From 56af1337af9c9cf27a4ca3ed4e3cb94bfcbdb9dc Mon Sep 17 00:00:00 2001
From: troido <troido@hotmail.com>
Date: Tue, 7 Nov 2017 19:07:34 +0100
Subject: improved combat system to include defense; made armour a thing

---
 asciifarm/charmaps/fullwidth.json     | 2 +-
 asciifarm/client/display/healthpad.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'asciifarm')

diff --git a/asciifarm/charmaps/fullwidth.json b/asciifarm/charmaps/fullwidth.json
index a9fa4c0..40b1912 100644
--- a/asciifarm/charmaps/fullwidth.json
+++ b/asciifarm/charmaps/fullwidth.json
@@ -1,6 +1,6 @@
 {
     "mapping":{
-        "tree": ["％",0,2],
+        "tree": ["Ｔ",0,2],
         "wall": ["＃",7,8],
         "rock": ["Ｘ",7,8],
         "stone": ["ｏ",7],
diff --git a/asciifarm/client/display/healthpad.py b/asciifarm/client/display/healthpad.py
index 3e0a09d..d4ee3f8 100644
--- a/asciifarm/client/display/healthpad.py
+++ b/asciifarm/client/display/healthpad.py
@@ -11,6 +11,8 @@ class HealthPad:
         self.changed = False
         self.lastView = None
         self.colours = colours
+        self.health = 0
+        self.maxHealth = 0
     
     def setHealth(self, health, maxHealth):
         self.pad.erase()
-- 
cgit