updated noicewall, updated SL ques,

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

4 files changed, 64 insertions, 58 deletions

diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index 8aed77a3c..d9910db55 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2007/01/05
+	* Updated noicewall mapflags (to allow them in cities), thanks to Au{R}oN
 2007/01/03
 	* Changed friend_auto_add to 'yes' (closer to official, except for one detail)
 	* Changed monster_class_change_full_recover to 'yes' (official) [ultramage]
diff --git a/conf-tmpl/mapflag/noicewall.txt b/conf-tmpl/mapflag/noicewall.txt
index 616feb8dc..bf46eac2c 100644
--- a/conf-tmpl/mapflag/noicewall.txt
+++ b/conf-tmpl/mapflag/noicewall.txt
@@ -1,84 +1,84 @@
 //===== eAthena Script =======================================
-//= Map flags that disable icewall skill
+//= 1.6 Map flags that disable icewall skill
 //===== By: ==================================================
 //= eAthena Dev Team
 //=============================================================
 //= noicewall: Disables Icewall skill.
 //= To disable Icewall on a specific map add the mapname here.
-//= 1.5 [Lupus]
+//= 1.6 Re-enabled icewalls for cities [Lupus]
 //============================================================
 
 ayo_in01.gat	mapflag	noicewall
 ayo_in02.gat	mapflag	noicewall
 alberta_in.gat	mapflag	noicewall
-alberta.gat	mapflag	noicewall
+//alberta.gat	mapflag	noicewall
 alde_alche.gat	mapflag	noicewall
 aldeba_in.gat	mapflag	noicewall
-aldebaran.gat	mapflag	noicewall
+//aldebaran.gat	mapflag	noicewall
 ama_in01.gat	mapflag	noicewall
 ama_in02.gat	mapflag	noicewall
-amatsu.gat	mapflag	noicewall
-ayothaya.gat	mapflag	noicewall
+//amatsu.gat	mapflag	noicewall
+//ayothaya.gat	mapflag	noicewall
 cmd_in01.gat	mapflag	noicewall
 cmd_in02.gat	mapflag	noicewall
-comodo.gat	mapflag	noicewall
-einbroch.gat	mapflag	noicewall
-einbech.gat	mapflag	noicewall
+//comodo.gat	mapflag	noicewall
+//einbroch.gat	mapflag	noicewall
+//einbech.gat	mapflag	noicewall
 gef_tower.gat	mapflag	noicewall
-geffen.gat	mapflag	noicewall
+//geffen.gat	mapflag	noicewall
 geffen_in.gat	mapflag	noicewall
 gon_in.gat	mapflag	noicewall
-gonryun.gat	mapflag	noicewall
+//gonryun.gat	mapflag	noicewall
 in_hunter.gat	mapflag	noicewall
 in_moc_16.gat	mapflag	noicewall
 in_orcs01.gat	mapflag	noicewall
 izlude_in.gat	mapflag	noicewall
-izlude.gat	mapflag	noicewall
-hugel.gat	mapflag	noicewall
-jawaii.gat	mapflag	noicewall
+//izlude.gat	mapflag	noicewall
+//hugel.gat	mapflag	noicewall
+//jawaii.gat	mapflag	noicewall
 moc_castle.gat	mapflag	noicewall
 monk_in.gat	mapflag	noicewall
 morocc_in.gat	mapflag	noicewall
-morocc.gat	mapflag	noicewall
+//morocc.gat	mapflag	noicewall
 payon_in01.gat	mapflag	noicewall
 payon_in02.gat	mapflag	noicewall
 payon_in03.gat	mapflag	noicewall
-payon.gat	mapflag	noicewall
-pay_arche.gat	mapflag	noicewall
+//payon.gat	mapflag	noicewall
+//pay_arche.gat	mapflag	noicewall
 prt_are_in.gat	mapflag	noicewall
 prt_are01.gat	mapflag	noicewall
 prt_castle.gat	mapflag	noicewall
 prt_church.gat	mapflag	noicewall
 prt_in.gat	mapflag	noicewall
-prontera.gat	mapflag	noicewall
+//prontera.gat	mapflag	noicewall
 sec_in01.gat	mapflag	noicewall
 job_sword1.gat	mapflag	noicewall
 um_in.gat	mapflag	noicewall
-umbala.gat	mapflag	noicewall
+//umbala.gat	mapflag	noicewall
 xmas_in.gat	mapflag	noicewall
-xmas.gat	mapflag	noicewall
+//xmas.gat	mapflag	noicewall
 yuno_in01.gat	mapflag	noicewall
 yuno_in02.gat	mapflag	noicewall
 yuno_in03.gat	mapflag	noicewall
 yuno_in04.gat	mapflag	noicewall
 yuno_in05.gat	mapflag	noicewall
-yuno.gat	mapflag	noicewall
+//yuno.gat	mapflag	noicewall
 gon_test.gat	mapflag	noicewall
 nif_in.gat	mapflag	noicewall
-louyang.gat	mapflag	noicewall
+//louyang.gat	mapflag	noicewall
 que_sign01.gat	mapflag	noicewall
 ein_in01.gat	mapflag	noicewall
 airport.gat	mapflag	noicewall
 airplane.gat	mapflag	noicewall
 airplane_01.gat	mapflag	noicewall
-lighthalzen.gat	mapflag	noicewall
+//lighthalzen.gat	mapflag	noicewall
 yuno_pre.gat	mapflag	noicewall
 y_airport.gat	mapflag	noicewall
 lhz_airport.gat	mapflag	noicewall
 lhz_in01.gat	mapflag	noicewall
 lhz_in02.gat	mapflag	noicewall
 lhz_in03.gat	mapflag	noicewall
-rachel.gat	mapflag	noicewall
+//rachel.gat	mapflag	noicewall
 ra_in01.gat	mapflag	noicewall
 ra_temin.gat	mapflag	noicewall
 ra_temple.gat	mapflag	noicewall
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 8b2a036e3..89818ac13 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,8 @@ KarLaeda
 Date		Added
 ======
 
+2007/01/05
+	* Updated SL job Quest according to iRO, thanks to Sousuke_PL [Lupus]
 2007/01/03
 	* Added Veins and Thor Dungeon warps, +fixed some headers [ultramage]
 2006/12/28
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 7e37850ac..fa0e3d744 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Celestria
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -12,13 +12,14 @@
 //= A temp Soul Linker Job Changer based on the kRO quest.
 //= Quest info from RagnaInfo. Sprites from kRO screenshots
 //= 1.0	Optimized and updated [Lupus]
+//= 1.1 Fixed NPC names according to iRO [Lupus]
 //============================================================ 
 
-morocc_in.gat,174,30,7	script	Little Boy#sltest	716,{
+morocc_in.gat,174,30,7	script	Kid#sltest	716,{
 	if(SOUL_Q==1) goto L_Check;
 	if(SOUL_Q >= 2) goto L_Warp;
 	if(Class==Job_Soul_Linker) goto L_Thanks;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "*sniff sniff*";
 	next;
 	if((Class==Job_Taekwon) && (JobLevel>=40)) goto L_Taekwon;
@@ -28,43 +29,43 @@ morocc_in.gat,174,30,7	script	Little Boy#sltest	716,{
 	close;
 
 L_Thanks:
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Hey, Thank you for helping";
 	mes "me earlier ^_^";
 	close;
 
 L_Taekwon:
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Excuse me. *sniff*";
 	mes "I don't suppose you couldvhelp me?";
 	next;
 	menu "Go on...",L_Goon,"No, I'm busy.",L_No;
 
 L_No:
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Waaaaaaaaaaaaaah~";
 	close;
 
 L_Goon:
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Well you see, I was doing some";
 	mes "shopping for my daddy, who's";
 	mes "an alchemist, and on my way home";
 	mes "a thief came and took my shopping!";
 	next;
 	menu "I'll get you your stuff.",-,"Awww, that's too bad.",L_No;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Really!?";
 	mes "You'll do that for me?";
 	set SOUL_Q,1;
 	next;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Ok, what I need is:";
-	mes "^0000FF- 1 Witherless Rose^000000";
 	mes "^0000FF- 1 3-Carat Diamond^000000";
+	mes "^0000FF- 1 Witherless Rose^000000";
 	mes "^0000FF- 1 Immortal Heart^000000";
 	next;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Please find these things quickly...";
 	close;
 
@@ -75,40 +76,41 @@ L_Check:
 	delitem 929,1;
 	set SOUL_Q,2;
 	if(SkillPoint) goto L_Skill;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Wow, Thank you so much!";
 	mes "You're so helpful, I think I";
 	mes "know of a few other people";
 	mes "who could use your help.";
 	next;
 	menu "Lead the way.",L_Warp,"Umm... Not right now.",-;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Okay, come back when you change your mind.";
 	close;
 
 L_Noitem:
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Awww... you haven't found all the items yet.";
 	next;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Remember, it was:";
-	mes "^0000FF- 1 Witherless Rose^000000";
 	mes "^0000FF- 1 3-Carat Diamond^000000";
+	mes "^0000FF- 1 Witherless Rose^000000";
 	mes "^0000FF- 1 Immortal Heart^000000";
 	next;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Please find these things quickly...";
 	close;
 
 L_Warp:
 	if(SkillPoint) goto L_Skill;
-	mes "[Little Boy]";
-	mes "Okay, here we go";
+	mes "[Kid]";
+	mes "Okay, here we go.";
+	close2;
 	warp "job_soul.gat",30,30;
-	close;
+	end;
 
 L_Skill:
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "It seems you have some skill";
 	mes "points left. I can't warp you";
 	mes "to my friends until you use them.";
@@ -269,46 +271,46 @@ L_Talk3:
 	close;
 }
 
-job_soul.gat,35,30,3	script	Little Boy#4	716,{
+job_soul.gat,35,30,3	script	Kid#4	716,{
 	if(SOUL_Q < 5) goto L_Notyet4;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "So you have listened to the tales of my friends?";
 	next;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "They aren't bad people they've just been depressed for so very long.";
 	next;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "But they seem to have renewed vigour since they talked to you.";
 	mes "I haven't seen them this lively ever.";
 	next;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "You seem to have a gift with people, so with your permisson,";
 	mes "I would like to make you a Soul Linker.";
 	next;
 	menu "Yes",-,"No",L_Warpout;
 
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Very Well then.";
 	mes "You are now a Soul Linker.";
 	jobchange Job_Soul_Linker;
 	callfunc "F_ClearJobVar";
 	misceffect 247;
 	next;
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Please try to help others.";
-	next;
+	close2;
 	warp "morocc_in.gat",175,31;
-	close;
+	end;
 
 L_Warpout:
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "If you change your mind come and talk to me.";
-	next;
+	close2;
 	warp "morocc_in.gat",175,31;
-	close;
+	end;
 
 L_Notyet4:
-	mes "[Little Boy]";
+	mes "[Kid]";
 	mes "Please talk to the others first.";
 	close;	
 }
\ No newline at end of file