* Renewal Izlude updates:

- Updated warp scripts and removed disabled warps.
- Implemented Renewal Hypnotist, which resets stats and skills; moved old file to Pre-Renewal path.
- Moved and added Bullet Dealer and Magazine Dealer duplicates. (bugreport:6410)
- Moved Dorian (quests_nameless) NPC to Pre-Renewal/Renewal paths and shifted Cuskoal (izlude) RE NPC.
- Corrected some coordinates and NPC facing directions.

* Updated all 3rd_trader scripts:
- Players can now purchase multiple items at once.
- Added many new Point Merchants.
- Moved Poison Herb Merchant in Morroc out of a wall (temp. fix).

* Other script updates:
- Added Eden Group Kafra (storage only).
- Added some missing announcements in Endless Tower.
- Added exit warp scripts to three 2nd job quests (Renewal only).
- Added official Morroc coordinates in Warlock job quest. (follow-up r17224)
- Minor updates to Comodo Gambling script.
- Fixed a Zeny bug in Payon town script, and changed some 'close' commands to 'end'. (bugreport:7893)
- Renamed npc/pre-re/kafras/kafras_izl.txt to .../kafras.txt.

Signed-off-by: Euphy <euphy@rathena.org>

doc/script_commands.txt

@@ -6117,15 +6117,13 @@ found there does stuff.
 
 Flag is a bit-mask (add up numbers to get effects you want)
  1 - warp all guild members to their save points.
- 2 - warp all non-guild members to their save points.
+ 2 - warp all non-guild members (including guildless players) to their save points.
  4 - remove all monsters which are not guardian or Emperium.
 
 Flag 7 will, therefore, mean 'wipe all mobs but guardians and the Emperium and 
 kick all characters out', which is what the official scripts do upon castle 
 surrender. Upon start of WoE, the scripts do 2 (warp all intruders out).
 
-Characters not belonging to any guild will warp out regardless of the flag setting.
-
 For examples, check the WoE scripts in the distribution.
 
 ---------------------------------------

npc/cities/izlude.txt

@@ -4,7 +4,7 @@
 //= kobra_k88
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8a
+//= 1.9a
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -29,6 +29,7 @@
 //= 1.9 Fixed a small problem with Dega. (Ne default case) [L0ne_W0lf]
 //=	Re-added NPC dialog for Cebalis. The dialog differs
 //=	(even if slightly,) after the five or so lines.
+//= 1.9a A part of Kylick's dialogue is Pre-Renewal only. [Euphy]
 //============================================================
 
 // Izlude
@@ -222,9 +223,18 @@
 }
 
 -	script	::Kylick_izlude	-1,{
-	mes "[Kylick]";
-	switch(rand(2)) {
-	case 1:
+	if (!checkre(0) && rand(2)) {
+		mes "[Kylick]";
+		mes "I was thinking, even though the people of Izlude live so close to the ocean...";
+		next;
+		mes "[Kylick]";
+		mes "There are other cultures that have completely developed by living off of the sea. Of course, I'm talking about Amatsu.";
+		next;
+		mes "[Kylick]";
+		mes "I hear the cuisine there is really good! Although the idea of eating raw fish is new to me, I would love to go there, and try it just once!";
+		close;
+	} else {
+		mes "[Kylick]";
 		mes "Don't you think Binoculars";
 		mes "are really COOL?! You can";
 		mes "see all sorts of places...!";
@@ -241,15 +251,6 @@
 		mes "a pound of cure";
 		mes "after all, right?";
 		close;
-	Default:
-		mes "I was thinking, even though the people of Izlude live so close to the ocean...";
-		next;
-		mes "[Kylick]";
-		mes "There are other cultures that have completely developed by living off of the sea. Of course, I'm talking about Amatsu.";
-		next;
-		mes "[Kylick]";
-		mes "I hear the cuisine there is really good! Although the idea of eating raw fish is new to me, I would love to go there, and try it just once!";
-		close;
 	}
 }
 

npc/cities/payon.txt

@@ -4,16 +4,16 @@
 //= Muad Dib (1.0) Darkchild (1.1) Muad Dib (1.2)
 //= Darkchild (1.3) DracoRPG (1.5) L0ne_W0lf (2.1)
 //===== Current Version: ===================================== 
-//= 2.1b
+//= 2.1c
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Payon City Npcs
 //===== Additional Comments: ================================= 
 //= Most Credits To Muad Dib, Some Stuff By Me
-//= 1.4 - Corrected a few typos
-//= 1.5 - Rescripted old NPCs + scripted new ones (from iRO Sak) [DracoRPG]
-//= 1.5b - Used Dino9021's script for the Gemstone exchanger [DracoRPG]
+//= 1.4 Corrected a few typos
+//= 1.5 Rescripted old NPCs + scripted new ones (from iRO Sak) [DracoRPG]
+//= 1.5b Used Dino9021's script for the Gemstone exchanger [DracoRPG]
 //= 1.5b1 fixed Gemstone Exchanger NPC [Lupus]
 //= 1.5b2 added adv.classes/baby classes support [Lupus]
 //= 1.6 Fixed typos [Nexon]
@@ -22,9 +22,10 @@
 //= 1.9 Fixed missing next;'s [Evera]
 //= 2.0 fixed some bugs, optimized script, added missing msg [Lupus]
 //= 2.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//=	Moved Gemstone Trader "Jade" to /merchants/gemstone.txt
-//=	Moved Fortune Teller to /other/fortune.txt
+//=     Moved Gemstone Trader "Jade" to /merchants/gemstone.txt
+//=     Moved Fortune Teller to /other/fortune.txt
 //= 2.1b Added a missing close in the Monster Scholar. [L0ne_W0lf]
+//= 2.1c Minor bug fixes. [Euphy]
 //============================================================ 
 
 // Payon
@@ -252,9 +253,9 @@ payon,210,110,1	script	Drunkard#payon	120,{
 		mes "Buy me a drink?!";
 	}
 	next;
