Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.18.5 #774

Merged
merged 3 commits into from
Feb 4, 2024
Merged

1.18.5 #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6921a0e
Whoops typo
xen-42 Feb 4, 2024
8882b70
Luna was having an NRE in the runwhen so skip it if we don't need it
xen-42 Feb 4, 2024
e1c23b2
Bump version
xen-42 Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NewHorizons/External/NewHorizonBody.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public bool RequiresDLC()
return Config.Cloak != null
|| Config.Props?.rafts != null
|| Config.Props?.slideShows != null
|| detailPaths.Any(x => x.StartsWith("Ringworld") || x.StartsWith("Dreamworld"));
|| detailPaths.Any(x => x.StartsWith("RingWorld_Body") || x.StartsWith("DreamWorld_Body"));
}

#region Cache
Expand Down
4 changes: 4 additions & 0 deletions NewHorizons/Patches/EyeScenePatches/SubmitActionLoadScenePatches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Autodesk.Fbx;
using HarmonyLib;
using NewHorizons.Utility.Files;
using NewHorizons.Utility.OWML;
Expand Down Expand Up @@ -26,6 +27,9 @@ public static bool SubmitActionLoadScene_ConfirmSubmit(SubmitActionLoadScene __i
Main.Instance.IsWarpingBackToEye = true;
__instance._sceneToLoad = SubmitActionLoadScene.LoadableScenes.GAME;
}

// Don't bother going through this stuff if we don't have to
if (AssetBundleUtilities.AreRequiredAssetsLoaded()) return true;

// modified from patched function
SubmitActionConfirm_ConfirmSubmit(__instance);
Expand Down
2 changes: 1 addition & 1 deletion NewHorizons/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "xen, Bwc9876, clay, MegaPiggy, John, Trifid, Hawkbar, Book",
"name": "New Horizons",
"uniqueName": "xen.NewHorizons",
"version": "1.18.4",
"version": "1.18.5",
"owmlVersion": "2.9.8",
"dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],
Expand Down
Loading