* 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, 12 insertions, 10 deletions

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";