16 files changed, 202 insertions, 11 deletions

@@ -1557,6 +1557,16 @@
    <property name="solid" type="bool" value="true"/>
   </properties>
  </tile>
+ <tile id="439">
+  <properties>
+   <property name="medium" value="water"/>
+  </properties>
+ </tile>
+ <tile id="440">
+  <properties>
+   <property name="solid" type="bool" value="true"/>
+  </properties>
+ </tile>
  <tile id="441">
   <properties>
    <property name="solid" type="bool" value="true"/>
@@ -1572,6 +1582,21 @@
    <property name="solid" type="bool" value="true"/>
   </properties>
  </tile>
+ <tile id="444">
+  <properties>
+   <property name="medium" value="water"/>
+  </properties>
+ </tile>
+ <tile id="445">
+  <properties>
+   <property name="medium" value="water"/>
+  </properties>
+ </tile>
+ <tile id="446">
+  <properties>
+   <property name="medium" value="water"/>
+  </properties>
+ </tile>
  <tile id="447">
   <properties>
    <property name="solid" type="bool" value="true"/>
@@ -1587,6 +1612,11 @@
    <property name="solid" type="bool" value="true"/>
   </properties>
  </tile>
+ <tile id="450">
+  <properties>
+   <property name="medium" value="water"/>
+  </properties>
+ </tile>
  <tile id="451">
   <properties>
    <property name="solid" type="bool" value="true"/>
@@ -49,4 +49,20 @@ barking[up_right]: 5,37,45,37,45,37,45
 barking[right]: 6,38,46,38,46,38,46
 barking[down_right]: 7,39,47,39,47,39,47
 climb[up]%60: 240#5,241#4,242#8,243#2,244#2,245#2,246#2,247#2,248#2,249#2,250#2,251#3,252#3
-climb[down]%60: 253#5,254#4,255#8,256#2,257#2,258#2,259#2,260#2,261#2,262#2,263#2,264#3,265#3
\ No newline at end of file
+climb[down]%60: 253#5,254#4,255#8,256#2,257#2,258#2,259#2,260#2,261#2,262#2,263#2,264#3,265#3
+swim_still[down]: 366
+swim_still[down_left]: 367
+swim_still[left]: 368
+swim_still[up_left]: 369
+swim_still[up]: 370
+swim_still[up_right]: 371
+swim_still[right]: 372
+swim_still[down_right]: 373
+swim_walk[down]: 366
+swim_walk[down_left]: 367
+swim_walk[left]: 368
+swim_walk[up_left]: 369
+swim_walk[up]: 370
+swim_walk[up_right]: 371
+swim_walk[right]: 372
+swim_walk[down_right]: 373
\ No newline at end of file
@@ -1,6 +1,6 @@
 32,32 cell size
 10 frames per row
-366 frames
+374 frames
 
 16,24,8,24
 32,24,16,24
@@ -368,3 +368,11 @@
 16,24,8,21
 17,24,9,21
 17,24,8,21
+16,16,8,16
+16,16,9,16
+32,16,16,16
+32,16,16,16
+16,16,8,16
+32,16,16,16
+32,16,16,16
+16,16,7,16
@@ -41,4 +41,20 @@ run[up_right]: 77,85,93,101,109
 run[right]: 78,86,94,102,110
 run[down_right]: 79,87,95,103,111
 climb[up]%60: 200#10,201,202,208#10,207,206,203#10,204,205,208#10,207,206
-climb[down]%60: 200#10,201,202,208#10,207,206,203#10,204,205,208#10,207,206
\ No newline at end of file
+climb[down]%60: 200#10,201,202,208#10,207,206,203#10,204,205,208#10,207,206
+swim_still[down]: 331#57,339,331,339
+swim_still[down_left]: 332#57,332,340,332
+swim_still[left]: 333#57,341,333,341
+swim_still[up_left]: 334
+swim_still[up]: 335
+swim_still[up_right]: 336
+swim_still[right]: 337#57,345,337,345
+swim_still[down_right]: 338#57,346,338,346
+swim_walk[down]: 331
+swim_walk[down_left]: 332
+swim_walk[left]: 333
+swim_walk[up_left]: 334
+swim_walk[up]: 335
+swim_walk[up_right]: 336
+swim_walk[right]: 337
+swim_walk[down_right]: 338
\ No newline at end of file
@@ -1,6 +1,6 @@
 40,32 cell size
 10 frames per row
-331 frames
+347 frames
 
 32,32,16,32
 32,32,16,32
@@ -333,3 +333,19 @@
 32,32,16,32
 33,32,17,32
 33,32,16,32
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
+32,24,16,24
@@ -49,4 +49,20 @@ talk[up_right]: 37,45
 talk[right]: 38,46
 talk[down_right]: 39,47
 climb[up]%60: 257#10,258,259,265#10,264,263,260#10,261,262,265#10,264,263
-climb[down]%60: 257#10,258,259,265#10,264,263,260#10,261,262,265#10,264,263
\ No newline at end of file
+climb[down]%60: 257#10,258,259,265#10,264,263,260#10,261,262,265#10,264,263
+swim_still[down]: 274#80,282,274,282
+swim_still[down_left]: 275#80,283,275,283
+swim_still[left]: 276#80,284,276,284
+swim_still[up_left]: 277
+swim_still[up]: 278
+swim_still[up_right]: 279
+swim_still[right]: 280#80,288,280,288
+swim_still[down_right]: 281#80,289,281,289
+swim_walk[down]: 274
+swim_walk[down_left]: 275
+swim_walk[left]: 276
+swim_walk[up_left]: 277
+swim_walk[up]: 278
+swim_walk[up_right]: 279
+swim_walk[right]: 280
+swim_walk[down_right]: 281
\ No newline at end of file
@@ -1,6 +1,6 @@
 33,32 cell size
 10 frames per row
-274 frames
+290 frames
 
 32,32,16,32
 32,32,16,32
@@ -276,3 +276,19 @@
 32,32,16,32
 32,32,17,32
 32,32,15,32
+32,16,16,16
+32,16,16,16
+16,16,7,16
+16,16,7,16
+32,16,16,16
+16,16,9,16
+16,16,9,16
+32,16,16,16
+32,16,16,16
+32,16,16,16
+16,16,7,16
+16,16,7,16
+16,16,7,16
+16,16,7,16
+16,16,9,16
+32,16,16,16
@@ -43,4 +43,20 @@ run[down_right]: 74,82,90,98
 lightning_electrocute![down]: 116,117,118,116,117,118
 lightning_collapse![down]: 119,120,121,122
 climb[up]%60: 123#10,124,125,128#10,127,126,129#10,130,131,128#10,127,126
-climb[down]%60: 123#10,124,125,128#10,127,126,129#10,130,131,128#10,127,126
\ No newline at end of file
+climb[down]%60: 123#10,124,125,128#10,127,126,129#10,130,131,128#10,127,126
+swim_still[down]: 399#53,407,399,407
+swim_still[down_left]: 400#53,408,400,408
+swim_still[left]: 401#53,409,401,409
+swim_still[up_left]: 402
+swim_still[up]: 403
+swim_still[up_right]: 404
+swim_still[right]: 405#53,413,405,413
+swim_still[down_right]: 406#53,414,406,414
+swim_walk[down]: 399
+swim_walk[down_left]: 400
+swim_walk[left]: 401
+swim_walk[up_left]: 402
+swim_walk[up]: 403
+swim_walk[up_right]: 404
+swim_walk[right]: 405
+swim_walk[down_right]: 406
\ No newline at end of file
@@ -1,6 +1,6 @@
 32,64 cell size
 10 frames per row
-399 frames
+434 frames
 
 16,32,8,32
 16,32,8,32
@@ -401,3 +401,38 @@
 16,24,9,25
 16,24,9,24
 16,32,8,32
+16,16,8,15
+16,16,8,15
+16,16,8,15
+16,16,8,15
+16,16,9,15
+16,16,9,15
+16,16,9,15
+16,16,9,15
+16,16,8,15
+16,16,8,15
+16,16,8,15
+16,16,8,15
+16,16,8,15
+16,16,8,15
+16,16,9,15
+16,16,9,15
+32,32,15,23
+32,32,15,23
+32,32,15,23
+16,24,8,23
+16,16,8,15
+16,16,8,15
+16,16,8,15
+16,24,8,15
+16,24,8,15
+16,24,8,15
+16,24,8,15
+16,24,8,15
+16,24,8,15
+16,16,8,15
+32,24,16,23
+32,24,16,23
+32,32,16,23
+32,24,16,15
+32,24,16,15
@@ -75,7 +75,8 @@ void CharacterSystem::moveInDirection(int spriteId, Direction dir) {
   sprite.movementDir = dir;
 
   switch (sprite.characterMedium) {
-    case CharacterMedium::Normal: {
+    case CharacterMedium::Normal:
+    case CharacterMedium::Water: {
       game_.getSystem<AnimationSystem>().setSpriteDirection(spriteId, dir);
       break;
     }
@@ -171,6 +172,12 @@ void CharacterSystem::tick(double dt) {
             sprite.characterMedium = newMedium;
             setAnimationFor(spriteId, sprite.characterState);
             adjustPartyTrails(spriteId);
+
+            // Stop running if you go into water.
+            if (newMedium == CharacterMedium::Water &&
+                sprite.characterState == CharacterState::Running) {
+              stopRunning(spriteId);
+            }
           }
 
           if (sprite.characterState == CharacterState::Running) {
@@ -214,7 +221,8 @@ void CharacterSystem::beginCrouch(int spriteId) {
   if (sprite.characterState == CharacterState::Running) {
     stopRunning(spriteId);
   } else {
-    if (sprite.characterMedium == CharacterMedium::Ladder) {
+    if (sprite.characterMedium == CharacterMedium::Ladder ||
+        sprite.characterMedium == CharacterMedium::Water) {
       return;
     }
 
@@ -323,6 +331,17 @@ void CharacterSystem::setAnimationFor(int spriteId, CharacterState state) {
 
       break;
     }
+    case CharacterMedium::Water: {
+      std::string animName = "swim_still";
+      if (state == CharacterState::Walking) {
+        animName = "swim_walk";
+      }
+
+      game_.getSystem<AnimationSystem>().setSpriteAnimation(spriteId, animName);
+      sprite.hasShadow = false;
+
+      break;
+    }
   }
 }
 
@@ -47,6 +47,8 @@ Map::Map(std::string_view name) : name_(name) {
           } else if (property.getName() == "medium") {
             if (property.getStringValue() == "ladder") {
               tile.medium = CharacterMedium::Ladder;
+            } else if (property.getStringValue() == "water") {
+              tile.medium = CharacterMedium::Water;
             }
           }
         }
@@ -36,7 +36,8 @@ enum class CharacterState {
 
 enum class CharacterMedium {
   Normal,
-  Ladder
+  Ladder,
+  Water
 };
 
 struct Movement {