summaryrefslogtreecommitdiff
path: root/npc/instances
diff options
context:
space:
mode:
authorPatskie <escalona3413@gmail.com>2013-12-04 18:28:18 +0800
committerPatskie <escalona3413@gmail.com>2013-12-04 18:28:18 +0800
commit5e9a2d434f522d1407b8764581473307293e921f (patch)
tree248458e7df1d876005daba16d50ce452f43d2381 /npc/instances
parentcf012645620c2e791607a43dfd0c69120761b18a (diff)
downloadhercules-5e9a2d434f522d1407b8764581473307293e921f.tar.gz
hercules-5e9a2d434f522d1407b8764581473307293e921f.tar.bz2
hercules-5e9a2d434f522d1407b8764581473307293e921f.tar.xz
hercules-5e9a2d434f522d1407b8764581473307293e921f.zip
- Fix part 2 of issue 7841
- http://hercules.ws/board/tracker/issue-7841-endless-tower-part-2/ - Thanks to Haru for the getarg suggestion Signed-off-by: Patskie <escalona3413@gmail.com>
Diffstat (limited to 'npc/instances')
-rw-r--r--npc/instances/EndlessTower.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index f8f8d541f..456bf590f 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -246,7 +246,7 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
instance_init(.@instance);
close;
case 2:
- callsub L_Enter,0,1;
+ callsub L_Enter,0,1,.@md_name$,.@p_name$;
case 3:
mes "I will move you to Alberta.";
close2;
@@ -258,7 +258,7 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
}
switch(select("Enter the "+.@md_name$+":Return to Alberta:Cancel")) {
case 1:
- callsub L_Enter,1,1;
+ callsub L_Enter,1,1,.@md_name$,.@p_name$;
case 2:
mes "I will move you to Alberta.";
close2;
@@ -272,7 +272,7 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
next;
switch(select("Enter the "+.@md_name$+":Return to Alberta:Cancel")) {
case 1:
- callsub L_Enter,0,0;
+ callsub L_Enter,0,0,.@md_name$,.@p_name$;
case 2:
mes "I will move you to Alberta.";
close2;
@@ -308,11 +308,11 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
L_Enter:
if (has_instance("1@tower") == "") {
- mes "The memorial dungeon " + .@md_name$ + " does not exist.";
+ mes "The memorial dungeon " +getarg(2)+ " does not exist.";
mes "The party leader did not generate the dungeon yet.";
close;
} else {
- mapannounce "e_tower", strcharinfo(0)+" of the party, "+.@p_name$+", is entering the dungeon, Endless Tower.",bc_map,"0x00ff99",FW_NORMAL,12;
+ mapannounce "e_tower", strcharinfo(0)+" of the party, " +getarg(3)+", is entering the dungeon, Endless Tower.",bc_map,"0x00ff99",FW_NORMAL,12;
if (getarg(1)) {
set etower_timer,gettimetick(2);
setquest 60200;