mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
Clean up tornado
This commit is contained in:
parent
363a20a978
commit
657203d9ba
@ -76,7 +76,7 @@ namespace NewHorizons.Builder.Props
|
||||
Logger.LogError($"Need either a position or an elevation for tornados");
|
||||
return;
|
||||
}
|
||||
info.type = "hurricane";
|
||||
|
||||
if (info.type.ToLower() == "hurricane") MakeHurricane(planetGO, sector, info, position, hasClouds);
|
||||
else MakeTornado(planetGO, sector, info, position, info.type.ToLower() == "downwards");
|
||||
}
|
||||
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user