diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 2 | ||||
| -rw-r--r-- | npc/cities/morocc.txt | 38 | ||||
| -rw-r--r-- | npc/jobs/2-1/knight.txt | 5 |
3 files changed, 12 insertions, 33 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index e7bcb05d8..ceaaea7a3 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,8 @@ Date Added ====== 2007/10/23 + * Rev. 11568 Removed duplicate Morroc city npc (bugreport:277) [L0ne_W0lf] + - Fix to the knight job quest. (bad areawarp destination) * Rev. 11566 Corrected the Jawaii Ice Cream salesman. bugreport:285 [L0ne_W0lf] * Rev. 11565 Fixed two duplicate names in the assassin skill quest. XD [L0ne_W0lf] * Rev. 11564 2-x quest skill update 2/2. [L0ne_W0lf] diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index 44561dc30..1c6163a8c 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 1.6 Added Bartender NPC, made by Persian69 [Vicious_Pucca] //= 1.7 Removed Duplicates [Silent] //= 1.8 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] +//= 1.9 Removed duplicate NPC, changed temp char vars to temp npc. [L0ne_W0;f] //============================================================ // Morroc @@ -687,31 +688,6 @@ morocc,289,230,3 script Citizen#06 92, { close; } -//<================================================== Assassin Guild ====================================================>\\ - -// Hashisid ==================================== -moc_fild16,199,212,4 script Hashisid 48,{ - mes "[Hashisid]"; - mes "For Assassins, it is important not to look a target in the eye. If a target is smart, he/she may be able to tell what you're up too."; - next; - menu "About Assassins",M_0,"Quit Conversation",M_End; - - M_0: - mes "[Hashisid]"; - mes "Let me tell you a little bit about Assassins"; - next; - mes "[Hashisid]"; - mes "Assassin's are hired to infiltrate, gather intelligence, and even commit murder without being seen or heard."; - mes "Stealth and speed are vital to Assassins. Assassins live in the shadows and never get praise or congratulations."; - next; - mes "[Hashisid]"; - mes "It's their job to go unnoticed. Though an Assassin may seem like a cruel and heartless individual...."; - mes "An Assassin will never do any harm to an innocent being. The main purpose of the Assassin to seek out and destroy evil forces!"; - close; - M_End: - close; -} - //================================================== // Assassin Guild Guards //=================================================== @@ -722,11 +698,11 @@ moc_fild16,195,281,4 script Assassin Guardian#1::SinGuard 707,{ mes "Welcome."; close; } - set @temp, rand(1,4); - if(@temp == 1) mes "........"; - if(@temp == 2) mes "Hmmm.........."; - if(@temp == 3) mes "Hmmm... you shouldn't be here....."; - if(@temp == 4) mes "You're trespassing on forbidden grounds......."; + set .@temp, rand(1,4); + if(.@temp == 1) mes "........"; + if(.@temp == 2) mes "Hmmm.........."; + if(.@temp == 3) mes "Hmmm... you shouldn't be here....."; + if(.@temp == 4) mes "You're trespassing on forbidden grounds......."; close; } diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 4f5dd4a9a..a64d60a7c 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.4 +//= 2.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -31,6 +31,7 @@ //= 2.4 Minor fixes to timer#knt. [L0ne_W0lf] //= 2.5 Fixes a small bug with making claymores. [L0ne_W0lf] //= Corrected usages of killmonster and killmonsterall. +//= 2.6 Corrected an improper areawarp destination. [L0ne_W0lf] //============================================================ prt_in,88,101,4 script Chivalry Captain#knt 56,{ @@ -1458,7 +1459,7 @@ OnTimer180000: end; OnTimer181000: - areawarp "job_knt", 24, 32, 63, 71, "prt_in",100,100; + areawarp "job_knt", 24, 32, 63, 71, "prt_in",80,100; end; OnTimer182000: |