* Another round of bug fixes to various scripts.

- Added Satan Morroc spawn and corrected shadow spawn timers. (bugreport:2690)
- Fixed Group of Evil NPC not reactivating  when it should. (bugreport:2696)
- Fixed the Zeny check when summoning guardians in agits. (bugreport:2712)
- Added zeny check to Jawaii bartender (hung the script.) (bugreport:2747)
- Corrected a mapwarp assosiated with the z-gang quest. (bugreport:2757)
- Fixed warps in ice dungeon 3 being usable all the time. (bugreport:2776)
- Corrected impossible condition if in Keil Hyre quest. (bugreport:2789)
- Corrected leftover aegis variables in several scripts. (bugreport:2794)
- Removed duplicate line from nameless quest. (bugreport:2795)
* Implemented official behaviour/Cost for investing in economy and defence
- Eco/Def will be modified on the turn of the day instead of immediately.
- Cost has been updated to official values. Investing twice now costs 4 times the first investment.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13559 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 2 deletions

diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index aabe87184..d54266947 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: ===================================== 
-//= 4.5
+//= 4.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -96,6 +96,7 @@
 //=     Corrected some typos in the dialogs.
 //= 4.4 Updated reviecer and robots NPC to use mobcount. (bugreport:2380) [L0ne_W0lf]
 //= 4.5 Removed a delitem that was no logner needed. [L0en_W0lf]
+//= 4.6 Fixed impossible condition for security guard. [L0ne_W0lf]
 //============================================================ 
 
 //============================================================================
@@ -756,7 +757,7 @@ yuno_fild08,196,196,5	script	Hanie#kh1	102,{
 // Academy Security Guards
 //----------------------------------------------------------------------------
 yuno_fild08,158,194,6	script	Security Guard#1::KHAGuard	852,{
-	if ((KielHyreQuest < 2) && (KielHyreQuest > 31)) { 
+	if ((KielHyreQuest < 2) || (KielHyreQuest > 31)) { 
 		mes "[Security Guard]";
 		mes "I'm sorry, but if you aren't";
 		mes "associated with this institution,";