From 76ca02f2c6cc0a2e6121c4ea8114bef8819fa747 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 6 Sep 2018 14:33:04 -0300
Subject: You can now join Bandit Guild or Merchant Police.

Currently unable to correct your ways or to pervert yourself later.
Storyline is the same (@BenB) but skill set is different.
Only Thief Minigame currently available.

Experience Table: [0, 32, 1024, 7776, 32768]
---
 npc/003-1/constableperry.txt | 14 ++++++++--
 npc/015-2/_import.txt        |  1 +
 npc/015-2/ben.txt            | 61 ++++++++++++++++++++++++++++++++++++++++++++
 npc/functions/lockpicks.txt  |  3 +++
 4 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 npc/015-2/ben.txt

diff --git a/npc/003-1/constableperry.txt b/npc/003-1/constableperry.txt
index b529727c3..f2187c5c0 100644
--- a/npc/003-1/constableperry.txt
+++ b/npc/003-1/constableperry.txt
@@ -25,10 +25,11 @@ L_Quest:
         goto L_Recruit;
     mesn;
     mesq l("Hello there, @@, protector of law and order.", mercrank());
+    if (MERC_RANK == 5) close;
     mesq l("I see you have collected some experience. Let me try to rank you up!");
     next;
-    if (MERC_EXP > (MERC_RANK+1)**5) {
-        MERC_EXP-=(MERC_RANK+1)**5;
+    if (MERC_EXP > (MERC_RANK*2)**5) {
+        MERC_EXP-=(MERC_RANK*2)**5;
         MERC_RANK+=1;
         mesn;
         mesq l("Congrats! You rank up! You are now a(n) @@!", mercrank());
@@ -42,6 +43,15 @@ L_Recruit:
     mesn;
     mesq l("You seem to be doing some money. Would you consider fighting for good, and against all thiefs?");
     mesq l("...Of course, Hasan is an exception.");
+    mesc l("Notice: If you join the ##BMerchants Guild Police##b now, you WON'T BE ABLE to be a thief later!"), 1;
+    next;
+    if (askyesno() == ASK_YES) {
+        MERC_EXP=0;
+        MERC_RANK=1;
+        mes "";
+        mesn;
+        mesq l("Welcome to the ##BMerchant Guild Police##b! Capture anyone doing an evil-doing!");
+    }
     close;
 
 OnInit:
diff --git a/npc/015-2/_import.txt b/npc/015-2/_import.txt
index 2538bf7bd..29bd5d555 100644
--- a/npc/015-2/_import.txt
+++ b/npc/015-2/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/015-2/_mobs.txt",
 "npc/015-2/_warps.txt",
+"npc/015-2/ben.txt",
 "npc/015-2/contrabandist.txt",
 "npc/015-2/guard.txt",
 "npc/015-2/lordcave.txt",
diff --git a/npc/015-2/ben.txt b/npc/015-2/ben.txt
new file mode 100644
index 000000000..f9e7d4db9
--- /dev/null
+++ b/npc/015-2/ben.txt
@@ -0,0 +1,61 @@
+// TMW2 Scripts.
+// Author:
+//    Saulc
+//    Jesusalva
+// Description:
+//    Ben Parkison invites players to the TMW2 Project
+//    Part of the THIEF/MERCHANT branches
+
+015-2,269,172,0	script	Ben Parkison	NPC_MOUBOO,{
+    if (JobLevel > 20 && MERC_RANK == 0) goto L_Quest;
+//hello;
+    mesn;
+    mesq l("Hey newbie... I am a dangerous bandit.");
+    next;
+    mesq l("Yes, I am a mouboo. Why? Can't a mouboo be a dangerous bandit?!");
+    next;
+    mesq l("Anyway, you can check our [@@https://gitlab.com/TMW2/Docs/wikis/home|Wiki@@] to find awesome stuff!");
+    mesc l("(Even bandits doesn't breaks the rules. To see the rules, use ##B@rules##b.)");
+    next;
+    mesq l("You can even join the project there. Contributors are greatly appreciated! %%N");
+    close;
+
+L_Quest:
+    if (THIEF_RANK == 0)
+        goto L_Recruit;
+    mesn;
+    mesq l("Hello there, @@, fear from the wealthy.", thiefrank());
+    if (THIEF_RANK == 5) close;
+    mesq l("I see you have collected some experience. Let me try to rank you up!");
+    next;
+    if (THIEF_EXP > (THIEF_RANK*2)**5) {
+        THIEF_EXP-=(THIEF_RANK*2)**5;
+        THIEF_RANK+=1;
+        mesn;
+        mesq l("Congrats! You rank up! You are now a(n) @@!", thiefrank());
+    } else {
+        mesn;
+        mesq l("Well, you need more experience. Keep trying!");
+    }
+    close;
+
+L_Recruit:
+    mesn;
+    mesq l("You seem to be doing some money. Would you consider fighting for evil, and against all those whom make wealthy unworthly?");
+    mesc l("Notice: If you join the ##BBandits Guild##b now, you WON'T BE ABLE to be a merchant police later!"), 1;
+    next;
+    if (askyesno() == ASK_YES) {
+        THIEF_EXP=0;
+        THIEF_RANK=1;
+        mes "";
+        mesn;
+        mesq l("Welcome to the ##BBandits Guild##b! Steal anyone doing wealth!");
+    }
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/functions/lockpicks.txt b/npc/functions/lockpicks.txt
index d3bb0d837..495828584 100644
--- a/npc/functions/lockpicks.txt
+++ b/npc/functions/lockpicks.txt
@@ -79,6 +79,9 @@ function	script	LockPicking	{
         } else {
             mesc l("This didn't work. All pins are now unset!");
             @pos=0;
+            // We don't need to clear console, each successful attempt IS counted.
+            // Therefore, unsetting 3 pins means you must do 3 new attempts!!
+            // The biggie is that you're running against time, here!!!
         }
 
         if (@pos > .@d) {
-- 
cgit v1.2.3-60-g2f50