-	switch(select("Alright, but only one drink. :No thanks, pal.:Oh my God! Hell no! ")) {
+	switch(select("Alright, but only one drink.:No thanks, pal.:Oh my God! Hell no!")) {
 	case 1:
-		set zeny,zeny-100;
+		set Zeny, (Zeny < 100)?0:(Zeny - 100);
 		mes "[Drunkard]";
 		mes "Thanks...!";
 		mes "..Brother!";
@@ -955,6 +956,7 @@ OnTouch:
 		mes "I'd better rest.";
 		mes "Please, take care";
 		mes "of yourself.";
+		close;
 
 		//This actually never happens on iRO
 		//if (.@oldman_random == 2) {
@@ -965,7 +967,7 @@ OnTouch:
 		//	mes "coming back later?";
 		//}
 	}
-	close;
+	end;
 }
 
 payon_in03,102,185,5	script	Guard#payon	708,{
@@ -975,15 +977,17 @@ payon_in03,102,185,5	script	Guard#payon	708,{
 		mes "You're not";
 		mes "allowed here!";
 		mes "Go back outside!";
+		close;
 	}
 	if (Baselevel > 30) {
 		mes "[Guard]";
 		mes "I'm sorry,";
 		mes "but you're";
 		mes "not allowed here.";
 		mes "Please leave.";
+		close;
 	}
-	close;
+	end;
 }
 
 // Payon Archer Village
@@ -1072,4 +1076,3 @@ pay_arche,77,131,2	script	Archer Joe#payon	88,{
 	}
 	close;
 }
-

npc/custom/healer.txt

@@ -48,7 +48,7 @@ einbroch,57,202,6	duplicate(Healer)	Healer#einbr	909
 geffen,115,72,6	duplicate(Healer)	Healer#gef	909
 gonryun,156,122,6	duplicate(Healer)	Healer#gon	909
 hugel,89,150,6	duplicate(Healer)	Healer#hug	909
-izlude,125,118,5	duplicate(Healer)	Healer#izl	909
+izlude,121,150,6	duplicate(Healer)	Healer#izl	909	//Pre-RE: (125,118)
 jawaii,250,139,4	duplicate(Healer)	Healer#jaw	909
 lighthalzen,152,100,6	duplicate(Healer)	Healer#lhz	909
 louyang,226,103,4	duplicate(Healer)	Healer#lou	909
@@ -75,5 +75,5 @@ dewata,195,187,4	duplicate(Healer)	Healer#dew	909
 dicastes01,201,194,4	duplicate(Healer)	Healer#dic	909
 ecl_in01,45,60,4	duplicate(Healer)	Healer#ecl	909
 malangdo,132,114,6	duplicate(Healer)	Healer#mal	909
-malaya,205,205,6	duplicate(Healer)	Healer#ma	909
+malaya,227,204,6	duplicate(Healer)	Healer#ma	909
 mora,55,152,4	duplicate(Healer)	Healer#mora	909

npc/custom/warper.txt

@@ -140,15 +140,15 @@ T12: Restrict("RE");
 T13: Go("geffen",119,59);
 T14: Go("gonryun",160,120);
 T15: Go("hugel",96,145);
-T16: Go("izlude",128,114);
+T16: Go("izlude",128,(checkre(3)?146:114));
 T17: Go("jawaii",251,132);
 T18: Go("lighthalzen",158,92);
 T19: Go("louyang",217,100);
 T20: Go("xmas",147,134);
 T21: Restrict("RE");
 	Go("malangdo",140,114);
 T22: Restrict("RE");
-	Go("malaya",212,206);
+	Go("malaya",231,200);
 T23: Go("manuk",282,138);
 T24: Go("mid_camp",210,288);
 T25: Restrict("RE");
@@ -415,7 +415,7 @@ G6: Go("schg_dun01",200,124);
 
 menu	"Bakonawa Lake",I1, "Bangungot Hospital 2F",I2, "Buwaya Cave",I3,
 	"Endless Tower",I4, "Hazy Forest",I5, "Malangdo Culvert",I6, "Nidhoggur's Nest",I7,
-	"Octopus Cave",I8, "Old Glast Heim",I9, "Orc's Memory",I10, "Sealed Shrine",I111;
+	"Octopus Cave",I8, "Old Glast Heim",I9, "Orc's Memory",I10, "Sealed Shrine",I11;
 
 I1: Restrict("RE");
 	Go("ma_scene01",172,175);
@@ -470,7 +470,7 @@ glast_01,372,308,4	duplicate(Warper)	Warper#glh	811
 gonryun,162,122,4	duplicate(Warper)	Warper#gon	811
 hugel,101,151,4	duplicate(Warper)	Warper#hug	811
 izlu2dun,110,92,4	duplicate(Warper)	Warper#izd	811
-izlude,132,120,4	duplicate(Warper)	Warper#izl	811
+izlude,134,150,4	duplicate(Warper)	Warper#izl	811	//Pre-RE: (132,120)
 jawaii,253,138,4	duplicate(Warper)	Warper#jaw	811
 lighthalzen,162,102,4	duplicate(Warper)	Warper#lhz	811
 louyang,208,103,6	duplicate(Warper)	Warper#lou	811
@@ -502,5 +502,5 @@ dewata,204,186,6	duplicate(Warper)	Warper#dew	811
 dicastes01,194,194,6	duplicate(Warper)	Warper#dic	811
 ecl_in01,51,60,4	duplicate(Warper)	Warper#ecl	811
 malangdo,134,117,6	duplicate(Warper)	Warper#mal	811
-malaya,210,205,4	duplicate(Warper)	Warper#ma	811
+malaya,231,204,4	duplicate(Warper)	Warper#ma	811
 mora,57,152,4	duplicate(Warper)	Warper#mora	811

npc/instances/EndlessTower.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.2
+//= 2.3
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -34,6 +34,7 @@
 //= 2.0 Fixed broken else/if chaining. [Joseph]
 //= 2.1 Updated to match latest official script. [Euphy]
 //= 2.2 Instance system rewrite. [Euphy]
+//= 2.3 Added some missing announcements. [Euphy]
 //============================================================ 
 
 alberta,214,77,6	script	Captain Janssen	709,{
@@ -1201,6 +1202,15 @@ function	script	F_Tower_Warp	{
 	mapannounce instance_mapname("1@tower"), strcharinfo(0)+". You will be warped to the "+.@level$[.@i]+" Level.",bc_map,"0x00ff99";
 	warp instance_mapname(.@map$[.@i]),52,354;
 	close;
+
+OnInstanceInit:
+	initnpctimer;
+	end;
+
+OnTimer10000:
+	mapannounce instance_mapname("1@tower"), "Notice : Taming a monster does not count towards defeating them.",bc_map,"0xff0000";
+	stopnpctimer;
+	end;
 }
 
 1@tower,29,365,1	script	#1F Controller	844,{
@@ -1341,6 +1351,23 @@ OnTouch_:
 	end;
 }
 
