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

Merge branch 'planetary-features' into bwc9876/custom-ship-log

Browse Source
This commit is contained in:
Ben C 2022-02-06 22:52:36 -05:00
commit e80ecf2b30
3 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
NewHorizons/AssetBundle/WarpDriveDialogue.xml
View File

@ -6,33 +6,7 @@
<EntryCondition>DEFAULT</EntryCondition> <EntryCondition>DEFAULT</EntryCondition>
<Dialogue> <Dialogue>
<Page>Your ship is now equiped with a warp drive! </Page> <Page>Your ship is now equiped with a warp drive! </Page>
</Dialogue>
<DialogueOptionsList>
<DialogueOption>
<Text>...</Text>
<DialogueTarget>1</DialogueTarget>
</DialogueOption>
</DialogueOptionsList>
</DialogueNode>
<DialogueNode>
<Name>1</Name>
<Dialogue>
<Page>You can use the new "Interstellar Mode" page in the ship log to lock-on your autopilot to another star system.</Page> <Page>You can use the new "Interstellar Mode" page in the ship log to lock-on your autopilot to another star system.</Page>
</Dialogue>
<DialogueOptionsList>
<DialogueOption>
<Text>...</Text>
<DialogueTarget>2</DialogueTarget>
</DialogueOption>
</DialogueOptionsList>
</DialogueNode>
<DialogueNode>
<Name>2</Name>
<Dialogue>
<Page>Then just buckle up and engage the autopilot to warp there!</Page> <Page>Then just buckle up and engage the autopilot to warp there!</Page>
</Dialogue> </Dialogue>
<SetPersistentCondition>KnowsAboutWarpDrive</SetPersistentCondition> <SetPersistentCondition>KnowsAboutWarpDrive</SetPersistentCondition>

10
NewHorizons/Builder/Body/WaterBuilder.cs
View File

@ -39,7 +39,8 @@ namespace NewHorizons.Builder.Body
tempArray[i] = new Material(GDSharedMaterials[i]); tempArray[i] = new Material(GDSharedMaterials[i]);
if (module.Tint != null) if (module.Tint != null)
{ {
tempArray[i].color = module.Tint.ToColor32(); tempArray[i].color = module.Tint.ToColor();
tempArray[i].SetColor("_FogColor", module.Tint.ToColor());
} }
} }
@ -80,6 +81,13 @@ namespace NewHorizons.Builder.Body
fogGO.name = "OceanFog"; fogGO.name = "OceanFog";
fogGO.transform.localPosition = Vector3.zero; fogGO.transform.localPosition = Vector3.zero;
fogGO.transform.localScale = Vector3.one; fogGO.transform.localScale = Vector3.one;
if(module.Tint != null)
{
var adjustedColour = module.Tint.ToColor() / 4f;
adjustedColour.a = 1f;
fogGO.GetComponent<MeshRenderer>().material.color = adjustedColour;
}
if (module.Curve != null) if (module.Curve != null)
{ {

3
NewHorizons/schema.json
View File

@ -680,9 +680,6 @@
"items": { "items": {
"type": "object", "type": "object",
"properties": { "properties": {
"count": {
"type": "integer"
},
"path": { "path": {
"type": "string", "type": "string",
"description": "Either the path in the scene hierarchy of the item to copy or the path to the object in the supplied asset bundle" "description": "Either the path in the scene hierarchy of the item to copy or the path to the object in the supplied asset bundle"