From 9d0c6e8944765d00a239680e35b3cfe2f3ac0faf Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 24 Sep 2021 00:31:16 -0300
Subject: Add three new weapons to Pyndragon. From these, only Whip effectively
 works. The other two, which rely on AutoSpell, are not working properly.

---
 db/re/item_db.conf | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 db/re/job_db.conf  |  10 ++++
 2 files changed, 142 insertions(+)

(limited to 'db/re')

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5aca15ab4..0f184373b 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -12521,6 +12521,9 @@ item_db: (
 		bonus bHitRate, -10;
 		bonus bMdefRate, -60;
 		bonus bMdef2Rate, -60;
+		bonus2 bSubEle, Ele_Holy, -12;
+		bonus2 bSubEle, Ele_Dark, -12;
+		bonus2 bSubEle, Ele_Ghost, -12;
 		skill TMW2_OVERLOAD, getrefine();
 	">
 },
@@ -12565,6 +12568,88 @@ item_db: (
 		bonus bFleeRate, -5;
 		bonus bMdefRate, -60;
 		bonus bMdef2Rate, -60;
+		bonus2 bSubEle, Ele_Holy, -20;
+		bonus2 bSubEle, Ele_Dark, -20;
+		bonus2 bSubEle, Ele_Ghost, -20;
+		skill TMW2_OVERLOAD, getrefine();
+	">
+},
+{
+	Id: 3538
+	AegisName: "PynKunai"
+	Name: "Kunai"
+	Type: "IT_WEAPON"
+	Buy: 7000
+	Sell: 3000
+	Weight: 1400
+	Atk: 370
+	Matk: 0
+	Loc: "EQP_HAND_R"
+	WeaponLv: 1
+	EquipLv: 60
+	Refine: true
+	Subtype: "W_1HSWORD"
+	Slots: 1
+	AllowCards: {
+		id5022: 1
+		id5023: 1
+		id5024: 1
+		id5025: 1
+		id5026: 1
+		id5027: 1
+		id5028: 1
+		id5029: 1
+		id5037: 1
+		id5038: 1
+		id5039: 1
+		id5040: 1
+	}
+	Script: <"
+		bonus bAtk,(BaseLevel-60)*4;
+		bonus bFleeRate, (BaseLevel/10);
+		bonus bDef, -(BaseLevel);
+		bonus bCritical, -(min(20, BaseLevel/6));
+		bonus bAddStealRate, min(800, BaseLevel+(JobLevel*2)); // FIXME?
+		bonus3 bAutoSpell,TF_STEAL,1,BaseLevel;
+		bonus3 bAutoSpell,BS_GREED,1,JobLevel*5;
+		skill TMW2_OVERLOAD, getrefine();
+	">
+},
+{
+	Id: 3539
+	AegisName: "PynWhip"
+	Name: "Whip"
+	Type: "IT_WEAPON"
+	Buy: 7000
+	Sell: 3000
+	Weight: 1400
+	Atk: 370
+	Matk: 0
+	Loc: "EQP_HAND_R"
+	WeaponLv: 1
+	EquipLv: 60
+	Refine: true
+	Subtype: "W_WHIP"
+	Slots: 1
+	AllowCards: {
+		id5022: 1
+		id5023: 1
+		id5024: 1
+		id5025: 1
+		id5026: 1
+		id5027: 1
+		id5028: 1
+		id5029: 1
+		id5037: 1
+		id5038: 1
+		id5039: 1
+		id5040: 1
+	}
+	Script: <"
+		bonus bAtk,(BaseLevel-60)*4;
+		bonus bFleeRate, -(BaseLevel/9);
+		bonus bDef2, -(BaseLevel/10);
+		bonus bSplashRange, 1;
 		skill TMW2_OVERLOAD, getrefine();
 	">
 },
@@ -14685,6 +14770,53 @@ item_db: (
 		skill TMW2_OVERLOAD, getrefine();
 	">
 },
+{
+	Id: 7020
+	AegisName: "PynScepter"
+	Name: "Scepter of Thunder"
+	Type: "IT_WEAPON"
+	Buy: 30000
+	Sell: 10000
+	Weight: 960
+	Atk: 25
+	Matk: 370
+	Range: 8
+	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+	WeaponLv: 1
+	EquipLv: 60
+	Refine: true
+	Subtype: "W_STAFF"
+	Slots: 1
+	AllowCards: {
+		id5022: 1
+		id5023: 1
+		id5024: 1
+		id5025: 1
+		id5026: 1
+		id5027: 1
+		id5028: 1
+		id5029: 1
+		id5037: 1
+		id5038: 1
+		id5039: 1
+		id5040: 1
+	}
+	Script: <"
+		//bonus bAttack2,-250;
+		bonus bMatk,(BaseLevel-50)*2;
+		bonus bAtk,(BaseLevel-60);
+		bonus bMaxSP,JobLevel+(BaseLevel-60);
+		addtoskill(TMW2_MPREGEN, 2, 2);
+		bonus bMaxHPrate, -16;
+		bonus bDef,-327; //bonus bDef,-32767;
+		// Will this work?
+		bonus3 bAutoSpell,TMW2_LIGHTNINGBOLT,min(4, BaseLevel/50),200;
+		bonus3 bAutoSpell,TMW2_METEORSHOWER,min(4, 1+JobLevel/37),100;
+		bonus3 bAutoSpell,TMW2_ARMAGEDDON,1,10;
+		bonus bSPDrainValue, -4;
+		skill TMW2_OVERLOAD, getrefine();
+	">
+},
 
 // System Reserved
 {
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 8feae59e8..69529b3a0 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -62,6 +62,7 @@ Human: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -119,6 +120,7 @@ MedHu: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -146,6 +148,7 @@ DarkHu: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -173,6 +176,7 @@ Elven: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -200,6 +204,7 @@ Orc: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -227,6 +232,7 @@ Raijin: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -254,6 +260,7 @@ Tritan: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -282,6 +289,7 @@ Ukar: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -309,6 +317,7 @@ Redy: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
@@ -336,6 +345,7 @@ Savior: {
 		Sword: 57
 		Axe: 52
 		Mace: 52
+		Whip: 62
 		TwoHandMace: 75
 		TwoHandSpear: 69
 		Rod: 92
-- 
cgit v1.2.3-60-g2f50