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

Unstable 0.1300.2.11

Browse Source
This commit is contained in:
Markus Isberg
2021-04-27 17:12:39 +03:00
parent 2c750282ec
commit bf743f1e99
15 changed files with 140 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Wearable.cs
+5
View File
@@ -144,6 +144,11 @@ namespace Barotrauma
// If the variant does not exist, parse the path so that it uses first variant.
SpritePath = tempPath.Replace("[VARIANT]", "1");
}
if (!File.Exists(SpritePath) && _gender == Gender.None)
{
// If there's no sprite for Gender.None does not exist, try to use male sprite
SpritePath = tempPath.Replace("[GENDER]", "male");
}
if (parseSpritePath)
{
Sprite.ParseTexturePath(file: SpritePath);
Barotrauma/BarotraumaShared/SharedSource/Map/Explosion.cs
+1 -1
View File
@@ -426,7 +426,7 @@ namespace Barotrauma
{
if (MathUtils.LineSegmentToPointDistanceSquared((edge.Point1 + cell.Translation).ToPoint(), (edge.Point2 + cell.Translation).ToPoint(), worldPosition.ToPoint()) < worldRange * worldRange)
{
destructibleWall.AddDamage(damage, worldPosition);
destructibleWall.AddDamage(levelWallDamage, worldPosition);
break;
}
}
Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs
+25 -1
View File
@@ -1068,12 +1068,36 @@ namespace Barotrauma
public void NeutralizeBallast()
{
float neutralBallastLevel = 0.5f;
int selectedSteeringValue = 0;
foreach (Item item in Item.ItemList)
{
if (item.Submarine != this) { continue; }
var steering = item.GetComponent<Steering>();
if (steering == null) { continue; }
neutralBallastLevel = Math.Min(neutralBallastLevel, steering.NeutralBallastLevel);
//find how many pumps/engines in this sub the steering item is connected to
int steeringValue = 1;
Connection connectionX = item.GetComponent<ConnectionPanel>()?.Connections.Find(c => c.Name == "velocity_x_out");
Connection connectionY = item.GetComponent<ConnectionPanel>()?.Connections.Find(c => c.Name == "velocity_y_out");
if (connectionX != null)
{
foreach (Engine engine in steering.Item.GetConnectedComponentsRecursive<Engine>(connectionX))
{
if (engine.Item.Submarine == this) { steeringValue++; }
}
}
if (connectionY != null)
{
foreach (Pump pump in steering.Item.GetConnectedComponentsRecursive<Pump>(connectionY))
{
if (pump.Item.Submarine == this) { steeringValue++; }
}
}
//the nav terminal that's connected to the most engines/pumps in the sub most likely controls the sub (instead of a shuttle or some other system)
if (steeringValue > selectedSteeringValue)
{
neutralBallastLevel = steering.NeutralBallastLevel;
}
}
HashSet<Hull> ballastHulls = new HashSet<Hull>();