12 files changed, 127 insertions, 30 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 10eb1e428..7ca0ec8c3 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -21,6 +21,7 @@ map_list: (
     "003-13",
     "003-2",
     "003-3",
+    "003-4-1",
     "003-4",
     "003-5",
     "003-6",
diff --git a/db/map_index.txt b/db/map_index.txt
index a455184ba..5a53e2709 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -18,33 +18,34 @@
 003-13 18
 003-2 19
 003-3 20
-003-4 21
-003-5 22
-003-6 23
-003-7 24
-003-8 25
-004-1 26
-004-2-1 27
-004-2 28
-005-1 29
-005-2-1 30
-005-2 31
-005-3 32
-005-4 33
-005-5 34
-005-6 35
-005-7 36
-007-1 37
-009-1 38
-010-1-1 39
-010-1 40
-010-2 41
-011-1 42
-011-2 43
-boss 44
-botcheck 45
-sec_pri 46
-soren-2 47
-soren 48
-test 49
-testbg 50
+003-4-1 21
+003-4 22
+003-5 23
+003-6 24
+003-7 25
+003-8 26
+004-1 27
+004-2-1 28
+004-2 29
+005-1 30
+005-2-1 31
+005-2 32
+005-3 33
+005-4 34
+005-5 35
+005-6 36
+005-7 37
+007-1 38
+009-1 39
+010-1-1 40
+010-1 41
+010-2 42
+011-1 43
+011-2 44
+boss 45
+botcheck 46
+sec_pri 47
+soren-2 48
+soren 49
+test 50
+testbg 51
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 02c969a21..6571eff32 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -156,6 +156,10 @@ quest_db: (
     Id: 56
     Name: "TulimsharQuest_Eistein"
 },
+{
+    Id: 57
+    Name: "TulimsharQuest_Hasan"
+},
 
 // ID 71 to 90: Halinarzo Quests
 {
diff --git a/maps/re/003-4-1.mcache b/maps/re/003-4-1.mcache
new file mode 100644
index 000000000..6371a4cb4
--- /dev/null
+++ b/maps/re/003-4-1.mcache
diff --git a/maps/re/003-4.mcache b/maps/re/003-4.mcache
index 1c8a7b440..fb9a8ce59 100644
--- a/maps/re/003-4.mcache
+++ b/maps/re/003-4.mcache
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 7e75a428a..2f24a39c0 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -11,6 +11,7 @@
 "npc/003-1/eugene.txt",
 "npc/003-1/events.txt",
 "npc/003-1/gladys.txt",
+"npc/003-1/hasan.txt",
 "npc/003-1/inac.txt",
 "npc/003-1/inar.txt",
 "npc/003-1/ishi.txt",
diff --git a/npc/003-1/hasan.txt b/npc/003-1/hasan.txt
new file mode 100644
index 000000000..b10267ae9
--- /dev/null
+++ b/npc/003-1/hasan.txt
@@ -0,0 +1,78 @@
+// TMW-2 Script
+// Author:
+//  Jesusalva
+// Description:
+//  Hasan is the city bully and steals the player. He lost his father to a Murderer
+//  Scorpion. Will respect player if they kill one. His mother is Sorfina, whom
+//  explains this and cries that he never touched a Soul Menhir. Allowing player
+//  to kill scorpion on Mahoud's Basement.
+//
+//  Player must report theft first to Dausen, who will tell the player that's
+//  normal and nobody messes with Hasan, and giving player pointer that he should
+//  tell his mother, Sorfina.
+//
+//  Reward: Cotton Short, Hasan won't steal you anymore.
+//
+//  GETQ1 Variable Value;
+//  0 - Never stolen by Hasan
+//  1 - Already stolen by Hasan
+//  2 - Dausen pointed player to Sorfina
+//  3 - Sorfina unlocked Mahoud's Basement
+//  4 - Player killed Murderer Scorpion
+//  5 - Quest is complete
+
+// Temporary sprite
+003-1,62,148,0	script	Hasan	NPC_ELVEN_MAN_RED,2,2{
+    if (Zeny > 15) goto L_Steal;
+
+L_Steal:
+    npctalk3("*whistle*");
+    if (getq(TulimsharQuest_Hasan) == 0) goto L_DoSteal;
+    if (getq(TulimsharQuest_Hasan) <= 4 && rand(0,100) < 20) goto L_DoSteal;
+    end;
+
+L_DoSteal:
+    Zeny=Zeny-rand(3,12);
+    if (getq(TulimsharQuest_Hasan) == 0)
+        setq TulimsharQuest_Hasan, 1;
+    dispbottom l("##BYou were stolen##b by an evil NPC.");
+    end;
+
+OnTalk:
+    if (getq(TulimsharQuest_Hasan) == 0) goto L_Safe;
+    //if (getq(TulimsharQuest_Hasan) == 4) goto L_Finish;
+    //if (getq(TulimsharQuest_Hasan) == 5) goto L_Complete;
+    mesn strcharinfo(0);
+    mesq l("Give me back what you've stole, thief!");
+    next;
+    mesn;
+    mesq l("I stole nothing from you. Do you have any proof?");
+    next;
+    menu
+        l("I have a print screen!"), L_Print,
+        l("No..."), L_NoProof;
+    close;
+
+L_Away:
+    mesn;
+    mesq l("Hey... Go bother someone else.");
+    close;
+
+L_Print:
+    mes "";
+    mesn;
+    mesq l("Let me analyze that.");
+    mes col("Hasan takes your print screen and analyzes it.",9);
+    next;
+    mesn;
+    mesq l("Photoshopped. Definitely. Good luck convincing somebody with that! %%a");
+    next;
+    mesn;
+    mesq l("If you go to Lieutenant Dausen, he'll say that you used Gimp. Just give up.");
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
diff --git a/npc/003-4-1/_import.txt b/npc/003-4-1/_import.txt
new file mode 100644
index 000000000..de17f1c1b
--- /dev/null
+++ b/npc/003-4-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 003-4-1: Forgotten Shop
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-4-1/_mobs.txt",
+"npc/003-4-1/_warps.txt",
diff --git a/npc/003-4-1/_mobs.txt b/npc/003-4-1/_mobs.txt
new file mode 100644
index 000000000..4066fd069
--- /dev/null
+++ b/npc/003-4-1/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-4-1: Forgotten Shop mobs
+003-4-1,35,36,6,5	monster	House Maggot	1084,2,35000,300000
diff --git a/npc/003-4-1/_warps.txt b/npc/003-4-1/_warps.txt
new file mode 100644
index 000000000..52e274ed1
--- /dev/null
+++ b/npc/003-4-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-4-1: Forgotten Shop warps
+003-4-1,35,26,0	warp	#003-4-1_35_26	1,0,003-4,38,32
diff --git a/npc/003-4/_warps.txt b/npc/003-4/_warps.txt
index 2334fc919..46934c5d2 100644
--- a/npc/003-4/_warps.txt
+++ b/npc/003-4/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 003-4: Forgotten Shop warps
 003-4,39,39,0	warp	#003-4_39_39	0,0,003-1,54,138
+003-4,38,31,0	warp	#003-4_38_31	0,0,003-4-1,34,27
diff --git a/npc/_import.txt b/npc/_import.txt
index b8f1a3822..683dcae10 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -20,6 +20,7 @@
 @include "npc/003-13/_import.txt"
 @include "npc/003-2/_import.txt"
 @include "npc/003-3/_import.txt"
+@include "npc/003-4-1/_import.txt"
 @include "npc/003-4/_import.txt"
 @include "npc/003-5/_import.txt"
 @include "npc/003-6/_import.txt"