From 22cfbc011ce19e96767861b60473fa3136177f10 Mon Sep 17 00:00:00 2001 From: mekolat Date: Sun, 1 Feb 2015 14:11:22 -0500 Subject: remove .gat from npcs --- world/map/npc/052-1/channelling.txt | 38 ++++++++++++++++++------------------- world/map/npc/052-1/janitor.txt | 8 ++++---- world/map/npc/052-1/mapflags.txt | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'world/map/npc/052-1') diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt index d9c7b826..b5c36dae 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,25,44,0|script|#EnchantDoorTrigger|32767,3,4 { set @step, 4; if ($@illia_progress < @step) goto L_ShouldNotBeHere; @@ -26,13 +26,13 @@ L_ShouldNotBeHere: } -052-1.gat,57,29,0|script|#Enchanted Door|369,1,1 +052-1,57,29,0|script|#Enchanted Door|369,1,1 { if ($@illia_level_4_progress != 2) goto L_PushBack; end; L_PushBack: - warp "052-1.gat", 57, 34; + warp "052-1", 57, 34; percentheal -20, 0; message strcharinfo(0), "You are pushed back violently. There is probably some way to break this barrier."; mes "You are pushed back violently."; @@ -40,7 +40,7 @@ L_PushBack: close; OnCommandDS: - areamonster "052-1.gat", 56, 30, 60, 31, "", 1101, 2 + rand(3), "#Enchanted Door::OnSpawn"; + areamonster "052-1", 56, 30, 60, 31, "", 1101, 2 + rand(3), "#Enchanted Door::OnSpawn"; misceffect FX_EVIL_SUMMON; end; @@ -49,13 +49,13 @@ OnSpawn: } -052-1.gat,57,29,0|script|#Enchanted Door2|400,1,1 +052-1,57,29,0|script|#Enchanted Door2|400,1,1 { if ($@illia_level_4_progress == 2) goto L_Warp; end; L_Warp: - warp "052-2.gat", 33, 40; + warp "052-2", 33, 40; end; OnCommandDestroy: @@ -64,7 +64,7 @@ OnCommandDestroy: } -052-1.gat,51,38,0|script|Engravings|400 +052-1,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; @@ -94,7 +94,7 @@ L_SuggestChannelling: function|script|StartChannelling { - if (isat("052-1.gat",53,38) == 0) + if (isat("052-1",53,38) == 0) end; if ($@illia_level_4_progress > 0) end; @@ -130,12 +130,12 @@ function|script|StartChannelling } -052-1.gat,53,38,0|script|#Power Circle|368 +052-1,53,38,0|script|#Power Circle|368 { set @step, 4; if ($@illia_progress < @step) goto L_ShouldNotBeHere; - if (isat("052-1.gat",53,38) == 0) + if (isat("052-1",53,38) == 0) goto L_Hint; end; @@ -185,19 +185,19 @@ S_ItemSpawn: set $@illia_item_spawn_x, $@illia_small_lazurites[$@illia_item_spawn_i*2]; set $@illia_item_spawn_y, $@illia_small_lazurites[($@illia_item_spawn_i*2)+1]; if (rand(10) > 0) - makeitem 873, rand(4,7), "052-1.gat", $@illia_item_spawn_x, $@illia_item_spawn_y; + makeitem 873, rand(4,7), "052-1", $@illia_item_spawn_x, $@illia_item_spawn_y; set $@illia_item_spawn_i, rand(getarraysize($@illia_regular_lazurites)/2); set $@illia_item_spawn_x, $@illia_regular_lazurites[$@illia_item_spawn_i*2]; set $@illia_item_spawn_y, $@illia_regular_lazurites[($@illia_item_spawn_i*2)+1]; if (rand(8) > 0) - makeitem 874, rand(3,4), "052-1.gat", $@illia_item_spawn_x, $@illia_item_spawn_y; + makeitem 874, rand(3,4), "052-1", $@illia_item_spawn_x, $@illia_item_spawn_y; set $@illia_item_spawn_i, rand(getarraysize($@illia_large_lazurites)/2); set $@illia_item_spawn_x, $@illia_large_lazurites[$@illia_item_spawn_i*2]; set $@illia_item_spawn_y, $@illia_large_lazurites[($@illia_item_spawn_i*2)+1]; if (rand(4) > 0) - makeitem 875, rand(1,2), "052-1.gat", $@illia_item_spawn_x, $@illia_item_spawn_y; + makeitem 875, rand(1,2), "052-1", $@illia_item_spawn_x, $@illia_item_spawn_y; set $@illia_item_spawn_i, 0; set $@illia_item_spawn_x, 0; @@ -212,9 +212,9 @@ L_Return: S_CheckChannelling: // Remove stones inside the circle set $@illia_magic_power, $@illia_magic_power + - getareadropitem("052-1.gat", 52, 37, 54, 39, 873, 1)*$@illia_lazurites_power[0] + - getareadropitem("052-1.gat", 52, 37, 54, 39, 874, 1)*$@illia_lazurites_power[1] + - getareadropitem("052-1.gat", 52, 37, 54, 39, 875, 1)*$@illia_lazurites_power[2]; + getareadropitem("052-1", 52, 37, 54, 39, 873, 1)*$@illia_lazurites_power[0] + + getareadropitem("052-1", 52, 37, 54, 39, 874, 1)*$@illia_lazurites_power[1] + + getareadropitem("052-1", 52, 37, 54, 39, 875, 1)*$@illia_lazurites_power[2]; // magic power fades over time set $@illia_magic_power, $@illia_magic_power - $@illia_magic_power_loss; @@ -235,7 +235,7 @@ S_CheckChannelling: if (isdead()) goto L_ChannellingDead; - if (isat("052-1.gat",53,38) == 0) + if (isat("052-1",53,38) == 0) goto L_ChannellingMoved; // check the magic power if ($@illia_magic_power <= 0) @@ -257,7 +257,7 @@ S_CheckChannelling: set $@illia_channelling_status_msg$, $@illia_char_channelling$ + ": Damn! It faded a little."; if ($@illia_channelling_status_msg$ != "") - areatimer "052-1.gat", 1, 1, 100, 80, 0, "#Power Circle::OnMPSC"; + areatimer "052-1", 1, 1, 100, 80, 0, "#Power Circle::OnMPSC"; return; @@ -296,7 +296,7 @@ L_ChannellingMoved: // kill the player as part of the process: the magic process drained his life. // But only if he is still in the island (otherwise, he probably got warped // and does not need being killed) - if (isin("052-1.gat",1,1,100,80) == 0) + if (isin("052-1",1,1,100,80) == 0) goto L_ChannellingFail; percentheal -100, 0; misceffect FX_MAGIC_DARK_EXPLOSION, strcharinfo(0); diff --git a/world/map/npc/052-1/janitor.txt b/world/map/npc/052-1/janitor.txt index d0067d6e..dbbd54dc 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,1,1,0|script|#IlliaJanitor4|127 { end; @@ -10,9 +10,9 @@ OnCommandClean: killmonster "052-1", "All"; // Delete the magic stones that are still laying around. // FIXME Syntax error happens if not setting a variable... - set $@dummy_var, getareadropitem("052-1.gat", 1, 1, 98, 78, 873, 1) + - getareadropitem("052-1.gat", 1, 1, 98, 78, 874, 1) + - getareadropitem("052-1.gat", 1, 1, 98, 78, 875, 1); + set $@dummy_var, getareadropitem("052-1", 1, 1, 98, 78, 873, 1) + + getareadropitem("052-1", 1, 1, 98, 78, 874, 1) + + getareadropitem("052-1", 1, 1, 98, 78, 875, 1); set $@dummy_var, 0; end; diff --git a/world/map/npc/052-1/mapflags.txt b/world/map/npc/052-1/mapflags.txt index da874ac2..1813a7cd 100644 --- a/world/map/npc/052-1/mapflags.txt +++ b/world/map/npc/052-1/mapflags.txt @@ -1,2 +1,2 @@ -052-1.gat|mapflag|nosave|007-1,86,76 -052-1.gat|mapflag|resave|007-1,86,76 +052-1|mapflag|nosave|007-1,86,76 +052-1|mapflag|resave|007-1,86,76 -- cgit v1.2.3-70-g09d2