Skip to content

Commit

Permalink
fix: distance weapons attributes #1167
Browse files Browse the repository at this point in the history
  • Loading branch information
libergod committed Jun 16, 2023
1 parent 53f1ee5 commit e8e6b21
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 28 deletions.
88 changes: 69 additions & 19 deletions data-baiak/scripts/movements/equipment/unscripted_equipments.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3039,7 +3039,7 @@ local items = {
itemid = 29417,
type = "equip",
slot = "hand",
level = 250,
level = 220,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
Expand Down Expand Up @@ -5327,13 +5327,15 @@ local items = {
-- royal star
itemid = 25759,
type = "equip",
slot = "hand"
slot = "hand",
level = 120
},
{
-- royal star
itemid = 25759,
type = "deequip",
slot = "hand"
slot = "hand",
level = 120
},
{
-- spectral bolt
Expand All @@ -5351,13 +5353,15 @@ local items = {
-- leaf star
itemid = 25735,
type = "equip",
slot = "hand"
slot = "hand",
level = 60
},
{
-- leaf star
itemid = 25735,
type = "deequip",
slot = "hand"
slot = "hand",
level = 60
},
{
-- dream blossom staff
Expand Down Expand Up @@ -7712,13 +7716,15 @@ local items = {
-- glooth spear
itemid = 21158,
type = "equip",
slot = "hand"
slot = "hand",
level = 60
},
{
-- glooth spear
itemid = 21158,
type = "deequip",
slot = "hand"
slot = "hand",
level = 60
},
{
-- cake backpack
Expand Down Expand Up @@ -8584,13 +8590,19 @@ local items = {
-- mean paladin spear
itemid = 17110,
type = "equip",
slot = "hand"
slot = "hand",
vocation = {
{"None", true}
}
},
{
-- mean paladin spear
itemid = 17110,
type = "deequip",
slot = "hand"
slot = "hand",
vocation = {
{"None", true}
}
},
{
-- mean knight sword
Expand Down Expand Up @@ -12172,7 +12184,7 @@ local items = {
itemid = 8024,
type = "equip",
slot = "hand",
level = 120,
level = 100,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
Expand All @@ -12182,7 +12194,12 @@ local items = {
-- The Devileye
itemid = 8024,
type = "deequip",
slot = "hand"
slot = "hand",
level = 100,
vocation = {
{"Paladin", true},
{"Royal Paladin"}
}
},
{
-- royal crossbow
Expand Down Expand Up @@ -12333,6 +12350,19 @@ local items = {
type = "deequip",
slot = "necklace"
},

{
-- viper star
itemid = 7366,
type = "equip",
slot = "hand"
},
{
-- viper star
itemid = 7366,
type = "deequip",
slot = "hand"
},
{
-- crimson sword
itemid = 860,
Expand Down Expand Up @@ -12363,6 +12393,18 @@ local items = {
type = "equip",
slot = "ring"
},
{
-- shapeshifter ring
itemid = 907,
type = "deequip",
slot = "ring"
},
{
-- Throwing Cake
itemid = 904,
type = "equip",
slot = "ring"
},
{
-- shapeshifter ring
itemid = 904,
Expand Down Expand Up @@ -14505,37 +14547,43 @@ local items = {
-- royal spear
itemid = 7378,
type = "equip",
slot = "hand"
slot = "hand",
level = 25
},
{
-- royal spear
itemid = 7378,
type = "deequip",
slot = "hand"
slot = "hand",
level = 25
},
{
-- assassin star
itemid = 7368,
type = "equip",
slot = "hand"
slot = "hand",
level = 80
},
{
-- assassin star
itemid = 7368,
type = "deequip",
slot = "hand"
slot = "hand",
level = 80
},
{
-- enchanted spear
itemid = 7367,
type = "equip",
slot = "hand"
slot = "hand",
level = 42
},
{
-- enchanted spear
itemid = 7367,
type = "deequip",
slot = "hand"
slot = "hand",
level = 42
},
{
-- onyx arrow
Expand Down Expand Up @@ -15108,13 +15156,15 @@ local items = {
-- hunting spear
itemid = 3347,
type = "equip",
slot = "hand"
slot = "hand",
level = 20
},
{
-- hunting spear
itemid = 3347,
type = "deequip",
slot = "hand"
slot = "hand",
level = 20
},
{
-- ripper lance
Expand Down
21 changes: 12 additions & 9 deletions data/items/items.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15929,7 +15929,7 @@
<attribute key="ammotype" value="arrow"/>
<attribute key="hitchance" value="3"/>
<attribute key="range" value="6"/>
<attribute key="weight" value="2200"/>
<attribute key="weight" value="2500"/>
<attribute key="imbuementslot" value="3">
<attribute key="elemental damage" value="3"/>
<attribute key="life leech" value="3"/>
Expand Down Expand Up @@ -37365,7 +37365,7 @@
<attribute key="elementearth" value="2"/>
<attribute key="maxhitchance" value="86"/>
<attribute key="hitchance" value="90"/>
<attribute key="range" value="4"/>
<attribute key="range" value="5"/>
<attribute key="attack" value="48"/>
<attribute key="weight" value="200"/>
</item>
Expand Down Expand Up @@ -39383,9 +39383,9 @@
<attribute key="weaponType" value="distance"/>
<attribute key="slotType" value="two-handed"/>
<attribute key="ammotype" value="arrow"/>
<attribute key="hitchance" value="6"/>
<attribute key="hitchance" value="5"/>
<attribute key="range" value="6"/>
<attribute key="attack" value="6"/>
<attribute key="attack" value="5"/>
<attribute key="weight" value="5500"/>
<attribute key="imbuementslot" value="3">
<attribute key="elemental damage" value="3"/>
Expand All @@ -39399,7 +39399,7 @@
<attribute key="weaponType" value="distance"/>
<attribute key="slotType" value="two-handed"/>
<attribute key="ammotype" value="bolt"/>
<attribute key="hitchance" value="6"/>
<attribute key="hitchance" value="5"/>
<attribute key="range" value="5"/>
<attribute key="attack" value="6"/>
<attribute key="weight" value="6500"/>
Expand Down Expand Up @@ -45488,7 +45488,7 @@
<attribute key="slotType" value="two-handed"/>
<attribute key="ammotype" value="arrow"/>
<attribute key="absorbpercentdeath" value="4"/>
<attribute key="skilldist" value="4"/>
<attribute key="skilldist" value="2"/>
<attribute key="hitchance" value="4"/>
<attribute key="range" value="6"/>
<attribute key="attack" value="6"/>
Expand Down Expand Up @@ -49226,7 +49226,7 @@
<attribute key="ammotype" value="arrow"/>
<attribute key="absorbpercentice" value="5"/>
<attribute key="skilldist" value="2"/>
<attribute key="hitchance" value="4"/>
<attribute key="hitchance" value="6"/>
<attribute key="range" value="6"/>
<attribute key="attack" value="6"/>
<attribute key="weight" value="4800"/>
Expand Down Expand Up @@ -51550,6 +51550,8 @@
<attribute key="slotType" value="right-hand"/>
<attribute key="containersize" value="8"/>
<attribute key="weight" value="2200"/>
<!--attribute key="perfectshotdamage" value="20"/-->
<!--attribute key="perfectshotrange" value="4"/-->
</item>
<item id="36667" article="a" name="eldritch breeches">
<attribute key="absorbpercentphysical" value="2"/>
Expand Down Expand Up @@ -54762,7 +54764,7 @@
<attribute key="ammotype" value="bolt"/>
<attribute key="absorbpercentpoison" value="4"/>
<attribute key="skilldist" value="2"/>
<attribute key="hitchance" value="7"/>
<attribute key="hitchance" value="6"/>
<attribute key="range" value="6"/>
<attribute key="attack" value="8"/>
<attribute key="weight" value="10200"/>
Expand Down Expand Up @@ -56525,10 +56527,11 @@
<attribute key="weight" value="1500"/>
<attribute key="armor" value="1"/>
</item>
<item id="40535" article="the" name="broken Iks spear">
<item id="40535" name="broken Iks spear">
<attribute key="description" value="This spear was once wielded by the ancient Iks"/>
<attribute key="weight" value="1300"/>
<attribute key="attack" value="1"/>
<attribute key="defense" value="1"/>
<attribute key="weaponType" value="distance"/>
<attribute key="shootType" value="spear"/>
<attribute key="range" value="3"/>
Expand Down

0 comments on commit e8e6b21

Please sign in to comment.