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

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

1 files changed, 29 insertions, 3 deletions

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;
 }