* Fixed DZeroX's fix! (Missing ;'s)

* Added Guild PVP NPC, and seal progress NPC.


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

4 files changed, 380 insertions, 3 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 9f11de0a1..5d286df61 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
 Date		Added
 ======
+2008/09/20
+	* Rev. 131222 Fixed DZeroX's fix! (Missing ;'s) [L0ne_W0lf]
+	* Added Guild PVP NPC, and seal progress NPC.
 2008/09/18
 	* Rev. 13219 Slew of bugreport fixage. Figured I should do something. [L0ne_W0lf]
 	* Fixed copy/paste errors in Aru castles. (bugreport:2012)
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 72848d48b..ec71e423d 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -149,7 +149,7 @@ geffen_in,110,172,0	script	Christopher#1::Chrisbs	63,{
 				close;
 			}
 			getitem 612,.@input; // Portable_Furnace
-			set Zeny,Zeny-.@sell
+			set Zeny,Zeny-.@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -230,7 +230,7 @@ geffen_in,110,172,0	script	Christopher#1::Chrisbs	63,{
 				close;
 			}
 			getitem 1010,.@input; // Phracon
-			set Zeny,Zeny-.@sell
+			set Zeny,Zeny-.@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need.";
 			close;
@@ -268,7 +268,7 @@ geffen_in,110,172,0	script	Christopher#1::Chrisbs	63,{
 				close;
 			}
 			getitem 1011,.@input; // Emveretarcon
-			set Zeny,Zeny-.@sell
+			set Zeny,Zeny-.@sell;
 			mes "[Christopher Guillenrow]";
 			mes "Thank ye fer shopping at me workshop. Feel free to come anytime, whenever ye need, whenever ye want.";
 			close;
diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt
new file mode 100644
index 000000000..1dcd51a1d
--- /dev/null
+++ b/npc/other/guildpvp.txt
@@ -0,0 +1,281 @@
+//===== eAthena Script ======================================= 
+//= Guild Battle NPC
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= eAthena SVN
+//===== Description: ========================================= 
+//= [Aegis Conversion]
+//= Guild Battle with PVP mechanics.
+//===== Additional Comments: ================================= 
+//= 1.0 First version. [L0ne_W0lf]
+//============================================================ 
+
+pvp_y_room,77,85,4	script	Guild Battle Guide	105,{
+	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;
+	switch(select("Map 1:Map 2:Map 3:Map 4:Map 5")) {
+	case 1:
+		mes "[Guild Battle Guide]";
+		mes "You've chosen Map 1.";
+		mes "Now, which team are";
+		mes "you on? You can choose";
+		mes "either Team 1 or Team 2.";
+		next;
+		switch(select("Team 1:Team 2")) {
+		case 1:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 1 as a member";
+			mes "of Team 1. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs1",7,49;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		case 2:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 1 as a member";
+			mes "of Team 2. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs1",91,49;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		}
+	case 2:
+		mes "[Guild Battle Guide]";
+		mes "You've chosen Map 2.";
+		mes "Now, which team are";
+		mes "you on? You can choose";
+		mes "either Team 1 or Team 2.";
+		next;
+		switch(select("Team 1:Team 2")) {
+		case 1:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 2 as a member";
+			mes "of Team 1. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs2",9,49;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		case 2:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 2 as a member";
+			mes "of Team 2. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs2",90,49;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		}
+	case 3:
+		mes "[Guild Battle Guide]";
+		mes "You've chosen Map 3.";
+		mes "Now, which team are";
+		mes "you on? You can choose";
+		mes "either Team 1 or Team 2.";
+		next;
+		switch(select("Team 1:Team 2")) {
+		case 1:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 3 as a member";
+			mes "of Team 1. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs3",16,50;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		case 2:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 3 as a member";
+			mes "of Team 2. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs3",83,50;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		}
+	case 4:
+		mes "[Guild Battle Guide]";
+		mes "You've chosen Map 4.";
+		mes "Now, which team are";
+		mes "you on? You can choose";
+		mes "either Team 1 or Team 2.";
+		next;
+		switch(select("Team 1:Team 2")) {
+		case 1:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 4 as a member";
+			mes "of Team 1. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs4",8,49;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		case 2:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 4 as a member";
+			mes "of Team 2. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs4",91,49;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		}
+	case 5:
+		mes "[Guild Battle Guide]";
+		mes "You've chosen Map 5.";
+		mes "Now, which team are";
+		mes "you on? You can choose";
+		mes "either Team 1 or Team 2.";
+		next;
+		switch(select("Team 1:Team 2")) {
+		case 1:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 5 as a member";
+			mes "of Team 1. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs5",20,50;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		case 2:
+			mes "[Guild Battle Guide]";
+			mes "Alright, I'll move you";
+			mes "to Map 4 as a member";
+			mes "of Team 2. Are you ready";
+			mes "to be transported there now?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Guild Battle Guide]";
+				mes "Great! Have a good time~";
+				close2;
+				warp "guild_vs5",79,50;
+				end;
+			case 2:
+				mes "[Guild Battle Guide]";
+				mes "Alright, I hope to";
+				mes "see you again on";
+				mes "the PvP fields!";
+				close;
+			}
+		}
+	}
+}
diff --git a/npc/other/sealstatus.txt b/npc/other/sealstatus.txt
new file mode 100644
index 000000000..c2fe7bd8c
--- /dev/null
+++ b/npc/other/sealstatus.txt
@@ -0,0 +1,93 @@
+//===== eAthena Script ======================================= 
+//= God Item Seal Status
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= eAthena SVN
+//===== Description: ========================================= 
+//= [Aegis Conversion]
+//= Goid Item Seal Status.
+//===== Additional Comments: ================================= 
+//= 1.0 First version. [L0ne_W0lf]
+//============================================================ 
+
+prontera,113,294,3	script	Sign Post	837,{
+	mes "======== God Seal Status ========";
+	if ($god1 == 0) {
+		mes "Sleipnir Seal: Unseen";
+	}
+	else if ($god1 < 50) {
+		mes "Sleipnir Seal: Active";
+	}
+	else if ($god1 < 100) {
+		mes "Sleipnir Seal: Appeared";
+	}
+	else {
+		mes "Sleipnir Seal: Released";
+	}
+	if ($god2 == 0) {
+		mes "Megingjard Seal: Unseen";
+	}
+	else if ($god2 < 50) {
+		mes "Megingjard Seal: Active";
+	}
+	else if ($god2 < 100) {
+		mes "Megingjard Seal: Appeared";
+	}
+	else {
+		mes "Megingjard Seal: Released";
+	}
+	if ($god3 == 0) {
+		mes "Brisingamen Seal: Unseen";
+	}
+	else if ($god3 < 50) {
+		mes "Brisingamen Seal: Active";
+	}
+	else if ($god3 < 100) {
+		mes "Brisingamen Seal: Appeared";
+	}
+	else {
+		mes "Brisingamen Seal: Released";
+	}
+	if ($god4 == 0) {
+		mes "Mjolnir Seal: Unseen";
+	}
+	else if ($god4 < 50) {
+		mes "Mjolnir Seal: Active";
+	}
+	else if ($god4 < 100) {
+		mes "Mjolnir Seal: Appeared";
+	}
+	else {
+		mes "Mjolnir Seal: Released";
+	}
+	mes "";
+	mes "======= Your Seal Status ========";
+	if ($god_sl_1 < 51) {
+		mes "^ff0000Sleipnir Seal: Not Completed^000000";
+	}
+	else {
+		mes "^00ff00Sleipnir Seal: Completed^000000";
+	}
+	if ($god_eremes < 28) {
+		mes "^ff0000Megingjard Seal: Not Completed^000000";
+	}
+	else {
+		mes "^00ff00Megingjard Seal: Completed^000000";
+	}
+	if ($god_brising < 50) {
+		mes "^ff0000Brisingamen Seal: Not Completed^000000";
+	}
+	else {
+		mes "^00ff00Brisingamen Seal: Completed^000000";
+	}
+	if ($god_mjo_0 < 11) {
+		mes "^ff0000Mjolnir Seal: Not Completed^000000";
+	}
+	else {
+		mes "^00ff00Mjolnir Seal: Completed^000000";
+	}
+	close;
+}