summaryrefslogtreecommitdiff
path: root/npc/guild2
diff options
context:
space:
mode:
Diffstat (limited to 'npc/guild2')
-rw-r--r--npc/guild2/arug_cas01.txt25
-rw-r--r--npc/guild2/arug_cas02.txt27
-rw-r--r--npc/guild2/arug_cas03.txt27
-rw-r--r--npc/guild2/arug_cas04.txt27
-rw-r--r--npc/guild2/arug_cas05.txt28
-rw-r--r--npc/guild2/schg_cas01.txt29
-rw-r--r--npc/guild2/schg_cas02.txt27
-rw-r--r--npc/guild2/schg_cas03.txt27
-rw-r--r--npc/guild2/schg_cas04.txt27
-rw-r--r--npc/guild2/schg_cas05.txt27
10 files changed, 161 insertions, 110 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:
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 71ee28fc4..844a9039a 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -24,6 +24,8 @@
//= 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]
+//= 2.2 Fixed eco/def not actually incrementing. [L0ne_W0lf]
+//= Can no longer gain eco/def higher than 100.
//============================================================
arug_cas02,1,1,0 script Manager#aru02_02 111,{
@@ -112,6 +114,19 @@ OnClock0001:
if (!GetCastleData("arug_cas02",1)) end;
killmonster "arug_cas02","Manager#aru02_02::OnTreasureDied";
+ if (GetCastleData("arug_cas02",4)) {
+ set .@Economy,GetCastleData("arug_cas02",2);
+ SetCastleData "arug_cas02",2,.@Economy + GetCastleData("arug_cas02",4) + (rand(2) && getgdskilllv(.@GID,10014));
+ if (GetCastleData("arug_cas02",2) > 100) SetCastleData "arug_cas02",2,100;
+ 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);
+ if (GetCastleData("arug_cas02",3) > 100) SetCastleData "arug_cas02",3,100;
+ 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";
@@ -159,16 +174,6 @@ 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:
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index fd94cf9eb..b9e5193c0 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -23,6 +23,8 @@
//= 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]
+//= 2.0 Fixed eco/def not actually incrementing. [L0ne_W0lf]
+//= Can no longer gain eco/def higher than 100.
//============================================================
arug_cas03,1,1,0 script Manager#aru03_02 111,{
@@ -111,6 +113,19 @@ OnClock0001:
if (!GetCastleData("arug_cas03",1)) end;
killmonster "arug_cas03","Manager#aru03_02::OnTreasureDied";
+ if (GetCastleData("arug_cas03",4)) {
+ set .@Economy,GetCastleData("arug_cas03",2);
+ SetCastleData "arug_cas03",2,.@Economy + GetCastleData("arug_cas03",4) + (rand(2) && getgdskilllv(.@GID,10014));
+ if (GetCastleData("arug_cas03",2) > 100) SetCastleData "arug_cas03",2,100;
+ 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);
+ if (GetCastleData("arug_cas03",3) > 100) SetCastleData "arug_cas03",3,100;
+ 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";
@@ -158,16 +173,6 @@ 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:
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index c6bc29252..de8b1d104 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.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 Fixed wrong event call for stones. (bugreport:2386) [L0ne_W0lf]
//= 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.
//============================================================
arug_cas04,1,1,0 script Manager#aru04_02 111,{
@@ -110,6 +112,19 @@ OnClock0001:
if (!GetCastleData("arug_cas04",1)) end;
killmonster "arug_cas04","Manager#aru04_02::OnTreasureDied";
+ if (GetCastleData("arug_cas04",4)) {
+ set .@Economy,GetCastleData("arug_cas04",2);
+ SetCastleData "arug_cas04",2,.@Economy + GetCastleData("arug_cas04",4) + (rand(2) && getgdskilllv(.@GID,10014));
+ if (GetCastleData("arug_cas04",2) > 100) SetCastleData "arug_cas04",2,100;
+ 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);
+ if (GetCastleData("arug_cas04",3) > 100) SetCastleData "arug_cas04",3,100;
+ 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";
@@ -157,16 +172,6 @@ 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:
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index fffda5ff2..f739c6d17 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.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 Fixed wrong event call for stones. (bugreport:2386) [L0ne_W0lf]
//= 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.
//============================================================
arug_cas05,1,1,0 script Manager#aru05_02 111,{
@@ -109,6 +111,20 @@ Onchange:
OnClock0001:
if (!GetCastleData("arug_cas05",1)) end;
killmonster "arug_cas05","Manager#aru05_02::OnTreasureDied";
+
+ if (GetCastleData("arug_cas05",4)) {
+ set .@Economy,GetCastleData("arug_cas05",2);
+ SetCastleData "arug_cas05",2,.@Economy + GetCastleData("arug_cas05",4) + (rand(2) && getgdskilllv(.@GID,10014));
+ if (GetCastleData("arug_cas05",2) > 100) SetCastleData "arug_cas05",2,100;
+ 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);
+ if (GetCastleData("arug_cas05",3) > 100) SetCastleData "arug_cas05",3,100;
+ 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";
@@ -156,16 +172,6 @@ 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:
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:
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index 5074812b4..fe87d89f4 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.0a
+//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -24,6 +24,8 @@
//= 1.9 Replaced effect numerics with constants. [L0ne_W0lf]
//= 2.0 Applied updated eco/def systems. [L0ne_W0lf]
//= 2.0a Corrected investment data being reset before applied.
+//= 2.1 Fixed eco/def not actually incrementing. [L0ne_W0lf]
+//= Can no longer gain eco/def higher than 100.
//============================================================
schg_cas02,1,1,0 script Manager#sch02_02 111,{
@@ -112,6 +114,19 @@ OnClock0001:
if (!GetCastleData("schg_cas02",1)) end;
killmonster "schg_cas02","Manager#sch02_02::OnTreasureDied";
+ if (GetCastleData("schg_cas02",4)) {
+ set .@Economy,GetCastleData("schg_cas02",2);
+ SetCastleData "schg_cas02",2,.@Economy + GetCastleData("schg_cas02",4) + (rand(2) && getgdskilllv(.@GID,10014));
+ if (GetCastleData("schg_cas02",2) > 100) SetCastleData "schg_cas02",2,100;
+ setcastledata "schg_cas02",4,0;
+ }
+ if (GetCastleData("schg_cas02",5)) {
+ set .@Defence,GetCastleData("schg_cas02",3);
+ SetCastleData "schg_cas02",3,.@Defence + GetCastleData("schg_cas02",5);
+ if (GetCastleData("schg_cas02",3) > 100) SetCastleData "schg_cas02",3,100;
+ setcastledata "schg_cas02",5,0;
+ }
+
set .@Treasure,GetCastleData("schg_cas02",2)/5+4;
if (.@Treasure) {
monster "schg_cas02",249,378,"Treasure Chest",1939,1,"Manager#sch02_02::OnTreasureDied";
@@ -159,16 +174,6 @@ OnClock0001:
if (.@Treasure < 24) end;
monster "schg_cas02",253,370,"Treasure Chest",1324,1,"Manager#sch02_02::OnTreasureDied";
}
- if (GetCastleData("schg_cas02",4)) {
- set .@Economy,GetCastleData("schg_cas02",2);
- SetCastleData "schg_cas02",2,.@Economy + GetCastleData("schg_cas02",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014));
- setcastledata "schg_cas02",4,0;
- }
- if (GetCastleData("schg_cas02",5)) {
- set .@Defence,GetCastleData("schg_cas02",3);
- SetCastleData "schg_cas02",3,.@Defence + GetCastleData("schg_cas02",5);
- setcastledata "schg_cas02",5,0;
- }
end;
OnTreasureDied:
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index ef7a30c92..b5b0ef6b9 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -26,6 +26,8 @@
//= 1.9 Replaced effect numerics with constants. [L0ne_W0lf]
//= 2.0 Fixed setcell coords for the first barricade. [L0ne_W0lf]
//= 2.1 Applied updated eco/def systems. [L0ne_W0lf]
+//= 2.2 Fixed eco/def not actually incrementing. [L0ne_W0lf]
+//= Can no longer gain eco/def higher than 100.
//============================================================
schg_cas03,1,1,0 script Manager#sch03_02 111,{
@@ -114,6 +116,19 @@ OnClock0001:
if (!GetCastleData("schg_cas03",1)) end;
killmonster "schg_cas03","Manager#sch03_02::OnTreasureDied";
+ if (GetCastleData("schg_cas03",4)) {
+ set .@Economy,GetCastleData("schg_cas03",2);
+ SetCastleData "schg_cas03",2,.@Economy + GetCastleData("schg_cas03",4) + (rand(2) && getgdskilllv(.@GID,10014));
+ if (GetCastleData("schg_cas03",2) > 100) SetCastleData "schg_cas03",2,100;
+ setcastledata "schg_cas03",4,0;
+ }
+ if (GetCastleData("schg_cas03",5)) {
+ set .@Defence,GetCastleData("schg_cas03",3);
+ SetCastleData "schg_cas03",3,.@Defence + GetCastleData("schg_cas03",5);
+ if (GetCastleData("schg_cas03",3) > 100) SetCastleData "schg_cas03",3,100;
+ setcastledata "schg_cas03",5,0;
+ }
+
set .@Treasure,GetCastleData("schg_cas03",2)/5+4;
if (.@Treasure) {
monster "schg_cas03",189,21,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
@@ -161,16 +176,6 @@ OnClock0001:
if (.@Treasure < 24) end;
monster "schg_cas03",194,15,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
}
- if (GetCastleData("schg_cas03",4)) {
- set .@Economy,GetCastleData("schg_cas03",2);
- SetCastleData "schg_cas03",2,.@Economy + GetCastleData("schg_cas03",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014));
- setcastledata "schg_cas03",4,0;
- }
- if (GetCastleData("schg_cas03",5)) {
- set .@Defence,GetCastleData("schg_cas03",3);
- SetCastleData "schg_cas03",3,.@Defence + GetCastleData("schg_cas03",5);
- setcastledata "schg_cas03",5,0;
- }
end;
OnTreasureDied:
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index d3e6661da..751945e0d 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.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_cas04,1,1,0 script Manager#sch04_02 111,{
@@ -107,6 +109,19 @@ OnClock0001:
if (!GetCastleData("schg_cas04",1)) end;
killmonster "schg_cas04","Manager#sch04_02::OnTreasureDied";
+ if (GetCastleData("schg_cas04",4)) {
+ set .@Economy,GetCastleData("schg_cas04",2);
+ SetCastleData "schg_cas04",2,.@Economy + GetCastleData("schg_cas04",4) + (rand(2) && getgdskilllv(.@GID,10014));
+ if (GetCastleData("schg_cas04",2) > 100) SetCastleData "schg_cas04",2,100;
+ setcastledata "schg_cas04",4,0;
+ }
+ if (GetCastleData("schg_cas04",5)) {
+ set .@Defence,GetCastleData("schg_cas04",3);
+ SetCastleData "schg_cas04",3,.@Defence + GetCastleData("schg_cas04",5);
+ if (GetCastleData("schg_cas04",3) > 100) SetCastleData "schg_cas04",3,100;
+ setcastledata "schg_cas04",5,0;
+ }
+
set .@Treasure,GetCastleData("schg_cas04",2)/5+4;
if (.@Treasure) {
monster "schg_cas04",388,388,"Treasure Chest",1941,1,"Manager#sch04_02::OnTreasureDied";
@@ -154,16 +169,6 @@ OnClock0001:
if (.@Treasure < 24) end;
monster "schg_cas04",386,386,"Treasure Chest",1324,1,"Manager#sch04_02::OnTreasureDied";
}
- if (GetCastleData("schg_cas04",4)) {
- set .@Economy,GetCastleData("schg_cas04",2);
- SetCastleData "schg_cas04",2,.@Economy + GetCastleData("schg_cas04",4) + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014));
- setcastledata "schg_cas04",4,0;
- }
- if (GetCastleData("schg_cas04",5)) {
- set .@Defence,GetCastleData("schg_cas04",3);
- SetCastleData "schg_cas04",3,.@Defence + GetCastleData("schg_cas04",5);
- setcastledata "schg_cas04",5,0;
- }
end;
OnTreasureDied:
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:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-19 13:35:08 +0000