Add three new weapons to Pyndragon. From these, only Whip effectively works.

The other two, which rely on AutoSpell, are not working properly.

3 files changed, 171 insertions, 3 deletions

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
diff --git a/npc/017-4/pyndragon.txt b/npc/017-4/pyndragon.txt
index 352ab8d8d..d112b46e7 100644
--- a/npc/017-4/pyndragon.txt
+++ b/npc/017-4/pyndragon.txt
@@ -24,7 +24,7 @@
         mesc l("@@/@@ @@", countitem(.@base1), .@amon1, getitemlink(.@base1));
         mesc l("@@/@@ @@", countitem(.@base2), .@amon2, getitemlink(.@base2));
         mesc l("@@/@@ @@", countitem(.@base3), .@amon3, getitemlink(.@base3));
-        mesc l("@@/@@ GP", format_number(Zeny), .@price);
+        mesc l("@@/@@ GP", format_number(Zeny), fnum(.@price));
         next;
 
         select
@@ -128,7 +128,8 @@ L_Craft:
         l("I want a SHORT GUNSTAFF."),
         l("I want a POWERFUL GUNSTAFF."),
         l("I want a RAPID GUNSTAFF."),
-        l("I want an EXPLOSIVE GUNSTAFF.");
+        l("I want an EXPLOSIVE GUNSTAFF."),
+        rif(false, l("I want something more magical."));
     mes "";
 
     switch (@menu) {
@@ -144,6 +145,12 @@ L_Craft:
         case 5:
             craft_gun( LeadIngot, 9, TitaniumIngot, 10, Coal, 16, PynShotgun, 6000 );
             goto L_Craft;
+        case 6:
+            mesn;
+            mesq l("I suppose I can make you a %s. It sometimes casts magic skills upon your foes. Well, seldomly, but it also deals more damage than normal wands.", getitemlink(PynScepter));
+            next;
+            craft_gun( LeadIngot, 10, TitaniumIngot, 12, Coal, 24, PynScepter, 24000 );
+            goto L_Craft;
     }
     goto L_Menu;
 
@@ -153,7 +160,9 @@ L_CraftMelee:
         l("I changed my mind."),
         l("Which melee you craft?"),
         l("I want a PORTABLE LIGHTSABER."),
-        l("I want a POWERFUL LIGHTSABER.");
+        l("I want a POWERFUL LIGHTSABER."),
+        rif(getskilllv(TF_STEAL) && false, l("I want a KUNAI.")),
+        l("I want a WHIP.");
     mes "";
 
     switch (@menu) {
@@ -166,6 +175,12 @@ L_CraftMelee:
         case 4:
             craft_gun( EverburnPowder, 30, TitaniumIngot, 7, LeadIngot, 4, PowerfulLightsaber, 25000 );
             goto L_CraftMelee;
+        case 5:
+            craft_gun( GoldIngot, 3, HeroCoin, 500, LOFCoin, 4, PynKunai, 25000 );
+            goto L_CraftMelee;
+        case 6:
+            craft_gun( LOFCoin, 3, TitaniumIngot, 5, LeadIngot, 3, PynWhip, 22000 );
+            goto L_CraftMelee;
     }
     goto L_Menu;
 
@@ -207,6 +222,17 @@ function explainMelee {
     mes l("  But the result is a fast weapon which is also powerful.");
     mes "";
     next;
+    mesc l("KUNAI");
+    mesc l("* More for bandits than assassins or ninjas.");
+    mes l("  See, I was lazy and there were only short knives around... So I made a Kunai.");
+    mes l("  It can steal items or collect drops on the floor randomly. Also improves your evasion.");
+    mes l("  It is not that amazing, though. I will trade with you for more useful items.");
+    mes "";
+    mesc l("WHIP");
+    mesc l("* Has non-cumulative area of effect damage.");
+    mes l("  A fair all-rounder weapon; Stronger than you would expect and not so clumsy.");
+    mes l("  But its splash damage does not stack, so be careful when adding options.");
+    next;
     return;
 }