From 3e04bb38346fd7b2a6490d042ca72cf5c4e34812 Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Sat, 31 Jan 2009 22:17:30 +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@11295 282e977c-c81d-0410-88c4-b93c2d0d6712 --- dev/unused/0.91.1/Flyingnote/flying_note.face | 22 ++++++ dev/unused/0.91.1/Flyingnote/flyingnote.arc | 23 +----- dev/unused/0.91.1/Lg_bungalow/lbungalow.arc | 4 - dev/unused/0.91.1/Lg_bungalow/lbungalow.face | 12 +++ dev/unused/0.91.1/Monolith/monolith.arc | 11 +-- dev/unused/0.91.1/Monolith/monolith_b.face | 10 +++ dev/unused/0.91.1/Undead/shadow.arc | 7 +- dev/unused/0.91.1/Undead/shadow.face | 14 ++++ dev/unused/0.91.1/Undead/werewolf.arc | 8 +- dev/unused/0.91.1/Undead/werewolf.face | 15 ++++ dev/unused/0.91.1/centaur.arc | 7 +- dev/unused/0.91.1/centaur.face | 14 ++++ dev/unused/0.91.1/dark_uni.arc | 16 +--- dev/unused/0.91.1/dark_uni.face | 18 +++++ dev/unused/0.91.1/dark_uni_2.face | 18 +++++ dev/unused/0.91.1/grave.arc | 10 +-- dev/unused/0.91.1/grave_clos.face | 3 + dev/unused/0.91.1/grave_open.face | 3 + dev/unused/0.91.1/lwoodhouse.arc | 4 - dev/unused/0.91.1/lwoodhouse.face | 12 +++ dev/unused/0.91.1/shop.arc | 1 - dev/unused/0.91.1/shop.face | 3 + dev/unused/0.91.1/shovel_2.face | 7 ++ dev/unused/0.91.7/Town/merchant.arc | 5 +- dev/unused/0.91.7/Town/merchant.face | 4 + dev/unused/0.91.7/chaos/broo.arc | 7 +- dev/unused/0.91.7/chaos/broo.face | 6 ++ dev/unused/0.91.7/chaos/c_knight.arc | 5 +- dev/unused/0.91.7/chaos/c_knight.face | 4 + dev/unused/0.91.7/newfood/bag_popcorn.arc | 1 - dev/unused/0.91.7/newfood/bag_popcorn.face | 3 + dev/unused/0.91.7/newfood/onion.arc | 1 - dev/unused/0.91.7/newfood/onion.face | 3 + dev/unused/0.91.7/newfood/orange.arc | 1 - dev/unused/0.91.7/newfood/orange.face | 3 + dev/unused/0.91.7/newfood/pear.arc | 1 - dev/unused/0.91.7/newfood/pear.face | 3 + dev/unused/0.91.7/newfood/s_weasel.arc | 1 - dev/unused/0.91.7/newfood/s_weasel.face | 3 + dev/unused/0.91.7/newtown/s_shop1.arc | 1 - dev/unused/0.91.7/newtown/s_shop1.face | 3 + dev/unused/0.91.7/newtown/s_shop2.arc | 1 - dev/unused/0.91.7/newtown/s_shop2.face | 3 + dev/wip/manhole/manhole.arc | 4 - dev/wip/manhole/manhole.face | 16 ++++ dev/wip/spout/pour_h2o.arc | 8 +- dev/wip/spout/pour_h2o.face | 12 +++ dev/wip/spout/pour_spout.arc | 1 - dev/wip/spout/pour_spout.face | 3 + dev/xpm_pref/Mountain/moun_cave1.arc | 1 - dev/xpm_pref/Mountain/moun_cave1.face | 3 + dev/xpm_pref/Mountain/mountain1.arc | 1 - dev/xpm_pref/Mountain/mountain1.face | 3 + dev/xpm_pref/Mountain/mountain2.arc | 1 - dev/xpm_pref/Mountain/mountain2.face | 3 + disease/diarrhea.arc | 43 +--------- disease/diseased_needle.arc | 5 +- disease/disgusting_puddle.face | 42 ++++++++++ disease/incontinence.arc | 4 +- disease/incontinence.face | 3 + disease/rabies.arc | 4 +- disease/rabies.face | 3 + disease/trap_diseased_needle.face | 4 + door/Door/door.arc | 16 ---- door/Door/door_0.face | 3 + door/Door/door_1.face | 3 + door/Door/door_2.face | 3 + door/Door/door_3.face | 3 + door/Door/door_4.face | 3 + door/Door/door_5.face | 3 + door/Door/door_6.face | 3 + door/Door/door_7.face | 3 + door/Door/door_8.face | 3 + door/Door/door_9.face | 3 + door/Door/door_A.face | 3 + door/Door/door_B.face | 3 + door/Door/door_C.face | 3 + door/Door/door_D.face | 3 + door/Door/door_E.face | 3 + door/Door/door_F.face | 3 + door/Locked/key2.arc | 1 - door/Locked/key2.face | 3 + door/Locked/ldoor1.arc | 1 - door/Locked/ldoor1.face | 3 + door/Locked/ldoor2.arc | 1 - door/Locked/ldoor2.face | 3 + door/key1.arc | 1 - door/key1.face | 3 + door/large_hdoor.arc | 3 - door/large_hdoor.face | 3 + door/large_vdoor.arc | 3 - door/large_vdoor.face | 3 + door/odoor_1.arc | 1 - door/odoor_1.face | 3 + door/odoor_2.arc | 1 - door/odoor_2.face | 3 + door/odoor_2_fant.arc | 5 -- door/odoor_2_fant_blue-green.face | 3 + door/odoor_2_fant_blue-yellow.face | 3 + door/odoor_2_fant_brown.face | 3 + door/odoor_2_fant_red-white.face | 3 + door/odoor_2_fant_red-yellow.face | 3 + door/wooddoor_1.arc | 1 - door/wooddoor_1.face | 3 + door/wooddoor_2.arc | 1 - door/wooddoor_2.face | 3 + exit/exit.arc | 7 +- exit/exit.face | 6 ++ exit/fogexit.arc | 12 +-- exit/fogexit.face | 11 +++ exit/magic_portal/magic_portal.arc | 68 +--------------- exit/magic_portal/magic_portal.face | 62 +++++++++++++++ exit/magic_portal/perm_magic_portal.face | 4 + exit/whirlwind.arc | 10 +-- exit/whirlwind_exit.face | 9 +++ flesh/demon/demon_head.arc | 1 - flesh/demon/demon_head.face | 3 + flesh/demon/icor.arc | 44 +---------- flesh/demon/icor.face | 78 +++++++++++++++++++ flesh/dragon/dragon_blue_scale.face | 3 + flesh/dragon/dragon_claw.arc | 1 - flesh/dragon/dragon_claw.face | 3 + flesh/dragon/dragon_eye.arc | 1 - flesh/dragon/dragon_eye.face | 3 + flesh/dragon/dragon_green_scale.face | 3 + flesh/dragon/dragon_orange_scale.face | 3 + flesh/dragon/dragon_sca.arc | 4 - flesh/dragon/dragon_sca.face | 3 + flesh/dragon/dragon_wing.arc | 1 - flesh/dragon/dragon_wing.face | 3 + flesh/generic/big_eye.arc | 1 - flesh/generic/big_eye.face | 3 + flesh/generic/brain.arc | 1 - flesh/generic/brain.face | 3 + flesh/generic/eye.arc | 1 - flesh/generic/eye.face | 3 + flesh/generic/eyes.arc | 1 - flesh/generic/eyes.face | 3 + flesh/generic/heart.arc | 1 - flesh/generic/heart.face | 3 + flesh/generic/hide_black.arc | 1 - flesh/generic/hide_black.face | 3 + flesh/generic/hide_brown.arc | 1 - flesh/generic/hide_brown.face | 3 + flesh/generic/hide_grey.arc | 1 - flesh/generic/hide_grey.face | 3 + flesh/generic/hide_white.arc | 1 - flesh/generic/hide_white.face | 3 + flesh/generic/liver.arc | 1 - flesh/generic/liver.face | 3 + flesh/generic/tongue.arc | 1 - flesh/generic/tongue.face | 3 + flesh/goblin/goblin_head.arc | 1 - flesh/goblin/goblin_head.face | 3 + flesh/human/arm.arc | 1 - flesh/human/arm.face | 3 + flesh/human/corpse.arc | 1 - flesh/human/corpse.face | 3 + flesh/human/corpse1.arc | 1 - flesh/human/corpse1.face | 3 + flesh/human/corpse_pl.arc | 1 - flesh/human/finger.arc | 1 - flesh/human/finger.face | 3 + flesh/human/foot.arc | 1 - flesh/human/foot.face | 3 + flesh/human/hand.arc | 1 - flesh/human/hand.face | 3 + flesh/human/hands.arc | 1 - flesh/human/hands.face | 3 + flesh/human/head.arc | 1 - flesh/human/head.face | 3 + flesh/human/leg.arc | 1 - flesh/human/leg.face | 3 + flesh/human/skin.arc | 1 - flesh/human/skin.face | 3 + flesh/human/tooth.arc | 1 - flesh/human/tooth.face | 3 + flesh/misc/bat_wing.arc | 1 - flesh/misc/bat_wing.face | 3 + flesh/misc/behold_eye.arc | 1 - flesh/misc/behold_eye.face | 3 + flesh/misc/ectoplasm.arc | 1 - flesh/misc/ectoplasm.face | 3 + flesh/misc/insect_sting.arc | 1 - flesh/misc/insect_sting.face | 3 + flesh/misc/insect_wing.arc | 1 - flesh/misc/insect_wing.face | 3 + flesh/misc/pix_dust.arc | 1 - flesh/misc/pix_dust.face | 3 + flesh/misc/pix_wing.arc | 1 - flesh/misc/pix_wing.face | 3 + flesh/misc/residue.arc | 1 - flesh/misc/residue.face | 3 + flesh/misc/serpent_skin.arc | 1 - flesh/misc/serpent_skin.face | 3 + flesh/misc/sheepskin.arc | 1 - flesh/misc/sheepskin.face | 3 + flesh/misc/u_horn.arc | 9 +-- flesh/misc/u_horn.face | 22 ++++++ 199 files changed, 709 insertions(+), 391 deletions(-) create mode 100644 dev/unused/0.91.1/Flyingnote/flying_note.face create mode 100644 dev/unused/0.91.1/Lg_bungalow/lbungalow.face create mode 100644 dev/unused/0.91.1/Monolith/monolith_b.face create mode 100644 dev/unused/0.91.1/Undead/shadow.face create mode 100644 dev/unused/0.91.1/Undead/werewolf.face create mode 100644 dev/unused/0.91.1/centaur.face create mode 100644 dev/unused/0.91.1/dark_uni.face create mode 100644 dev/unused/0.91.1/dark_uni_2.face create mode 100644 dev/unused/0.91.1/grave_clos.face create mode 100644 dev/unused/0.91.1/grave_open.face create mode 100644 dev/unused/0.91.1/lwoodhouse.face create mode 100644 dev/unused/0.91.1/shop.face create mode 100644 dev/unused/0.91.1/shovel_2.face create mode 100644 dev/unused/0.91.7/Town/merchant.face create mode 100644 dev/unused/0.91.7/chaos/broo.face create mode 100644 dev/unused/0.91.7/chaos/c_knight.face create mode 100644 dev/unused/0.91.7/newfood/bag_popcorn.face create mode 100644 dev/unused/0.91.7/newfood/onion.face create mode 100644 dev/unused/0.91.7/newfood/orange.face create mode 100644 dev/unused/0.91.7/newfood/pear.face create mode 100644 dev/unused/0.91.7/newfood/s_weasel.face create mode 100644 dev/unused/0.91.7/newtown/s_shop1.face create mode 100644 dev/unused/0.91.7/newtown/s_shop2.face create mode 100644 dev/wip/spout/pour_spout.face create mode 100644 dev/xpm_pref/Mountain/moun_cave1.face create mode 100644 dev/xpm_pref/Mountain/mountain1.face create mode 100644 dev/xpm_pref/Mountain/mountain2.face create mode 100644 disease/disgusting_puddle.face create mode 100644 disease/incontinence.face create mode 100644 disease/rabies.face create mode 100644 disease/trap_diseased_needle.face create mode 100644 door/Door/door_0.face create mode 100644 door/Door/door_1.face create mode 100644 door/Door/door_2.face create mode 100644 door/Door/door_3.face create mode 100644 door/Door/door_4.face create mode 100644 door/Door/door_5.face create mode 100644 door/Door/door_6.face create mode 100644 door/Door/door_7.face create mode 100644 door/Door/door_8.face create mode 100644 door/Door/door_9.face create mode 100644 door/Door/door_A.face create mode 100644 door/Door/door_B.face create mode 100644 door/Door/door_C.face create mode 100644 door/Door/door_D.face create mode 100644 door/Door/door_E.face create mode 100644 door/Door/door_F.face create mode 100644 door/Locked/key2.face create mode 100644 door/Locked/ldoor1.face create mode 100644 door/Locked/ldoor2.face create mode 100644 door/key1.face create mode 100644 door/large_hdoor.face create mode 100644 door/large_vdoor.face create mode 100644 door/odoor_1.face create mode 100644 door/odoor_2.face create mode 100644 door/odoor_2_fant_blue-green.face create mode 100644 door/odoor_2_fant_blue-yellow.face create mode 100644 door/odoor_2_fant_brown.face create mode 100644 door/odoor_2_fant_red-white.face create mode 100644 door/odoor_2_fant_red-yellow.face create mode 100644 door/wooddoor_1.face create mode 100644 door/wooddoor_2.face create mode 100644 exit/fogexit.face create mode 100644 exit/magic_portal/magic_portal.face create mode 100644 exit/magic_portal/perm_magic_portal.face create mode 100644 exit/whirlwind_exit.face create mode 100644 flesh/demon/demon_head.face create mode 100644 flesh/demon/icor.face create mode 100644 flesh/dragon/dragon_blue_scale.face create mode 100644 flesh/dragon/dragon_claw.face create mode 100644 flesh/dragon/dragon_eye.face create mode 100644 flesh/dragon/dragon_green_scale.face create mode 100644 flesh/dragon/dragon_orange_scale.face create mode 100644 flesh/dragon/dragon_sca.face create mode 100644 flesh/dragon/dragon_wing.face create mode 100644 flesh/generic/big_eye.face create mode 100644 flesh/generic/brain.face create mode 100644 flesh/generic/eye.face create mode 100644 flesh/generic/eyes.face create mode 100644 flesh/generic/heart.face create mode 100644 flesh/generic/hide_black.face create mode 100644 flesh/generic/hide_brown.face create mode 100644 flesh/generic/hide_grey.face create mode 100644 flesh/generic/hide_white.face create mode 100644 flesh/generic/liver.face create mode 100644 flesh/generic/tongue.face create mode 100644 flesh/goblin/goblin_head.face create mode 100644 flesh/human/arm.face create mode 100644 flesh/human/corpse.face create mode 100644 flesh/human/corpse1.face create mode 100644 flesh/human/finger.face create mode 100644 flesh/human/foot.face create mode 100644 flesh/human/hand.face create mode 100644 flesh/human/hands.face create mode 100644 flesh/human/head.face create mode 100644 flesh/human/leg.face create mode 100644 flesh/human/skin.face create mode 100644 flesh/human/tooth.face create mode 100644 flesh/misc/bat_wing.face create mode 100644 flesh/misc/behold_eye.face create mode 100644 flesh/misc/ectoplasm.face create mode 100644 flesh/misc/insect_sting.face create mode 100644 flesh/misc/insect_wing.face create mode 100644 flesh/misc/pix_dust.face create mode 100644 flesh/misc/pix_wing.face create mode 100644 flesh/misc/residue.face create mode 100644 flesh/misc/serpent_skin.face create mode 100644 flesh/misc/sheepskin.face create mode 100644 flesh/misc/u_horn.face diff --git a/dev/unused/0.91.1/Flyingnote/flying_note.face b/dev/unused/0.91.1/Flyingnote/flying_note.face new file mode 100644 index 000000000..1592fdb26 --- /dev/null +++ b/dev/unused/0.91.1/Flyingnote/flying_note.face @@ -0,0 +1,22 @@ +animation flying_note +flyingnote.111 +flyingnote.112 +flyingnote.113 +flyingnote.114 +flyingnote.115 +flyingnote.116 +flyingnote.117 +flyingnote.118 +flyingnote.119 +flyingnote.11A +flyingnote.11B +flyingnote.11A +flyingnote.119 +flyingnote.118 +flyingnote.117 +flyingnote.116 +flyingnote.115 +flyingnote.114 +flyingnote.113 +flyingnote.112 +mina diff --git a/dev/unused/0.91.1/Flyingnote/flyingnote.arc b/dev/unused/0.91.1/Flyingnote/flyingnote.arc index 295bab0db..de1f90f37 100644 --- a/dev/unused/0.91.1/Flyingnote/flyingnote.arc +++ b/dev/unused/0.91.1/Flyingnote/flyingnote.arc @@ -4,28 +4,7 @@ type 88 level 1 move_on walk fly_low face flyingnote.111 -anim -flyingnote.111 -flyingnote.112 -flyingnote.113 -flyingnote.114 -flyingnote.115 -flyingnote.116 -flyingnote.117 -flyingnote.118 -flyingnote.119 -flyingnote.11A -flyingnote.11B -flyingnote.11A -flyingnote.119 -flyingnote.118 -flyingnote.117 -flyingnote.116 -flyingnote.115 -flyingnote.114 -flyingnote.113 -flyingnote.112 -mina +animation flying_note attacktype 4096 wc -30 dam 0 diff --git a/dev/unused/0.91.1/Lg_bungalow/lbungalow.arc b/dev/unused/0.91.1/Lg_bungalow/lbungalow.arc index 06228d666..74dbe827a 100644 --- a/dev/unused/0.91.1/Lg_bungalow/lbungalow.arc +++ b/dev/unused/0.91.1/Lg_bungalow/lbungalow.arc @@ -2,7 +2,6 @@ Object large_bungalow name bungalow type 66 face lbungalow.111 -magicmap brown no_pick 1 is_floor 1 end @@ -11,7 +10,6 @@ Object large_bungalow2 name bungalow type 66 face lbungalow.211 -magicmap brown x 1 is_floor 1 no_pick 1 @@ -21,7 +19,6 @@ Object large_bungalow3 name bungalow type 66 face lbungalow.311 -magicmap brown y 1 no_pick 1 is_floor 1 @@ -31,7 +28,6 @@ Object large_bungalow4 name bungalow type 66 face lbungalow.411 -magicmap brown x 1 y 1 no_pick 1 diff --git a/dev/unused/0.91.1/Lg_bungalow/lbungalow.face b/dev/unused/0.91.1/Lg_bungalow/lbungalow.face new file mode 100644 index 000000000..0e6354b29 --- /dev/null +++ b/dev/unused/0.91.1/Lg_bungalow/lbungalow.face @@ -0,0 +1,12 @@ +face lbungalow.111 +magicmap brown +end +face lbungalow.211 +magicmap brown +end +face lbungalow.311 +magicmap brown +end +face lbungalow.411 +magicmap brown +end diff --git a/dev/unused/0.91.1/Monolith/monolith.arc b/dev/unused/0.91.1/Monolith/monolith.arc index 3b57a3839..63a87b8cb 100644 --- a/dev/unused/0.91.1/Monolith/monolith.arc +++ b/dev/unused/0.91.1/Monolith/monolith.arc @@ -26,16 +26,7 @@ Object monolith_b name a strange black monolith type 66 face monolith.212 -anim -monolith.212 -monolith.213 -monolith.214 -monolith.215 -monolith.216 -monolith.215 -monolith.214 -monolith.213 -mina +animation monolith_b speed .2 y 1 no_pick 1 diff --git a/dev/unused/0.91.1/Monolith/monolith_b.face b/dev/unused/0.91.1/Monolith/monolith_b.face new file mode 100644 index 000000000..bf460ba27 --- /dev/null +++ b/dev/unused/0.91.1/Monolith/monolith_b.face @@ -0,0 +1,10 @@ +animation monolith_b +monolith.212 +monolith.213 +monolith.214 +monolith.215 +monolith.216 +monolith.215 +monolith.214 +monolith.213 +mina diff --git a/dev/unused/0.91.1/Undead/shadow.arc b/dev/unused/0.91.1/Undead/shadow.arc index b30fcf212..adb424831 100644 --- a/dev/unused/0.91.1/Undead/shadow.arc +++ b/dev/unused/0.91.1/Undead/shadow.arc @@ -1,12 +1,7 @@ Object shadow race shadow face shadow.111 -magicmap black -anim -shadow.111 -shadow.112 -shadow.113 -mina +animation shadow monster 1 sleep 1 Wis 14 diff --git a/dev/unused/0.91.1/Undead/shadow.face b/dev/unused/0.91.1/Undead/shadow.face new file mode 100644 index 000000000..273df8413 --- /dev/null +++ b/dev/unused/0.91.1/Undead/shadow.face @@ -0,0 +1,14 @@ +animation shadow +shadow.111 +shadow.112 +shadow.113 +mina +face shadow.111 +magicmap black +end +face shadow.112 +magicmap black +end +face shadow.113 +magicmap black +end diff --git a/dev/unused/0.91.1/Undead/werewolf.arc b/dev/unused/0.91.1/Undead/werewolf.arc index e46f27d19..798d1cb1f 100644 --- a/dev/unused/0.91.1/Undead/werewolf.arc +++ b/dev/unused/0.91.1/Undead/werewolf.arc @@ -2,13 +2,7 @@ Object werewolf randomitems standard race lycantherope face werewolf.111 -anim -werewolf.111 -werewolf.112 -werewolf.111 -werewolf.113 -mina -magicmap brown +animation werewolf monster 1 undead 1 Wis 10 diff --git a/dev/unused/0.91.1/Undead/werewolf.face b/dev/unused/0.91.1/Undead/werewolf.face new file mode 100644 index 000000000..790dbd1ef --- /dev/null +++ b/dev/unused/0.91.1/Undead/werewolf.face @@ -0,0 +1,15 @@ +animation werewolf +werewolf.111 +werewolf.112 +werewolf.111 +werewolf.113 +mina +face werewolf.111 +magicmap brown +end +face werewolf.112 +magicmap brown +end +face werewolf.113 +magicmap brown +end diff --git a/dev/unused/0.91.1/centaur.arc b/dev/unused/0.91.1/centaur.arc index 96235faa7..70b321785 100644 --- a/dev/unused/0.91.1/centaur.arc +++ b/dev/unused/0.91.1/centaur.arc @@ -1,12 +1,7 @@ Object centaur name centaur face centaur.111 -magicmap brown -anim -centaur.111 -centaur.112 -centaur.113 -mina +animation centaur monster 1 alive 1 Int 10 diff --git a/dev/unused/0.91.1/centaur.face b/dev/unused/0.91.1/centaur.face new file mode 100644 index 000000000..01a805075 --- /dev/null +++ b/dev/unused/0.91.1/centaur.face @@ -0,0 +1,14 @@ +animation centaur +centaur.111 +centaur.112 +centaur.113 +mina +face centaur.111 +magicmap brown +end +face centaur.112 +magicmap brown +end +face centaur.113 +magicmap brown +end diff --git a/dev/unused/0.91.1/dark_uni.arc b/dev/unused/0.91.1/dark_uni.arc index cc1b882cb..e31bafe32 100644 --- a/dev/unused/0.91.1/dark_uni.arc +++ b/dev/unused/0.91.1/dark_uni.arc @@ -6,13 +6,7 @@ monster 1 sleep 1 Wis 18 face dark_uni.111 -magicmap black -anim -dark_uni.111 -dark_uni.111 -dark_uni.112 -dark_uni.112 -mina +animation dark_uni level 6 Con 8 Int 15 @@ -44,13 +38,7 @@ More Object dark_uni_2 name dark unicorn face dark_uni.211 -magicmap black -anim -dark_uni.211 -dark_uni.211 -dark_uni.212 -dark_uni.212 -mina +animation dark_uni_2 monster 1 x 1 alive 1 diff --git a/dev/unused/0.91.1/dark_uni.face b/dev/unused/0.91.1/dark_uni.face new file mode 100644 index 000000000..14279b7c9 --- /dev/null +++ b/dev/unused/0.91.1/dark_uni.face @@ -0,0 +1,18 @@ +animation dark_uni +dark_uni.111 +dark_uni.111 +dark_uni.112 +dark_uni.112 +mina +face dark_uni.111 +magicmap black +end +face dark_uni.111 +magicmap black +end +face dark_uni.112 +magicmap black +end +face dark_uni.112 +magicmap black +end diff --git a/dev/unused/0.91.1/dark_uni_2.face b/dev/unused/0.91.1/dark_uni_2.face new file mode 100644 index 000000000..ca46f6d33 --- /dev/null +++ b/dev/unused/0.91.1/dark_uni_2.face @@ -0,0 +1,18 @@ +animation dark_uni_2 +dark_uni.211 +dark_uni.211 +dark_uni.212 +dark_uni.212 +mina +face dark_uni.211 +magicmap black +end +face dark_uni.211 +magicmap black +end +face dark_uni.212 +magicmap black +end +face dark_uni.212 +magicmap black +end diff --git a/dev/unused/0.91.1/grave.arc b/dev/unused/0.91.1/grave.arc index 26b00cea8..13fabbd4e 100644 --- a/dev/unused/0.91.1/grave.arc +++ b/dev/unused/0.91.1/grave.arc @@ -2,7 +2,6 @@ Object grave_open name the open grave face grave_open.111 no_pick 1 -magicmap brown end Object grave_close name the empty grave @@ -14,7 +13,6 @@ face grave_clos.111 type 20 move_block all no_pick 1 -magicmap green end Object shovel_2 name shovel @@ -24,12 +22,6 @@ face shovel_1.111 material 2 weight 30000 value 50 -anim -shovel_1.111 -shovel_1.112 -shovel_1.113 -shovel_1.114 -shovel_1.115 -mina +animation shovel_2 speed 0.1 end diff --git a/dev/unused/0.91.1/grave_clos.face b/dev/unused/0.91.1/grave_clos.face new file mode 100644 index 000000000..ecfccb499 --- /dev/null +++ b/dev/unused/0.91.1/grave_clos.face @@ -0,0 +1,3 @@ +face grave_clos.111 +magicmap green +end diff --git a/dev/unused/0.91.1/grave_open.face b/dev/unused/0.91.1/grave_open.face new file mode 100644 index 000000000..db8ea75ac --- /dev/null +++ b/dev/unused/0.91.1/grave_open.face @@ -0,0 +1,3 @@ +face grave_open.111 +magicmap brown +end diff --git a/dev/unused/0.91.1/lwoodhouse.arc b/dev/unused/0.91.1/lwoodhouse.arc index 3c7afcbba..52becc720 100644 --- a/dev/unused/0.91.1/lwoodhouse.arc +++ b/dev/unused/0.91.1/lwoodhouse.arc @@ -1,7 +1,6 @@ Object large_woodhouse type 66 face lwoodhouse.111 -magicmap brown no_pick 1 is_floor 1 end @@ -9,7 +8,6 @@ More Object large_woodhouse2 type 66 face lwoodhouse.211 -magicmap brown no_pick 1 x 1 is_floor 1 @@ -18,7 +16,6 @@ More Object large_woodhouse3 type 66 face lwoodhouse.311 -magicmap brown no_pick 1 y 1 is_floor 1 @@ -27,7 +24,6 @@ More Object large_woodhouse4 type 66 face lwoodhouse.411 -magicmap brown x 1 y 1 no_pick 1 diff --git a/dev/unused/0.91.1/lwoodhouse.face b/dev/unused/0.91.1/lwoodhouse.face new file mode 100644 index 000000000..21ef14d63 --- /dev/null +++ b/dev/unused/0.91.1/lwoodhouse.face @@ -0,0 +1,12 @@ +face lwoodhouse.111 +magicmap brown +end +face lwoodhouse.211 +magicmap brown +end +face lwoodhouse.311 +magicmap brown +end +face lwoodhouse.411 +magicmap brown +end diff --git a/dev/unused/0.91.1/shop.arc b/dev/unused/0.91.1/shop.arc index 389048f26..d8ec2acba 100644 --- a/dev/unused/0.91.1/shop.arc +++ b/dev/unused/0.91.1/shop.arc @@ -1,6 +1,5 @@ Object shop face shop.111 -magicmap brown type 66 no_pick 1 end diff --git a/dev/unused/0.91.1/shop.face b/dev/unused/0.91.1/shop.face new file mode 100644 index 000000000..c46e166bc --- /dev/null +++ b/dev/unused/0.91.1/shop.face @@ -0,0 +1,3 @@ +face shop.111 +magicmap brown +end diff --git a/dev/unused/0.91.1/shovel_2.face b/dev/unused/0.91.1/shovel_2.face new file mode 100644 index 000000000..f7b144f31 --- /dev/null +++ b/dev/unused/0.91.1/shovel_2.face @@ -0,0 +1,7 @@ +animation shovel_2 +shovel_1.111 +shovel_1.112 +shovel_1.113 +shovel_1.114 +shovel_1.115 +mina diff --git a/dev/unused/0.91.7/Town/merchant.arc b/dev/unused/0.91.7/Town/merchant.arc index 53a94c8a8..57b8c66df 100644 --- a/dev/unused/0.91.7/Town/merchant.arc +++ b/dev/unused/0.91.7/Town/merchant.arc @@ -2,10 +2,7 @@ Object merchant name Merchant randomitems standard face merchant.111 -anim -merchant.171 -merchant.131 -mina +animation merchant is_turning 1 sp 10 maxsp 10 diff --git a/dev/unused/0.91.7/Town/merchant.face b/dev/unused/0.91.7/Town/merchant.face new file mode 100644 index 000000000..7f1271c51 --- /dev/null +++ b/dev/unused/0.91.7/Town/merchant.face @@ -0,0 +1,4 @@ +animation merchant +merchant.171 +merchant.131 +mina diff --git a/dev/unused/0.91.7/chaos/broo.arc b/dev/unused/0.91.7/chaos/broo.arc index 687b9083e..e838b1998 100644 --- a/dev/unused/0.91.7/chaos/broo.arc +++ b/dev/unused/0.91.7/chaos/broo.arc @@ -1,11 +1,6 @@ Object broo face broo.111 -anim -broo.111 -broo.112 -broo.113 -broo.112 -mina +animation broo monster 1 Wis 10 no_pick 1 diff --git a/dev/unused/0.91.7/chaos/broo.face b/dev/unused/0.91.7/chaos/broo.face new file mode 100644 index 000000000..90603f84e --- /dev/null +++ b/dev/unused/0.91.7/chaos/broo.face @@ -0,0 +1,6 @@ +animation broo +broo.111 +broo.112 +broo.113 +broo.112 +mina diff --git a/dev/unused/0.91.7/chaos/c_knight.arc b/dev/unused/0.91.7/chaos/c_knight.arc index eb296cfaa..cc1b4b537 100644 --- a/dev/unused/0.91.7/chaos/c_knight.arc +++ b/dev/unused/0.91.7/chaos/c_knight.arc @@ -2,10 +2,7 @@ Object c_knight name Chaos Knight randomitems standard face c_knight.111 -anim -c_knight.111 -c_knight.112 -mina +animation c_knight monster 1 Wis 10 no_pick 1 diff --git a/dev/unused/0.91.7/chaos/c_knight.face b/dev/unused/0.91.7/chaos/c_knight.face new file mode 100644 index 000000000..db1184d3c --- /dev/null +++ b/dev/unused/0.91.7/chaos/c_knight.face @@ -0,0 +1,4 @@ +animation c_knight +c_knight.111 +c_knight.112 +mina diff --git a/dev/unused/0.91.7/newfood/bag_popcorn.arc b/dev/unused/0.91.7/newfood/bag_popcorn.arc index a75527f28..a84bbd34d 100644 --- a/dev/unused/0.91.7/newfood/bag_popcorn.arc +++ b/dev/unused/0.91.7/newfood/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/dev/unused/0.91.7/newfood/bag_popcorn.face b/dev/unused/0.91.7/newfood/bag_popcorn.face new file mode 100644 index 000000000..c943f8916 --- /dev/null +++ b/dev/unused/0.91.7/newfood/bag_popcorn.face @@ -0,0 +1,3 @@ +face bag_popcorn.111 +magicmap red +end diff --git a/dev/unused/0.91.7/newfood/onion.arc b/dev/unused/0.91.7/newfood/onion.arc index 76b74fd5c..3ed62ce2c 100644 --- a/dev/unused/0.91.7/newfood/onion.arc +++ b/dev/unused/0.91.7/newfood/onion.arc @@ -1,7 +1,6 @@ Object onion name onion face onion.111 -magicmap red food 50 nrof 1 type 6 diff --git a/dev/unused/0.91.7/newfood/onion.face b/dev/unused/0.91.7/newfood/onion.face new file mode 100644 index 000000000..1952ba930 --- /dev/null +++ b/dev/unused/0.91.7/newfood/onion.face @@ -0,0 +1,3 @@ +face onion.111 +magicmap red +end diff --git a/dev/unused/0.91.7/newfood/orange.arc b/dev/unused/0.91.7/newfood/orange.arc index 0a263134f..11912e082 100644 --- a/dev/unused/0.91.7/newfood/orange.arc +++ b/dev/unused/0.91.7/newfood/orange.arc @@ -1,7 +1,6 @@ Object orange name orange face orange.111 -magicmap orange food 25 nrof 1 type 6 diff --git a/dev/unused/0.91.7/newfood/orange.face b/dev/unused/0.91.7/newfood/orange.face new file mode 100644 index 000000000..50e393fc3 --- /dev/null +++ b/dev/unused/0.91.7/newfood/orange.face @@ -0,0 +1,3 @@ +face orange.111 +magicmap orange +end diff --git a/dev/unused/0.91.7/newfood/pear.arc b/dev/unused/0.91.7/newfood/pear.arc index 4de58f917..fd9045d18 100644 --- a/dev/unused/0.91.7/newfood/pear.arc +++ b/dev/unused/0.91.7/newfood/pear.arc @@ -1,6 +1,5 @@ Object pear face pear.111 -magicmap green food 25 nrof 1 type 6 diff --git a/dev/unused/0.91.7/newfood/pear.face b/dev/unused/0.91.7/newfood/pear.face new file mode 100644 index 000000000..82aeb0319 --- /dev/null +++ b/dev/unused/0.91.7/newfood/pear.face @@ -0,0 +1,3 @@ +face pear.111 +magicmap green +end diff --git a/dev/unused/0.91.7/newfood/s_weasel.arc b/dev/unused/0.91.7/newfood/s_weasel.arc index 06283689d..316495bd5 100644 --- a/dev/unused/0.91.7/newfood/s_weasel.arc +++ b/dev/unused/0.91.7/newfood/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/dev/unused/0.91.7/newfood/s_weasel.face b/dev/unused/0.91.7/newfood/s_weasel.face new file mode 100644 index 000000000..97c06e4bd --- /dev/null +++ b/dev/unused/0.91.7/newfood/s_weasel.face @@ -0,0 +1,3 @@ +face s_weasel.111 +magicmap red +end diff --git a/dev/unused/0.91.7/newtown/s_shop1.arc b/dev/unused/0.91.7/newtown/s_shop1.arc index 0aa632937..5b245bafa 100644 --- a/dev/unused/0.91.7/newtown/s_shop1.arc +++ b/dev/unused/0.91.7/newtown/s_shop1.arc @@ -1,7 +1,6 @@ Object s_shop1 name small shop face s_shop1.111 -magicmap black type 66 no_pick 1 end diff --git a/dev/unused/0.91.7/newtown/s_shop1.face b/dev/unused/0.91.7/newtown/s_shop1.face new file mode 100644 index 000000000..ede42a00f --- /dev/null +++ b/dev/unused/0.91.7/newtown/s_shop1.face @@ -0,0 +1,3 @@ +face s_shop1.111 +magicmap black +end diff --git a/dev/unused/0.91.7/newtown/s_shop2.arc b/dev/unused/0.91.7/newtown/s_shop2.arc index f86f365cc..070ba94e7 100644 --- a/dev/unused/0.91.7/newtown/s_shop2.arc +++ b/dev/unused/0.91.7/newtown/s_shop2.arc @@ -2,6 +2,5 @@ Object s_shop2 name small shop face s_shop2.111 type 66 -magicmap black no_pick 1 end diff --git a/dev/unused/0.91.7/newtown/s_shop2.face b/dev/unused/0.91.7/newtown/s_shop2.face new file mode 100644 index 000000000..f4ed0760f --- /dev/null +++ b/dev/unused/0.91.7/newtown/s_shop2.face @@ -0,0 +1,3 @@ +face s_shop2.111 +magicmap black +end diff --git a/dev/wip/manhole/manhole.arc b/dev/wip/manhole/manhole.arc index ea3b47c7f..a56f080a9 100644 --- a/dev/wip/manhole/manhole.arc +++ b/dev/wip/manhole/manhole.arc @@ -13,8 +13,6 @@ no_pick 1 face manhole.114 animation manhole is_animated 0 -visibility 50 -magicmap black wc 4 end More @@ -51,8 +49,6 @@ is_animated 0 move_on walk wc 0 maxsp 1 -visibility 50 -magicmap black end More Object manhole_open_1a diff --git a/dev/wip/manhole/manhole.face b/dev/wip/manhole/manhole.face index 9c461113a..895633685 100644 --- a/dev/wip/manhole/manhole.face +++ b/dev/wip/manhole/manhole.face @@ -4,3 +4,19 @@ manhole.112 manhole.113 manhole.114 mina +face manhole.111 +magicmap black +visibility 50 +end +face manhole.112 +magicmap black +visibility 50 +end +face manhole.113 +magicmap black +visibility 50 +end +face manhole.114 +magicmap black +visibility 50 +end diff --git a/dev/wip/spout/pour_h2o.arc b/dev/wip/spout/pour_h2o.arc index 6acabf3bf..3859c5bc1 100644 --- a/dev/wip/spout/pour_h2o.arc +++ b/dev/wip/spout/pour_h2o.arc @@ -2,14 +2,8 @@ Object pour_h2o name pouring water face pour_h2o.111 type 67 -anim -pour_h2o.111 -pour_h2o.112 -pour_h2o.113 -pour_h2o.114 -mina +animation pour_h2o is_animated 1 -magicmap blue no_pick 1 anim_speed 2 map_layer item diff --git a/dev/wip/spout/pour_h2o.face b/dev/wip/spout/pour_h2o.face index d7726b746..c6d583c2b 100644 --- a/dev/wip/spout/pour_h2o.face +++ b/dev/wip/spout/pour_h2o.face @@ -4,3 +4,15 @@ pour_h2o.112 pour_h2o.113 pour_h2o.114 mina +face pour_h2o.111 +magicmap blue +end +face pour_h2o.112 +magicmap blue +end +face pour_h2o.113 +magicmap blue +end +face pour_h2o.114 +magicmap blue +end diff --git a/dev/wip/spout/pour_spout.arc b/dev/wip/spout/pour_spout.arc index 4ce6632d4..4a7f562ed 100644 --- a/dev/wip/spout/pour_spout.arc +++ b/dev/wip/spout/pour_spout.arc @@ -2,7 +2,6 @@ Object pour_spout name wall spout face pour_spout.111 type 79 -magicmap blue no_pick 1 map_layer item end diff --git a/dev/wip/spout/pour_spout.face b/dev/wip/spout/pour_spout.face new file mode 100644 index 000000000..d83d73cef --- /dev/null +++ b/dev/wip/spout/pour_spout.face @@ -0,0 +1,3 @@ +face pour_spout.111 +magicmap blue +end diff --git a/dev/xpm_pref/Mountain/moun_cave1.arc b/dev/xpm_pref/Mountain/moun_cave1.arc index 2828efa89..b129b4ff4 100644 --- a/dev/xpm_pref/Mountain/moun_cave1.arc +++ b/dev/xpm_pref/Mountain/moun_cave1.arc @@ -2,6 +2,5 @@ Object mountain_cave name cave type 66 face moun_cave1.111 -magicmap grey no_pick 1 end diff --git a/dev/xpm_pref/Mountain/moun_cave1.face b/dev/xpm_pref/Mountain/moun_cave1.face new file mode 100644 index 000000000..9478e6c05 --- /dev/null +++ b/dev/xpm_pref/Mountain/moun_cave1.face @@ -0,0 +1,3 @@ +face moun_cave1.111 +magicmap grey +end diff --git a/dev/xpm_pref/Mountain/mountain1.arc b/dev/xpm_pref/Mountain/mountain1.arc index 16db75504..b9306d59d 100644 --- a/dev/xpm_pref/Mountain/mountain1.arc +++ b/dev/xpm_pref/Mountain/mountain1.arc @@ -4,7 +4,6 @@ face mountain1.111 type 67 race /terrain/mountain move_on walk -magicmap grey no_pick 1 blocksview 1 move_slow walk diff --git a/dev/xpm_pref/Mountain/mountain1.face b/dev/xpm_pref/Mountain/mountain1.face new file mode 100644 index 000000000..0c25eefde --- /dev/null +++ b/dev/xpm_pref/Mountain/mountain1.face @@ -0,0 +1,3 @@ +face mountain1.111 +magicmap grey +end diff --git a/dev/xpm_pref/Mountain/mountain2.arc b/dev/xpm_pref/Mountain/mountain2.arc index ac600b763..08583f574 100644 --- a/dev/xpm_pref/Mountain/mountain2.arc +++ b/dev/xpm_pref/Mountain/mountain2.arc @@ -4,7 +4,6 @@ face mountain2.111 type 67 race /terrain/mountain move_on walk -magicmap white no_pick 1 move_slow walk move_slow_penalty 10 diff --git a/dev/xpm_pref/Mountain/mountain2.face b/dev/xpm_pref/Mountain/mountain2.face new file mode 100644 index 000000000..a216fb30b --- /dev/null +++ b/dev/xpm_pref/Mountain/mountain2.face @@ -0,0 +1,3 @@ +face mountain2.111 +magicmap white +end diff --git a/disease/diarrhea.arc b/disease/diarrhea.arc index 49319e696..f19f355a6 100644 --- a/disease/diarrhea.arc +++ b/disease/diarrhea.arc @@ -25,48 +25,7 @@ Object disgusting_puddle name stinking puddle of diarrhea type 72 face icor.111 -anim -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.115 -icor.116 -icor.117 -icor.118 -icor.119 -icor.11A -icor.11B -icor.11C -mina +animation disgusting_puddle is_used_up 1 speed 0.005 food 1 diff --git a/disease/diseased_needle.arc b/disease/diseased_needle.arc index c8a3ec96c..2f3210809 100644 --- a/disease/diseased_needle.arc +++ b/disease/diseased_needle.arc @@ -8,10 +8,7 @@ hp 1 msg You are pricked by a needle! endmsg -anim -needle.111 -needle.111 -mina +animation trap_diseased_needle level 1 is_animated 0 invisible 1 diff --git a/disease/disgusting_puddle.face b/disease/disgusting_puddle.face new file mode 100644 index 000000000..c7124734a --- /dev/null +++ b/disease/disgusting_puddle.face @@ -0,0 +1,42 @@ +animation disgusting_puddle +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.115 +icor.116 +icor.117 +icor.118 +icor.119 +icor.11A +icor.11B +icor.11C +mina diff --git a/disease/incontinence.arc b/disease/incontinence.arc index 51bdb41e4..facb6d12f 100644 --- a/disease/incontinence.arc +++ b/disease/incontinence.arc @@ -25,9 +25,7 @@ Object reeking_urine name reeking puddle of urine type 72 face residue.111 -anim -residue.111 -mina +animation incontinence is_used_up 1 speed 0.0002 food 1 diff --git a/disease/incontinence.face b/disease/incontinence.face new file mode 100644 index 000000000..9189ba559 --- /dev/null +++ b/disease/incontinence.face @@ -0,0 +1,3 @@ +animation incontinence +residue.111 +mina diff --git a/disease/rabies.arc b/disease/rabies.arc index d2254b70d..2757f2818 100644 --- a/disease/rabies.arc +++ b/disease/rabies.arc @@ -32,9 +32,7 @@ end Object puddle_of_saliva name puddle of froth and saliva face residue.111 -anim -residue.111 -mina +animation rabies is_used_up 1 speed 0.0002 type 72 diff --git a/disease/rabies.face b/disease/rabies.face new file mode 100644 index 000000000..8d282c76d --- /dev/null +++ b/disease/rabies.face @@ -0,0 +1,3 @@ +animation rabies +residue.111 +mina diff --git a/disease/trap_diseased_needle.face b/disease/trap_diseased_needle.face new file mode 100644 index 000000000..c3e769fbe --- /dev/null +++ b/disease/trap_diseased_needle.face @@ -0,0 +1,4 @@ +animation trap_diseased_needle +needle.111 +needle.111 +mina diff --git a/door/Door/door.arc b/door/Door/door.arc index f244b5d28..22d91d0f5 100644 --- a/door/Door/door.arc +++ b/door/Door/door.arc @@ -4,7 +4,6 @@ randomitems door move_block all blocksview 1 face door_0.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -20,7 +19,6 @@ randomitems door move_block all blocksview 1 face door_1.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -36,7 +34,6 @@ randomitems door move_block all blocksview 1 face door_2.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -52,7 +49,6 @@ randomitems door move_block all blocksview 1 face door_3.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -68,7 +64,6 @@ randomitems door move_block all blocksview 1 face door_4.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -84,7 +79,6 @@ randomitems door move_block all blocksview 1 face door_5.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -100,7 +94,6 @@ randomitems door move_block all blocksview 1 face door_6.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -116,7 +109,6 @@ randomitems door move_block all blocksview 1 face door_7.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -132,7 +124,6 @@ randomitems door move_block all blocksview 1 face door_8.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -148,7 +139,6 @@ randomitems door move_block all blocksview 1 face door_9.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -164,7 +154,6 @@ name door move_block all blocksview 1 face door_A.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -180,7 +169,6 @@ name door move_block all blocksview 1 face door_B.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -196,7 +184,6 @@ name door move_block all blocksview 1 face door_C.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -212,7 +199,6 @@ name door move_block all blocksview 1 face door_D.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -228,7 +214,6 @@ name door move_block all blocksview 1 face door_E.111 -magicmap dark_orange hp 400 exp 1 ac 10 @@ -244,7 +229,6 @@ name door move_block all blocksview 1 face door_F.111 -magicmap dark_orange hp 400 exp 1 ac 10 diff --git a/door/Door/door_0.face b/door/Door/door_0.face new file mode 100644 index 000000000..78aacac68 --- /dev/null +++ b/door/Door/door_0.face @@ -0,0 +1,3 @@ +face door_0.111 +magicmap dark_orange +end diff --git a/door/Door/door_1.face b/door/Door/door_1.face new file mode 100644 index 000000000..bda2596c3 --- /dev/null +++ b/door/Door/door_1.face @@ -0,0 +1,3 @@ +face door_1.111 +magicmap dark_orange +end diff --git a/door/Door/door_2.face b/door/Door/door_2.face new file mode 100644 index 000000000..f8a96e886 --- /dev/null +++ b/door/Door/door_2.face @@ -0,0 +1,3 @@ +face door_2.111 +magicmap dark_orange +end diff --git a/door/Door/door_3.face b/door/Door/door_3.face new file mode 100644 index 000000000..821c32ac9 --- /dev/null +++ b/door/Door/door_3.face @@ -0,0 +1,3 @@ +face door_3.111 +magicmap dark_orange +end diff --git a/door/Door/door_4.face b/door/Door/door_4.face new file mode 100644 index 000000000..e0ddfa979 --- /dev/null +++ b/door/Door/door_4.face @@ -0,0 +1,3 @@ +face door_4.111 +magicmap dark_orange +end diff --git a/door/Door/door_5.face b/door/Door/door_5.face new file mode 100644 index 000000000..8877572b3 --- /dev/null +++ b/door/Door/door_5.face @@ -0,0 +1,3 @@ +face door_5.111 +magicmap dark_orange +end diff --git a/door/Door/door_6.face b/door/Door/door_6.face new file mode 100644 index 000000000..e2a4f5c62 --- /dev/null +++ b/door/Door/door_6.face @@ -0,0 +1,3 @@ +face door_6.111 +magicmap dark_orange +end diff --git a/door/Door/door_7.face b/door/Door/door_7.face new file mode 100644 index 000000000..df102be4b --- /dev/null +++ b/door/Door/door_7.face @@ -0,0 +1,3 @@ +face door_7.111 +magicmap dark_orange +end diff --git a/door/Door/door_8.face b/door/Door/door_8.face new file mode 100644 index 000000000..52076ba00 --- /dev/null +++ b/door/Door/door_8.face @@ -0,0 +1,3 @@ +face door_8.111 +magicmap dark_orange +end diff --git a/door/Door/door_9.face b/door/Door/door_9.face new file mode 100644 index 000000000..fa9a99dff --- /dev/null +++ b/door/Door/door_9.face @@ -0,0 +1,3 @@ +face door_9.111 +magicmap dark_orange +end diff --git a/door/Door/door_A.face b/door/Door/door_A.face new file mode 100644 index 000000000..b5116f363 --- /dev/null +++ b/door/Door/door_A.face @@ -0,0 +1,3 @@ +face door_A.111 +magicmap dark_orange +end diff --git a/door/Door/door_B.face b/door/Door/door_B.face new file mode 100644 index 000000000..bde13b08c --- /dev/null +++ b/door/Door/door_B.face @@ -0,0 +1,3 @@ +face door_B.111 +magicmap dark_orange +end diff --git a/door/Door/door_C.face b/door/Door/door_C.face new file mode 100644 index 000000000..68c63595b --- /dev/null +++ b/door/Door/door_C.face @@ -0,0 +1,3 @@ +face door_C.111 +magicmap dark_orange +end diff --git a/door/Door/door_D.face b/door/Door/door_D.face new file mode 100644 index 000000000..d1f1954c3 --- /dev/null +++ b/door/Door/door_D.face @@ -0,0 +1,3 @@ +face door_D.111 +magicmap dark_orange +end diff --git a/door/Door/door_E.face b/door/Door/door_E.face new file mode 100644 index 000000000..5edc54b4c --- /dev/null +++ b/door/Door/door_E.face @@ -0,0 +1,3 @@ +face door_E.111 +magicmap dark_orange +end diff --git a/door/Door/door_F.face b/door/Door/door_F.face new file mode 100644 index 000000000..9229c25f8 --- /dev/null +++ b/door/Door/door_F.face @@ -0,0 +1,3 @@ +face door_F.111 +magicmap dark_orange +end diff --git a/door/Locked/key2.arc b/door/Locked/key2.arc index b34126262..8c62a55a9 100644 --- a/door/Locked/key2.arc +++ b/door/Locked/key2.arc @@ -3,7 +3,6 @@ name strange key race keys slaying set_individual_value face key2.111 -magicmap dark_orange type 21 value 100 weight 100 diff --git a/door/Locked/key2.face b/door/Locked/key2.face new file mode 100644 index 000000000..45781090d --- /dev/null +++ b/door/Locked/key2.face @@ -0,0 +1,3 @@ +face key2.111 +magicmap dark_orange +end diff --git a/door/Locked/ldoor1.arc b/door/Locked/ldoor1.arc index eaa5eef46..d0b7c3137 100644 --- a/door/Locked/ldoor1.arc +++ b/door/Locked/ldoor1.arc @@ -6,7 +6,6 @@ You need the special key to open this door. endmsg move_block all face ldoor1.111 -magicmap dark_orange type 20 no_pick 1 no_magic 1 diff --git a/door/Locked/ldoor1.face b/door/Locked/ldoor1.face new file mode 100644 index 000000000..c131c6e82 --- /dev/null +++ b/door/Locked/ldoor1.face @@ -0,0 +1,3 @@ +face ldoor1.111 +magicmap dark_orange +end diff --git a/door/Locked/ldoor2.arc b/door/Locked/ldoor2.arc index 82f599a3e..b7004b077 100644 --- a/door/Locked/ldoor2.arc +++ b/door/Locked/ldoor2.arc @@ -6,7 +6,6 @@ You need the special key to open this door. endmsg move_block all face ldoor2.111 -magicmap dark_orange type 20 no_pick 1 no_magic 1 diff --git a/door/Locked/ldoor2.face b/door/Locked/ldoor2.face new file mode 100644 index 000000000..299a43a62 --- /dev/null +++ b/door/Locked/ldoor2.face @@ -0,0 +1,3 @@ +face ldoor2.111 +magicmap dark_orange +end diff --git a/door/key1.arc b/door/key1.arc index faa57c107..deea68927 100644 --- a/door/key1.arc +++ b/door/key1.arc @@ -1,7 +1,6 @@ Object key race keys face key1.111 -magicmap orange nrof 1 type 24 material 2 diff --git a/door/key1.face b/door/key1.face new file mode 100644 index 000000000..225af2478 --- /dev/null +++ b/door/key1.face @@ -0,0 +1,3 @@ +face key1.111 +magicmap orange +end diff --git a/door/large_hdoor.arc b/door/large_hdoor.arc index 09b84cc24..16ac86f9f 100644 --- a/door/large_hdoor.arc +++ b/door/large_hdoor.arc @@ -2,7 +2,6 @@ Object large_hdoor1 name large door move_block 0 face large_hdoor.111 -magicmap brown type 23 material 2 no_pick 1 @@ -12,7 +11,6 @@ Object large_hdoor2 name large door move_block 0 face large_hdoor.111 -magicmap brown type 23 material 2 no_pick 1 @@ -23,7 +21,6 @@ Object large_hdoor3 name large door move_block 0 face large_hdoor.111 -magicmap brown type 23 material 2 no_pick 1 diff --git a/door/large_hdoor.face b/door/large_hdoor.face new file mode 100644 index 000000000..c8f7dd728 --- /dev/null +++ b/door/large_hdoor.face @@ -0,0 +1,3 @@ +face large_hdoor.111 +magicmap brown +end diff --git a/door/large_vdoor.arc b/door/large_vdoor.arc index 575e3b7da..3a0c67bdf 100644 --- a/door/large_vdoor.arc +++ b/door/large_vdoor.arc @@ -2,7 +2,6 @@ Object large_vdoor1 name large door move_block 0 face large_vdoor.111 -magicmap brown type 23 material 2 no_pick 1 @@ -12,7 +11,6 @@ Object large_vdoor2 name large door move_block 0 face large_vdoor.111 -magicmap brown type 23 material 2 no_pick 1 @@ -23,7 +21,6 @@ Object large_vdoor3 name large door move_block 0 face large_vdoor.111 -magicmap brown type 23 material 2 no_pick 1 diff --git a/door/large_vdoor.face b/door/large_vdoor.face new file mode 100644 index 000000000..ec2282cd7 --- /dev/null +++ b/door/large_vdoor.face @@ -0,0 +1,3 @@ +face large_vdoor.111 +magicmap brown +end diff --git a/door/odoor_1.arc b/door/odoor_1.arc index ea4c7361f..c45cae908 100644 --- a/door/odoor_1.arc +++ b/door/odoor_1.arc @@ -4,7 +4,6 @@ randomitems door move_block all blocksview 1 face odoor_1.111 -magicmap orange hp 400 exp 1 ac 10 diff --git a/door/odoor_1.face b/door/odoor_1.face new file mode 100644 index 000000000..bb8601534 --- /dev/null +++ b/door/odoor_1.face @@ -0,0 +1,3 @@ +face odoor_1.111 +magicmap orange +end diff --git a/door/odoor_2.arc b/door/odoor_2.arc index b47d399c4..6c7c90442 100644 --- a/door/odoor_2.arc +++ b/door/odoor_2.arc @@ -4,7 +4,6 @@ randomitems door move_block all blocksview 1 face odoor_2.111 -magicmap orange hp 400 exp 1 ac 10 diff --git a/door/odoor_2.face b/door/odoor_2.face new file mode 100644 index 000000000..1f52db373 --- /dev/null +++ b/door/odoor_2.face @@ -0,0 +1,3 @@ +face odoor_2.111 +magicmap orange +end diff --git a/door/odoor_2_fant.arc b/door/odoor_2_fant.arc index 87cbc4f65..4e512c2a6 100644 --- a/door/odoor_2_fant.arc +++ b/door/odoor_2_fant.arc @@ -4,7 +4,6 @@ randomitems door move_block all blocksview 1 face odoor_2_fant_blue-green.111 -magicmap orange hp 400 exp 1 ac 10 @@ -21,7 +20,6 @@ randomitems door move_block all blocksview 1 face odoor_2_fant_blue-yellow.111 -magicmap orange hp 400 exp 1 ac 10 @@ -38,7 +36,6 @@ randomitems door move_block all blocksview 1 face odoor_2_fant_brown.111 -magicmap orange hp 400 exp 1 ac 10 @@ -55,7 +52,6 @@ randomitems door move_block all blocksview 1 face odoor_2_fant_red-white.111 -magicmap orange hp 400 exp 1 ac 10 @@ -72,7 +68,6 @@ randomitems door move_block all blocksview 1 face odoor_2_fant_red-yellow.111 -magicmap orange hp 400 exp 1 ac 10 diff --git a/door/odoor_2_fant_blue-green.face b/door/odoor_2_fant_blue-green.face new file mode 100644 index 000000000..4567d8eb5 --- /dev/null +++ b/door/odoor_2_fant_blue-green.face @@ -0,0 +1,3 @@ +face odoor_2_fant_blue-green.111 +magicmap orange +end diff --git a/door/odoor_2_fant_blue-yellow.face b/door/odoor_2_fant_blue-yellow.face new file mode 100644 index 000000000..fd7f230dc --- /dev/null +++ b/door/odoor_2_fant_blue-yellow.face @@ -0,0 +1,3 @@ +face odoor_2_fant_blue-yellow.111 +magicmap orange +end diff --git a/door/odoor_2_fant_brown.face b/door/odoor_2_fant_brown.face new file mode 100644 index 000000000..4e2a086c2 --- /dev/null +++ b/door/odoor_2_fant_brown.face @@ -0,0 +1,3 @@ +face odoor_2_fant_brown.111 +magicmap orange +end diff --git a/door/odoor_2_fant_red-white.face b/door/odoor_2_fant_red-white.face new file mode 100644 index 000000000..ca2a4571d --- /dev/null +++ b/door/odoor_2_fant_red-white.face @@ -0,0 +1,3 @@ +face odoor_2_fant_red-white.111 +magicmap orange +end diff --git a/door/odoor_2_fant_red-yellow.face b/door/odoor_2_fant_red-yellow.face new file mode 100644 index 000000000..5907e9fba --- /dev/null +++ b/door/odoor_2_fant_red-yellow.face @@ -0,0 +1,3 @@ +face odoor_2_fant_red-yellow.111 +magicmap orange +end diff --git a/door/wooddoor_1.arc b/door/wooddoor_1.arc index b52a8a731..9a6dbb37f 100644 --- a/door/wooddoor_1.arc +++ b/door/wooddoor_1.arc @@ -3,7 +3,6 @@ name door randomitems door move_block all face wooddoor_1.111 -magicmap brown hp 400 exp 1 ac 10 diff --git a/door/wooddoor_1.face b/door/wooddoor_1.face new file mode 100644 index 000000000..3948801f6 --- /dev/null +++ b/door/wooddoor_1.face @@ -0,0 +1,3 @@ +face wooddoor_1.111 +magicmap brown +end diff --git a/door/wooddoor_2.arc b/door/wooddoor_2.arc index a923572b7..d643bc3d8 100644 --- a/door/wooddoor_2.arc +++ b/door/wooddoor_2.arc @@ -3,7 +3,6 @@ name door randomitems door move_block all face wooddoor_2.111 -magicmap brown hp 400 exp 1 ac 10 diff --git a/door/wooddoor_2.face b/door/wooddoor_2.face new file mode 100644 index 000000000..d7ddce884 --- /dev/null +++ b/door/wooddoor_2.face @@ -0,0 +1,3 @@ +face wooddoor_2.111 +magicmap brown +end diff --git a/exit/exit.arc b/exit/exit.arc index 1c2d4cd7e..c932ac302 100644 --- a/exit/exit.arc +++ b/exit/exit.arc @@ -4,12 +4,7 @@ anim_speed 2 client_anim_random 1 type 66 no_pick 1 -anim -exit.111 -exit.113 -exit.115 -exit.117 -mina +animation exit move_on walk fly_low client_type 25012 end diff --git a/exit/exit.face b/exit/exit.face index 22e0fb959..01d1d9b56 100644 --- a/exit/exit.face +++ b/exit/exit.face @@ -1,3 +1,9 @@ +animation exit +exit.111 +exit.113 +exit.115 +exit.117 +mina face exit.111 magicmap blue visibility 100 diff --git a/exit/fogexit.arc b/exit/fogexit.arc index 89fd047c5..d63cf01bd 100644 --- a/exit/fogexit.arc +++ b/exit/fogexit.arc @@ -5,17 +5,7 @@ anim_speed 5 client_anim_random 1 type 66 no_pick 1 -anim -fog.111 -empty.111 -fog.111 -fog.112 -fog.111 -fog.112 -fog.111 -empty.111 -empty.111 -mina +animation fogexit move_on walk fly_low client_type 25012 end diff --git a/exit/fogexit.face b/exit/fogexit.face new file mode 100644 index 000000000..395520af6 --- /dev/null +++ b/exit/fogexit.face @@ -0,0 +1,11 @@ +animation fogexit +fog.111 +empty.111 +fog.111 +fog.112 +fog.111 +fog.112 +fog.111 +empty.111 +empty.111 +mina diff --git a/exit/magic_portal/magic_portal.arc b/exit/magic_portal/magic_portal.arc index a51dd125a..062615d81 100644 --- a/exit/magic_portal/magic_portal.arc +++ b/exit/magic_portal/magic_portal.arc @@ -8,10 +8,7 @@ anim_speed 3 client_anim_random 1 type 66 no_pick 1 -anim -magic_portal.111 -magic_portal.112 -mina +animation perm_magic_portal client_type 25011 end Object magic_portal @@ -22,68 +19,7 @@ sp 19 speed 0.3 type 66 no_pick 1 -anim -magic_portal.11K -magic_portal.11J -magic_portal.11I -magic_portal.11H -magic_portal.11G -magic_portal.11F -magic_portal.11E -magic_portal.11B -magic_portal.11A -magic_portal.119 -magic_portal.118 -magic_portal.117 -magic_portal.116 -magic_portal.115 -magic_portal.113 -magic_portal.114 -magic_portal.111 -magic_portal.112 -magic_portal.111 -magic_portal.112 -magic_portal.111 -magic_portal.112 -magic_portal.111 -magic_portal.112 -magic_portal.111 -magic_portal.112 -magic_portal.111 -magic_portal.112 -magic_portal.111 -magic_portal.112 -magic_portal.113 -magic_portal.114 -magic_portal.113 -magic_portal.114 -magic_portal.113 -magic_portal.114 -magic_portal.113 -magic_portal.114 -magic_portal.115 -magic_portal.116 -magic_portal.115 -magic_portal.116 -magic_portal.117 -magic_portal.118 -magic_portal.119 -magic_portal.11A -magic_portal.11B -magic_portal.11C -magic_portal.11D -magic_portal.11C -magic_portal.11D -magic_portal.11E -magic_portal.11F -magic_portal.11G -magic_portal.11H -magic_portal.11I -magic_portal.11J -magic_portal.11K -magic_portal.11L -magic_portal.11M -mina +animation magic_portal is_used_up 1 food 59 changing 1 diff --git a/exit/magic_portal/magic_portal.face b/exit/magic_portal/magic_portal.face new file mode 100644 index 000000000..6f8d70c1f --- /dev/null +++ b/exit/magic_portal/magic_portal.face @@ -0,0 +1,62 @@ +animation magic_portal +magic_portal.11K +magic_portal.11J +magic_portal.11I +magic_portal.11H +magic_portal.11G +magic_portal.11F +magic_portal.11E +magic_portal.11B +magic_portal.11A +magic_portal.119 +magic_portal.118 +magic_portal.117 +magic_portal.116 +magic_portal.115 +magic_portal.113 +magic_portal.114 +magic_portal.111 +magic_portal.112 +magic_portal.111 +magic_portal.112 +magic_portal.111 +magic_portal.112 +magic_portal.111 +magic_portal.112 +magic_portal.111 +magic_portal.112 +magic_portal.111 +magic_portal.112 +magic_portal.111 +magic_portal.112 +magic_portal.113 +magic_portal.114 +magic_portal.113 +magic_portal.114 +magic_portal.113 +magic_portal.114 +magic_portal.113 +magic_portal.114 +magic_portal.115 +magic_portal.116 +magic_portal.115 +magic_portal.116 +magic_portal.117 +magic_portal.118 +magic_portal.119 +magic_portal.11A +magic_portal.11B +magic_portal.11C +magic_portal.11D +magic_portal.11C +magic_portal.11D +magic_portal.11E +magic_portal.11F +magic_portal.11G +magic_portal.11H +magic_portal.11I +magic_portal.11J +magic_portal.11K +magic_portal.11L +magic_portal.11M +mina diff --git a/exit/magic_portal/perm_magic_portal.face b/exit/magic_portal/perm_magic_portal.face new file mode 100644 index 000000000..9eee0e5d0 --- /dev/null +++ b/exit/magic_portal/perm_magic_portal.face @@ -0,0 +1,4 @@ +animation perm_magic_portal +magic_portal.111 +magic_portal.112 +mina diff --git a/exit/whirlwind.arc b/exit/whirlwind.arc index 077646c6a..0072ffcbe 100644 --- a/exit/whirlwind.arc +++ b/exit/whirlwind.arc @@ -5,15 +5,7 @@ anim_speed 5 client_anim_random 1 type 66 no_pick 1 -anim -elem_air.111 -elem_air.112 -empty.111 -elem_air.111 -elem_air.112 -empty.111 -empty.111 -mina +animation whirlwind_exit move_on walk fly_low client_type 25012 end diff --git a/exit/whirlwind_exit.face b/exit/whirlwind_exit.face new file mode 100644 index 000000000..e2e1f1206 --- /dev/null +++ b/exit/whirlwind_exit.face @@ -0,0 +1,9 @@ +animation whirlwind_exit +elem_air.111 +elem_air.112 +empty.111 +elem_air.111 +elem_air.112 +empty.111 +empty.111 +mina diff --git a/flesh/demon/demon_head.arc b/flesh/demon/demon_head.arc index 4dd8ca0cb..6772b8d52 100644 --- a/flesh/demon/demon_head.arc +++ b/flesh/demon/demon_head.arc @@ -6,7 +6,6 @@ type 72 nrof 1 weight 25 value 400 -magicmap red name_pl heads client_type 625 end diff --git a/flesh/demon/demon_head.face b/flesh/demon/demon_head.face new file mode 100644 index 000000000..25f7b23b5 --- /dev/null +++ b/flesh/demon/demon_head.face @@ -0,0 +1,3 @@ +face demon_head.111 +magicmap red +end diff --git a/flesh/demon/icor.arc b/flesh/demon/icor.arc index d7f8fd4dd..8eb5aac3e 100644 --- a/flesh/demon/icor.arc +++ b/flesh/demon/icor.arc @@ -1,53 +1,11 @@ Object icor nrof 1 face icor.111 -anim -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.111 -icor.112 -icor.113 -icor.114 -icor.115 -icor.116 -icor.117 -icor.118 -icor.119 -icor.11A -icor.11B -icor.11C -mina +animation icor is_used_up 1 material 32 food 40 type 72 -magicmap green weight 45 speed 0.03 hp -100 diff --git a/flesh/demon/icor.face b/flesh/demon/icor.face new file mode 100644 index 000000000..a31f7aedb --- /dev/null +++ b/flesh/demon/icor.face @@ -0,0 +1,78 @@ +animation icor +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.111 +icor.112 +icor.113 +icor.114 +icor.115 +icor.116 +icor.117 +icor.118 +icor.119 +icor.11A +icor.11B +icor.11C +mina +face icor.111 +magicmap green +end +face icor.112 +magicmap green +end +face icor.113 +magicmap green +end +face icor.114 +magicmap green +end +face icor.115 +magicmap green +end +face icor.116 +magicmap green +end +face icor.117 +magicmap green +end +face icor.118 +magicmap green +end +face icor.119 +magicmap green +end +face icor.11A +magicmap green +end +face icor.11B +magicmap green +end +face icor.11C +magicmap green +end diff --git a/flesh/dragon/dragon_blue_scale.face b/flesh/dragon/dragon_blue_scale.face new file mode 100644 index 000000000..3fa479fcb --- /dev/null +++ b/flesh/dragon/dragon_blue_scale.face @@ -0,0 +1,3 @@ +face dragon_blue_scale.111 +magicmap blue +end diff --git a/flesh/dragon/dragon_claw.arc b/flesh/dragon/dragon_claw.arc index 029688621..78b58d921 100644 --- a/flesh/dragon/dragon_claw.arc +++ b/flesh/dragon/dragon_claw.arc @@ -2,7 +2,6 @@ Object dragonclaw name dragon's claw nrof 1 face dragon_claw.111 -magicmap green material 32 weight 1 value 55 diff --git a/flesh/dragon/dragon_claw.face b/flesh/dragon/dragon_claw.face new file mode 100644 index 000000000..61b22abb3 --- /dev/null +++ b/flesh/dragon/dragon_claw.face @@ -0,0 +1,3 @@ +face dragon_claw.111 +magicmap green +end diff --git a/flesh/dragon/dragon_eye.arc b/flesh/dragon/dragon_eye.arc index 9ea9fea8a..6c7137c42 100644 --- a/flesh/dragon/dragon_eye.arc +++ b/flesh/dragon/dragon_eye.arc @@ -6,7 +6,6 @@ material 32 type 72 weight 2 value 30 -magicmap white name_pl eyes client_type 625 end diff --git a/flesh/dragon/dragon_eye.face b/flesh/dragon/dragon_eye.face new file mode 100644 index 000000000..38b9cca0c --- /dev/null +++ b/flesh/dragon/dragon_eye.face @@ -0,0 +1,3 @@ +face dragon_eye.111 +magicmap white +end diff --git a/flesh/dragon/dragon_green_scale.face b/flesh/dragon/dragon_green_scale.face new file mode 100644 index 000000000..a4c0b6300 --- /dev/null +++ b/flesh/dragon/dragon_green_scale.face @@ -0,0 +1,3 @@ +face dragon_green_scale.111 +magicmap green +end diff --git a/flesh/dragon/dragon_orange_scale.face b/flesh/dragon/dragon_orange_scale.face new file mode 100644 index 000000000..731aff2be --- /dev/null +++ b/flesh/dragon/dragon_orange_scale.face @@ -0,0 +1,3 @@ +face dragon_orange_scale.111 +magicmap orange +end diff --git a/flesh/dragon/dragon_sca.arc b/flesh/dragon/dragon_sca.arc index 0ba84c597..f23549495 100644 --- a/flesh/dragon/dragon_sca.arc +++ b/flesh/dragon/dragon_sca.arc @@ -3,7 +3,6 @@ name dragon scale nrof 1 type 73 face dragon_sca.111 -magicmap dark_orange weight 25000 name_pl dragon scales client_type 627 @@ -13,7 +12,6 @@ name blue dragon scale nrof 1 type 73 face dragon_blue_scale.111 -magicmap blue weight 25000 name_pl blue dragon scales client_type 627 @@ -23,7 +21,6 @@ name green dragon scale nrof 1 type 73 face dragon_green_scale.111 -magicmap green weight 25000 name_pl green dragon scales client_type 627 @@ -33,7 +30,6 @@ name orange dragon scale nrof 1 type 73 face dragon_orange_scale.111 -magicmap orange weight 25000 name_pl orange dragon scales client_type 627 diff --git a/flesh/dragon/dragon_sca.face b/flesh/dragon/dragon_sca.face new file mode 100644 index 000000000..281abac62 --- /dev/null +++ b/flesh/dragon/dragon_sca.face @@ -0,0 +1,3 @@ +face dragon_sca.111 +magicmap dark_orange +end diff --git a/flesh/dragon/dragon_wing.arc b/flesh/dragon/dragon_wing.arc index e0d0059df..a2241132f 100644 --- a/flesh/dragon/dragon_wing.arc +++ b/flesh/dragon/dragon_wing.arc @@ -6,7 +6,6 @@ material 32 type 72 weight 25 value 100 -magicmap green name_pl wings client_type 626 end diff --git a/flesh/dragon/dragon_wing.face b/flesh/dragon/dragon_wing.face new file mode 100644 index 000000000..b231b23b8 --- /dev/null +++ b/flesh/dragon/dragon_wing.face @@ -0,0 +1,3 @@ +face dragon_wing.111 +magicmap green +end diff --git a/flesh/generic/big_eye.arc b/flesh/generic/big_eye.arc index d1c447b8c..5a1f34de7 100644 --- a/flesh/generic/big_eye.arc +++ b/flesh/generic/big_eye.arc @@ -7,7 +7,6 @@ type 72 food 35 weight 1 value 15 -magicmap white name_pl eyes client_type 625 end diff --git a/flesh/generic/big_eye.face b/flesh/generic/big_eye.face new file mode 100644 index 000000000..672d539a9 --- /dev/null +++ b/flesh/generic/big_eye.face @@ -0,0 +1,3 @@ +face big_eye.111 +magicmap white +end diff --git a/flesh/generic/brain.arc b/flesh/generic/brain.arc index 1ed7dda30..efa66cbea 100755 --- a/flesh/generic/brain.arc +++ b/flesh/generic/brain.arc @@ -6,7 +6,6 @@ type 72 weight 4 value 220 nrof 1 -magicmap black name_pl brains client_type 627 end diff --git a/flesh/generic/brain.face b/flesh/generic/brain.face new file mode 100644 index 000000000..b20158ae1 --- /dev/null +++ b/flesh/generic/brain.face @@ -0,0 +1,3 @@ +face brain.111 +magicmap black +end diff --git a/flesh/generic/eye.arc b/flesh/generic/eye.arc index e215bb5f1..e8a35c577 100644 --- a/flesh/generic/eye.arc +++ b/flesh/generic/eye.arc @@ -6,7 +6,6 @@ type 72 food 1 weight 1 value 15 -magicmap white name_pl eyes client_type 625 end diff --git a/flesh/generic/eye.face b/flesh/generic/eye.face new file mode 100644 index 000000000..0608e6868 --- /dev/null +++ b/flesh/generic/eye.face @@ -0,0 +1,3 @@ +face eye.111 +magicmap white +end diff --git a/flesh/generic/eyes.arc b/flesh/generic/eyes.arc index 200ecdfda..f9fb7e5e3 100644 --- a/flesh/generic/eyes.arc +++ b/flesh/generic/eyes.arc @@ -6,5 +6,4 @@ type 72 food 1 weight 1 value 30 -magicmap white end diff --git a/flesh/generic/eyes.face b/flesh/generic/eyes.face new file mode 100644 index 000000000..dacef3e4c --- /dev/null +++ b/flesh/generic/eyes.face @@ -0,0 +1,3 @@ +face eyes.111 +magicmap white +end diff --git a/flesh/generic/heart.arc b/flesh/generic/heart.arc index 78b08e3a9..e9f708e8a 100644 --- a/flesh/generic/heart.arc +++ b/flesh/generic/heart.arc @@ -3,7 +3,6 @@ name heart nrof 1 face heart.111 material 32 -magicmap red type 72 weight 4 value 200 diff --git a/flesh/generic/heart.face b/flesh/generic/heart.face new file mode 100644 index 000000000..5f7ebbd12 --- /dev/null +++ b/flesh/generic/heart.face @@ -0,0 +1,3 @@ +face heart.111 +magicmap red +end diff --git a/flesh/generic/hide_black.arc b/flesh/generic/hide_black.arc index 511b4680a..27e82a77a 100755 --- a/flesh/generic/hide_black.arc +++ b/flesh/generic/hide_black.arc @@ -3,7 +3,6 @@ name hide nrof 1 face hide_black.111 material 32 -magicmap black type 72 weight 20 value 300 diff --git a/flesh/generic/hide_black.face b/flesh/generic/hide_black.face new file mode 100644 index 000000000..6d0ebf482 --- /dev/null +++ b/flesh/generic/hide_black.face @@ -0,0 +1,3 @@ +face hide_black.111 +magicmap black +end diff --git a/flesh/generic/hide_brown.arc b/flesh/generic/hide_brown.arc index 599b1c130..7b79b68f8 100755 --- a/flesh/generic/hide_brown.arc +++ b/flesh/generic/hide_brown.arc @@ -3,7 +3,6 @@ name hide nrof 1 face hide_brown.111 material 32 -magicmap brown type 72 weight 20 value 300 diff --git a/flesh/generic/hide_brown.face b/flesh/generic/hide_brown.face new file mode 100644 index 000000000..04c694347 --- /dev/null +++ b/flesh/generic/hide_brown.face @@ -0,0 +1,3 @@ +face hide_brown.111 +magicmap brown +end diff --git a/flesh/generic/hide_grey.arc b/flesh/generic/hide_grey.arc index 04624971a..190b9698a 100755 --- a/flesh/generic/hide_grey.arc +++ b/flesh/generic/hide_grey.arc @@ -3,7 +3,6 @@ name hide nrof 1 face hide_grey.111 material 32 -magicmap grey type 72 weight 20 value 300 diff --git a/flesh/generic/hide_grey.face b/flesh/generic/hide_grey.face new file mode 100644 index 000000000..0a95a6c39 --- /dev/null +++ b/flesh/generic/hide_grey.face @@ -0,0 +1,3 @@ +face hide_grey.111 +magicmap grey +end diff --git a/flesh/generic/hide_white.arc b/flesh/generic/hide_white.arc index 304223d1e..f4bd866e3 100755 --- a/flesh/generic/hide_white.arc +++ b/flesh/generic/hide_white.arc @@ -3,7 +3,6 @@ name hide nrof 1 face hide_white.111 material 32 -magicmap white type 72 weight 20 value 300 diff --git a/flesh/generic/hide_white.face b/flesh/generic/hide_white.face new file mode 100644 index 000000000..d5836c876 --- /dev/null +++ b/flesh/generic/hide_white.face @@ -0,0 +1,3 @@ +face hide_white.111 +magicmap white +end diff --git a/flesh/generic/liver.arc b/flesh/generic/liver.arc index 703940d9a..e31562086 100644 --- a/flesh/generic/liver.arc +++ b/flesh/generic/liver.arc @@ -6,7 +6,6 @@ type 72 weight 4 value 120 nrof 1 -magicmap black name_pl livers client_type 627 end diff --git a/flesh/generic/liver.face b/flesh/generic/liver.face new file mode 100644 index 000000000..107be71f7 --- /dev/null +++ b/flesh/generic/liver.face @@ -0,0 +1,3 @@ +face liver.111 +magicmap black +end diff --git a/flesh/generic/tongue.arc b/flesh/generic/tongue.arc index 786d86bc1..c0c098151 100644 --- a/flesh/generic/tongue.arc +++ b/flesh/generic/tongue.arc @@ -6,7 +6,6 @@ type 72 food 2 weight 1 value 20 -magicmap red name_pl tongues client_type 625 end diff --git a/flesh/generic/tongue.face b/flesh/generic/tongue.face new file mode 100644 index 000000000..90165776b --- /dev/null +++ b/flesh/generic/tongue.face @@ -0,0 +1,3 @@ +face tongue.111 +magicmap red +end diff --git a/flesh/goblin/goblin_head.arc b/flesh/goblin/goblin_head.arc index f81c9f0a6..9ee63eea6 100644 --- a/flesh/goblin/goblin_head.arc +++ b/flesh/goblin/goblin_head.arc @@ -7,7 +7,6 @@ type 72 food 30 weight 25 value 15 -magicmap green name_pl heads client_type 625 end diff --git a/flesh/goblin/goblin_head.face b/flesh/goblin/goblin_head.face new file mode 100644 index 000000000..9fd5c0743 --- /dev/null +++ b/flesh/goblin/goblin_head.face @@ -0,0 +1,3 @@ +face goblin_head.111 +magicmap green +end diff --git a/flesh/human/arm.arc b/flesh/human/arm.arc index d5388edf6..03525ef69 100644 --- a/flesh/human/arm.arc +++ b/flesh/human/arm.arc @@ -6,7 +6,6 @@ type 72 food 150 weight 8 value 10 -magicmap khaki name_pl arms client_type 626 end diff --git a/flesh/human/arm.face b/flesh/human/arm.face new file mode 100644 index 000000000..c2dcab432 --- /dev/null +++ b/flesh/human/arm.face @@ -0,0 +1,3 @@ +face arm.111 +magicmap khaki +end diff --git a/flesh/human/corpse.arc b/flesh/human/corpse.arc index 7116c250d..a329742d0 100644 --- a/flesh/human/corpse.arc +++ b/flesh/human/corpse.arc @@ -3,7 +3,6 @@ face corpse.111 nrof 1 material 32 weight 75000 -magicmap white name_pl corpses client_type 622 end diff --git a/flesh/human/corpse.face b/flesh/human/corpse.face new file mode 100644 index 000000000..0d9171c3e --- /dev/null +++ b/flesh/human/corpse.face @@ -0,0 +1,3 @@ +face corpse.111 +magicmap white +end diff --git a/flesh/human/corpse1.arc b/flesh/human/corpse1.arc index ece5f826e..f2e840726 100644 --- a/flesh/human/corpse1.arc +++ b/flesh/human/corpse1.arc @@ -1,6 +1,5 @@ Object corpse1 face corpse1.111 -magicmap blue nrof 1 type 7 material 32 diff --git a/flesh/human/corpse1.face b/flesh/human/corpse1.face new file mode 100644 index 000000000..549d1b78a --- /dev/null +++ b/flesh/human/corpse1.face @@ -0,0 +1,3 @@ +face corpse1.111 +magicmap blue +end diff --git a/flesh/human/corpse_pl.arc b/flesh/human/corpse_pl.arc index 3ecd72622..a75e6a056 100644 --- a/flesh/human/corpse_pl.arc +++ b/flesh/human/corpse_pl.arc @@ -1,6 +1,5 @@ Object corpse_pl face corpse1.111 -magicmap blue nrof 1 type 157 material 32 diff --git a/flesh/human/finger.arc b/flesh/human/finger.arc index 3d4e9c242..70b3174fc 100644 --- a/flesh/human/finger.arc +++ b/flesh/human/finger.arc @@ -6,7 +6,6 @@ type 72 food 1 weight 2 value 2 -magicmap khaki name_pl fingers client_type 626 end diff --git a/flesh/human/finger.face b/flesh/human/finger.face new file mode 100644 index 000000000..827fa57ac --- /dev/null +++ b/flesh/human/finger.face @@ -0,0 +1,3 @@ +face finger.111 +magicmap khaki +end diff --git a/flesh/human/foot.arc b/flesh/human/foot.arc index de063d429..26bf16468 100644 --- a/flesh/human/foot.arc +++ b/flesh/human/foot.arc @@ -6,7 +6,6 @@ type 72 food 50 weight 5 value 10 -magicmap khaki name_pl feet client_type 626 end diff --git a/flesh/human/foot.face b/flesh/human/foot.face new file mode 100644 index 000000000..1876a3f3f --- /dev/null +++ b/flesh/human/foot.face @@ -0,0 +1,3 @@ +face foot.111 +magicmap khaki +end diff --git a/flesh/human/hand.arc b/flesh/human/hand.arc index ebc062810..78c16ac2b 100644 --- a/flesh/human/hand.arc +++ b/flesh/human/hand.arc @@ -6,7 +6,6 @@ type 72 food 2 weight 3 value 10 -magicmap khaki name_pl hands client_type 626 end diff --git a/flesh/human/hand.face b/flesh/human/hand.face new file mode 100644 index 000000000..eaf31d932 --- /dev/null +++ b/flesh/human/hand.face @@ -0,0 +1,3 @@ +face hand.111 +magicmap khaki +end diff --git a/flesh/human/hands.arc b/flesh/human/hands.arc index a074c9884..8e3b1e877 100644 --- a/flesh/human/hands.arc +++ b/flesh/human/hands.arc @@ -6,7 +6,6 @@ type 72 food 2 weight 6 value 20 -magicmap khaki name_pl hands client_type 626 end diff --git a/flesh/human/hands.face b/flesh/human/hands.face new file mode 100644 index 000000000..c52e7e01e --- /dev/null +++ b/flesh/human/hands.face @@ -0,0 +1,3 @@ +face hands.111 +magicmap khaki +end diff --git a/flesh/human/head.arc b/flesh/human/head.arc index 9bee0a1d9..56a2ba7d1 100644 --- a/flesh/human/head.arc +++ b/flesh/human/head.arc @@ -6,7 +6,6 @@ type 72 food 50 weight 15 value 15 -magicmap khaki name_pl heads client_type 625 end diff --git a/flesh/human/head.face b/flesh/human/head.face new file mode 100644 index 000000000..b9a5336ff --- /dev/null +++ b/flesh/human/head.face @@ -0,0 +1,3 @@ +face head.111 +magicmap khaki +end diff --git a/flesh/human/leg.arc b/flesh/human/leg.arc index 0f1d1f8f1..11ac5df19 100644 --- a/flesh/human/leg.arc +++ b/flesh/human/leg.arc @@ -6,7 +6,6 @@ type 72 food 450 weight 15 value 10 -magicmap khaki name_pl legs client_type 626 end diff --git a/flesh/human/leg.face b/flesh/human/leg.face new file mode 100644 index 000000000..6557041ad --- /dev/null +++ b/flesh/human/leg.face @@ -0,0 +1,3 @@ +face leg.111 +magicmap khaki +end diff --git a/flesh/human/skin.arc b/flesh/human/skin.arc index 79882db96..c2cd34e66 100644 --- a/flesh/human/skin.arc +++ b/flesh/human/skin.arc @@ -6,7 +6,6 @@ type 72 food 1 weight 7 value 5 -magicmap khaki name_pl skins client_type 627 end diff --git a/flesh/human/skin.face b/flesh/human/skin.face new file mode 100644 index 000000000..eb0ee956b --- /dev/null +++ b/flesh/human/skin.face @@ -0,0 +1,3 @@ +face skin.111 +magicmap khaki +end diff --git a/flesh/human/tooth.arc b/flesh/human/tooth.arc index 50ae5073c..9e842ffd0 100644 --- a/flesh/human/tooth.arc +++ b/flesh/human/tooth.arc @@ -5,7 +5,6 @@ material 64 type 72 weight 1 value 10 -magicmap white name_pl teeth client_type 625 end diff --git a/flesh/human/tooth.face b/flesh/human/tooth.face new file mode 100644 index 000000000..f129e5f34 --- /dev/null +++ b/flesh/human/tooth.face @@ -0,0 +1,3 @@ +face tooth.111 +magicmap white +end diff --git a/flesh/misc/bat_wing.arc b/flesh/misc/bat_wing.arc index aec482db1..eaac4e7b0 100755 --- a/flesh/misc/bat_wing.arc +++ b/flesh/misc/bat_wing.arc @@ -6,7 +6,6 @@ material 32 type 72 weight 15 value 50 -magicmap black name_pl wings client_type 626 end diff --git a/flesh/misc/bat_wing.face b/flesh/misc/bat_wing.face new file mode 100644 index 000000000..231a1c8ea --- /dev/null +++ b/flesh/misc/bat_wing.face @@ -0,0 +1,3 @@ +face bat_wing.111 +magicmap black +end diff --git a/flesh/misc/behold_eye.arc b/flesh/misc/behold_eye.arc index 5062519bc..b8a761a6f 100644 --- a/flesh/misc/behold_eye.arc +++ b/flesh/misc/behold_eye.arc @@ -4,7 +4,6 @@ nrof 1 face behold_eye.111 material 32 weight 2500 -magicmap white name_pl beholdereyes client_type 625 end diff --git a/flesh/misc/behold_eye.face b/flesh/misc/behold_eye.face new file mode 100644 index 000000000..bc31fd3d5 --- /dev/null +++ b/flesh/misc/behold_eye.face @@ -0,0 +1,3 @@ +face behold_eye.111 +magicmap white +end diff --git a/flesh/misc/ectoplasm.arc b/flesh/misc/ectoplasm.arc index 9eac38bd3..661513171 100644 --- a/flesh/misc/ectoplasm.arc +++ b/flesh/misc/ectoplasm.arc @@ -3,7 +3,6 @@ nrof 1 name ectoplasm face ectoplasm.111 type 72 -magicmap grey material 64 weight 20 value 200 diff --git a/flesh/misc/ectoplasm.face b/flesh/misc/ectoplasm.face new file mode 100644 index 000000000..5cb177eb3 --- /dev/null +++ b/flesh/misc/ectoplasm.face @@ -0,0 +1,3 @@ +face ectoplasm.111 +magicmap grey +end diff --git a/flesh/misc/insect_sting.arc b/flesh/misc/insect_sting.arc index 34176d0ab..971ea0046 100644 --- a/flesh/misc/insect_sting.arc +++ b/flesh/misc/insect_sting.arc @@ -6,7 +6,6 @@ type 72 material 32 weight 10 value 20 -magicmap black name_pl stingers client_type 627 end diff --git a/flesh/misc/insect_sting.face b/flesh/misc/insect_sting.face new file mode 100644 index 000000000..4dd7bb103 --- /dev/null +++ b/flesh/misc/insect_sting.face @@ -0,0 +1,3 @@ +face insect_sting.111 +magicmap black +end diff --git a/flesh/misc/insect_wing.arc b/flesh/misc/insect_wing.arc index 9cc8790f6..3172041f4 100644 --- a/flesh/misc/insect_wing.arc +++ b/flesh/misc/insect_wing.arc @@ -3,7 +3,6 @@ nrof 1 name wing face insect_wing.111 type 72 -magicmap blue material 32 weight 10 value 20 diff --git a/flesh/misc/insect_wing.face b/flesh/misc/insect_wing.face new file mode 100644 index 000000000..4fc52e0c9 --- /dev/null +++ b/flesh/misc/insect_wing.face @@ -0,0 +1,3 @@ +face insect_wing.111 +magicmap blue +end diff --git a/flesh/misc/pix_dust.arc b/flesh/misc/pix_dust.arc index 5af623422..d329b9db6 100644 --- a/flesh/misc/pix_dust.arc +++ b/flesh/misc/pix_dust.arc @@ -2,7 +2,6 @@ Object pix_dust nrof 1 name pixie dust face pix_dust.111 -magicmap green material 4 weight 100 value 200 diff --git a/flesh/misc/pix_dust.face b/flesh/misc/pix_dust.face new file mode 100644 index 000000000..89a05dbf8 --- /dev/null +++ b/flesh/misc/pix_dust.face @@ -0,0 +1,3 @@ +face pix_dust.111 +magicmap green +end diff --git a/flesh/misc/pix_wing.arc b/flesh/misc/pix_wing.arc index 7ee5af93f..4bd01b0d9 100644 --- a/flesh/misc/pix_wing.arc +++ b/flesh/misc/pix_wing.arc @@ -3,7 +3,6 @@ nrof 1 name wings face pix_wing.111 type 72 -magicmap orange material 32 weight 10 value 50 diff --git a/flesh/misc/pix_wing.face b/flesh/misc/pix_wing.face new file mode 100644 index 000000000..0fb3dfa36 --- /dev/null +++ b/flesh/misc/pix_wing.face @@ -0,0 +1,3 @@ +face pix_wing.111 +magicmap orange +end diff --git a/flesh/misc/residue.arc b/flesh/misc/residue.arc index 7b6c5868d..f452e097a 100644 --- a/flesh/misc/residue.arc +++ b/flesh/misc/residue.arc @@ -3,7 +3,6 @@ nrof 1 name residue face residue.111 type 72 -magicmap grey material 64 weight 50 value 200 diff --git a/flesh/misc/residue.face b/flesh/misc/residue.face new file mode 100644 index 000000000..724c82591 --- /dev/null +++ b/flesh/misc/residue.face @@ -0,0 +1,3 @@ +face residue.111 +magicmap grey +end diff --git a/flesh/misc/serpent_skin.arc b/flesh/misc/serpent_skin.arc index 44cf1ba7f..0d0d7967e 100644 --- a/flesh/misc/serpent_skin.arc +++ b/flesh/misc/serpent_skin.arc @@ -2,7 +2,6 @@ Object serp_skin name skin nrof 1 face serpent_skin.111 -magicmap green type 72 weight 1000 name_pl skins diff --git a/flesh/misc/serpent_skin.face b/flesh/misc/serpent_skin.face new file mode 100644 index 000000000..00b78e845 --- /dev/null +++ b/flesh/misc/serpent_skin.face @@ -0,0 +1,3 @@ +face serpent_skin.111 +magicmap green +end diff --git a/flesh/misc/sheepskin.arc b/flesh/misc/sheepskin.arc index d91607f8f..4ffde5acc 100644 --- a/flesh/misc/sheepskin.arc +++ b/flesh/misc/sheepskin.arc @@ -3,7 +3,6 @@ name sheepskin nrof 1 face sheepskin.111 material 32 -magicmap white type 72 weight 30 value 100 diff --git a/flesh/misc/sheepskin.face b/flesh/misc/sheepskin.face new file mode 100644 index 000000000..b2eff053c --- /dev/null +++ b/flesh/misc/sheepskin.face @@ -0,0 +1,3 @@ +face sheepskin.111 +magicmap white +end diff --git a/flesh/misc/u_horn.arc b/flesh/misc/u_horn.arc index 5e81ff660..af4ca74de 100644 --- a/flesh/misc/u_horn.arc +++ b/flesh/misc/u_horn.arc @@ -7,18 +7,11 @@ face u_horn.111 weight 10000 value 500 magic 3 -anim -u_horn.111 -u_horn.112 -u_horn.113 -u_horn.114 -u_horn.115 -mina +animation u_horn anim_speed 2 client_anim_random 1 type 15 nrof 1 -magicmap black name_pl unicorn horns client_type 627 item_power 2 diff --git a/flesh/misc/u_horn.face b/flesh/misc/u_horn.face new file mode 100644 index 000000000..0e2932c00 --- /dev/null +++ b/flesh/misc/u_horn.face @@ -0,0 +1,22 @@ +animation u_horn +u_horn.111 +u_horn.112 +u_horn.113 +u_horn.114 +u_horn.115 +mina +face u_horn.111 +magicmap black +end +face u_horn.112 +magicmap black +end +face u_horn.113 +magicmap black +end +face u_horn.114 +magicmap black +end +face u_horn.115 +magicmap black +end