* A rather large overhaul of the battlegrounds.

- in bg_common.txt, stripped out KvM npcs, fixed coordinates.
- Needs to be tested, none of the BG files are on by default.
- Created subfolder battleground/KvM/ which now holds KVM files.
- Added kvm_enter.txt, which warps players to the waiting rooms.
- Added kvm_item_pay.txt, which holds the point redemption NPC.
- Made the KvM battlegrounds work closer to official, needs work.
* Corrected variable typos in the acolyte arena. (bugreport:4374)
* Corrected donpcevent typo in the party arena. (bugreport:4374)
* Added two global functions which will return equip data as strings.
- F_GetWeaponType: returns the type of weapon by 'look', (ie "Dagger")
- F_GetArmorType: returns the kind of armor via 'equip loc'. (ie "Armor")
* Fixed duplicate documentation for getitemslot. (bugreport:4362)

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

1 files changed, 30 insertions, 453 deletions

diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index c9dd7c232..3c6ce01a6 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -10,7 +10,6 @@ bat_room	mapflag	nowarpto
 bat_room	mapflag	nobranch
 bat_room	mapflag	nopenalty
 bat_room	mapflag	noteleport
-bat_room	mapflag	nosave	SavePoint
 
 // BattleGround Warper - Entrance
 // *********************************************************************
@@ -178,9 +177,9 @@ function	script	Time2Str	{
 	return .@Time$;
 }
 
-// Guillaume Knight - Tierra Valley
+// Guillaume Knight - Tierra Gorge
 // *********************************************************************
-bat_room,159,178,5	script	Guillaume Knight#1	417,{
+bat_room,127,178,5	script	Guillaume Knight#1	417,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -199,7 +198,7 @@ bat_room,159,178,5	script	Guillaume Knight#1	417,{
 
 // Tierra Officer - Guillaume
 // *********************************************************************
-bat_room,156,178,5	script	Tierra Valley Officer#1	418,{
+bat_room,124,178,5	script	Tierra Gorge Officer#1	418,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -244,13 +243,13 @@ bat_room,156,178,5	script	Tierra Valley Officer#1	418,{
 
 	mes "Good luck!";
 	close2;
-	warp "bat_room",85,224;
+	warp "bat_room",57,223;
 	end;
 }
 
-// Croix Knight - Tierra Valley
+// Croix Knight - Tierra Gorge
 // *********************************************************************
-bat_room,159,121,1	script	Croix Knight#1	413,{
+bat_room,127,121,1	script	Croix Knight#1	413,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -269,7 +268,7 @@ bat_room,159,121,1	script	Croix Knight#1	413,{
 
 // Tierra Officer - Croix
 // *********************************************************************
-bat_room,156,121,1	script	Tierra Valley Officer#2	414,{
+bat_room,125,121,1	script	Tierra Gorge Officer#2	414,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -314,13 +313,13 @@ bat_room,156,121,1	script	Tierra Valley Officer#2	414,{
 
 	mes "Good luck!";
 	close2;
-	warp "bat_room",85,208;
+	warp "bat_room",57,207;
 	end;
 }
 
 // Guillaume Knight - Tierra
 // *********************************************************************
-bat_room,167,178,5	script	Guillaume Knight#2	417,{
+bat_room,143,178,5	script	Guillaume Knight#2	417,{
 	mes "[Guillaume Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -339,7 +338,7 @@ bat_room,167,178,5	script	Guillaume Knight#2	417,{
 
 // Tierra Officer - Guillaume
 // *********************************************************************
-bat_room,164,178,5	script	Tierra Valley Officer#3	418,{
+bat_room,140,178,5	script	Tierra Gorge Officer#3	418,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -384,13 +383,13 @@ bat_room,164,178,5	script	Tierra Valley Officer#3	418,{
 
 	mes "Good luck!";
 	close2;
-	warp "bat_room",57,94;
+	warp "bat_room",114,223;
 	end;
 }
 
 // Croix Knight - Tierra
 // *********************************************************************
-bat_room,167,121,1	script	Croix Knight#2	413,{
+bat_room,143,121,1	script	Croix Knight#2	413,{
 	mes "[Croix Knight]";
 	mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
 	next;
@@ -409,7 +408,7 @@ bat_room,167,121,1	script	Croix Knight#2	413,{
 
 // Tierra Officer - Croix
 // *********************************************************************
-bat_room,164,121,1	script	Tierra Valley Officer#4	414,{
+bat_room,140,121,1	script	Tierra Gorge Officer#4	414,{
 	mes "[Tierra Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -454,13 +453,13 @@ bat_room,164,121,1	script	Tierra Valley Officer#4	414,{
 
 	mes "Good luck!";
 	close2;
