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

Implement #389 playWithShipLogFacts, fix #392 (#418)

Browse Source 
## Major features
- Added `playWithShipLogFacts ` to `slideShows` to make reels play in
ship log computer.. #389

## Bug fixes
- Fix NRE errors caused by visions (`visionTorchTarget` and
`standingVisionTorch`) initialization. #392
- Fix reels (`slideReel`) showing up in Echoes of the Eye entries
replacing the vanilla reel:

![reel](https://user-images.githubusercontent.com/22490080/194959455-9a1d02d7-a5d3-41d8-8d3f-f9c15f92b9ea.jpg)
This commit is contained in:
Will Corby 2022-10-10 17:27:04 -07:00 committed by GitHub
commit b3c7d30f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NewHorizons/Builder/Props/ProjectionBuilder.cs
View File

@ -130,8 +130,7 @@ namespace NewHorizons.Builder.Props
slideCollectionContainer.slideCollection = slideCollection;
// Idk why but it wants reveals to be comma delimited not a list
if (info.reveals != null) slideCollectionContainer._shipLogOnComplete = string.Join(",", info.reveals);
LinkShipLogFacts(info, slideCollectionContainer);
StreamingHandler.SetUpStreaming(slideReelObj, sector);
@ -245,8 +244,7 @@ namespace NewHorizons.Builder.Props
target.slideCollection = g.AddComponent<MindSlideCollection>();
target.slideCollection._slideCollectionContainer = slideCollectionContainer;
// Idk why but it wants reveals to be comma delimited not a list
if (info.reveals != null) slideCollectionContainer._shipLogOnComplete = string.Join(",", info.reveals);
LinkShipLogFacts(info, slideCollectionContainer);
return g;
}
@ -323,13 +321,10 @@ namespace NewHorizons.Builder.Props
var mindSlideCollection = standingTorch.AddComponent<MindSlideCollection>();
mindSlideCollection._slideCollectionContainer = slideCollectionContainer;
// Make sure that these slides play when the player wanders into the beam
LinkShipLogFacts(info, slideCollectionContainer);
mindSlideProjector.SetMindSlideCollection(mindSlideCollection);
// Idk why but it wants reveals to be comma delimited not a list
if (info.reveals != null) slideCollectionContainer._shipLogOnComplete = string.Join(",", info.reveals);
return standingTorch;
}
@ -405,6 +400,14 @@ namespace NewHorizons.Builder.Props
Slide.WriteModules(modules, ref slide._modulesList, ref slide._modulesData, ref slide.lengths);
}
private static void LinkShipLogFacts(ProjectionInfo info, SlideCollectionContainer slideCollectionContainer)
{
// Idk why but it wants reveals to be comma delimited not a list
if (info.reveals != null) slideCollectionContainer._shipLogOnComplete = string.Join(",", info.reveals);
// Don't use null value, NRE in SlideCollectionContainer.Initialize
slideCollectionContainer._playWithShipLogFacts = info.playWithShipLogFacts ?? Array.Empty<string>();
}
}
public class VisionTorchTarget : MonoBehaviour

12
NewHorizons/External/Modules/PropModule.cs vendored
View File

@ -617,10 +617,18 @@ namespace NewHorizons.External.Modules
public MVector3 position;
/// <summary>
/// The ship log entries revealed after finishing this slide reel.
/// The ship log facts revealed after finishing this slide reel.
/// </summary>
public string[] reveals;
/// <summary>
/// The ship log facts that make the reel play when they are displayed in the computer (by selecting entries or arrows).
/// You should probably include facts from `reveals` here.
/// If you only specify a rumor fact, then it would only play in its ship log entry if this has revealed only
/// rumor facts because an entry with revealed explore facts doesn't display rumor facts.
/// </summary>
public string[] playWithShipLogFacts;
/// <summary>
/// The rotation of this slideshow.
/// </summary>
@ -712,7 +720,7 @@ namespace NewHorizons.External.Modules
// SlideShipLogEntryModule
/// <summary>
/// Ship log entry revealed when viewing this slide
/// Ship log fact revealed when viewing this slide
/// </summary>
public string reveal;

11
NewHorizons/Schemas/body_schema.json
View File

@ -1425,7 +1425,14 @@
},
"reveals": {
"type": "array",
"description": "The ship log entries revealed after finishing this slide reel.",
"description": "The ship log facts revealed after finishing this slide reel.",
"items": {
"type": "string"
}
},
"playWithShipLogFacts": {
"type": "array",
"description": "The ship log facts that make the reel play when they are displayed in the computer (by selecting entries or arrows).\nYou should probably include facts from `reveals` here.\nIf you only specify a rumor fact, then it would only play in its ship log entry if this has revealed only\nrumor facts because an entry with revealed explore facts doesn't display rumor facts.",
"items": {
"type": "string"
}
@ -1504,7 +1511,7 @@
},
"reveal": {
"type": "string",
"description": "Ship log entry revealed when viewing this slide"
"description": "Ship log fact revealed when viewing this slide"
},
"spotIntensityMod": {
"type": "number",