Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warp on timeout in swordman.txt

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9199 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lupus 2006-11-11 18:43:51 +00:00
parent 3757a2b2f8
commit a5108726ab
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/Changelog.txt
View File

@ -33,6 +33,8 @@ KarLaeda
Date Added Date Added
====== ======
11/11
* Fixed warp on timeout in swordman.txt [KarLaeda]
11/09 11/09
* Added Bingo - Hugel warps, thanks to erKURITA [Lupus] * Added Bingo - Hugel warps, thanks to erKURITA [Lupus]
- Added Hugel INN - Added Hugel INN

20
npc/jobs/1-1/swordman.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= kobra_k88 //= kobra_k88
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.7 //= 1.7.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena 1.0 + //= eAthena 1.0 +
//===== Description: ========================================= //===== Description: =========================================
@ -21,6 +21,7 @@
//= 1.5.3 Removed Duplicates [Silent] //= 1.5.3 Removed Duplicates [Silent]
//= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus] //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]
//= 1.7 changed location from its clone to the original [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: L_Menu:
next; next;
menu "Make me a Swordsman!",M_0,"About being a Swordsman.",M_1,"The job requirements.",M_2,"Cancel.",M_End; 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: M_0:
mes "[Master Swordsman]"; mes "[Master Swordsman]";
@ -133,11 +134,11 @@ L_Menu:
next; next;
O_2a: 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."; 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; next;
mes "[Master Swordsman]"; mes "[Master Swordsman]";
mes "Secondly you must pass the legendary Izlude Swordsman Test."; mes "Secondly you must pass the legendary Izlude Swordsman Test.";
next; next;
mes "[Master Swordsman]"; mes "[Master Swordsman]";
mes "When you fullfill these 2 conditions, you can become an offical 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 "[Test Hall Staff]";
mes "Are you ready?"; mes "Are you ready?";
next; next;
menu "Let me at it!!",M_yes,"Ah..maybe later..",M_no; menu "Let me at it!!",-,"Ah..maybe later..",M_no;
close;
M_yes: M_yes:
set SWTEST, SWTEST + 1; set SWTEST, SWTEST + 1;
@ -315,7 +315,7 @@ job_sword1.gat,1,1,0 script TimerSwrdmn -1,{
end; end;
OnTimer428000: OnTimer428000:
stopnpctimer; stopnpctimer;
warp "izlude_in.gat",39,170; areawarp "job_sword1.gat",0,0,400,400,"izlude_in.gat",39,170;
end; end;
} }
@ -341,7 +341,7 @@ job_sword1.gat,230,242,2 script Test Hall Staff#01 105,{
M_1: M_1:
mes "[Test Hall Staff]"; mes "[Test Hall Staff]";
mes "Bravo! Go for it again!"; mes "Bravo! Go for it again!";
close; close;
} }
// -- Medic 2 -- // -- Medic 2 --
@ -365,10 +365,10 @@ job_sword1.gat,230,204,2 script Test Hall Staff#02 105,{
M_1: M_1:
mes "[Test Hall Staff]"; mes "[Test Hall Staff]";
mes "Bravo! Go for it again!"; mes "Bravo! Go for it again!";
close; close;
} }
// -- Mae (Medic 3) -- // -- Mae (Medic 3) --
job_sword1.gat,223,167,2 script Mae 92,{ job_sword1.gat,223,167,2 script Mae 92,{
mes "[Mae]"; mes "[Mae]";
mes "I sincerely congratulate you for passing the test!"; mes "I sincerely congratulate you for passing the test!";