From c70b3922ad11312e858266dc3f2a86cb97d11670 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Mon, 21 Apr 2008 15:21:51 +0000 Subject: Fixed bugreport:1390, bugreport:1394, bugreport:1396. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12624 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/guild2/arug_cas01.txt | 10 ++++++---- npc/guild2/arug_cas02.txt | 5 +++-- npc/guild2/arug_cas03.txt | 5 +++-- npc/guild2/arug_cas04.txt | 5 +++-- npc/guild2/arug_cas05.txt | 5 +++-- npc/guild2/schg_cas01.txt | 5 +++-- npc/guild2/schg_cas02.txt | 5 +++-- npc/guild2/schg_cas03.txt | 5 +++-- npc/guild2/schg_cas04.txt | 5 +++-- npc/guild2/schg_cas05.txt | 5 +++-- npc/quests/eye_of_hellion.txt | 5 +++-- 12 files changed, 38 insertions(+), 24 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 881811206..0f4dab28f 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2008/04/21 + * Rev. 12624 Fixed bugreport:1390, bugreport:1394, bugreport:1396. [L0ne_W0lf] 2008/04/15 * Rev. 12602 Rescripted Eye of Hellion quest, all quest progress is lost. [L0ne_W0lf] 2008/04/14 diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index 253dc4e91..20b00c53b 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -3,13 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Arunafeltz Castle 1 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] +//- Fixed improper label used in guaridan stone. //============================================================ arug_cas01,1,1,0 script Manager#aru01_02 111,{ @@ -541,11 +543,11 @@ Onreset: arug_cas01,1,3,0 script #aru01_df01 -1,{ OnEnable: - guardian "arug_cas01",210,234,"1st Guardian Stone",1907,"#aru01_df01::OnGuardianDied"; //22; + guardian "arug_cas01",210,234,"1st Guardian Stone",1907,"#aru01_df01::OnGuardianStoneDied"; //22; end; OnDisable: - killmonster "arug_cas01","#aru01_df01::OnGuardianDied"; + killmonster "arug_cas01","#aru01_df01::OnGuardianStoneDied"; setarray $agit_ar01[0],1; //Global Variable stopnpctimer; end; @@ -2355,7 +2357,7 @@ arug_cas01,92,380,3 script Steward#aru01 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas01",4,GetCastleData("arug_cas01",4)+1; diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index 3f5f37f26..b1c8a0d9e 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Arunafeltz Castle 2 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ arug_cas02,1,1,0 script Manager#aru02_02 111,{ @@ -2313,7 +2314,7 @@ arug_cas02,303,341,3 script Steward#aru02 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas02",4,GetCastleData("arug_cas02",4)+1; diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index d619369c9..cb5617387 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Arunafeltz Castle 3 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ arug_cas03,1,1,0 script Manager#aru03_02 111,{ @@ -2359,7 +2360,7 @@ arug_cas03,328,98,3 script Steward#aru03 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas03",4,GetCastleData("arug_cas03",4)+1; diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index eedfc6a2d..687096907 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Arunafeltz Castle 4 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ arug_cas04,1,1,0 script Manager#aru04_02 111,{ @@ -2359,7 +2360,7 @@ arug_cas04,328,98,3 script Steward#aru04 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas04",4,GetCastleData("arug_cas04",4)+1; diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index a36891754..b50543ab0 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Arunafeltz Castle 5 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ arug_cas05,1,1,0 script Manager#aru05_02 111,{ @@ -2359,7 +2360,7 @@ arug_cas05,328,98,3 script Steward#aru05 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas05",4,GetCastleData("arug_cas05",4)+1; diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt index de1661939..f989f65b8 100644 --- a/npc/guild2/schg_cas01.txt +++ b/npc/guild2/schg_cas01.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Schwaltzvalt Castle 1 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ schg_cas01,1,1,0 script Manager#sch01_02 111,{ @@ -2359,7 +2360,7 @@ schg_cas01,247,305,3 script Steward#sch01 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "schg_cas01",4,GetCastleData("schg_cas01",4)+1; diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt index ccb414e64..f0542dabb 100644 --- a/npc/guild2/schg_cas02.txt +++ b/npc/guild2/schg_cas02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //= 1.0 First Version [L0ne_W0lf] //= 1.1 Fixed setcell range of first barricade. [L0ne_W0lf] //= 1.2 Fixed first Barricade being desotryable. [L0ne_W0lf] +//= 1.3 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ schg_cas02,1,1,0 script Manager#sch02_02 111,{ @@ -2295,7 +2296,7 @@ schg_cas02,105,378,3 script Steward#sch02 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "schg_cas02",4,GetCastleData("schg_cas02",4)+1; diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index 7afd7049c..dede4266e 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Schwaltzvalt Castle 3 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ schg_cas03,1,1,0 script manager#sch03_02 111,{ @@ -2349,7 +2350,7 @@ schg_cas03,88,90,3 script Steward#sch03 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "schg_cas03",4,GetCastleData("schg_cas03",4)+1; diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt index 522eaa1f9..edb24e8fa 100644 --- a/npc/guild2/schg_cas04.txt +++ b/npc/guild2/schg_cas04.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Schwaltzvalt Castle 4 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ schg_cas04,1,1,0 script Manager#sch04_02 111,{ @@ -2359,7 +2360,7 @@ schg_cas04,247,305,3 script Steward#sch04 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "schg_cas04",4,GetCastleData("schg_cas04",4)+1; diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt index bb7e43caa..460cea84a 100644 --- a/npc/guild2/schg_cas05.txt +++ b/npc/guild2/schg_cas05.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= WoE SE Schwaltzvalt Castle 5 //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] +//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] //============================================================ schg_cas05,1,1,0 script Manager#sch05_02 111,{ @@ -2359,7 +2360,7 @@ schg_cas05,247,305,3 script Steward#sch05 55,{ mes "you do not have enough"; mes "zeny to make an investment"; mes "for the guild today."; - end; + close; } set zeny,zeny-.@eco_invest; SetCastleData "schg_cas05",4,GetCastleData("schg_cas05",4)+1; diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 0e5adec69..7cb76b69c 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= Tracking variable is not backwards compatable meaning //= you can again repeat this quest from the start. +//= 1.6 Fixed issue with #prt_key-1-1. [L0ne_W0lf] //============================================================ morocc_in,116,101,3 script Old Scholar Tyus#hellion 735,3,3,{ @@ -1094,7 +1095,7 @@ prontera,223,82,0 script #prt_key-1 111,{ close; } -prontera,45,67,0 script #prt_key-1-1 -1,1,1,{ +prontera,45,67,0 script #prt_key-1-1 139,1,1,{ OnTouch: if (HELLIONQ == 40 || HELLIONQ == 41) { mes "[" + strcharinfo(0) + "]"; -- cgit v1.2.3-60-g2f50