Make deepwater non-solid.

It's water, nothing solid about that. Also remove excessive walking-into-things penalty.
FLHerne · Jan 11, 2015 · e367211 · e367211
1 parent 04097de
commit e367211
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MGO/GEPlayer.py b/MGO/GEPlayer.py
@@ -78,8 +78,9 @@ def move(self, x, y):
         if abs(x) + abs(y) != 1:
             return False
         self.direction = (x, y)
-        if self.cellmap[coords.sum(self.position, (x, y))]['solid'] and not GEPlayer.FREEPLAYER:
-            self.score[collectables.CHOCOLATE] -= 50
+        if ((self.cellmap[coords.sum(self.position, (x, y))]['solid'] or
+             self.cellmap[coords.sum(self.position, (x, y))]['sogginess'] == 100) and
+            not GEPlayer.FREEPLAYER):
             return False
         self.position = coords.modsum(self.position, self.direction, self.cellmap.size)
         collectable = self.cellmap[self.position]['collectableitem']

diff --git a/map/terrain.csv b/map/terrain.csv
@@ -11,4 +11,4 @@
 127,  64,   0, True,  0.4, 0.1,   False, True,  False, 20,   0,     2,       planks,           # Planked floor
  64, 127, 127, True,  0,     1,   False, True,  False, 20,  60,    10,       marsh,            # Marsh
   0, 127, 255, False, 0,     1,   False, True,  False, 12,  95,    10,       water,            # Water
-  0,   0, 255, False, 0,     1,   False, True,  True,   8, 100,    40,       deepwater,        # Deep water
+  0,   0, 255, False, 0,     1,   False, True,  False,  8, 100,    40,       deepwater,        # Deep water