summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/maps.conf8
-rw-r--r--npc/001-2-21/_warps.txt2
-rw-r--r--npc/001-2-22/_warps.txt2
-rw-r--r--npc/001-2-22/peter.txt4
-rw-r--r--npc/001-2-22/savepoint.txt8
-rw-r--r--npc/001-2-23/doors.txt4
-rw-r--r--npc/001-2-23/ratto.txt2
-rw-r--r--npc/001-2-24/nard.txt4
8 files changed, 21 insertions, 13 deletions
diff --git a/conf/maps.conf b/conf/maps.conf
index 5f3be852..00b095a5 100644
--- a/conf/maps.conf
+++ b/conf/maps.conf
@@ -24,3 +24,11 @@ map: 001-2-16
map: 001-2-17
map: test
map: 001-2-1
+map: 001-2-17
+map: 001-2-18
+map: 001-2-19
+map: 001-2-20
+map: 001-2-21
+map: 001-2-22
+map: 001-2-23
+map: 001-2-24
diff --git a/npc/001-2-21/_warps.txt b/npc/001-2-21/_warps.txt
index e115cf96..1512ff29 100644
--- a/npc/001-2-21/_warps.txt
+++ b/npc/001-2-21/_warps.txt
@@ -1,2 +1,2 @@
// Map 001-2-21: La Johanne, First Deck
-001-2-21,31,25,0 warp ToLevel1 0,0,001-2-22,72,29
+001-2-21,31,25,0 warp ToLevel1#001-2-21 0,0,001-2-22,72,29
diff --git a/npc/001-2-22/_warps.txt b/npc/001-2-22/_warps.txt
index ed735863..239f5f61 100644
--- a/npc/001-2-22/_warps.txt
+++ b/npc/001-2-22/_warps.txt
@@ -1,2 +1,2 @@
// Map 001-2-22: La Johanne, Second Deck
-001-2-22,72,30,0 warp ToLevel0#000-2-1 0,0,001-2-21,31,26
+001-2-22,72,30,0 warp ToLevel0#001-2-22 0,0,001-2-21,31,26
diff --git a/npc/001-2-22/peter.txt b/npc/001-2-22/peter.txt
index f0718a17..facd13c6 100644
--- a/npc/001-2-22/peter.txt
+++ b/npc/001-2-22/peter.txt
@@ -39,7 +39,7 @@
// [9] = Shows how many seconds passed since the player started the quest.
// [10] = Shows how many seconds passed since the player done the quest.
-001-2-22,72,34,0 script AreaNPC 32767,0,1,{
+001-2-22,72,34,0 script AreaNPC#001-2-22 32767,0,1,{
OnTouch:
if (BaseLevel < 5) goto L_Stop;
@@ -87,7 +87,7 @@ L_NoGoodTick:
close;
}
-001-2-22,70,35,0 script Peter 403,{
+001-2-22,70,35,0 script Peter#001-2-22 403,{
if (BaseLevel < 5) goto OnTooWeak;
if ($@ARTIS_RAT1_COUNTDOWN == "") goto L_NoCountDown;
if ((gettimetick(2) - $@ARTIS_RAT1_COUNTDOWN) < 10) goto OnNoGoodTick;
diff --git a/npc/001-2-22/savepoint.txt b/npc/001-2-22/savepoint.txt
index 68e3689d..9baf995c 100644
--- a/npc/001-2-22/savepoint.txt
+++ b/npc/001-2-22/savepoint.txt
@@ -4,7 +4,7 @@
// Description:
// Saves locations in 001-2-22 map.
-001-2-22,40,37,0 script #name1 901,{
+001-2-22,40,37,0 script #001-2-22-1 901,{
savepoint "001-2-22.gat", 40, 37;
close;
@@ -13,7 +13,7 @@ OnInit:
end;
}
-001-2-22,46,37,0 script #name2 901,{
+001-2-22,46,37,0 script #001-2-22-2 901,{
savepoint "001-2-22.gat", 46, 37;
close;
@@ -22,7 +22,7 @@ OnInit:
end;
}
-001-2-22,50,38,0 script #name3 901,{
+001-2-22,50,38,0 script #001-2-22-3 901,{
savepoint "001-2-22.gat", 50, 38;
close;
@@ -31,7 +31,7 @@ OnInit:
end;
}
-001-2-22,55,40,0 script #name4 901,{
+001-2-22,55,40,0 script #001-2-22-4 901,{
savepoint "001-2-22.gat", 55, 40;
close;
diff --git a/npc/001-2-23/doors.txt b/npc/001-2-23/doors.txt
index ac0e5f61..abfa89cb 100644
--- a/npc/001-2-23/doors.txt
+++ b/npc/001-2-23/doors.txt
@@ -6,7 +6,7 @@
// Description:
// Doors NPCs.
-001-2-23,48,29,0 script DoorUpwards 32767,0,0,{
+001-2-23,48,29,0 script DoorUpwards#001-2-23 32767,0,0,{
OnTouch:
if (mobcount("001-2-23.gat","all") > 0) goto L_Warn;
@@ -35,7 +35,7 @@ L_Warp:
close;
}
-001-2-23,24,31,0 script LeftDoor 32767,0,0,{
+001-2-23,24,31,0 script LeftDoor#001-2-23 32767,0,0,{
OnTouch:
mesn "Narrator";
diff --git a/npc/001-2-23/ratto.txt b/npc/001-2-23/ratto.txt
index 5f42a802..6b22ed2b 100644
--- a/npc/001-2-23/ratto.txt
+++ b/npc/001-2-23/ratto.txt
@@ -17,7 +17,7 @@
// [8] = Shows how many seconds passed since ratto number 4 died.
// [9] = Shows how many seconds passed since the player started the quest.
-001-2-23,47,30,0 script RattosControl 32767,{
+001-2-23,47,30,0 script RattosControl#001-2-23 32767,{
OnSpawn:
areamonster "001-2-23.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt
index e8e306b9..4b0c251f 100644
--- a/npc/001-2-24/nard.txt
+++ b/npc/001-2-24/nard.txt
@@ -40,7 +40,7 @@
next;
mesq l("I think that we will stay in port for a great time.");
- closedialogs;
+ closedialog;
close;
L_Lost :
@@ -48,7 +48,7 @@ L_Lost :
mesn;
mesq l("Julia make appeal the Legion of Aemil to search you, exit the ship and you should see your escort!");
- closedialogs;
+ closedialog;
close;
OnInit: