* Optimized Splendide coin merchant and merged it to a template with Manuk's (merchants\coin_exchange.txt)

* Fixed and enabled a Manuk NPC (cities\manuk.txt)
* Other small changes and fixes.

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

8 files changed, 113 insertions, 207 deletions

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index d60682401..f9db3809b 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3718,7 +3718,7 @@ Y 150
 By using ,0,0; as the destination coordinates it will take all the characters in 
 the affected area to a random set of co-ordinates on "place2".
 
-	areawarp "place",10,10,120,120,"place2",150,150,200,200;
+    areawarp "place",10,10,120,120,"place2",150,150,200,200;
 
 By using the optional x4 and y4 parameters, the destination coordinates will be a 
 random place within the defined x3/y3-x4/y4 square.
@@ -3892,9 +3892,9 @@ changing jobs, which can be checked for later in scripts.
 
 This command retrieves the name of the given job using the msg_athena entries 550->650.
 
-		mes "[Kid]";
-		mes "I never thought I'd met a "+jobname(Class)+" here of all places.";
-		close;
+	mes "[Kid]";
+	mes "I never thought I'd met a "+jobname(Class)+" here of all places.";
+	close;
 
 ---------------------------------------
 
@@ -6097,10 +6097,10 @@ Battle flags are the flags found in the battle/*.conf files and is also used in
 
 Example(s):
 
-//will set the base experience rate to 20x (2000%)
+// Will set the base experience rate to 20x (2000%)
 	setBattleFlag "base_exp_rate",2000;
 	
-//will return the value of the base experience rate (when used after the above example, it would print 2000).
+// Will return the value of the base experience rate (when used after the above example, it would print 2000).
 	mes getBattleFlag("base_exp_rate");
 
 ---------------------------------------
@@ -6113,23 +6113,29 @@ The mapname and second x and y is the target area of the warp portal.
 
 Example(s):
 
-//Will create a warp portal on the NPC's map at 150,150 leading to prontera, coords 150,180.
-	warpPortal 150,150,"prontera",150,180;
+// Will create a warp portal on the NPC's map at 150,150 leading to prontera, coords 150,180.
+	warpportal 150,150,"prontera",150,180;
 
 ---------------------------------------
 
-*mapwarp "<from map>","<to map>",<x>,<y>,<type>,<ID for Type>;
+*mapwarp "<from map>","<to map>",<x>,<y>{,<type>,<ID>};
 
-type: 0=everyone, 1=guild, 2=party
 This command will collect all characters located on the From map and warp them 
 wholesale to the same point on the To map, or randomly distribute them there if 
 the coordinates are zero. "Random" is understood as a special To map name and 
 will mean randomly shuffling everyone on the same map.
 
+Optionally, a type and ID can be specified. Available types are:
+
+ 0 - Everyone
+ 1 - Guild
+ 2 - Party
+
 Example:
 
-// Will warp all members of guild with ID 63 on map prontera to map alberta
+// Will warp all members of guild with ID 63 on map prontera to map alberta.
 	mapwarp "prontera","alberta",150,150,1,63;
+
 ---------------------------------------
 \\
 5,2.- Guild-related Commands
diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt
index 1b33799f1..07bf61ccf 100644
--- a/npc/cities/manuk.txt
+++ b/npc/cities/manuk.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.0 First Version.
 //= 1.1 Added more town NPCs
 //= 1.2 Added more town NPCs
+//= 1.3 Enabled an NPC
 //============================================================
 
 // cat_enhance
@@ -63,14 +64,13 @@ manuk,107,233,5	script	Soldier#ep13_3	454,{
 }
 
 // ep13_2_hiki
-/*
 manuk,100,100,3	script	Piom	454,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Piom]";
-		mes "�?����?�������?�����Fairy��";
-		mes "??���?�����Fairy��";
-		mes "�?������?j��?�������";
-		mes "?�?��?�����?�?";
+		mes "You are... tiny. But you don't seem like a Fairy.";
+		mes "As long as you are not a damned Fairy,";
+		mes "then you are not our foe!";
+		mes "In this world, there are only friends or foe!";
 		close;
 	}
 	else {
@@ -82,7 +82,6 @@ manuk,100,100,3	script	Piom	454,{
 		close;
 	}
 }
-*/
 
 manuk,188,216,3	script	Benknee#ep13_2_1	449,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
