summaryrefslogtreecommitdiff
path: root/npc/guild
diff options
context:
space:
mode:
authorMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
committerMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
commite3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch)
tree20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/guild
parent491892212d338903179909b89a5bfc2385e52261 (diff)
downloadhercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip
Update to last rAthena npc.
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/guild')
-rw-r--r--npc/guild/agit_main.txt6
-rw-r--r--npc/guild/trs_rp.txt12
2 files changed, 10 insertions, 8 deletions
diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt
index 5253fbe16..324fd71fd 100644
--- a/npc/guild/agit_main.txt
+++ b/npc/guild/agit_main.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.9a
+//= 2.0
//===== Description: =========================================
//= [ Aegis Conversion]
//= ----------------------------------------------------------
@@ -50,6 +50,7 @@
//= 1.8 Fixed a possible exploit in guild castle investment. [Brian]
//= 1.9 Partially rewrote Script. [Masao]
//= 1.9a Fixed incorrect setcastledata parameter. [Euphy]
+//= 2.0 Fixed an issue where Castle Manager couldn't be fired. [Joseph]
//============================================================
// WoE : Main Functions
@@ -834,12 +835,13 @@ OnRecvCastle:
mes "Oh, my goodness! This is nonsense!";
next;
cutin "",255;
- close;
+ break;
case 2:
mes "[ Hired Kafra Employee ]";
mes "I'll work hard for you... Thank you!";
close;
}
+ break;
case 2:
mes "["+strnpcinfo(1)+"]";
mes "She worked hard in my opinion. It was a good decision to keep her.";
diff --git a/npc/guild/trs_rp.txt b/npc/guild/trs_rp.txt
index 0c4374b66..88a320406 100644
--- a/npc/guild/trs_rp.txt
+++ b/npc/guild/trs_rp.txt
@@ -1,16 +1,16 @@
//===== Hercules Script ======================================
//= Treasure Room Protection
-//===== By: ==================================================
+//===== By: ==================================================
//= Masao
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.1
-//===== Description: =========================================
+//===== Description: =========================================
//= Warps every Player out of the Treasure Room except for the
//= Guildleader.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Converted from the official script.
//= 1.1 Reverted back and optimized. [Daegaladh]
-//============================================================
+//============================================================
- script Gld_Trea_Protect::Gld_Trea_Protect -1,{
@@ -52,4 +52,4 @@ gefg_cas01,154,112,0 duplicate(Gld_Trea_Protect) ban_warp#gefg_cas01 -1,6,6
gefg_cas02,140,116,0 duplicate(Gld_Trea_Protect) ban_warp#gefg_cas02 -1,6,6
gefg_cas03,271,290,0 duplicate(Gld_Trea_Protect) ban_warp#gefg_cas03 -1,6,6
gefg_cas04,116,119,0 duplicate(Gld_Trea_Protect) ban_warp#gefg_cas04 -1,6,6
-gefg_cas05,144,110,0 duplicate(Gld_Trea_Protect) ban_warp#gefg_cas05 -1,6,6
+gefg_cas05,144,110,0 duplicate(Gld_Trea_Protect) ban_warp#gefg_cas05 -1,6,6 \ No newline at end of file