Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: axes attributes #1194

Merged
merged 1 commit into from
Jun 27, 2023
Merged

fix: axes attributes #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions data-otservbr-global/scripts/movements/equipment/unscripted_equipments.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3907,7 +3907,7 @@ local items = {
itemid = 27452,
type = "equip",
slot = "hand",
level = 200,
level = 200,
vocation = {
{"Knight", true},
{"Elite Knight"}
Expand Down Expand Up @@ -6683,11 +6683,7 @@ local items = {
itemid = 22727,
type = "equip",
slot = "hand",
level = 70,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
level = 70
},
{
-- rift lance
Expand Down Expand Up @@ -7734,7 +7730,7 @@ local items = {
itemid = 21174,
type = "equip",
slot = "hand",
level = 40
level = 45
},
{
-- mino lance
Expand Down Expand Up @@ -8243,7 +8239,12 @@ local items = {
-- umbral master chopper
itemid = 20075,
type = "equip",
slot = "hand"
slot = "hand",
level = 250,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- umbral master chopper
Expand All @@ -8256,7 +8257,7 @@ local items = {
itemid = 20074,
type = "equip",
slot = "hand",
level = 120,
level = 120,
vocation = {
{"Knight", true},
{"Elite Knight"}
Expand Down Expand Up @@ -8325,7 +8326,7 @@ local items = {
itemid = 20070,
type = "equip",
slot = "hand",
level = 75,
level = 75,
vocation = {
{"Knight", true},
{"Elite Knight"}
Expand Down Expand Up @@ -16923,7 +16924,11 @@ local items = {
itemid = 3342,
type = "equip",
slot = "hand",
level = 65
level = 65,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- war axe
Expand Down Expand Up @@ -17078,11 +17083,7 @@ local items = {
itemid = 3331,
type = "equip",
slot = "hand",
level = 70,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
level = 70
},
{
-- ravager's axe
Expand Down Expand Up @@ -17915,7 +17916,11 @@ local items = {
-- battle axe
itemid = 3266,
type = "equip",
slot = "hand"
slot = "hand",
vocation = {
{"Knight", true},
{"Elite Knight"}
}
},
{
-- battle axe
Expand Down
10 changes: 4 additions & 6 deletions data-otservbr-global/scripts/weapons/unscripted_weapons.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2061,6 +2061,7 @@ local weapons = {
type = WEAPON_AXE,
level = 75,
unproperly = true,
action = "removecharge",
vocation = {
{"Knight", true},
{"Elite Knight"}
Expand All @@ -2072,6 +2073,7 @@ local weapons = {
type = WEAPON_SWORD,
level = 75,
unproperly = true,
action = "removecharge",
vocation = {
{"Knight", true},
{"Elite Knight"}
Expand Down Expand Up @@ -2294,7 +2296,7 @@ local weapons = {
}
},
{
-- guardian halberd
-- crude umbral chopper
itemid = 20073,
type = WEAPON_AXE,
level = 75,
Expand Down Expand Up @@ -4525,11 +4527,7 @@ local weapons = {
itemid = 3331,
type = WEAPON_AXE,
level = 70,
unproperly = true,
vocation = {
{"Knight", true},
{"Elite Knight"}
}
unproperly = true
},
{
-- heavy machete
Expand Down
12 changes: 6 additions & 6 deletions data/items/items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18717,7 +18717,7 @@
</item>
<item id="9384" article="a" name="scythe of the reaper">
<attribute key="description" value="This scythe has harvested countless souls and still hungers for more"/>
<attribute key="weaponType" value="club"/>
<attribute key="weaponType" value="axe"/>
<attribute key="slotType" value="two-handed"/>
<attribute key="attack" value="16"/>
<attribute key="defense" value="6"/>
Expand All @@ -18732,7 +18732,7 @@
</item>
<item id="9386" article="a" name="farmer's avenger">
<attribute key="description" value="A weapon forged to fight oppression of the poor underdogs"/>
<attribute key="weaponType" value="sword"/>
<attribute key="weaponType" value="axe"/>
<attribute key="slotType" value="two-handed"/>
<attribute key="attack" value="17"/>
<attribute key="defense" value="7"/>
Expand Down Expand Up @@ -22897,7 +22897,7 @@
<attribute key="weight" value="4000"/>
</item>
<item id="12683" article="a" name="heavy trident">
<attribute key="weaponType" value="sword"/>
<attribute key="weaponType" value="axe"/>
<attribute key="slotType" value="two-handed"/>
<attribute key="attack" value="35"/>
<attribute key="defense" value="17"/>
Expand Down Expand Up @@ -39327,7 +39327,7 @@
<attribute key="attack" value="51"/>
<attribute key="defense" value="31"/>
<attribute key="weight" value="5000"/>
<attribute key="imbuementslot" value="3">
<attribute key="imbuementslot" value="2">
<attribute key="elemental damage" value="3"/>
<attribute key="life leech" value="3"/>
<attribute key="mana leech" value="3"/>
Expand All @@ -39339,7 +39339,7 @@
<attribute key="weaponType" value="axe"/>
<attribute key="slotType" value="two-handed"/>
<attribute key="attack" value="52"/>
<attribute key="defense" value="32"/>
<attribute key="defense" value="30"/>
<attribute key="weight" value="7000"/>
<attribute key="imbuementslot" value="3">
<attribute key="elemental damage" value="3"/>
Expand Down Expand Up @@ -48820,7 +48820,7 @@
<attribute key="criticalhitchance" value="10"/>
<attribute key="skillaxe" value="5"/>
<attribute key="attack" value="10"/>
<attribute key="defense" value="35"/>
<attribute key="defense" value="34"/>
<attribute key="weight" value="7200"/>
<attribute key="imbuementslot" value="3">
<attribute key="life leech" value="3"/>
Expand Down