new file mode 100644
index 000000000..8603383ad
--- /dev/null
+++ b/npc/merchants/coin_exchange.txt
@@ -0,0 +1,87 @@
+//===== rAthena Script =======================================
+//= Manuk & Splendide Coin Merchants
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Coin redemption NPCs.
+//===== Additional Comments: =================================
+//= 1.0 First version 
+//= 1.1 Fixed checkweight. [Gepard]
+//= 1.2 Optimized and merged into one file. [Euphy]
+//============================================================
+
+-	script	::merchant_13_2	-1,{
+	set .@n$, "["+strnpcinfo(1)+"]";
+	mes .@n$;
+	if (isequipped(2782) && ep13_2_rhea == 100) {
+		if (!checkweight(1201,1)) {
+			mes "It looks like you're carrying too many things.";
+			mes "Why not put some of your items in storage and come back?";
+			close;
+		}
+		mes "Hello.";
+		mes "What are you looking for?";
+		next;
+		if (strnpcinfo(1) == "Merchant of Manuk") {
+			setarray .@Items[2],12342,12343,12348;
+			set .@Book,11019; //Manuk_Selling_Item
+			set .@Coin,6080; //Manuk_Coin
+			set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel");
+		}
+		else {
+			setarray .@Items[2],12344,12345,12349;
+			set .@Book,11018; //Splendide_Selling_Item
+			set .@Coin,6081; //Splendide_Coin
+			set .@i, select("View item description:Buy Pinguicula's Fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing");
+		}
+		mes .@n$;
+		if (.@i == 1) {
+			mes "Here are the item descriptions.";
+			close2;
+			ReadBook .@Book,1;
+			end;
+		}
+		else if (.@i < 5) {
+			mes "I can sell you 3 "+getitemname(.@Items[.@i])+" for ^3131FF1 coin^000000.";
+			next;
+			switch(select("Purchase:Do not purchase")) {
+			case 1:
+				if (countitem(.@Coin)) {
+					mes .@n$;
+					mes "Thank you for coming.";
+					delitem .@Coin,1; 
+					getitem .@Items[.@i],3;
+					close;
+				}
+				else {
+					mes .@n$;
+					mes "You don't have enough coins.";
+					close;
+				}
+			case 2:
+				mes .@n$;
+				break;
+			}
+		}
+		mes "Come again if you change your mind.";
+		close;
+	}
+	else {
+		if (strnpcinfo(1) == "Merchant of Manuk") {
+			mes "Rtt od d";
+			mes "Qwo hd is d irr";
+		}
+		else {
+			mes "BurWehAla";
+			mes "tasnarAndu Ie Ru";
+		}
+		close;
+	}
+}
+man_in01,286,16,1	duplicate(merchant_13_2)	Merchant of Manuk	454
+spl_in01,110,326,5	duplicate(merchant_13_2)	Merchant of Splendide	439
\ No newline at end of file
diff --git a/npc/merchants/manuk.txt b/npc/merchants/manuk.txt
deleted file mode 100644
index 9500a7eb2..000000000
--- a/npc/merchants/manuk.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-//===== rAthena Script =======================================
-//= Manuk Merchant
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= [Aegis Conversion]
-//= Manuk coin redemption NPC.
-//===== Additional Comments: =================================
-//= 1.0 First version 
-//= 1.1 Fixed checkweight. [Gepard]
-//= 1.2 Optimized. [Euphy]
-//============================================================
-
-man_in01,286,16,1	script	Merchant of Manuk	454,{
-	mes "[Merchant of Manuk]";
-	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
-		if (!checkweight(1201,1)) {
-			mes "It looks like you're carrying too many things.";
-			mes "Why not put some of your items in storage and come back?";
-			close;
-		}
-		mes "Hello.";
-		mes "What are you looking for?";
-		next;
-		setarray .@Items[2],12342,12343,12348;
-		set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel");
-		mes "[Merchant of Manuk]";
-		if (.@i == 1) {
-			mes "Here are the item descriptions.";
-			close2;
-			ReadBook 11019,1;
-			end;
-		}
-		else if (.@i < 5) {
-			mes "I can sell you 3 "+getitemname(.@Items[.@i])+" for^3131FF 1 coin^000000.";
-			next;
-			switch(select("Purchase:Do not purchase")) {
-			case 1:
-				if (countitem(6080)) {
-					mes "[Merchant of Manuk]";
-					mes "Thank you for coming.";
-					delitem 6080,1;
-					getitem .@Items[.@i],3;
-					close;
-				}
-				else {
-					mes "[Merchant of Manuk]";
-					mes "You don't have enough coins.";
-					close;
-				}
-			case 2:
-				mes "[Merchant of Manuk]";
-				break;
-			}
-		}
-		mes "Come again if you change your mind.";
-		close;
-	}
-	else {
-		mes "Rtt od d";
-		mes "Qwo hd is d irr";
-		close;
-	}
-}
\ No newline at end of file
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 836644a5f..acd3b2fe6 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -1,7 +1,7 @@
 //===== rAthena Script =======================================
 //= Episode 11.1 Socket Enchant NPC
 //===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
 //===== Current Version: =====================================
 //= 2.0
 //===== Compatible With: =====================================
