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

Fixed bad merge

Browse Source 
Also moved black hole building to shared generation
This commit is contained in:
Nick J. Connors 2022-01-03 11:53:57 -05:00
parent c7c5f67aae
commit ec8f7c3cbd
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
NewHorizons/Builder/Props/PropBuilder.cs
View File

@ -120,22 +120,6 @@ namespace NewHorizons.Builder.Props
prop.transform.parent = go.transform; prop.transform.parent = go.transform;
prop.transform.localPosition = position == null ? Vector3.zero : (Vector3)position; prop.transform.localPosition = position == null ? Vector3.zero : (Vector3)position;
Quaternion rot = rotation == null ? prefab.transform.rotation : Quaternion.Euler((Vector3)rotation);
prop.transform.rotation = rot;
if (alignWithNormal)
{
// TODO: Make this work or smthng
if (component is GhostIK) (component as GhostIK).enabled = false;
if(component is GhostEffects) (component as GhostEffects).enabled = false;
var enabledField = component.GetType().GetField("enabled");
if(enabledField != null && enabledField.FieldType == typeof(bool)) enabledField.SetValue(component, true);
}
prop.transform.parent = go.transform;
prop.transform.localPosition = position == null ? prefab.transform.localPosition : (Vector3)position;
Quaternion rot = rotation == null ? prefab.transform.rotation : Quaternion.Euler((Vector3)rotation); Quaternion rot = rotation == null ? prefab.transform.rotation : Quaternion.Euler((Vector3)rotation);
prop.transform.rotation = rot; prop.transform.rotation = rot;
if (alignWithNormal) if (alignWithNormal)

6
NewHorizons/Main.cs
View File

@ -321,9 +321,6 @@ namespace NewHorizons
if (body.Config.ProcGen != null) if (body.Config.ProcGen != null)
ProcGenBuilder.Make(go, body.Config.ProcGen); ProcGenBuilder.Make(go, body.Config.ProcGen);
if (body.Config.Base.BlackHoleSize != 0 || body.Config.Singularity != null)
SingularityBuilder.Make(go, sector, owRigidBody, body.Config);
if (body.Config.Star != null) StarLightController.AddStar(StarBuilder.Make(go, sector, body.Config.Star)); if (body.Config.Star != null) StarLightController.AddStar(StarBuilder.Make(go, sector, body.Config.Star));
if (body.Config.FocalPoint != null) if (body.Config.FocalPoint != null)
@ -403,6 +400,9 @@ namespace NewHorizons
if (body.Config.Signal != null) if (body.Config.Signal != null)
SignalBuilder.Make(go, sector, body.Config.Signal, body.Assets); SignalBuilder.Make(go, sector, body.Config.Signal, body.Assets);
if (body.Config.Base.BlackHoleSize != 0 || body.Config.Singularity != null)
SingularityBuilder.Make(go, sector, rb, body.Config);
return go; return go;
} }
} }

2
NewHorizons/manifest.json
View File

@ -3,6 +3,6 @@
"author": "xen", "author": "xen",
"name": "New Horizons", "name": "New Horizons",
"uniqueName": "xen.NewHorizons", "uniqueName": "xen.NewHorizons",
"version": "0.3.1", "version": "0.4.0",
"owmlVersion": "2.1.0" "owmlVersion": "2.1.0"
} }