fix: axes attributes #1194

libergod · Jul 7, 2023 · 3d7444d · 3d7444d
1 parent 29e8a02
commit 3d7444d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 29 deletions.
diff --git a/data-baiak/scripts/movements/equipment/unscripted_equipments.lua b/data-baiak/scripts/movements/equipment/unscripted_equipments.lua
@@ -3843,7 +3843,7 @@ local items = {
 		itemid = 27452,
 		type = "equip",
 		slot = "hand",
-                level = 200,
+		level = 200,
 		vocation = {
 			{"Knight", true},
 			{"Elite Knight"}
@@ -6624,11 +6624,7 @@ local items = {
 		itemid = 22727,
 		type = "equip",
 		slot = "hand",
-        level = 70,
-		vocation = {
-			{"Knight", true},
-			{"Elite Knight"}
-		}
+        level = 70
 	},
 	{
 		-- rift lance
@@ -7656,7 +7652,7 @@ local items = {
 		itemid = 21174,
 		type = "equip",
 		slot = "hand",
-        level = 40
+        level = 45
 	},
 	{
 		-- mino lance
@@ -8165,7 +8161,12 @@ local items = {
 		-- umbral master chopper
 		itemid = 20075,
 		type = "equip",
-		slot = "hand"
+		slot = "hand",
+        level = 250,
+		vocation = {
+			{"Knight", true},
+			{"Elite Knight"}
+        }
 	},
 	{
 		-- umbral master chopper
@@ -8178,7 +8179,7 @@ local items = {
 		itemid = 20074,
 		type = "equip",
 		slot = "hand",
-                level = 120,
+		level = 120,
 		vocation = {
 			{"Knight", true},
 			{"Elite Knight"}
@@ -8247,7 +8248,7 @@ local items = {
 		itemid = 20070,
 		type = "equip",
 		slot = "hand",
-              level = 75,
+		level = 75,
 		vocation = {
 			{"Knight", true},
 			{"Elite Knight"}
@@ -16873,7 +16874,11 @@ local items = {
 		itemid = 3342,
 		type = "equip",
 		slot = "hand",
-        level = 65
+        level = 65,
+		vocation = {
+			{"Knight", true},
+			{"Elite Knight"}
+		}
 	},
 	{
 		-- war axe
@@ -17021,11 +17026,7 @@ local items = {
 		itemid = 3331,
 		type = "equip",
 		slot = "hand",
-        level = 70,
-		vocation = {
-			{"Knight", true},
-			{"Elite Knight"}
-		}
+        level = 70
 	},
 	{
 		-- ravager's axe
@@ -17868,7 +17869,11 @@ local items = {
 		-- battle axe
 		itemid = 3266,
 		type = "equip",
-		slot = "hand"
+		slot = "hand",
+		vocation = {
+			{"Knight", true},
+			{"Elite Knight"}
+		}
 	},
 	{
 		-- battle axe

diff --git a/data-baiak/scripts/weapons/unscripted_weapons.lua b/data-baiak/scripts/weapons/unscripted_weapons.lua
@@ -2066,6 +2066,7 @@ local weapons = {
 		type = WEAPON_AXE,
 		level = 75,
 		unproperly = true,
+		action = "removecharge",
 		vocation = {
 			{"Knight", true},
 			{"Elite Knight"}
@@ -2077,6 +2078,7 @@ local weapons = {
 		type = WEAPON_SWORD,
 		level = 75,
 		unproperly = true,
+		action = "removecharge",
 		vocation = {
 			{"Knight", true},
 			{"Elite Knight"}
@@ -2299,7 +2301,7 @@ local weapons = {
 		}
 	},
 	{
-		-- guardian halberd
+		-- crude umbral chopper
 		itemid = 20073,
 		type = WEAPON_AXE,
 		level = 75,
@@ -4526,11 +4528,7 @@ local weapons = {
 		itemid = 3331,
 		type = WEAPON_AXE,
 		level = 70,
-		unproperly = true,
-		vocation = {
-			{"Knight", true},
-			{"Elite Knight"}
-		}
+		unproperly = true
 	},
 	{
 		-- heavy machete

diff --git a/data/items/items.xml b/data/items/items.xml
@@ -18724,7 +18724,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"/>
@@ -18739,7 +18739,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"/>
@@ -22904,7 +22904,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"/>
@@ -39335,7 +39335,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"/>
@@ -39347,7 +39347,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"/>
@@ -48838,7 +48838,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"/>