diff --git a/npc/merchants/splendide.txt b/npc/merchants/splendide.txt
deleted file mode 100644
index b8d4f8f71..000000000
--- a/npc/merchants/splendide.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-//===== rAthena Script =======================================
-//= Splendide Merchant
-//===== By: ==================================================
-//= rAthena dev team
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= [Aegis Conversion]
-//= Splendide coin redemption NPC.
-//===== Additional Comments: =================================
-//= 1.0 First version 
-//= 1.1 Fixed checkweight. [Gepard]
-//============================================================
-
-spl_in01,110,326,5	script	Merchant of Splendide	439,{
-	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
-		if (checkweight(1201,1) == 0) {
-			mes "[Merchant of Splendide]";
-			mes "It looks like you're carrying too many things.";
-			mes "Why not put some of your items in storage and come back?";
-			close;
-		}
-		mes "[Merchant of Splendide]";
-		mes "Hello.";
-		mes "What are you looking for?";
-		next;
-		switch(select("View item description:Buy Pinguicula's fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing")) {
-		case 1:
-			mes "[Merchant of Splendide]";
-			mes "Would you like to see the item description?";
-			close2;
-			ReadBook 11018,1;
-			end;
-		case 2:
-			mes "[Merchant of Splendide]";
-			mes "I can sell you 3 Pinguicula's fruit Jam for^3131FF 1 coin^000000";
-			next;
-			switch(select("Purchase:Do not purchase.")) {
-			case 1:
-				if (countitem(6081) > 0) {
-					mes "[Merchant of Splendide]";
-					mes "Thank you for coming.";
-					delitem 6081,1; //Splendide_Coin
-					getitem 12344,3; //Pinguicula's_fruit_Jam
-					close;
-				}
-				else {
-					mes "[Merchant of Splendide]";
-					mes "You don't have enough coins.";
-					close;
-				}
-			case 2:
-				mes "[Merchant of Splendide]";
-				mes "Come again if you change your mind.";
-				close;
-			}
-		case 3:
-			mes "[Merchant of Splendide]";
-			mes "I can sell you 3 Luciola's Honey Jam for^3131FF 1 coin^000000";
-			next;
-			switch(select("Purchase:Do not purchase.")) {
-			case 1:
-				if (countitem(6081) > 0) {
-					mes "[Merchant of Splendide]";
-					mes "Thank you for coming.";
-					delitem 6081,1; //Splendide_Coin
-					getitem 12345,3; //Luciola's_Honey_Jam
-					close;
-				}
-				else {
-					mes "[Merchant of Splendide]";
-					mes "You don't have enough coins.";
-					close;
-				}
-			case 2:
-				mes "[Merchant of Splendide]";
-				mes "Come again if you change your mind.";
-				close;
-			}
-		case 4:
-			mes "[Merchant of Splendide]";
-			mes "I can sell you 3 Cornus' Tears for^3131FF 1 coin^000000";
-			next;
-			switch(select("Purchase:Do not purchase.")) {
-			case 1:
-				if (countitem(6081) > 0) {
-					mes "[Merchant of Splendide]";
-					mes "Thank you for coming.";
-					delitem 6081,1; //Splendide_Coin
-					getitem 12349,3; //Cornus'_Tears
-					close;
-				}
-				else {
-					mes "[Merchant of Splendide]";
-					mes "You don't have enough coins.";
-					close;
-				}
-			case 2:
-				mes "[Merchant of Splendide]";
-				mes "Come again if you change your mind.";
-				close;
-			}
-		case 5:
-			mes "[Merchant of Splendide]";
-			mes "Come again if you change your mind.";
-			close;
-		}
-	}
-	else {
-		mes "[Merchant of Splendide]";
-		mes "BurWehAla";
-		mes "tasnarAndu Ie Ru";
-		close;
-	}
-}
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index ab83fb7df..8b8ce645b 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -126,6 +126,7 @@ npc: npc/merchants/ammo_boxes.txt
 npc: npc/merchants/ammo_dealer.txt
 npc: npc/merchants/buying_shops.txt
 //npc: npc/merchants/clothes_dyer.txt
