summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/052-1/channelling.txt8
-rw-r--r--world/map/npc/052-1/janitor.txt2
-rw-r--r--world/map/npc/052-2/chest.txt2
-rw-r--r--world/map/npc/052-2/janitor.txt6
-rw-r--r--world/map/npc/052-2/lobby.txt10
-rw-r--r--world/map/npc/052-2/partyroom.txt12
-rw-r--r--world/map/npc/052-2/storage.txt8
7 files changed, 24 insertions, 24 deletions
diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index 34633ac5..33a0aa51 100644
--- a/world/map/npc/052-1/channelling.txt
+++ b/world/map/npc/052-1/channelling.txt
@@ -8,7 +8,7 @@
// 2: Channelling completed
//-----------------------------------------------------------------------------
-052-1.gat,25,44,0|script|#EnchantDoorTrigger|32767,3,4,
+052-1.gat,25,44,0|script|#EnchantDoorTrigger|32767,3,4
{
set @step, 4;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -64,7 +64,7 @@ OnCommandDestroy:
}
-052-1.gat,51,38,0|script|Engravings|400,
+052-1.gat,51,38,0|script|Engravings|400
{
mes "You can read some words engraved inside this rock, but some are erased by wind and time:";
next;
@@ -92,7 +92,7 @@ L_SuggestChannelling:
}
-function|script|StartChannelling|,
+function|script|StartChannelling
{
if (isat("052-1.gat",53,38) == 0)
end;
@@ -130,7 +130,7 @@ function|script|StartChannelling|,
}
-052-1.gat,53,38,0|script|#Power Circle|368,
+052-1.gat,53,38,0|script|#Power Circle|368
{
set @step, 4;
if ($@illia_progress < @step)
diff --git a/world/map/npc/052-1/janitor.txt b/world/map/npc/052-1/janitor.txt
index 0a3a5356..26b52d38 100644
--- a/world/map/npc/052-1/janitor.txt
+++ b/world/map/npc/052-1/janitor.txt
@@ -1,6 +1,6 @@
// Illia Island janitor
-052-1.gat,1,1,0|script|#IlliaJanitor4|127,
+052-1.gat,1,1,0|script|#IlliaJanitor4|127
{
end;
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index 84c5a5cd..fc57e654 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -12,7 +12,7 @@
// 3: player choosed to leave the room
//-----------------------------------------------------------------------------
-052-2.gat,136,73,0|script|Chest#illia|111,
+052-2.gat,136,73,0|script|Chest#illia|111
{
set @step, 8;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt
index 7ee68955..d78c4bba 100644
--- a/world/map/npc/052-2/janitor.txt
+++ b/world/map/npc/052-2/janitor.txt
@@ -1,5 +1,5 @@
// Lobby janitor
-052-2.gat,1,1,0|script|#IlliaJanitor5|127,
+052-2.gat,1,1,0|script|#IlliaJanitor5|127
{
end;
@@ -12,7 +12,7 @@ OnCommandClean:
}
// Storage janitor
-052-2.gat,1,1,0|script|#IlliaJanitor6|127,
+052-2.gat,1,1,0|script|#IlliaJanitor6|127
{
end;
@@ -24,7 +24,7 @@ OnCommandClean:
}
// Final boss janitor
-052-2.gat,1,1,0|script|#IlliaJanitor7|127,
+052-2.gat,1,1,0|script|#IlliaJanitor7|127
{
end;
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index c707c76f..fb9dd41e 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -14,7 +14,7 @@
// 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;
@@ -33,7 +33,7 @@ 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;
@@ -50,7 +50,7 @@ L_ShouldNotBeHere:
end;
}
-052-2.gat,1,1,0|script|#LuviaShadow|127,
+052-2.gat,1,1,0|script|#LuviaShadow|127
{
end;
@@ -103,7 +103,7 @@ OnNN:
}
-052-2.gat,1,1,0|script|#MysteriousVoice|127,
+052-2.gat,1,1,0|script|#MysteriousVoice|127
{
end;
@@ -149,7 +149,7 @@ 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;
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index ef04a667..a2857e9c 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -9,7 +9,7 @@
// 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;
@@ -29,7 +29,7 @@ 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;
@@ -42,7 +42,7 @@ 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;
@@ -83,7 +83,7 @@ OnTimer15000:
}
-052-2.gat,88,15,0|script|#LuviaDaemon|127,
+052-2.gat,88,15,0|script|#LuviaDaemon|127
{
end;
@@ -214,7 +214,7 @@ OnDeath:
end;
set $@illia_level_7_progress, 4;
killmonster "052-2.gat", "#LuviaDaemon::OnWGD";
- mapannounce "052-2.gat", "Luvia : How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
+ mapannounce "052-2.gat", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
set $@illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120;
areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP";
@@ -272,7 +272,7 @@ 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;
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 50c4bad7..1951cfaf 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -8,7 +8,7 @@
// 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;
@@ -27,14 +27,14 @@ L_StartItemInvoker:
}
-052-2.gat,1,1,0|script|#ItemsInvoker|127,
+052-2.gat,1,1,0|script|#ItemsInvoker|127
{
end;
OnInit:
setarray $@illia_storage_items, 541, 567, 568, 562;
setarray $@illia_storage_special_items, 687, 827, 1229;
- // Map coords : x1,y1, x2,y2, ...
+ // Map coords:* x1,y1, x2,y2, ...
setarray $@illia_storage_item_points, 20,67, 22,75, 27,71, 30,73, 34,76, 30,64, 34,65, 34,62, 21,61, 22,64;
end;
@@ -172,7 +172,7 @@ 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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 12:44:41 +0000