summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-21 17:08:14 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-21 17:08:14 +0000
commit2fb0a525453c30a710b27c4eb5c2d95babdb02c1 (patch)
treea328fc3513e082d97972314c0e05f6c9429829c6 /npc
parente8b3eecf9e259b11fc01e3856df14ddd77b5d631 (diff)
downloadhercules-2fb0a525453c30a710b27c4eb5c2d95babdb02c1.tar.gz
hercules-2fb0a525453c30a710b27c4eb5c2d95babdb02c1.tar.bz2
hercules-2fb0a525453c30a710b27c4eb5c2d95babdb02c1.tar.xz
hercules-2fb0a525453c30a710b27c4eb5c2d95babdb02c1.zip
Fixes to WoE SE Juno castles 1, 2, and 3. (copy/paste issues)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12627 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/guild2/schg_cas01.txt3
-rw-r--r--npc/guild2/schg_cas02.txt5
-rw-r--r--npc/guild2/schg_cas03.txt14
4 files changed, 14 insertions, 9 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0f4dab28f..d5fbfe2fa 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2008/04/21
+ * Rev. 12627 Fixes to WoE SE Juno castles 1, 2, and 3. (copy/paste issues) [L0ne_W0lf]
* Rev. 12624 Fixed bugreport:1390, bugreport:1394, bugreport:1396. [L0ne_W0lf]
2008/04/15
* Rev. 12602 Rescripted Eye of Hellion quest, all quest progress is lost. [L0ne_W0lf]
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index f989f65b8..2bbb58324 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 1.0 First Version [L0ne_W0lf]
//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf]
+//= 1.2 Fixed take-over lowering schg_cas04's eco. [L0ne_W0lf]
//============================================================
schg_cas01,1,1,0 script Manager#sch01_02 111,{
@@ -2620,7 +2621,7 @@ OnStartArena:
// Lower castle Economy
set .@Economy,GetCastleData("schg_cas01",2) - 5;
if (.@Economy < 0) set .@Economy, 0;
- SetCastleData "schg_cas04", 2, .@Economy;
+ SetCastleData "schg_cas01", 2, .@Economy;
// Lower Castle Defence
set .@Defence,GetCastleData("schg_cas01",3) - 5;
if (.@Defence < 0) set .@Defence, 0;
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index f0542dabb..d6dd29fcc 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 1.1 Fixed setcell range of first barricade. [L0ne_W0lf]
//= 1.2 Fixed first Barricade being desotryable. [L0ne_W0lf]
//= 1.3 Swaped an end for a close in eco investing. [L0ne_W0lf]
+//= 1.4 Fixed 3rd Control Device wasting supplies. [L0ne_W0lf]
//============================================================
schg_cas02,1,1,0 script Manager#sch02_02 111,{
@@ -1925,7 +1926,7 @@ schg_cas02,159,143,0 script Control Device03#sch02 111,{
delitem 999,10; //Steel
delitem 1011,10; //Emveretarcon
delitem 984,5; //Oridecon
- close;
+ close2;
donpcevent "#sch02_RL03::OnEnable";
disablenpc "Control Device03#sch02";
mapannounce "schg_cas02","The 3rd Fortress Gate has been reconstructed!!",bc_map,"0x00ff00";
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index dede4266e..48721baa1 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -11,6 +11,8 @@
//===== Additional Comments: =================================
//= 1.0 First Version [L0ne_W0lf]
//= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf]
+//= 1.2 Fixed 3rd Control Device wasting supplies. [L0ne_W0lf]
+//= Also fixed donpcevent calling wrong NPC.
//============================================================
schg_cas03,1,1,0 script manager#sch03_02 111,{
@@ -1922,7 +1924,7 @@ schg_cas03,273,205,0 script control device03#sch03 111,{
delitem 999,10; //Steel
delitem 1011,10; //Emveretarcon
delitem 984,5; //Oridecon
- close;
+ close2;
donpcevent "#sch03_RL03::OnEnable";
disablenpc "control device03#sch03";
mapannounce "schg_cas03","The 3rd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
@@ -2626,23 +2628,23 @@ OnStartArena:
set .msg,2;
if (.msg == 1) {
announce "Fortress [" + GetCastleName("schg_cas03") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
- donpcevent "Manager#sch01_02::Onstart";
+ donpcevent "Manager#sch03_02::Onstart";
}
else if (.msg == 2) {
announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 3] stronghold of "+GetCastleName("schg_cas03"),bc_all;
mapannounce "schg_cas03","The emperium has been shattered!",bc_map,"0x00FF00";
if (agitcheck()) {
- donpcevent "Manager#sch01_02::Onreset";
+ donpcevent "Manager#sch03_02::Onreset";
initnpctimer;
}
else {
- donpcevent "Manager#sch01_02::Onreset";
+ donpcevent "Manager#sch03_02::Onreset";
stopnpctimer;
}
}
else if (.msg == 0) {
announce "Fortress [" + GetCastleName("schg_cas03") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
- donpcevent "Manager#sch01_02::Onreset";
+ donpcevent "Manager#sch03_02::Onreset";
stopnpctimer;
end;
}