Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

dont touch backslashes (#426)

Browse Source 
this turns off owml's backslash "fixer"

![image](https://user-images.githubusercontent.com/26337121/196365766-5ce2978a-6c71-4e83-be08-a5e7dca99430.png)

apparently, the backslash fixer was implemented for path-character
reasons.
unfortunately, it happens to break all escape characters, such as The
Vision's
https://github.com/Outer-Wilds-New-Horizons/new-horizons/issues/424#issuecomment-1281856989

it being disabled doesn't seem to break anything.
further testing on linux is probably needed. obv i cant do that testing.
This commit is contained in:
Will Corby 2022-10-19 19:14:19 -07:00 committed by GitHub
commit cc10da8120
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NewHorizons/Components/ShipLog/ShipLogStarChartMode.cs
View File

@ -2,6 +2,7 @@ using NewHorizons.Handlers;
using NewHorizons.Utility; using NewHorizons.Utility;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@ -131,7 +132,7 @@ namespace NewHorizons.Components.ShipLog
} }
else else
{ {
var path = $"planets/{uniqueID}.png"; var path = Path.Combine("planets", uniqueID + ".png");
Logger.LogVerbose($"ShipLogStarChartManager - Trying to load {path}"); Logger.LogVerbose($"ShipLogStarChartManager - Trying to load {path}");
texture = ImageUtilities.GetTexture(Main.SystemDict[uniqueID].Mod, path); texture = ImageUtilities.GetTexture(Main.SystemDict[uniqueID].Mod, path);
} }

2
NewHorizons/External/NewHorizonsData.cs vendored
View File

@ -25,7 +25,7 @@ namespace NewHorizons.External
try try
{ {
_saveFile = Main.Instance.ModHelper.Storage.Load<NewHorizonsSaveFile>(FileName); _saveFile = Main.Instance.ModHelper.Storage.Load<NewHorizonsSaveFile>(FileName, false);
if (!_saveFile.Profiles.ContainsKey(_activeProfileName)) if (!_saveFile.Profiles.ContainsKey(_activeProfileName))
_saveFile.Profiles.Add(_activeProfileName, new NewHorizonsProfile()); _saveFile.Profiles.Add(_activeProfileName, new NewHorizonsProfile());
_activeProfile = _saveFile.Profiles[_activeProfileName]; _activeProfile = _saveFile.Profiles[_activeProfileName];

8
NewHorizons/Main.cs
View File

@ -582,7 +582,7 @@ namespace NewHorizons
Logger.LogVerbose($"Loading system {name}"); Logger.LogVerbose($"Loading system {name}");
var relativePath = file.Replace(folder, ""); var relativePath = file.Replace(folder, "");
var starSystemConfig = mod.ModHelper.Storage.Load<StarSystemConfig>(relativePath); var starSystemConfig = mod.ModHelper.Storage.Load<StarSystemConfig>(relativePath, false);
starSystemConfig.Migrate(); starSystemConfig.Migrate();
starSystemConfig.FixCoordinates(); starSystemConfig.FixCoordinates();
@ -656,7 +656,7 @@ namespace NewHorizons
{ {
Logger.LogVerbose($"Loading addon manifest for {mod.ModHelper.Manifest.Name}"); Logger.LogVerbose($"Loading addon manifest for {mod.ModHelper.Manifest.Name}");
var addonConfig = mod.ModHelper.Storage.Load<AddonConfig>(file); var addonConfig = mod.ModHelper.Storage.Load<AddonConfig>(file, false);
if (addonConfig.achievements != null) if (addonConfig.achievements != null)
{ {
@ -706,7 +706,7 @@ namespace NewHorizons
NewHorizonsBody body = null; NewHorizonsBody body = null;
try try
{ {
var config = mod.ModHelper.Storage.Load<PlanetConfig>(relativePath); var config = mod.ModHelper.Storage.Load<PlanetConfig>(relativePath, false);
if (config == null) if (config == null)
{ {
Logger.LogError($"Couldn't load {relativePath}. Is your Json formatted correctly?"); Logger.LogError($"Couldn't load {relativePath}. Is your Json formatted correctly?");
@ -719,7 +719,7 @@ namespace NewHorizons
if (!SystemDict.ContainsKey(config.starSystem)) if (!SystemDict.ContainsKey(config.starSystem))
{ {
// Since we didn't load it earlier there shouldn't be a star system config // Since we didn't load it earlier there shouldn't be a star system config
var starSystemConfig = mod.ModHelper.Storage.Load<StarSystemConfig>($"systems/{config.starSystem}.json"); var starSystemConfig = mod.ModHelper.Storage.Load<StarSystemConfig>(Path.Combine("systems", config.starSystem + ".json"), false);
if (starSystemConfig == null) starSystemConfig = new StarSystemConfig(); if (starSystemConfig == null) starSystemConfig = new StarSystemConfig();
else Logger.LogWarning($"Loaded system config for {config.starSystem}. Why wasn't this loaded earlier?"); else Logger.LogWarning($"Loaded system config for {config.starSystem}. Why wasn't this loaded earlier?");