From fce372cf130d08c93750175d1938d8a5accfbf75 Mon Sep 17 00:00:00 2001 From: garbled Date: Thu, 6 Feb 2003 08:13:23 +0000 Subject: [PATCH] Twiddle the materials and materialnames on a ton of objects. Get rid of things like "organic eyeshield" "glass magnifying glass" etc. Set some materialtypes that are specific to the armour/weapon, like glacium for the frost weapons. Make all the boots and shoes made of leather, so I stop seeing "pine boots". Change a bunch of artifacts to use specific metals or magical cloths, to stop things like "adamantium robe". Also.. change leather armour to just "armour" so the leather and other random leathertypes automatically work with it, making things like "bearskin armour". This breaks a few alchemy formulae.. which I will fix soon. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/trunk/arch@2004 282e977c-c81d-0410-88c4-b93c2d0d6712 --- armour/boots/high_boots.arc | 2 +- armour/boots/low_boots.arc | 2 +- armour/boots/sandals.arc | 2 +- armour/cloak/cloak.arc | 2 +- armour/cloak/magic_resist.arc | 3 ++- armour/cloak/serp_cloak.arc | 3 ++- armour/helmet/eyeglasses.arc | 3 ++- armour/mail/Pdragonmail.arc | 1 + armour/mail/dragonmail.arc | 2 ++ armour/mail/leather_ar.arc | 5 ++--- armour/mail/mithril_ar.arc | 2 ++ armour/mail/mithril_ar_ele.arc | 2 ++ armour/shield/DShield.arc | 2 ++ armour/shield/DShieldm.arc | 2 ++ armour/shield/DShieldms.arc | 2 ++ armour/shield/DShields.arc | 2 ++ armour/shield/dragon_shi.arc | 2 ++ armour/shield/eyeshield.arc | 1 + armour/shield/reflector.arc | 1 + armour/shield/uw_shield.arc | 2 ++ inorganic/mercury.arc | 5 ++++- misc/magnifier.arc | 3 ++- optical/crystalball.arc | 1 + weapon/artifact/Fdagger/dagger_f.arc | 3 ++- weapon/artifact/Fhammer/frost_hammer.arc | 3 ++- weapon/artifact/Lslasher/lava_s.arc | 3 ++- weapon/artifact/UW_Sword/uw_sword.arc | 2 ++ 27 files changed, 48 insertions(+), 15 deletions(-) diff --git a/armour/boots/high_boots.arc b/armour/boots/high_boots.arc index 6e6758854..329fcfdf0 100644 --- a/armour/boots/high_boots.arc +++ b/armour/boots/high_boots.arc @@ -9,7 +9,7 @@ ac 1 nrof 1 resist_physical 4 type 99 -material 24 +material 8 editable 1024 color_fg black body_foot -2 diff --git a/armour/boots/low_boots.arc b/armour/boots/low_boots.arc index c9e70d04e..a74ab8853 100644 --- a/armour/boots/low_boots.arc +++ b/armour/boots/low_boots.arc @@ -10,7 +10,7 @@ nrof 1 ac 1 resist_physical 1 type 99 -material 24 +material 8 editable 1024 body_foot -2 gen_sp_armour 1 diff --git a/armour/boots/sandals.arc b/armour/boots/sandals.arc index 1a5e1bf1a..66038cd9f 100644 --- a/armour/boots/sandals.arc +++ b/armour/boots/sandals.arc @@ -8,7 +8,7 @@ weight 500 resist_physical 1 nrof 1 type 99 -material 24 +material 8 editable 1024 color_fg brown body_foot -2 diff --git a/armour/cloak/cloak.arc b/armour/cloak/cloak.arc index 151a2e319..6803c00af 100644 --- a/armour/cloak/cloak.arc +++ b/armour/cloak/cloak.arc @@ -7,7 +7,7 @@ face cloak.111 ac 0 weight 5000 value 40 -material 8 +material 136 editable 1024 nrof 1 color_fg black diff --git a/armour/cloak/magic_resist.arc b/armour/cloak/magic_resist.arc index cc2966fc7..d57b1e790 100644 --- a/armour/cloak/magic_resist.arc +++ b/armour/cloak/magic_resist.arc @@ -10,7 +10,8 @@ weight 5000 value 220000 startequip 1 no_steal 1 -material 256 +material 128 +materialname astolare resist_magic 95 editable 5120 color_fg black diff --git a/armour/cloak/serp_cloak.arc b/armour/cloak/serp_cloak.arc index 8f86f536a..3adbdc9d6 100644 --- a/armour/cloak/serp_cloak.arc +++ b/armour/cloak/serp_cloak.arc @@ -9,7 +9,8 @@ weight 700 color_fg green resist_poison 30 value 900 -material 32 +material 8 +materialname snakeskin editable 5120 nrof 1 body_shoulder -1 diff --git a/armour/helmet/eyeglasses.arc b/armour/helmet/eyeglasses.arc index d8254b783..8be10b28b 100644 --- a/armour/helmet/eyeglasses.arc +++ b/armour/helmet/eyeglasses.arc @@ -8,7 +8,8 @@ weight 120 value 1000 Dex 2 Cha -2 -material 6 +material 4 +materialname glass editable 1024 color_fg black body_head -1 diff --git a/armour/mail/Pdragonmail.arc b/armour/mail/Pdragonmail.arc index b1f80ce88..b068c6e6a 100644 --- a/armour/mail/Pdragonmail.arc +++ b/armour/mail/Pdragonmail.arc @@ -12,6 +12,7 @@ mina speed 0.2 last_sp 13 ac 8 +material 256 resist_physical 60 weight 40000 value 990000 diff --git a/armour/mail/dragonmail.arc b/armour/mail/dragonmail.arc index a7a9a8acf..15c4b8b6b 100644 --- a/armour/mail/dragonmail.arc +++ b/armour/mail/dragonmail.arc @@ -8,6 +8,8 @@ face dragonmail.111 last_sp 13 ac 6 resist_physical 50 +material 2048 +materialname dragonscale weight 60000 value 50000 resist_fire 40 diff --git a/armour/mail/leather_ar.arc b/armour/mail/leather_ar.arc index b2b65e174..28d4e7ca7 100644 --- a/armour/mail/leather_ar.arc +++ b/armour/mail/leather_ar.arc @@ -1,7 +1,7 @@ Object leather_armour nrof 1 -name leather armour -name_pl leather armours +name armour +name_pl armours client_type 254 type 16 face leather_ar.111 @@ -11,7 +11,6 @@ resist_physical 10 weight 20000 value 40 material 8 -materialname leather editable 1024 magicmap brown body_torso -1 diff --git a/armour/mail/mithril_ar.arc b/armour/mail/mithril_ar.arc index cfed86a7b..9a4a8a7fa 100644 --- a/armour/mail/mithril_ar.arc +++ b/armour/mail/mithril_ar.arc @@ -4,6 +4,8 @@ name mithril chainmail name_pl mithril chainmails client_type 250 type 16 +material 2 +materialname mithril face mithril_ar.111 anim mithril_ar.111 diff --git a/armour/mail/mithril_ar_ele.arc b/armour/mail/mithril_ar_ele.arc index 4867f92d9..1045716ec 100644 --- a/armour/mail/mithril_ar_ele.arc +++ b/armour/mail/mithril_ar_ele.arc @@ -4,6 +4,8 @@ name mithril chainmail of lightning name_pl mithril chainmails of lightning client_type 250 type 16 +material 2 +materialname mithril face mithril_ar_ele.111 anim mithril_ar_ele.111 diff --git a/armour/shield/DShield.arc b/armour/shield/DShield.arc index f8542ffc7..c94067f83 100644 --- a/armour/shield/DShield.arc +++ b/armour/shield/DShield.arc @@ -4,6 +4,8 @@ name_pl Demonspawn Shields client_type 260 nrof 1 type 33 +material 256 +materialname abyssium face DShield.111 anim DShield.111 diff --git a/armour/shield/DShieldm.arc b/armour/shield/DShieldm.arc index 4ce602a56..e04b06947 100644 --- a/armour/shield/DShieldm.arc +++ b/armour/shield/DShieldm.arc @@ -4,6 +4,8 @@ name_pl Demonspawn Shields client_type 260 nrof 1 type 33 +material 256 +materialname abyssium face DShield.111 anim DShield.111 diff --git a/armour/shield/DShieldms.arc b/armour/shield/DShieldms.arc index 1b8e52d74..dc47b31a2 100644 --- a/armour/shield/DShieldms.arc +++ b/armour/shield/DShieldms.arc @@ -4,6 +4,8 @@ name_pl Demonspawn Shields client_type 260 nrof 1 type 33 +material 256 +materialname abyssium face DShield.111 anim DShield.111 diff --git a/armour/shield/DShields.arc b/armour/shield/DShields.arc index 1804e439f..ba3e4106e 100644 --- a/armour/shield/DShields.arc +++ b/armour/shield/DShields.arc @@ -4,6 +4,8 @@ name_pl Demonspawn Shields client_type 260 nrof 1 type 33 +material 256 +materialname abyssium face DShield.111 anim DShield.111 diff --git a/armour/shield/dragon_shi.arc b/armour/shield/dragon_shi.arc index 49059be40..003d54e9a 100644 --- a/armour/shield/dragon_shi.arc +++ b/armour/shield/dragon_shi.arc @@ -3,6 +3,8 @@ name dragon shield name_pl dragon shields client_type 260 nrof 1 +material 2048 +materialname dragonscale face dragon_shi.111 type 33 color_fg dark_orange diff --git a/armour/shield/eyeshield.arc b/armour/shield/eyeshield.arc index efb8df185..6f2c9f5dd 100644 --- a/armour/shield/eyeshield.arc +++ b/armour/shield/eyeshield.arc @@ -4,6 +4,7 @@ name_pl eyeshields client_type 260 nrof 1 material 32 +materialname organic type 33 face eyeshield.111 ac 3 diff --git a/armour/shield/reflector.arc b/armour/shield/reflector.arc index 9c3cba59a..8f084c87c 100644 --- a/armour/shield/reflector.arc +++ b/armour/shield/reflector.arc @@ -4,6 +4,7 @@ name_pl polished shields client_type 260 nrof 1 type 33 +material 256 face reflector.111 anim reflector.111 diff --git a/armour/shield/uw_shield.arc b/armour/shield/uw_shield.arc index c209bc536..651c01b01 100644 --- a/armour/shield/uw_shield.arc +++ b/armour/shield/uw_shield.arc @@ -3,6 +3,8 @@ name Belzebub's shield name_pl Belzebub's shields client_type 260 nrof 1 +material 256 +materialname abyssium face uw_shield.111 type 33 weight 25000 diff --git a/inorganic/mercury.arc b/inorganic/mercury.arc index 9865f9f3a..f880f4f13 100644 --- a/inorganic/mercury.arc +++ b/inorganic/mercury.arc @@ -7,6 +7,8 @@ resist_acid 100 type 73 nrof 1 weight 3000 +material 512 +materialname mercury identified 1 editable 2048 magicmap grey @@ -22,7 +24,8 @@ fix_mercury.111 fix_mercury.112 mina speed 0.5 -material 2 +material 512 +materialname mercury value 400 resist_electricity 100 resist_acid 100 diff --git a/misc/magnifier.arc b/misc/magnifier.arc index 8f3d01f81..f5ede2371 100644 --- a/misc/magnifier.arc +++ b/misc/magnifier.arc @@ -5,7 +5,8 @@ nrof 1 last_sp 2 type 15 face magnifier.111 -material 6 +material 4 +materialname glass Dex 1 dam 1 weight 2000 diff --git a/optical/crystalball.arc b/optical/crystalball.arc index 0b459e233..0e12bf4c7 100644 --- a/optical/crystalball.arc +++ b/optical/crystalball.arc @@ -3,6 +3,7 @@ name glass sphere nrof 1 face crystalball.111 material 4 +materialname glass weight 10000 editable 2048 value 10000 diff --git a/weapon/artifact/Fdagger/dagger_f.arc b/weapon/artifact/Fdagger/dagger_f.arc index 611bf9cc3..99f8a9cc9 100644 --- a/weapon/artifact/Fdagger/dagger_f.arc +++ b/weapon/artifact/Fdagger/dagger_f.arc @@ -15,7 +15,8 @@ nrof 1 type 15 attacktype 1 weapontype 2 -material 2 +material 256 +materialname glacium value 50000 weight 2000 last_sp 5 diff --git a/weapon/artifact/Fhammer/frost_hammer.arc b/weapon/artifact/Fhammer/frost_hammer.arc index 6b2e59a8c..bc2f70d87 100644 --- a/weapon/artifact/Fhammer/frost_hammer.arc +++ b/weapon/artifact/Fhammer/frost_hammer.arc @@ -12,7 +12,8 @@ frost_hammer.113 frost_hammer.114 mina speed .4 -material 2 +material 256 +materialname glacium dam 10 value 90000 weight 30000 diff --git a/weapon/artifact/Lslasher/lava_s.arc b/weapon/artifact/Lslasher/lava_s.arc index 70ea24cf3..d6908fd3a 100644 --- a/weapon/artifact/Lslasher/lava_s.arc +++ b/weapon/artifact/Lslasher/lava_s.arc @@ -15,7 +15,8 @@ type 15 resist_cold 75 attacktype 5 weapontype 1 -material 2 +material 256 +materialname magmasium value 220000 weight 25000 magic 3 diff --git a/weapon/artifact/UW_Sword/uw_sword.arc b/weapon/artifact/UW_Sword/uw_sword.arc index 6896a26cd..4d11c338e 100644 --- a/weapon/artifact/UW_Sword/uw_sword.arc +++ b/weapon/artifact/UW_Sword/uw_sword.arc @@ -6,6 +6,8 @@ dam 17 slaying angel Con 2 Int 1 +material 256 +materialname abyssium sp 1 type 15 face uw_sword.111