summaryrefslogtreecommitdiff
path: root/npc/guild2/arug_cas01.txt
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-04 18:28:22 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-04 18:28:22 +0000
commit647998c0b4bda1600c59323a4370be252701bc15 (patch)
treeaa06d30a05d8f862f5b2b4bc061ee91e4896be46 /npc/guild2/arug_cas01.txt
parent134bf364c8deffa192fb77a323b92b708a2e2276 (diff)
downloadhercules-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/arug_cas01.txt')
-rw-r--r--npc/guild2/arug_cas01.txt25
1 files changed, 15 insertions, 10 deletions
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index 3d549562f..f55845069 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -21,6 +21,8 @@
//= 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]
+//= 1.9 Fixed eco/def not actually incrementing. [L0ne_W0lf]
+//= Can no longer gain eco/def higher than 100.
//============================================================
arug_cas01,1,1,0 script Manager#aru01_02 111,{
@@ -109,6 +111,19 @@ OnClock0001:
if (!GetCastleData("arug_cas01",1)) end;
killmonster "arug_cas01","Manager#aru01_02::OnTreasureDied";
+ if (GetCastleData("arug_cas01",4)) {
+ set .@Economy,GetCastleData("arug_cas01",2);
+ SetCastleData "arug_cas01",2,.@Economy + GetCastleData("arug_cas01",4) + (rand(2) && getgdskilllv(.@GID,10014));
+ if (GetCastleData("arug_cas01",2) > 100) SetCastleData "arug_cas01",2,100;
+ 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);
+ if (GetCastleData("arug_cas01",3) > 100) SetCastleData "arug_cas01",3,100;
+ 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";
@@ -156,16 +171,6 @@ 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: