Skip to content

Commit 8340851

Browse files
committed
Patch 14 hotfix
1 parent 0031d60 commit 8340851

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

CustomShipLogModes/CustomShipLogModes.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public void Setup(ShipLogController shipLogController)
7676
ICustomShipLogModesAPI api = (ICustomShipLogModesAPI)GetApi();
7777
api.ItemListMake(false, itemList =>
7878
{
79+
// TODO: The selection arrow isn't properly placed for some reason...
7980
_modeSelectorMode = itemList.gameObject.AddComponent<ModeSelectorMode>();
8081
_modeSelectorMode.itemList = new ItemListWrapper(api, itemList);
8182

@@ -94,7 +95,8 @@ private void InitializeMode(ShipLogMode mode)
9495
{
9596
bool canvasActive = _shipLogController._shipLogCanvas.gameObject.activeSelf;
9697
_shipLogController._shipLogCanvas.gameObject.SetActive(true); // I don't remember the point of this...
97-
mode.Initialize(_shipLogController._centerPromptList, _shipLogController._upperRightPromptList, _shipLogController._oneShotSource);
98+
// TODO: These prompts would probably be invisible because they are part of the Map Mode...
99+
mode.Initialize(_shipLogController._centerPromptList, _shipLogController._upperRightPromptListMap, _shipLogController._oneShotSource);
98100
_shipLogController._shipLogCanvas.gameObject.SetActive(canvasActive);
99101
}
100102

@@ -313,8 +315,11 @@ public void OnEnterShipComputer()
313315
{
314316
// TODO: Review no detective enabled, it always defaults to map mode instead of last mode, probably nobody cares
315317
PromptManager promptManager = Locator.GetPromptManager();
316-
promptManager.AddScreenPrompt(_modeSelectorPrompt, _shipLogController._upperRightPromptList, TextAnchor.MiddleRight);
317-
promptManager.AddScreenPrompt(_modeSwapPrompt, _shipLogController._upperRightPromptList, TextAnchor.MiddleRight);
318+
// TODO: Prompt list for each custom mode?
319+
promptManager.AddScreenPrompt(_modeSelectorPrompt, _shipLogController._upperRightPromptListMap, TextAnchor.MiddleRight);
320+
promptManager.AddScreenPrompt(_modeSelectorPrompt, _shipLogController._upperRightPromptListDetective, TextAnchor.MiddleRight);
321+
promptManager.AddScreenPrompt(_modeSwapPrompt, _shipLogController._upperRightPromptListMap, TextAnchor.MiddleRight);
322+
promptManager.AddScreenPrompt(_modeSwapPrompt, _shipLogController._upperRightPromptListDetective, TextAnchor.MiddleRight);
318323
foreach (ShipLogMode mode in GetCustomModes())
319324
{
320325
mode.OnEnterComputer();

CustomShipLogModes/CustomShipLogModes.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<PackageReference Include="OWML" Version="2.7.0" />
16-
<PackageReference Include="OuterWildsGameLibs" Version="1.1.13.393" />
16+
<PackageReference Include="OuterWildsGameLibs" Version="1.1.14.768" />
1717
<PackageReference Include="HarmonyX" Version="2.10.0" />
1818
</ItemGroup>
1919
<ItemGroup>

CustomShipLogModes/ShipLogItemList.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public static void CreatePrefab(ShipLogMapMode mapMode)
6060
itemList.photo.gameObject.SetActive(false);
6161
itemList.MarkHUDRootEnable(false);
6262

63-
// Init animations TODO: allow changing?
64-
itemList.mapModeAnimator.SetImmediate(0f, Vector3.one * 0.5f);
65-
itemList.entryMenuAnimator.SetImmediate(0f, new Vector3(1f, 0.01f, 1f));
63+
// Init animations TODO: THIS IS FAILING???
64+
//itemList.mapModeAnimator.SetImmediate(0f, Vector3.one * 0.5f);
65+
//itemList.entryMenuAnimator.SetImmediate(0f, new Vector3(1f, 0.01f, 1f));
6666

6767
itemList.nameField.text = ""; // NamePanelRoot/Name
6868

0 commit comments

Comments
 (0)