diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-02 11:06:32 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-02 22:21:29 -0700 |
| commit | c0ba38cd4b68491e28e467889804ebc09c9c002e (patch) | |
| tree | af2890e6fe20990d2a9b7c94b991be58f25a5d52 /world/map/npc/052-2 | |
| parent | 514a2f05cb335c1e9210fea58bc9a9a58478283f (diff) | |
| download | serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.gz serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.bz2 serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.xz serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.zip | |
Clean up main scripts
Diffstat (limited to 'world/map/npc/052-2')
| -rw-r--r-- | world/map/npc/052-2/chest.txt | 14 | ||||
| -rw-r--r-- | world/map/npc/052-2/lobby.txt | 5 |
2 files changed, 9 insertions, 10 deletions
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index 59fe8ae4..84c5a5cd 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -40,21 +40,19 @@ L_ResumePick: "... and quickly.", L_GetReward, "... or maybe not. I am out of time.", L_AskLeaving, "... but I can't carry more stuff.", L_AskLeaving, - "... no, wait a minute.", -; - close; + "... no, wait a minute.", L_Close; L_Pick: menu "Let's take what I deserve for all this.", L_GetReward, - "Wait.", -; - close; + "Wait.", L_Close; L_GetReward: if (@illia_got_rewards == 0) goto L_GetCommonReward; if (@illia_got_rewards == 1) goto L_GetUniqueReward; - close; + goto L_Close; L_GetCommonReward: if (@illia_current_num_rewards == $@illia_num_common_reward_items) @@ -133,8 +131,7 @@ L_PrepareLeaving: mes "Use Valia's ring to teleport now?"; menu "Yes. Time to make her pay for her trick!", L_Leave, - "No, I still need to see things here.", -; - close; + "No, I still need to see things here.", L_Close; L_Leave: set @illia_got_rewards, 3; @@ -174,4 +171,7 @@ L_ScheduleEnd: cmdothernpc "#IlliaDaemon", "Toggle"; end; +L_Close: + close; + } diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt index d8dd6e44..a32ab830 100644 --- a/world/map/npc/052-2/lobby.txt +++ b/world/map/npc/052-2/lobby.txt @@ -173,15 +173,14 @@ L_HandleTalk: if (strcharinfo(0) == $@ILLIA_HERO$) goto L_TalkToHero; goto L_TalkToHelper; - end; L_TalkToHelper: mes "She gives you a quick look then gives her attention to " + $@ILLIA_HERO$ + "."; close; L_TalkToHero: - menu - "Are you Luvia? Your sister Valia sent me to save you! Where is Ismuth?", -; + mes "Are you Luvia? Your sister Valia sent me to save you! Where is Ismuth?"; + next; set $@illia_level_5_progress, 4; initnpctimer; close; |