From a2efbcc91190a79fb49489738cbf419a1b2395ee Mon Sep 17 00:00:00 2001
From: troido <troido@hotmail.com>
Date: Tue, 7 Nov 2017 10:53:00 +0100
Subject: changed water colours and set default to 7,0

---
 asciifarm/charmaps/default.json     |  2 +-
 asciifarm/charmaps/fullwidth.json   | 11 ++++++++---
 asciifarm/client/display/colours.py |  9 ++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/asciifarm/charmaps/default.json b/asciifarm/charmaps/default.json
index eaf1384..a7534ea 100644
--- a/asciifarm/charmaps/default.json
+++ b/asciifarm/charmaps/default.json
@@ -10,7 +10,7 @@
         "grass1": [",", 2],
         "grass2": ["'", 2],
         "grass3": ["`", 10],
-        "water": ["~", 6, 4],
+        "water": ["~", 4, 4],
         "rabbit": ["r", 15],
         "floor": [".", 8],
         "portal": ["$", 5],
diff --git a/asciifarm/charmaps/fullwidth.json b/asciifarm/charmaps/fullwidth.json
index c1e80f8..a9fa4c0 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],
@@ -11,7 +11,7 @@
         "grass2": ["＇",2],
         "grass3": ["｀",10],
         "rabbit": ["ｒ",15],
-        "water": ["～",6,4],
+        "water": ["～",4,4],
         "floor": ["．",8],
         "portal": ["＄", 5],
         "stairdown": ["＞",7],
@@ -31,5 +31,10 @@
     "default": "？",
     "charwidth": 2,
     "healthfull": ["#", 7, 2],
-    "healthemtpy": ["_", 7, 1]
+    "healthemtpy": ["_", 7, 1],
+    "comment: allcharacters": [
+        "！＂＃＄％＆＇（）＊＋，－．／０１２３４５６７８９：；＜＝＞？",
+        "＠ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ［＼］＾＿",
+        "｀ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ｛｜｝～"
+    ]
 }
diff --git a/asciifarm/client/display/colours.py b/asciifarm/client/display/colours.py
index cef2675..22e6f14 100644
--- a/asciifarm/client/display/colours.py
+++ b/asciifarm/client/display/colours.py
@@ -13,6 +13,9 @@ class Colours:
             curses.init_pair(i, i%self.colours, i//self.colours)
     
     def get(self, fg=0, bg=0):
-        fg %= self.colours
-        bg %= self.colours
-        return curses.color_pair(fg + bg*self.colours)
+        dfg = fg % self.colours
+        dbg = bg % self.colours
+        if (dfg, dbg) == (0, 0) and (fg, bg) != (0, 0):
+            # avoid unintended use of (0,0), which is settings dependent
+            dfg, dbg = 7, 0
+        return curses.color_pair(dfg + dbg*self.colours)
-- 
cgit