7DRL: New plant mission, plus lots of refactoring of 7DRL-specific code.

[plomrogue] / confserver / world

diff --git a/confserver/world b/confserver/world
index 676dfe260d7a29adb94ae934aa66e82273cb74d7..9d4a8afd26efbfd55bcef248255b518f4f9e247e 100644 (file)
--- a/confserver/world
+++ b/confserver/world
@@ -26,22 +26,22 @@ TT_START_NUMBER 1
 TT_LIFEPOINTS 30
 TT_SYMBOL @
 TT_NAME HUMAN
-TT_CONSUMABLE 0
-TT_STORAGE 5
+TT_TOOLPOWER 0
+TT_STORAGE 4
 
 TT_ID 1
 TT_START_NUMBER 0
 TT_LIFEPOINTS 0
 TT_SYMBOL 0
 TT_NAME GLOBE
-TT_CONSUMABLE 9001
+TT_TOOLPOWER 9001
 
 TT_ID 2
 TT_START_NUMBER 27
 TT_LIFEPOINTS 6
 TT_SYMBOL a
 TT_NAME ANT
-TT_CONSUMABLE 0
+TT_TOOLPOWER 0
 TT_STORAGE 1
 
 TT_ID 3
@@ -49,7 +49,7 @@ TT_START_NUMBER 9
 TT_LIFEPOINTS 18
 TT_SYMBOL d
 TT_NAME DOG
-TT_CONSUMABLE 0
+TT_TOOLPOWER 0
 TT_STORAGE 1
 
 TT_ID 4
@@ -57,7 +57,7 @@ TT_START_NUMBER 3
 TT_LIFEPOINTS 54
 TT_SYMBOL b
 TT_NAME BEAR
-TT_CONSUMABLE 0
+TT_TOOLPOWER 0
 TT_STORAGE 3
 
 TT_ID 5
@@ -65,32 +65,62 @@ TT_START_NUMBER 9
 TT_LIFEPOINTS 0
 TT_SYMBOL $
 TT_NAME DIRT
-TT_CONSUMABLE 0
+TT_TOOLPOWER 0
 
 TT_ID 6
 TT_START_NUMBER 5
 TT_LIFEPOINTS 0
 TT_SYMBOL m
 TT_NAME 'MAGIC MEAT'
-TT_CONSUMABLE 1024
+TT_TOOLPOWER 1024
 TT_PROLIFERATE 0
+TT_TOOL food
 
 TT_ID 7
 TT_START_NUMBER 10
 TT_LIFEPOINTS 0
 TT_SYMBOL '#'
-TT_NAME 'PLANT #1'
-TT_CONSUMABLE 0
+TT_NAME 'UNKRAUT'
+TT_TOOLPOWER 0
 TT_PROLIFERATE 192
 
 TT_ID 8
 TT_START_NUMBER 1
 TT_LIFEPOINTS 0
 TT_SYMBOL %
-TT_NAME 'PLANT #2'
-TT_CONSUMABLE 0
+TT_NAME 'PLANT #1'
+TT_TOOLPOWER 0
 TT_PROLIFERATE 512
 
+TT_ID 9
+TT_TOOL axe
+TT_SYMBOL /
+TT_NAME AXE
+TT_TOOLPOWER 5000
+TT_START_NUMBER 1
+
+TT_ID 10
+TT_TOOL wood
+TT_START_NUMBER 0
+TT_SYMBOL =
+TT_NAME WOOD
+
+TT_ID 11
+TT_TOOL carpentry
+TT_SYMBOL -
+TT_NAME 'CARPENTRY TOOL'
+TT_TOOLPOWER 5000
+TT_START_NUMBER 0
+
+TT_ID 12
+TT_START_NUMBER 0
+TT_LIFEPOINTS 0
+TT_SYMBOL *
+TT_NAME 'PLANT #2'
+TT_TOOLPOWER 512
+TT_PROLIFERATE 192
+TT_TOOL food
+
 TT_ID 0
 TT_CORPSE_ID 6
 TT_ID 1
@@ -107,7 +137,14 @@ TT_ID 6
 TT_CORPSE_ID 4
 TT_ID 7
 TT_CORPSE_ID 4
+TT_ID 8
+TT_CORPSE_ID 4
+TT_ID 9
+TT_CORPSE_ID 4
 
 FAVOR_STAGE 0
 SLIPPERS 1
 PLANT_0 8
+PLANT_1 12
+LUMBER 10
+TOOL_0 11