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

Build 0.18.9.0

Browse Source
This commit is contained in:
Markus Isberg
2022-06-14 04:14:47 +09:00
parent 4f5a3bf8b9
commit 856f894203
39 changed files with 459 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Map/Creatures/BallastFloraBehavior.cs
+14 -12
View File
@@ -460,13 +460,14 @@ namespace Barotrauma.MapCreatures.Behavior
{
if (parentBranchId > -1)
{
if (parentBranchId < Branches.Count)
var parentBranch = Branches.Find(b => b.ID == parentBranchId);
if (parentBranch == null)
{
branch.ParentBranch = Branches[parentBranchId];
DebugConsole.AddWarning($"Error while loading ballast flora: couldn't find a parent branch with the ID {parentBranchId}");
}
else
{
DebugConsole.AddWarning($"Error while loading ballast flora: parent branch ID {parentBranchId} out of range (total {Branches.Count} branches)");
branch.ParentBranch = parentBranch;
}
}
}
@@ -790,7 +791,8 @@ namespace Barotrauma.MapCreatures.Behavior
MaxHealth = RootHealth,
Health = RootHealth,
IsRoot = true,
CurrentHull = Parent
CurrentHull = Parent,
ID = CreateID()
};
Branches.Add(root);
@@ -1015,14 +1017,6 @@ namespace Barotrauma.MapCreatures.Behavior
public void DamageBranch(BallastFloraBranch branch, float amount, AttackType type, Character? attacker = null)
{
float damage = amount;
if (damage > 0)
{
damage = Math.Min(damage, branch.Health);
}
else
{
damage = Math.Max(damage, branch.Health - branch.MaxHealth);
}
if (type != AttackType.Other && type != AttackType.CutFromRoot)
{
@@ -1081,6 +1075,14 @@ namespace Barotrauma.MapCreatures.Behavior
}
}
if (damage > 0)
{
damage = Math.Min(damage, branch.Health);
}
else
{
damage = Math.Max(damage, branch.Health - branch.MaxHealth);
}
branch.Health -= damage;
#if SERVER