summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-11 18:43:51 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-11 18:43:51 +0000
commit55338f39fd1865409c46b2cc8471841f0be04363 (patch)
tree747cbe51e0df16a855085c7c1b059e8e0d0ece25 /npc/jobs
parentc3386da24b7ec744b41a30eb9fe85b08f19ded37 (diff)
downloadhercules-55338f39fd1865409c46b2cc8471841f0be04363.tar.gz
hercules-55338f39fd1865409c46b2cc8471841f0be04363.tar.bz2
hercules-55338f39fd1865409c46b2cc8471841f0be04363.tar.xz
hercules-55338f39fd1865409c46b2cc8471841f0be04363.zip
Fixed warp on timeout in swordman.txt
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9199 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/1-1/swordman.txt20
1 files changed, 10 insertions, 10 deletions
diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 68ec70790..92de98d25 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.7
+//= 1.7.1
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.5.3 Removed Duplicates [Silent]
//= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]
//= 1.7 changed location from its clone to the original [Lupus]
+//= 1.7.1 Fixed warp on timeout [KarLaeda]
//============================================================
@@ -34,7 +35,7 @@ izlude_in.gat,74,172,5 script Master Swordsman 119,{
L_Menu:
next;
menu "Make me a Swordsman!",M_0,"About being a Swordsman.",M_1,"The job requirements.",M_2,"Cancel.",M_End;
- close;
+ close;
M_0:
mes "[Master Swordsman]";
@@ -133,11 +134,11 @@ L_Menu:
next;
O_2a:
- mes "[Master Swordsman]";
+ mes "[Master Swordsman]";
mes "First, You must learn all 9 Basic Skills. If you can't satisfy this condition, you won't be able to become anything.";
next;
mes "[Master Swordsman]";
- mes "Secondly you must pass the legendary Izlude Swordsman Test.";
+ mes "Secondly you must pass the legendary Izlude Swordsman Test.";
next;
mes "[Master Swordsman]";
mes "When you fullfill these 2 conditions, you can become an offical Swordsman.";
@@ -264,8 +265,7 @@ izlude_in.gat,30,163,8 script Test Hall Staff 105,{
mes "[Test Hall Staff]";
mes "Are you ready?";
next;
- menu "Let me at it!!",M_yes,"Ah..maybe later..",M_no;
- close;
+ menu "Let me at it!!",-,"Ah..maybe later..",M_no;
M_yes:
set SWTEST, SWTEST + 1;
@@ -315,7 +315,7 @@ job_sword1.gat,1,1,0 script TimerSwrdmn -1,{
end;
OnTimer428000:
stopnpctimer;
- warp "izlude_in.gat",39,170;
+ areawarp "job_sword1.gat",0,0,400,400,"izlude_in.gat",39,170;
end;
}
@@ -341,7 +341,7 @@ job_sword1.gat,230,242,2 script Test Hall Staff#01 105,{
M_1:
mes "[Test Hall Staff]";
mes "Bravo! Go for it again!";
- close;
+ close;
}
// -- Medic 2 --
@@ -365,10 +365,10 @@ job_sword1.gat,230,204,2 script Test Hall Staff#02 105,{
M_1:
mes "[Test Hall Staff]";
mes "Bravo! Go for it again!";
- close;
+ close;
}
-// -- Mae (Medic 3) --
+// -- Mae (Medic 3) --
job_sword1.gat,223,167,2 script Mae 92,{
mes "[Mae]";
mes "I sincerely congratulate you for passing the test!";