-	warp "bat_room",57,77;
+	warp "bat_room",114,204;
 	end;
 }
 
 // Guillaune Knight - Flavius
 // *********************************************************************
-bat_room,175,178,5	script	Guillaume Knight#3	417,{
+bat_room,135,178,5	script	Guillaume Knight#3	417,{
 	mes "[Guillaume Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -480,7 +479,7 @@ bat_room,175,178,5	script	Guillaume Knight#3	417,{
 
 // Flavius Officer - Guillaume
 // *********************************************************************
-bat_room,172,178,5	script	Flavius Officer#1	418,{
+bat_room,133,178,5	script	Flavius Officer#1	418,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 2 )
 	{
@@ -525,13 +524,13 @@ bat_room,172,178,5	script	Flavius Officer#1	418,{
 
 	mes "Good luck!";
 	close2;
-	warp "bat_room",85,94;
+	warp "bat_room",85,223;
 	end;
 }
 
 // Croix Knight - Flavius
 // *********************************************************************
-bat_room,175,121,1	script	Croix Knight#3	413,{
+bat_room,135,121,1	script	Croix Knight#3	413,{
 	mes "[Croix Knight]";
 	mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
 	next;
@@ -551,7 +550,7 @@ bat_room,175,121,1	script	Croix Knight#3	413,{
 
 // Flavius Officerer - Croix
 // *********************************************************************
-bat_room,172,121,1	script	Flavius Officer#2	414,{
+bat_room,133,121,1	script	Flavius Officer#2	414,{
 	mes "[Flavius Officer]";
 	if( Bat_Team == 1 )
 	{
@@ -596,7 +595,7 @@ bat_room,172,121,1	script	Flavius Officer#2	414,{
 
 	mes "Good luck!";
 	close2;
-	warp "bat_room",85,77;
+	warp "bat_room",85,207;
 	end;
 }
 
@@ -667,7 +666,7 @@ bat_room,148,178,5	script	Flavius Officer#3	418,{
 
 	mes "Good luck!";
 	close2;
-	warp "bat_room",253,94;
+	warp "bat_room",141,207;
 	end;
 }
 
@@ -738,415 +737,7 @@ bat_room,148,121,1	script	Flavius Officer#4	414,{
 
 	mes "Good luck!";
 	close2;
