diff options
| author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
| commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
| tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /npc/guild | |
| parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
| parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
| download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/guild')
| -rw-r--r-- | npc/guild/agit_main.txt | 6 | ||||
| -rw-r--r-- | npc/guild/trs_rp.txt | 12 |
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 |