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

Unstable v0.19.3.0

Browse Source
This commit is contained in:
Juan Pablo Arce
2022-09-02 15:10:56 -03:00
parent 28789616bd
commit 3f2c843247
336 changed files with 7152 additions and 7739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs
+41 -10
View File
@@ -168,6 +168,17 @@ namespace Barotrauma
public ImmutableHashSet<Identifier> Tags => Prefab.Tags;
#if DEBUG
[Editable, Serialize("", IsPropertySaveable.Yes)]
#else
[Serialize("", IsPropertySaveable.Yes)]
#endif
public string SpecialTag
{
get;
set;
}
protected Color spriteColor;
[Editable, Serialize("1.0,1.0,1.0,1.0", IsPropertySaveable.Yes)]
public Color SpriteColor
@@ -574,6 +585,11 @@ namespace Barotrauma
int xsections = 1, ysections = 1;
int width = rect.Width, height = rect.Height;
WallSection[] prevSections = null;
if (Sections != null)
{
prevSections = Sections.ToArray();
}
if (!HasBody)
{
if (FlippedX && IsHorizontal)
@@ -657,6 +673,14 @@ namespace Barotrauma
}
}
}
if (prevSections != null && Sections.Length == prevSections.Length)
{
for (int i = 0; i < Sections.Length; i++)
{
Sections[i].damage = prevSections[i].damage;
}
}
}
private Rectangle GenerateMergedRect(List<WallSection> mergedSections)
@@ -829,27 +853,33 @@ namespace Barotrauma
public WallSection GetSection(int sectionIndex)
{
if (sectionIndex < 0 || sectionIndex >= Sections.Length) return null;
if (sectionIndex < 0 || sectionIndex >= Sections.Length) { return null; }
return Sections[sectionIndex];
}
public bool SectionBodyDisabled(int sectionIndex)
{
if (sectionIndex < 0 || sectionIndex >= Sections.Length) return false;
if (sectionIndex < 0 || sectionIndex >= Sections.Length) { return false; }
return (Sections[sectionIndex].damage >= MaxHealth);
}
public bool AllSectionBodiesDisabled()
{
for (int i = 0; i < Sections.Length; i++)
{
if (Sections[i].damage < MaxHealth) { return false; }
}
return true;
}
/// <summary>
/// Sections that are leaking have a gap placed on them
/// </summary>
public bool SectionIsLeaking(int sectionIndex)
{
if (sectionIndex < 0 || sectionIndex >= Sections.Length) return false;
return (Sections[sectionIndex].damage >= MaxHealth * LeakThreshold);
if (sectionIndex < 0 || sectionIndex >= Sections.Length) { return false; }
return Sections[sectionIndex].damage >= MaxHealth * LeakThreshold;
}
public int SectionLength(int sectionIndex)
@@ -1139,21 +1169,22 @@ namespace Barotrauma
gapRect.Height += 20;
bool horizontalGap = !IsHorizontal;
bool diagonalGap = false;
if (Prefab.BodyRotation != 0.0f)
{
//rotation within a 90 deg sector (e.g. 100 -> 10, 190 -> 10, -10 -> 80)
float sectorizedRotation = MathUtils.WrapAngleTwoPi(BodyRotation) % MathHelper.PiOver2;
//diagonal if 30 < angle < 60
bool diagonal = sectorizedRotation > MathHelper.Pi / 6 && sectorizedRotation < MathHelper.Pi / 3;
diagonalGap = sectorizedRotation > MathHelper.Pi / 6 && sectorizedRotation < MathHelper.Pi / 3;
//gaps on the lower half of a diagonal wall are horizontal, ones on the upper half are vertical
if (diagonal)
if (diagonalGap)
{
horizontalGap = gapRect.Y - gapRect.Height / 2 < Position.Y;
if (FlippedY) { horizontalGap = !horizontalGap; }
}
}
Sections[sectionIndex].gap = new Gap(gapRect, horizontalGap, Submarine);
Sections[sectionIndex].gap = new Gap(gapRect, horizontalGap, Submarine, isDiagonal: diagonalGap);
//free the ID, because if we give gaps IDs we have to make sure they always match between the clients and the server and
//that clients create them in the correct order along with every other entity created/removed during the round