Disabled crouching/running in the underwater map

6 files changed, 27 insertions, 2 deletions

@@ -315,3 +315,17 @@ function StopClipping()
   local playerSprite = getSprite(playerId)
   playerSprite.clipping = false
 end
+
+--- Turns off crouching (and thus running) for the player.
+function PreventCrouching()
+  local playerId = getPlayerSprite()
+  local playerSprite = getSprite(playerId)
+  playerSprite.cantCrouch = true
+end
+
+--- Undoes the effect of PreventCrouching().
+function AllowCrouching()
+  local playerId = getPlayerSprite()
+  local playerSprite = getSprite(playerId)
+  playerSprite.cantCrouch = false
+end
@@ -1,5 +1,9 @@
 underwater = {}
 
+function underwater.leave()
+  AllowCrouching()
+end
+
 function underwater.fish2()
   StartCutscene()
   DisplayMessage("* What are you complaining about?\nYou're so powerful now...\n\fYou owe it all to her.", "Fish", SpeakerType.BOY)
@@ -1,5 +1,9 @@
 underwater_start = {}
 
+function underwater_start.init()
+  PreventCrouching()
+end
+
 function underwater_start.talk_to_fish1()
   StartCutscene()
   DisplayMessage("* You deserved what she did to you.", "Fish", SpeakerType.BOY)
@@ -237,7 +237,8 @@ void CharacterSystem::beginCrouch(int spriteId) {
     stopRunning(spriteId);
   } else {
     if (sprite.characterMedium == CharacterMedium::Ladder ||
-        sprite.characterMedium == CharacterMedium::Water) {
+        sprite.characterMedium == CharacterMedium::Water ||
+        sprite.cantCrouch) {
       return;
     }
 
@@ -39,7 +39,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     },
     "persistent", &Sprite::persistent,
     "paused", &Sprite::paused,
-    "clipping", &Sprite::clipping);
+    "clipping", &Sprite::clipping,
+    "cantCrouch", &Sprite::cantCrouch);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -91,6 +91,7 @@ public:
   StepType stepType = StepType::none;
   int runningSfxChannel = -1;
   bool clipping = false;
+  bool cantCrouch = false; // Use this to prevent running
 
   // Input
   bool controllable = false;