vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: no more dynvalues or userdatas

Browse Source
This commit is contained in:
Evil Factory
2021-08-29 00:16:33 -03:00
parent fdb9ca1d30
commit e24797dd05
16 changed files with 161 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs
+5 -2
View File
@@ -714,11 +714,14 @@ namespace Barotrauma
#if SERVER
var should = GameMain.Lua.hook.Call("changeFallDamage", new DynValue[] { DynValue.NewNumber(impactDamage), LuaSetup.CreateUserDataSafe(character), LuaSetup.CreateUserDataSafe(impactPos), LuaSetup.CreateUserDataSafe(velocity) });
var should = GameMain.Lua.hook.Call("changeFallDamage", new object[] { impactDamage, character, impactPos, velocity });
if (should != null)
{
impactDamage = (float)should.CastToNumber();
if (should is DynValue dyn)
{
impactDamage = (float)dyn.CastToNumber();
}
}
#endif
Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
+1 -1
View File
@@ -3810,7 +3810,7 @@ namespace Barotrauma
#if SERVER
GameMain.Lua.hook.Call("characterDeath", new MoonSharp.Interpreter.DynValue[] { MoonSharp.Interpreter.UserData.Create(this) });
GameMain.Lua.hook.Call("characterDeath", new object[] { this });
#endif
}
partial void KillProjSpecific(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction, bool log);
Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs
+36 -12
View File
@@ -410,11 +410,17 @@ namespace Barotrauma
if (targetLimb == null)
{
#if SERVER
var should = GameMain.Lua.hook.Call("afflictionApplied", new DynValue[] { LuaSetup.CreateUserDataSafe(this), LuaSetup.CreateUserDataSafe(affliction) });
var should = GameMain.Lua.hook.Call("afflictionApplied", new object[] { this, affliction });
if (should != null && should.CastToBool())
if (should != null)
{
return;
if (should is DynValue dyn)
{
if (dyn.CastToBool())
{
return;
}
}
}
#endif
@@ -428,11 +434,17 @@ namespace Barotrauma
else
{
#if SERVER
var should = GameMain.Lua.hook.Call("afflictionApplied", new DynValue[] { UserData.Create(this), UserData.Create(affliction), UserData.Create(targetLimb) });
var should = GameMain.Lua.hook.Call("afflictionApplied", new object[] { this, affliction, targetLimb });
if (should != null && should.CastToBool())
if (should != null)
{
return;
if (should is DynValue dyn)
{
if (dyn.CastToBool())
{
return;
}
}
}
#endif
@@ -442,11 +454,17 @@ namespace Barotrauma
else
{
#if SERVER
var should = GameMain.Lua.hook.Call("afflictionApplied", new DynValue[] { UserData.Create(this), UserData.Create(affliction)});
var should = GameMain.Lua.hook.Call("afflictionApplied", new object[] { this, affliction });
if (should != null && should.CastToBool())
if (should != null)
{
return;
if (should is DynValue dyn)
{
if (dyn.CastToBool())
{
return;
}
}
}
#endif
@@ -527,11 +545,17 @@ namespace Barotrauma
}
#if SERVER
var should = GameMain.Lua.hook.Call("afflictionApplied", new DynValue[] { LuaSetup.CreateUserDataSafe(this), LuaSetup.CreateUserDataSafe(attackResult), LuaSetup.CreateUserDataSafe(hitLimb) });
var should = GameMain.Lua.hook.Call("afflictionApplied", new object[] { this, attackResult, hitLimb });
if (should != null && should.CastToBool())
if (should != null)
{
return;
if (should is DynValue dyn)
{
if (dyn.CastToBool())
{
return;
}
}
}
#endif