summaryrefslogtreecommitdiff
path: root/world/map/npc/010-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/010-2')
-rw-r--r--world/map/npc/010-2/chef.txt3
-rw-r--r--world/map/npc/010-2/dimonds.txt18
-rw-r--r--world/map/npc/010-2/loratay.txt12
3 files changed, 15 insertions, 18 deletions
diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index 20ef0dcf..a128b094 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -277,8 +277,7 @@ L_Easter2012_Result:
L_Next8:
if (@temp < 15) goto L_Easter2012_Lucky;
- //else
- goto L_Easter2012_Unlucky;
+ goto L_Easter2012_Unlucky;
close;
L_Easter2012_Lucky:
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index d422cf03..e51213ae 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -382,7 +382,7 @@ event_done:
next;
mes "\"Well, that was the poem. What do you think of it?\"";
menu
- "It was a bit long and kind of hard to understand, but thanks for reading.", leave;
+ "It was a bit long and kind of hard to understand, but thanks for reading.", L_Close;
L_Full_Inv:
mes "[Shannon]";
@@ -463,28 +463,28 @@ L_nobeer:
L_MenuItems:
set @choose, @menu - 1;
if (@choice_idx[@choose] == 0)
- goto leave;
+ goto L_Close;
if ((countitem("Steak") != 0) && (@choice_idx[@choose] == @C_steak))
- goto rem_item;
+ goto L_RmItem;
if ((countitem("ChickenLeg") != 0) && (@choice_idx[@choose] == @C_chickenleg))
- goto rem_item;
+ goto L_RmItem;
if ((countitem("RedApple") != 0) && (@choice_idx[@choose] == @C_redapple))
- goto rem_item;
+ goto L_RmItem;
if ((countitem("GreenApple") != 0) && (@choice_idx[@choose] == @C_greenapple))
- goto rem_item;
+ goto L_RmItem;
if ((countitem("Beer") != 0) && (@choice_idx[@choose] == @C_beer))
- goto rem_item;
+ goto L_RmItem;
// fallthrough only when player remove the items while in menu, trying to cheat
// the quest will need to be started again
mes "\"What you are offering, you do not have. Do not try to betray me. Come back when you have better morals.\"";
close;
-rem_item:
+L_RmItem:
delitem @choice_idx[@choose], 1;
return;
-leave:
+L_Close:
close;
}
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index a6b4c06f..35cf3af7 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -160,11 +160,11 @@ L_agostine_2:
"Are you alright?", L_Next,
"Here, have a bottle of water...", L_give_water,
"Can I help you?", L_Next;
- //else
- menu
- "(sneak out of the room)", L_end,
- "Are you alright?", L_Next,
- "Can I help you?", L_Next;
+
+ menu
+ "(sneak out of the room)", L_end,
+ "Are you alright?", L_Next,
+ "Can I help you?", L_Next;
L_Next:
mes "[Lora Tay the Seamstress]";
@@ -328,7 +328,6 @@ L_Next4:
mes "\"I will fix them, but I cannot use normal threading to fix these materials.";
mes "I will need a soft thin thread so I won't spoil the textures.\"";
next;
-
goto L_proposal_search_items;
L_proposal_search_items:
@@ -1116,5 +1115,4 @@ L_CleanSorcererRobe:
set @chosen_color, 0;
set @cotton_cloth_id, 0;
close;
-
}