Merge remote-tracking branch 'upstream/master'

1 files changed, 14 insertions, 14 deletions

diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 9a7d0fb51..76eed3733 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -1,22 +1,23 @@
 //===== Hercules Script ======================================
 // BattleGround System - Common NPCs
-//===== By: ================================================== 
+//===== By: ==================================================
 //= ????, L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Description: ========================================= 
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
 //= Battleground NPCs:
 //= - Generals and Aides
 //= - Battleground Warper
 //= - Kafra and Repairman.
 //= - GM Management NPC (disabled by default)
 //= - Badge Exchanger (Tierra and Flavius)
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.1 Updated several NPCs to Official.
 //= 1.2 Updated Repairman NPC
 //= 1.3 Optimized "Erundek" NPC. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
 //============================================================
 
 // Generals
@@ -320,17 +321,17 @@ bat_room,138,144,4	script	Repairman#bg	86,{
 	end;
 }
 
-/*
 // GM Management NPC
 //============================================================
 bat_room,1,151,3	script	Switch#batgnd	81,{
-	input .@input,0,2000;
-	if (.@input == 0) {
+	set .@i, callfunc("F_GM_NPC",1854,0);
+	if (.@i == -1) {
 		mes "The command has been cancelled.";
 		close;
-	}
-	else if (.@input == 1854) {
-		mes "May I help ypu?";
+	} else if (.@i == 0) {
+		end;
+	} else {
+		mes "May I help you?";
 		next;
 		switch(select("Close Battlefield:Open Battlefield:Reset a01:Reset b01:Reset a02:Reset b02")) {
 		case 1:
@@ -370,7 +371,6 @@ bat_room,1,151,3	script	Switch#batgnd	81,{
 		close;
 	}
 }
-*/
 
 // Badges Exchange
 //============================================================
@@ -505,7 +505,7 @@ bat_room,160,150,3	script	Erundek	109,{
 		mes "[Erundek]";
 		mes "We have many items, so please take a look and purchase deliberately.";
 		close2;
-		ReadBook 11010,1;
+		readbook 11010,1;
 		end;
 	}
 	set .@menu$,"";