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

Clean up tornado

Browse Source
This commit is contained in:
Nick 2022-05-22 12:30:10 -04:00
parent 363a20a978
commit 657203d9ba
2 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/Builder/Props/TornadoBuilder.cs
View File

@ -76,7 +76,7 @@ namespace NewHorizons.Builder.Props
Logger.LogError($"Need either a position or an elevation for tornados"); Logger.LogError($"Need either a position or an elevation for tornados");
return; return;
} }
info.type = "hurricane";
if (info.type.ToLower() == "hurricane") MakeHurricane(planetGO, sector, info, position, hasClouds); if (info.type.ToLower() == "hurricane") MakeHurricane(planetGO, sector, info, position, hasClouds);
else MakeTornado(planetGO, sector, info, position, info.type.ToLower() == "downwards"); else MakeTornado(planetGO, sector, info, position, info.type.ToLower() == "downwards");
} }

61
NewHorizons/Components/TornadoFix.cs
View File

@ -1,61 +0,0 @@
namespace NewHorizons.Components
{
public class TornadoFix : SectoredMonoBehaviour
{
public TornadoController tornadoController;
public new void Awake()
{
base.Awake();
tornadoController = GetComponent<TornadoController>();
tornadoController._tornadoRoot.SetActive(false);
tornadoController._formationDuration = 1f;
tornadoController._collapseDuration = 1f;
if (_sector != null)
{
_sector.OnOccupantEnterSector += OnOccupantEnterSector;
_sector.OnOccupantExitSector += OnOccupantExitSector;
}
}
public new void SetSector(Sector sector)
{
if (_sector != null)
{
_sector.OnOccupantEnterSector -= OnOccupantEnterSector;
_sector.OnOccupantExitSector -= OnOccupantExitSector;
}
base.SetSector(sector);
_sector.OnOccupantEnterSector += OnOccupantEnterSector;
_sector.OnOccupantExitSector += OnOccupantExitSector;
}
public new void OnDestroy()
{
base.OnDestroy();
_sector.OnOccupantEnterSector -= OnOccupantEnterSector;
_sector.OnOccupantExitSector -= OnOccupantExitSector;
}
public void OnOccupantEnterSector(SectorDetector _)
{
// Only form if not active and not forming
if (tornadoController._tornadoRoot.activeInHierarchy || tornadoController._tornadoForming) return;
tornadoController.StartFormation();
}
public void OnOccupantExitSector(SectorDetector _)
{
if (_sector.ContainsAnyOccupants(DynamicOccupant.Player | DynamicOccupant.Probe | DynamicOccupant.Ship)) return;
// If the root is inactive it has collapsed. Also don't collapse if we're already doing it
if (!tornadoController._tornadoRoot.activeInHierarchy || tornadoController._tornadoCollapsing) return;
tornadoController.StartCollapse();
}
}
}