A bit cheap, but force Halinarzo Librarian to react when you're putting horses over carriage

Also: Prepare grounds for Brawler - ASPD nerfs

3 files changed, 39 insertions, 10 deletions

diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 99e0e3fc8..3ae30e602 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -68,7 +68,7 @@ Human: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -125,7 +125,7 @@ MedHu: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -152,7 +152,7 @@ DarkHu: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -179,7 +179,7 @@ Elven: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -206,7 +206,7 @@ Orc: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -233,7 +233,7 @@ Raijin: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -260,7 +260,7 @@ Tritan: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -288,7 +288,7 @@ Ukar: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -315,7 +315,7 @@ Redy: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
@@ -342,7 +342,7 @@ Savior: {
 		TwoHandRod: 92
 		Bow: 90
 		Knuckle: 20
-		Katar: 45
+		Katar: 48
 		Revolver: 110
 		Rifle: 135
 		Shotgun: 90
diff --git a/npc/009-2/librarian.txt b/npc/009-2/librarian.txt
index bd4ea8e3c..4b4b7faa1 100644
--- a/npc/009-2/librarian.txt
+++ b/npc/009-2/librarian.txt
@@ -13,11 +13,39 @@
     if (.@n >= 9) goto L_Complete;
     if (.@n == 8) goto L_Report;
     if (.@n == 6 || .@n == 7) goto L_Advance;
+    if (.@n < 6 && .@n >= 2) goto L_Horses;
     mesn;
     mesq l("Hello. I am the book keeper, responsible for keeping Halinarzo History.");
     // TODO: Import data from BR-002-5 (Royal Library) and make available story about TMW-BR
     close;
 
+L_Horses:
+    mesn;
+    mesq l("Hello. I am the book keeper, responsible for keeping Halinarzo History.");
+    next;
+    select
+        l("Cool, thank you."),
+        l("I was born here but I had amnesia.");
+    mes "";
+    if (@menu == 1)
+        close;
+    mesn;
+    mesq l("Please prove your statement.");
+    next;
+    mesc l("You realize that you have no means to prove your statement.");
+    mesc l("Saying that you were sent here would prove nothing.");
+    mesc l("How do you even prove amnesia, anyway?");
+    next;
+    mesn;
+    mesq l("You are just a random stranger trying to steal adventurer data, aren't you?? %%e");
+    next;
+    mesn;
+    mesq l("I bet you'll now ask for %s's password, and scam all their money!!", strcharinfo(0));
+    next;
+    mesn;
+    mesq l("Get out of here! Before I call the city guard!!");
+    close;
+
 L_Advance:
     .@nt = getq2(General_Narrator);
     // Initial Value is 0.
diff --git a/npc/craft/options.txt b/npc/craft/options.txt
index 2423c49b9..0002850ca 100644
--- a/npc/craft/options.txt
+++ b/npc/craft/options.txt
@@ -386,6 +386,7 @@ function	script	csys_Multiplier	{
         case IOPT_EXPGAIN:
         case VAR_CRITICALRATE:
         case DEC_SP_CONSUMPTION:
+        case VAR_PLUSASPDPERCENT:
             return 5;
         case IOPT_SCRESIST_POISON:
         case IOPT_SCRESIST_SILENCE: