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

Merge https://github.com/Regalis11/Barotrauma

Browse Source
This commit is contained in:
EvilFactory
2022-10-06 12:44:55 -03:00
parent bbca25854c 69b9960c3c
commit 8fef89a255
14 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View File

@@ -52,7 +52,7 @@ body:
label: Version
description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu.
options:
- 0.19.10.0
- 0.19.11.0
- Other
validations:
required: true

1
Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs
View File

@@ -71,6 +71,7 @@ namespace Barotrauma.Steam
return (await Task.WhenAll(outOfDatePackages.Where(p => !p.IsUpToDate)
.Select(p => p.Package.UgcId)
.NotNone()
.OfType<SteamWorkshopId>()
.Select(async id => await SteamManager.Workshop.GetItem(id.Value))))
.Where(p => p.HasValue).Select(p => p ?? default).ToArray();

5
Barotrauma/BarotraumaClient/ClientSource/Steam/WorkshopMenu/Mutable/ModListPreset.cs
View File

@@ -113,7 +113,10 @@ namespace Barotrauma
{
case ModType.Workshop:
pkgElem.SetAttributeValue("name", pkg.Name);
pkgElem.SetAttributeValue("id", pkg.UgcId.ToString());
if (pkg.UgcId.TryUnwrap(out ContentPackageId ugcId))
{
pkgElem.SetAttributeValue("id", ugcId.ToString());
}
break;
case ModType.Local:
pkgElem.SetAttributeValue("name", pkg.Name);

2
Barotrauma/BarotraumaClient/LinuxClient.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>0.19.10.0</Version>
<Version>0.19.11.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>

2
Barotrauma/BarotraumaClient/MacClient.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>0.19.10.0</Version>
<Version>0.19.11.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>

2
Barotrauma/BarotraumaClient/WindowsClient.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma</Product>
<Version>0.19.10.0</Version>
<Version>0.19.11.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>Barotrauma</AssemblyName>

2
Barotrauma/BarotraumaServer/LinuxServer.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>0.19.10.0</Version>
<Version>0.19.11.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>

2
Barotrauma/BarotraumaServer/MacServer.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>0.19.10.0</Version>
<Version>0.19.11.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>

2
Barotrauma/BarotraumaServer/WindowsServer.csproj
View File

@@ -11,7 +11,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>0.19.10.0</Version>
<Version>0.19.11.0</Version>
<Copyright>Copyright © FakeFish 2018-2022</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>

6
Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs
View File

@@ -269,6 +269,9 @@ namespace Barotrauma
public const float DefaultRealWorldCrushDepth = 3500.0f;
/// <summary>
/// The crush depth of a non-upgraded submarine in in-game coordinates. Note that this can be above the top of the level!
/// </summary>
public float CrushDepth
{
get
@@ -277,6 +280,9 @@ namespace Barotrauma
}
}
/// <summary>
/// The crush depth of a non-upgraded submarine in "real world units" (meters from the surface of Europa). Note that this can be above the top of the level!
/// </summary>
public float RealWorldCrushDepth
{
get

10
Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelData.cs
View File

@@ -47,6 +47,9 @@ namespace Barotrauma
public readonly Point Size;
/// <summary>
/// The depth at which the level starts at, in in-game coordinates. E.g. if this was set to 100 000 (= 1000 m), the nav terminal would display the depth as 1000 meters at the top of the level.
/// </summary>
public readonly int InitialDepth;
/// <summary>
@@ -59,6 +62,9 @@ namespace Barotrauma
public bool EventsExhausted { get; set; }
/// <summary>
/// The crush depth of a non-upgraded submarine in in-game coordinates. Note that this can be above the top of the level!
/// </summary>
public float CrushDepth
{
get
@@ -66,6 +72,10 @@ namespace Barotrauma
return Math.Max(Size.Y, Level.DefaultRealWorldCrushDepth / Physics.DisplayToRealWorldRatio) - InitialDepth;
}
}
/// <summary>
/// The crush depth of a non-upgraded submarine in "real world units" (meters from the surface of Europa). Note that this can be above the top of the level!
/// </summary>
public float RealWorldCrushDepth
{
get

7
Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs
View File

@@ -1433,6 +1433,13 @@ namespace Barotrauma
if (submarine?.Info.GameVersion != null)
{
SerializableProperty.UpgradeGameVersion(s, s.Prefab.ConfigElement, submarine.Info.GameVersion);
//tier-based upgrade restrictions were added in 0.19.10.0, potentially soft-locking campaigns if you're
//far enough on the map on a submarine that can no longer have as many levels of hull upgrades.
// -> let's ensure that won't happen
if (submarine.Info.GameVersion < new Version(0, 19, 10) && GameMain.GameSession?.LevelData != null)
{
s.CrushDepth = Math.Max(s.CrushDepth, GameMain.GameSession.LevelData.InitialDepth * Physics.DisplayToRealWorldRatio + 500);
}
}
bool hasDamage = false;

8
Barotrauma/BarotraumaShared/changelog.txt
View File

@@ -1,3 +1,11 @@
---------------------------------------------------------------------------------------------------------
v0.19.11.0
---------------------------------------------------------------------------------------------------------
- Fixed some old campaign saves being impossible to continue due to the new submarine upgrade restricions.
- Fixed "update all mods" button doing nothing in the Workshop menu.
- Fixed inability to create mod lists that include Workshop mods.
---------------------------------------------------------------------------------------------------------
v0.19.10.0
---------------------------------------------------------------------------------------------------------

0
Deploy/DeployAll.sh Normal file → Executable file
View File