diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-03-04 18:28:22 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-03-04 18:28:22 +0000 |
| commit | 647998c0b4bda1600c59323a4370be252701bc15 (patch) | |
| tree | aa06d30a05d8f862f5b2b4bc061ee91e4896be46 /npc/guild2/schg_cas05.txt | |
| parent | 134bf364c8deffa192fb77a323b92b708a2e2276 (diff) | |
| download | hercules-647998c0b4bda1600c59323a4370be252701bc15.tar.gz hercules-647998c0b4bda1600c59323a4370be252701bc15.tar.bz2 hercules-647998c0b4bda1600c59323a4370be252701bc15.tar.xz hercules-647998c0b4bda1600c59323a4370be252701bc15.zip | |
Follow up to r13559, r13560 and r13561. Moved some stuff around in the WoESE agits, and corrected a few mistakes I made.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13566 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/guild2/schg_cas05.txt')
| -rw-r--r-- | npc/guild2/schg_cas05.txt | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt index 6aa646f8b..c5357a2f0 100644 --- a/npc/guild2/schg_cas05.txt +++ b/npc/guild2/schg_cas05.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -19,6 +19,8 @@ //= Treasure will now be killed before spawning. //= 1.5 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.6 Applied updated eco/def systems. [L0ne_W0lf] +//= 1.7 Fixed eco/def not actually incrementing. [L0ne_W0lf] +//= Can no longer gain eco/def higher than 100. //============================================================ schg_cas05,1,1,0 script Manager#sch05_02 111,{ @@ -107,6 +109,19 @@ OnClock0001: if (!GetCastleData("schg_cas05",1)) end; killmonster "schg_cas05","Manager#sch05_02::OnTreasureDied"; + if (GetCastleData("schg_cas05",4)) { + set .@Economy,GetCastleData("schg_cas05",2); + SetCastleData "schg_cas05",2,.@Economy + GetCastleData("schg_cas05",4) + (rand(2) && getgdskilllv(.@GID,10014)); + if (GetCastleData("schg_cas05",2) > 100) SetCastleData "schg_cas05",2,100; + setcastledata "schg_cas05",4,0; + } + if (GetCastleData("schg_cas05",5)) { + set .@Defence,GetCastleData("schg_cas05",3); + SetCastleData "schg_cas05",3,.@Defence + GetCastleData("schg_cas05",5); + if (GetCastleData("schg_cas05",3) > 100) SetCastleData "schg_cas05",3,100; + setcastledata "schg_cas05",5,0; + } + set .@Treasure,GetCastleData("schg_cas05",2)/5+4; if (.@Treasure) { monster "schg_cas05",388,388,"Treasure Chest",1942,1,"Manager#sch05_02::OnTreasureDied"; @@ -154,16 +169,6 @@ OnClock0001: if (.@Treasure < 24) end; monster "schg_cas05",386,386,"Treasure Chest",1324,1,"Manager#sch05_02::OnTreasureDied"; } - if (GetCastleData("schg_cas05",4)) { - set .@Economy,GetCastleData("schg_cas05",2); - SetCastleData "schg_cas05",2,.@Economy + GetCastleData("schg_cas05",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); - setcastledata "schg_cas05",4,0; - } - if (GetCastleData("schg_cas05",5)) { - set .@Defence,GetCastleData("schg_cas05",3); - SetCastleData "schg_cas05",3,.@Defence + GetCastleData("schg_cas05",5); - setcastledata "schg_cas05",5,0; - } end; OnTreasureDied: |