Allow player access to Nivalis Town Square

8 files changed, 16 insertions, 10 deletions

diff --git a/maps/re/019-2.mcache b/maps/re/019-2.mcache
index 1783f2fb1..fbbb90143 100644
--- a/maps/re/019-2.mcache
+++ b/maps/re/019-2.mcache
diff --git a/npc/019-1/_warps.txt b/npc/019-1/_warps.txt
index e53f590ea..a29a45f12 100644
--- a/npc/019-1/_warps.txt
+++ b/npc/019-1/_warps.txt
@@ -1,4 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 019-1: Snow Field warps
+019-1,70,21,0	warp	#019-1_70_21	3,0,020-1,70,127
 019-1,61,102,0	warp	#019-1_61_102	3,0,019-4,95,28
 019-1,84,53,0	warp	#019-1_84_53	0,0,019-1-1,33,41
diff --git a/npc/019-1/sign.txt b/npc/019-1/sign.txt
index 3503acf5e..93599d6fe 100644
--- a/npc/019-1/sign.txt
+++ b/npc/019-1/sign.txt
@@ -10,11 +10,7 @@
         next;
         mesc l("We've built this blockade to prevent this area from being overrun with monsters, but who knows for how long this will last.");
     } else {
-        mesc l("Do you want to cross Nivalis city to the other side?");
-        if (askyesno() == ASK_YES) {
-            warp "019-2", 43, 55;
-            closedialog;
-        }
+        mesc l("The city is still under repairs, but town square is safe already."), 1;
     }
     close;
 
diff --git a/npc/019-2/_warps.txt b/npc/019-2/_warps.txt
index 272db1592..85925ec25 100644
--- a/npc/019-2/_warps.txt
+++ b/npc/019-2/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 019-2: Nivalis Port warps
+019-2,37,55,0	warp	#019-2_37_55	0,0,020-1,106,55
 019-2,76,24,0	warp	#019-2_76_24	0,0,021-1,212,299
diff --git a/npc/019-2/guards.txt b/npc/019-2/guards.txt
index cf325ac15..1a4675057 100644
--- a/npc/019-2/guards.txt
+++ b/npc/019-2/guards.txt
@@ -12,11 +12,6 @@
     if ($NIVALIS_LIBDATE) {
         mesn;
         mesq l("Nivalis was liberated @@ ago.", FuzzyTime($NIVALIS_LIBDATE));
-        // TODO
-        mesc l("Due town state, you cannot visit it. Do you want to cross to the other side?"), 1;
-        next;
-        if (askyesno() == ASK_YES)
-            warp "019-1", 70, 30;
         close;
     } else if ($NLIB_DAY > 0) {
         if (.@q == $NLIB_DAY) goto L_Delay;
@@ -40,6 +35,10 @@
             setmapflagnosave("023-2", "000-1", 22, 22);
             setmapflag("019-3",mf_bexp,25);
             setmapflag("020-1",mf_bexp,150);
+            disablenpc "#019-1_70_21";
+            disablenpc "#019-2_37_55";
+            disablenpc "#020-1_70_128";
+            disablenpc "#020-1_107_55";
             enablenpc "Lightbringer#NLib";
             channelmes("#world", "Nivalis Liberation Day has started.");
             announce "Nivalis Liberation Day has started.", bc_all|bc_npc;
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
index 4e95fbf32..26462c45f 100644
--- a/npc/020-1/_import.txt
+++ b/npc/020-1/_import.txt
@@ -1,4 +1,5 @@
 // Map 020-1: Nivalis
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/020-1/_mobs.txt",
+"npc/020-1/_warps.txt",
 "npc/020-1/siege.txt",
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
new file mode 100644
index 000000000..f1ee0c18f
--- /dev/null
+++ b/npc/020-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-1: Nivalis warps
+020-1,70,128,0	warp	#020-1_70_128	3,0,019-1,70,22
+020-1,107,55,0	warp	#020-1_107_55	0,0,019-2,38,55
diff --git a/npc/023-2/mk.txt b/npc/023-2/mk.txt
index 8214b4bd7..facdac748 100644
--- a/npc/023-2/mk.txt
+++ b/npc/023-2/mk.txt
@@ -73,6 +73,10 @@ L_Finish2:
     $NLIB_HIGHTIME=0;
     $NLIB_HIGHNAME$="";
     disablenpc "Lightbringer#NLib";
+    enablenpc "#019-1_70_21";
+    enablenpc "#019-2_37_55";
+    enablenpc "#020-1_70_128";
+    enablenpc "#020-1_107_55";
 
     removemapflag("019-3", mf_bexp);
     removemapflag("019-3", mf_nosave);