-	warp "bat_room",253,77;
-	end;
-}
-
-// Guillaume Knight - KvM
-// *********************************************************************
-bat_room,143,178,5	script	Guillaume Knight#5	417,{
-	mes "[Guillaume Knight]";
-	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "The first team to lose all their soldiers loses.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "Since you cannot come back to battle after you die, taking care on the battlefield is essential.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "Are you ready for battle? Then apply with the recruiter next to me!";
-	close;
-}
-
-// KvM Officerer - Guillaume
-// *********************************************************************
-bat_room,140,178,5	script	KVM [80-99] Officer#1	418,{
-	mes "[KVM Officer]";
-	if( Bat_Team == 2 )
-	{
-		mes "Get out of here you stinky Croix!";
-		close;
-	}
-
-	if( Bat_Team == 0 )
-	{
-		mes "Please sign up for an army with Prince Croix or General Guillaume!";
-		close;
-	}
-
-	mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!";
-	next;
-	if( select("I want to join your army!:End Conversation") == 2 )
-		close;
-
-	mes "[KVM Officer]";
-	if( BG_Delay_Tick >= gettimetick(2) )
-	{
-		mes "You are a Deserter!!";
-		mes "Because of running away, you need to wait ^0000FF" + callfunc("Time2Str",BG_Delay_Tick) + "^000000 to join again a BattleGround.";
-		close;
-	}
-
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
-		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
-		next;
-		mes "[KVM Officer]";
-		mes "Stand-by for KvM Battle until the time limit passes.";
-		close;
-	}
-
-	if( BaseLevel < 80 )
-	{
-		mes "I'm very please you want to join our army, but I'm sorry: This arena is for players with baselevel from 80 to 99.";
-		close;
-	}
-
-	mes "Good luck!";
-	close2;
-	warp "bat_room",253,224;
-	end;
-}
-
-// Croix Knight - KvM
-// *********************************************************************
-bat_room,143,121,1	script	Croix Knight#5	413,{
-	mes "[Croix Knight]";
-	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
-	next;
-	mes "[Croix Knight]";
-	mes "The first team to lose all their soldiers loses.";
-	next;
-	mes "[Croix Knight]";
-	mes "Since you cannot come back to battle after you die, taking care on the battlefield is essential.";
-	next;
-	mes "[Croix Knight]";
-	mes "Are you ready for battle? Then apply with the recruiter next to me!";
-	close;
-}
-
-// KvM Officer - Croix
-// *********************************************************************
-bat_room,140,121,1	script	KVM [80-99] Officer#2	414,{
-	mes "[KVM Officer]";
-	if( Bat_Team == 1 )
-	{
-		mes "Get out of here you stupid Guillaume!";
-		close;
-	}
-
-	if( Bat_Team == 0 )
-	{
-		mes "Please sign up for an army with Prince Croix or General Guillaume!";
-		close;
-	}
-
-	mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!";
-	next;
-	if( select("I want to join your army!:End Conversation") == 2 )
-		close;
-
-	mes "[KVM Officer]";
-	if( BG_Delay_Tick >= gettimetick(2) )
-	{
-		mes "You are a Deserter!!";
-		mes "Because of running away, you need to wait ^0000FF" + callfunc("Time2Str",BG_Delay_Tick) + "^000000 to join again a BattleGround.";
-		close;
-	}
-
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
-		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
-		next;
-		mes "[KVM Officer]";
-		mes "Stand-by for KvM Battle until the time limit passes.";
-		close;
-	}
-
-	if( BaseLevel < 80 )
-	{
-		mes "I'm very please you want to join our army, but I'm sorry: This arena is for players with baselevel from 80 to 99.";
-		close;
-	}
-
-	mes "Good luck!";
-	close2;
-	warp "bat_room",253,208;
-	end;
-}
-
-// Guillaume Knight - KvM
-// *********************************************************************
-bat_room,135,178,5	script	Guillaume Knight#6	417,{
-	mes "[Guillaume Knight]";
-	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "The first team to lose all their soldiers loses.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "Since you cannot come back to battle after you die, taking care on the battlefield is essential.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "Are you ready for battle? Then apply with the recruiter next to me!";
-	close;
-}
-
-// KvM Officerer - Guillaume
-// *********************************************************************
-bat_room,132,178,5	script	KVM [60-79] Officer#1	418,{
-	mes "[KVM Officer]";
-	if( Bat_Team == 2 )
-	{
-		mes "Get out of here you stinky Croix!";
-		close;
-	}
-
-	if( Bat_Team == 0 )
-	{
-		mes "Please sign up for an army with Prince Croix or General Guillaume!";
-		close;
-	}
-
-	mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!";
-	next;
-	if( select("I want to join your army!:End Conversation") == 2 )
-		close;
-
-	mes "[KVM Officer]";
-	if( BG_Delay_Tick >= gettimetick(2) )
-	{
-		mes "You are a Deserter!!";
-		mes "Because of running away, you need to wait ^0000FF" + callfunc("Time2Str",BG_Delay_Tick) + "^000000 to join again a BattleGround.";
-		close;
-	}
-
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
-		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
-		next;
-		mes "[KVM Officer]";
-		mes "Stand-by for KvM Battle until the time limit passes.";
-		close;
-	}
-
-	if( BaseLevel < 60 || BaseLevel > 79 )
-	{
-		mes "I'm very please you want to join our army, but I'm sorry: This arena is for players with baselevel from 60 to 79.";
-		close;
-	}
-
-	mes "Good luck!";
-	close2;
-	warp "bat_room",225,224;
-	end;
-}
-
-// Croix Knight - KvM
-// *********************************************************************
-bat_room,135,121,1	script	Croix Knight#6	413,{
-	mes "[Croix Knight]";
-	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
-	next;
-	mes "[Croix Knight]";
-	mes "The first team to lose all their soldiers loses.";
-	next;
-	mes "[Croix Knight]";
-	mes "Since you cannot come back to battle after you die, taking care on the battlefield is essential.";
-	next;
-	mes "[Croix Knight]";
-	mes "Are you ready for battle? Then apply with the recruiter next to me!";
-	close;
-}
-
-// KvM Officer - Croix
-// *********************************************************************
-bat_room,132,121,1	script	KVM [60-79] Officer#2	414,{
-	mes "[KVM Officer]";
-	if( Bat_Team == 1 )
-	{
-		mes "Get out of here you stupid Guillaume!";
-		close;
-	}
-
-	if( Bat_Team == 0 )
-	{
-		mes "Please sign up for an army with Prince Croix or General Guillaume!";
-		close;
-	}
-
-	mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!";
-	next;
-	if( select("I want to join your army!:End Conversation") == 2 )
-		close;
-
-	mes "[KVM Officer]";
-	if( BG_Delay_Tick >= gettimetick(2) )
-	{
-		mes "You are a Deserter!!";
-		mes "Because of running away, you need to wait ^0000FF" + callfunc("Time2Str",BG_Delay_Tick) + "^000000 to join again a BattleGround.";
-		close;
-	}
-
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
-		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
-		next;
-		mes "[KVM Officer]";
-		mes "Stand-by for KvM Battle until the time limit passes.";
-		close;
-	}
-
-	if( BaseLevel < 60 || BaseLevel > 79 )
-	{
-		mes "I'm very please you want to join our army, but I'm sorry: This arena is for players with baselevel from 60 to 79.";
-		close;
-	}
-
-	mes "Good luck!";
-	close2;
-	warp "bat_room",225,208;
-	end;
-}
-
-// Guillaume Knight - KvM
-// *********************************************************************
-bat_room,127,178,5	script	Guillaume Knight#7	417,{
-	mes "[Guillaume Knight]";
-	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "The first team to lose all their soldiers loses.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "Since you cannot come back to battle after you die, taking care on the battlefield is essential.";
-	next;
-	mes "[Guillaume Knight]";
-	mes "Are you ready for battle? Then apply with the recruiter next to me!";
-	close;
-}
-
-// KvM Officerer - Guillaume
-// *********************************************************************
-bat_room,124,178,5	script	KVM [1-59] Officer#1	418,{
-	mes "[KVM Officer]";
-	if( Bat_Team == 2 )
-	{
-		mes "Get out of here you stinky Croix!";
-		close;
-	}
-
-	if( Bat_Team == 0 )
-	{
-		mes "Please sign up for an army with Prince Croix or General Guillaume!";
-		close;
-	}
-
-	mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!";
-	next;
-	if( select("I want to join your army!:End Conversation") == 2 )
-		close;
-
-	mes "[KVM Officer]";
-	if( BG_Delay_Tick >= gettimetick(2) )
-	{
-		mes "You are a Deserter!!";
-		mes "Because of running away, you need to wait ^0000FF" + callfunc("Time2Str",BG_Delay_Tick) + "^000000 to join again a BattleGround.";
-		close;
-	}
-
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
-		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
-		next;
-		mes "[KVM Officer]";
-		mes "Stand-by for KvM Battle until the time limit passes.";
-		close;
-	}
-
-	if( BaseLevel > 59 )
-	{
-		mes "I'm very please you want to join our army, but I'm sorry: This arena is for players with baselevel from 1 to 59.";
-		close;
-	}
-
-	mes "Good luck!";
-	close2;
-	warp "bat_room",197,224;
-	end;
-}
-
-// Croix Knight - KvM
-// *********************************************************************
-bat_room,127,121,1	script	Croix Knight#7	413,{
-	mes "[Croix Knight]";
-	mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
-	next;
-	mes "[Croix Knight]";
-	mes "The first team to lose all their soldiers loses.";
-	next;
-	mes "[Croix Knight]";
-	mes "Since you cannot come back to battle after you die, taking care on the battlefield is essential.";
-	next;
-	mes "[Croix Knight]";
-	mes "Are you ready for battle? Then apply with the recruiter next to me!";
-	close;
-}
-
-// KvM Officer - Croix
-// *********************************************************************
-bat_room,124,121,1	script	KVM [1-59] Officer#2	414,{
-	mes "[KVM Officer]";
-	if( Bat_Team == 1 )
-	{
-		mes "Get out of here you stupid Guillaume!";
-		close;
-	}
-
-	if( Bat_Team == 0 )
-	{
-		mes "Please sign up for an army with Prince Croix or General Guillaume!";
-		close;
-	}
-
-	mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!";
-	next;
-	if( select("I want to join your army!:End Conversation") == 2 )
-		close;
-
-	mes "[KVM Officer]";
-	if( BG_Delay_Tick >= gettimetick(2) )
-	{
-		mes "You are a Deserter!!";
-		mes "Because of running away, you need to wait ^0000FF" + callfunc("Time2Str",BG_Delay_Tick) + "^000000 to join again a BattleGround.";
-		close;
-	}
-
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
-		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
-		next;
-		mes "[KVM Officer]";
-		mes "Stand-by for KvM Battle until the time limit passes.";
-		close;
-	}
-
-	if( BaseLevel > 59 )
-	{
-		mes "I'm very please you want to join our army, but I'm sorry: This arena is for players with baselevel from 1 to 59.";
-		close;
-	}
-
-	mes "Good luck!";
-	close2;
-	warp "bat_room",197,208;
+	warp "bat_room",141,227;
 	end;
 }
 
