diff options
Diffstat (limited to 'npc/guild2')
-rw-r--r-- | npc/guild2/arug_cas01.txt | 12 | ||||
-rw-r--r-- | npc/guild2/arug_cas02.txt | 12 | ||||
-rw-r--r-- | npc/guild2/arug_cas03.txt | 13 | ||||
-rw-r--r-- | npc/guild2/arug_cas04.txt | 12 | ||||
-rw-r--r-- | npc/guild2/arug_cas05.txt | 12 | ||||
-rw-r--r-- | npc/guild2/schg_cas01.txt | 12 | ||||
-rw-r--r-- | npc/guild2/schg_cas02.txt | 12 | ||||
-rw-r--r-- | npc/guild2/schg_cas03.txt | 16 | ||||
-rw-r--r-- | npc/guild2/schg_cas04.txt | 12 | ||||
-rw-r--r-- | npc/guild2/schg_cas05.txt | 12 |
10 files changed, 84 insertions, 41 deletions
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: |