From c0ba38cd4b68491e28e467889804ebc09c9c002e Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 2 Apr 2014 11:06:32 -0700 Subject: Clean up main scripts --- world/map/npc/051-1/desert.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'world/map/npc/051-1/desert.txt') diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt index b79fe0f5..960eb401 100644 --- a/world/map/npc/051-1/desert.txt +++ b/world/map/npc/051-1/desert.txt @@ -33,8 +33,7 @@ mes "Jump in the waterfall?"; menu "Yes", L_Warp, - "No", -; - close; + "No", L_Close; OnTimer1000: npctalk "Youuuuuuu... Bring me souls... " + $@illia_num_sealed_souls + " fresh souls... Nooooow. And you shall paaass."; @@ -85,7 +84,7 @@ L_GiveTask: areamonster "051-1.gat", 138, 34, 145, 41, "", 1096, 5, "IlliaDMobs051-1::On1096"; // Start timed messages initnpctimer; - close; + goto L_Close; L_GiveSouls: if (strcharinfo(0) != $@ILLIA_HERO$) @@ -94,13 +93,12 @@ L_GiveSouls: mes "\"Give me the souuuuuuls... Noooooooow!!\""; menu "Please, have a look at these.", L_CheckSouls, - "Sorry, I don't have any.", -; - close; + "Sorry, I don't have any.", L_Close; L_GiveSoulsToHero: mes "[Cursed Waterfall]"; mes "\"Who are you?.... I want the souuuuuuls from " + $@ILLIA_HERO$ + "!\""; - close; + goto L_Close; L_CheckSouls: if (countitem ("SealedSoul") < $@illia_num_sealed_souls) @@ -127,17 +125,19 @@ L_CheckSouls: // Display an effect to show the waterfall opens itself / kills remaining monsters misceffect FX_MEDIUM_BLINDINGLIGHT; - close; + goto L_Close; L_NotEnough: mes "[Cursed Waterfall]"; mes "\"Moooooooooore... Give me more...\""; - close; + goto L_Close; L_Warp: warp "052-1.gat", 23, 52; // Count the player who reached the island. set $@illia_players_in_luvia_territory, $@illia_players_in_luvia_territory + 1; - close; + goto L_Close; +L_Close: + close; } -- cgit v1.2.3-60-g2f50