diff options
| -rw-r--r-- | asciifarm/charmaps/halfwidth.json (renamed from asciifarm/charmaps/default.json) | 0 | ||||
| -rw-r--r-- | asciifarm/client/display/health.py | 6 | ||||
| -rw-r--r-- | asciifarm/client/loaders.py | 8 | ||||
| -rw-r--r-- | asciifarm/client/paths.py | 2 | ||||
| -rw-r--r-- | asciifarm/keybindings/default.json (renamed from asciifarm/keybindings/keybindings.json) | 0 |
5 files changed, 9 insertions, 7 deletions
diff --git a/asciifarm/charmaps/default.json b/asciifarm/charmaps/halfwidth.json index 2952ab0..2952ab0 100644 --- a/asciifarm/charmaps/default.json +++ b/asciifarm/charmaps/halfwidth.json diff --git a/asciifarm/client/display/health.py b/asciifarm/client/display/health.py index 3f149ea..a8d0823 100644 --- a/asciifarm/client/display/health.py +++ b/asciifarm/client/display/health.py @@ -4,9 +4,9 @@ from .widimp import WidImp class Health(WidImp): - def __init__(self, char=('@',7,0), emptyChar=('-',7,0), colours=False): - self.char = char - self.emptyChar = emptyChar + def __init__(self, char=None, emptyChar=None, colours=False): + self.char = char or ('@',7,0) + self.emptyChar = emptyChar or ('-',7,0) self.changed = False self.colours = colours self.health = 0 diff --git a/asciifarm/client/loaders.py b/asciifarm/client/loaders.py index 8330e0e..fef4769 100644 --- a/asciifarm/client/loaders.py +++ b/asciifarm/client/loaders.py @@ -6,7 +6,7 @@ import json standardKeyFiles = { - "default": os.path.join(keybindingsPath, "keybindings.json"), + "default": os.path.join(keybindingsPath, "default.json"), "azerty": os.path.join(keybindingsPath, "azerty.json") } @@ -32,8 +32,10 @@ def loadKeybindings(name): standardCharFiles = {name: os.path.join(charmapPath, file) for name, file in { - "default": "default.json", - "fullwith": "fullwidth.json", + "default": "halfwidth.json", + "halfwidth": "halfwidth.json", + "hw": "halfwidth.json", + "fullwidth": "fullwidth.json", "fw": "fullwidth.json", "emoji": "emoji.json" }.items()} diff --git a/asciifarm/client/paths.py b/asciifarm/client/paths.py index 3042f92..407d54c 100644 --- a/asciifarm/client/paths.py +++ b/asciifarm/client/paths.py @@ -2,6 +2,6 @@ import os.path clientPath = os.path.dirname(__file__) -farmsPath = os.path.join(clientPath, "..") +farmsPath = os.path.normpath(os.path.join(clientPath, "..")) charmapPath = os.path.join(farmsPath, "charmaps") keybindingsPath = os.path.join(farmsPath, "keybindings") diff --git a/asciifarm/keybindings/keybindings.json b/asciifarm/keybindings/default.json index a816527..a816527 100644 --- a/asciifarm/keybindings/keybindings.json +++ b/asciifarm/keybindings/default.json |