v1.5.7.0 (Summer Update)

This commit is contained in:
Regalis11
2024-06-18 16:49:51 +03:00
parent 4a63dacbce
commit 230d1b6e78
263 changed files with 7792 additions and 2845 deletions
@@ -210,7 +210,9 @@ namespace Barotrauma
{
bool primaryMouseButtonHeld = PlayerInput.PrimaryMouseButtonHeld();
bool secondaryMouseButtonHeld = PlayerInput.SecondaryMouseButtonHeld();
if (!primaryMouseButtonHeld && !secondaryMouseButtonHeld) { return; }
bool doubleClicked = PlayerInput.DoubleClicked();
bool secondaryDoubleClicked = PlayerInput.SecondaryDoubleClicked();
if (!primaryMouseButtonHeld && !secondaryMouseButtonHeld && !doubleClicked && !secondaryDoubleClicked) { return; }
Vector2 position = cam.ScreenToWorld(PlayerInput.MousePosition);
Hull hull = FindHull(position);
@@ -218,29 +220,67 @@ namespace Barotrauma
if (hull == null || hull.IdFreed) { return; }
if (EditWater)
{
const float waterIncrement = 100000.0f;
if (primaryMouseButtonHeld)
{
ShowHulls = true;
hull.WaterVolume += 100000.0f * deltaTime;
hull.networkUpdatePending = true;
hull.serverUpdateDelay = 0.5f;
SetWaterVolume(hull.WaterVolume + waterIncrement * deltaTime);
}
else if (secondaryMouseButtonHeld)
{
hull.WaterVolume -= 100000.0f * deltaTime;
SetWaterVolume(hull.WaterVolume - waterIncrement * deltaTime);
}
if (doubleClicked)
{
SetWaterVolume(hull.Volume * MaxCompress);
}
else if (secondaryDoubleClicked)
{
SetWaterVolume(0f);
}
void SetWaterVolume(float newVolume)
{
ShowHulls = true;
hull.WaterVolume = newVolume;
hull.networkUpdatePending = true;
hull.serverUpdateDelay = 0.5f;
}
}
else if (EditFire)
{
bool networkUpdate = false;
if (primaryMouseButtonHeld)
{
new FireSource(position, hull, isNetworkMessage: true);
networkUpdate = true;
}
else if (secondaryMouseButtonHeld || secondaryDoubleClicked)
{
for (int index = hull.FireSources.Count - 1; index >= 0; index--)
{
var currentFireSource = hull.FireSources[index];
if (secondaryMouseButtonHeld)
{
const float extinguishAmount = 120f;
currentFireSource.Extinguish(deltaTime, extinguishAmount);
networkUpdate = true;
}
else
{
currentFireSource.Remove();
networkUpdate = true;
}
}
}
if (networkUpdate)
{
hull.networkUpdatePending = true;
hull.serverUpdateDelay = 0.5f;
}
}
}
}