merged master changes from today into package branch

1 files changed, 27 insertions, 25 deletions

diff --git a/asciifarm/charmaps/fullwidth.json b/asciifarm/charmaps/fullwidth.json
index dc1cec8..bd1590e 100644
--- a/asciifarm/charmaps/fullwidth.json
+++ b/asciifarm/charmaps/fullwidth.json
@@ -1,31 +1,33 @@
 {
     "mapping":{
-        "tree": "Ｔ",
-        "wall": "＃",
-        "rock": "Ｘ",
-        "stone": "ｏ",
-        "pebble": "＊",
-        "player": "＠",
-        "ground": "．",
-        "grass1": "，",
-        "grass2": "＇",
-        "grass3": "｀",
-        "rabbit": "ｒ",
-        "water": "～",
-        "floor": "＋",
-        "portal": "＄",
-        "stairdown": "＞",
-        "stairup": "＜",
-        "dummy": "ｄ",
-        "spikes": "＾",
-        "goblin": "ｇ",
-        "seed": "：",
-        "plant": "Ｙ",
-        "youngplant": "ｖ",
-        "food": "８",
-        "troll": "Ｔ",
+        "tree": ["Ｔ",2],
+        "wall": ["＃",7,8],
+        "rock": ["Ｘ",7,8],
+        "stone": ["ｏ",7],
+        "pebble": ["＊",7],
+        "player": ["＠",15],
+        "ground": ["．",3],
+        "grass1": ["，",2],
+        "grass2": ["＇",2],
+        "grass3": ["｀",10],
+        "rabbit": ["ｒ",15],
+        "water": ["～",6,4],
+        "floor": ["．",8],
+        "portal": ["＄", 5],
+        "stairdown": ["＞",7],
+        "stairup": ["＜",7],
+        "dummy": ["ｄ",3],
+        "spikes": ["＾",7],
+        "goblin": ["ｇ",2],
+        "seed": ["：",10],
+        "plant": ["Ｙ",10],
+        "youngplant": ["ｖ",10],
+        "food": ["８",13],
+        "troll": ["Ｔ",1],
         " ": "  "
     },
     "default": "？",
-    "charwidth": 2
+    "charwidth": 2,
+    "healthfull": ["#", 7, 2],
+    "healthemtpy": ["_", 7, 1]
 }