From 4995b7d73889e05becabc8ea8fae477b72558dec Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sun, 11 May 2008 14:30:17 +0000 Subject: * Fixed guild manager charging twice for invest - Corrected some treasure room switch sent-to spawns. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12701 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/guild/agit_template.txt | 5 +++-- npc/guild/aldeg_cas01.txt | 1 - npc/guild/gefg_cas04.txt | 5 +++-- npc/guild/payg_cas03.txt | 5 +++-- npc/guild/prtg_cas01.txt | 5 +++-- npc/guild/prtg_cas03.txt | 5 +++-- npc/guild/prtg_cas05.txt | 5 +++-- 7 files changed, 18 insertions(+), 13 deletions(-) (limited to 'npc/guild') diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt index ecd119780..d9282f935 100644 --- a/npc/guild/agit_template.txt +++ b/npc/guild/agit_template.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -35,6 +35,7 @@ //= 1.0 First Version. No longer uses functions. [L0ne_W0lf] //= 1.1 Daily investement will now be reset. [L0ne_W0lf] //= Template will no longer try to spawn chests. +//= 1.2 Fixed Eco Invest option charging twice. [L0ne_W0lf] //============================================================ // AGIT Manager Template @@ -159,6 +160,7 @@ OnAgitBreak: OnAgitEnd: if (strnpcinfo(0) == "Gld_Agit_Manager") end; GvgOff strnpcinfo(2); + // If the castle has no owner at the end of WoE, do not kill Emperium. if (GetCastleData(strnpcinfo(2),1)) { KillMonster strnpcinfo(2),"Agit#"+strnpcinfo(2)+"::OnAgitBreak"; } @@ -538,7 +540,6 @@ OnRecvCastle: close; } set zeny,zeny-.@eco_invest; - set zeny,zeny-.@eco_invest; SetCastleData strnpcinfo(2),4,GetCastleData(strnpcinfo(2),4)+1; SetCastleData strnpcinfo(2),2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014)); mes "[ Steward .@name$]"; diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt index 6ac7eb98a..02cfcd50c 100644 --- a/npc/guild/aldeg_cas01.txt +++ b/npc/guild/aldeg_cas01.txt @@ -136,7 +136,6 @@ aldeg_cas01,216,24,0 duplicate(Gld_Agit_Manager) Agit#aldeg_cas01 -1 //============================================================ aldeg_cas01,218,175,0 duplicate(Gld_Mngr_Template) Alfredo#aldeg_cas01 55 - // Guardians //============================================================ aldeg_cas01,218,175,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas01 -1 diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt index 561540e5b..ac8463c94 100644 --- a/npc/guild/gefg_cas04.txt +++ b/npc/guild/gefg_cas04.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= NPCs that relate to Geffen Guild Castle 4 //===== Additional Comments: ================================= //= 1.0 First Version. No longer uses functions. [L0ne_W0lf] +//= 1.1 Corrected treasure room switch coordinates. [L0ne_W0lf] //============================================================ // Guild Flag (Town) @@ -142,7 +143,7 @@ gefg_cas04,117,123,0 script #switch_G04 111,{ next; switch(select("Pull.:Do not.")) { case 1: - warp "gefg_cas04",73,74; + warp "gefg_cas04",73,47; break; case 2: break; diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt index c149b21e9..f266a99cf 100644 --- a/npc/guild/payg_cas03.txt +++ b/npc/guild/payg_cas03.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= //= NPCs that relate to Payon Guild Castle 3 //===== Additional Comments: ================================= //= 1.0 First Version. No longer uses functions. [L0ne_W0lf] +//= 1.1 Corrected treasure room switch coordinates. [L0ne_W0lf] //============================================================ // Guild Flag (Town) @@ -144,7 +145,7 @@ payg_cas03,163,167,0 script #switch_Py03 111,{ next; switch(select("Pull.:Do not.")) { case 1: - warp "payg_cas03",11,278; + warp "payg_cas03",50,261; break; case 2: break; diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt index 1399fb78f..2ec631b53 100644 --- a/npc/guild/prtg_cas01.txt +++ b/npc/guild/prtg_cas01.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. No longer uses functions. [L0ne_W0lf] //= 1.1 Corrected flag-in spawn point. [L0ne_W0lf] +//= 1.2 Corrected treasure room switch coordinates. [L0ne_W0lf] //============================================================ // Guild Flag (Town) @@ -147,7 +148,7 @@ prtg_cas01,15,209,0 script #switch_Pt01 111,{ next; switch(select("Pull.:Do not.")) { case 1: - warp "prtg_cas01",109,179; + warp "prtg_cas01",112,183; break; case 2: break; diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt index b7ae3553c..63734d1e4 100644 --- a/npc/guild/prtg_cas03.txt +++ b/npc/guild/prtg_cas03.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. No longer uses functions. [L0ne_W0lf] //= 1.1 Corrected flag-in spawn point. [L0ne_W0lf] +//= 1.2 Corrected treasure room switch coordinates. [L0ne_W0lf] //============================================================ // Guild Flag (Town) @@ -148,7 +149,7 @@ prtg_cas03,193,130,0 script #switch_Pt03 111,{ next; switch(select("Pull.:Do not.")) { case 1: - warp "prtg_cas03",45,99; + warp "prtg_cas03",51,101; break; case 2: break; diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt index 2b491eec2..9574b2aea 100644 --- a/npc/guild/prtg_cas05.txt +++ b/npc/guild/prtg_cas05.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. No longer uses functions. [L0ne_W0lf] //= 1.1 Corrected flag-in spawn point. [L0ne_W0lf] +//= 1.2 Corrected treasure room switch coordinates. [L0ne_W0lf] //============================================================ // Guild Flag (Town) @@ -145,7 +146,7 @@ prtg_cas05,281,176,0 script #switch_Pt05 111,{ next; switch(select("Pull.:Do not.")) { case 1: - warp "prtg_cas05",34,30; + warp "prtg_cas05",36,38; break; case 2: break; -- cgit v1.2.3-60-g2f50