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

Unstable 1.1.15.0

Browse Source
This commit is contained in:
Markus Isberg
2023-10-05 14:55:53 +03:00
parent cf8f0de659
commit 12e43d95ef
13 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/LinuxClient.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace> <RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors> <Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product> <Product>Barotrauma</Product>
<Version>1.1.14.0</Version> <Version>1.1.15.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright> <Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName> <AssemblyName>Barotrauma</AssemblyName>
Barotrauma/BarotraumaClient/MacClient.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace> <RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors> <Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product> <Product>Barotrauma</Product>
<Version>1.1.14.0</Version> <Version>1.1.15.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright> <Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName> <AssemblyName>Barotrauma</AssemblyName>
Barotrauma/BarotraumaClient/WindowsClient.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace> <RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors> <Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product> <Product>Barotrauma</Product>
<Version>1.1.14.0</Version> <Version>1.1.15.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright> <Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName> <AssemblyName>Barotrauma</AssemblyName>
Barotrauma/BarotraumaServer/LinuxServer.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace> <RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors> <Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product> <Product>Barotrauma Dedicated Server</Product>
<Version>1.1.14.0</Version> <Version>1.1.15.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright> <Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName> <AssemblyName>DedicatedServer</AssemblyName>
Barotrauma/BarotraumaServer/MacServer.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace> <RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors> <Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product> <Product>Barotrauma Dedicated Server</Product>
<Version>1.1.14.0</Version> <Version>1.1.15.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright> <Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName> <AssemblyName>DedicatedServer</AssemblyName>
Barotrauma/BarotraumaServer/WindowsServer.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace> <RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors> <Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product> <Product>Barotrauma Dedicated Server</Product>
<Version>1.1.14.0</Version> <Version>1.1.15.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright> <Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName> <AssemblyName>DedicatedServer</AssemblyName>
Barotrauma/BarotraumaShared/SharedSource/CircuitBox/CircuitBoxConnection.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace Barotrauma
if (connector is CircuitBoxOutputConnection output) if (connector is CircuitBoxOutputConnection output)
{ {
output.ReceiveSignal(signal); output.ReceiveSignal(signal);
return; continue;
} }
Connection.SendSignalIntoConnection(signal, connector.Connection); Connection.SendSignalIntoConnection(signal, connector.Connection);
} }
Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/CheckItemAction.cs
+5 -7
View File
@@ -134,14 +134,12 @@ namespace Barotrauma
foreach (var target in targets) foreach (var target in targets)
{ {
if (target is not Item item) { continue; } if (target is not Item item) { continue; }
if (itemTags.Any() && itemTags.None(item.HasTag) && if (itemTags.Any(item.HasTag) || itemIdentifierSplit.Contains(item.Prefab.Identifier))
itemIdentifierSplit.Any() && !itemIdentifierSplit.Contains(item.Prefab.Identifier))
{ {
continue; if (ConditionalsMatch(item, character: null))
} {
if (ConditionalsMatch(item, character: null)) tempTargetItems.Add(item);
{ }
tempTargetItems.Add(item);
} }
} }
if (EnoughTargets(targetCount, tempTargetItems.Count)) if (EnoughTargets(targetCount, tempTargetItems.Count))
Barotrauma/BarotraumaShared/SharedSource/Events/MonsterEvent.cs
+2
View File
@@ -612,6 +612,8 @@ namespace Barotrauma
//round ended before the coroutine finished //round ended before the coroutine finished
if (GameMain.GameSession == null || Level.Loaded == null) { return; } if (GameMain.GameSession == null || Level.Loaded == null) { return; }
if (monster.Removed) { return; }
System.Diagnostics.Debug.Assert(GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer, "Clients should not create monster events."); System.Diagnostics.Debug.Assert(GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer, "Clients should not create monster events.");
Vector2 pos = spawnPos.Value + Rand.Vector(scatterAmount); Vector2 pos = spawnPos.Value + Rand.Vector(scatterAmount);
Barotrauma/BarotraumaShared/SharedSource/Items/Components/ElectricalDischarger.cs
+10 -13
View File
@@ -1,4 +1,5 @@
using Barotrauma.Networking; using Barotrauma.Extensions;
using Barotrauma.Networking;
using FarseerPhysics; using FarseerPhysics;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using System; using System;
@@ -181,22 +182,18 @@ namespace Barotrauma.Items.Components
if (hasPower) if (hasPower)
{ {
var batteries = GetDirectlyConnectedBatteries().Where(static b => !b.OutputDisabled && b.Charge > 0.0001f && b.MaxOutPut > 0.0001f); var batteries = GetDirectlyConnectedBatteries().Where(static b => !b.OutputDisabled && b.Charge > 0.0001f && b.MaxOutPut > 0.0001f);
int batteryCount = batteries.Count(); float neededPower = PowerConsumption;
if (batteryCount > 0) while (neededPower > 0.0001f && batteries.Any())
{ {
float neededPower = PowerConsumption; float takePower = neededPower / batteries.Count();
while (neededPower > 0.0001f) takePower = Math.Min(takePower, batteries.Min(b => Math.Min(b.Charge * 3600.0f, b.MaxOutPut)));
foreach (PowerContainer battery in batteries)
{ {
float takePower = neededPower / batteryCount; neededPower -= takePower;
takePower = Math.Min(takePower, batteries.Min(b => Math.Min(b.Charge * 3600.0f, b.MaxOutPut))); battery.Charge -= takePower / 3600.0f;
foreach (PowerContainer battery in batteries)
{
neededPower -= takePower;
battery.Charge -= takePower / 3600.0f;
#if SERVER #if SERVER
if (GameMain.Server != null) { battery.Item.CreateServerEvent(battery); } if (GameMain.Server != null) { battery.Item.CreateServerEvent(battery); }
#endif #endif
}
} }
} }
Discharge(); Discharge();
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs
+11 -16
View File
@@ -773,28 +773,23 @@ namespace Barotrauma.Items.Components
if (!ignorePower) if (!ignorePower)
{ {
var batteries = GetDirectlyConnectedBatteries().Where(static b => !b.OutputDisabled && b.Charge > 0.0001f && b.MaxOutPut > 0.0001f); var batteries = GetDirectlyConnectedBatteries().Where(static b => !b.OutputDisabled && b.Charge > 0.0001f && b.MaxOutPut > 0.0001f);
int batteryCount = batteries.Count(); float neededPower = GetPowerRequiredToShoot();
if (batteryCount > 0) // tinkering is currently not factored into the common method as it is checked only when shooting
// but this is a minor issue that causes mostly cosmetic woes. might still be worth refactoring later
neededPower /= 1f + (tinkeringStrength * TinkeringPowerCostReduction);
while (neededPower > 0.0001f && batteries.Any())
{ {
float neededPower = GetPowerRequiredToShoot(); float takePower = neededPower / batteries.Count();
// tinkering is currently not factored into the common method as it is checked only when shooting takePower = Math.Min(takePower, batteries.Min(b => Math.Min(b.Charge * 3600.0f, b.MaxOutPut)));
// but this is a minor issue that causes mostly cosmetic woes. might still be worth refactoring later foreach (PowerContainer battery in batteries)
neededPower /= 1f + (tinkeringStrength * TinkeringPowerCostReduction);
while (neededPower > 0.0001f)
{ {
float takePower = neededPower / batteryCount; neededPower -= takePower;
takePower = Math.Min(takePower, batteries.Min(b => Math.Min(b.Charge * 3600.0f, b.MaxOutPut))); battery.Charge -= takePower / 3600.0f;
foreach (PowerContainer battery in batteries)
{
neededPower -= takePower;
battery.Charge -= takePower / 3600.0f;
#if SERVER #if SERVER
battery.Item.CreateServerEvent(battery); battery.Item.CreateServerEvent(battery);
#endif #endif
}
} }
} }
} }
launchedProjectile = projectiles.FirstOrDefault(); launchedProjectile = projectiles.FirstOrDefault();
Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs
+3
View File
@@ -1378,6 +1378,9 @@ namespace Barotrauma
{ {
if (sub.Info.IsOutpost) if (sub.Info.IsOutpost)
{ {
#if CLIENT
if (GameMain.GameSession.GameMode is TutorialMode) { continue; }
#endif
OutpostGenerator.PowerUpOutpost(sub); OutpostGenerator.PowerUpOutpost(sub);
} }
} }
Barotrauma/BarotraumaShared/changelog.txt
+10
View File
@@ -1,3 +1,13 @@
-------------------------------------------------------------------------------------------------------------------------------------------------
v1.1.15.0
-------------------------------------------------------------------------------------------------------------------------------------------------
- Fixed console errors when there are swarm feeders (or other monsters that immediately despawn when killed) in an irradiated level.
- Fixed occasional crashes when firing a turret makes a supercapacitor drop to 0% charge.
- Fixed circuit box only outputting to one pin when wired directly from input to multiple output pins.
- Fixed tutorial reactor starting already powered up, making the first engineer tutorial objectives complete immediately.
- Miscellaneous tutorial fixes.
------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------
v1.1.14.0 v1.1.14.0
------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------