From 647998c0b4bda1600c59323a4370be252701bc15 Mon Sep 17 00:00:00 2001
From: L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 4 Mar 2009 18:28:22 +0000
Subject: 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
---
 npc/guild2/schg_cas01.txt | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'npc/guild2/schg_cas01.txt')

diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index 0b1f18b86..dc1ec36be 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.9
+//= 2.0
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -22,6 +22,8 @@
 //= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.8 Corrected wrong treasure spawn position. [zapbomb]
 //= 1.9 Applied updated eco/def systems. [L0ne_W0lf]
+//= 2.0 Fixed eco/def not actually incrementing. [L0ne_W0lf]
+//=     Can no longer gain eco/def higher than 100.
 //============================================================
 
 schg_cas01,1,1,0	script	Manager#sch01_02	111,{
@@ -106,10 +108,23 @@ Onchange:
 	donpcevent "2nd Guardian Stone#sch01::OnEnable";
 	end;
 
-OnClock0001:
+OnClock0000:
 	if (!GetCastleData("schg_cas01",1)) end;
 	killmonster "schg_cas01","Manager#sch01_02::OnTreasureDied";
 
+	if (GetCastleData("schg_cas01",4)) {
+		set .@Economy,GetCastleData("schg_cas01",2);
+		SetCastleData "schg_cas01",2,.@Economy + GetCastleData("schg_cas01",4) + (rand(2) && getgdskilllv(.@GID,10014));
+		if (GetCastleData("schg_cas01",2) > 100) SetCastleData "schg_cas01",2,100;
+		setcastledata "schg_cas01",4,0;
+	}
+	if (GetCastleData("schg_cas01",5)) {
+		set .@Defence,GetCastleData("schg_cas01",3);
+		SetCastleData "schg_cas01",3,.@Defence + GetCastleData("schg_cas01",5);
+		if (GetCastleData("schg_cas01",3) > 100) SetCastleData "schg_cas01",3,100;
+		setcastledata "schg_cas01",5,0;
+	}
+
 	set .@Treasure,GetCastleData("schg_cas01",2)/5+4;
 	if (.@Treasure) {
 		monster "schg_cas01",388,388,"Treasure Chest",1938,1,"Manager#sch01_02::OnTreasureDied";
@@ -157,16 +172,6 @@ OnClock0001:
 		if (.@Treasure < 24) end;
 		monster "schg_cas01",386,386,"Treasure Chest",1324,1,"Manager#sch01_02::OnTreasureDied";
 	}
-	if (GetCastleData("schg_cas01",4)) {
-		set .@Economy,GetCastleData("schg_cas01",2);
-		SetCastleData "schg_cas01",2,.@Economy + GetCastleData("schg_cas01",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014));
-		setcastledata "schg_cas01",4,0;
-	}
-	if (GetCastleData("schg_cas01",5)) {
-		set .@Defence,GetCastleData("schg_cas01",3);
-		SetCastleData "schg_cas01",3,.@Defence + GetCastleData("schg_cas01",5);
-		setcastledata "schg_cas01",5,0;
-	}
 	end;
 
 OnTreasureDied:
-- 
cgit v1.2.3-70-g09d2