From e7017bb06be97f4e1b56318bdfb5c15227eb0a2a Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Sat, 31 Jan 2009 22:51:56 +0000 Subject: [PATCH] Add explicit animations; extract some 'magicmap' and 'visibility' attributes into .face files. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@11297 282e977c-c81d-0410-88c4-b93c2d0d6712 --- food/apple.arc | 1 - food/apple.face | 3 +++ food/apple_eighth.face | 3 +++ food/apple_fourth.face | 3 +++ food/apple_half.face | 3 +++ food/apple_partitions.arc | 3 --- food/bag_popcorn.arc | 1 - food/bag_popcorn.face | 3 +++ food/blackroot.arc | 1 - food/blackroot.face | 3 +++ food/booze.arc | 1 - food/booze.face | 3 +++ food/cabbage.arc | 1 - food/cabbage.face | 3 +++ food/cake.arc | 1 - food/cake.face | 3 +++ food/caramel.arc | 1 - food/caramel.face | 3 +++ food/carrot.arc | 1 - food/carrot.face | 3 +++ food/ch_burger.arc | 1 - food/ch_burger.face | 3 +++ food/chocolate.arc | 1 - food/chocolate.face | 3 +++ food/clover.arc | 1 - food/clover.face | 3 +++ food/coffee.arc | 1 - food/coffee.face | 3 +++ food/drag_steak.arc | 1 - food/drag_steak.face | 3 +++ food/fish.arc | 6 ------ food/fish_1.face | 3 +++ food/fish_2.face | 3 +++ food/fish_3.face | 3 +++ food/fish_4.face | 3 +++ food/fish_5.face | 3 +++ food/fish_6.face | 3 +++ food/fishfood.arc | 1 - food/fishfood.face | 3 +++ food/food.arc | 1 - food/food.face | 3 +++ food/gen_mushroom.arc | 1 - food/gen_mushroom.face | 3 +++ food/haggis.arc | 1 - food/haggis.face | 3 +++ food/leg_mutton.arc | 1 - food/loaf.arc | 1 - food/loaf.face | 3 +++ food/man_root.arc | 1 - food/mint.arc | 1 - food/mint.face | 3 +++ food/mushroom_1.arc | 1 - food/mushroom_1.face | 3 +++ food/mushroom_2.arc | 1 - food/mushroom_2.face | 3 +++ food/mushroom_3.arc | 1 - food/mushroom_3.face | 3 +++ food/onion.arc | 1 - food/onion.face | 3 +++ food/orange.arc | 1 - food/orange.face | 3 +++ food/orcchop.arc | 1 - food/orcchop.face | 3 +++ food/pear.arc | 1 - food/pear.face | 3 +++ food/pipeweed.arc | 1 - food/pipeweed.face | 3 +++ food/poisonfood.arc | 4 ---- food/potato.arc | 1 - food/potato.face | 3 +++ food/roast_bird.arc | 1 - food/roast_bird.face | 3 +++ food/root.face | 3 +++ food/rose.arc | 5 ----- food/rose_black.face | 3 +++ food/rose_pink.face | 3 +++ food/rose_red.face | 3 +++ food/rose_wh.face | 3 +++ food/rose_yel.face | 3 +++ food/s_weasel.arc | 1 - food/s_weasel.face | 3 +++ food/tomato.arc | 2 -- food/tomato.face | 3 +++ food/tomato_big.face | 3 +++ food/uf6.arc | 1 - food/uf6.face | 3 +++ food/w_glass.arc | 1 - food/w_glass.face | 3 +++ food/water.arc | 1 - food/water.face | 3 +++ food/waybread.arc | 1 - food/waybread.face | 3 +++ food/wine.arc | 1 - food/wine.face | 3 +++ 94 files changed, 156 insertions(+), 57 deletions(-) create mode 100644 food/apple.face create mode 100644 food/apple_eighth.face create mode 100644 food/apple_fourth.face create mode 100644 food/apple_half.face create mode 100644 food/bag_popcorn.face create mode 100644 food/blackroot.face create mode 100644 food/booze.face create mode 100644 food/cabbage.face create mode 100644 food/cake.face create mode 100644 food/caramel.face create mode 100644 food/carrot.face create mode 100644 food/ch_burger.face create mode 100644 food/chocolate.face create mode 100644 food/clover.face create mode 100644 food/coffee.face create mode 100644 food/drag_steak.face create mode 100644 food/fish_1.face create mode 100644 food/fish_2.face create mode 100644 food/fish_3.face create mode 100644 food/fish_4.face create mode 100644 food/fish_5.face create mode 100644 food/fish_6.face create mode 100644 food/fishfood.face create mode 100644 food/food.face create mode 100644 food/gen_mushroom.face create mode 100644 food/haggis.face create mode 100644 food/loaf.face create mode 100644 food/mint.face create mode 100644 food/mushroom_1.face create mode 100644 food/mushroom_2.face create mode 100644 food/mushroom_3.face create mode 100644 food/onion.face create mode 100644 food/orange.face create mode 100644 food/orcchop.face create mode 100644 food/pear.face create mode 100644 food/pipeweed.face create mode 100644 food/potato.face create mode 100644 food/roast_bird.face create mode 100644 food/root.face create mode 100644 food/rose_black.face create mode 100644 food/rose_pink.face create mode 100644 food/rose_red.face create mode 100644 food/rose_wh.face create mode 100644 food/rose_yel.face create mode 100644 food/s_weasel.face create mode 100644 food/tomato.face create mode 100644 food/tomato_big.face create mode 100644 food/uf6.face create mode 100644 food/w_glass.face create mode 100644 food/water.face create mode 100644 food/waybread.face create mode 100644 food/wine.face diff --git a/food/apple.arc b/food/apple.arc index cd611b069..bd56c395c 100644 --- a/food/apple.arc +++ b/food/apple.arc @@ -1,6 +1,5 @@ Object apple face apple.111 -magicmap red food 25 nrof 1 type 6 diff --git a/food/apple.face b/food/apple.face new file mode 100644 index 000000000..0c58a5cc0 --- /dev/null +++ b/food/apple.face @@ -0,0 +1,3 @@ +face apple.111 +magicmap red +end diff --git a/food/apple_eighth.face b/food/apple_eighth.face new file mode 100644 index 000000000..f8efdf2a1 --- /dev/null +++ b/food/apple_eighth.face @@ -0,0 +1,3 @@ +face apple_eighth.111 +magicmap red +end diff --git a/food/apple_fourth.face b/food/apple_fourth.face new file mode 100644 index 000000000..f4a9046ab --- /dev/null +++ b/food/apple_fourth.face @@ -0,0 +1,3 @@ +face apple_fourth.111 +magicmap red +end diff --git a/food/apple_half.face b/food/apple_half.face new file mode 100644 index 000000000..008b425f7 --- /dev/null +++ b/food/apple_half.face @@ -0,0 +1,3 @@ +face apple_half.111 +magicmap red +end diff --git a/food/apple_partitions.arc b/food/apple_partitions.arc index 30cad0532..a1c90e32a 100644 --- a/food/apple_partitions.arc +++ b/food/apple_partitions.arc @@ -2,7 +2,6 @@ Object apple_half face apple_half.111 name apple halve name_pl apple halves -magicmap red food 12 nrof 1 type 6 @@ -19,7 +18,6 @@ Object apple_fourth face apple_fourth.111 name apple fourth name_pl apple fourths -magicmap red food 6 nrof 1 type 6 @@ -36,7 +34,6 @@ Object apple_eighth face apple_eighth.111 name apple eighth name_pl apple eighths -magicmap red food 3 nrof 1 type 6 diff --git a/food/bag_popcorn.arc b/food/bag_popcorn.arc index 5c6564450..0cc4c6545 100644 --- a/food/bag_popcorn.arc +++ b/food/bag_popcorn.arc @@ -1,7 +1,6 @@ Object bag_popcorn name bag of popcorn face bag_popcorn.111 -magicmap red food 50 nrof 1 type 6 diff --git a/food/bag_popcorn.face b/food/bag_popcorn.face new file mode 100644 index 000000000..c943f8916 --- /dev/null +++ b/food/bag_popcorn.face @@ -0,0 +1,3 @@ +face bag_popcorn.111 +magicmap red +end diff --git a/food/blackroot.arc b/food/blackroot.arc index 0c28fdba3..fb7ad5784 100644 --- a/food/blackroot.arc +++ b/food/blackroot.arc @@ -1,7 +1,6 @@ Object blackroot name blackroot face blackroot.111 -magicmap black food 15 nrof 1 type 6 diff --git a/food/blackroot.face b/food/blackroot.face new file mode 100644 index 000000000..033f0af85 --- /dev/null +++ b/food/blackroot.face @@ -0,0 +1,3 @@ +face blackroot.111 +magicmap black +end diff --git a/food/booze.arc b/food/booze.arc index cdbc11566..d4220849a 100644 --- a/food/booze.arc +++ b/food/booze.arc @@ -1,6 +1,5 @@ Object booze face booze.111 -magicmap orange on_use_yield boozebottle_empty food 100 nrof 1 diff --git a/food/booze.face b/food/booze.face new file mode 100644 index 000000000..fcc21e8f7 --- /dev/null +++ b/food/booze.face @@ -0,0 +1,3 @@ +face booze.111 +magicmap orange +end diff --git a/food/cabbage.arc b/food/cabbage.arc index 1c62383f8..a0927eede 100644 --- a/food/cabbage.arc +++ b/food/cabbage.arc @@ -1,6 +1,5 @@ Object cabbage face cabbage.111 -magicmap green food 80 nrof 1 type 6 diff --git a/food/cabbage.face b/food/cabbage.face new file mode 100644 index 000000000..922d86561 --- /dev/null +++ b/food/cabbage.face @@ -0,0 +1,3 @@ +face cabbage.111 +magicmap green +end diff --git a/food/cake.arc b/food/cake.arc index 48cd8f882..5bb706ff0 100644 --- a/food/cake.arc +++ b/food/cake.arc @@ -7,7 +7,6 @@ material 32 value 8 weight 3000 identified 1 -magicmap yellow name_pl cakes client_type 601 end diff --git a/food/cake.face b/food/cake.face new file mode 100644 index 000000000..f48c8a721 --- /dev/null +++ b/food/cake.face @@ -0,0 +1,3 @@ +face cake.111 +magicmap yellow +end diff --git a/food/caramel.arc b/food/caramel.arc index 75233f457..2b90bd1a1 100644 --- a/food/caramel.arc +++ b/food/caramel.arc @@ -7,7 +7,6 @@ material 32 value 2 weight 30 identified 1 -magicmap yellow name_pl cakes client_type 601 end diff --git a/food/caramel.face b/food/caramel.face new file mode 100644 index 000000000..035f29f74 --- /dev/null +++ b/food/caramel.face @@ -0,0 +1,3 @@ +face caramel.111 +magicmap yellow +end diff --git a/food/carrot.arc b/food/carrot.arc index 49358231b..1b571704f 100644 --- a/food/carrot.arc +++ b/food/carrot.arc @@ -1,7 +1,6 @@ Object carrot name carrots face carrot.111 -magicmap orange food 20 nrof 1 type 6 diff --git a/food/carrot.face b/food/carrot.face new file mode 100644 index 000000000..1d7868ba3 --- /dev/null +++ b/food/carrot.face @@ -0,0 +1,3 @@ +face carrot.111 +magicmap orange +end diff --git a/food/ch_burger.arc b/food/ch_burger.arc index 8d60bec3f..2c6d79cd6 100644 --- a/food/ch_burger.arc +++ b/food/ch_burger.arc @@ -1,6 +1,5 @@ Object cheeseburger face ch_burger.111 -magicmap dark_orange food 350 nrof 1 type 6 diff --git a/food/ch_burger.face b/food/ch_burger.face new file mode 100644 index 000000000..823f684d4 --- /dev/null +++ b/food/ch_burger.face @@ -0,0 +1,3 @@ +face ch_burger.111 +magicmap dark_orange +end diff --git a/food/chocolate.arc b/food/chocolate.arc index 05661380a..4f81d8f67 100644 --- a/food/chocolate.arc +++ b/food/chocolate.arc @@ -1,6 +1,5 @@ Object chocolate face chocolate.111 -magicmap brown food 50 nrof 1 type 6 diff --git a/food/chocolate.face b/food/chocolate.face new file mode 100644 index 000000000..a22e53c74 --- /dev/null +++ b/food/chocolate.face @@ -0,0 +1,3 @@ +face chocolate.111 +magicmap brown +end diff --git a/food/clover.arc b/food/clover.arc index afb0276eb..5947a75dd 100644 --- a/food/clover.arc +++ b/food/clover.arc @@ -5,7 +5,6 @@ nrof 1 type 6 material 32 value 5 -magicmap green weight 100 name_pl clovers client_type 601 diff --git a/food/clover.face b/food/clover.face new file mode 100644 index 000000000..1f7799e18 --- /dev/null +++ b/food/clover.face @@ -0,0 +1,3 @@ +face clover.111 +magicmap green +end diff --git a/food/coffee.arc b/food/coffee.arc index 5efcba0d2..19cfc5d95 100644 --- a/food/coffee.arc +++ b/food/coffee.arc @@ -9,7 +9,6 @@ material 32 value 1 weight 100 identified 1 -magicmap white name_pl cups of coffee client_type 601 end diff --git a/food/coffee.face b/food/coffee.face new file mode 100644 index 000000000..b98c2c18d --- /dev/null +++ b/food/coffee.face @@ -0,0 +1,3 @@ +face coffee.111 +magicmap white +end diff --git a/food/drag_steak.arc b/food/drag_steak.arc index 9d2085635..a7bee3ab5 100644 --- a/food/drag_steak.arc +++ b/food/drag_steak.arc @@ -1,7 +1,6 @@ Object dragon_steak name steak face drag_steak.111 -magicmap brown food 400 nrof 1 type 72 diff --git a/food/drag_steak.face b/food/drag_steak.face new file mode 100644 index 000000000..b63d38835 --- /dev/null +++ b/food/drag_steak.face @@ -0,0 +1,3 @@ +face drag_steak.111 +magicmap brown +end diff --git a/food/fish.arc b/food/fish.arc index c5262de2d..e98ba2b3c 100644 --- a/food/fish.arc +++ b/food/fish.arc @@ -4,7 +4,6 @@ Object fish_1 name fish face fish_1.111 -magicmap green food 100 nrof 1 type 6 @@ -26,7 +25,6 @@ end Object fish_2 name fish face fish_2.111 -magicmap green food 100 nrof 1 type 6 @@ -52,7 +50,6 @@ end Object fish_3 name fish face fish_3.111 -magicmap green food 100 nrof 1 type 6 @@ -72,7 +69,6 @@ end Object fish_4 name fish face fish_4.111 -magicmap green food 100 nrof 1 type 6 @@ -92,7 +88,6 @@ end Object fish_5 name fish face fish_5.111 -magicmap green food 100 nrof 1 type 6 @@ -112,7 +107,6 @@ end Object fish_6 name fish face fish_6.111 -magicmap green food 100 nrof 1 type 6 diff --git a/food/fish_1.face b/food/fish_1.face new file mode 100644 index 000000000..51c8c8827 --- /dev/null +++ b/food/fish_1.face @@ -0,0 +1,3 @@ +face fish_1.111 +magicmap green +end diff --git a/food/fish_2.face b/food/fish_2.face new file mode 100644 index 000000000..ef109c138 --- /dev/null +++ b/food/fish_2.face @@ -0,0 +1,3 @@ +face fish_2.111 +magicmap green +end diff --git a/food/fish_3.face b/food/fish_3.face new file mode 100644 index 000000000..0175eccb1 --- /dev/null +++ b/food/fish_3.face @@ -0,0 +1,3 @@ +face fish_3.111 +magicmap green +end diff --git a/food/fish_4.face b/food/fish_4.face new file mode 100644 index 000000000..004bfe7a5 --- /dev/null +++ b/food/fish_4.face @@ -0,0 +1,3 @@ +face fish_4.111 +magicmap green +end diff --git a/food/fish_5.face b/food/fish_5.face new file mode 100644 index 000000000..a86d87649 --- /dev/null +++ b/food/fish_5.face @@ -0,0 +1,3 @@ +face fish_5.111 +magicmap green +end diff --git a/food/fish_6.face b/food/fish_6.face new file mode 100644 index 000000000..93ce9d717 --- /dev/null +++ b/food/fish_6.face @@ -0,0 +1,3 @@ +face fish_6.111 +magicmap green +end diff --git a/food/fishfood.arc b/food/fishfood.arc index e50facfff..28edacf0e 100644 --- a/food/fishfood.arc +++ b/food/fishfood.arc @@ -1,7 +1,6 @@ Object fishfood name fish face fishfood.111 -magicmap green food 100 nrof 1 type 6 diff --git a/food/fishfood.face b/food/fishfood.face new file mode 100644 index 000000000..f4cb7e46e --- /dev/null +++ b/food/fishfood.face @@ -0,0 +1,3 @@ +face fishfood.111 +magicmap green +end diff --git a/food/food.arc b/food/food.arc index 3e747ec56..e19745a8d 100644 --- a/food/food.arc +++ b/food/food.arc @@ -1,6 +1,5 @@ Object food face food.111 -magicmap dark_orange food 200 nrof 1 type 6 diff --git a/food/food.face b/food/food.face new file mode 100644 index 000000000..ff80952ed --- /dev/null +++ b/food/food.face @@ -0,0 +1,3 @@ +face food.111 +magicmap dark_orange +end diff --git a/food/gen_mushroom.arc b/food/gen_mushroom.arc index 1e321da4c..aaa1a6588 100644 --- a/food/gen_mushroom.arc +++ b/food/gen_mushroom.arc @@ -12,5 +12,4 @@ maxhp 1 speed -1.0 invisible 1 is_used_up 1 -magicmap black end diff --git a/food/gen_mushroom.face b/food/gen_mushroom.face new file mode 100644 index 000000000..5c064cea7 --- /dev/null +++ b/food/gen_mushroom.face @@ -0,0 +1,3 @@ +face gen_mushroom.111 +magicmap black +end diff --git a/food/haggis.arc b/food/haggis.arc index 83d6ef2be..674d841ca 100644 --- a/food/haggis.arc +++ b/food/haggis.arc @@ -1,7 +1,6 @@ Object haggis name haggis face haggis.111 -magicmap orange food 500 nrof 1 type 6 diff --git a/food/haggis.face b/food/haggis.face new file mode 100644 index 000000000..b07a4a0df --- /dev/null +++ b/food/haggis.face @@ -0,0 +1,3 @@ +face haggis.111 +magicmap orange +end diff --git a/food/leg_mutton.arc b/food/leg_mutton.arc index 03a7dda52..a8e23e49c 100644 --- a/food/leg_mutton.arc +++ b/food/leg_mutton.arc @@ -1,6 +1,5 @@ Object leg_mutton face food.111 -magicmap red food 150 nrof 1 type 6 diff --git a/food/loaf.arc b/food/loaf.arc index 570bc5415..471c740ab 100644 --- a/food/loaf.arc +++ b/food/loaf.arc @@ -1,7 +1,6 @@ Object loaf name bread face loaf.111 -magicmap brown food 100 nrof 1 type 6 diff --git a/food/loaf.face b/food/loaf.face new file mode 100644 index 000000000..b5d4a405f --- /dev/null +++ b/food/loaf.face @@ -0,0 +1,3 @@ +face loaf.111 +magicmap brown +end diff --git a/food/man_root.arc b/food/man_root.arc index d62767344..b6da52d4e 100644 --- a/food/man_root.arc +++ b/food/man_root.arc @@ -1,7 +1,6 @@ Object mandrake_root name mandrake root face root.111 -magicmap orange food 15 nrof 1 type 6 diff --git a/food/mint.arc b/food/mint.arc index ac604a2e2..0d7a50a93 100644 --- a/food/mint.arc +++ b/food/mint.arc @@ -6,7 +6,6 @@ nrof 1 type 6 material 32 value 5 -magicmap green weight 100 name_pl mint sprigs client_type 601 diff --git a/food/mint.face b/food/mint.face new file mode 100644 index 000000000..6b44630a2 --- /dev/null +++ b/food/mint.face @@ -0,0 +1,3 @@ +face mint.111 +magicmap green +end diff --git a/food/mushroom_1.arc b/food/mushroom_1.arc index 72662a4cd..0354d2e8d 100644 --- a/food/mushroom_1.arc +++ b/food/mushroom_1.arc @@ -7,7 +7,6 @@ type 6 material 32 value 5 weight 100 -magicmap white name_pl mushrooms client_type 601 end diff --git a/food/mushroom_1.face b/food/mushroom_1.face new file mode 100644 index 000000000..1b1bd562c --- /dev/null +++ b/food/mushroom_1.face @@ -0,0 +1,3 @@ +face mushroom_1.111 +magicmap white +end diff --git a/food/mushroom_2.arc b/food/mushroom_2.arc index bd9bcfa82..4e45da7d3 100644 --- a/food/mushroom_2.arc +++ b/food/mushroom_2.arc @@ -7,7 +7,6 @@ material 32 value 6 food 55 weight 100 -magicmap brown name_pl mushrooms client_type 601 end diff --git a/food/mushroom_2.face b/food/mushroom_2.face new file mode 100644 index 000000000..05049f685 --- /dev/null +++ b/food/mushroom_2.face @@ -0,0 +1,3 @@ +face mushroom_2.111 +magicmap brown +end diff --git a/food/mushroom_3.arc b/food/mushroom_3.arc index c9dc92160..89d15fe0c 100644 --- a/food/mushroom_3.arc +++ b/food/mushroom_3.arc @@ -7,7 +7,6 @@ type 6 material 32 value 7 weight 50 -magicmap blue name_pl mushrooms client_type 601 end diff --git a/food/mushroom_3.face b/food/mushroom_3.face new file mode 100644 index 000000000..24611f4ea --- /dev/null +++ b/food/mushroom_3.face @@ -0,0 +1,3 @@ +face mushroom_3.111 +magicmap blue +end diff --git a/food/onion.arc b/food/onion.arc index d19c6aeb1..ded1e4190 100644 --- a/food/onion.arc +++ b/food/onion.arc @@ -1,7 +1,6 @@ Object onion name onion face onion.111 -magicmap red food 50 nrof 1 type 6 diff --git a/food/onion.face b/food/onion.face new file mode 100644 index 000000000..1952ba930 --- /dev/null +++ b/food/onion.face @@ -0,0 +1,3 @@ +face onion.111 +magicmap red +end diff --git a/food/orange.arc b/food/orange.arc index 5fa0f61e8..160969c4e 100644 --- a/food/orange.arc +++ b/food/orange.arc @@ -1,7 +1,6 @@ Object orange name orange face orange.111 -magicmap orange food 25 nrof 1 type 6 diff --git a/food/orange.face b/food/orange.face new file mode 100644 index 000000000..50e393fc3 --- /dev/null +++ b/food/orange.face @@ -0,0 +1,3 @@ +face orange.111 +magicmap orange +end diff --git a/food/orcchop.arc b/food/orcchop.arc index 134788654..dc71e5ed4 100644 --- a/food/orcchop.arc +++ b/food/orcchop.arc @@ -8,7 +8,6 @@ material 32 value 1 weight 650 identified 1 -magicmap red name_pl orc chops client_type 624 end diff --git a/food/orcchop.face b/food/orcchop.face new file mode 100644 index 000000000..f29d4518e --- /dev/null +++ b/food/orcchop.face @@ -0,0 +1,3 @@ +face orcchop.111 +magicmap red +end diff --git a/food/pear.arc b/food/pear.arc index 0044f1608..c0ceefaf1 100644 --- a/food/pear.arc +++ b/food/pear.arc @@ -1,6 +1,5 @@ Object pear face pear.111 -magicmap green food 25 nrof 1 type 6 diff --git a/food/pear.face b/food/pear.face new file mode 100644 index 000000000..82aeb0319 --- /dev/null +++ b/food/pear.face @@ -0,0 +1,3 @@ +face pear.111 +magicmap green +end diff --git a/food/pipeweed.arc b/food/pipeweed.arc index 8becd2012..bd1eb3688 100644 --- a/food/pipeweed.arc +++ b/food/pipeweed.arc @@ -7,7 +7,6 @@ type 6 material 32 value 300 weight 32 -magicmap green name_pl pipeweed client_type 601 end diff --git a/food/pipeweed.face b/food/pipeweed.face new file mode 100644 index 000000000..16a823dde --- /dev/null +++ b/food/pipeweed.face @@ -0,0 +1,3 @@ +face pipeweed.111 +magicmap green +end diff --git a/food/poisonfood.arc b/food/poisonfood.arc index c061bf06d..47c34e7a0 100644 --- a/food/poisonfood.arc +++ b/food/poisonfood.arc @@ -2,7 +2,6 @@ Object poison name booze face booze.111 on_use_yield boozebottle_empty -magicmap orange nrof 1 type 7 material 32 @@ -19,7 +18,6 @@ Object wine_poison name bottle of wine face wine.111 on_use_yield winebottle_empty -magicmap red food 75 nrof 1 type 7 @@ -37,7 +35,6 @@ end Object w_glass_poison name glass of wine face w_glass.111 -magicmap red food 10 nrof 1 type 7 @@ -55,7 +52,6 @@ end Object water_poison face water.111 on_use_yield wbottle_empty -magicmap blue food 5 nrof 1 type 7 diff --git a/food/potato.arc b/food/potato.arc index 13a0c497d..61b4a28c5 100644 --- a/food/potato.arc +++ b/food/potato.arc @@ -1,7 +1,6 @@ Object potato name potatoes face potato.111 -magicmap brown food 200 nrof 1 type 6 diff --git a/food/potato.face b/food/potato.face new file mode 100644 index 000000000..104b84b23 --- /dev/null +++ b/food/potato.face @@ -0,0 +1,3 @@ +face potato.111 +magicmap brown +end diff --git a/food/roast_bird.arc b/food/roast_bird.arc index beed6560f..10cf371a3 100644 --- a/food/roast_bird.arc +++ b/food/roast_bird.arc @@ -1,7 +1,6 @@ Object roast_bird name roast bird face roast_bird.111 -magicmap orange food 450 nrof 1 type 6 diff --git a/food/roast_bird.face b/food/roast_bird.face new file mode 100644 index 000000000..ac6e104a2 --- /dev/null +++ b/food/roast_bird.face @@ -0,0 +1,3 @@ +face roast_bird.111 +magicmap orange +end diff --git a/food/root.face b/food/root.face new file mode 100644 index 000000000..05e435e8f --- /dev/null +++ b/food/root.face @@ -0,0 +1,3 @@ +face root.111 +magicmap orange +end diff --git a/food/rose.arc b/food/rose.arc index 0bef37229..b3dc838fc 100644 --- a/food/rose.arc +++ b/food/rose.arc @@ -7,7 +7,6 @@ type 6 material 32 value 60 weight 2 -magicmap red name_pl pink roses client_type 601 end @@ -20,7 +19,6 @@ type 6 material 32 value 80 weight 2 -magicmap red name_pl red roses client_type 601 end @@ -33,7 +31,6 @@ type 6 material 32 value 45 weight 2 -magicmap white name_pl white roses client_type 601 end @@ -46,7 +43,6 @@ type 6 material 32 value 45 weight 2 -magicmap yellow name_pl yellow roses client_type 601 end @@ -59,7 +55,6 @@ type 6 material 32 value 160 weight 2 -magicmap black name_pl black roses client_type 601 end diff --git a/food/rose_black.face b/food/rose_black.face new file mode 100644 index 000000000..8ecb698e2 --- /dev/null +++ b/food/rose_black.face @@ -0,0 +1,3 @@ +face rose_black.111 +magicmap black +end diff --git a/food/rose_pink.face b/food/rose_pink.face new file mode 100644 index 000000000..8d29ce5de --- /dev/null +++ b/food/rose_pink.face @@ -0,0 +1,3 @@ +face rose_pink.111 +magicmap red +end diff --git a/food/rose_red.face b/food/rose_red.face new file mode 100644 index 000000000..6349e3c41 --- /dev/null +++ b/food/rose_red.face @@ -0,0 +1,3 @@ +face rose_red.111 +magicmap red +end diff --git a/food/rose_wh.face b/food/rose_wh.face new file mode 100644 index 000000000..b4354578b --- /dev/null +++ b/food/rose_wh.face @@ -0,0 +1,3 @@ +face rose_wh.111 +magicmap white +end diff --git a/food/rose_yel.face b/food/rose_yel.face new file mode 100644 index 000000000..09d6aa553 --- /dev/null +++ b/food/rose_yel.face @@ -0,0 +1,3 @@ +face rose_yel.111 +magicmap yellow +end diff --git a/food/s_weasel.arc b/food/s_weasel.arc index 7d4302324..79912a018 100644 --- a/food/s_weasel.arc +++ b/food/s_weasel.arc @@ -1,7 +1,6 @@ Object s_weasel name sizzling weasel on a stick face s_weasel.111 -magicmap red food 30 nrof 1 type 6 diff --git a/food/s_weasel.face b/food/s_weasel.face new file mode 100644 index 000000000..97c06e4bd --- /dev/null +++ b/food/s_weasel.face @@ -0,0 +1,3 @@ +face s_weasel.111 +magicmap red +end diff --git a/food/tomato.arc b/food/tomato.arc index c4f1f4d33..e0eadd5c4 100644 --- a/food/tomato.arc +++ b/food/tomato.arc @@ -1,7 +1,6 @@ Object tomato name tomato face tomato.111 -magicmap red food 50 nrof 1 type 6 @@ -16,7 +15,6 @@ end Object tomato_big name very large tomato face tomato_big.111 -magicmap red food 200 nrof 1 type 6 diff --git a/food/tomato.face b/food/tomato.face new file mode 100644 index 000000000..4b71be151 --- /dev/null +++ b/food/tomato.face @@ -0,0 +1,3 @@ +face tomato.111 +magicmap red +end diff --git a/food/tomato_big.face b/food/tomato_big.face new file mode 100644 index 000000000..e09f581f5 --- /dev/null +++ b/food/tomato_big.face @@ -0,0 +1,3 @@ +face tomato_big.111 +magicmap red +end diff --git a/food/uf6.arc b/food/uf6.arc index 02850cd32..c980f03a3 100644 --- a/food/uf6.arc +++ b/food/uf6.arc @@ -1,7 +1,6 @@ Object uf6 face uf6.111 on_use_yield wbottle_empty -magicmap blue food 1 nrof 1 type 54 diff --git a/food/uf6.face b/food/uf6.face new file mode 100644 index 000000000..fbcedcbaf --- /dev/null +++ b/food/uf6.face @@ -0,0 +1,3 @@ +face uf6.111 +magicmap blue +end diff --git a/food/w_glass.arc b/food/w_glass.arc index 28d3af8b6..1ba919e2a 100644 --- a/food/w_glass.arc +++ b/food/w_glass.arc @@ -2,7 +2,6 @@ Object w_glass name glass of wine face w_glass.111 on_use_yield w_glass_empty -magicmap red food 10 nrof 1 type 54 diff --git a/food/w_glass.face b/food/w_glass.face new file mode 100644 index 000000000..e795ee0a8 --- /dev/null +++ b/food/w_glass.face @@ -0,0 +1,3 @@ +face w_glass.111 +magicmap red +end diff --git a/food/water.arc b/food/water.arc index 4d4e0b4df..6f5f4e759 100644 --- a/food/water.arc +++ b/food/water.arc @@ -1,7 +1,6 @@ Object water face water.111 on_use_yield wbottle_empty -magicmap blue food 5 nrof 1 type 54 diff --git a/food/water.face b/food/water.face new file mode 100644 index 000000000..d11f8aaea --- /dev/null +++ b/food/water.face @@ -0,0 +1,3 @@ +face water.111 +magicmap blue +end diff --git a/food/waybread.arc b/food/waybread.arc index 1a7aa2299..b2bf91b7d 100644 --- a/food/waybread.arc +++ b/food/waybread.arc @@ -7,7 +7,6 @@ material 32 value 30 weight 1000 identified 1 -magicmap yellow name_pl waybreads client_type 601 end diff --git a/food/waybread.face b/food/waybread.face new file mode 100644 index 000000000..5e8638b2d --- /dev/null +++ b/food/waybread.face @@ -0,0 +1,3 @@ +face waybread.111 +magicmap yellow +end diff --git a/food/wine.arc b/food/wine.arc index 54cacfd64..630566e59 100644 --- a/food/wine.arc +++ b/food/wine.arc @@ -2,7 +2,6 @@ Object wine name bottle of wine face wine.111 on_use_yield winebottle_empty -magicmap red food 75 nrof 1 type 54 diff --git a/food/wine.face b/food/wine.face new file mode 100644 index 000000000..5ff63e3b2 --- /dev/null +++ b/food/wine.face @@ -0,0 +1,3 @@ +face wine.111 +magicmap red +end