Implement the missing Legendary Weapons + fixes

2 files changed, 149 insertions, 8 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 8cf1b4fd7..9f866e3ce 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -538,10 +538,10 @@ item_db: (
 		@min = 100;
 		@max = 225;
 		if ($EVENT$ == "Easter") {
-        	@min*=4;
-            @max*=3;
-    		sc_start SC_INCHIT,10000,10;
-        }
+			@min*=4;
+			@max*=3;
+			sc_start SC_INCHIT,10000,10;
+		}
 		@delay = 5;
 		@type = 1;
 		doevent "rand_sc_heal::OnUse";
@@ -2808,7 +2808,11 @@ item_db: (
 	ViewSprite: 646
 	Delay: 500
 	Script: <"
-		sc_start SC_WALKSPEED,5000,150;
+		@min = 150;
+		@max = 150;
+		@delay = 5;
+		@type = SC_WALKSPEED;
+		doevent "inc_sc_bonus::OnUse";
 	">
 },
 {
@@ -2823,7 +2827,11 @@ item_db: (
 	ViewSprite: 647
 	Delay: 500
 	Script: <"
-		sc_start SC_INCHIT,20000,40;
+		@min = 40;
+		@max = 40;
+		@delay = 20;
+		@type = SC_INCHIT;
+		doevent "inc_sc_bonus::OnUse";
 	">
 },
 {
@@ -10906,6 +10914,139 @@ item_db: (
 		bonus bMatk,JobLevel;
 	">
 },
+{
+	Id: 3602
+	AegisName: "Tyranny"
+	Name: "Tyranny"
+	Type: "IT_WEAPON"
+	Buy: 9999999
+	Sell: 0
+	Weight: 3000
+	Range: 8
+	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+	WeaponLv: 1
+	EquipLv: 1
+	Refine: true
+	Subtype: "W_BOW"
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	AllowAmmo: {
+		Id6500: 1
+		Id6501: 1
+		Id6502: 1
+		Id6503: 1
+		Id6504: 1
+		Id6505: 1
+		Id6506: 1
+		Id6507: 1	
+	}
+	Script: <"
+		bonus bHitRate,100;
+		bonus bAtkEle,Ele_Holy;
+		bonus bFlee2Rate,-100;
+		bonus bFleeRate,-100;
+
+		// This weapon attack power grows with the user
+		// It'll be behind the other weapons until the endgame stages (lv 100+)
+		bonus bAtk,BaseLevel*6;
+	">
+},
+{
+	Id: 3603
+	AegisName: "Runestaff"
+	Name: "Runestaff"
+	Type: "IT_WEAPON"
+	Buy: 9999999
+	Sell: 0
+	Weight: 3000
+	Range: 1
+	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+	WeaponLv: 1
+	EquipLv: 1
+	Refine: true
+	Subtype: "W_STAFF"
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		bonus bAtkEle,Ele_Holy;
+		//bonus bCastrate,-50;
+		//bonus bNoCastCancel,1;
+		bonus bMaxSP,750;
+		bonus bDef,-100;
+
+		// This weapon attack power grows with the user
+		// Catches up in early game, then lags behind, and catch up again at lv 106.
+		bonus bMatk,BaseLevel*7;
+		bonus bAtk,JobLevel;
+	">
+},
+{
+	Id: 3604
+	AegisName: "AegisShield"
+	Name: "Aegis Shield"
+	Type: "IT_ARMOR"
+	Buy: 9999999
+	Sell: 0
+	Weight: 3000
+	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+	WeaponLv: 1
+	EquipLv: 1
+	Refine: true
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		bonus bFlee2,20;
+		bonus bFlee,-100;
+		bonus bCriticalDef,100;
+		bonus bSPrecovRate,100;
+
+		// The defense power grows with the user
+		// Will always be higher than shields (except Savior shield at right level)
+		// However, it comes at an expensive price.
+		bonus bDef,BaseLevel*2;
+		bonus bAtkRate,-100;
+		bonus bMatkRate,-100;
+		bonus bRestartFullRecover,1;
+		bonus bNoKnockback,1;
+		bonus bBaseAtk,-700;
+
+		// Skills for Aegis Shield, all at maximum level
+		skill TMW2_ZARKOR, 7;
+		skill TMW2_KALMURK, 10;
+		skill TMW2_DRAGOKIN, 5;
+	">
+	OnUnequipScript: <"
+		@min = 20;
+		@max = 20;
+		@delay = 60;
+		@type = SC_WALKSPEED;
+		doevent "inc_sc_bonus::OnUse";
+	">
+},
 
 //
 // Pets
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index bd658f146..c1a18e146 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38422,7 +38422,7 @@ skill_db: (
 	Id: 20023
 	Name: "TMW2_ZARKOR"
 	Description: "Summon Cave Maggot"
-	MaxLevel: 3
+	MaxLevel: 7
 	SkillInfo: {
 		Quest: true
 	}
@@ -38446,7 +38446,7 @@ skill_db: (
 	Id: 20025
 	Name: "TMW2_KALMURK"
 	Description: "Summon Maggot"
-	MaxLevel: 4
+	MaxLevel: 10
 	SkillType: {
 		Self: true
 	}