summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-06-06 10:26:34 +0000
committerFate <fate-tmw@googlemail.com>2009-06-06 10:26:34 +0000
commitb7e593df793b278eccd1be00c9cc45a1b17faad6 (patch)
tree42000ecedb551cea1b931ea2b70dbfdf2c686c6e
parent5ffa653cc01a1143cd296662d76fde77ea88ebac (diff)
parente2d869f2be948a65103e6ba81d7b6da590d58dfc (diff)
downloadserverdata-b7e593df793b278eccd1be00c9cc45a1b17faad6.tar.gz
serverdata-b7e593df793b278eccd1be00c9cc45a1b17faad6.tar.bz2
serverdata-b7e593df793b278eccd1be00c9cc45a1b17faad6.tar.xz
serverdata-b7e593df793b278eccd1be00c9cc45a1b17faad6.zip
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline
-rw-r--r--npc/009-2_Hurnscald/nicholas.txt12
-rw-r--r--npc/014-1_Woodland/wedding-officiator.txt3
2 files changed, 11 insertions, 4 deletions
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 0ee1053f..f808959d 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -107,10 +107,11 @@ L_main_menu:
set @CHOICE_WARLORD, 3;
set @CHOICE_SHIELD, 4;
set @CHOICE_SETZER, 5;
+ set @CHOICE_CANCEL, 6;
- setarray @choice$, "", "", "", "", "";
+ setarray @choice$, "", "", "", "", "", "";
set @choices_nr, 0;
- setarray @choice_idx, 0, 0, 0, 0, 0;
+ setarray @choice_idx, 0, 0, 0, 0, 0, 0;
if (countitem("ShortSword") < 1) goto L_main_menu_post_setzer;
set @choice$[@choices_nr], "Can you make my short sword better?";
@@ -140,12 +141,16 @@ L_main_menu_post_setzer:
set @choice_idx[@choices_nr], @CHOICE_WARLORD;
set @choices_nr, 1 + @choices_nr;
L_no_more_helmets:
+ set @choice$[@choices_nr], "No thanks.";
+ set @choice_idx[@choices_nr], @CHOICE_CANCEL;
+ set @choices_nr, 1 + @choices_nr;
menu @choice$[0], -,
@choice$[1], -,
@choice$[2], -,
@choice$[3], -,
- @choice$[4], -;
+ @choice$[4], -,
+ @choice$[5], -;
set @menu, @menu - 1;
@@ -159,6 +164,7 @@ L_no_more_helmets:
if (@choice == @CHOICE_WARLORD) goto L_YesWarlord;
if (@choice == @CHOICE_SHIELD) goto L_YesShield;
if (@choice == @CHOICE_SETZER) goto L_SetzerQuest;
+ if (@choice == @CHOICE_CANCEL) goto L_end;
close;
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index 6e09af99..9a5cfd33 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
@@ -17,7 +17,8 @@ L_main:
menu "What exactly do you do?", L_explain_self,
"How do I get married?", L_explain_marriage,
- "I would like to get married.", L_get_married;
+ "I would like to get married.", L_get_married,
+ "Goodbye.", L_end;
close;
L_explain_self: