Skip to content

Commit

Permalink
1.20.1 (#851)
Browse files Browse the repository at this point in the history
## Bug fixes
- Fixes The Vision roasting you in the sun if you're Turkish (use
invariant culture when changing string casing)
  • Loading branch information
xen-42 committed Apr 28, 2024
2 parents 693d09b + a188d53 commit e0a2855
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion NewHorizons/Builder/StarSystem/SkyboxBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static GameObject BuildSkySphereFace(GameObject skySphere, string name, Q
{
if (!tex)
{
NHLogger.LogError($"Failed to load texture for skybox {name.ToLower()} face");
NHLogger.LogError($"Failed to load texture for skybox {name.ToLowerInvariant()} face");
return null;
}

Expand Down
10 changes: 5 additions & 5 deletions NewHorizons/Handlers/PlanetGraphHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ public static List<PlanetGraphHandler> ConstructStockGraph(NewHorizonsBody[] bod

private static bool DetermineIfChildOfFocal(NewHorizonsBody body, FocalPointNode node)
{
var name = body.Config.name.ToLower();
var primary = (body.Config.Orbit?.primaryBody ?? "").ToLower();
var primaryName = node.primary.body.Config.name.ToLower();
var secondaryName = node.secondary.body.Config.name.ToLower();
return name != primaryName && name != secondaryName && (primary == node.body.Config.name.ToLower() || primary == primaryName || primary == secondaryName);
var name = body.Config.name.ToLowerInvariant();
var primary = (body.Config.Orbit?.primaryBody ?? "").ToLowerInvariant();
var primaryName = node.primary.body.Config.name.ToLowerInvariant();
var secondaryName = node.secondary.body.Config.name.ToLowerInvariant();
return name != primaryName && name != secondaryName && (primary == node.body.Config.name.ToLowerInvariant() || primary == primaryName || primary == secondaryName);
}


Expand Down
2 changes: 1 addition & 1 deletion NewHorizons/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ private void LoadTranslations(string folder, IModBehaviour mod)
{
if (language is TextTranslation.Language.UNKNOWN or TextTranslation.Language.TOTAL) continue;

var relativeFile = Path.Combine("translations", language.ToString().ToLower() + ".json");
var relativeFile = Path.Combine("translations", language.ToString().ToLowerInvariant() + ".json");

if (File.Exists(Path.Combine(folder, relativeFile)))
{
Expand Down
4 changes: 2 additions & 2 deletions NewHorizons/Utility/NewHorizonExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ public static float GetFalloffExponent(this GravityVolume gv)
public static string ToCamelCase(this string str)
{
StringBuilder strBuilder = new StringBuilder(str);
strBuilder[0] = strBuilder[0].ToString().ToLower().ToCharArray()[0];
strBuilder[0] = strBuilder[0].ToString().ToLowerInvariant().ToCharArray()[0];
return strBuilder.ToString();
}

public static string ToTitleCase(this string str)
{
StringBuilder strBuilder = new StringBuilder(str);
strBuilder[0] = strBuilder[0].ToString().ToUpper().ToCharArray()[0];
strBuilder[0] = strBuilder[0].ToString().ToUpperInvariant().ToCharArray()[0];
return strBuilder.ToString();
}

Expand Down
5 changes: 3 additions & 2 deletions NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using NewHorizons.Components.Orbital;
using NewHorizons.Handlers;
Expand Down Expand Up @@ -33,7 +34,7 @@ public static AstroObject GetAstroObject(string name, bool flag = false)
}

// Else check stock names
var stringID = name.ToUpper().Replace(" ", "_").Replace("'", "");
var stringID = name.ToUpperInvariant().Replace(" ", "_").Replace("'", "");
if (stringID.Equals("ATTLEROCK")) stringID = "TIMBER_MOON";
if (stringID.Equals("HOLLOWS_LANTERN")) stringID = "VOLCANIC_MOON";
if (stringID.Equals("ASH_TWIN")) stringID = "TOWER_TWIN";
Expand All @@ -42,7 +43,7 @@ public static AstroObject GetAstroObject(string name, bool flag = false)
if (stringID.Equals("EYE") || stringID.Equals("EYEOFTHEUNIVERSE")) stringID = "EYE_OF_THE_UNIVERSE";

string key;
if (stringID.ToUpper().Replace("_", "").Equals("MAPSATELLITE"))
if (stringID.ToUpperInvariant().Replace("_", "").Equals("MAPSATELLITE"))
{
key = AstroObject.Name.MapSatellite.ToString();
}
Expand Down
2 changes: 1 addition & 1 deletion NewHorizons/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "xen, Bwc9876, JohnCorby, MegaPiggy, Clay, Trifid, and friends",
"name": "New Horizons",
"uniqueName": "xen.NewHorizons",
"version": "1.20.0",
"version": "1.20.1",
"owmlVersion": "2.10.3",
"dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
"conflicts": [ "PacificEngine.OW_CommonResources" ],
Expand Down

0 comments on commit e0a2855

Please sign in to comment.