From 6b7563b7fdef7e9be9c25227e9196e5afcb5b20d Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Fri, 25 Nov 2022 16:12:22 -0500 Subject: [PATCH] Set revealFor on achievement volume --- NewHorizons/Builder/ShipLog/RevealBuilder.cs | 16 ++++++++++++++++ .../Components/Achievement/AchievementVolume.cs | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/NewHorizons/Builder/ShipLog/RevealBuilder.cs b/NewHorizons/Builder/ShipLog/RevealBuilder.cs index f2d122c1..559684b7 100644 --- a/NewHorizons/Builder/ShipLog/RevealBuilder.cs +++ b/NewHorizons/Builder/ShipLog/RevealBuilder.cs @@ -99,6 +99,22 @@ namespace NewHorizons.Builder.ShipLog { var achievementVolume = go.AddComponent(); achievementVolume.achievementID = info.achievementID; + switch (info.revealFor) + { + case VolumesModule.RevealVolumeInfo.EnterType.Player: + achievementVolume.player = true; + achievementVolume.probe = false; + break; + case VolumesModule.RevealVolumeInfo.EnterType.Probe: + achievementVolume.player = false; + achievementVolume.probe = true; + break; + case VolumesModule.RevealVolumeInfo.EnterType.Both: + default: + achievementVolume.player = true; + achievementVolume.probe = true; + break; + } } } diff --git a/NewHorizons/Components/Achievement/AchievementVolume.cs b/NewHorizons/Components/Achievement/AchievementVolume.cs index a5f39b15..9e40974f 100644 --- a/NewHorizons/Components/Achievement/AchievementVolume.cs +++ b/NewHorizons/Components/Achievement/AchievementVolume.cs @@ -18,7 +18,7 @@ namespace NewHorizons.Components.Achievement private void OnEntry(GameObject hitObj) { - if ((!player || hitObj.CompareTag("PlayerDetector")) && (!probe || hitObj.CompareTag("ProbeDetector"))) + if ((player && hitObj.CompareTag("PlayerDetector")) || (probe && hitObj.CompareTag("ProbeDetector"))) { AchievementHandler.Earn(achievementID);