Merge branch 'dev' of github.com:xen-42/outer-wilds-new-horizons into dev

This commit is contained in:
FreezeDriedMangoes 2022-07-15 09:34:52 -04:00
commit 8652f84221
2 changed files with 20 additions and 4 deletions

View File

@ -151,7 +151,9 @@ namespace NewHorizons.Components.SizeControllers
// Use the age if theres no resizing happening, else make it get redder the larger it is or wtv // Use the age if theres no resizing happening, else make it get redder the larger it is or wtv
var t = _age / (lifespan * 60f); var t = _age / (lifespan * 60f);
if (maxScale > 0) t = CurrentScale / maxScale; if (maxScale > 0) t = CurrentScale / maxScale;
if (t < 1f)
// Only go to 98% else if it reaches the endSurfaceMaterial it'll morb
if (t < 0.98f)
{ {
_currentColour = Color.Lerp(_startColour, _endColour, t); _currentColour = Color.Lerp(_startColour, _endColour, t);
supernova._surface._materials[0].Lerp(_startSurfaceMaterial, _endSurfaceMaterial, t); supernova._surface._materials[0].Lerp(_startSurfaceMaterial, _endSurfaceMaterial, t);
@ -268,9 +270,7 @@ namespace NewHorizons.Components.SizeControllers
{ {
lod.material.SetFloat("_InnerRadius", CurrentScale); lod.material.SetFloat("_InnerRadius", CurrentScale);
lod.material.SetFloat("_OuterRadius", CurrentScale * StarBuilder.OuterRadiusRatio); lod.material.SetFloat("_OuterRadius", CurrentScale * StarBuilder.OuterRadiusRatio);
lod.material.SetColor("_SkyColor", _currentColour);
// These break once it reaches endColour and I have no idea why
//lod.material.SetColor("_SkyColor", _currentColour);
} }
} }
} }

View File

@ -530,6 +530,14 @@
"description": "The internal radius (in meters) of the dimension. The default is 1705.", "description": "The internal radius (in meters) of the dimension. The default is 1705.",
"format": "float", "format": "float",
"default": 1705.0 "default": 1705.0
},
"allowedEntrances": {
"type": "array",
"description": "An array of integers from 0-5. By default, all entrances are allowed. To force this dimension to warp players in from only one point (like the anglerfish nest dimension in the base game) set this value to [3], [5], or similar. Values of 0-5 only.",
"items": {
"type": "integer",
"format": "int32"
}
} }
} }
}, },
@ -571,6 +579,14 @@
"lightTint": { "lightTint": {
"description": "The color of the shafts of light coming from the entrances to the node. Leave blank for the default yellowish color: (131, 124, 105, 255)", "description": "The color of the shafts of light coming from the entrances to the node. Leave blank for the default yellowish color: (131, 124, 105, 255)",
"$ref": "#/definitions/MColor" "$ref": "#/definitions/MColor"
},
"possibleExits": {
"type": "array",
"description": "An array of integers from 0-5. By default, all entrances are allowed. To force this node to warp players out from only one hole set this value to [3], [5], or similar. Values of 0-5 only.",
"items": {
"type": "integer",
"format": "int32"
}
} }
} }
}, },