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

Make VanishVolumes never use shapes

Browse Source
This commit is contained in:
xen-42 2025-04-25 11:48:48 -04:00
parent 96e32001ee
commit b20cda59e9
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NewHorizons/Builder/Props/BrambleNodeBuilder.cs
View File

@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using static NewHorizons.External.Modules.BrambleModule;
using static NewHorizons.External.Modules.SignalModule;
namespace NewHorizons.Builder.Props
{

12
NewHorizons/Builder/Volumes/VanishVolumeBuilder.cs
View File

@ -1,4 +1,5 @@
using NewHorizons.External.Modules.Volumes.VolumeInfos;
using NewHorizons.Utility.OWML;
using UnityEngine;
namespace NewHorizons.Builder.Volumes
@ -7,6 +8,17 @@ namespace NewHorizons.Builder.Volumes
{
public static TVolume Make<TVolume>(GameObject planetGO, Sector sector, VanishVolumeInfo info) where TVolume : VanishVolume
{
if (info.shape != null && (info.shape?.type != External.Modules.Props.ShapeType.Sphere || info.shape?.useShape == false))
{
NHLogger.LogError($"Destruction/VanishVolumes only support sphere colliders. Affects planet [{planetGO.name}]");
}
// VanishVolume is only compatible with sphere colliders
// If info.shape was null, it will still default to using info.radius, just make sure it does so with a collider
info.shape ??= new();
info.shape.useShape = false;
info.shape.type = External.Modules.Props.ShapeType.Sphere;
var volume = VolumeBuilder.Make<TVolume>(planetGO, sector, info);
var collider = volume.gameObject.GetComponent<SphereCollider>();

2
NewHorizons/Builder/Volumes/VolumeBuilder.cs
View File

@ -45,7 +45,7 @@ namespace NewHorizons.Builder.Volumes
return volume;
}
public static TVolume Make<TVolume>(GameObject planetGO, Sector sector, VolumeInfo info) where TVolume : MonoBehaviour //Could be BaseVolume but I need to create vanilla volumes too.
public static TVolume Make<TVolume>(GameObject planetGO, Sector sector, VolumeInfo info) where TVolume : MonoBehaviour // Could be BaseVolume but I need to create vanilla volumes too.
{
var go = GeneralPropBuilder.MakeNew(typeof(TVolume).Name, planetGO, sector, info);
return MakeExisting<TVolume>(go, planetGO, sector, info);

3
NewHorizons/External/Modules/Volumes/VolumeInfos/VanishVolumeInfo.cs vendored
View File

@ -4,6 +4,9 @@ using System.ComponentModel;
namespace NewHorizons.External.Modules.Volumes.VolumeInfos
{
/// <summary>
/// Note: Only sphere colliders work on vanish volumes!
/// </summary>
[JsonObject]
public class VanishVolumeInfo : VolumeInfo
{