From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 21 Feb 2016 21:42:38 +0000 (+0100)
Subject: Server: Make default thing attributes configurable.
X-Git-Tag: tce~189
X-Git-Url: https://plomlompom.com/repos/?p=plomrogue;a=commitdiff_plain;h=599249e2b0b374b12e65fb92a9a6dc524afba40f

Server: Make default thing attributes configurable.
---

diff --git a/server/config/world_data.py b/server/config/world_data.py
index e8639c5..193da78 100644
--- a/server/config/world_data.py
+++ b/server/config/world_data.py
@@ -19,3 +19,16 @@ world_db = {
 """Mapping of direction names to internal direction chars."""
 directions_db = {"east": "d", "south-east": "c", "south-west": "x",
                  "west": "s", "north-west": "w", "north-east": "e"}
+
+thing_defaults = {
+        "T_ARGUMENT": 0,
+        "T_PROGRESS": 0,
+        "T_SATIATION": 0,
+        "T_COMMAND": 0,
+        "T_CARRIES": [],
+        "carried": False,
+        "T_MEMTHING": [],
+        "T_MEMMAP": False,
+        "T_MEMDEPTHMAP": False,
+        "fovmap": False
+}
diff --git a/server/world.py b/server/world.py
index 9bd9f6d..1280269 100644
--- a/server/world.py
+++ b/server/world.py
@@ -84,22 +84,14 @@ def build_fov_map(t):
 
 def new_Thing(type, pos=(0, 0)):
     """Return Thing of type T_TYPE, with fovmap if alive and world active."""
-    thing = {
-        "T_LIFEPOINTS": world_db["ThingTypes"][type]["TT_LIFEPOINTS"],
-        "T_ARGUMENT": 0,
-        "T_PROGRESS": 0,
-        "T_SATIATION": 0,
-        "T_COMMAND": 0,
-        "T_TYPE": type,
-        "T_POSY": pos[0],
-        "T_POSX": pos[1],
-        "T_CARRIES": [],
-        "carried": False,
-        "T_MEMTHING": [],
-        "T_MEMMAP": False,
-        "T_MEMDEPTHMAP": False,
-        "fovmap": False
-    }
+    from server.config.world_data import thing_defaults
+    thing = {}
+    for key in thing_defaults:
+        thing[key] = thing_defaults[key]
+    thing["T_LIFEPOINTS"] = world_db["ThingTypes"][type]["TT_LIFEPOINTS"]
+    thing["T_TYPE"] = type
+    thing["T_POSY"] = pos[0]
+    thing["T_POSX"] = pos[1]
     if world_db["WORLD_ACTIVE"] and thing["T_LIFEPOINTS"]:
         build_fov_map(thing)
     return thing