From bf5d35ffa62f9cc19f20f27fd5bd364f5fc13d7c Mon Sep 17 00:00:00 2001 From: shadow Date: Sat, 7 Jun 2008 15:07:49 +0000 Subject: Another fix to Lucius (trivial) on /cities/lighthalzen.txt. (bugreport:1125) Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12777 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 +++ npc/cities/lighthalzen.txt | 5 +++-- npc/merchants/inn.txt | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index a0eade0d1..6efd296c7 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== + * 1.7b Another fix to Lucius (trivial). (bugreport:1125) + * Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191. + 2008/06/07 * Bug Report 1624, fixed warp destinationX from 230 to 320. [Brainstorm] diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 8d52eced2..49aa3b42b 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= erKURITA, Au{R}oN (Translated by Alan), $ephiroth //===== Current Version: ===================================== -//= 1.7a +//= 1.7b //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -36,6 +36,7 @@ //= 1.7 Removed Auciton Staff as the offical auction file has been added. [L0ne_W0lf] //= Corrected Lucius so he checks the donation variable. (bugreport:1103) [L0ne_W0lf] //= 1.7a Another fix to Lucius. (bugreport:1118) [L0ne_W0lf] +//= 1.7b Another fix to Lucius (trivial). (bugreport:1125) //============================================================= lighthalzen,198,285,5 script Jiwon#zen5 862,{ @@ -555,7 +556,7 @@ lighthalzen,182,102,3 script Lucius#zen5 866,{ mes "to cancel, please enter ''0.''"; next; input .@input; - if (.@input > 30000) { + if (.@input > 30000 || .@input < 0) { mes "[Lucius]"; mes "Please enter a value"; mes "from 1 to 30,000 in"; diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index ae8098f3f..c314c01f5 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -4,7 +4,7 @@ //= Darkchild (1.1) //= Playtester (1.2) //===== Current Version: ===================================== -//= 2.2 +//= 2.4 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -38,6 +38,7 @@ //= 2.1a Corrected a little Typo error. (bugreport:536 & 537) [Samuray22] //= 2.2 Small update to Vein's Inn Master. [L0ne_W0lf] //= 2.3 Added Lighthalzen Inn from Lighthalzen town file. [L0ne_W0lf] +//= 2.4 Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191. //============================================================ @@ -52,7 +53,7 @@ prt_in,244,135,2 script Inn Employee#Sammy 53,{ prt_in,61,141,2 script Inn Employee#Ahlma 53,{ callfunc "F_InnMaid","[Employee Ahlma]","Nenkaras","prt_in",64,136; - warp "prt_in",64,136; end; + warp "prt_in",60,166; end; } //======================== Alberta ==================================== -- cgit v1.2.3-70-g09d2