From dcb944663cfdf8dc428ca864887c7b0b76cc3e9e Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Tue, 3 Mar 2009 05:41:17 +0000 Subject: * Applied the updated eco/def investment system to Rachel WoESE castles, Juno's next. * Corrected the conditions in the if block that I goofed up, in agit_template. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13560 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 ++ npc/guild/agit_template.txt | 83 +++++++++++++++++++++--------------------- npc/guild2/arug_cas01.txt | 87 +++++++++++++++++++++++++++++++-------------- npc/guild2/arug_cas02.txt | 86 ++++++++++++++++++++++++++++++-------------- npc/guild2/arug_cas03.txt | 86 ++++++++++++++++++++++++++++++-------------- npc/guild2/arug_cas04.txt | 86 ++++++++++++++++++++++++++++++-------------- npc/guild2/arug_cas05.txt | 87 +++++++++++++++++++++++++++++++-------------- 7 files changed, 346 insertions(+), 172 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 1eccd0522..981be65bc 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2009/03/03 + * Rev. 13560 Applied the updated eco/def investment system to Rachel WoESE castles, Juno's next. [L0ne_W0lf] + * Corrected the conditions in the if block that I goofed up, in agit_template. 2009/03/02 * Rev. 13559 Another round of bug fixes to various scripts. [L0ne_W0lf] - Added Satan Morroc spawn and corrected shadow spawn timers. (bugreport:2690) diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt index 83ce19292..9c1f5330f 100644 --- a/npc/guild/agit_template.txt +++ b/npc/guild/agit_template.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.6a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -45,6 +45,7 @@ //= Corrected cost for investing, thanks to Ai4rei. //= Second invest is now quadruple the value of the first //= Investing now happens at the turn of the day. +//= 1.6a Corrected conditions in the new investing blocks. [L0ne_W0lf] //============================================================ // AGIT Manager Template @@ -488,26 +489,26 @@ OnRecvCastle: close; case 2: set .@Economy,GetCastleData(strnpcinfo(2),2); - if (.@Economy > 6) { set .@eco_invest,5000; } - else if ((.@Economy <= 6) && (.@Economy >= 10)) { set .@eco_invest,10000; } - else if ((.@Economy <= 11) && (.@Economy >= 15)) { set .@eco_invest,20000; } - else if ((.@Economy <= 16) && (.@Economy >= 20)) { set .@eco_invest,35000; } - else if ((.@Economy <= 21) && (.@Economy >= 25)) { set .@eco_invest,55000; } - else if ((.@Economy <= 26) && (.@Economy >= 30)) { set .@eco_invest,80000; } - else if ((.@Economy <= 31) && (.@Economy >= 35)) { set .@eco_invest,110000; } - else if ((.@Economy <= 36) && (.@Economy >= 40)) { set .@eco_invest,145000; } - else if ((.@Economy <= 41) && (.@Economy >= 45)) { set .@eco_invest,185000; } - else if ((.@Economy <= 46) && (.@Economy >= 50)) { set .@eco_invest,230000; } - else if ((.@Economy <= 51) && (.@Economy >= 55)) { set .@eco_invest,280000; } - else if ((.@Economy <= 56) && (.@Economy >= 60)) { set .@eco_invest,335000; } - else if ((.@Economy <= 61) && (.@Economy >= 65)) { set .@eco_invest,395000; } - else if ((.@Economy <= 66) && (.@Economy >= 70)) { set .@eco_invest,460000; } - else if ((.@Economy <= 71) && (.@Economy >= 75)) { set .@eco_invest,530000; } - else if ((.@Economy <= 76) && (.@Economy >= 80)) { set .@eco_invest,605000; } - else if ((.@Economy <= 81) && (.@Economy >= 85)) { set .@eco_invest,685000; } - else if ((.@Economy <= 86) && (.@Economy >= 90)) { set .@eco_invest,770000; } - else if ((.@Economy <= 91) && (.@Economy >= 95)) { set .@eco_invest,860000; } - else if ((.@Economy <= 96) && (.@Economy >= 100)) { set .@eco_invest,955000; } + if (.@Economy < 6) { set .@eco_invest,5000; } + else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } + else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } + else if ((.@Economy >= 16) && (.@Economy <= 20)) { set .@eco_invest,35000; } + else if ((.@Economy >= 21) && (.@Economy <= 25)) { set .@eco_invest,55000; } + else if ((.@Economy >= 26) && (.@Economy <= 30)) { set .@eco_invest,80000; } + else if ((.@Economy >= 31) && (.@Economy <= 35)) { set .@eco_invest,110000; } + else if ((.@Economy >= 36) && (.@Economy <= 40)) { set .@eco_invest,145000; } + else if ((.@Economy >= 41) && (.@Economy <= 45)) { set .@eco_invest,185000; } + else if ((.@Economy >= 46) && (.@Economy <= 50)) { set .@eco_invest,230000; } + else if ((.@Economy >= 51) && (.@Economy <= 55)) { set .@eco_invest,280000; } + else if ((.@Economy >= 56) && (.@Economy <= 60)) { set .@eco_invest,335000; } + else if ((.@Economy >= 61) && (.@Economy <= 65)) { set .@eco_invest,395000; } + else if ((.@Economy >= 66) && (.@Economy <= 70)) { set .@eco_invest,460000; } + else if ((.@Economy >= 71) && (.@Economy <= 75)) { set .@eco_invest,530000; } + else if ((.@Economy >= 76) && (.@Economy <= 80)) { set .@eco_invest,605000; } + else if ((.@Economy >= 81) && (.@Economy <= 85)) { set .@eco_invest,685000; } + else if ((.@Economy >= 86) && (.@Economy <= 90)) { set .@eco_invest,770000; } + else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; } + else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; } //Quadruple the cost of investing if you've already invested once. if (GetCastleData(strnpcinfo(2),4)) { set .@eco_invest,.@eco_invest*4; @@ -551,26 +552,26 @@ OnRecvCastle: } case 3: set .@Defence,GetCastleData(strnpcinfo(2),3); - if (.@Defence > 6) { set .@def_invest,10000; } - else if ((.@Defence <= 6) && (.@Defence >= 10)) { set .@def_invest,20000; } - else if ((.@Defence <= 11) && (.@Defence >= 15)) { set .@def_invest,40000; } - else if ((.@Defence <= 16) && (.@Defence >= 20)) { set .@def_invest,70000; } - else if ((.@Defence <= 21) && (.@Defence >= 25)) { set .@def_invest,110000; } - else if ((.@Defence <= 26) && (.@Defence >= 30)) { set .@def_invest,160000; } - else if ((.@Defence <= 31) && (.@Defence >= 35)) { set .@def_invest,220000; } - else if ((.@Defence <= 36) && (.@Defence >= 40)) { set .@def_invest,290000; } - else if ((.@Defence <= 41) && (.@Defence >= 45)) { set .@def_invest,370000; } - else if ((.@Defence <= 46) && (.@Defence >= 50)) { set .@def_invest,460000; } - else if ((.@Defence <= 51) && (.@Defence >= 55)) { set .@def_invest,560000; } - else if ((.@Defence <= 56) && (.@Defence >= 60)) { set .@def_invest,670000; } - else if ((.@Defence <= 61) && (.@Defence >= 65)) { set .@def_invest,790000; } - else if ((.@Defence <= 66) && (.@Defence >= 70)) { set .@def_invest,920000; } - else if ((.@Defence <= 71) && (.@Defence >= 75)) { set .@def_invest,1060000; } - else if ((.@Defence <= 76) && (.@Defence >= 80)) { set .@def_invest,1210000; } - else if ((.@Defence <= 81) && (.@Defence >= 85)) { set .@def_invest,1370000; } - else if ((.@Defence <= 86) && (.@Defence >= 90)) { set .@def_invest,1540000; } - else if ((.@Defence <= 91) && (.@Defence >= 95)) { set .@def_invest,1720000; } - else if ((.@Defence <= 96) && (.@Defence >= 100)) { set .@def_invest,1910000; } + if (.@Defence < 6) { set .@def_invest,10000; } + else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; } + else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; } + else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; } + else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; } + else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; } + else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; } + else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; } + else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; } + else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; } + else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; } + else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; } + else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; } + else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; } + else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; } + else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; } + else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; } + else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; } + else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; } + else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; } //Quadruple the cost of investing if you've already invested once. if (GetCastleData(strnpcinfo(2),5)) { set .@def_invest,.@def_invest*4; diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index 94f9b4461..872ddc93a 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -1,9 +1,10 @@ //===== eAthena Script ======================================= +//===== eAthena Script ======================================= //= War of Emperium Second Edition //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +21,7 @@ //= 1.5 Fixed error with control devices. [L0ne_W0lf] //= 1.6 Implemented new Wall System. [Zephyrus] //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf] +//= 1.8 Applied updated eco/def systems. [L0ne_W0lf] //============================================================ arug_cas01,1,1,0 script Manager#aru01_02 111,{ @@ -108,9 +110,6 @@ OnClock0001: if (!GetCastleData("arug_cas01",1)) end; killmonster "arug_cas01","Manager#aru01_02::OnTreasureDied"; - setcastledata "arug_cas01",4,0; - setcastledata "arug_cas01",5,0; - set .@Treasure,GetCastleData("arug_cas01",2)/5+4; if (.@Treasure) { monster "arug_cas01",251,369,"Treasure Chest",1943,1,"Manager#aru01_02::OnTreasureDied"; @@ -158,6 +157,16 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas01",258,364,"Treasure Chest",1324,1,"Manager#aru01_02::OnTreasureDied"; } + if (GetCastleData("arug_cas01",4)) { + set .@Economy,GetCastleData("arug_cas01",2); + SetCastleData "arug_cas01",2,.@Economy + GetCastleData("arug_cas01",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); + setcastledata "arug_cas01",4,0; + } + if (GetCastleData("arug_cas01",5)) { + set .@Defence,GetCastleData("arug_cas01",3); + SetCastleData "arug_cas01",3,.@Defence + GetCastleData("arug_cas01",5); + setcastledata "arug_cas01",5,0; + } end; OnTreasureDied: @@ -2299,16 +2308,30 @@ arug_cas01,92,380,3 script Steward#aru01 55,{ close; case 2: set .@Economy,GetCastleData("arug_cas01",2); - if(.@Economy < 8) set .@eco_invest,10000; - if(.@Economy >= 8) set .@eco_invest,20000; - if(.@Economy >= 16) set .@eco_invest,40000; - if(.@Economy >= 25) set .@eco_invest,80000; - if(.@Economy >= 34) set .@eco_invest,160000; - if(.@Economy >= 44) set .@eco_invest,320000; - if(.@Economy >= 54) set .@eco_invest,640000; - if(.@Economy >= 65) set .@eco_invest,1280000; - if(.@Economy >= 76) set .@eco_invest,2560000; - if(.@Economy >= 88) set .@eco_invest,5120000; + if (.@Economy < 6) { set .@eco_invest,5000; } + else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } + else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } + else if ((.@Economy >= 16) && (.@Economy <= 20)) { set .@eco_invest,35000; } + else if ((.@Economy >= 21) && (.@Economy <= 25)) { set .@eco_invest,55000; } + else if ((.@Economy >= 26) && (.@Economy <= 30)) { set .@eco_invest,80000; } + else if ((.@Economy >= 31) && (.@Economy <= 35)) { set .@eco_invest,110000; } + else if ((.@Economy >= 36) && (.@Economy <= 40)) { set .@eco_invest,145000; } + else if ((.@Economy >= 41) && (.@Economy <= 45)) { set .@eco_invest,185000; } + else if ((.@Economy >= 46) && (.@Economy <= 50)) { set .@eco_invest,230000; } + else if ((.@Economy >= 51) && (.@Economy <= 55)) { set .@eco_invest,280000; } + else if ((.@Economy >= 56) && (.@Economy <= 60)) { set .@eco_invest,335000; } + else if ((.@Economy >= 61) && (.@Economy <= 65)) { set .@eco_invest,395000; } + else if ((.@Economy >= 66) && (.@Economy <= 70)) { set .@eco_invest,460000; } + else if ((.@Economy >= 71) && (.@Economy <= 75)) { set .@eco_invest,530000; } + else if ((.@Economy >= 76) && (.@Economy <= 80)) { set .@eco_invest,605000; } + else if ((.@Economy >= 81) && (.@Economy <= 85)) { set .@eco_invest,685000; } + else if ((.@Economy >= 86) && (.@Economy <= 90)) { set .@eco_invest,770000; } + else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; } + else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas01",4)) { + set .@eco_invest,.@eco_invest*4; + } mes "[ Steward ]"; mes "Raising the stronghold's"; mes "commercial growth will"; @@ -2370,7 +2393,6 @@ arug_cas01,92,380,3 script Steward#aru01 55,{ } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas01",4,GetCastleData("arug_cas01",4)+1; - SetCastleData "arug_cas01",2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. We can expect"; @@ -2384,16 +2406,30 @@ arug_cas01,92,380,3 script Steward#aru01 55,{ } case 3: set .@Defence,GetCastleData("arug_cas01",3); - if(.@Defence < 8) set .@def_invest,20000; - if(.@Defence >= 8) set .@def_invest,40000; - if(.@Defence >= 16) set .@def_invest,80000; - if(.@Defence >= 25) set .@def_invest,160000; - if(.@Defence >= 34) set .@def_invest,320000; - if(.@Defence >= 44) set .@def_invest,640000; - if(.@Defence >= 54) set .@def_invest,1280000; - if(.@Defence >= 65) set .@def_invest,2560000; - if(.@Defence >= 76) set .@def_invest,5120000; - if(.@Defence >= 88) set .@def_invest,10240000; + if (.@Defence < 6) { set .@def_invest,10000; } + else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; } + else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; } + else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; } + else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; } + else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; } + else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; } + else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; } + else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; } + else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; } + else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; } + else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; } + else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; } + else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; } + else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; } + else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; } + else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; } + else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; } + else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; } + else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas01",5)) { + set .@def_invest,.@def_invest*4; + } mes "[ Steward ]"; mes "Investing in our stronghold's"; mes "defense will enhance the"; @@ -2449,7 +2485,6 @@ arug_cas01,92,380,3 script Steward#aru01 55,{ } set zeny,zeny-.@def_invest; SetCastleData "arug_cas01",5,GetCastleData("arug_cas01",5)+1; - SetCastleData "arug_cas01",3,.@Defence+1; mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. Increasing"; diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index 4cc3bea60..71ee28fc4 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.9 +//= 2.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -23,6 +23,7 @@ //= 1.8 Corrected copy/paste error. [L0ne_W0lf] //= 1.9 Implemented new Wall System. [Zephyrus] //= 2.0 Replaced effect numerics with constants. [L0ne_W0lf] +//= 2.1 Applied updated eco/def systems. [L0ne_W0lf] //============================================================ arug_cas02,1,1,0 script Manager#aru02_02 111,{ @@ -111,9 +112,6 @@ OnClock0001: if (!GetCastleData("arug_cas02",1)) end; killmonster "arug_cas02","Manager#aru02_02::OnTreasureDied"; - setcastledata "arug_cas02",4,0; - setcastledata "arug_cas02",5,0; - set .@Treasure,GetCastleData("arug_cas02",2)/5+4; if (.@Treasure) { monster "arug_cas02",382,231,"Treasure Chest",1944,1,"Manager#aru02_02::OnTreasureDied"; @@ -161,6 +159,16 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas02",389,224,"Treasure Chest",1324,1,"Manager#aru02_02::OnTreasureDied"; } + if (GetCastleData("arug_cas02",4)) { + set .@Economy,GetCastleData("arug_cas02",2); + SetCastleData "arug_cas02",2,.@Economy + GetCastleData("arug_cas02",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); + setcastledata "arug_cas02",4,0; + } + if (GetCastleData("arug_cas02",5)) { + set .@Defence,GetCastleData("arug_cas02",3); + SetCastleData "arug_cas02",3,.@Defence + GetCastleData("arug_cas02",5); + setcastledata "arug_cas02",5,0; + } end; OnTreasureDied: @@ -2260,16 +2268,30 @@ arug_cas02,303,341,3 script Steward#aru02 55,{ close; case 2: set .@Economy,GetCastleData("arug_cas02",2); - if(.@Economy < 8) set .@eco_invest,10000; - if(.@Economy >= 8) set .@eco_invest,20000; - if(.@Economy >= 16) set .@eco_invest,40000; - if(.@Economy >= 25) set .@eco_invest,80000; - if(.@Economy >= 34) set .@eco_invest,160000; - if(.@Economy >= 44) set .@eco_invest,320000; - if(.@Economy >= 54) set .@eco_invest,640000; - if(.@Economy >= 65) set .@eco_invest,1280000; - if(.@Economy >= 76) set .@eco_invest,2560000; - if(.@Economy >= 88) set .@eco_invest,5120000; + if (.@Economy < 6) { set .@eco_invest,5000; } + else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } + else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } + else if ((.@Economy >= 16) && (.@Economy <= 20)) { set .@eco_invest,35000; } + else if ((.@Economy >= 21) && (.@Economy <= 25)) { set .@eco_invest,55000; } + else if ((.@Economy >= 26) && (.@Economy <= 30)) { set .@eco_invest,80000; } + else if ((.@Economy >= 31) && (.@Economy <= 35)) { set .@eco_invest,110000; } + else if ((.@Economy >= 36) && (.@Economy <= 40)) { set .@eco_invest,145000; } + else if ((.@Economy >= 41) && (.@Economy <= 45)) { set .@eco_invest,185000; } + else if ((.@Economy >= 46) && (.@Economy <= 50)) { set .@eco_invest,230000; } + else if ((.@Economy >= 51) && (.@Economy <= 55)) { set .@eco_invest,280000; } + else if ((.@Economy >= 56) && (.@Economy <= 60)) { set .@eco_invest,335000; } + else if ((.@Economy >= 61) && (.@Economy <= 65)) { set .@eco_invest,395000; } + else if ((.@Economy >= 66) && (.@Economy <= 70)) { set .@eco_invest,460000; } + else if ((.@Economy >= 71) && (.@Economy <= 75)) { set .@eco_invest,530000; } + else if ((.@Economy >= 76) && (.@Economy <= 80)) { set .@eco_invest,605000; } + else if ((.@Economy >= 81) && (.@Economy <= 85)) { set .@eco_invest,685000; } + else if ((.@Economy >= 86) && (.@Economy <= 90)) { set .@eco_invest,770000; } + else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; } + else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas02",4)) { + set .@eco_invest,.@eco_invest*4; + } mes "[ Steward ]"; mes "Raising the stronghold's"; mes "commercial growth will"; @@ -2331,7 +2353,6 @@ arug_cas02,303,341,3 script Steward#aru02 55,{ } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas02",4,GetCastleData("arug_cas02",4)+1; - SetCastleData "arug_cas02",2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. We can expect"; @@ -2345,16 +2366,30 @@ arug_cas02,303,341,3 script Steward#aru02 55,{ } case 3: set .@Defence,GetCastleData("arug_cas02",3); - if(.@Defence < 8) set .@def_invest,20000; - if(.@Defence >= 8) set .@def_invest,40000; - if(.@Defence >= 16) set .@def_invest,80000; - if(.@Defence >= 25) set .@def_invest,160000; - if(.@Defence >= 34) set .@def_invest,320000; - if(.@Defence >= 44) set .@def_invest,640000; - if(.@Defence >= 54) set .@def_invest,1280000; - if(.@Defence >= 65) set .@def_invest,2560000; - if(.@Defence >= 76) set .@def_invest,5120000; - if(.@Defence >= 88) set .@def_invest,10240000; + if (.@Defence < 6) { set .@def_invest,10000; } + else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; } + else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; } + else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; } + else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; } + else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; } + else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; } + else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; } + else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; } + else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; } + else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; } + else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; } + else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; } + else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; } + else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; } + else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; } + else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; } + else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; } + else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; } + else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas02",5)) { + set .@def_invest,.@def_invest*4; + } mes "[ Steward ]"; mes "Investing in our stronghold's"; mes "defense will enhance the"; @@ -2410,7 +2445,6 @@ arug_cas02,303,341,3 script Steward#aru02 55,{ } set zeny,zeny-.@def_invest; SetCastleData "arug_cas02",5,GetCastleData("arug_cas02",5)+1; - SetCastleData "arug_cas02",3,.@Defence+1; mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. Increasing"; diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index 2d7b4c7fb..fd94cf9eb 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -22,6 +22,7 @@ //= 1.6 Corrected copy/paste error. [L0ne_W0lf] //= 1.7 Implemented new Wall System. [Zephyrus] //= 1.8 Replaced effect numerics with constants. [L0ne_W0lf] +//= 1.9 Applied updated eco/def systems. [L0ne_W0lf] //============================================================ arug_cas03,1,1,0 script Manager#aru03_02 111,{ @@ -110,9 +111,6 @@ OnClock0001: if (!GetCastleData("arug_cas03",1)) end; killmonster "arug_cas03","Manager#aru03_02::OnTreasureDied"; - setcastledata "arug_cas03",4,0; - setcastledata "arug_cas03",5,0; - set .@Treasure,GetCastleData("arug_cas03",2)/5+4; if (.@Treasure) { monster "arug_cas03",291,276,"Treasure Chest",1945,1,"Manager#aru03_02::OnTreasureDied"; @@ -160,6 +158,16 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas03",298,269,"Treasure Chest",1324,1,"Manager#aru03_02::OnTreasureDied"; } + if (GetCastleData("arug_cas03",4)) { + set .@Economy,GetCastleData("arug_cas03",2); + SetCastleData "arug_cas03",2,.@Economy + GetCastleData("arug_cas03",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); + setcastledata "arug_cas03",4,0; + } + if (GetCastleData("arug_cas03",5)) { + set .@Defence,GetCastleData("arug_cas03",3); + SetCastleData "arug_cas03",3,.@Defence + GetCastleData("arug_cas03",5); + setcastledata "arug_cas03",5,0; + } end; OnTreasureDied: @@ -2305,16 +2313,30 @@ arug_cas03,328,98,3 script Steward#aru03 55,{ close; case 2: set .@Economy,GetCastleData("arug_cas03",2); - if(.@Economy < 8) set .@eco_invest,10000; - if(.@Economy >= 8) set .@eco_invest,20000; - if(.@Economy >= 16) set .@eco_invest,40000; - if(.@Economy >= 25) set .@eco_invest,80000; - if(.@Economy >= 34) set .@eco_invest,160000; - if(.@Economy >= 44) set .@eco_invest,320000; - if(.@Economy >= 54) set .@eco_invest,640000; - if(.@Economy >= 65) set .@eco_invest,1280000; - if(.@Economy >= 76) set .@eco_invest,2560000; - if(.@Economy >= 88) set .@eco_invest,5120000; + if (.@Economy < 6) { set .@eco_invest,5000; } + else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } + else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } + else if ((.@Economy >= 16) && (.@Economy <= 20)) { set .@eco_invest,35000; } + else if ((.@Economy >= 21) && (.@Economy <= 25)) { set .@eco_invest,55000; } + else if ((.@Economy >= 26) && (.@Economy <= 30)) { set .@eco_invest,80000; } + else if ((.@Economy >= 31) && (.@Economy <= 35)) { set .@eco_invest,110000; } + else if ((.@Economy >= 36) && (.@Economy <= 40)) { set .@eco_invest,145000; } + else if ((.@Economy >= 41) && (.@Economy <= 45)) { set .@eco_invest,185000; } + else if ((.@Economy >= 46) && (.@Economy <= 50)) { set .@eco_invest,230000; } + else if ((.@Economy >= 51) && (.@Economy <= 55)) { set .@eco_invest,280000; } + else if ((.@Economy >= 56) && (.@Economy <= 60)) { set .@eco_invest,335000; } + else if ((.@Economy >= 61) && (.@Economy <= 65)) { set .@eco_invest,395000; } + else if ((.@Economy >= 66) && (.@Economy <= 70)) { set .@eco_invest,460000; } + else if ((.@Economy >= 71) && (.@Economy <= 75)) { set .@eco_invest,530000; } + else if ((.@Economy >= 76) && (.@Economy <= 80)) { set .@eco_invest,605000; } + else if ((.@Economy >= 81) && (.@Economy <= 85)) { set .@eco_invest,685000; } + else if ((.@Economy >= 86) && (.@Economy <= 90)) { set .@eco_invest,770000; } + else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; } + else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas03",4)) { + set .@eco_invest,.@eco_invest*4; + } mes "[ Steward ]"; mes "Raising the stronghold's"; mes "commercial growth will"; @@ -2376,7 +2398,6 @@ arug_cas03,328,98,3 script Steward#aru03 55,{ } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas03",4,GetCastleData("arug_cas03",4)+1; - SetCastleData "arug_cas03",2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. We can expect"; @@ -2390,16 +2411,30 @@ arug_cas03,328,98,3 script Steward#aru03 55,{ } case 3: set .@Defence,GetCastleData("arug_cas03",3); - if(.@Defence < 8) set .@def_invest,20000; - if(.@Defence >= 8) set .@def_invest,40000; - if(.@Defence >= 16) set .@def_invest,80000; - if(.@Defence >= 25) set .@def_invest,160000; - if(.@Defence >= 34) set .@def_invest,320000; - if(.@Defence >= 44) set .@def_invest,640000; - if(.@Defence >= 54) set .@def_invest,1280000; - if(.@Defence >= 65) set .@def_invest,2560000; - if(.@Defence >= 76) set .@def_invest,5120000; - if(.@Defence >= 88) set .@def_invest,10240000; + if (.@Defence < 6) { set .@def_invest,10000; } + else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; } + else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; } + else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; } + else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; } + else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; } + else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; } + else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; } + else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; } + else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; } + else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; } + else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; } + else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; } + else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; } + else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; } + else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; } + else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; } + else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; } + else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; } + else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas03",5)) { + set .@def_invest,.@def_invest*4; + } mes "[ Steward ]"; mes "Investing in our stronghold's"; mes "defense will enhance the"; @@ -2455,7 +2490,6 @@ arug_cas03,328,98,3 script Steward#aru03 55,{ } set zeny,zeny-.@def_invest; SetCastleData "arug_cas03",5,GetCastleData("arug_cas03",5)+1; - SetCastleData "arug_cas03",3,.@Defence+1; mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. Increasing"; diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index 866f46f3c..c6bc29252 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= 1.6 Corrected copy/paste error. [L0ne_W0lf] //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.8 Fixed wrong event call for stones. (bugreport:2386) [L0ne_W0lf] +//= 1.9 Applied updated eco/def systems. [L0ne_W0lf] //============================================================ arug_cas04,1,1,0 script Manager#aru04_02 111,{ @@ -109,9 +110,6 @@ OnClock0001: if (!GetCastleData("arug_cas04",1)) end; killmonster "arug_cas04","Manager#aru04_02::OnTreasureDied"; - setcastledata "arug_cas04",4,0; - setcastledata "arug_cas04",5,0; - set .@Treasure,GetCastleData("arug_cas04",2)/5+4; if (.@Treasure) { monster "arug_cas04",291,276,"Treasure Chest",1946,1,"Manager#aru04_02::OnTreasureDied"; @@ -159,6 +157,16 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas04",298,269,"Treasure Chest",1324,1,"Manager#aru04_02::OnTreasureDied"; } + if (GetCastleData("arug_cas04",4)) { + set .@Economy,GetCastleData("arug_cas04",2); + SetCastleData "arug_cas04",2,.@Economy + GetCastleData("arug_cas04",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); + setcastledata "arug_cas04",4,0; + } + if (GetCastleData("arug_cas04",5)) { + set .@Defence,GetCastleData("arug_cas04",3); + SetCastleData "arug_cas04",3,.@Defence + GetCastleData("arug_cas04",5); + setcastledata "arug_cas04",5,0; + } end; OnTreasureDied: @@ -2307,16 +2315,30 @@ arug_cas04,328,98,3 script Steward#aru04 55,{ close; case 2: set .@Economy,GetCastleData("arug_cas04",2); - if(.@Economy < 8) set .@eco_invest,10000; - if(.@Economy >= 8) set .@eco_invest,20000; - if(.@Economy >= 16) set .@eco_invest,40000; - if(.@Economy >= 25) set .@eco_invest,80000; - if(.@Economy >= 34) set .@eco_invest,160000; - if(.@Economy >= 44) set .@eco_invest,320000; - if(.@Economy >= 54) set .@eco_invest,640000; - if(.@Economy >= 65) set .@eco_invest,1280000; - if(.@Economy >= 76) set .@eco_invest,2560000; - if(.@Economy >= 88) set .@eco_invest,5120000; + if (.@Economy < 6) { set .@eco_invest,5000; } + else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } + else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } + else if ((.@Economy >= 16) && (.@Economy <= 20)) { set .@eco_invest,35000; } + else if ((.@Economy >= 21) && (.@Economy <= 25)) { set .@eco_invest,55000; } + else if ((.@Economy >= 26) && (.@Economy <= 30)) { set .@eco_invest,80000; } + else if ((.@Economy >= 31) && (.@Economy <= 35)) { set .@eco_invest,110000; } + else if ((.@Economy >= 36) && (.@Economy <= 40)) { set .@eco_invest,145000; } + else if ((.@Economy >= 41) && (.@Economy <= 45)) { set .@eco_invest,185000; } + else if ((.@Economy >= 46) && (.@Economy <= 50)) { set .@eco_invest,230000; } + else if ((.@Economy >= 51) && (.@Economy <= 55)) { set .@eco_invest,280000; } + else if ((.@Economy >= 56) && (.@Economy <= 60)) { set .@eco_invest,335000; } + else if ((.@Economy >= 61) && (.@Economy <= 65)) { set .@eco_invest,395000; } + else if ((.@Economy >= 66) && (.@Economy <= 70)) { set .@eco_invest,460000; } + else if ((.@Economy >= 71) && (.@Economy <= 75)) { set .@eco_invest,530000; } + else if ((.@Economy >= 76) && (.@Economy <= 80)) { set .@eco_invest,605000; } + else if ((.@Economy >= 81) && (.@Economy <= 85)) { set .@eco_invest,685000; } + else if ((.@Economy >= 86) && (.@Economy <= 90)) { set .@eco_invest,770000; } + else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; } + else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas04",4)) { + set .@eco_invest,.@eco_invest*4; + } mes "[ Steward ]"; mes "Raising the stronghold's"; mes "commercial growth will"; @@ -2378,7 +2400,6 @@ arug_cas04,328,98,3 script Steward#aru04 55,{ } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas04",4,GetCastleData("arug_cas04",4)+1; - SetCastleData "arug_cas04",2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. We can expect"; @@ -2392,16 +2413,30 @@ arug_cas04,328,98,3 script Steward#aru04 55,{ } case 3: set .@Defence,GetCastleData("arug_cas04",3); - if(.@Defence < 8) set .@def_invest,20000; - if(.@Defence >= 8) set .@def_invest,40000; - if(.@Defence >= 16) set .@def_invest,80000; - if(.@Defence >= 25) set .@def_invest,160000; - if(.@Defence >= 34) set .@def_invest,320000; - if(.@Defence >= 44) set .@def_invest,640000; - if(.@Defence >= 54) set .@def_invest,1280000; - if(.@Defence >= 65) set .@def_invest,2560000; - if(.@Defence >= 76) set .@def_invest,5120000; - if(.@Defence >= 88) set .@def_invest,10240000; + if (.@Defence < 6) { set .@def_invest,10000; } + else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; } + else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; } + else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; } + else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; } + else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; } + else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; } + else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; } + else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; } + else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; } + else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; } + else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; } + else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; } + else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; } + else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; } + else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; } + else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; } + else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; } + else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; } + else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas04",5)) { + set .@def_invest,.@def_invest*4; + } mes "[ Steward ]"; mes "Investing in our stronghold's"; mes "defense will enhance the"; @@ -2457,7 +2492,6 @@ arug_cas04,328,98,3 script Steward#aru04 55,{ } set zeny,zeny-.@def_invest; SetCastleData "arug_cas04",5,GetCastleData("arug_cas04",5)+1; - SetCastleData "arug_cas04",3,.@Defence+1; mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. Increasing"; diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index e6f2bbbc8..fffda5ff2 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= 1.6 Corrected copy/paste error. [L0ne_W0lf] //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.8 Fixed wrong event call for stones. (bugreport:2386) [L0ne_W0lf] +//= 1.9 Applied updated eco/def systems. [L0ne_W0lf] //============================================================ arug_cas05,1,1,0 script Manager#aru05_02 111,{ @@ -108,10 +109,6 @@ Onchange: OnClock0001: if (!GetCastleData("arug_cas05",1)) end; killmonster "arug_cas05","Manager#aru05_02::OnTreasureDied"; - - setcastledata "arug_cas05",4,0; - setcastledata "arug_cas05",5,0; - set .@Treasure,GetCastleData("arug_cas05",2)/5+4; if (.@Treasure) { monster "arug_cas05",291,276,"Treasure Chest",1945,1,"Manager#aru05_02::OnTreasureDied"; @@ -159,6 +156,16 @@ OnClock0001: if (.@Treasure < 24) end; monster "arug_cas05",298,269,"Treasure Chest",1324,1,"Manager#aru05_02::OnTreasureDied"; } + if (GetCastleData("arug_cas05",4)) { + set .@Economy,GetCastleData("arug_cas05",2); + SetCastleData "arug_cas05",2,.@Economy + GetCastleData("arug_cas05",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); + setcastledata "arug_cas05",4,0; + } + if (GetCastleData("arug_cas05",5)) { + set .@Defence,GetCastleData("arug_cas05",3); + SetCastleData "arug_cas05",3,.@Defence + GetCastleData("arug_cas05",5); + setcastledata "arug_cas05",5,0; + } end; OnTreasureDied: @@ -2307,16 +2314,30 @@ arug_cas05,328,98,3 script Steward#aru05 55,{ close; case 2: set .@Economy,GetCastleData("arug_cas05",2); - if(.@Economy < 8) set .@eco_invest,10000; - if(.@Economy >= 8) set .@eco_invest,20000; - if(.@Economy >= 16) set .@eco_invest,40000; - if(.@Economy >= 25) set .@eco_invest,80000; - if(.@Economy >= 34) set .@eco_invest,160000; - if(.@Economy >= 44) set .@eco_invest,320000; - if(.@Economy >= 54) set .@eco_invest,640000; - if(.@Economy >= 65) set .@eco_invest,1280000; - if(.@Economy >= 76) set .@eco_invest,2560000; - if(.@Economy >= 88) set .@eco_invest,5120000; + if (.@Economy < 6) { set .@eco_invest,5000; } + else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } + else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } + else if ((.@Economy >= 16) && (.@Economy <= 20)) { set .@eco_invest,35000; } + else if ((.@Economy >= 21) && (.@Economy <= 25)) { set .@eco_invest,55000; } + else if ((.@Economy >= 26) && (.@Economy <= 30)) { set .@eco_invest,80000; } + else if ((.@Economy >= 31) && (.@Economy <= 35)) { set .@eco_invest,110000; } + else if ((.@Economy >= 36) && (.@Economy <= 40)) { set .@eco_invest,145000; } + else if ((.@Economy >= 41) && (.@Economy <= 45)) { set .@eco_invest,185000; } + else if ((.@Economy >= 46) && (.@Economy <= 50)) { set .@eco_invest,230000; } + else if ((.@Economy >= 51) && (.@Economy <= 55)) { set .@eco_invest,280000; } + else if ((.@Economy >= 56) && (.@Economy <= 60)) { set .@eco_invest,335000; } + else if ((.@Economy >= 61) && (.@Economy <= 65)) { set .@eco_invest,395000; } + else if ((.@Economy >= 66) && (.@Economy <= 70)) { set .@eco_invest,460000; } + else if ((.@Economy >= 71) && (.@Economy <= 75)) { set .@eco_invest,530000; } + else if ((.@Economy >= 76) && (.@Economy <= 80)) { set .@eco_invest,605000; } + else if ((.@Economy >= 81) && (.@Economy <= 85)) { set .@eco_invest,685000; } + else if ((.@Economy >= 86) && (.@Economy <= 90)) { set .@eco_invest,770000; } + else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; } + else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas05",4)) { + set .@eco_invest,.@eco_invest*4; + } mes "[ Steward ]"; mes "Raising the stronghold's"; mes "commercial growth will"; @@ -2378,7 +2399,6 @@ arug_cas05,328,98,3 script Steward#aru05 55,{ } set zeny,zeny-.@eco_invest; SetCastleData "arug_cas05",4,GetCastleData("arug_cas05",4)+1; - SetCastleData "arug_cas05",2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. We can expect"; @@ -2392,16 +2412,30 @@ arug_cas05,328,98,3 script Steward#aru05 55,{ } case 3: set .@Defence,GetCastleData("arug_cas05",3); - if(.@Defence < 8) set .@def_invest,20000; - if(.@Defence >= 8) set .@def_invest,40000; - if(.@Defence >= 16) set .@def_invest,80000; - if(.@Defence >= 25) set .@def_invest,160000; - if(.@Defence >= 34) set .@def_invest,320000; - if(.@Defence >= 44) set .@def_invest,640000; - if(.@Defence >= 54) set .@def_invest,1280000; - if(.@Defence >= 65) set .@def_invest,2560000; - if(.@Defence >= 76) set .@def_invest,5120000; - if(.@Defence >= 88) set .@def_invest,10240000; + if (.@Defence < 6) { set .@def_invest,10000; } + else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; } + else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; } + else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; } + else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; } + else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; } + else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; } + else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; } + else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; } + else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; } + else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; } + else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; } + else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; } + else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; } + else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; } + else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; } + else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; } + else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; } + else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; } + else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; } + //Quadruple the cost of investing if you've already invested once. + if (GetCastleData("arug_cas05",5)) { + set .@def_invest,.@def_invest*4; + } mes "[ Steward ]"; mes "Investing in our stronghold's"; mes "defense will enhance the"; @@ -2457,7 +2491,6 @@ arug_cas05,328,98,3 script Steward#aru05 55,{ } set zeny,zeny-.@def_invest; SetCastleData "arug_cas05",5,GetCastleData("arug_cas05",5)+1; - SetCastleData "arug_cas05",3,.@Defence+1; mes "[ Steward ]"; mes "A wise use of the guild's"; mes "funds, Master. Increasing"; -- cgit v1.2.3-60-g2f50