Merge branch 'pauls-grind' into 'master'

Paul's bounty quest: mob points are not removed anymore

See merge request ml/serverdata!70

1 files changed, 16 insertions, 53 deletions

diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index ca6919961..f6e2cbf1a 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -11,10 +11,10 @@
     if (!$HURNS_LIBDATE && is_master()) goto L_Admus;
     if (strcharinfo(2) == "Monster King") goto L_MKControl;
     mesn;
-    mesq l("We are @@ since the last great attack from the Monster King.", FuzzyTime($HURNS_LIBDATE,1,2));
+    mesq l("It is %s since the last great attack from the Monster King.", FuzzyTime($HURNS_LIBDATE,1,2));
     next;
     mesn;
-    mesq l("Many citzens are still in fear. Paths are closed, economy is a disaster, things are not here.");
+    mesq l("Many citzens are still cowering in fear. Paths are closed, economy is a disaster, things are not as they should be.");
     next;
     mesn;
     mesq l("But we are working day and night. We hope that soon, more people come out and this place gets lively again.");
@@ -66,7 +66,8 @@ L_Assign:
     // Check if you already met objective
     if (.@k > 0 && Mobpt >= .@k+@rq) {
         setq HurnscaldQuest_Lieutenant, @fc, 0;
-        Mobpt-=@rq;
+        // Do not deduct mob points anymore because gathering them without spending is a challenge on its own.
+        // Mobpt-=@rq;
         mesn;
         mesq l("Good job collecting the monster points for me. Here's your reward.");
         @xp=1000;
@@ -139,7 +140,7 @@ L_Assign:
     // Assign quest
     else if (.@k == 0) {
         mesn;
-        mesq l("Maybe you can help our city guard. I see you are a Monster Hunting Quest Participant, right?");
+        mesq l("Maybe you can help our city. I see you are a Monster Hunting Quest Participant, right?");
         next;
         mesn;
         mesq l("So, I'm placing a special bounty for @@ Mob Points.", @rq);
@@ -158,26 +159,17 @@ L_Assign:
             .@k=0;
         }
         mesn;
-        mesq l("You have collected and additional of @@/@@ Mob Points.", Mobpt-.@k, @rq);
+        mesq l("You have collected @@/@@ Mob Points.", Mobpt-.@k, @rq);
     }
     close;
 
-
-
-
-
-
-
-
-
-
-
-
+///////////////////////////
 // Liberation Day facility
+///////////////////////////
 L_Admus:
     mes ".:: " + col("HURNSCALD LIBERATION DAY - ADMUS PANEL", 2) + " ::.";
     mesc l("For HLib, a GM must take the role of the Monster King");
-    mesc l("Protip: Use @hide to don't interfer.");
+    mesc("Protip: Use @hide to not interfere.");
     mes l("Determine Team Size (If everyone is ready and stdby at Tulimshar, use: @@. Minimum 2 players.)", getusers(1)-1);
     input $@BG1_SIZE;
     if ($@BG1_SIZE < 2 && !$@GM_OVERRIDE) close;
@@ -191,8 +183,8 @@ L_Admus:
     setmapflag("012-1", mf_nopenalty);
     setmapflag("012-1",mf_bexp,126);
     enablenpc "Hurnsguard";
-	donpcevent "Hurnsguard::OnSet";
-	donpcevent "Lieutenant Paul::OnSet";
+    donpcevent "Hurnsguard::OnSet";
+    donpcevent "Lieutenant Paul::OnSet";
     addmapmask "012-1", MASK_MATTACK;
     addmapmask "012-1", MASK_EVILSANCTUM;
     pvpon("012-1");
@@ -266,20 +258,6 @@ OnInit:
     end;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // Liberation Day Script
 012-1,122,25,0	script	Hurnsguard	NPC_PLAYER,{
     //query_sql("SELECT online FROM `char` WHERE name='Saulc GM'", .@online);
@@ -516,18 +494,9 @@ OnReward:
 
 }
 
-
-
-
-
-
-
-
-
-
-
-
+////////////////////////////////////////////////
 //== Battleground Engine ======================
+////////////////////////////////////////////////
 012-1,0,0,0	script	start#hurns_lib	NPC_HIDDEN,{
 OnInit:
 	end;
@@ -572,21 +541,15 @@ OnReadyCheck:
 	end;
 }
 
-
-
-
-
-
-
-
-
+////////////////////////
 // Handle Guard's logic
+////////////////////////
 function	script	CheckpointGuard	{
     mesn;
     mesq l("I am stationed here to protect Hurnscald from monsters.");
     next;
     mesn;
-    mesq l("If the Monster King attack, I will try to control inbound monsters here.");
+    mesq l("If the Monster King attacks, I will try to control inbound monsters here.");
     close;
     return;
 }