mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
1.19.6 (#824)
## Bug fixes - Fix sun trying to destroy phantom shuttles - Fix cull group error spam
This commit is contained in:
commit
fad6070667
@ -1,6 +1,7 @@
|
|||||||
using NewHorizons.External.Modules;
|
using NewHorizons.External.Modules;
|
||||||
using NewHorizons.External.Modules.VariableSize;
|
using NewHorizons.External.Modules.VariableSize;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace NewHorizons.Builder.Atmosphere
|
namespace NewHorizons.Builder.Atmosphere
|
||||||
{
|
{
|
||||||
public static class SunOverrideBuilder
|
public static class SunOverrideBuilder
|
||||||
|
|||||||
@ -140,9 +140,6 @@ namespace NewHorizons.Builder.Props
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FixSectoredComponent(component, sector, existingSectors);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fix cull groups only when not from an asset bundle (because then they're there on purpose!)
|
// Fix cull groups only when not from an asset bundle (because then they're there on purpose!)
|
||||||
// keepLoaded should remove existing groups
|
// keepLoaded should remove existing groups
|
||||||
// renderers/colliders get enabled later so we dont have to do that here
|
// renderers/colliders get enabled later so we dont have to do that here
|
||||||
@ -152,6 +149,9 @@ namespace NewHorizons.Builder.Props
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FixSectoredComponent(component, sector, existingSectors);
|
||||||
|
}
|
||||||
|
|
||||||
// Asset bundle is a real string -> Object loaded from unity
|
// Asset bundle is a real string -> Object loaded from unity
|
||||||
// If they're adding dialogue we have to manually register the xml text
|
// If they're adding dialogue we have to manually register the xml text
|
||||||
if (isFromAssetBundle && component is CharacterDialogueTree dialogue)
|
if (isFromAssetBundle && component is CharacterDialogueTree dialogue)
|
||||||
|
|||||||
@ -26,5 +26,25 @@ namespace NewHorizons.Patches.VolumePatches
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// This method detects Nomai shuttles that are inactive
|
||||||
|
/// When active, it swaps the position of the NomaiShuttleController and the Rigidbody, so its not found as a child here and explodes continuously forever
|
||||||
|
/// Just ignore the shuttle if its inactive
|
||||||
|
/// </summary>
|
||||||
|
[HarmonyPrefix]
|
||||||
|
[HarmonyPatch(nameof(DestructionVolume.VanishNomaiShuttle))]
|
||||||
|
public static bool DestructionVolume_VanishNomaiShuttle(DestructionVolume __instance, OWRigidbody shuttleBody, RelativeLocationData entryLocation)
|
||||||
|
{
|
||||||
|
if (shuttleBody.GetComponentInChildren<NomaiShuttleController>() == null)
|
||||||
|
{
|
||||||
|
if (__instance._nomaiShuttleBody == shuttleBody)
|
||||||
|
{
|
||||||
|
__instance._nomaiShuttleBody = null;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
"author": "xen, Bwc9876, JohnCorby, MegaPiggy, Clay, Trifid, and friends",
|
"author": "xen, Bwc9876, JohnCorby, MegaPiggy, Clay, Trifid, and friends",
|
||||||
"name": "New Horizons",
|
"name": "New Horizons",
|
||||||
"uniqueName": "xen.NewHorizons",
|
"uniqueName": "xen.NewHorizons",
|
||||||
"version": "1.19.5",
|
"version": "1.19.6",
|
||||||
"owmlVersion": "2.10.3",
|
"owmlVersion": "2.10.3",
|
||||||
"dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
|
"dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
|
||||||
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],
|
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user