In hunger(), correct log message on actually over-eating, not hungering.

[plomrogue] / confserver / world

diff --git a/confserver/world b/confserver/world
index 1224fe45474d0b889250e1535c6e68e6f722a08d..430c402d86d195472594c9ac05680f7fff38b3dc 100644 (file)
--- a/confserver/world
+++ b/confserver/world
@@ -26,62 +26,125 @@ TT_START_NUMBER 1
 TT_LIFEPOINTS 30
 TT_SYMBOL @
 TT_NAME HUMAN
-TT_CONSUMABLE 0
+TT_TOOLPOWER 0
+TT_STORAGE 4
 
 TT_ID 1
-TT_START_NUMBER 27
+TT_START_NUMBER 0
 TT_LIFEPOINTS 6
 TT_SYMBOL a
 TT_NAME ANT
-TT_CONSUMABLE 0
+TT_TOOLPOWER 0
+TT_STORAGE 1
 
 TT_ID 2
-TT_START_NUMBER 9
+TT_START_NUMBER 0
 TT_LIFEPOINTS 18
-TT_SYMBOL z
-TT_NAME ZOMBIE
-TT_CONSUMABLE 0
+TT_SYMBOL d
+TT_NAME DOG
+TT_TOOLPOWER 0
+TT_STORAGE 1
 
 TT_ID 3
-TT_START_NUMBER 3
+TT_START_NUMBER 0
 TT_LIFEPOINTS 54
-TT_SYMBOL S
-TT_NAME SHOGGOTH
-TT_CONSUMABLE 0
+TT_SYMBOL b
+TT_NAME BEAR
+TT_TOOLPOWER 0
+TT_STORAGE 3
 
 TT_ID 4
-TT_START_NUMBER 9
+TT_START_NUMBER 0
 TT_LIFEPOINTS 0
-TT_SYMBOL '#'
-TT_NAME DIRT
-TT_CONSUMABLE 0
+TT_SYMBOL 0
+TT_NAME GLOBE
+TT_TOOLPOWER 9001
 
 TT_ID 5
-TT_START_NUMBER 9
-TT_LIFEPOINTS 0
-TT_SYMBOL %
-TT_NAME SKELETON
-TT_CONSUMABLE 0
+TT_TOOL axe
+TT_SYMBOL /
+TT_NAME AXE
+TT_TOOLPOWER 5000
+TT_START_NUMBER 1
 
 TT_ID 6
-TT_START_NUMBER 1
+TT_TOOL carpentry
+TT_SYMBOL -
+TT_NAME 'CARPENTRY TOOL'
+TT_TOOLPOWER 5000
+TT_START_NUMBER 0
+
+TT_ID 7
+TT_TOOL wood
+TT_START_NUMBER 0
+TT_SYMBOL =
+TT_NAME WOOD
+
+TT_ID 8
+TT_START_NUMBER 5
 TT_LIFEPOINTS 0
 TT_SYMBOL m
 TT_NAME 'MAGIC MEAT'
-TT_CONSUMABLE 512
-TT_PROLIFERATE 255
+TT_TOOLPOWER 1024
+TT_PROLIFERATE 0
+TT_TOOL food
+
+TT_ID 9
+TT_START_NUMBER 9
+TT_LIFEPOINTS 0
+TT_SYMBOL $
+TT_NAME DIRT
+TT_TOOLPOWER 0
+
+TT_ID 10
+TT_START_NUMBER 0
+TT_LIFEPOINTS 0
+TT_SYMBOL *
+TT_NAME 'PLANT #2'
+TT_TOOLPOWER 512
+TT_PROLIFERATE 192
+TT_TOOL food
+
+TT_ID 11
+TT_START_NUMBER 3
+TT_LIFEPOINTS 0
+TT_SYMBOL %
+TT_NAME 'PLANT #1'
+TT_TOOLPOWER 0
+TT_PROLIFERATE 1024
+
+TT_ID 12
+TT_START_NUMBER 10
+TT_LIFEPOINTS 0
+TT_SYMBOL '#'
+TT_NAME 'UNKRAUT'
+TT_TOOLPOWER 0
+TT_PROLIFERATE 192
 
 TT_ID 0
-TT_CORPSE_ID 5
+TT_CORPSE_ID 8
 TT_ID 1
-TT_CORPSE_ID 4
+TT_CORPSE_ID 9
 TT_ID 2
-TT_CORPSE_ID 5
+TT_CORPSE_ID 8
 TT_ID 3
-TT_CORPSE_ID 6
+TT_CORPSE_ID 8
 TT_ID 4
-TT_CORPSE_ID 4
+TT_CORPSE_ID 9
 TT_ID 5
-TT_CORPSE_ID 4
+TT_CORPSE_ID 9
 TT_ID 6
-TT_CORPSE_ID 4
+TT_CORPSE_ID 9
+TT_ID 7
+TT_CORPSE_ID 9
+TT_ID 8
+TT_CORPSE_ID 9
+TT_ID 9
+TT_CORPSE_ID 9
+
+FAVOR_STAGE 0
+SLIPPERS 4
+PLANT_0 11
+PLANT_1 10
+LUMBER 7
+TOOL_0 6