Fix some broken storyline

2 files changed, 47 insertions, 32 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 8eb5b878b..c8a3e946e 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -10965,9 +10965,9 @@ item_db: (
 	Type: "IT_WEAPON"
 	Buy: 55000
 	Sell: 5200
-	Weight: 1190
-	Atk: 600
-	Range: 9
+	Weight: 11000
+	Atk: 516
+	Range: 8
 	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
 	WeaponLv: 1
 	EquipLv: 60
@@ -10988,9 +10988,9 @@ item_db: (
 	Type: "IT_WEAPON"
 	Buy: 55000
 	Sell: 5200
-	Weight: 1190
-	Atk: 10
-	Range: 7
+	Weight: 21000
+	Atk: 0
+	Range: 6
 	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
 	WeaponLv: 1
 	EquipLv: 60
@@ -11001,10 +11001,11 @@ item_db: (
 		Id6511: 1
 	}
 	Script: <"
-		bonus bAtk,-(readparam(bDex));
+		bonus bAtk,-50;
 		//bonus bAtkRate,-60;
 		bonus bCriticalRate,-100;
 		bonus bHitRate,-10;
+		bonus bFleeRate,-100;
 	">
 },
 {
@@ -11014,8 +11015,8 @@ item_db: (
 	Type: "IT_WEAPON"
 	Buy: 55000
 	Sell: 5200
-	Weight: 1190
-	Atk: 288
+	Weight: 11000
+	Atk: 516
 	Range: 5
 	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
 	WeaponLv: 1
@@ -11028,8 +11029,7 @@ item_db: (
 	}
 	Script: <"
 		bonus bSplashRange,1;
-		bonus bHitRate,-30;
-		bonus bFlee2Rate,-25;
+		bonus bFleeRate,-100;
 	">
 },
 {
@@ -11039,9 +11039,9 @@ item_db: (
 	Type: "IT_WEAPON"
 	Buy: 55000
 	Sell: 5200
-	Weight: 760
-	Atk: 384
-	Range: 4
+	Weight: 8000
+	Atk: 122
+	Range: 5
 	Loc: "EQP_HAND_R"
 	WeaponLv: 1
 	EquipLv: 60
@@ -11052,8 +11052,7 @@ item_db: (
 		Id6511: 1
 	}
 	Script: <"
-		bonus bCriticalRate,-60;
-		bonus bHitRate,-40;
+		bonus bFleeRate,-100;
 	">
 },
 {
@@ -11063,9 +11062,9 @@ item_db: (
 	Type: "IT_WEAPON"
 	Buy: 550000
 	Sell: 10200
-	Weight: 970
-	Atk: 700
-	Range: 9
+	Weight: 12000
+	Atk: 900
+	Range: 7
 	Loc: ["EQP_HAND_R", "EQP_HAND_L"]
 	WeaponLv: 1
 	EquipLv: 70
@@ -11076,8 +11075,8 @@ item_db: (
 		Id6511: 1
 	}
 	Script: <"
-		bonus bCriticalRate,-100;
-		bonus bHitRate,20;
+		bonus bFleeRate,-100;
+		bonus bCriticalRate,40;
 	">
 },
 {
diff --git a/npc/017-4/pyndragon.txt b/npc/017-4/pyndragon.txt
index e1ee6062e..98d8d0017 100644
--- a/npc/017-4/pyndragon.txt
+++ b/npc/017-4/pyndragon.txt
@@ -58,7 +58,15 @@
     else
         mesq l("Good @@. My name is @@ and I make @@.", l("day"), .name$, l("firearms"));
     next;
-    if (BaseLevel < 50)
+    mesn strcharinfo(0);
+    mesq l("Firearms? What would that be? @@", "%%4");
+    next;
+    mesn;
+    mesq l("Oh, just an empty staff with black powder inside it. Which explodes. And then kills monsters.");
+    next;
+    mesn;
+    next;
+   if (BaseLevel < 50)
         goto L_TooWeak;
     else if (BaseLevel < 60)
         goto L_Weak;
@@ -85,14 +93,22 @@ L_Info:
     mes "";
     mesn;
     mesq l("There are four basic class:");
-    mesc l("REVOLVERS");
-    mesc l("* The only one hand ranged weapon you'll ever find. Not amazing at all.");
-    mesc l("RIFLES");
+    mesc l("SHORT GUNSTAFF");//aka revolver
+    mesc l("* The only one hand ranged weapon you'll ever find!");
+    mes l("  I cut it in half, and to fix shooting speed, I added some extra cogs.");
+    mes l("  It didn't got too much lighter, and it got really weak compared to a bow.");
+    mesc l("POWERFUL GUNSTAFF");
     mesc l("* Huge damage and more criticals, but slow fire rate.");
-    mesc l("GATLING");
-    mesc l("* Shoots like crazy, but deals less damage.");
-    mesc l("SHOTGUNS");
+    mes l("  The standard gunstaff! It is stronger than a bow, and doesn't have any penalty!");
+    mes l("  Oh, and it comes with added shooting range, but it is slow as hell to reload.");
+    mesc l("RAPID GUNSTAFF");
+    mesc l("* Low damage, highest attack speed from all.");
+    mes l("  One have lots of powder to attack non-stop, but oh god that is heavy.");
+    mes l("  It is also much weaker and less precise than a bow. But it is so fun using...");
+    mesc l("EXPLOSIVE GUNSTAFF");
     mesc l("* Causes splash damage, and are very expensive.");
+    mes l("  You know, I wanted to make the powder explode when hitting!");
+    mes l("  It is the same as a bow, including in penalty. But it deals splash damage!");
     next;
     mesn;
     mesq l("Select carefully which weapon you want, so there are no regrets.");
@@ -102,10 +118,10 @@ L_Info:
 L_Craft:
     select
         l("I changed my mind."),
-        l("I want a REVOLVER."),
-        l("I want a RIFLE."),
-        l("I want a GATLING."),
-        l("I want a SHOTGUN.");
+        l("I want a SHORT GUNSTAFF."),
+        l("I want a POWERFUL GUNSTAFF."),
+        l("I want a RAPID GUNSTAFF."),
+        l("I want an EXPLOSIVE GUNSTAFF.");
     mes "";
 
     switch (@menu) {