From ffa877bd248a6f6a014dd29e4c158b7399cb0a98 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 8 May 2008 16:25:07 +0000 Subject: * Fixed some of the newer reported bugs. - Corrected typo in guild steward (missing space.) (bugreport:1423) - Corrected duplicate messages in WoE 2.0 scripts. (bugreport:1449) - Corrected missing close in turtle island quest (bugreport:1455) - Corrected missing next in hunter job quest. (bugreport:1477) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12692 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/guild2/arug_cas01.txt | 5 ++--- npc/guild2/arug_cas02.txt | 8 ++++---- npc/guild2/arug_cas03.txt | 8 ++++---- npc/guild2/arug_cas04.txt | 8 ++++---- npc/guild2/arug_cas05.txt | 8 ++++---- npc/guild2/schg_cas01.txt | 8 ++++---- npc/guild2/schg_cas02.txt | 8 ++++---- npc/guild2/schg_cas03.txt | 10 +++++----- npc/guild2/schg_cas04.txt | 8 ++++---- npc/guild2/schg_cas05.txt | 8 ++++---- 10 files changed, 39 insertions(+), 40 deletions(-) (limited to 'npc/guild2') diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index 20b00c53b..54ebdea4f 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -11,7 +11,8 @@ //===== Additional Comments: ================================= //= 1.0 First Version [L0ne_W0lf] //= 1.1 Swaped an end for a close in eco investing. [L0ne_W0lf] -//- Fixed improper label used in guaridan stone. +//= Fixed improper label used in guaridan stone. +//= 1.2 Fixed double message in defense investing. [L0ne_W0lf] //============================================================ arug_cas01,1,1,0 script Manager#aru01_02 111,{ @@ -2414,8 +2415,6 @@ arug_cas01,92,380,3 script Steward#aru01 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("arug_cas01",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index b1c8a0d9e..d486833e4 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.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 double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ arug_cas02,1,1,0 script Manager#aru02_02 111,{ @@ -2215,7 +2217,7 @@ arug_cas02,303,341,3 script Steward#aru02 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2371,8 +2373,6 @@ arug_cas02,303,341,3 script Steward#aru02 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("arug_cas02",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index cb5617387..1102755fc 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_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 double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ arug_cas03,1,1,0 script Manager#aru03_02 111,{ @@ -2261,7 +2263,7 @@ arug_cas03,328,98,3 script Steward#aru03 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2417,8 +2419,6 @@ arug_cas03,328,98,3 script Steward#aru03 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("arug_cas03",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index 687096907..ece110bf4 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.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 double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ arug_cas04,1,1,0 script Manager#aru04_02 111,{ @@ -2261,7 +2263,7 @@ arug_cas04,328,98,3 script Steward#aru04 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2417,8 +2419,6 @@ arug_cas04,328,98,3 script Steward#aru04 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("arug_cas04",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index b50543ab0..92a05104b 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.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 double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ arug_cas05,1,1,0 script Manager#aru05_02 111,{ @@ -2261,7 +2263,7 @@ arug_cas05,328,98,3 script Steward#aru05 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2417,8 +2419,6 @@ arug_cas05,328,98,3 script Steward#aru05 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("arug_cas05",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt index 2bbb58324..37deb048d 100644 --- a/npc/guild2/schg_cas01.txt +++ b/npc/guild2/schg_cas01.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.1 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -12,6 +12,8 @@ //= 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] +//= 1.3 Fixed double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ schg_cas01,1,1,0 script Manager#sch01_02 111,{ @@ -2262,7 +2264,7 @@ schg_cas01,247,305,3 script Steward#sch01 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2418,8 +2420,6 @@ schg_cas01,247,305,3 script Steward#sch01 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("schg_cas01",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt index d6dd29fcc..83554d79d 100644 --- a/npc/guild2/schg_cas02.txt +++ b/npc/guild2/schg_cas02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,8 @@ //= 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] +//= 1.5 Fixed double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ schg_cas02,1,1,0 script Manager#sch02_02 111,{ @@ -2198,7 +2200,7 @@ schg_cas02,105,378,3 script Steward#sch02 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2354,8 +2356,6 @@ schg_cas02,105,378,3 script Steward#sch02 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("schg_cas02",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index 87a5390da..385dfa3d2 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,7 +14,9 @@ //= 1.2 Fixed 3rd Control Device wasting supplies. [L0ne_W0lf] //= Also fixed donpcevent calling wrong NPC. //= 1.2a Fixed another donpcevent calling the wrong NPC. [L0ne_W0lf] -//= 1.3 Wrong variable used to store castle information. [L0nE_W0lf] +//= 1.3 Wrong variable used to store castle information. [L0ne_W0lf] +//= 1.4 Fixed double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ schg_cas03,1,1,0 script manager#sch03_02 111,{ @@ -2255,7 +2257,7 @@ schg_cas03,88,90,3 script Steward#sch03 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2411,8 +2413,6 @@ schg_cas03,88,90,3 script Steward#sch03 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("schg_cas03",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt index edb24e8fa..40507b609 100644 --- a/npc/guild2/schg_cas04.txt +++ b/npc/guild2/schg_cas04.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 double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ schg_cas04,1,1,0 script Manager#sch04_02 111,{ @@ -2261,7 +2263,7 @@ schg_cas04,247,305,3 script Steward#sch04 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2417,8 +2419,6 @@ schg_cas04,247,305,3 script Steward#sch04 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("schg_cas04",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt index 460cea84a..03da2e257 100644 --- a/npc/guild2/schg_cas05.txt +++ b/npc/guild2/schg_cas05.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 double message in defense investing. [L0ne_W0lf] +//= Corrected a minor typo in the guild steward. //============================================================ schg_cas05,1,1,0 script Manager#sch05_02 111,{ @@ -2261,7 +2263,7 @@ schg_cas05,247,305,3 script Steward#sch05 55,{ mes "this infidel away from here!"; mes "I will always be loyal to the"; mes "master of this stronghold,"; - mes "the one and only^FF0000" + getguildmaster(.@GID) + "^000000."; + mes "the one and only ^FF0000" + getguildmaster(.@GID) + "^000000."; close; } mes "[ Steward ]"; @@ -2417,8 +2419,6 @@ schg_cas05,247,305,3 script Steward#sch05 55,{ mes "want to increase our defenses."; close; } - next; - mes "[ Steward ]"; if (GetCastleData("schg_cas05",5) == 0) { mes "We need ^FF0000" + .@def_invest + "^000000"; mes "zeny to invest in our"; -- cgit v1.2.3-60-g2f50