merged master changes from today into package branch

1 files changed, 21 insertions, 19 deletions

diff --git a/asciifarm/charmaps/default.json b/asciifarm/charmaps/default.json
index 433745d..0ed12a9 100644
--- a/asciifarm/charmaps/default.json
+++ b/asciifarm/charmaps/default.json
@@ -1,31 +1,33 @@
 {
     "mapping":{
         "tree": ["T", 2],
-        "wall": ["#", 135],
-        "rock": ["X", 8],
-        "stone": ["o", 8],
-        "pebble": ["*", 8],
+        "wall": ["#", 7, 8],
+        "rock": ["X", 7, 8],
+        "stone": ["o", 7],
+        "pebble": ["*", 7],
         "player": ["@", 15],
         "ground": [".", 3],
         "grass1": [",", 2],
         "grass2": ["'", 2],
         "grass3": ["`", 10],
-        "water": ["~", 70],
-        "rabbit": "r",
-        "floor": "+",
-        "portal": "$",
-        "stairdown": ">",
-        "stairup": "<",
-        "dummy": "d",
-        "spikes": "^",
-        "goblin": "g",
-        "seed": ":",
-        "plant": "Y",
-        "youngplant": "v",
-        "food": "8",
-        "troll": "T",
+        "water": ["~", 6, 4],
+        "rabbit": ["r", 15],
+        "floor": [".", 8],
+        "portal": ["$", 5],
+        "stairdown": [">",7],
+        "stairup": ["<",7],
+        "dummy": ["d", 3],
+        "spikes": ["^",7],
+        "goblin": ["g",2],
+        "seed": [":",10],
+        "plant": ["Y",10],
+        "youngplant": ["v",10],
+        "food": ["8",13],
+        "troll": ["T",1],
         " ": " "
     },
     "default": "?",
-    "charwidth": 1
+    "charwidth": 1,
+    "healthfull": ["#", 7, 2],
+    "healthempty": ["_", 7, 1]
 }