From af90f0c214d86aca0117df966f87b95e6999bd45 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Tue, 20 May 2008 12:53:54 +0000 Subject: * Fixed variable issue with Milk Trader NPC. (bugreport:1523) * Fixed typos in the acolyte nad mage skill quests. (bugreport:1531) * Fixed issue with a removing a Keil Hyre cutin. (bugreport:1593) * Corrected a few oversights in the WoESE scripts. * Added dummy "OnMyMobDead" label to a Niflheim NPC. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12718 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 6 ++++++ npc/cities/niflheim.txt | 6 +++++- npc/guild2/arug_cas01.txt | 12 +++++++++--- npc/guild2/arug_cas02.txt | 12 ++++++++---- npc/guild2/arug_cas03.txt | 13 +++++++++---- npc/guild2/arug_cas04.txt | 12 ++++++++---- npc/guild2/arug_cas05.txt | 12 ++++++++---- npc/guild2/schg_cas01.txt | 12 ++++++++---- npc/guild2/schg_cas02.txt | 12 ++++++++---- npc/guild2/schg_cas03.txt | 16 ++++++++++------ npc/guild2/schg_cas04.txt | 12 ++++++++---- npc/guild2/schg_cas05.txt | 12 ++++++++---- npc/merchants/milk_trader.txt | 5 +++-- npc/quests/Kiel_Hyre_Quest.txt | 7 +++++-- npc/quests/skills/acolyte_skills.txt | 3 ++- npc/quests/skills/mage_skills.txt | 5 +++-- 16 files changed, 108 insertions(+), 49 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 37b967c94..a698382bb 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,11 @@ Date Added ====== +2008/05/20 + * Rev. 12718 Fixed variable issue with Milk Trader NPC. (bugreport:1523) [L0ne_W0lf] + * Fixed typos in the acolyte nad mage skill quests. (bugreport:1531) + * Fixed issue with a removing a Keil Hyre cutin. (bugreport:1593) + * Corrected a few oversights in the WoESE scripts. + * Added dummy "OnMyMobDead" label to a Niflheim NPC. 2008/05/16 * Rev. 12712 Fixed variable typo in guild scripts. (bugreport:1514) [L0ne_W0lf] 2008/05/13 diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 9b6d52203..c8e502514 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -4,7 +4,7 @@ //= Fyrien, Dizzy, PKGINGO //= Official NPCs translated and re-edited by Celest //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= [Aegis Conversion] //= eAthena SVN; Niflheim Required @@ -25,6 +25,7 @@ //= 1.3 Moved Book of Devil and Piano quest to quests/quests_niflheim.txt [Evera] //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= Removed Cursed Spirits as they were custom. +//= 1.5 Added dummy "OnMyMobDead" event to Cursed Spirit. [L0ne_W0lf] //============================================================ niflheim,52,147,3 script Keedz#nif 796,{ @@ -348,4 +349,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 802,{ mes "rush to leave."; close; } + +OnMyMobDead: + end; } diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index b8712e521..8aff1c173 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,9 @@ //= Fixed improper label used in guaridan stone. //= 1.2 Fixed double message in defense investing. [L0ne_W0lf] //= 1.3 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.4 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ arug_cas01,1,1,0 script Manager#aru01_02 111,{ @@ -98,12 +101,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("arug_cas01",1)) end; + killmonster "arug_cas01","Manager#aru01_02::OnMyTreasureDied"; + // Reset daily investment limit. set .@Treasure,GetCastleData("arug_cas01",2)/5+4; if (.@Treasure) { monster "arug_cas01",251,369,"Treasure Chest",1943,1,"Manager#aru01_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "arug_cas01",251,369,"Treasure Chest",1324,1,"Manager#aru01_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "arug_cas01",253,369,"Treasure Chest",1943,1,"Manager#aru01_02::OnTreasureDied"; if (.@Treasure < 4) end; monster "arug_cas01",254,369,"Treasure Chest",1324,1,"Manager#aru01_02::OnTreasureDied"; @@ -148,6 +152,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas01",258,364,"Treasure Chest",1324,1,"Manager#aru01_02::OnTreasureDied"; } + setcastledata "arug_cas01",4,0; + setcastledata "arug_cas01",5,0; end; OnTreasureDied: diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index 2e8a6a75f..baf39e19f 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,9 @@ //= 1.2 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. //= 1.3 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.4 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ arug_cas02,1,1,0 script Manager#aru02_02 111,{ @@ -98,14 +101,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("arug_cas02",1)) end; + killmonster "arug_cas02","Manager#aru02_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("arug_cas02",2)/5+4; if (.@Treasure) { monster "arug_cas02",382,231,"Treasure Chest",1944,1,"Manager#aru02_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "arug_cas02",383,231,"Treasure Chest",1324,1,"Manager#aru02_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "arug_cas02",384,231,"Treasure Chest",1944,1,"Manager#aru02_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "arug_cas02",385,231,"Treasure Chest",1324,1,"Manager#aru02_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "arug_cas02",386,231,"Treasure Chest",1944,1,"Manager#aru02_02::OnTreasureDied"; @@ -148,6 +150,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas02",389,224,"Treasure Chest",1324,1,"Manager#aru02_02::OnTreasureDied"; } + setcastledata "arug_cas02",4,0; + setcastledata "arug_cas02",5,0; end; OnTreasureDied: diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index b2d83051a..37a2df7ce 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,10 @@ //= 1.2 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. //= 1.3 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.4 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. +//= Should take care of event-not-found error. //============================================================ arug_cas03,1,1,0 script Manager#aru03_02 111,{ @@ -98,14 +102,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("arug_cas03",1)) end; + killmonster "arug_cas03","Manager#aru03_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("arug_cas03",2)/5+4; if (.@Treasure) { monster "arug_cas03",291,276,"Treasure Chest",1945,1,"Manager#aru03_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "arug_cas03",292,276,"Treasure Chest",1324,1,"Manager#aru03_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "arug_cas03",293,276,"Treasure Chest",1945,1,"Manager#aru03_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "arug_cas03",294,276,"Treasure Chest",1324,1,"Manager#aru03_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "arug_cas03",295,276,"Treasure Chest",1945,1,"Manager#aru03_02::OnTreasureDied"; @@ -148,6 +151,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas03",298,269,"Treasure Chest",1324,1,"Manager#aru03_02::OnTreasureDied"; } + setcastledata "arug_cas03",4,0; + setcastledata "arug_cas03",5,0; end; OnTreasureDied: diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index bae367987..58d074454 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,9 @@ //= 1.2 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. //= 1.3 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.4 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ arug_cas04,1,1,0 script Manager#aru04_02 111,{ @@ -98,14 +101,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("arug_cas04",1)) end; + killmonster "arug_cas04","Manager#aru04_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("arug_cas04",2)/5+4; if (.@Treasure) { monster "arug_cas04",291,276,"Treasure Chest",1946,1,"Manager#aru04_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "arug_cas04",292,276,"Treasure Chest",1324,1,"Manager#aru04_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "arug_cas04",293,276,"Treasure Chest",1946,1,"Manager#aru04_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "arug_cas04",294,276,"Treasure Chest",1324,1,"Manager#aru04_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "arug_cas04",295,276,"Treasure Chest",1946,1,"Manager#aru04_02::OnTreasureDied"; @@ -148,6 +150,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas04",298,269,"Treasure Chest",1324,1,"Manager#aru04_02::OnTreasureDied"; } + setcastledata "arug_cas04",4,0; + setcastledata "arug_cas04",5,0; end; OnTreasureDied: diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index f5e867abb..1cf307681 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,9 @@ //= 1.2 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. //= 1.3 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.4 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ arug_cas05,1,1,0 script Manager#aru05_02 111,{ @@ -98,14 +101,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("arug_cas05",1)) end; + killmonster "arug_cas05","Manager#aru05_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("arug_cas05",2)/5+4; if (.@Treasure) { monster "arug_cas05",291,276,"Treasure Chest",1945,1,"Manager#aru05_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "arug_cas05",292,276,"Treasure Chest",1324,1,"Manager#aru05_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "arug_cas05",293,276,"Treasure Chest",1945,1,"Manager#aru05_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "arug_cas05",294,276,"Treasure Chest",1324,1,"Manager#aru05_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "arug_cas05",295,276,"Treasure Chest",1945,1,"Manager#aru05_02::OnTreasureDied"; @@ -148,6 +150,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas05",298,269,"Treasure Chest",1324,1,"Manager#aru05_02::OnTreasureDied"; } + setcastledata "arug_cas05",4,0; + setcastledata "arug_cas05",5,0; end; OnTreasureDied: diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt index 789801535..9c33bc02e 100644 --- a/npc/guild2/schg_cas01.txt +++ b/npc/guild2/schg_cas01.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -15,6 +15,9 @@ //= 1.3 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. //= 1.4 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.5 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ schg_cas01,1,1,0 script Manager#sch01_02 111,{ @@ -99,14 +102,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("schg_cas01",1)) end; + killmonster "aschg_cas01","Manager#sch01_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("schg_cas01",2)/5+4; if (.@Treasure) { monster "schg_cas01",388,388,"Treasure Chest",1938,1,"Manager#sch01_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "schg_cas01",388,389,"Treasure Chest",1324,1,"Manager#sch01_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "schg_cas01",388,390,"Treasure Chest",1938,1,"Manager#sch01_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "schg_cas01",387,390,"Treasure Chest",1324,1,"Manager#sch01_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "schg_cas01",386,390,"Treasure Chest",1938,1,"Manager#sch01_02::OnTreasureDied"; @@ -149,6 +151,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "schg_cas01",386,386,"Treasure Chest",1324,1,"Manager#sch01_02::OnTreasureDied"; } + setcastledata "schg_cas01",4,0; + setcastledata "schg_cas01",5,0; end; OnTreasureDied: diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt index 2b0224030..c4917fedb 100644 --- a/npc/guild2/schg_cas02.txt +++ b/npc/guild2/schg_cas02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -17,6 +17,9 @@ //= 1.5 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. //= 1.6 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.7 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ schg_cas02,1,1,0 script Manager#sch02_02 111,{ @@ -101,14 +104,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("schg_cas02",1)) end; + killmonster "schg_cas02","Manager#sch02_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("schg_cas02",2)/5+4; if (.@Treasure) { monster "schg_cas02",249,378,"Treasure Chest",1939,1,"Manager#sch02_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "schg_cas02",250,378,"Treasure Chest",1324,1,"Manager#sch02_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "schg_cas02",251,378,"Treasure Chest",1939,1,"Manager#sch02_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "schg_cas02",252,378,"Treasure Chest",1324,1,"Manager#sch02_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "schg_cas02",253,378,"Treasure Chest",1939,1,"Manager#sch02_02::OnTreasureDied"; @@ -151,6 +153,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "schg_cas02",253,370,"Treasure Chest",1324,1,"Manager#sch02_02::OnTreasureDied"; } + setcastledata "schg_cas02",4,0; + setcastledata "schg_cas02",5,0; end; OnTreasureDied: diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index 7578fae05..8c0a3b44c 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -17,10 +17,13 @@ //= 1.3 Wrong variable used to store castle information. [L0ne_W0lf] //= 1.4 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. -//= 1.3 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.5 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.6 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ -schg_cas03,1,1,0 script manager#sch03_02 111,{ +schg_cas03,1,1,0 script Manager#sch03_02 111,{ end; OnInterIfInitOnce: @@ -102,14 +105,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("schg_cas03",1)) end; + killmonster "schg_cas03","Manager#sch03_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("schg_cas03",2)/5+4; if (.@Treasure) { monster "schg_cas03",189,21,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "schg_cas03",190,21,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "schg_cas03",191,21,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "schg_cas03",192,21,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "schg_cas03",193,21,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied"; @@ -152,6 +154,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "schg_cas03",194,15,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied"; } + setcastledata "schg_cas03",4,0; + setcastledata "schg_cas03",5,0; end; OnTreasureDied: diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt index d1aaa9b91..54bda5d5b 100644 --- a/npc/guild2/schg_cas04.txt +++ b/npc/guild2/schg_cas04.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,9 @@ //= 1.2 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. //= 1.3 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.4 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ schg_cas04,1,1,0 script Manager#sch04_02 111,{ @@ -98,14 +101,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("schg_cas04",1)) end; + killmonster "schg_cas04","Manager#sch04_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("schg_cas04",2)/5+4; if (.@Treasure) { monster "schg_cas04",388,388,"Treasure Chest",1941,1,"Manager#sch04_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "schg_cas04",388,389,"Treasure Chest",1324,1,"Manager#sch04_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "schg_cas04",388,390,"Treasure Chest",1941,1,"Manager#sch04_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "schg_cas04",387,390,"Treasure Chest",1324,1,"Manager#sch04_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "schg_cas04",386,390,"Treasure Chest",1941,1,"Manager#sch04_02::OnTreasureDied"; @@ -148,6 +150,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "schg_cas04",386,386,"Treasure Chest",1324,1,"Manager#sch04_02::OnTreasureDied"; } + setcastledata "schg_cas04",4,0; + setcastledata "schg_cas04",5,0; end; OnTreasureDied: diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt index 41729f0d8..a55ad2226 100644 --- a/npc/guild2/schg_cas05.txt +++ b/npc/guild2/schg_cas05.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,9 @@ //= 1.2 Fixed double message in defense investing. [L0ne_W0lf] //= Corrected a minor typo in the guild steward. //= 1.3 Fixed a guardian spawning NPCs. [L0ne_W0lf] +//= 1.4 Fixed investment period not resetting. [L0ne_W0lf] +//= Made it so treasure won't spawn if castle is empty. +//= Treasure will now be killed before spawning. //============================================================ schg_cas05,1,1,0 script Manager#sch05_02 111,{ @@ -98,14 +101,13 @@ Onchange: end; OnClock0001: + if (!GetCastleData("schg_cas05",1)) end; + killmonster "schg_cas05","Manager#sch05_02::OnMyTreasureDied"; set .@Treasure,GetCastleData("schg_cas05",2)/5+4; if (.@Treasure) { monster "schg_cas05",388,388,"Treasure Chest",1942,1,"Manager#sch05_02::OnTreasureDied"; - if (.@Treasure < 2) end; monster "schg_cas05",388,389,"Treasure Chest",1324,1,"Manager#sch05_02::OnTreasureDied"; - if (.@Treasure < 3) end; monster "schg_cas05",388,390,"Treasure Chest",1942,1,"Manager#sch05_02::OnTreasureDied"; - if (.@Treasure < 4) end; monster "schg_cas05",387,390,"Treasure Chest",1324,1,"Manager#sch05_02::OnTreasureDied"; if (.@Treasure < 5) end; monster "schg_cas05",386,390,"Treasure Chest",1942,1,"Manager#sch05_02::OnTreasureDied"; @@ -148,6 +150,8 @@ OnClock0001: if (.@Treasure < 24) end; monster "schg_cas05",386,386,"Treasure Chest",1324,1,"Manager#sch05_02::OnTreasureDied"; } + setcastledata "schg_cas05",4,0; + setcastledata "schg_cas05",5,0; end; OnTreasureDied: diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt index f960ee284..cb5f26c74 100644 --- a/npc/merchants/milk_trader.txt +++ b/npc/merchants/milk_trader.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 1.2a Switched to Lupus's "loopless" technique.[kobra_k88] //= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.4 Implemented checkweight. [L0ne_W0lf] +//= 1.5 Fixed missed variable. (bugreport:1523) [L0ne_W0lf] //============================================================ prontera,73,140,0 script Milk Vendor 86,{ @@ -57,7 +58,7 @@ prontera,73,140,0 script Milk Vendor 86,{ mes "zeny to exchange all"; mes "these Empty Bottles for"; mes "Milk. You need to have"; - mes "at least " + gap + " zeny."; + mes "at least " + .@total_cost + " zeny."; close; } if ((maxweight-weight) < .@total_weight) { diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index 88ee28130..1578c9225 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf (Script), DZeroX (Timer) //===== Current Version: ===================================== -//= 3.8 +//= 3.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -74,6 +74,7 @@ //= to after finishing the quest. //= 3.7 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 3.8 Corrected some delitems. (bugreport:690) [Samuray22] +//= 3.9 Fixed a cutin not being erased. (bugreport:1539) [L0ne_W0lf] //============================================================ //============================================================================ // Kiel Hyre Quest/Robotic Lab Dungeon @@ -4299,7 +4300,9 @@ kh_mansion,22,28,4 script Kiel Hyre 903,{ if (KielHyreQuest < 46) { mes "[Kiel Hyre]"; mes "........."; - close; + close2; + cutin "",255; + end; } else if (KielHyreQuest == 46) { diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt index 30ab80723..9ab02151a 100644 --- a/npc/quests/skills/acolyte_skills.txt +++ b/npc/quests/skills/acolyte_skills.txt @@ -11,6 +11,7 @@ //= Quest for skills: Holy Light //===== Additional Comments: ================================= //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] +//= 1.6 Fixed a typo in job check. (Bugreport:1531) [L0ne_W0lf] //============================================================ prt_church,173,23,4 script Cleric#qsk_al 79,{ @@ -68,7 +69,7 @@ prt_church,173,23,4 script Cleric#qsk_al 79,{ } else { if (countitem(727) > 0 && countitem(991) > 0 && countitem(2608) > 0) { - if ((JobLevel > 29 && BaseJob == Job_Acolyte) || BaseJob == Job_MOnk || BaseJob == Job_Priest) { + if ((JobLevel > 29 && BaseJob == Job_Acolyte) || BaseJob == Job_Monk || BaseJob == Job_Priest) { mes "[Acolyte Klift]"; mes "Your faith has proven worthy"; mes "for you to gain the ' Holy Light ' skill."; diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt index 31bb06334..2c4752826 100644 --- a/npc/quests/skills/mage_skills.txt +++ b/npc/quests/skills/mage_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //= Quest for skills: Energy Coat //===== Additional Comments: ================================= //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] +//= 1.6 Fixed a typo in job check. (Bugreport:1531) [L0ne_W0lf] //============================================================ geffen_in,151,119,4 script Great Wizard#qsk_mg 64,{ @@ -93,7 +94,7 @@ geffen_in,151,119,4 script Great Wizard#qsk_mg 64,{ } else { if (countitem(746) > 2 && countitem(730) > 0 && countitem(935) > 4 && countitem(943) > 0) { - if ((JobLevel > 34 && BaseJOb == Job_Mage) || BaseJob == Job_Wizard || BaseJob == Job_Sage) { + if ((JobLevel > 34 && BaseJob == Job_Mage) || BaseJob == Job_Wizard || BaseJob == Job_Sage) { mes "[BLIZZARDRISS]"; mes "Okay, I have received your request."; mes "I will now awaken your hidden energies . ."; -- cgit v1.2.3-60-g2f50