+1@tower,71,4,0	script	#Broadcast Mode1	844,{
+	end;
+
+OnInstanceInit:
+	initnpctimer;
+	end;
+
+OnTimer15000:
+OnTimer60000:
+	mapannounce instance_mapname("1@tower"), "Notice : In any abnormal situation where you defeat a monster, you can't advance to the next level!",bc_map,"0xff0000";
+	end;
+OnTimer120000:
+	mapannounce instance_mapname("1@tower"), "Notice : In any abnormal situation where you defeat a monster, you can't advance to the next level!",bc_map,"0xff0000";
+	stopnpctimer;
+	end;
+}
+
 /*
 1@tower,71,1,0	script	#Manager Mode1	844,{
 	mes "Please enter the password.";

npc/merchants/ammo_boxes.txt

@@ -1,7 +1,7 @@
 //===== rAthena Script =======================================
-//= Magazine Dealer Kenny
+//= Magazine Dealers
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 1.5
 //===== Compatible With: =====================================
@@ -18,10 +18,9 @@
 //= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
 //============================================================
 
-alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
-	set .n$, compare(strnpcinfo(1),"Tonny")?"[Tonny]":"[Kenny]";
+alberta,118,157,3	script	Magazine Dealer Kenny::mdk	83,{
 	if(BaseJob == Job_Gunslinger) {
-		mes .n$;
+		mes "[Kenny]";
 		mes "Welcome to my Magazine Shop.";
 		mes "As you may know, large numbers";
 		mes "of bullets can be carried more";
@@ -38,7 +37,7 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 		case 7: callfunc "Func_Casing",13202,12150; break;
 		case 8: callfunc "Func_Casing",13201,12151; break;
 		case 9:
-			mes .n$;
+			mes "[Kenny]";
 			mes "Well, if you ever find";
 			mes "that you have too many";
 			mes "bullets, come and see me.";
@@ -47,15 +46,15 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 			close;
 		}
 	}
-	mes .n$;
+	mes "[Kenny]";
 	mes "Welcome to my shop.";
 	mes "Here, I provide Magazines";
 	mes "and Cartridges for Gunslingers.";
 	mes "Sorry, but it doesn't look like";
 	mes "my services would be of any";
 	mes "use to you, adventurer.";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "Eh, but if you happen to";
 	mes "know any Gunslingers, send";
 	mes "them my way. You can never";
@@ -64,18 +63,18 @@ alberta,118,157,3	script	Magazine Dealer Tonny::mdk	83,{
 }
 
 function	script	Func_Casing	{
-	mes .n$;
+	mes "[Kenny]";
 	mes "Now, you can trade";
 	mes "500 "+getitemname(getarg(0))+"s";
 	mes "and 500 zeny for 1 "+getitemname(getarg(1))+", so make sure";
 	mes "you have sufficient bullets";
 	mes "and zeny for this exchange.";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "You can exchange 500 "+getitemname(getarg(0))+"s and 500 zeny";
 	mes "with 1 "+getitemname(getarg(1))+".";
 	next;
-	mes .n$;
+	mes "[Kenny]";
 	mes "Remember that I can't give";
 	mes "you more than 50 Magazines";
 	mes "at a time. Now please enter";
@@ -84,7 +83,7 @@ function	script	Func_Casing	{
 	next;
 	input .@amount;
 	if(.@amount > 50 || .@amount == 0) {
-		mes .n$;
+		mes "[Kenny]";
 		mes "Hey, I can't give you";
 		mes "that many Magazines.";
 		mes "Please try again, and";
@@ -95,7 +94,7 @@ function	script	Func_Casing	{
 	if (countitem(getarg(0)) >= (500*.@amount)) {
 		if (Zeny >= (500*.@amount)) {
 			if (checkweight(getarg(1),.@amount) == 0) {
-				mes .n$;
+				mes "[Kenny]";
 				mes "Hey, you've got a lot";
 				mes "of junk crammed in your";
 				mes "Inventory. Free up some";
@@ -104,7 +103,7 @@ function	script	Func_Casing	{
 				mes "some Magazines later, okay?";
 				close;
 			}else{
-				mes .n$;
+				mes "[Kenny]";
 				mes "Alright, here are";
 				mes "your Magazines. Thanks";
 				mes "for visiting my shop, and";
@@ -116,7 +115,7 @@ function	script	Func_Casing	{
 				close;
 			}
 		}else{
-			mes .n$;
+			mes "[Kenny]";
 			mes "Sorry, but you don't";
 			mes "have enough zeny for";
 			mes "this Magazine exchange.";
@@ -126,7 +125,7 @@ function	script	Func_Casing	{
 			close;
 		}
 	}else{
-		mes .n$;
+		mes "[Kenny]";
 		mes "Sorry, but you don't";
 		mes "have enough bullets for";
 		mes "this Magazine exchange.";

npc/merchants/ammo_dealer.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= Bullet Dealer Tony
+//= Bullet Dealers
 //===== By ===================================================
 //= Playtester, Paradox924X
 //===== Version ==============================================