7DRL: Add falling trees turning to lumber / WOOD.

diff --git a/SERVER_COMMANDS b/SERVER_COMMANDS
index 3ae0b2041c60bc99924824ce1e155d9013445716..aa147c01128e4570a196de6d3503e1b88630eef7 100644 (file)
--- a/SERVER_COMMANDS
+++ b/SERVER_COMMANDS
@@ -249,4 +249,7 @@ FAVOR_STAGE [0 to 65535]
 
 PLANT_0 [0 to infinity]
 
+LUMBER [0 to infinity]
+
 TT_TOOLS gain the "axe" argument.
+

diff --git a/confserver/world b/confserver/world
index e6c85acfa5c1949f50f8f138b43341dc4bb93ecb..9aa0d5700e62729b960b44f140de4b7b4bc53faf 100644 (file)
--- a/confserver/world
+++ b/confserver/world
@@ -99,6 +99,11 @@ TT_NAME AXE
 TT_TOOLPOWER 5000
 TT_START_NUMBER 1
 
+TT_ID 10
+TT_START_NUMBER 0
+TT_SYMBOL =
+TT_NAME WOOD
+
 TT_ID 0
 TT_CORPSE_ID 6
 TT_ID 1
@@ -123,3 +128,4 @@ TT_CORPSE_ID 4
 FAVOR_STAGE 0
 SLIPPERS 1
 PLANT_0 8
+LUMBER 10

diff --git a/roguelike-server b/roguelike-server
index 305c8aa7dbdbbbaf93af77fcf8ea1a09504c49e2..98bee7c6b8c431fd98d40a705ff7450e80027528 100755 (executable)
--- a/roguelike-server
+++ b/roguelike-server
@@ -769,6 +769,7 @@ def actor_move(t):
                 type = world_db["Things"][id]["T_TYPE"]  # #
                 if world_db["ThingTypes"][type]["TT_TOOL"] == "axe":  # #
                     carries_axe = True  # #
+                    break  # #
             if carries_axe:  # #
                 axe_name = world_db["ThingTypes"][type]["TT_NAME"]  # #
                 if t == world_db["Things"][0]:  # #
@@ -783,6 +784,10 @@ def actor_move(t):
                                      "LOG You chop the tree down.\n")  # #
                     add_gods_favor(-10)  # #
                     world_db["MAP"][pos] = ord(".")   # #
