summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-03 17:49:09 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-03 17:49:09 +0000
commit23d9eff296a39897242648b4e5f89aaa14f945ea (patch)
tree55534035b2ea0204e22abaa39f44ea2b2ab2fd85 /npc
parentb87129549e052974ef07d5fafd04118465e44658 (diff)
downloadhercules-23d9eff296a39897242648b4e5f89aaa14f945ea.tar.gz
hercules-23d9eff296a39897242648b4e5f89aaa14f945ea.tar.bz2
hercules-23d9eff296a39897242648b4e5f89aaa14f945ea.tar.xz
hercules-23d9eff296a39897242648b4e5f89aaa14f945ea.zip
Removed extra lines from schg_cas02 resetting data before eco/def is applied.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13563 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/guild2/arug_cas01.txt1
-rw-r--r--npc/guild2/schg_cas02.txt6
3 files changed, 3 insertions, 5 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index fa78ff49a..4b7219e80 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2009/03/03
+ * Rev. 13563 Removed extra lines from schg_cas02 resetting data before eco/def is applied. (bugreport:2842) [L0ne_W0lf]
* Rev. 13561 Applied the updated eco/def investment system to Juno WoESE castles. [L0ne_W0lf]
* 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.
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index 872ddc93a..3d549562f 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -1,5 +1,4 @@
//===== eAthena Script =======================================
-//===== eAthena Script =======================================
//= War of Emperium Second Edition
//===== By: ==================================================
//= L0ne_W0lf
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index 979e78414..5074812b4 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.0
+//= 2.0a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -23,6 +23,7 @@
//= 1.8 Fixed error with control devices. [L0ne_W0lf]
//= 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.
//============================================================
schg_cas02,1,1,0 script Manager#sch02_02 111,{
@@ -111,9 +112,6 @@ OnClock0001:
if (!GetCastleData("schg_cas02",1)) end;
killmonster "schg_cas02","Manager#sch02_02::OnTreasureDied";
- setcastledata "schg_cas02",4,0;
- 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";