+npc: npc/merchants/coin_exchange.txt
 npc: npc/merchants/dye_maker.txt
 npc: npc/merchants/elemental_trader.txt
 npc: npc/merchants/enchan_arm.txt
@@ -135,7 +136,6 @@ npc: npc/merchants/hair_style.txt
 //npc: npc/merchants/icecream.txt
 npc: npc/merchants/inn.txt
 npc: npc/merchants/kunai_maker.txt
-npc: npc/merchants/manuk.txt
 npc: npc/merchants/milk_trader.txt
 npc: npc/merchants/novice_exchange.txt
 npc: npc/merchants/old_pharmacist.txt
@@ -145,7 +145,6 @@ npc: npc/merchants/renters.txt
 npc: npc/merchants/shops.txt
 npc: npc/merchants/socket_enchant.txt
 npc: npc/merchants/socket_enchant2.txt
-npc: npc/merchants/splendide.txt
 npc: npc/merchants/wander_pet_food.txt
 // - Cash Shop
 //   See file before enabling, as you may wish to change the
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 1b0b2a8f0..b99208762 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -857,7 +857,7 @@ REPLACE INTO `item_db_re` VALUES (1526,'Slash','Slash',4,20,NULL,1000,'145',NULL
 REPLACE INTO `item_db_re` VALUES (1527,'Quadrille','Quadrille',4,20,NULL,900,'165',NULL,1,NULL,0x00008110,7,2,2,4,'40',1,8,'bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddEle,Ele_Earth,10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1528,'Grand_Cross','Grand Cross',4,20,NULL,1500,'140',NULL,1,NULL,0x00008110,7,2,2,4,'40',1,8,'bonus bAtkEle,Ele_Holy; skill "PR_TURNUNDEAD",3; bonus3 bAutoSpell,"PR_TURNUNDEAD",3,100; bonus2 bSPDrainValueRace,RC_Undead,1; bonus2 bSPGainRace,RC_Undead,3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1529,'Iron_Driver','Iron Driver',4,20,NULL,3000,'155',NULL,2,NULL,0x00008100,7,2,2,3,'78',1,8,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1530,'Mjolnir','Mjolnir',4,20,NULL,6000,'350',NULL,1,NULL,0x000444A2,7,2,2,4,'95',NULL,8,'bonus bAtkEle,Ele_Wind; bonus bDex,50; bonus bStr,20; bonus bAspdRate,10; bonus3 bAutoSpell,"MG_THUNDERSTORM",10,100; autobonus "{bonus bSplashRange,1;}",50,10000;}',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1530,'Mjolnir','Mjolnir',4,20,NULL,6000,'350',NULL,1,NULL,0x000444A2,7,2,2,4,'95',NULL,8,'bonus bAtkEle,Ele_Wind; bonus bDex,50; bonus bStr,20; bonus bAspdRate,10; bonus3 bAutoSpell,"MG_THUNDERSTORM",10,100; autobonus "{bonus bSplashRange,1;}",50,10000;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1531,'Spanner','Wrench',4,20,NULL,2500,'115',NULL,1,NULL,0x00008110,7,2,2,3,'55',1,8,'bonus2 bAddEff,Eff_Blind,100; bonus2 bAddEff,Eff_Stun,100; bonus2 bAddEff,Eff_Poison,100; bonus2 bAddEff,Eff_Freeze,100;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1532,'Stunner_','Stunner',4,60000,NULL,2000,'140',NULL,1,2,0x00008110,7,2,2,3,'27',1,8,'bonus2 bAddEff,Eff_Stun,1000;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1533,'Warrior_Balmung','Warrior\'s Balmung',4,20,NULL,1000,'170',NULL,1,NULL,0xFFFFFFFF,7,2,2,4,'48',1,8,'bonus bAllStats,5;',NULL,NULL);