undo arena gameover when reviving player

woutkolkman · Oct 15, 2023 · 1e682b8 · 1e682b8
1 parent 7b4426f
commit 1e682b8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/MouseDrag/Options.cs b/MouseDrag/Options.cs
@@ -69,7 +69,7 @@ public Options()
             killReleasesMask = config.Bind("killReleasesMask", defaultValue: true, new ConfigurableInfo("Killing elite scavengers or vultures with this tool will release their masks.", null, "", "Kill releases mask"));
 
             menuOpen = config.Bind("menuOpen", KeyCode.None, new ConfigurableInfo("KeyBind opens menu on object or background, as an alternative to right mouse button.", null, "", "Open menu"));
-            throwWeapon = config.Bind(nameof(throwWeapon), KeyCode.None, new ConfigurableInfo("KeyBind to throw the weapon which you're currently dragging. Aim is still determined by drag direction.", null, "", "Throw weapon"));
+            throwWeapon = config.Bind(nameof(throwWeapon), KeyCode.None, new ConfigurableInfo("KeyBind to throw the weapon which you're currently dragging. Aim is still determined by drag direction. Sandbox mouse might interfere.", null, "", "Throw weapon"));
             pauseOneKey = config.Bind("pauseOneKey", KeyCode.None, new ConfigurableInfo("KeyBind to pause/unpause the object/creature which you're currently dragging.", null, "", "Pause"));
             pauseRoomCreaturesKey = config.Bind("pauseRoomCreaturesKey", KeyCode.None, new ConfigurableInfo("KeyBind to pause all creatures except Player and SlugNPC, only currently in this room.\nAllows unpausing individual creatures.", null, "", "Pause creatures\nin room"));
             unpauseAllKey = config.Bind("unpauseAllKey", KeyCode.None, new ConfigurableInfo("KeyBind to unpause all objects/creatures, including individually paused creatures.", null, "", "Unpause all"));

diff --git a/MouseDrag/Tools/Health.cs b/MouseDrag/Tools/Health.cs
@@ -65,11 +65,24 @@ public static void ReviveCreature(PhysicalObject obj)
 
             if (obj is Player) {
                 //try to exit game over mode
-                if (Options.exitGameOverMode?.Value != false &&
-                    !(obj as Player).isNPC &&
-                    obj?.room?.game?.cameras?.Length > 0 &&
-                    obj.room.game.cameras[0]?.hud?.textPrompt != null)
-                    obj.room.game.cameras[0].hud.textPrompt.gameOverMode = false;
+                if (Options.exitGameOverMode?.Value != false && !(obj as Player).isNPC) {
+                    //campaign
+                    if (obj.room?.game?.cameras?.Length > 0 &&
+                        obj.room.game.cameras[0]?.hud?.textPrompt != null)
+                        obj.room.game.cameras[0].hud.textPrompt.gameOverMode = false;
+
+                    //sandbox & challenges
+                    if (obj.room?.game?.arenaOverlay != null) {
+                        obj.room.game.arenaOverlay.ShutDownProcess();
+                        obj.room.game.manager?.sideProcesses?.Remove(obj.room.game.arenaOverlay);
+                        obj.room.game.arenaOverlay = null;
+                        if (obj.room.game.session is ArenaGameSession)
+                            (obj.room.game.session as ArenaGameSession).sessionEnded = false;
+                            (obj.room.game.session as ArenaGameSession).challengeCompleted = false;
+                            (obj.room.game.session as ArenaGameSession).endSessionCounter = -1;
+                        }
+                    }
+                }
 
                 (obj as Player).exhausted = false;
                 (obj as Player).lungsExhausted = false;

diff --git a/MouseDrag/bin/mousedrag/plugins/MouseDrag.dll b/MouseDrag/bin/mousedrag/plugins/MouseDrag.dll