Added new gears and corrected scripts

2 files changed, 396 insertions, 3 deletions

diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 040eb12bc..a092a81da 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -204,6 +204,7 @@
 18823:2153:1433,{ bonus2 bSkillAtk,LG_CANNONSPEAR,20; bonus2 bSkillAtk,LG_BANISHINGPOINT,20; bonus2 bSkillAtk,LG_SHIELDPRESS,20; }
 15090:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus3 bAutoSpellWhenHit,"WL_DRAINLIFE",3,100; }
 15091:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus bMaxHPrate,25; bonus bMaxSPrate,25; bonus bMatkRate,10; }
+15117:20744:22047,{ bonus bMaxHP,25; bonus bMaxSP,25; bonus bSpeedRate,25; if (getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES)+getequiprefinerycnt(EQI_ARMOR) >= 30) { bonus bMaxSP,5; bonus bSpeedRate,5; } }
 
 // Shadow Equipment
 24012:24013:24014:24015:24016:24017,{ bonus bAllStats,3; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5a3045d1c..5509edade 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -108088,6 +108088,99 @@ item_db: (
 		bonus2 bSubEle,Ele_Holy,10+(getrefine()/2);
 	">
 },
+{
+	Id: 15116
+	AegisName: "Armor_Of_Airship"
+	Name: "Armor Of Airship"
+	Type: 5
+	Buy: 20
+	Weight: 700
+	Def: 100
+	Loc: 16
+	EquipLv: 125
+	Script: <"
+		bonus bMaxHP,1000;
+		bonus bMaxSP,100;
+		bonus bMdef,10;
+		bonus bAllStats,1;
+	">
+},
+{
+	Id: 15117
+	AegisName: "Tarlock's_Armor"
+	Name: "Tarlock's Armor"
+	Type: 5
+	Buy: 20
+	Weight: 750
+	Def: 70
+	Loc: 16
+	EquipLv: 125
+	Script: <"
+		bonus bMaxHP,500;
+		bonus bMaxSP,50;
+		bonus bMdef,10;
+		bonus bAllStats,1;
+		.@r = getrefine();
+		if(.@r>=7) {
+			bonus bMaxHP,500;
+			bonus bMaxSP,50;
+		}
+		if(.@r>=9) {
+			bonus bMaxHP,200;
+			bonus bMaxSP,20;
+		}
+		if(.@r>=12) {
+			bonus bMaxHP,300;
+			bonus bMaxSP,30;
+		}
+	">
+},
+{
+	Id: 15123
+	AegisName: "Whikebain_Suit"
+	Name: "Whikebain Suit"
+	Type: 5
+	Buy: 10
+	Weight: 9000
+	Def: 56
+	Slots: 1
+	Job: 0x00001000
+	Upper: 56
+	Loc: 16
+	EquipLv: 105
+	Script: <"
+		bonus3 bAutoSpell,DC_WINKCHARM,1,20;
+		if(getrefine()>4) {
+			bonus bCritAtkRate,4;
+		}
+		if(getrefine()>6) {
+			bonus bCritAtkRate,6;
+		}
+		if (isequipped(1287)) {
+			if(getequiprefinerycnt(EQI_HAND_R)>6) {
+				autobonus2 "{ bonus bIgnoreDefRace,RC_NonBoss; }",20,3000,BF_WEAPON,"{}";
+			}
+		}
+	">
+},
+{
+	Id: 15128
+	AegisName: "Excellion_Suit"
+	Name: "Excellion Suit"
+	Type: 5
+	Buy: 20
+	Weight: 1000
+	Def: 100
+	Loc: 16
+	EquipLv: 99
+	Script: <"
+		bonus bVit,6;
+		bonus bMaxHPrate,(getrefine()/3)*4;
+		if(BaseLevel>130) {
+			bonus bVit,4;
+		}
+	">
+},
 //  More Maces
 // ===================================================================
 {
@@ -124528,6 +124621,14 @@ item_db: (
 	Loc: 1024
 	View: 42
 },
+{
+	Id: 20292
+	AegisName: "Costume_Black_Ramen_Hat"
+	Name: "Costume Black Ramen Hat"
+	Type: 5
+	Loc: 4096
+	View: 1338
+},
 //  New Garments (Costume)
 // ===================================================================
 {
@@ -124724,6 +124825,33 @@ item_db: (
 	View: 6
 },
 {
+	Id: 20744
+	AegisName: "Tarlock's_Cloak"
+	Name: "Tarlock's Cloak"
+	Type: 5
+	Buy: 20
+	Weight: 400
+	Def: 12
+	Slots: 1
+	Loc: 4
+	EquipLv: 125
+	Script: <"
+		bonus2 bSubEle,Ele_Neutral,10;
+		bonus bFlee,20;
+		bonus bVariableCastrate,-10;
+		.@r = getrefine();
+		if(.@r>=7) {
+			bonus bVariableCastrate,-10;
+		}
+		if(.@r>=9) {
+			bonus bVariableCastrate,-10;
+		}
+		if(.@r>=12) {
+			bonus bVariableCastrate,-5;
+		}
+	">
+},
+{
 	Id: 20746
 	AegisName: "Costume_Rudra_Wings"
 	Name: "Costume Rudra Wings"
@@ -124809,6 +124937,31 @@ item_db: (
 	Loc: 4
 	View: 10
 },
+{
+	Id: 20773
+	AegisName: "Excellion_Wing"
+	Name: "Excellion Wing"
+	Type: 5
+	Buy: 20
+	Weight: 900
+	Def: 40
+	Loc: 4
+	EquipLv: 99
+	Script: <"
+		bonus bFlee2,8;
+		bonus bFlee,getrefine()*2;
+		if(BaseLevel>130) {
+			bonus bFlee2,2;
+		}
+		if(isequipped(15128)) {
+			bonus bDelayrate,-10;
+			bonus bFlee2,6;
+			if(BaseLevel>130) {
+				bonus bDelayrate,-10;
+			}
+		}
+	">
+},
 //  New Two-handed Swords
 // ===================================================================
 {
@@ -124886,11 +125039,15 @@ item_db: (
 	Range: 1
 	Slots: 2
 	Job: 0x00004082
-	Upper: 63
 	Loc: 34
 	WeaponLv: 4
 	EquipLv: 48
 	View: 3
+	Script: <"
+		bonus bCritical,30;
+		bonus bAspdRate,8;
+		bonus2 bAddEff2,Eff_Curse,10;
+	">
 },
 {
 	Id: 21004
@@ -124908,13 +125065,13 @@ item_db: (
 	WeaponLv: 3
 	EquipLv: 100
 	View: 3
+	Script: <" bonus bAspd,(getrefine()/2); ">
 },
 {
 	Id: 21005
 	AegisName: "Metal_Two_Hand_Sword"
 	Name: "Metal Two-Handed Sword"
 	Type: 4
-	Buy: 20
 	Atk: 95
 	Range: 1
 	Slots: 1
@@ -124923,6 +125080,89 @@ item_db: (
 	Loc: 34
 	WeaponLv: 3
 	View: 3
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		bonus bAtk,getrefine()*6;
+		bonus bMatk,getrefine()*2;
+		if(BaseLevel>20) {
+			bonus bAtk,min(((BaseLevel-20)/10)*5,120);
+		}
+	">
+},
+{
+	Id: 21006
+	AegisName: "TE_WoE_Two-Handed_Sword"
+	Name: "TE WoE Two-Handed Sword"
+	Type: 4
+	Atk: 150
+	Range: 1
+	Job: 0x00004082
+	Loc: 34
+	WeaponLv: 3
+	EquipLv: 40
+	Refine: false
+	View: 3
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		bonus2 bAddEff,Eff_Bleeding,300;
+		bonus2 bAddRace,RC_DemiHuman,40;
+	">
+},
+{
+	Id: 21007
+	AegisName: "Heavy_Sword"
+	Name: "Heavy Sword"
+	Type: 4
+	Buy: 20
+	Weight: 2500
+	Atk: 330
+	Range: 1
+	Slots: 1
+	Job: 0x00004080
+	Loc: 34
+	WeaponLv: 1
+	EquipLv: 150
+	View: 3
+	Script: <"
+		bonus bStr,20;
+	">
+},
+{
+	Id: 21008
+	AegisName: "Small_Karasuma"
+	Name: "Small Karasuma"
+	Type: 4
+	Buy: 20
+	Weight: 1000
+	Atk: 170
+	Range: 1
+	Slots: 2
+	Job: 0x00004082
+	Loc: 34
+	WeaponLv: 4
+	EquipLv: 50
+	View: 3
+	Script: <"
+		bonus bCritAtkRate,getrefine()*2;
+		bonus3 bAutoSpell,NPC_CRITICALWOUND,1,50;
+	">
 },
 {
 	Id: 21009
@@ -124952,8 +125192,132 @@ item_db: (
 	OnUnequipScript: <" heal -1000,0; ">
 },
 {
+	Id: 21010
+	AegisName: "Evil_Slayer_Slasher_Sword"
+	Name: "Evil Slayer Slasher Sword"
+	Type: 4
+	Buy: 20
+	Weight: 2000
+	Atk: 225
+	Range: 1
+	Slots: 1
+	Job: 0x00004082
+	Upper: 56
+	Loc: 34
+	WeaponLv: 3
+	EquipLv: 100
+	View: 3
+	Script: <"
+		if(getrefine()>=9) {
+			bonus bAtkRate,5;
+		}
+		if(getrefine()>=12) {
+			bonus bAtkRate,7;
+		}
+	">
+},
+{
+	Id: 21011
+	AegisName: "Gigantic_Blade"
+	Name: "Gigantic Blade"
+	Type: 4
+	Buy: 20
+	Weight: 5000
+	Atk: 300
+	Range: 1
+	Slots: 1
+	Job: 0x00004082
+	Upper: 56
+	Loc: 34
+	WeaponLv: 4
+	EquipLv: 130
+	View: 3
+	Script: <"
+		bonus bUnbreakableWeapon,0;
+		bonus bAspdRate,-5;
+		if(readparam(bStr)<=110) bonus bAtk,-250;
+		bonus bCritAtkRate,getrefine();
+	">
+},
+{
+	Id: 21012
+	AegisName: "Mashirubeken"
+	Name: "Mashirubeken"
+	Type: 4
+	Buy: 20
+	Weight: 2200
+	Atk: 200
+	Matk: 150
+	Range: 1
+	Slots: 2
+	Job: 0x00000080
+	Upper: 56
+	Loc: 34
+	WeaponLv: 4
+	EquipLv: 110
+	View: 3
+	Script: <"
+		if(isequipped(4388)) bonus3 bAutoSpell,MG_SOULSTRIKE,5,20+(getequiprefinerycnt(EQI_HAND_R));
+		if(isequipped(4335)) bonus3 bAutoSpell,WZ_EARTHSPIKE,5,20+(getequiprefinerycnt(EQI_HAND_R));
+		if(isequipped(4345)) bonus3 bAutoSpell,MG_LIGHTNINGBOLT,5,20+(getequiprefinerycnt(EQI_HAND_R));
+		if(isequipped(4350)) bonus3 bAutoSpell,MG_COLDBOLT,5,20+(getequiprefinerycnt(EQI_HAND_R));
+		if(isequipped(4380)) bonus3 bAutoSpell,MG_FIREBOLT,5,20+(getequiprefinerycnt(EQI_HAND_R));
+	">
+},
+{
+	Id: 21013
+	AegisName: "Companion_Cavalry_Sword"
+	Name: "Companion Cavalry Sword"
+	Type: 4
+	Buy: 20
+	Weight: 2200
+	Atk: 210
+	Range: 1
+	Slots: 2
+	Job: 0x00000080
+	Upper: 56
+	Loc: 34
+	WeaponLv: 4
+	EquipLv: 110
+	View: 3
+	Script: <"
+		bonus2 bSkillUseSP,KN_AUTOCOUNTER,-2;
+		bonus2 bSkillUseSP,LK_PARRYING,-25;
+		if(isequipped(4072)) {
+			bonus2 bSubSize,Size_Large,15;
+			bonus2 bSubSize,Size_Small,15;
+		}
+	">
+},
+{
+	Id: 21014
+	AegisName: "Infinity_Two-Handed_Sword"
+	Name: "Infinity Two-Handed Sword"
+	Type: 4
+	Buy: 20
+	Weight: 500
+	Atk: 230
+	Range: 1
+	Slots: 1
+	Job: 0x00004082
+	Upper: 56
+	Loc: 34
+	WeaponLv: 4
+	EquipLv: 100
+	View: 3
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+},
+{
 	Id: 21015
-	AegisName: "Crimson_wo-Handed_Sword"
+	AegisName: "Crimson_Two-Handed_Sword"
 	Name: "Crimson Two-Handed Sword"
 	Type: 4
 	Buy: 20
@@ -124992,6 +125356,28 @@ item_db: (
 	">
 },
 {
+	Id: 21018
+	AegisName: "Lindy_Hop"
+	Name: "Lindy Hop"
+	Type: 4
+	Buy: 20
+	Weight: 3400
+	Atk: 340
+	Range: 1
+	Slots: 2
+	Job: 0x00004082
+	Upper: 56
+	Loc: 34
+	WeaponLv: 4
+	EquipLv: 170
+	View: 3
+	Script: <"
+		bonus bUnbreakableWeapon,0;
+		bonus bAtkRate,getrefine()/2;
+		bonus bAspdRate,getrefine();
+	">
+},
+{
 	Id: 21019
 	AegisName: "Onimaru"
 	Name: "Onimaru"
@@ -125011,6 +125397,12 @@ item_db: (
 		if(readparam(bStr)>=95) bonus bAtk,40;
 		if(readparam(bStr)>=108) bonus bAtk,40;
 		if(readparam(bStr)>=120) bonus bAtk,40;
+		if(getrefine()>=7) {
+			bonus3 bAutoSpell,NPC_WIDECURSE,5,10;
+		}
+		if(getrefine()>=9) {
+			skill LK_BERSERK,1;
+		}		
 	">
 },
 //  New Shoes