Make Maps. Estard also notifies if you're in a guild.

9 files changed, 17 insertions, 19 deletions

diff --git a/maps/re/003-1.mcache b/maps/re/003-1.mcache
index 2ee766032..34053c6b4 100644
--- a/maps/re/003-1.mcache
+++ b/maps/re/003-1.mcache
diff --git a/maps/re/003-13.mcache b/maps/re/003-13.mcache
index 1216bd973..0a93defdb 100644
--- a/maps/re/003-13.mcache
+++ b/maps/re/003-13.mcache
diff --git a/maps/re/004-1.mcache b/maps/re/004-1.mcache
index 87fc5a1b1..fa3b169f6 100644
--- a/maps/re/004-1.mcache
+++ b/maps/re/004-1.mcache
diff --git a/npc/003-1-2/_import.txt b/npc/003-1-2/_import.txt
index 2b6b015f7..6237ae196 100644
--- a/npc/003-1-2/_import.txt
+++ b/npc/003-1-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 003-1-2: Tulimshar Jeweler
+// Map 003-1-2: Tulimshar Wall
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-1-2/_mobs.txt",
 "npc/003-1-2/_warps.txt",
diff --git a/npc/003-1-2/_mobs.txt b/npc/003-1-2/_mobs.txt
index 531b82111..fbebe95b6 100644
--- a/npc/003-1-2/_mobs.txt
+++ b/npc/003-1-2/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-1-2: Tulimshar Jeweler mobs
+// Map 003-1-2: Tulimshar Wall mobs
 003-1-2,34,36,15,3	monster	Black Scorpion	1074,2,35000,150000
diff --git a/npc/003-1-2/_warps.txt b/npc/003-1-2/_warps.txt
index 84eaa9b60..6fd6be463 100644
--- a/npc/003-1-2/_warps.txt
+++ b/npc/003-1-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-1-2: Tulimshar Jeweler warps
+// Map 003-1-2: Tulimshar Wall warps
 003-1-2,33,34,0	warp	#003-1-2_33_34	0,0,003-1,81,119
 003-1-2,19,34,0	warp	#003-1-2_19_34	0,0,003-1,53,119
 003-1-2,48,34,0	warp	#003-1-2_48_34	0,0,003-1,116,119
diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt
index 9c49b1d13..c7177951e 100644
--- a/npc/003-2/estard.txt
+++ b/npc/003-2/estard.txt
@@ -1,18 +1,12 @@
+// TMW-2 Scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Manages party and guild.
+
 // Evol scripts.
 // Author:
 //    Reid
-// Description:
-//    Light Armor shop keeper.
-// Variables:
-//    ArtisQuests_Enora
-// Values:
-//    0    Default.
-//    1    BlackSmith quest delivered.
-//    2    Chelios Quest given.
-//    3    Chelios Quest done.
-//    4    BlackSmith gave the sword.
-//    5    Light Armor Shop quest delivered.
-//    6    Light Armor Shop gave the cloths.
 
 003-2,32,34,0	script	Estard	NPC_PLAYER,{
 
@@ -52,8 +46,12 @@
     }
 
 
-    speech S_LAST_NEXT,
-        lg("Welcome miss.", "Good day sir.");
+    mesn;
+    mesq lg("Welcome miss.", "Good day sir.");
+
+    if (getcharid(2) > 0)
+        mesq l("You are part of the \"@@\" guild.", getguildname(getcharid(2)));
+    next;
 
     do
     {
diff --git a/npc/003-4/_import.txt b/npc/003-4/_import.txt
index b6c9bd0bb..a15662b0e 100644
--- a/npc/003-4/_import.txt
+++ b/npc/003-4/_import.txt
@@ -1,3 +1,3 @@
-// Map 003-4: Omar House
+// Map 003-4: Forgotten Shop
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-4/_warps.txt",
diff --git a/npc/003-4/_warps.txt b/npc/003-4/_warps.txt
index c935a6424..2334fc919 100644
--- a/npc/003-4/_warps.txt
+++ b/npc/003-4/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-4: Omar House warps
+// Map 003-4: Forgotten Shop warps
 003-4,39,39,0	warp	#003-4_39_39	0,0,003-1,54,138