added rats as source of seeds. fixed default char error. brought WASD for directional attacks back

5 files changed, 16 insertions, 5 deletions

diff --git a/asciifarm/charmaps/default.json b/asciifarm/charmaps/default.json
index 4b0cdb3..39df13b 100644
--- a/asciifarm/charmaps/default.json
+++ b/asciifarm/charmaps/default.json
@@ -33,6 +33,7 @@
         "fence": ["#", 3],
         "armour": ["[", 7],
         "wound": [" ", 7, 1],
+        "rat": ["r", 7],
         " ": [" ", 7]
     },
     "default": ["?", 7],
diff --git a/asciifarm/charmaps/fullwidth.json b/asciifarm/charmaps/fullwidth.json
index 69370c3..66c35e7 100644
--- a/asciifarm/charmaps/fullwidth.json
+++ b/asciifarm/charmaps/fullwidth.json
@@ -33,6 +33,7 @@
         "fence": ["＃", 3],
         "armour": ["［", 7],
         "wound": ["  ", 7, 1],
+        "rat": ["ｒ",7],
         " ": ["  ", 7]
     },
     "default": ["？", 7],
diff --git a/asciifarm/client/display/display.py b/asciifarm/client/display/display.py
index d80703c..8cf7d32 100644
--- a/asciifarm/client/display/display.py
+++ b/asciifarm/client/display/display.py
@@ -26,15 +26,19 @@ class Display:
         else:
                 self.colours = None
         self.characters = {}
-        for name, sprite in charMap["mapping"].items():
+        
+        def parseSprite(sprite):
             if isinstance(sprite, str):
-                self.characters[name] = (sprite, None, None)
-                continue
+                return (sprite, None, None)
             char = get(sprite, 0, " ")
             fg = get(sprite, 1)
             bg = get(sprite, 2)
-            self.characters[name] = (char, fg, bg)
-        self.defaultChar = charMap.get("default", "?")
+            return (char, fg, bg)
+        for name, sprite in charMap["mapping"].items():
+            vals = parseSprite(sprite)
+            if vals:
+                self.characters[name] = vals
+        self.defaultChar = parseSprite(charMap.get("default", "?"))
         self.screen = Screen(self, stdscr, self.colours)
         
         self.widgets = {}
diff --git a/asciifarm/common/__init__.py b/asciifarm/common/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/asciifarm/common/__init__.py
diff --git a/asciifarm/keybindings/keybindings.hy b/asciifarm/keybindings/keybindings.hy
index 36f60ef..ee924a9 100644
--- a/asciifarm/keybindings/keybindings.hy
+++ b/asciifarm/keybindings/keybindings.hy
@@ -25,6 +25,11 @@ f (do [
     (inp ["attack" "south"])
     (inp ["attack" "east"])
     (inp ["attack" "west"])])
+F (inp ["attack"])
+W (inp ["attack" "north"])
+S (inp ["attack" "south"])
+D (inp ["attack" "east"])
+A (inp ["attack" "west"])
 t (self.parseMessage (self.display.getString))
 NEWLINE (self.parseMessage (self.display.getString))
 KEY_PPAGE (self.display.scrollBack 1)