Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

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

1 files changed, 55 insertions, 0 deletions

diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt
new file mode 100644
index 000000000..34143b748
--- /dev/null
+++ b/npc/other/guildpvp.txt
@@ -0,0 +1,55 @@
+//===== rAthena Script ======================================= 
+//= Guild Battle NPC
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= [Aegis Conversion]
+//= Guild Battle with PVP mechanics.
+//===== Additional Comments: ================================= 
+//= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Optimized. [Euphy]
+//============================================================ 
+
+pvp_y_room,77,85,4	script	Guild Battle Guide	105,{
+
+	setarray .@map1X[1],7,9,16,8,20;
+	setarray .@map2X[1],91,90,83,91,79;
+	setarray .@mapY[1],49,49,50,49,50;
+
+	mes "[Guild Battle Guide]";
+	mes "How are you doing?";
+	mes "I'm the Guild Battle Guide";
+	mes "for the new PvP maps.";
+	mes "Let me know to which map";
+	mes "you want me to move you.";
+	next;
+	set .@i, select("Map 1:Map 2:Map 3:Map 4:Map 5");
+	mes "[Guild Battle Guide]";
+	mes "You've chosen Map "+.@i+".";
+	mes "Now, which team are";
+	mes "you on? You can choose";
+	mes "either Team 1 or Team 2.";
+	next;
+	set .@j, select("Team 1:Team 2");
+	mes "[Guild Battle Guide]";
+	mes "Alright, I'll move you";
+	mes "to Map "+.@i+" as a member";
+	mes "of Team "+.@j+". Are you ready";
+	mes "to be transported there now?";
+	next;
+	if(select("Yes:No")==2) {
+		mes "[Guild Battle Guide]";
+		mes "Alright, I hope to";
+		mes "see you again on";
+		mes "the PvP fields!";
+		close; }
+	mes "[Guild Battle Guide]";
+	mes "Great! Have a good time~";
+	close2;
+	warp "guild_vs"+.@i,getd(".@map"+.@j+"X["+.@i+"]"),.@mapY[.@i];
+	end;
+}
\ No newline at end of file