diff options
| -rw-r--r-- | items/equip-1hand/item0591_LongSword.xml | 21 | ||||
| -rw-r--r-- | items/equip-1hand/item0867_IceGladius.xml | 14 | ||||
| -rw-r--r-- | items/equip-head/item0801_PinkieHelmet.xml | 11 | ||||
| -rw-r--r-- | items/equip-ring/item5253_MagicRing.xml | 11 | ||||
| -rw-r--r-- | license.md | 4 | ||||
| -rw-r--r-- | monsters.xml | 4 | ||||
| m--------- | music | 0 | ||||
| -rw-r--r-- | sfx/weapons/swords/longsword/longsword-hit1.ogg (renamed from sfx/weapons/swords/longsword-hit1.ogg) | bin | 6081 -> 6081 bytes | |||
| -rw-r--r-- | sfx/weapons/swords/longsword/longsword-hit2.ogg (renamed from sfx/weapons/swords/longsword-hit2.ogg) | bin | 7064 -> 7064 bytes |
9 files changed, 57 insertions, 8 deletions
diff --git a/items/equip-1hand/item0591_LongSword.xml b/items/equip-1hand/item0591_LongSword.xml index f81d18ad..478042fc 100644 --- a/items/equip-1hand/item0591_LongSword.xml +++ b/items/equip-1hand/item0591_LongSword.xml @@ -1,7 +1,26 @@ <?xml version="1.0"?> <items> - <item id="591" image="equipment/weapon/sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="10" sellProtected="true"> + <item id="591" + image="equipment/weapon/sword-longsword.png" + name="Long Sword" + description="A sword with a long and agile blade." + type="equip-1hand" + attack-action="attack_chop" + effect="Weapon Level 2 / Perfect Hit +11%, +7% Damage / Attack Speed -11" + attack="149" + attack-range="1" + weight="1300" + req-str="31" + req-vit="67" + req-dex="59" + req-luk="61" + sellProtected="true"> <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="hit">weapons/swords/longsword/longsword-hit1.ogg</sound> + <sound event="hit">weapons/swords/longsword/longsword-hit2.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> </item> </items> diff --git a/items/equip-1hand/item0867_IceGladius.xml b/items/equip-1hand/item0867_IceGladius.xml index bc4da922..9b8ec863 100644 --- a/items/equip-1hand/item0867_IceGladius.xml +++ b/items/equip-1hand/item0867_IceGladius.xml @@ -1,6 +1,18 @@ <?xml version="1.0"?> <items> - <item id="867" image="equipment/weapon/sword-ice.png" name="Ice Gladius" description="A sword with a shimmering blue blade." effect="Weapon Level 1" attack="130" type="equip-1hand" attack-action="attack" attack-range="1" luk="1" weight="1000" sellProtected="true"> + <item id="867" + image="equipment/weapon/sword-ice.png" + name="Ice Gladius" + type="equip-1hand" + attack-action="attack" + description="A sword with a shimmering blue blade." + effect="Weapon Level 1" + attack="130" + attack-range="1" + luk="1" + criticaldefense="5" + weight="1000" + sellProtected="true"> <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound> diff --git a/items/equip-head/item0801_PinkieHelmet.xml b/items/equip-head/item0801_PinkieHelmet.xml index 00c1d8f5..1e3972d9 100644 --- a/items/equip-head/item0801_PinkieHelmet.xml +++ b/items/equip-head/item0801_PinkieHelmet.xml @@ -1,6 +1,15 @@ <?xml version="1.0"?> <items> - <item id="801" image="equipment/head/pinkie-helmet.png" name="Pinkie Helmet" description="A helmet of Pinkie warriors." mattack="-20" type="equip-head" defense="10" luk="1" weight="800" sellProtected="true"> + <item id="801" + image="equipment/head/pinkie-helmet.png" + type="equip-head" + name="Pinkie Helmet" + description="A helmet for Pinkie warriors." + defense="15" + luk="1" + mattack="-30" + weight="800" + sellProtected="true"> <sprite gender="unisex">equipment/head/pinkie-helmet.xml</sprite> <sprite gender="female">equipment/head/pinkie-helmet-female.xml</sprite> <replace sprite="hair"> diff --git a/items/equip-ring/item5253_MagicRing.xml b/items/equip-ring/item5253_MagicRing.xml index b16e193e..43316a8a 100644 --- a/items/equip-ring/item5253_MagicRing.xml +++ b/items/equip-ring/item5253_MagicRing.xml @@ -1,5 +1,14 @@ <?xml version="1.0"?> <items> - <item id="5253" image="equipment/rings/magic.png" name="Magic Ring" description="A powerful ring for spellcasters." effect="#ingrav delay -20% " int="1" type="equip-ring" weight="1"> + <item id="5253" + image="equipment/rings/magic.png" + type="equip-ring" + name="Magic Ring" + description="A powerful ring for spellcasters." + effect="ingrav delay -20% / Requires Naturally Flowing Magic (lvl 2)" + int="1" + level="80" + req-int="80" + weight="3"> </item> </items> @@ -1617,8 +1617,8 @@ File | Artists | Licenses `sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0 `sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0 `sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0 -`sfx/weapons/swords/longsword-hit1.ogg` | Krazyjakee | GPLv2 -`sfx/weapons/swords/longsword-hit2.ogg` | Krazyjakee | GPLv2 +`sfx/weapons/swords/longsword/longsword-hit1.ogg` | Krazyjakee | GPLv2 +`sfx/weapons/swords/longsword/longsword-hit2.ogg` | Krazyjakee | GPLv2 `sfx/weapons/swords/longsword-miss1.ogg` | Krazyjakee | GPLv2 `sfx/weapons/swords/rapier-hit1.ogg` | Krazyjakee | GPLv2 `sfx/weapons/swords/sabre-hit1.ogg` | Krazyjakee | GPLv2 diff --git a/monsters.xml b/monsters.xml index 131d8171..39696caa 100644 --- a/monsters.xml +++ b/monsters.xml @@ -1613,8 +1613,8 @@ <sprite>equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite>equipment/shields/wooden.xml</sprite> <sound event="die">env/spawn_burst.ogg</sound> - <sound event="hit">weapons/swords/longsword-hit1.ogg</sound> - <sound event="hit">weapons/swords/longsword-hit2.ogg</sound> + <sound event="hit">weapons/swords/longsword/longsword-hit1.ogg</sound> + <sound event="hit">weapons/swords/longsword/longsword-hit2.ogg</sound> <sound event="miss">weapons/miss1.ogg</sound> <sound event="miss">weapons/miss2.ogg</sound> <sound event="miss">weapons/miss3.ogg</sound> diff --git a/music b/music -Subproject c7004f9805e4d5a19a05fc252bf00769b395068 +Subproject f3e326cd669ebd2cd5fd82a4dcf28bed65eef97 diff --git a/sfx/weapons/swords/longsword-hit1.ogg b/sfx/weapons/swords/longsword/longsword-hit1.ogg Binary files differindex 278a3c8e..278a3c8e 100644 --- a/sfx/weapons/swords/longsword-hit1.ogg +++ b/sfx/weapons/swords/longsword/longsword-hit1.ogg diff --git a/sfx/weapons/swords/longsword-hit2.ogg b/sfx/weapons/swords/longsword/longsword-hit2.ogg Binary files differindex c0df2bc7..c0df2bc7 100644 --- a/sfx/weapons/swords/longsword-hit2.ogg +++ b/sfx/weapons/swords/longsword/longsword-hit2.ogg |