* Merged changes from trunk [14688:14739/trunk].

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

5 files changed, 42 insertions, 22 deletions

diff --git a/npc/other/auction.txt b/npc/other/auction.txt
index 4a033fa3a..20fcde573 100644
--- a/npc/other/auction.txt
+++ b/npc/other/auction.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.0 First version, place holders only. [L0ne_W0lf]
 //= 1.1 Moved Morroc Auction NPCs to Morroc Ruins. [L0ne_W0lf]
 //= 1.2 Warp fixed. Dialog in Ruins/Lighthalzen changed. [Kisuka]
+//= 1.3 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================
 
 // Auction House warpers
@@ -72,14 +73,15 @@ function	script	F_AuctionWarper	{
 
 // Sign posts
 //============================================================
-moc_ruins,76,176,6	script	Information Post#moc::AuctionSign	837,{
+-	script	Information Post#dum::AuctionSign	-1,{
 	mes "[Information]";
 	mes "Auction Warp Guide";
 	close;
 }
 
-prontera,216,120,4	duplicate(AuctionSign)	Information Post#prt	837,{
-yuno,131,116,0	duplicate(AuctionSign)	Information Post#yuno	837,{
+moc_ruins,76,176,6	duplicate(AuctionSign)	Information Post#moc	837
+prontera,216,120,4	duplicate(AuctionSign)	Information Post#prt	837
+yuno,131,116,0	duplicate(AuctionSign)	Information Post#yuno	837
 lighthalzen,207,169,6	duplicate(AuctionSign)	Information Post#lhz	837
 
 // Warps
@@ -91,7 +93,7 @@ auction_02,43,17,0	warp	auction_enterance_lhz	1,1,lighthalzen,209,169
 
 // Auction House NPCs
 //============================================================
-auction_01,182,68,6	script	Auction Broker#moc1::AuctionBroker	98,{
+-	script	Auction Broker#dum::AuctionBroker	-1,{
 	mes "[Auction Broker]";
 	mes "Welcome to the Auction Hall.";
 	mes "Would you like to view the goods?";
@@ -114,6 +116,7 @@ auction_01,182,68,6	script	Auction Broker#moc1::AuctionBroker	98,{
 	close;
 }
 
+auction_01,182,68,6	duplicate(AuctionBroker)	Auction Broker#moc1	98
 auction_01,182,75,0	duplicate(AuctionBroker)	Auction Broker#moc2	99
 auction_01,177,75,2	duplicate(AuctionBroker)	Auction Broker#moc3	98
 auction_01,177,68,4	duplicate(AuctionBroker)	Auction Broker#moc4	99
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index 155e21031..9f563141f 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -21,6 +21,7 @@
 //=      Added missing emotions and cutins
 //= 1.1- Updated prizes according to 11.1 NPC [Paradox924X]
 //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.3 Added missing item. [Kisuka]
 //============================================================ 
 
 comodo,219,160,3	script	Kachua	91,{
@@ -169,6 +170,7 @@ comodo,219,160,3	script	Kachua	91,{
 				else if (.@gamble2 == 81) set .@item,1560; // Sage's Diary[2]
 				else if (.@gamble2 == 82) set .@item,1618; // Survivor's Rod[1]
 				else if (.@gamble2 == 83) set .@item,1620; // Survivor's Rod[1]
+				else if (.@gamble2 > 83 && .@gamble2 < 86) set .@item,1971; // Electric Wire
 			}
 			else if ((.@gamble1 >   0) && (.@gamble1 <  201)) set .@item,1201; // Knife[3]
 			else if ((.@gamble1 > 200) && (.@gamble1 <  301)) set .@item,1101; // Sword[3]
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 626efcb0b..778dba4f4 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,14 +17,12 @@
 //= 1.3a Corrected a typo error. (bugreport:798) [Samuray22]
 //= 1.4 Added a Mapflag to prevent mail operations in other maps [Zephyrus]
 //= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf]
+//= 1.6 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================
 
-// Allow Mail Inbox reading from
+// Floating mailbox npc that all NPCs duplicate from.
 //============================================================
-
-// Prontera
-//============================================================
-prontera,146,86,0	script	Mailbox#prt::MailBox	888,{
+-	script	Mailbox#dummy::MailBox	-1,{
 	mes "[Mailbox]";
 	mes "If you'd like to use";
 	mes "the Mailbox Service,";
@@ -57,6 +55,9 @@ prontera,146,86,0	script	Mailbox#prt::MailBox	888,{
 	close;
 }
 
