hook merge + hook wrappers
This commit is contained in:
+1
-1
@@ -80,7 +80,7 @@ namespace Barotrauma
|
||||
|
||||
public void AddObjective<T>(T objective) where T : AIObjective
|
||||
{
|
||||
var result = new LuaResult(GameMain.LuaCs.hook.Call("AI.AddObjective", this, objective));
|
||||
var result = new LuaResult(GameMain.LuaCs.HookBase.Call("AI.AddObjective", this, objective));
|
||||
|
||||
if (result.Bool()) return;
|
||||
|
||||
|
||||
+2
-2
@@ -1440,11 +1440,11 @@ namespace Barotrauma
|
||||
// -> the character should be revived if there are no major afflictions in addition to lack of oxygen
|
||||
target.Oxygen = Math.Max(target.Oxygen + 10.0f, 10.0f);
|
||||
|
||||
GameMain.LuaCs.hook.Call("human.CPRSuccess", this);
|
||||
GameMain.LuaCs.HookBase.Call("human.CPRSuccess", this);
|
||||
}
|
||||
else
|
||||
{
|
||||
GameMain.LuaCs.hook.Call("human.CPRFailed", this);
|
||||
GameMain.LuaCs.HookBase.Call("human.CPRFailed", this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -745,7 +745,7 @@ namespace Barotrauma
|
||||
|
||||
float impactDamage = Math.Min((impact - ImpactTolerance) * ImpactDamageMultiplayer, character.MaxVitality * MaxImpactDamage);
|
||||
|
||||
var should = new LuaResult(GameMain.LuaCs.hook.Call("changeFallDamage", new object[] { impactDamage, character, impactPos, velocity }));
|
||||
var should = new LuaResult(GameMain.LuaCs.HookBase.Call("changeFallDamage", new object[] { impactDamage, character, impactPos, velocity }));
|
||||
|
||||
if (!should.IsNull())
|
||||
{
|
||||
|
||||
@@ -1043,7 +1043,7 @@ namespace Barotrauma
|
||||
}
|
||||
#endif
|
||||
|
||||
GameMain.LuaCs.hook.Call("characterCreated", new object[] { newCharacter });
|
||||
GameMain.LuaCs.HookBase.Call("characterCreated", new object[] { newCharacter });
|
||||
|
||||
return newCharacter;
|
||||
}
|
||||
|
||||
+1
-1
@@ -388,7 +388,7 @@ namespace Barotrauma
|
||||
AdditionStrength -= amount;
|
||||
}
|
||||
#if SERVER
|
||||
GameMain.LuaCs.hook.Call("afflictionUpdate", new object[] { this, characterHealth, targetLimb, deltaTime });
|
||||
GameMain.LuaCs.HookBase.Call("afflictionUpdate", new object[] { this, characterHealth, targetLimb, deltaTime });
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -308,7 +308,7 @@ namespace Barotrauma
|
||||
if (client != null)
|
||||
{
|
||||
GameMain.Server.SetClientCharacter(client, husk);
|
||||
GameMain.LuaCs.hook.Call("husk.clientControlHusk", new object[] { client, husk });
|
||||
GameMain.LuaCs.HookBase.Call("husk.clientControlHusk", new object[] { client, husk });
|
||||
}
|
||||
#else
|
||||
if (!character.IsRemotelyControlled && character == Character.Controlled)
|
||||
|
||||
@@ -541,7 +541,7 @@ namespace Barotrauma
|
||||
return;
|
||||
}
|
||||
|
||||
var should = new LuaResult(GameMain.LuaCs.hook.Call("character.applyDamage", new object[] { this, attackResult, hitLimb, allowStacking }));
|
||||
var should = new LuaResult(GameMain.LuaCs.HookBase.Call("character.applyDamage", new object[] { this, attackResult, hitLimb, allowStacking }));
|
||||
|
||||
if (should.Bool())
|
||||
return;
|
||||
@@ -674,7 +674,7 @@ namespace Barotrauma
|
||||
}
|
||||
}
|
||||
|
||||
var should = new LuaResult(GameMain.LuaCs.hook.Call("character.applyAffliction", new object[] { this, limbHealth, newAffliction, allowStacking }));
|
||||
var should = new LuaResult(GameMain.LuaCs.HookBase.Call("character.applyAffliction", new object[] { this, limbHealth, newAffliction, allowStacking }));
|
||||
|
||||
if (should.Bool())
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user