Skip to content

Commit c397b2f

Browse files
committed
1.0.1
merge the dlls
1 parent 7f04613 commit c397b2f

File tree

11 files changed

+17
-28
lines changed

11 files changed

+17
-28
lines changed
0 Bytes
Binary file not shown.

Example/modules/IronPythonModule/plugins/Test/Test.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,7 @@ def On_DoorUse(self, Player, DoorEvent):
5858
# def On_EntityDecay(self, DecayEvent):
5959
# return DecayEvent.DamageAmount
6060
def On_EntityDeployed(self, Player, Enity):
61-
UnityEngine.Debug.Log(Player.Name + " deployed a(n) " + Entity.Name + " @ " + Player.Location.ToString())
61+
UnityEngine.Debug.Log(Player.Name + " deployed a(n) " + Entity.Name + " @ " + Player.Location.ToString())
62+
63+
def On_EntityHurt(self, he):
64+
UnityEngine.Debug.Log("python: " + he.Attacker.TimeOnline.ToString())
3.75 MB
Binary file not shown.
-696 KB
Binary file not shown.
-1.71 MB
Binary file not shown.
-1010 KB
Binary file not shown.
-375 KB
Binary file not shown.
-140 KB
Binary file not shown.

IronPythonModule/IPEngine.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,9 @@ private void InstallHooks(IPPlugin.Plugin plugin){
128128
case "OnNPCKilled": case "On_NPCKilled":
129129
Hooks.OnNPCKilled += new Hooks.KillHandlerDelegate (plugin.OnNPCKilled);
130130
break;
131-
// this works here but there is a problem with it in RemoveHooks, note: wtf
132-
// case "OnBlueprintUse": case "On_BlueprintUse":
133-
// Hooks.OnBlueprintUse += new Hooks.BlueprintUseHandlerDelagate(plugin.OnBlueprintUse);
134-
// break;
131+
case "OnBlueprintUse": case "On_BlueprintUse":
132+
Hooks.OnBlueprintUse += new Hooks.BlueprintUseHandlerDelagate (plugin.OnBlueprintUse);
133+
break;
135134
case "OnDoorUse": case "On_DoorUse":
136135
Hooks.OnDoorUse += new Hooks.DoorOpenHandlerDelegate (plugin.OnDoorUse);
137136
break;
@@ -211,10 +210,9 @@ private void RemoveHooks(IPPlugin.Plugin plugin){
211210
case "OnNPCKilled": case "On_NPCKilled":
212211
Hooks.OnNPCKilled -= new Hooks.KillHandlerDelegate (plugin.OnNPCKilled);
213212
break;
214-
// FIXME: something is broken here (it worked before and all the other still works, so must be fougerite side)
215-
// case "OnBlueprintUse": case "On_BlueprintUse":
216-
// Hooks.OnBlueprintUse -= new Hooks.BlueprintUseHandlerDelegate(plugin.OnBlueprintUse);
217-
// break;
213+
case "OnBlueprintUse": case "On_BlueprintUse":
214+
Hooks.OnBlueprintUse -= new Hooks.BlueprintUseHandlerDelagate (plugin.OnBlueprintUse);
215+
break;
218216
case "OnDoorUse": case "On_DoorUse":
219217
Hooks.OnDoorUse -= new Hooks.DoorOpenHandlerDelegate (plugin.OnDoorUse);
220218
break;

IronPythonModule/IronPythonModule.csproj

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,6 @@
3535
<Reference Include="Fougerite">
3636
<HintPath>references\Fougerite.dll</HintPath>
3737
</Reference>
38-
<Reference Include="IronPython">
39-
<HintPath>references\IronPython.dll</HintPath>
40-
</Reference>
41-
<Reference Include="IronPython.Modules">
42-
<HintPath>references\IronPython.Modules.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Microsoft.Dynamic">
45-
<HintPath>references\Microsoft.Dynamic.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Microsoft.Scripting.Core">
48-
<HintPath>references\Microsoft.Scripting.Core.dll</HintPath>
49-
</Reference>
50-
<Reference Include="Microsoft.Scripting">
51-
<HintPath>references\Microsoft.Scripting.dll</HintPath>
52-
</Reference>
5338
<Reference Include="uLink">
5439
<HintPath>references\uLink.dll</HintPath>
5540
</Reference>
@@ -65,6 +50,9 @@
6550
<Reference Include="Microsoft.Contracts">
6651
<HintPath>references\Microsoft.Contracts.dll</HintPath>
6752
</Reference>
53+
<Reference Include="IronPython.Deps">
54+
<HintPath>references\IronPython.Deps.dll</HintPath>
55+
</Reference>
6856
</ItemGroup>
6957
<ItemGroup>
7058
<Compile Include="Properties\AssemblyInfo.cs" />

0 commit comments

Comments
 (0)