@@ -1181,10 +772,10 @@ bat_room,57,90,0	duplicate(warp2bat_room)	bat2	45,1,1
 // Free BG
 bat_room,57,220,0	duplicate(warp2bat_room)	bat3	45,1,1
 bat_room,57,211,0	duplicate(warp2bat_room)	bat4	45,1,1
-// Tierra Valley bat_a02
+// Tierra Gorge bat_a02
 bat_room,85,81,0	duplicate(warp2bat_room)	bat5	45,1,1
 bat_room,85,90,0	duplicate(warp2bat_room)	bat6	45,1,1
-// Tierra Valley bat_a01
+// Tierra Gorge bat_a01
 bat_room,85,220,0	duplicate(warp2bat_room)	bat7	45,1,1
 bat_room,85,211,0	duplicate(warp2bat_room)	bat8	45,1,1
 // Free BG
@@ -1203,31 +794,22 @@ bat_room,141,211,0	duplicate(warp2bat_room)	bat16	45,1,1
 bat_room,169,81,0	duplicate(warp2bat_room)	bat17	45,1,1
 bat_room,169,90,0	duplicate(warp2bat_room)	bat18	45,1,1
 // Free BG
-bat_room,169,220,0	duplicate(warp2bat_room)	bat19	45,1,1
-bat_room,169,211,0	duplicate(warp2bat_room)	bat20	45,1,1
-// Free BG
 bat_room,197,81,0	duplicate(warp2bat_room)	bat21	45,1,1
 bat_room,197,90,0	duplicate(warp2bat_room)	bat22	45,1,1
