Fixed crest action icon being visible in H scenes inside clubroom; re…

…moved some debug logging
ManlyMarco · Feb 28, 2021 · 11b06c4 · 11b06c4
1 parent bc2ffb8
commit 11b06c4
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/KK_LewdCrestX/Hooks/ActionIconHooks.cs b/KK_LewdCrestX/Hooks/ActionIconHooks.cs
@@ -63,9 +63,6 @@ private static void SpawnCrestActionPoint()
             // position above the small table
             iconRootTransform.position = new Vector3(-3.1f, -0.4f, 1.85f);
 
-            if (iconRootObject.GetComponent<ObservableUpdateTrigger>())
-                Console.WriteLine("was spawned -=--------------");
-
             var evt = iconRootObject.AddComponent<TriggerEnterExitEvent>();
             var animator = iconRootObject.GetComponentInChildren<Animator>();
             var rendererIcon = iconRootObject.GetComponentInChildren<SpriteRenderer>();
@@ -90,8 +87,17 @@ private static void SpawnCrestActionPoint()
 
             var player = Singleton<Game>.Instance.actScene.Player;
             evt.UpdateAsObservable()
-                .Where(_ => playerInRange && ActionInput.isAction && !player.isActionNow)
-                .Subscribe(_ => ClubInterface.ShowWindow = true)
+                .Subscribe(_ =>
+                {
+                    // Hide in H scenes and other places
+                    var isVisible = Singleton<Game>.IsInstance() && !Singleton<Game>.Instance.IsRegulate(true);
+                    if (rendererIcon.enabled != isVisible)
+                        rendererIcon.enabled = isVisible;
+
+                    // Check if player clicked this point
+                    if (isVisible && playerInRange && ActionInput.isAction && !player.isActionNow)
+                        ClubInterface.ShowWindow = true;
+                })
                 .AddTo(evt);
             evt.OnGUIAsObservable()
                 .Subscribe(ClubInterface.OnGui)