+                    id = id_setter(-1, "Things")  # #
+                    world_db["Things"][id] = new_Thing(world_db["LUMBER"],  # #
+                                                       (move_result[1],  # #
+                                                        move_result[2]))  # # 
                     build_fov_map(t)  # #
                 return   # #
         passable = ("." == chr(world_db["MAP"][pos]) or
@@ -1460,6 +1465,9 @@ def command_makeworld(seed_string):
     if not world_db["PLANT_0"] in world_db["ThingTypes"]:  # #
         print("Ignoring: No valid PLANT_0 set.")  # #
         return  # #
+    if not world_db["LUMBER"] in world_db["ThingTypes"]:  # #
+        print("Ignoring: No valid LUMBER set.")  # #
+        return  # #
     world_db["Things"] = {}
     make_map()
     world_db["WORLD_ACTIVE"] = 1
@@ -1500,8 +1508,8 @@ def command_worldactive(worldactive_string):
     map. On activation, rebuild all Things' FOVs, and the player's map memory.
     Also call log_help().
     """
-    # 7DRL: altar must be on map, and (valid) SLIPPERS and PLANT_0must be set
-    # for world activation.
+    # 7DRL: altar must be on map, and (valid) SLIPPERS and PLANT_0 and LUMBER
+    # must be set for world activation.
     val = integer_test(worldactive_string, 0, 1)
     if None != val:
         if 0 != world_db["WORLD_ACTIVE"]:
@@ -1522,6 +1530,7 @@ def command_worldactive(worldactive_string):
                     break
             valid_slippers = world_db["SLIPPERS"] in world_db["ThingTypes"]  # #
             valid_plant0 = world_db["PLANT_0"] in world_db["ThingTypes"]  # #
+            valid_lumber = world_db["PLANT_0"] in world_db["ThingTypes"]  # #
             altar_found = False  # #
             if world_db["MAP"]:  # #
                 pos = world_db["MAP"].find(b'_')  # #
@@ -1530,8 +1539,9 @@ def command_worldactive(worldactive_string):
                     x = pos % world_db["MAP_LENGTH"]  # #
                     world_db["altar"] = (y, x)  # #
                     altar_found = True  # #
-            if wait_exists and player_exists and world_db["MAP"] \
-                and altar_found and valid_slippers and valid_plant0:  # #
+            if (wait_exists and player_exists and world_db["MAP"]
+                and altar_found and valid_slippers and valid_plant0  # #
+                and valid_lumber):  # #
                 for id in world_db["Things"]:
                     if world_db["Things"][id]["T_LIFEPOINTS"]:
                         build_fov_map(world_db["Things"][id])
@@ -1568,6 +1578,17 @@ def command_plant0(str_int):  # #
             print("PLANT_0 matches no known ThingTypes, deactivating world.")
 
 
+def command_lumber(str_int):  # #
+    """Set LUMBER, but deactivate world if not in ThingTypes."""
+    val = integer_test(str_int, 0)
+    if None != val:
+        world_db["LUMBER"] = val
+        if world_db["WORLD_ACTIVE"] and \
+           world_db["LUMBER"] not in world_db["ThingTypes"]:
+            world_db["WORLD_ACTIVE"] = 0
+            print("LUMBER matches no known ThingTypes, deactivating world.")
+
+
 def test_for_id_maker(object, category):
     """Return decorator testing for object having "id" attribute."""
     def decorator(f):
@@ -1850,6 +1871,7 @@ commands_db = {
     "FAVOR_STAGE": (1, False, setter(None, "FAVOR_STAGE", 0, 65535)),  # #
     "SLIPPERS": (1, False, command_slippers),  # #
     "PLANT_0": (1, False, command_plant0),  # #
+    "LUMBER": (1, False, command_lumber),  # #
     "TA_ID": (1, False, command_taid),
     "TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
     "TA_NAME": (1, False, command_taname),
@@ -1901,6 +1923,7 @@ world_db = {
     "FAVOR_STAGE": 0,  # #
     "SLIPPERS": 0,  # #
     "PLANT_0": 0,  # #
+    "LUMBER": 0,  # #
     "ThingActions": {},
     "ThingTypes": {},
     "Things": {}

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index d0b66a97bf89afc91fbc4617fe0ac10b05034c87..940b76813b2ecbb0711740288f7e3225ff38aa7e 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -418,6 +418,7 @@ extern void draw_win_map(struct Win * win)
     init_pair(11, COLOR_BLACK, COLOR_GREEN); //
     init_pair(12, COLOR_BLACK, COLOR_MAGENTA); //
     init_pair(13, COLOR_WHITE, COLOR_BLACK); //
+    init_pair(14, COLOR_RED, COLOR_BLACK); //
     for (y = 0; y < world.map.length; y++)
     {
         for (x = 0; x < world.map.length; x++)
@@ -463,6 +464,10 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = COLOR_PAIR(13); //
                 } //
+                else if ('=' == c) //
+                { //
+                    a = COLOR_PAIR(14); //
+                } //
                 // char c = world.map.cells[y*world.map.length + x];
                 set_ch_on_yx(win, y, x * 2 + (y % 2),     c | a); //
                 set_ch_on_yx(win, y, x * 2 + (y % 2) + 1, ' ' | a); //

diff --git a/testing/ref_end b/testing/ref_end
index d5560ea1445cea29d0e74c68fb9af1d988719b62..a5f46df696c6f8de95f367d8b37858be3e36511d 100644 (file)
--- a/testing/ref_end
+++ b/testing/ref_end
@@ -5,6 +5,7 @@ PLAYER_TYPE 0
 GOD_FAVOR 0
 GOD_MOOD -250
 TURN 461
+LUMBER 0
 SLIPPERS 1
 MAP 0 "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 MAP 1 "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"