summaryrefslogtreecommitdiff
path: root/world/map/npc/052-2
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-07-05 12:25:49 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-07-05 12:30:10 -0700
commit89e2ac5687d698f0843ac46612ee33b6692bbc93 (patch)
tree8ea32e1691381e9d4db72b54c4ebed0ce809c3d2 /world/map/npc/052-2
parent27ad0933834fb488c6deac76d660cda338bb5da8 (diff)
downloadserverdata-89e2ac5687d698f0843ac46612ee33b6692bbc93.tar.gz
serverdata-89e2ac5687d698f0843ac46612ee33b6692bbc93.tar.bz2
serverdata-89e2ac5687d698f0843ac46612ee33b6692bbc93.tar.xz
serverdata-89e2ac5687d698f0843ac46612ee33b6692bbc93.zip
Move starting brace to new line
Diffstat (limited to 'world/map/npc/052-2')
-rw-r--r--world/map/npc/052-2/_mobs.txt3
-rw-r--r--world/map/npc/052-2/chest.txt4
-rw-r--r--world/map/npc/052-2/janitor.txt9
-rw-r--r--world/map/npc/052-2/lobby.txt18
-rw-r--r--world/map/npc/052-2/partyroom.txt15
-rw-r--r--world/map/npc/052-2/storage.txt9
6 files changed, 38 insertions, 20 deletions
diff --git a/world/map/npc/052-2/_mobs.txt b/world/map/npc/052-2/_mobs.txt
index 8ce33c63..f105c44e 100644
--- a/world/map/npc/052-2/_mobs.txt
+++ b/world/map/npc/052-2/_mobs.txt
@@ -3,6 +3,7 @@
-052-2.gat,0,0,0|script|Mob052-2|-1,{
+052-2.gat,0,0,0|script|Mob052-2|-1,
+{
end;
}
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index d42cea48..11725a9a 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -12,8 +12,8 @@
// 3: player choosed to leave the room
//-----------------------------------------------------------------------------
-052-2.gat,136,73,0|script|Chest|111,{
-
+052-2.gat,136,73,0|script|Chest|111,
+{
set @step, 8;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
if (@illia_got_rewards > 2) end;
diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt
index 9c78d638..32ed405c 100644
--- a/world/map/npc/052-2/janitor.txt
+++ b/world/map/npc/052-2/janitor.txt
@@ -1,5 +1,6 @@
// Lobby janitor
-052-2.gat,1,1,0|script|#IlliaJanitor5|127,{
+052-2.gat,1,1,0|script|#IlliaJanitor5|127,
+{
end;
OnCommandClean:
@@ -11,7 +12,8 @@ OnCommandClean:
}
// Storage janitor
-052-2.gat,1,1,0|script|#IlliaJanitor6|127,{
+052-2.gat,1,1,0|script|#IlliaJanitor6|127,
+{
end;
OnCommandClean:
@@ -22,7 +24,8 @@ OnCommandClean:
}
// Final boss janitor
-052-2.gat,1,1,0|script|#IlliaJanitor7|127,{
+052-2.gat,1,1,0|script|#IlliaJanitor7|127,
+{
end;
OnCommandClean:
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index b50a0273..c651266c 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -14,7 +14,8 @@
// 8: Witch guards defeated. Door is open.
//-----------------------------------------------------------------------------
-052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2,{
+052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2,
+{
set @step, 5;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
if ($@illia_level_5_progress == 8) goto L_Warp;
@@ -32,7 +33,8 @@ L_ShouldNotBeHere:
}
-052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2,{
+052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2,
+{
set @step, 5;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
if ($@illia_level_5_progress == 0 && strcharinfo(0) == $@ILLIA_HERO$) goto L_StartVoices;
@@ -48,7 +50,8 @@ L_ShouldNotBeHere:
end;
}
-052-2.gat,1,1,0|script|#LuviaShadow|127,{
+052-2.gat,1,1,0|script|#LuviaShadow|127,
+{
end;
// Escape sequence
@@ -100,7 +103,8 @@ OnNN:
}
-052-2.gat,1,1,0|script|#MysteriousVoice|127,{
+052-2.gat,1,1,0|script|#MysteriousVoice|127,
+{
end;
onInit:
@@ -145,7 +149,8 @@ L_Continue:
// Dummy npc to display the mysterious voice,
// as a workaround to fakenpcname causing problems
-052-2.gat,1,1,0|script|?|127,{
+052-2.gat,1,1,0|script|?|127,
+{
end;
OnCommandTalk:
@@ -154,7 +159,8 @@ OnCommandTalk:
}
-052-2.gat,1,1,0|script|Luvia?|371,2,2{
+052-2.gat,1,1,0|script|Luvia?|371,2,2
+{
if ($@illia_level_5_progress != 3) end;
if (isin("052-2.gat", 37,36, 41,39)) goto L_HandleTalk;
// Notify too far
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index acba1fdc..fc1094f5 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -9,7 +9,8 @@
// 3: Luvia is defeated
//-----------------------------------------------------------------------------
-052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2,{
+052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2,
+{
set @step, 7;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
if ($@illia_level_7_progress == 0 && strcharinfo(0) == $@ILLIA_HERO$) goto L_SpawnLuvia;
@@ -28,7 +29,8 @@ L_ShouldNotBeHere:
// A trigger whose only purpose is to place Luvia npcs back in place.
// (even though the Janitor 7 will have done this job)
-052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1,{
+052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1,
+{
if (strcharinfo(0) != $@ILLIA_HERO$) end;
if ($@illia_progress == 7 && $@illia_level_7_progress == 0) goto L_PlaceLuvia;
end;
@@ -40,7 +42,8 @@ L_PlaceLuvia:
}
-052-2.gat,88,15,0|script|Luvia|371,{
+052-2.gat,88,15,0|script|Luvia|371,
+{
set @step, 7;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
if ($@illia_level_7_progress == 0 && strcharinfo(0) == $@ILLIA_HERO$) goto L_Start;
@@ -80,7 +83,8 @@ OnTimer15000:
}
-052-2.gat,88,15,0|script|#LuviaDaemon|127,{
+052-2.gat,88,15,0|script|#LuviaDaemon|127,
+{
end;
OnCommandInvoke:
@@ -265,7 +269,8 @@ onW00t:
}
// Warp from the party room, to the chest room
-052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2,{
+052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2,
+{
set @step, 7;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
if ($@illia_level_7_progress < 4) end;
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index b52dc759..43160db8 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -8,7 +8,8 @@
// 2: All spawns are done and the players killed all mobs
//-----------------------------------------------------------------------------
-052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0,{
+052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0,
+{
set @step, 6;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
if (strcharinfo(0) != $@ILLIA_HERO$) end;
@@ -26,7 +27,8 @@ L_StartItemInvoker:
}
-052-2.gat,1,1,0|script|#ItemsInvoker|127,{
+052-2.gat,1,1,0|script|#ItemsInvoker|127,
+{
end;
onInit:
@@ -170,7 +172,8 @@ onWow:
}
-052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1,{
+052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1,
+{
set @step, 6;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
if ($@illia_level_6_progress == 2) goto L_Warp;