summaryrefslogtreecommitdiff
path: root/npc/other/pvp.txt
diff options
context:
space:
mode:
authorKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-09 12:50:24 +0000
committerKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-09 12:50:24 +0000
commit5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0 (patch)
tree1f546bf12a99017b41ae2fd90e0ac452f97b0282 /npc/other/pvp.txt
parentb4208257ea0906e375024f811d8e51208d539d35 (diff)
downloadhercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.gz
hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.bz2
hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.xz
hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.zip
* 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
Diffstat (limited to 'npc/other/pvp.txt')
-rw-r--r--npc/other/pvp.txt28
1 files changed, 19 insertions, 9 deletions
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