diff options
54 files changed, 113 insertions, 94 deletions
diff --git a/graphics/items/equipment/amulets/angel-wings.png b/graphics/items/equipment/amulets/angel-wings.png Binary files differnew file mode 100644 index 00000000..17a5b710 --- /dev/null +++ b/graphics/items/equipment/amulets/angel-wings.png diff --git a/graphics/items/equipment/charms/assassin-amulet.png b/graphics/items/equipment/amulets/assassin-amulet.png Binary files differindex bf7caae7..bf7caae7 100644 --- a/graphics/items/equipment/charms/assassin-amulet.png +++ b/graphics/items/equipment/amulets/assassin-amulet.png diff --git a/graphics/items/equipment/charms/enchanter.png b/graphics/items/equipment/amulets/enchanter.png Binary files differindex 3023715e..3023715e 100644 --- a/graphics/items/equipment/charms/enchanter.png +++ b/graphics/items/equipment/amulets/enchanter.png diff --git a/graphics/items/equipment/charms/fourleaf-amulet.png b/graphics/items/equipment/amulets/fourleaf-amulet.png Binary files differindex 894b7f60..894b7f60 100644 --- a/graphics/items/equipment/charms/fourleaf-amulet.png +++ b/graphics/items/equipment/amulets/fourleaf-amulet.png diff --git a/graphics/items/equipment/charms/gmamulet.png b/graphics/items/equipment/amulets/gmamulet.png Binary files differindex 0724945b..0724945b 100644 --- a/graphics/items/equipment/charms/gmamulet.png +++ b/graphics/items/equipment/amulets/gmamulet.png diff --git a/graphics/items/equipment/charms/manapearl.png b/graphics/items/equipment/amulets/manapearl.png Binary files differindex 16dad06a..16dad06a 100644 --- a/graphics/items/equipment/charms/manapearl.png +++ b/graphics/items/equipment/amulets/manapearl.png diff --git a/graphics/sprites/equipment/angel-wings.png b/graphics/sprites/equipment/amulets/angel-wings.png Binary files differindex 00290548..00290548 100644 --- a/graphics/sprites/equipment/angel-wings.png +++ b/graphics/sprites/equipment/amulets/angel-wings.png diff --git a/graphics/sprites/equipment/angel-wings.xml b/graphics/sprites/equipment/amulets/angel-wings.xml index 83844588..cd13e426 100644 --- a/graphics/sprites/equipment/angel-wings.xml +++ b/graphics/sprites/equipment/amulets/angel-wings.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <sprite> <!-- Original from tmw.ufbteam.org - Authors: Varuna and Arikel--> - <imageset name="base" src="graphics/sprites/equipment/angel-wings.png|W" width="64" height="64"/> + <imageset name="base" src="graphics/sprites/equipment/amulets/angel-wings.png|W" width="64" height="64"/> <action name="stand" imageset="base"> <animation direction="down"> <sequence start="0" end="5" delay="75" offsetY="0" offsetX="0"/> @@ -14,6 +14,7 @@ <include name="items/equip-arms/_include.xml"/> <include name="items/equip-legs/_include.xml"/> <include name="items/equip-shield/_include.xml"/> + <include name="items/equip-amulet/_include.xml"/> <include name="items/equip-charm/_include.xml"/> <include name="items/equip-ring/_include.xml"/> <!-- New items may go below this line --> diff --git a/items/equip-1hand/item0571_Setzer.xml b/items/equip-1hand/item0571_Setzer.xml index 2f09171e..c7fd2169 100644 --- a/items/equip-1hand/item0571_Setzer.xml +++ b/items/equip-1hand/item0571_Setzer.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <items> - <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." effect="Base Attack Delay -25 / Weapon Level 1" attack="100" type="equip-1hand" attack-action="attack" attack-range="1" weight="900" sellProtected="true"> + <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." effect="Base Attack Delay -25 / Weapon Level 1" attack="100" type="equip-1hand" attack-action="attack" attack-range="1" weight="500" sellProtected="true"> <sprite gender="unisex">equipment/weapons/dagger-setzer.xml</sprite> <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> diff --git a/items/equip-amulet/_include.xml b/items/equip-amulet/_include.xml new file mode 100644 index 00000000..006583e5 --- /dev/null +++ b/items/equip-amulet/_include.xml @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<items> + <include name="items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml"/> + <include name="items/equip-amulet/item0830_BromenalFourLeafAmulet.xml"/> + <include name="items/equip-amulet/item0831_SilverFourLeafAmulet.xml"/> + <include name="items/equip-amulet/item0832_GoldenFourLeafAmulet.xml"/> + <include name="items/equip-amulet/item0908_GMAmulet.xml"/> + <include name="items/equip-amulet/item1227_EnchantersAmulet.xml"/> + <include name="items/equip-amulet/item5252_GuardianWings.xml"/> + <include name="items/equip-amulet/item5269_AssassinAmulet.xml"/> + <include name="items/equip-amulet/item5270_ManaPearl.xml"/> +</items> diff --git a/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml new file mode 100644 index 00000000..170cf010 --- /dev/null +++ b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<items> + <item id="829" image="equipment/amulets/fourleaf-amulet.png|W:#332f27,584a31,af7817,ffffff" name="Crozenite Four-Leaf Amulet" description="An amulet that brings the wearer luck where ever they go." mattack="5" type="equip-neck" luk="1" weight="10" sellProtected="true"/> +</items> diff --git a/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml new file mode 100644 index 00000000..774fa2a9 --- /dev/null +++ b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<items> + <item id="830" image="equipment/amulets/fourleaf-amulet.png|W:#3f2e26,644435,7c513c,ffffff" name="Bromenal Four-Leaf Amulet" description="An amulet that brings the wearer good luck where ever they go." mattack="5" type="equip-neck" luk="2" weight="10" sellProtected="true"/> +</items> diff --git a/items/equip-amulet/item0831_SilverFourLeafAmulet.xml b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml new file mode 100644 index 00000000..93849ded --- /dev/null +++ b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<items> + <item id="831" image="equipment/amulets/fourleaf-amulet.png|W:#272f33,384347,6f7e85,ffffff" name="Silver Four-Leaf Amulet" description="An amulet that brings the wearer great luck where ever they go." mattack="5" type="equip-neck" luk="3" weight="10" sellProtected="true"/> +</items> diff --git a/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml new file mode 100644 index 00000000..3276f54f --- /dev/null +++ b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<items> + <item id="832" image="equipment/amulets/fourleaf-amulet.png|W:#857a4d,bc9600,fdd017,ffffff" name="Golden Four-Leaf Amulet" description="An amulet that brings the wearer excellent luck where ever they go." mattack="5" type="equip-neck" luk="4" weight="10" sellProtected="true"/> +</items> diff --git a/items/equip-amulet/item0908_GMAmulet.xml b/items/equip-amulet/item0908_GMAmulet.xml new file mode 100644 index 00000000..c8d93eb3 --- /dev/null +++ b/items/equip-amulet/item0908_GMAmulet.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<items> + <item id="908" image="equipment/amulets/gmamulet.png" name="GM Amulet" description="An amulet for GMs during events." effect="HP Recovery Rate 200%" defense="50" criticaldefense="50" mdefense="50" flee="20" mattack="20" accuracy="50" crit="50" attkspeed="20" maxhp="31000" weight="1" type="equip-neck"/> +</items> diff --git a/items/equip-amulet/item1227_EnchantersAmulet.xml b/items/equip-amulet/item1227_EnchantersAmulet.xml new file mode 100644 index 00000000..aa6bacb8 --- /dev/null +++ b/items/equip-amulet/item1227_EnchantersAmulet.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<items> + <item id="1227" image="equipment/amulets/enchanter.png" name="Enchanter's Amulet" description="An amulet made for true enchanters." effect="Hit Chance +22" type="equip-neck" weight="1"/> +</items> diff --git a/items/equip-amulet/item5252_GuardianWings.xml b/items/equip-amulet/item5252_GuardianWings.xml new file mode 100644 index 00000000..a0cf9143 --- /dev/null +++ b/items/equip-amulet/item5252_GuardianWings.xml @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<items> + <item id="5252" image="equipment/amulets/angel-wings.png" name="Guardian Wings" description="Powerful guardian wings, which watches over the horizon, guarding mana." type="equip-neck" weight="1"> + <sprite>equipment/amulets/angel-wings.xml</sprite> + <particlefx>graphics/particles/angel.particle.xml</particlefx> + </item> +</items> diff --git a/items/equip-amulet/item5269_AssassinAmulet.xml b/items/equip-amulet/item5269_AssassinAmulet.xml new file mode 100644 index 00000000..6b10f6af --- /dev/null +++ b/items/equip-amulet/item5269_AssassinAmulet.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<items> + <item id="5269" image="equipment/amulets/assassin-amulet.png" name="Assassin Amulet" description="Amulet for a master assassin. (Brawler only: Strength +2 / Dexterity +1)" effect="Double Damage +5% / Hit Chance +25" agi="1" type="equip-neck" weight="1" sellProtected="true"/> +</items> diff --git a/items/equip-amulet/item5270_ManaPearl.xml b/items/equip-amulet/item5270_ManaPearl.xml new file mode 100644 index 00000000..b25ba0be --- /dev/null +++ b/items/equip-amulet/item5270_ManaPearl.xml @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<items> + <item id="5270" image="equipment/amulets/manapearl.png" name="Mana Pearl" description="This pearl resonates with a natural mana flow and channels some power from the Mana Seed to the user." int="1" mattack="22" mdefense="22" maxmp="55" effect="SP Recovery Rate +33%" type="equip-neck" weight="0" sellProtected="true"> + <particlefx>graphics/particles/manapearl.particle.xml</particlefx> + </item> +</items> diff --git a/items/equip-charm/_include.xml b/items/equip-charm/_include.xml index fa1cb995..ff7953a8 100644 --- a/items/equip-charm/_include.xml +++ b/items/equip-charm/_include.xml @@ -3,15 +3,7 @@ <include name="items/equip-charm/item0677_HeartNecklace.xml"/> <include name="items/equip-charm/item0742_FourLeafClover.xml"/> <include name="items/equip-charm/item0749_Towel.xml"/> - <include name="items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml"/> - <include name="items/equip-charm/item0830_BromenalFourLeafAmulet.xml"/> - <include name="items/equip-charm/item0831_SilverFourLeafAmulet.xml"/> - <include name="items/equip-charm/item0832_GoldenFourLeafAmulet.xml"/> <include name="items/equip-charm/item0865_Grimoire.xml"/> <include name="items/equip-charm/item0879_HeartofIsis.xml"/> - <include name="items/equip-charm/item0908_GMAmulet.xml"/> - <include name="items/equip-charm/item1227_EnchantersAmulet.xml"/> <include name="items/equip-charm/item1244_DarkTalisman.xml"/> - <include name="items/equip-charm/item5269_AssassinAmulet.xml"/> - <include name="items/equip-charm/item5270_ManaPearl.xml"/> </items> diff --git a/items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml b/items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml deleted file mode 100644 index 29d60d62..00000000 --- a/items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="829" image="equipment/charms/fourleaf-amulet.png|W:#332f27,584a31,af7817,ffffff" name="Crozenite Four-Leaf Amulet" description="An amulet that brings the wearer luck where ever they go." mattack="5" type="equip-charm" luk="1" weight="10" sellProtected="true"/> -</items> diff --git a/items/equip-charm/item0830_BromenalFourLeafAmulet.xml b/items/equip-charm/item0830_BromenalFourLeafAmulet.xml deleted file mode 100644 index 79394b97..00000000 --- a/items/equip-charm/item0830_BromenalFourLeafAmulet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="830" image="equipment/charms/fourleaf-amulet.png|W:#3f2e26,644435,7c513c,ffffff" name="Bromenal Four-Leaf Amulet" description="An amulet that brings the wearer good luck where ever they go." mattack="5" type="equip-charm" luk="2" weight="10" sellProtected="true"/> -</items> diff --git a/items/equip-charm/item0831_SilverFourLeafAmulet.xml b/items/equip-charm/item0831_SilverFourLeafAmulet.xml deleted file mode 100644 index 379d3635..00000000 --- a/items/equip-charm/item0831_SilverFourLeafAmulet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="831" image="equipment/charms/fourleaf-amulet.png|W:#272f33,384347,6f7e85,ffffff" name="Silver Four-Leaf Amulet" description="An amulet that brings the wearer great luck where ever they go." mattack="5" type="equip-charm" luk="3" weight="10" sellProtected="true"/> -</items> diff --git a/items/equip-charm/item0832_GoldenFourLeafAmulet.xml b/items/equip-charm/item0832_GoldenFourLeafAmulet.xml deleted file mode 100644 index a1a5a12b..00000000 --- a/items/equip-charm/item0832_GoldenFourLeafAmulet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="832" image="equipment/charms/fourleaf-amulet.png|W:#857a4d,bc9600,fdd017,ffffff" name="Golden Four-Leaf Amulet" description="An amulet that brings the wearer excellent luck where ever they go." mattack="5" type="equip-charm" luk="4" weight="10" sellProtected="true"/> -</items> diff --git a/items/equip-charm/item0908_GMAmulet.xml b/items/equip-charm/item0908_GMAmulet.xml deleted file mode 100644 index 86777263..00000000 --- a/items/equip-charm/item0908_GMAmulet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="908" image="equipment/charms/gmamulet.png" name="GM Amulet" description="An amulet for GMs during events." effect="HP Recovery Rate 200%" defense="50" criticaldefense="50" mdefense="50" flee="20" mattack="20" accuracy="50" crit="50" attkspeed="20" maxhp="31000" weight="1" type="equip-charm"/> -</items> diff --git a/items/equip-charm/item1227_EnchantersAmulet.xml b/items/equip-charm/item1227_EnchantersAmulet.xml deleted file mode 100644 index ba13cb75..00000000 --- a/items/equip-charm/item1227_EnchantersAmulet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="1227" image="equipment/charms/enchanter.png" name="Enchanter's Amulet" description="An amulet made for true enchanters." effect="Hit Chance +22" type="equip-charm" weight="1"/> -</items> diff --git a/items/equip-charm/item1244_DarkTalisman.xml b/items/equip-charm/item1244_DarkTalisman.xml index 647f7d80..2a002698 100644 --- a/items/equip-charm/item1244_DarkTalisman.xml +++ b/items/equip-charm/item1244_DarkTalisman.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <items> - <item id="1244" image="equipment/charms/darktalisman.png" name="Dark Talisman" description="A small cube. It radiates unimaginable power, and is quite dizzying to look at." mattack="100" type="equip-torso" mdefense="30" sellProtected="true"> + <item id="1244" image="equipment/charms/darktalisman.png" name="Dark Talisman" description="A small cube. It radiates unimaginable power, and is quite dizzying to look at." mattack="100" type="equip-charm" mdefense="30" sellProtected="true"> <particlefx>graphics/particles/dark-talisman.xml</particlefx> </item> </items> diff --git a/items/equip-charm/item5269_AssassinAmulet.xml b/items/equip-charm/item5269_AssassinAmulet.xml deleted file mode 100644 index ec66cbdc..00000000 --- a/items/equip-charm/item5269_AssassinAmulet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="5269" image="equipment/charms/assassin-amulet.png" name="Assassin Amulet" description="Amulet for a master assassin. (Brawler only: Strength +2 / Dexterity +1)" effect="Double Damage +5% / Hit Chance +25" agi="1" type="equip-charm" weight="1" sellProtected="true"/> -</items> diff --git a/items/equip-charm/item5270_ManaPearl.xml b/items/equip-charm/item5270_ManaPearl.xml deleted file mode 100644 index d4e0dab7..00000000 --- a/items/equip-charm/item5270_ManaPearl.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="5270" image="equipment/charms/manapearl.png" name="Mana Pearl" description="This pearl resonates with a natural mana flow and channels some power from the Mana Seed to the user." int="1" mattack="22" mdefense="22" maxmp="55" effect="SP Recovery Rate +33%" type="equip-charm" weight="0" sellProtected="true"> - <particlefx>graphics/particles/manapearl.particle.xml</particlefx> - </item> -</items> diff --git a/items/equip-feet/_include.xml b/items/equip-feet/_include.xml index 1c3b6977..ad7b2328 100644 --- a/items/equip-feet/_include.xml +++ b/items/equip-feet/_include.xml @@ -3,6 +3,7 @@ <include name="items/equip-feet/item0528_Boots.xml"/> <include name="items/equip-feet/item0655_FurBoots.xml"/> <include name="items/equip-feet/item0734_BlackBoots.xml"/> + <include name="items/equip-feet/item0735_CottonBoots.xml"/> <include name="items/equip-feet/item0757_AssassinBoots.xml"/> <include name="items/equip-feet/item0792_BromenalBoots.xml"/> <include name="items/equip-feet/item0876_WarlordBoots.xml"/> diff --git a/items/equip-head/item0735_CottonBoots.xml b/items/equip-feet/item0735_CottonBoots.xml index ed9f57d7..14aed202 100644 --- a/items/equip-head/item0735_CottonBoots.xml +++ b/items/equip-feet/item0735_CottonBoots.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <items> - <item id="735" image="equipment/feet/boots.png|W:#a4b2b2,ffffff" name="Cotton Boots" description="A pair of quality cotton boots." mattack="1" type="equip-head" defense="1" weight="10"> + <item id="735" image="equipment/feet/boots.png|W:#a4b2b2,ffffff" name="Cotton Boots" description="A pair of quality cotton boots." mattack="1" type="equip-feet" defense="1" weight="10"> <sprite gender="unisex">equipment/feet/boots.xml|#a4b2b2,ffffff</sprite> <sprite gender="female">equipment/feet/boots-female.xml|#a4b2b2,ffffff</sprite> </item> diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml index 447e89b2..d8077c1e 100644 --- a/items/equip-head/_include.xml +++ b/items/equip-head/_include.xml @@ -37,7 +37,6 @@ <include name="items/equip-head/item0723_DesertHat.xml"/> <include name="items/equip-head/item0724_CottonHeadband.xml"/> <include name="items/equip-head/item0725_GMCap.xml"/> - <include name="items/equip-head/item0735_CottonBoots.xml"/> <include name="items/equip-head/item0751_PinkieHat.xml"/> <include name="items/equip-head/item0752_FluffyHat.xml"/> <include name="items/equip-head/item0759_PaladinsHelmet.xml"/> diff --git a/items/equip-ring/_include.xml b/items/equip-ring/_include.xml index 20fc0c07..628269c4 100644 --- a/items/equip-ring/_include.xml +++ b/items/equip-ring/_include.xml @@ -8,7 +8,6 @@ <include name="items/equip-ring/item4012_TopazRing.xml"/> <include name="items/equip-ring/item4013_AmethystRing.xml"/> <include name="items/equip-ring/item4014_SimpleRing.xml"/> - <include name="items/equip-ring/item5252_GuardianWings.xml"/> <include name="items/equip-ring/item5253_MagicRing.xml"/> <include name="items/equip-ring/item5268_AssassinRing.xml"/> </items> diff --git a/items/equip-ring/item5252_GuardianWings.xml b/items/equip-ring/item5252_GuardianWings.xml deleted file mode 100644 index dd9b9663..00000000 --- a/items/equip-ring/item5252_GuardianWings.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<items> - <item id="5252" image="equipment/rings/wedding.png" name="Guardian Wings" description="Powerful guardian wings, which watches over the horizon, guarding mana." type="equip-ring" weight="1"> - <sprite>equipment/angel-wings.xml</sprite> - <particlefx>graphics/particles/angel.particle.xml</particlefx> - </item> -</items> diff --git a/items/generic/item5380_Stone.xml b/items/generic/item5380_Stone.xml index 4bfc916a..e9d87f5d 100644 --- a/items/generic/item5380_Stone.xml +++ b/items/generic/item5380_Stone.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="5380" image="generic/stone-a.png|W:#280b03,81330f,b3582b,d78464,f8ba81,ffddbb,ffffff" name="Stone" description="A heavy stone, your back is already hurting only from looking at it." type="generic" weight="60"/> + <item id="5380" image="generic/stone-a.png|W:#280b03,81330f,b3582b,d78464,f8ba81,ffddbb,ffffff" name="Stone" description="A heavy stone. Your back is already hurting just from looking at it." type="generic" weight="60"/> </items> diff --git a/items/usable/item0808_HitchhikersTowel.xml b/items/usable/item0808_HitchhikersTowel.xml index abbf794e..82ec32bd 100644 --- a/items/usable/item0808_HitchhikersTowel.xml +++ b/items/usable/item0808_HitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="808" image="use/others/warp-towel.png" name="Hitchhiker's Towel" description="An inconspicuous towel." type="usable" effect="A strange way of travelling. Cooldown: 20 minutes" weight="20" sellProtected="true"/> + <item id="808" image="use/others/warp-towel.png" name="Hitchhiker's Towel" description="An inconspicuous towel." type="usable" effect="A strange way of travelling. Cooldown: 5 minutes" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0809_WhiteHitchhikersTowel.xml b/items/usable/item0809_WhiteHitchhikersTowel.xml index d0f5889e..9af2e10e 100644 --- a/items/usable/item0809_WhiteHitchhikersTowel.xml +++ b/items/usable/item0809_WhiteHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="809" image="use/others/warp-towel.png|W:#5e7480,f1ffff,ffffff" name="White Hitchhiker's Towel" description="An inconspicuous white towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="809" image="use/others/warp-towel.png|W:#5e7480,f1ffff,ffffff" name="White Hitchhiker's Towel" description="An inconspicuous white towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0810_RedHitchhikersTowel.xml b/items/usable/item0810_RedHitchhikersTowel.xml index bbef7a84..1c753a01 100644 --- a/items/usable/item0810_RedHitchhikersTowel.xml +++ b/items/usable/item0810_RedHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="810" image="use/others/warp-towel.png|W:#581a1a,a41111,c03a3a,ff6060" name="Red Hitchhiker's Towel" description="An inconspicuous red towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="810" image="use/others/warp-towel.png|W:#581a1a,a41111,c03a3a,ff6060" name="Red Hitchhiker's Towel" description="An inconspicuous red towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0811_GreenHitchhikersTowel.xml b/items/usable/item0811_GreenHitchhikersTowel.xml index c34193b0..60e18c69 100644 --- a/items/usable/item0811_GreenHitchhikersTowel.xml +++ b/items/usable/item0811_GreenHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="811" image="use/others/warp-towel.png|W:#1f9c1f,89d689" name="Green Hitchhiker's Towel" description="An inconspicuous green towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="811" image="use/others/warp-towel.png|W:#1f9c1f,89d689" name="Green Hitchhiker's Towel" description="An inconspicuous green towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0812_BlueHitchhikersTowel.xml b/items/usable/item0812_BlueHitchhikersTowel.xml index f5f3f72b..bc7cd983 100644 --- a/items/usable/item0812_BlueHitchhikersTowel.xml +++ b/items/usable/item0812_BlueHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="812" image="use/others/warp-towel.png|W:#4b4bbd,888af4" name="Blue Hitchhiker's Towel" description="An inconspicuous blue towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="812" image="use/others/warp-towel.png|W:#4b4bbd,888af4" name="Blue Hitchhiker's Towel" description="An inconspicuous blue towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0813_YellowHitchhikersTowel.xml b/items/usable/item0813_YellowHitchhikersTowel.xml index 7905f785..98322ccb 100644 --- a/items/usable/item0813_YellowHitchhikersTowel.xml +++ b/items/usable/item0813_YellowHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="813" image="use/others/warp-towel.png|W:#ccb534,f1ea8e,ffffaa" name="Yellow Hitchhiker's Towel" description="An inconspicuous yellow towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="813" image="use/others/warp-towel.png|W:#ccb534,f1ea8e,ffffaa" name="Yellow Hitchhiker's Towel" description="An inconspicuous yellow towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0814_PurpleHitchhikersTowel.xml b/items/usable/item0814_PurpleHitchhikersTowel.xml index a51b60d2..aef4e613 100644 --- a/items/usable/item0814_PurpleHitchhikersTowel.xml +++ b/items/usable/item0814_PurpleHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="814" image="use/others/warp-towel.png|W:#530a7c,b362e1,ca87ef" name="Purple Hitchhiker's Towel" description="An inconspicuous purple towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="814" image="use/others/warp-towel.png|W:#530a7c,b362e1,ca87ef" name="Purple Hitchhiker's Towel" description="An inconspicuous purple towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0815_OrangeHitchhikersTowel.xml b/items/usable/item0815_OrangeHitchhikersTowel.xml index b9d409ab..b5d5171c 100644 --- a/items/usable/item0815_OrangeHitchhikersTowel.xml +++ b/items/usable/item0815_OrangeHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="815" image="use/others/warp-towel.png|W:#80280f,b04810,ef681f,ffb830" name="Orange Hitchhiker's Towel" description="An inconspicuous orange towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="815" image="use/others/warp-towel.png|W:#80280f,b04810,ef681f,ffb830" name="Orange Hitchhiker's Towel" description="An inconspicuous orange towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0816_PinkHitchhikersTowel.xml b/items/usable/item0816_PinkHitchhikersTowel.xml index 6dfcbc88..e5957e8f 100644 --- a/items/usable/item0816_PinkHitchhikersTowel.xml +++ b/items/usable/item0816_PinkHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="816" image="use/others/warp-towel.png|W:#bf369b,f25cb1,ff87b7,ffcccf" name="Pink Hitchhiker's Towel" description="An inconspicuous pink towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="816" image="use/others/warp-towel.png|W:#bf369b,f25cb1,ff87b7,ffcccf" name="Pink Hitchhiker's Towel" description="An inconspicuous pink towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0817_TealHitchhikersTowel.xml b/items/usable/item0817_TealHitchhikersTowel.xml index 0ee888fd..f8ef8b54 100644 --- a/items/usable/item0817_TealHitchhikersTowel.xml +++ b/items/usable/item0817_TealHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="817" image="use/others/warp-towel.png|W:#4ee2ec" name="Teal Hitchhiker's Towel" description="An inconspicuous teal towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="817" image="use/others/warp-towel.png|W:#4ee2ec" name="Teal Hitchhiker's Towel" description="An inconspicuous teal towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item0818_LimeHitchhikersTowel.xml b/items/usable/item0818_LimeHitchhikersTowel.xml index f87cfe09..834e3213 100644 --- a/items/usable/item0818_LimeHitchhikersTowel.xml +++ b/items/usable/item0818_LimeHitchhikersTowel.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <items> - <item id="818" image="use/others/warp-towel.png|W:#41a317" name="Lime Hitchhiker's Towel" description="An inconspicuous lime towel." effect="A strange way of travelling. Cooldown: 20 minutes" type="usable" weight="30" sellProtected="true"/> + <item id="818" image="use/others/warp-towel.png|W:#41a317" name="Lime Hitchhiker's Towel" description="An inconspicuous lime towel." effect="A strange way of travelling. Cooldown: 5 minutes" type="usable" weight="30" sellProtected="true"/> </items> diff --git a/items/usable/item5382_AnchorStone.xml b/items/usable/item5382_AnchorStone.xml index 528403d8..c846eaa1 100644 --- a/items/usable/item5382_AnchorStone.xml +++ b/items/usable/item5382_AnchorStone.xml @@ -3,7 +3,7 @@ <item id="5382" image="use/others/anchor-stone.png|W:#280b03,81330f,b3582b,d78464,f8ba81,ffddbb,ffffff" name="Anchor Stone" - description="An enchanted stone capable to be bound to a place." + description="An enchanted stone capable of being bound to a place." useButton="Activate" type="usable" weight="40"/> @@ -140,21 +140,35 @@ File | Artists | Licenses `graphics/items/equipment/ammo/snowball.png` | Ledmitz, Reid | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/ammo/stoneprojectile-icon.png` | wushin, tux9th | GPLv2, CC BY-SA 3.0 +#### Amulets +File | Artists | Licenses +---- |:-------:|:--------: +`graphics/items/equipment/amulets/angel-wings.png` | :grey_question:, Varuna, Arikel, HoraK-FDF | GPLv2 +`graphics/items/equipment/amulets/enchanter.png` | Fate | GPLv2, CC BY-SA 3.0 +`graphics/items/equipment/amulets/fourleaf-amulet.png` | Fate | GPLv2, CC BY-SA 3.0 +`graphics/items/equipment/amulets/gmamulet.png` | Ledmitz | GPLv2, CC BY-SA 3.0 +`graphics/items/equipment/amulets/manapearl.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/items/equipment/amulets/assassin-amulet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 + #### Charms File | Artists | Licenses ---- |:-------:|:--------: `graphics/items/equipment/charms/clover.png` | 5t3v3 | GPLv2 -`graphics/items/equipment/charms/enchanter.png` | Fate | GPLv2, CC BY-SA 3.0 -`graphics/items/equipment/charms/fourleaf-amulet.png` | Fate | GPLv2, CC BY-SA 3.0 -`graphics/items/equipment/charms/gmamulet.png` | Ledmitz | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/charms/heart-of-isis.png` | V0id | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/charms/heartnecklace.png` | Jetryl | GPLv2 `graphics/items/equipment/charms/skeletoncharm.png` | Cassy, Jetryl | GPLv2 `graphics/items/equipment/charms/towel.png` | Bjorn | GPLv2, CC BY-SA 3.0 -`graphics/items/equipment/charms/manapearl.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 -`graphics/items/equipment/charms/assassin-amulet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 `graphics/items/equipment/charms/darktalisman.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +#### Rings +File | Artists | Licenses +---- |:-------:|:--------: +`graphics/items/equipment/rings/gem.png` | Salmondine | GPLv2 +`graphics/items/equipment/rings/magic.png` | Nami | GPLv2, CC BY-SA 3.0 +`graphics/items/equipment/rings/simple.png` | Salmondine | GPLv2 +`graphics/items/equipment/rings/wedding.png` | Kess | GPLv2 +`graphics/items/equipment/rings/assassin-ring.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 + #### Chest File | Artists | Licenses ---- |:-------:|:--------: @@ -299,15 +313,6 @@ File | Artists | Licenses `graphics/items/equipment/legs/silkpants.png` | LuH | GPLv2 `graphics/items/equipment/legs/terranitepants.png` | Kr0n05931 | GPLv2 -#### Rings -File | Artists | Licenses ----- |:-------:|:--------: -`graphics/items/equipment/rings/gem.png` | Salmondine | GPLv2 -`graphics/items/equipment/rings/magic.png` | Nami | GPLv2, CC BY-SA 3.0 -`graphics/items/equipment/rings/simple.png` | Salmondine | GPLv2 -`graphics/items/equipment/rings/wedding.png` | Kess | GPLv2 -`graphics/items/equipment/rings/assassin-ring.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 - #### Shields File | Artists | Licenses ---- |:-------:|:--------: @@ -722,8 +727,6 @@ File | Artists | Licenses ---- |:-------:|:--------: `graphics/sprites/emote.png` | Alige, Arikel, DerLoisl, Modanung, Reid | GPLv2, CC BY-SA 3.0 `graphics/sprites/error.png` | Wushin | GPLv2, CC BY-SA 3.0 -`graphics/sprites/equipment/angel-wings.png` | :grey_question:, Varuna, Arikel | GPLv2 -`graphics/sprites/equipment/shields/dragon.png` | ?, TMW-Br Team | GPLv2 `graphics/sprites/races/savior-male.png` | Modanung, Talaroc, Alige, Reid, Saphy, Jesusalva | CC BY-SA 4.0 (GPLv3) #### Status Icons @@ -759,6 +762,11 @@ File | Artists | Licenses `graphics/sprites/model/male.png` | Modanung, Skipy, Talaroc, Wombat, Nami, Wushin | GPLv2 `graphics/sprites/model/city-emblems.png` | Alige, Wushin | GPLv2 +#### Amulets +File | Artists | Licenses +---- |:-------:|:--------: +`graphics/sprites/equipment/amulets/angel-wings.png` | :grey_question:, Varuna, Arikel | GPLv2 + #### Weapons File | Artists | Licenses ---- |:-------:|:--------: @@ -941,7 +949,6 @@ File | Artists | Licenses `graphics/sprites/equipment/head/shades.png` | jak1 | GPLv2, CC BY-SA 3.0 `graphics/sprites/equipment/head/assassin-mask.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 - #### Legs File | Artists | Licenses ---- |:-------:|:--------: @@ -960,6 +967,14 @@ File | Artists | Licenses `graphics/sprites/equipment/legs/terranite-female.png` | Kr0n05931 | GPLv2 `graphics/sprites/equipment/legs/terranite-male.png` | Kr0n05931 | GPLv2 +#### Shields +File | Artists | Licenses +---- |:-------:|:--------: +`graphics/sprites/equipment/shields/dragon.png` | ?, TMW-Br Team | GPLv2 +`graphics/sprites/equipment/shields/leather.png` | ?, Irukard, TMW-Br Team | GPLv2 +`graphics/sprites/equipment/shields/steel.png` | ?, Irukard, TMW-Br Team | GPLv2 +`graphics/sprites/equipment/shields/wooden.png` | Enchilado | GPL 3.0/CC BY-SA 3.0 + #### Override File | Artists | Licenses ---- |:-------:|:--------: diff --git a/monsters.xml b/monsters.xml index 91e133d1..131d8171 100644 --- a/monsters.xml +++ b/monsters.xml @@ -1226,7 +1226,7 @@ <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> <sprite>equipment/chest/robe.xml|#ffffff</sprite> <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/head/aureole.xml</sprite> <sound event="hit">env/flame.ogg</sound> <sound event="miss">weapons/miss1.ogg</sound> @@ -1301,7 +1301,7 @@ <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> <sprite>equipment/chest/robe.xml|#000000</sprite> <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/head/aureole.xml</sprite> <sprite>equipment/weapons/sword-sandcutter.xml</sprite> <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound> @@ -1332,7 +1332,7 @@ <sprite>equipment/legs/assassin.xml</sprite> <sprite>equipment/chest/bromenalchest.xml|#fbf5e9</sprite> <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_2hand"/> <sound event="die">monsters/flashmob/flashmob-die1.ogg</sound> @@ -1358,7 +1358,7 @@ <sprite>equipment/legs/assassin-female.xml</sprite> <sprite>equipment/chest/bromenalchest-female.xml|#fbf5e9</sprite> <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/weapons/bow-female.xml</sprite> <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_bow"/> <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> @@ -1396,7 +1396,7 @@ <sprite>equipment/chest/warlordplate.xml</sprite> <sprite>equipment/head/knighthelm.xml</sprite> <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/head/aureole.xml</sprite> <sound event="hit">weapons/punch1.ogg</sound> <sound event="hit">weapons/punch2.ogg</sound> diff --git a/npcs/npc420.xml b/npcs/npc420.xml index fb3c3684..c2723969 100644 --- a/npcs/npc420.xml +++ b/npcs/npc420.xml @@ -7,7 +7,7 @@ <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> <sprite>equipment/chest/robe.xml|#ffffff</sprite> <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/head/aureole.xml</sprite> <particlefx>graphics/particles/angel.particle.xml</particlefx> </npc> diff --git a/npcs/npc421.xml b/npcs/npc421.xml index ef95403e..b0412878 100644 --- a/npcs/npc421.xml +++ b/npcs/npc421.xml @@ -8,7 +8,7 @@ <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> <sprite>equipment/chest/robe.xml|#ffffff</sprite> <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/head/aureole.xml</sprite> <particlefx>graphics/particles/angel.particle.xml</particlefx> </npc> diff --git a/npcs/npc426.xml b/npcs/npc426.xml index 2e1ec8d9..5dfa1b1b 100644 --- a/npcs/npc426.xml +++ b/npcs/npc426.xml @@ -7,7 +7,7 @@ <sprite>equipment/legs/pants.xml|#a4b2b2,ffffff</sprite> <sprite>equipment/chest/sorcerer-robe.xml|#000000;#2554c7</sprite> <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/head/aureole.xml</sprite> <particlefx>graphics/particles/angel.particle.xml</particlefx> </npc> diff --git a/npcs/npc430.xml b/npcs/npc430.xml index 614b71c9..f393cde1 100644 --- a/npcs/npc430.xml +++ b/npcs/npc430.xml @@ -6,7 +6,7 @@ <sprite>equipment/feet/furboots-female.xml</sprite> <sprite>equipment/legs/pants-female.xml|#a4b2b2,ffffff</sprite> <sprite>equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite> - <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/amulets/angel-wings.xml</sprite> <sprite>equipment/head/bunnyears-female.xml</sprite> <sprite>equipment/head/afkcap.xml</sprite> </npc> |
