Add weaker axe KNIFE.

diff --git a/confserver/world b/confserver/world
index bffa3a4a4413ab029d03a155ab5b5e9a3904ef54..554da1845498c0f8ddcc24be0a0f53e246dc8274 100644 (file)
--- a/confserver/world
+++ b/confserver/world
@@ -30,7 +30,7 @@ TT_TOOLPOWER 0
 TT_STORAGE 4
 
 TT_ID 1
-TT_START_NUMBER 1
+TT_START_NUMBER 27
 TT_LIFEPOINTS 4
 TT_SYMBOL ,
 TT_NAME 'BUG'
@@ -39,7 +39,7 @@ TT_STORAGE 1
 TT_PROLIFERATE 256
 
 TT_ID 2
-TT_START_NUMBER 0
+TT_START_NUMBER 9
 TT_LIFEPOINTS 16
 TT_SYMBOL d
 TT_NAME DOG
@@ -48,7 +48,7 @@ TT_STORAGE 1
 TT_PROLIFERATE 512
 
 TT_ID 3
-TT_START_NUMBER 0
+TT_START_NUMBER 3
 TT_LIFEPOINTS 54
 TT_SYMBOL B
 TT_NAME BEAR
@@ -71,26 +71,33 @@ TT_TOOLPOWER 5000
 TT_START_NUMBER 1
 
 TT_ID 6
+TT_TOOL axe
+TT_SYMBOL -
+TT_NAME KNIFE
+TT_TOOLPOWER 500
+TT_START_NUMBER 1
+
+TT_ID 7
 TT_TOOL carpentry
 TT_SYMBOL ]
 TT_NAME 'CARPENTRY TOOL'
 TT_TOOLPOWER 5000
 TT_START_NUMBER 0
 
-TT_ID 7
+TT_ID 8
 TT_TOOL fertilizer
 TT_SYMBOL [
 TT_NAME 'FERTILIZER'
 TT_START_NUMBER 0
 TT_TOOLPOWER 5000
 
-TT_ID 8
+TT_ID 9
 TT_TOOL wood
 TT_START_NUMBER 0
 TT_SYMBOL =
 TT_NAME WOOD
 
-TT_ID 9
+TT_ID 10
 TT_START_NUMBER 0
 TT_LIFEPOINTS 0
 TT_SYMBOL $
@@ -99,7 +106,7 @@ TT_TOOLPOWER 4000
 TT_PROLIFERATE 4096
 TT_TOOL food
 
-TT_ID 10
+TT_ID 11
 TT_START_NUMBER 0
 TT_LIFEPOINTS 0
 TT_SYMBOL %
@@ -107,7 +114,7 @@ TT_NAME 'HUMAN CORPSE'
 TT_TOOLPOWER 2500
 TT_TOOL food
 
-TT_ID 11
+TT_ID 12
 TT_START_NUMBER 0
 TT_LIFEPOINTS 0
 TT_SYMBOL &
@@ -115,7 +122,7 @@ TT_NAME 'DOG CORPSE'
 TT_TOOLPOWER 1500
 TT_TOOL food
 
-TT_ID 12
+TT_ID 13
 TT_START_NUMBER 0
 TT_LIFEPOINTS 0
 TT_SYMBOL (
@@ -124,7 +131,7 @@ TT_TOOLPOWER 512
 TT_PROLIFERATE 192
 TT_TOOL food
 
-TT_ID 13
+TT_ID 14
 TT_START_NUMBER 0
 TT_LIFEPOINTS 0
 TT_SYMBOL ;
@@ -132,7 +139,7 @@ TT_NAME 'BUG CORPSE'
 TT_TOOLPOWER 512
 TT_TOOL food
 
-TT_ID 14
+TT_ID 15
 TT_START_NUMBER 64
 TT_LIFEPOINTS 0
 TT_SYMBOL '#'
@@ -141,7 +148,7 @@ TT_TOOLPOWER 128
 TT_PROLIFERATE 32
 TT_TOOL food
 
-TT_ID 15
+TT_ID 16
 TT_START_NUMBER 3
 TT_LIFEPOINTS 0
 TT_SYMBOL *
@@ -150,18 +157,18 @@ TT_TOOLPOWER 0
 TT_PROLIFERATE 1024
 
 TT_ID 0
-TT_CORPSE_ID 10
+TT_CORPSE_ID 11
 TT_ID 1
-TT_CORPSE_ID 13
+TT_CORPSE_ID 14
 TT_ID 2
-TT_CORPSE_ID 11
+TT_CORPSE_ID 12
 TT_ID 3
-TT_CORPSE_ID 9
+TT_CORPSE_ID 10
 
 FAVOR_STAGE 0
 SLIPPERS 4
-PLANT_0 15
-PLANT_1 12
-LUMBER 8
-TOOL_0 6
-TOOL_1 7
+PLANT_0 16
+PLANT_1 13
+LUMBER 9
+TOOL_0 7
+TOOL_1 8

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index d40574dcd9a2ff936646128ced36abd61dbc602c..bd34e1f3846396be5dd1efb639063196485d089d 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -481,7 +481,7 @@ extern void draw_win_map(struct Win * win)
                 { //
                     a = col_corpse; //
                 } //
-                else if ('/' == c || ']' == c || '[' == c) //
+                else if ('-' == c || '/' == c || ']' == c || '[' == c) //
                 { //
                     a = col_tool; //
                 } //