+// Prontera
+//============================================================
+prontera,146,86,0	duplicate(MailBox)	Mailbox#prt	888
 prontera,275,213,0	duplicate(MailBox)	Mailbox#2prt	888
 prontera,34,212,0	duplicate(MailBox)	Mailbox#3prt	888
 
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index 645f7dfd6..23c3e78c1 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -1,9 +1,10 @@
 //===== eAthena Script ======================================= 
+//===== eAthena Script ======================================= 
 //= Mercenary related NPCs
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -14,6 +15,7 @@
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Optimization. [Zephyrus]
 //= 1.2 Removed redundent input. [L0ne_W0lf]
+//= 1.3 Duplicates now spawned from floating NPCs. [L0ne_W0lf]
 //============================================================ 
 
 prontera,41,337,5	script	Mercenary Manager#Spear	105,{
@@ -653,7 +655,7 @@ pay_arche,99,167,4	script	Mercenary Manager#Bow	732,{
 
 // Mercenary Merchant NPCs
 //============================================================
-prontera,30,337,4	script	Mercenary Merchant#Spear::MercMerchant	700,{
+-	script	Mercenary Merchant#dummy::MercMerchant	-1,{
 	mes "[Mercenary Goods Merchant]";
 	mes "Hello, I sell goods";
 	mes "that Mercenaries can";
@@ -698,8 +700,10 @@ prontera,30,337,4	script	Mercenary Merchant#Spear::MercMerchant	700,{
 		next;
 		callfunc "F_PurchaseMercItem",12243,2100;
 	}
+	close;
 }
 
+prontera,30,337,4	duplicate(MercMerchant)	Mercenary Merchant#Spear	700
 izlude,56,139,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
 pay_arche,102,167,5	duplicate(MercMerchant)	Mercenary Merchant#Bow	879
 
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 05c56e2e5..5a7673ce9 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -26,15 +26,12 @@
 //=	exception of the "Free for all" mode.
 //=	Added PVP event NPCs.
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.5 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
 //============================================================ 
 
-// Morroc
+// Floating NPC
 //============================================================ 
-morocc_in,144,138,4	script	PVPNarrator#moc	84,{
-	callfunc "F_PVPNarrator","morocc_in",141,139;
-}
-
-morocc_in,144,142,4	script	Gate Keeper#moc::PVPGateKeeper	83,{
+-	script	Gate Keeper#dummy::PVPGateKeeper	-1,{
 	mes "[Gate Keeper]";
 	mes "Glad to be of service.";
 	mes "I will open the PVP fight";
@@ -114,6 +111,15 @@ morocc_in,144,142,4	script	Gate Keeper#moc::PVPGateKeeper	83,{
 	}
 }
 
+// Morroc
+//============================================================ 
+morocc_in,144,138,4	script	PVPNarrator#moc	84,{
+	callfunc "F_PVPNarrator","morocc_in",141,139;
+}
+
+morocc_in,144,142,4	duplicate(PVPGateKeeper)	Gate Keeper#moc	83,{
+
+
 // Alberta
 //============================================================ 
 alberta_in,22,146,4	script	PVP Narrator#alb	84,{
@@ -465,7 +471,7 @@ OnInit:
 
 // Spectator Entrance
 //============================================================ 
-pvp_room,62,85,4	script	Spectator's Entrance#1::PVPSpectator	105,{
+-	script	Spectator's Entrance#dum::PVPSpectator	-1,{
 	if (countitem(7029) == 0) {
 		mes "[PVP Compete Square Register Staff]";
 		mes "This is the entrance for viewers.";
@@ -492,6 +498,8 @@ OnInit:
 	end;
 }
 
+pvp_room,62,85,4	duplicate(PVPSpectator)	Spectator's Entrance#1	105
+
 pvp_room,70,85,4	duplicate(PVPSpectator)	Spectator's Entrance#2	105
 
 pvp_room,78,85,4	duplicate(PVPSpectator)	Spectator's Entrance#3	105
@@ -500,7 +508,7 @@ pvp_room,86,85,4	duplicate(PVPSpectator)	Spectator's Entrance#4	105
 
 // Spectator Warps
 //============================================================ 
-pvp_2vs2,5,4,0	script	Combat Square Staff#1::PVPSpecWarp	45,1,1,{
+-	script	Combat Square Staff#dum::PVPSpecWarp	-1,{
 OnTouch:
 	mes "[Combat Square Staff]";
 	mes "May I help you?";
@@ -512,6 +520,8 @@ OnTouch:
 	end;
 }
 
+pvp_2vs2,5,4,0	duplicate(PVPSpecWarp)	Combat Square Staff#1	45,1,1,{
+
 pvp_2vs2,5,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#2	45,1,1
 
 pvp_2vs2,74,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#3	45,1,1