summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/035-2/_import.txt1
-rw-r--r--world/map/npc/035-2/emblems.txt43
-rw-r--r--world/map/npc/036-2/_import.txt1
-rw-r--r--world/map/npc/036-2/emblems.txt31
-rw-r--r--world/map/npc/functions/ferry.txt47
5 files changed, 119 insertions, 4 deletions
diff --git a/world/map/npc/035-2/_import.txt b/world/map/npc/035-2/_import.txt
index 5e207a35..ed669bfc 100644
--- a/world/map/npc/035-2/_import.txt
+++ b/world/map/npc/035-2/_import.txt
@@ -7,3 +7,4 @@ npc: npc/035-2/casino.txt
npc: npc/035-2/koga.txt
npc: npc/035-2/mapflags.txt
npc: npc/035-2/shops.txt
+npc: npc/035-2/emblems.txt
diff --git a/world/map/npc/035-2/emblems.txt b/world/map/npc/035-2/emblems.txt
new file mode 100644
index 00000000..895909a3
--- /dev/null
+++ b/world/map/npc/035-2/emblems.txt
@@ -0,0 +1,43 @@
+035-2.gat,28,27,0|script|#k1city1e|410,
+{
+ end;
+ OnInit:
+ disablenpc "#k1city1e";
+ end;
+}
+035-2.gat,28,27,0|script|#k1city1d|411,
+{
+ end;
+}
+
+035-2.gat,30,27,0|script|#k1city2e|412,
+{
+ end;
+ OnInit:
+ disablenpc "#k1city2e";
+ end;
+}
+035-2.gat,30,27,0|script|#k1city2d|413,
+{
+ end;
+}
+
+035-2.gat,32,27,0|script|#k1city3e|414,
+{
+ end;
+ OnInit:
+ disablenpc "#k1city3e";
+ end;
+}
+035-2.gat,32,27,0|script|#k1city3d|415,
+{
+ end;
+}
+
+035-2.gat,32,27,0|script|#k1sound|127,
+{
+ end;
+ OnCommandDing:
+ misceffect 402;
+ end;
+}
diff --git a/world/map/npc/036-2/_import.txt b/world/map/npc/036-2/_import.txt
index b151f381..174946f7 100644
--- a/world/map/npc/036-2/_import.txt
+++ b/world/map/npc/036-2/_import.txt
@@ -7,3 +7,4 @@ npc: npc/036-2/casino.txt
npc: npc/036-2/koga-candor.txt
npc: npc/036-2/mapflags.txt
npc: npc/036-2/shops.txt
+npc: npc/036-2/emblems.txt
diff --git a/world/map/npc/036-2/emblems.txt b/world/map/npc/036-2/emblems.txt
new file mode 100644
index 00000000..c3fbc18a
--- /dev/null
+++ b/world/map/npc/036-2/emblems.txt
@@ -0,0 +1,31 @@
+036-2.gat,29,27,0|script|#k2city1e|410,
+{
+ end;
+ OnInit:
+ disablenpc "#k2city1e";
+ end;
+}
+036-2.gat,29,27,0|script|#k2city1d|411,
+{
+ end;
+}
+
+036-2.gat,31,27,0|script|#k2city2e|416,
+{
+ end;
+ OnInit:
+ disablenpc "#k2city2e";
+ end;
+}
+036-2.gat,31,27,0|script|#k2city2d|417,
+{
+ end;
+}
+
+036-2.gat,32,27,0|script|#k2sound|127,
+{
+ end;
+ OnCommandDing:
+ misceffect 402;
+ end;
+}
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index c2e92271..8d530d1f 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -35,20 +35,59 @@ L_NextDock:
cmdothernpc "#"+$@MainDocks$[$@MainCurrentDock]+"Dock", "Arrive";
cmdothernpc "#"+$@CandorDocks$[$@CandorLastDock]+"Dock", "Warp";
cmdothernpc "#"+$@CandorDocks$[$@CandorCurrentDock]+"Dock", "Arrive";
- mapannounce "035-2.tmx", " Koga - Main : Now arriving in "+$@MainDocks$[$@MainCurrentDock]+".", 0;
- mapannounce "036-2.tmx", " Koga - Candor : Now arriving in "+$@CandorDocks$[$@CandorCurrentDock]+".", 0;
+
+ cmdothernpc "#k1sound", "Ding";
+ cmdothernpc "#k2sound", "Ding";
+
+ //mapannounce "035-2.tmx", " Koga - Main : Now arriving in "+$@MainDocks$[$@MainCurrentDock]+".", 0;
+ //mapannounce "036-2.tmx", " Koga - Candor : Now arriving in "+$@CandorDocks$[$@CandorCurrentDock]+".", 0;
initnpctimer;
+
+ if($@MainCurrentDock == 2) goto L_k1city1;
+ if($@MainCurrentDock == 0) goto L_k1city2;
+ if($@MainCurrentDock == 1) goto L_k1city3;
end;
OnTimer10000:
if ($@DockTickCount > $@DockLeaveCount)
goto L_NextDock;
- mapannounce "035-2.tmx", "Koga - Main : Now docked in "+$@MainDocks$[$@MainCurrentDock]+", Departing soon", 0;
- mapannounce "036-2.tmx", "Koga - Candor : Now docked in "+$@CandorDocks$[$@CandorCurrentDock]+", Departing soon", 0;
+ //mapannounce "035-2.tmx", "Koga - Main : Now docked in "+$@MainDocks$[$@MainCurrentDock]+", Departing soon", 0;
+ //mapannounce "036-2.tmx", "Koga - Candor : Now docked in "+$@CandorDocks$[$@CandorCurrentDock]+", Departing soon", 0;
set $@DockTickCount, $@DockTickCount + 1;
initnpctimer;
end;
+
+L_k1city1:
+ enablenpc "#k1city1e"; disablenpc "#k1city2e"; disablenpc "#k1city3e";
+ disablenpc "#k1city1d"; enablenpc "#k1city2d"; enablenpc "#k1city3d";
+ if($@CandorCurrentDock == 1) goto L_k2city1;
+ if($@CandorCurrentDock == 0) goto L_k2city2;
+end;
+
+L_k1city2:
+ disablenpc "#k1city1e"; enablenpc "#k1city2e"; disablenpc "#k1city3e";
+ enablenpc "#k1city1d"; disablenpc "#k1city2d"; enablenpc "#k1city3d";
+ if($@CandorCurrentDock == 1) goto L_k2city1;
+ if($@CandorCurrentDock == 0) goto L_k2city2;
+end;
+
+L_k1city3:
+ disablenpc "#k1city1e"; disablenpc "#k1city2e"; enablenpc "#k1city3e";
+ enablenpc "#k1city1d"; enablenpc "#k1city2d"; disablenpc "#k1city3d";
+ if($@CandorCurrentDock == 1) goto L_k2city1;
+ if($@CandorCurrentDock == 0) goto L_k2city2;
+end;
+
+L_k2city1:
+ enablenpc "#k2city1e"; disablenpc "#k2city2e";
+ disablenpc "#k2city1d"; enablenpc "#k2city2d";
+end;
+
+L_k2city2:
+ disablenpc "#k2city1e"; enablenpc "#k2city2e";
+ enablenpc "#k2city1d"; disablenpc "#k2city2d";
+end;
}
function|script|FerryManifest|,