-// KvM bat_c03
-bat_room,197,220,0	duplicate(warp2bat_room)	bat23	45,1,1
-bat_room,197,211,0	duplicate(warp2bat_room)	bat24	45,1,1
 // Free BG
 bat_room,225,81,0	duplicate(warp2bat_room)	bat25	45,1,1
 bat_room,225,90,0	duplicate(warp2bat_room)	bat26	45,1,1
-// KvM bat_c02
-bat_room,225,220,0	duplicate(warp2bat_room)	bat27	45,1,1
-bat_room,225,211,0	duplicate(warp2bat_room)	bat28	45,1,1
 // Flavius bat_b01
 bat_room,253,81,0	duplicate(warp2bat_room)	bat29	45,1,1
 bat_room,253,90,0	duplicate(warp2bat_room)	bat30	45,1,1
-// KvM bat_c01
+// Unknown
 bat_room,253,220,0	duplicate(warp2bat_room)	bat31	45,1,1
 bat_room,253,211,0	duplicate(warp2bat_room)	bat32	45,1,1
 
 // Badges Repairman
 // *********************************************************************
 
-bat_room,138,144,5	script	Repairman#bg	99,{
+bat_room,138,144,5	script	Repairman#bg	86,{
 	callfunc "repairmain","Repairman";
 	end;
 }
@@ -1240,7 +822,7 @@ bat_room,160,150,3	script	Erundek	109,{
 	mes "Welcome, mighty warrior.";
 	mes "What can I do for you today ?";
 	next;
-	switch( select("Check the Catalog","Exchange Bravery Badges","Exchange Valor Badges","Exchange Heroism Badges","Hmm, nothing I guess.") )
+	switch( select("Check the Catalog","Exchange Bravery Badges","Exchange Valor Badges","Hmm, nothing I guess.") )
 	{
 		case 1:
 			mes "[Erundek]";
@@ -1248,14 +830,14 @@ bat_room,160,150,3	script	Erundek	109,{
 			close2;
 			Readbook 11010,1;
 			end;
-		case 5:
+		case 4:
 			mes "[Erundek]";
 			mes "As you wish.";
 			mes "See you later.";
 			close;
 		case 2: // Bravery Badges
 			mes "[Erundek]";
-			mes "So you want to exchange ^0000FFBravery Badges^000000 from the Battle of Tierra Valley.";
+			mes "So you want to exchange ^0000FFBravery Badges^000000 from the Battle of Tierra Gorge.";
 			mes "What kind of item do you want to exchange?";
 			next;
 			deletearray .@Item_DB[0],127;
@@ -1289,13 +871,8 @@ bat_room,160,150,3	script	Erundek	109,{
 			}
 			
 			break;
-		case 4: // Heroism Badge
-			mes "[Erundek]";
-			mes "So you want to exchange ^FFA500Heroism Badges^000000 from the Battle of Kriger Von Midgard.";
-			mes "This shop is not available at the moment.";
-			close;
 	}
-	
+
 	mes "[Erundek]";
 	mes "What item do you want to exchange?";
 	mes "If you are not sure, check the catalog.";