* 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

7 files changed, 29 insertions, 24 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,";
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index 9cfe6f253..7d9a0e63f 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Celesta, Lupus
 //===== Version ==============================================
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.8 Added missing checkweights. [L0ne_W0lf]
 //= 1.9 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf]
+//= 2.0 Removed unused "name" variable. [L0ne_W0lf]
 //============================================================ 
 
 alberta,43,244,0	script	Tourist#thai	99,{
@@ -1017,7 +1018,6 @@ moc_ruins,105,62,4	script	Jacob#thai	50,{
 				mes "'^0000FFTry to be in someone else's shoes before judging that person.^000000'";
 				mes "Do you understand?";
 				next;
-				set name,PcName;
 				mes "["+strcharinfo(0)+"]";
 				mes "(There's more this guy can tell me, I just know it...)";
 				close;
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 1ae068b9a..3b18c5faa 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.2a
+//= 2.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -44,6 +44,7 @@
 //=     Added missing quest, "Oridecon/Mineral Quest"
 //=     Full overhual of the Uwe Kleine quest.
 //= 2.2a Fixed typos in var names from EIN_LOVERQRQ to EIN_LOVERQ. (bugreport:2464) [Paradox924X]
+//= 2.3 Removed occurance of PcName. [L0ne_W0lf]
 //============================================================ 
 
 // Oridecon Stone OR Mineral Stone Quest
@@ -1049,7 +1050,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 			mes "Oh! Hello again,";
 			mes "you cutie adventurer.";
 			mes "So tell me, what brings";
-			mes "you here, "+PcName+"?";
+			mes "you here, "+strcharinfo(0)+"?";
 			next;
 			switch(select("Ask about Cooking.:Ask about Einbroch.:Cancel.")) {
 			case 1:
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index cbd99e095..593f59cad 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -32,6 +32,7 @@
 //= 1.9 Bug fixes/Typos. [Paradox924X]
 //= 2.0 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 2.1 Fixed guard tower warper ALWAYS warping. (bugreport:2377) [L0ne_W0lf]
+//= 2.2 Removed unused "name" variable. [L0ne_W0lf]
 //============================================================ 
 
 // Soup Quest
@@ -4333,7 +4334,6 @@ OnTouch:
 
 louyang,217,278,0	script	 #lou_path	111,{
 	if (ch_poison == 12 || ch_poison == 16) {
-		set name,PcName;
 		mes "["+strcharinfo(0)+"]";
 		mes "What's this?";
 		mes "A crack in the wall?";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index c0dfac447..ab77879a1 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.4
+//= 2.5
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -28,6 +28,7 @@
 //= 2.4 Implemented Ep. 12.1 Continental Guard Quest. [L0ne_W0lf]
 //=     Moved Dandelion's Request to a it's own file.
 //=     Added support NPCs required to finish Gaebolg quest.
+//= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf]
 //============================================================ 
 
 //==================================================================================//
@@ -1881,7 +1882,6 @@ OnInit:
 
 OnEnable:
 	enablenpc "Group of Evil#edq";
-	donpcevent "Time-Space Gap#edq::OnDisable";
 	end;
 
 OnDisable:
@@ -1933,7 +1933,7 @@ OnTimer1800000:
 OnTimer21600000:
 	stopnpctimer;
 	set $@re_moc,0;
-	disablenpc "Time-Space Gap#edq";
+	donpcevent "Time-Space Gap#edq::OnDisable";
 	end;
 }
 
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index a806db290..44a147a98 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -52,6 +52,8 @@
 //= 1.7 Fixed a typo in monestary quest. [L0ne_W0lf]
 //= 1.8 Renamed temporary global variable. [L0ne_W0lf]
 //=     moved OnMyMobDead for access quest to a different NPC.
+//= 1.9 Fixed mapwarp warping to disabled map. [L0ne_W0lf]
+//= 2.0 Removed duplicate dialog. [L0ne_W0lf]
 //============================================================ 
 
 // Nameless Island and Cursed Monestary Access Quest
@@ -2800,7 +2802,6 @@ OnTouch:
 		mes "priests, the corruption...^000000";
 		next;
 		mes "^3355FFHe also explained the role";
-		mes "He also explained the role";
 		mes "of the priests in the inhumane";
 		mes "testing conducted by the";
 		mes "Rekenber Corporation, and";
@@ -8830,7 +8831,7 @@ z_agit,97,101,3	script	Louis	931,{
 		close2;
 		getitem 7724,1; //Forbidden_Secret_Art
 		set zdan_edq,18;
-		mapwarp "z_agit","moc_fild09",68,298;
+		mapwarp "z_agit","moc_fild17",209,235;
 		set $@monster_zgang,0;
 		set $@door2,0;
 		hideonnpc "Louis";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index e058350cb..45ff7aa43 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 3.2
+//= 3.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -57,6 +57,8 @@
 //=     Some more numeric conversion, and some other cleanup.
 //= 3.1 Updated Ice Necklace quest, added missing checks. [L0ne_W0lf]
 //= 3.2 Added missing updates for Peace to the Arunafeltz quest. [L0ne_W0lf]
+//= 3.3 Fixed occurance of PcName. [L0ne_W0lf]
+//=     Fixed level 4 ID warps always being usable.
 //============================================================ 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -3813,10 +3815,10 @@ OnTimer7200000:
 ice_dun03,1,175,3	script	#ice_sec	-1,{
 OnStart:
 	initnpctimer;
-	hideoffnpc "#ice_4f_1";
-	hideoffnpc "#ice_4f_2";
-	hideoffnpc "#ice_4f_3";
-	hideoffnpc "#ice_4f_4";
+	enablenpc "#ice_4f_1";
+	enablenpc "#ice_4f_2";
+	enablenpc "#ice_4f_3";
+	enablenpc "#ice_4f_4";
 	donpcevent "#ice_4f_1::OnEnable";
 	donpcevent "#ice_4f_2::OnEnable";
 	donpcevent "#ice_4f_3::OnEnable";
@@ -3825,10 +3827,10 @@ OnStart:
 
 OnTimer60000:
 	stopnpctimer;
-	hideonnpc "#ice_4f_1";
-	hideonnpc "#ice_4f_2";
-	hideonnpc "#ice_4f_3";
-	hideonnpc "#ice_4f_4";
+	disablenpc "#ice_4f_1";
+	disablenpc "#ice_4f_2";
+	disablenpc "#ice_4f_3";
+	disablenpc "#ice_4f_4";
 	end;
 }
 
@@ -7173,7 +7175,7 @@ ra_temsky,99,99,5	script	Pope#rachel	936,{
 			mes "strange to me. Well, it's";
 			mes "good to hear it from you.";
 			next;
-			mes "["+PcName+"]";
+			mes "["+strcharinfo(0)+"]";
 			mes "(^333333I can't just leave";
 			mes "now. I should try to see";
 			mes "if I can learn anything";