diff --git a/food/apple.arc b/food/apple.arc index ffe7d2fcb..cd611b069 100644 --- a/food/apple.arc +++ b/food/apple.arc @@ -1,6 +1,6 @@ Object apple face apple.111 -color_fg red +magicmap red food 25 nrof 1 type 6 diff --git a/food/apple_partitions.arc b/food/apple_partitions.arc index 18a96fc3b..30cad0532 100644 --- a/food/apple_partitions.arc +++ b/food/apple_partitions.arc @@ -2,7 +2,7 @@ Object apple_half face apple_half.111 name apple halve name_pl apple halves -color_fg red +magicmap red food 12 nrof 1 type 6 @@ -19,7 +19,7 @@ Object apple_fourth face apple_fourth.111 name apple fourth name_pl apple fourths -color_fg red +magicmap red food 6 nrof 1 type 6 @@ -36,7 +36,7 @@ Object apple_eighth face apple_eighth.111 name apple eighth name_pl apple eighths -color_fg red +magicmap red food 3 nrof 1 type 6 diff --git a/food/bag_popcorn.arc b/food/bag_popcorn.arc index 7f0c9b620..5c6564450 100644 --- a/food/bag_popcorn.arc +++ b/food/bag_popcorn.arc @@ -1,7 +1,7 @@ Object bag_popcorn name bag of popcorn face bag_popcorn.111 -color_fg red +magicmap red food 50 nrof 1 type 6 diff --git a/food/blackroot.arc b/food/blackroot.arc index 4dbd2643b..0c28fdba3 100644 --- a/food/blackroot.arc +++ b/food/blackroot.arc @@ -1,7 +1,7 @@ Object blackroot name blackroot face blackroot.111 -color_fg black +magicmap black food 15 nrof 1 type 6 diff --git a/food/booze.arc b/food/booze.arc index 77cc7db0a..cdbc11566 100644 --- a/food/booze.arc +++ b/food/booze.arc @@ -1,6 +1,6 @@ Object booze face booze.111 -color_fg orange +magicmap orange on_use_yield boozebottle_empty food 100 nrof 1 diff --git a/food/cabbage.arc b/food/cabbage.arc index 4476f4cc4..1c62383f8 100644 --- a/food/cabbage.arc +++ b/food/cabbage.arc @@ -1,6 +1,6 @@ Object cabbage face cabbage.111 -color_fg green +magicmap green food 80 nrof 1 type 6 diff --git a/food/carrot.arc b/food/carrot.arc index 9721f7b8f..49358231b 100644 --- a/food/carrot.arc +++ b/food/carrot.arc @@ -1,7 +1,7 @@ Object carrot name carrots face carrot.111 -color_fg orange +magicmap orange food 20 nrof 1 type 6 diff --git a/food/ch_burger.arc b/food/ch_burger.arc index 9c66c1589..8d60bec3f 100644 --- a/food/ch_burger.arc +++ b/food/ch_burger.arc @@ -1,6 +1,6 @@ Object cheeseburger face ch_burger.111 -color_fg dark_orange +magicmap dark_orange food 350 nrof 1 type 6 diff --git a/food/chocolate.arc b/food/chocolate.arc index 05ef18e42..05661380a 100644 --- a/food/chocolate.arc +++ b/food/chocolate.arc @@ -1,6 +1,6 @@ Object chocolate face chocolate.111 -color_fg brown +magicmap brown food 50 nrof 1 type 6 diff --git a/food/clover.arc b/food/clover.arc index 301b29fe6..afb0276eb 100644 --- a/food/clover.arc +++ b/food/clover.arc @@ -5,7 +5,7 @@ nrof 1 type 6 material 32 value 5 -color_fg green +magicmap green weight 100 name_pl clovers client_type 601 diff --git a/food/drag_steak.arc b/food/drag_steak.arc index d633b3a65..9d2085635 100644 --- a/food/drag_steak.arc +++ b/food/drag_steak.arc @@ -1,7 +1,7 @@ Object dragon_steak name steak face drag_steak.111 -color_fg brown +magicmap brown food 400 nrof 1 type 72 diff --git a/food/fish.arc b/food/fish.arc index fecaf2c44..daebd6626 100644 --- a/food/fish.arc +++ b/food/fish.arc @@ -4,7 +4,7 @@ Object fish_1 name fish face fish_1.111 -color_fg green +magicmap green food 100 nrof 1 type 6 @@ -26,7 +26,7 @@ end Object fish_2 name fish face fish_2.111 -color_fg green +magicmap green food 100 nrof 1 type 6 @@ -52,7 +52,7 @@ end Object fish_3 name fish face fish_3.111 -color_fg green +magicmap green food 100 nrof 1 type 6 @@ -72,7 +72,7 @@ end Object fish_4 name fish face fish_4.111 -color_fg green +magicmap green food 100 nrof 1 type 6 diff --git a/food/fishfood.arc b/food/fishfood.arc index 28f787673..e50facfff 100644 --- a/food/fishfood.arc +++ b/food/fishfood.arc @@ -1,7 +1,7 @@ Object fishfood name fish face fishfood.111 -color_fg green +magicmap green food 100 nrof 1 type 6 diff --git a/food/food.arc b/food/food.arc index f522d8d73..3e747ec56 100644 --- a/food/food.arc +++ b/food/food.arc @@ -1,6 +1,6 @@ Object food face food.111 -color_fg dark_orange +magicmap dark_orange food 200 nrof 1 type 6 diff --git a/food/gen_mushroom.arc b/food/gen_mushroom.arc index e4d981f83..1e321da4c 100644 --- a/food/gen_mushroom.arc +++ b/food/gen_mushroom.arc @@ -12,5 +12,5 @@ maxhp 1 speed -1.0 invisible 1 is_used_up 1 -color_fg black +magicmap black end diff --git a/food/haggis.arc b/food/haggis.arc index 209cb2aad..83d6ef2be 100644 --- a/food/haggis.arc +++ b/food/haggis.arc @@ -1,7 +1,7 @@ Object haggis name haggis face haggis.111 -color_fg orange +magicmap orange food 500 nrof 1 type 6 diff --git a/food/loaf.arc b/food/loaf.arc index 69dcfe88c..570bc5415 100644 --- a/food/loaf.arc +++ b/food/loaf.arc @@ -1,7 +1,7 @@ Object loaf name bread face loaf.111 -color_fg brown +magicmap brown food 100 nrof 1 type 6 diff --git a/food/man_root.arc b/food/man_root.arc index 3c7a86413..d62767344 100644 --- a/food/man_root.arc +++ b/food/man_root.arc @@ -1,7 +1,7 @@ Object mandrake_root name mandrake root face root.111 -color_fg orange +magicmap orange food 15 nrof 1 type 6 diff --git a/food/mint.arc b/food/mint.arc index 696389bdc..ac604a2e2 100644 --- a/food/mint.arc +++ b/food/mint.arc @@ -6,7 +6,7 @@ nrof 1 type 6 material 32 value 5 -color_fg green +magicmap green weight 100 name_pl mint sprigs client_type 601 diff --git a/food/onion.arc b/food/onion.arc index fd619acfa..d19c6aeb1 100644 --- a/food/onion.arc +++ b/food/onion.arc @@ -1,7 +1,7 @@ Object onion name onion face onion.111 -color_fg red +magicmap red food 50 nrof 1 type 6 diff --git a/food/orange.arc b/food/orange.arc index 028610808..5fa0f61e8 100644 --- a/food/orange.arc +++ b/food/orange.arc @@ -1,7 +1,7 @@ Object orange name orange face orange.111 -color_fg orange +magicmap orange food 25 nrof 1 type 6 diff --git a/food/pear.arc b/food/pear.arc index bdda3dc82..0044f1608 100644 --- a/food/pear.arc +++ b/food/pear.arc @@ -1,6 +1,6 @@ Object pear face pear.111 -color_fg green +magicmap green food 25 nrof 1 type 6 diff --git a/food/pipeweed.arc b/food/pipeweed.arc index 26ad0b347..8becd2012 100644 --- a/food/pipeweed.arc +++ b/food/pipeweed.arc @@ -6,7 +6,6 @@ nrof 1 type 6 material 32 value 300 -color_fg green weight 32 magicmap green name_pl pipeweed diff --git a/food/poisonfood.arc b/food/poisonfood.arc index 083ec5f9e..c061bf06d 100644 --- a/food/poisonfood.arc +++ b/food/poisonfood.arc @@ -2,7 +2,7 @@ Object poison name booze face booze.111 on_use_yield boozebottle_empty -color_fg orange +magicmap orange nrof 1 type 7 material 32 @@ -19,7 +19,7 @@ Object wine_poison name bottle of wine face wine.111 on_use_yield winebottle_empty -color_fg red +magicmap red food 75 nrof 1 type 7 @@ -37,7 +37,7 @@ end Object w_glass_poison name glass of wine face w_glass.111 -color_fg red +magicmap red food 10 nrof 1 type 7 @@ -55,7 +55,7 @@ end Object water_poison face water.111 on_use_yield wbottle_empty -color_fg blue +magicmap blue food 5 nrof 1 type 7 diff --git a/food/potato.arc b/food/potato.arc index 737c3814e..13a0c497d 100644 --- a/food/potato.arc +++ b/food/potato.arc @@ -1,7 +1,7 @@ Object potato name potatoes face potato.111 -color_fg brown +magicmap brown food 200 nrof 1 type 6 diff --git a/food/roast_bird.arc b/food/roast_bird.arc index c90ffc687..beed6560f 100644 --- a/food/roast_bird.arc +++ b/food/roast_bird.arc @@ -1,7 +1,7 @@ Object roast_bird name roast bird face roast_bird.111 -color_fg orange +magicmap orange food 450 nrof 1 type 6 diff --git a/food/rose.arc b/food/rose.arc index 1a31be142..0bef37229 100644 --- a/food/rose.arc +++ b/food/rose.arc @@ -6,7 +6,6 @@ nrof 1 type 6 material 32 value 60 -color_fg red weight 2 magicmap red name_pl pink roses @@ -20,7 +19,6 @@ nrof 1 type 6 material 32 value 80 -color_fg red weight 2 magicmap red name_pl red roses @@ -60,7 +58,6 @@ nrof 1 type 6 material 32 value 160 -color_fg black weight 2 magicmap black name_pl black roses diff --git a/food/s_weasel.arc b/food/s_weasel.arc index f03032cb6..7d4302324 100644 --- a/food/s_weasel.arc +++ b/food/s_weasel.arc @@ -1,7 +1,7 @@ Object s_weasel name sizzling weasel on a stick face s_weasel.111 -color_fg red +magicmap red food 30 nrof 1 type 6 diff --git a/food/tomato.arc b/food/tomato.arc index 7a9f8fcbb..c4f1f4d33 100644 --- a/food/tomato.arc +++ b/food/tomato.arc @@ -1,7 +1,7 @@ Object tomato name tomato face tomato.111 -color_fg red +magicmap red food 50 nrof 1 type 6 @@ -16,7 +16,7 @@ end Object tomato_big name very large tomato face tomato_big.111 -color_fg red +magicmap red food 200 nrof 1 type 6 diff --git a/food/uf6.arc b/food/uf6.arc index 66b782893..02850cd32 100644 --- a/food/uf6.arc +++ b/food/uf6.arc @@ -1,7 +1,7 @@ Object uf6 face uf6.111 on_use_yield wbottle_empty -color_fg blue +magicmap blue food 1 nrof 1 type 54 diff --git a/food/w_glass.arc b/food/w_glass.arc index 2a710c635..28d3af8b6 100644 --- a/food/w_glass.arc +++ b/food/w_glass.arc @@ -2,7 +2,7 @@ Object w_glass name glass of wine face w_glass.111 on_use_yield w_glass_empty -color_fg red +magicmap red food 10 nrof 1 type 54 diff --git a/food/water.arc b/food/water.arc index 5313ae37a..4d4e0b4df 100644 --- a/food/water.arc +++ b/food/water.arc @@ -1,7 +1,7 @@ Object water face water.111 on_use_yield wbottle_empty -color_fg blue +magicmap blue food 5 nrof 1 type 54 diff --git a/food/wine.arc b/food/wine.arc index f3b657f07..54cacfd64 100644 --- a/food/wine.arc +++ b/food/wine.arc @@ -2,7 +2,7 @@ Object wine name bottle of wine face wine.111 on_use_yield winebottle_empty -color_fg red +magicmap red food 75 nrof 1 type 54 diff --git a/gods/items/tear_gaea.arc b/gods/items/tear_gaea.arc index 211c548c8..04cab1daa 100644 --- a/gods/items/tear_gaea.arc +++ b/gods/items/tear_gaea.arc @@ -11,7 +11,7 @@ nrof 1 level 10 anim_speed 4 client_anim_random 1 -color_fg blue +magicmap blue type 5 weight 10 name_pl Gaea's tears