HULD-compliance: updated npc/battleground/

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 129 insertions, 129 deletions

diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index d3bf777ab..92771f14b 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2012-2015  Hercules Dev Team
+//= Copyright (C) 2012-2016  Hercules Dev Team
 //= Copyright (C)  L0ne_W0lf
 //=
 //= Hercules is free software: you can redistribute it and/or modify
@@ -41,69 +41,69 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 		.@pointstoadd = countitem(War_Badge);
 		delitem 7773,.@pointstoadd;
 		kvm_point += .@pointstoadd;
-		mes "[Logistics]";
-		mes "Are those "+getitemname(7773)+"s I see?";
-		mes "We no longer accept that currency,";
-		mes "but I can exchange those for you,";
-		mes "So you have "+.@pointstoadd+" "+getitemname(7773)+"s?";
-		mes "Alright, all set, you now have ^580080"+ kvm_point +"^000000 KVM Points.";
+		mes("[Logistics]");
+		mesf("Are those %ss I see?", getitemname(7773));
+		mes("We no longer accept that currency,\r"
+			"but I can exchange those for you.");
+		mesf("So you have %d %ss?", .@pointstoadd, getitemname(7773));
+		mesf("Alright, all set, you now have ^580080%d^000000 KVM Points.", kvm_point);
 		next;
 	}
 	if (checkweight(Knife,1) == 0) {
-		mes "- Wait a minute !! -";
-		mes "- Currently you're carrying -";
-		mes "- too many items with you. -";
-		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes("- Wait a minute !! -");
+		mes("- Currently you're carrying -");
+		mes("- too many items with you. -");
+		mes("- Please try again -");
+		mes("- after you loose some weight. -");
 		close;
 	}
-	mes "[Logistics]";
-	mes "Hello?";
-	mes "I am in charge of distributing";
-	mes "reward items for KVM points. Any";
-	mes "wrong selection of items will not";
-	mes "be reversed. Please be carefull.";
-	mes "Select the next step please.";
+	mes("[Logistics]");
+	mes("Hello?");
+	mes("I am in charge of distributing\r"
+		"reward items for KVM points. Any\r"
+		"wrong selection of items will not\r"
+		"be reversed. Please be carefull.");
+	mes("Select the next step please.");
 	next;
 	.@name$ = strcharinfo(0);
 	switch(select("Read the KVM Catalogue.", "Purchase KVM Items.", "Confirm KVM Points.", "Explanation of KVM Rewards.", "Explanation of KVM Points.")) {
 	case 1:
-		mes "[Logistics]";
-		mes "Here is the catalogue of KVM items.";
-		mes "Each weapon requires 2,000 points";
-		mes "and each armor from 10 to 1,200";
-		mes "points. So, be carefull when";
-		mes "selecting a reward.";
+		mes("[Logistics]");
+		mes("Here is the catalogue of KVM items.");
+		mes("Each weapon requires 2,000 points\r"
+			"and each armor from 10 to 1,200\r"
+			"points. So, be carefull when\r"
+			"selecting a reward.");
 		close2;
 		readbook 11017,1;
 		end;
 	case 2:
-		mes "[Logistics]";
-		mes "Wich items do you want to see? As";
-		mes "for the detailed specification of";
-		mes "the items, please refer to the";
-		mes "^3131FFCatalogue^000000.";
+		mes("[Logistics]");
+		mes("Wich items do you want to see? As\r"
+			"for the detailed specification of\r"
+			"the items, please refer to the\r"
+			"^3131FFCatalogue^000000.");
 		next;
 		switch(select("Weapon", "Armor/Accessory", "Mass-Production Armor/Accessory", "Popularized Armor/Accessory")) {
 		case 1:
-			mes "[Logistics]";
-			mes "You have selected the Weapon Category.";
-			mes "Please select a sub-category.";
+			mes("[Logistics]");
+			mes("You have selected the Weapon Category.");
+			mes("Please select a sub-category.");
 			next;
 			switch(select("Dagger/Sword/Spear", "Staff/Mace/Axe/Shuriken", "Bow/Katar/Instrument/Whip", "Book/Knuckle", "Revolver/Rifle/Gun/Grenade Launcher")) {
 			case 1:
-				mes "[Logistics]";
-				mes "You have selected the Dagger/Sword/Spear category.";
-				mes "Please select a sub-category.";
+				mes("[Logistics]");
+				mes("You have selected the Dagger/Sword/Spear category.");
+				mes("Please select a sub-category.");
 				next;
 				switch(select("Dagger", "One-handed Sword", "Two-handed Sword", "One-handed Spear", "Two-handed Spear")) {
 				case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1
 				case 2:
-					mes "[Logistics]";
-					mes "You have selected the 'One-handed Sword' category.";
-					mes "There are 3 One-handed Swords: Glorious Flamberge, Glorious Rapier and Glorious Holy Avenger.";
-					mes "If you want their details, please refer to the KVM Catalogue.";
-					mes "Please select one of them.";
+					mes("[Logistics]");
+					mes("You have selected the 'One-handed Sword' category.");
+					mes("There are 3 One-handed Swords: Glorious Flamberge, Glorious Rapier and Glorious Holy Avenger.");
+					mes("If you want their details, please refer to the KVM Catalogue.");
+					mes("Please select one of them.");
 					next;
 					switch(select("Glorious Flamberge", "Glorious Rapier", "Glorious Holy Avenger")) {
 					case 1: callsub PurchaseItem,13416,0,0; //Krieger_Onehand_Sword1
@@ -115,17 +115,17 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 				case 5: callsub PurchaseItem,1486,0,1; //Krieger_Twohand_Spear1
 				}
 			case 2:
-				mes "[Logistics]";
-				mes "You have selected the 'Staff/Mace/Axe/Shuriken' category.";
-				mes "Please select a sub-category.";
+				mes("[Logistics]");
+				mes("You have selected the 'Staff/Mace/Axe/Shuriken' category.");
+				mes("Please select a sub-category.");
 				next;
 				switch(select("Staff", "Mace", "One-handed Axe", "Two-handed Axe", "Shuriken")) {
 				case 1:
-					mes "[Logistics]";
-					mes "You have selected the 'Staff' category.";
-					mes "There are 3 Staffs: a Two-handed Weapon Glorious Destruction Staff, a One-handed Glorious Arc Wand and a Glorious Healing Staff.";
-					mes "If you want their details, please refer to the KVM Catalogue.";
-					mes "Please select one of them.";
+					mes("[Logistics]");
+					mes("You have selected the 'Staff' category.");
+					mes("There are 3 Staffs: a Two-handed Weapon Glorious Destruction Staff, a One-handed Glorious Arc Wand and a Glorious Healing Staff.");
+					mes("If you want their details, please refer to the KVM Catalogue.");
+					mes("Please select one of them.");
 					next;
 					switch(select("Glorious Destruction Staff", "Glorious Arc Wand", "Glorious Healing Staff")) {
 					case 1: callsub PurchaseItem,2002,0,0; //Krieger_Twohand_Staff1
@@ -138,18 +138,18 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 				case 5: callsub PurchaseItem,13307,0,1; //Krieger_Huuma_Shuriken1
 				}
 			case 3:
-				mes "[Logistics]";
-				mes "You have selected the Bow/Katar/Instrument/Whip category.";
-				mes "Please select a sub-category.";
+				mes("[Logistics]");
+				mes("You have selected the Bow/Katar/Instrument/Whip category.");
+				mes("Please select a sub-category.");
 				next;
 				switch(select("Bow", "Katar", "Instrument", "Whip")) {
 				case 1: callsub PurchaseItem,1743,0,1; //Krieger_Bow1
 				case 2:
-					mes "[Logistics]";
-					mes "You have selected the 'Katar' category.";
-					mes "There are 2 Katars: Glorious Bloody Roar and Glorious Jamadhar.";
-					mes "If you want their details, please refer to the KVM Catalogue.";
-					mes "Please select one of them.";
+					mes("[Logistics]");
+					mes("You have selected the 'Katar' category.");
+					mes("There are 2 Katars: Glorious Bloody Roar and Glorious Jamadhar.");
+					mes("If you want their details, please refer to the KVM Catalogue.");
+					mes("Please select one of them.");
 					next;
 					switch(select("Glorious Bloody Roar", "Glorious Jamadhar")) {
 					case 1: callsub PurchaseItem,1281,0,0; //Krieger_Katar1
@@ -159,28 +159,28 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 				case 4: callsub PurchaseItem,1981,0,1; //Krieger_Whip1
 				}
 			case 4:
-				mes "[Logistics]";
-				mes "You have selected the Book/Knuckle category.";
-				mes "Please select a sub-category.";
+				mes("[Logistics]");
+				mes("You have selected the Book/Knuckle category.");
+				mes("Please select a sub-category.");
 				next;
 				switch(select("Book", "Knuckle")) {
 				case 1:
-					mes "[Logistics]";
-					mes "You have selected 'Book'.";
-					mes "There are 2 Books: Glorious Tablet and Glorious Apocalypse.";
-					mes "If you want their details, please refer to the KVM Catalogue.";
-					mes "Please select one of them.";
+					mes("[Logistics]");
+					mes("You have selected 'Book'.");
+					mes("There are 2 Books: Glorious Tablet and Glorious Apocalypse.");
+					mes("If you want their details, please refer to the KVM Catalogue.");
+					mes("Please select one of them.");
 					next;
 					switch(select("Glorious Tablet", "Glorious Apocalypse")) {
 					case 1: callsub PurchaseItem,1576,0,0; //Krieger_Book1
 					case 2: callsub PurchaseItem,1577,0,0; //Krieger_Book2
 					}
 				case 2:
-					mes "[Logistics]";
-					mes "You have selected the 'Knuckle' category.";
-					mes "There are 2 Knuckles: Glorious Claw and Glorious Fist.";
-					mes "If you want their details, please refer to the KVM Catalogue.";
-					mes "Please select one of them.";
+					mes("[Logistics]");
+					mes("You have selected the 'Knuckle' category.");
+					mes("There are 2 Knuckles: Glorious Claw and Glorious Fist.");
+					mes("If you want their details, please refer to the KVM Catalogue.");
+					mes("Please select one of them.");
 					next;
 					switch(select("Glorious Claw", "Glorious Fist")) {
 					case 1: callsub PurchaseItem,1826,0,0; //Krieger_Knuckle1
@@ -188,9 +188,9 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 					}
 				}
 			case 5:
-				mes "[Logistics]";
-				mes "You have selected the 'Revolver/Rifle/Gun/Grenade Launcher' category.";
-				mes "Please select a sub-category.";
+				mes("[Logistics]");
+				mes("You have selected the 'Revolver/Rifle/Gun/Grenade Launcher' category.");
+				mes("Please select a sub-category.");
 				next;
 				switch(select("Revolver", "Rifle", "Gatling Gun", "Shotgun", "Grenade Launcher")) {
 				case 1: callsub PurchaseItem,13110,0,1; //Krieger_Pistol1
@@ -201,9 +201,9 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 				}
 			}
 		case 2:
-			mes "[Logistics]";
-			mes "You have selected the 'Armor/Accessory' category.";
-			mes "Please select a sub-category.";
+			mes("[Logistics]");
+			mes("You have selected the 'Armor/Accessory' category.");
+			mes("Please select a sub-category.");
 			next;
 			switch(select("Armor", "Cloak", "Shoes", "Accessory")) {
 			case 1: callsub PurchaseItem,2394,1,2; //Krieger_Suit1
@@ -212,9 +212,9 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 			case 4: callsub PurchaseItem,2772,4,2; //Krieger_Ring1
 			}
 		case 3:
-			mes "[Logistics]";
-			mes "You have selected the 'Mass-Production Armor/Accessory' category.";
-			mes "Please select a sub-category.";
+			mes("[Logistics]");
+			mes("You have selected the 'Mass-Production Armor/Accessory' category.");
+			mes("Please select a sub-category.");
 			next;
 			switch(select("Mass-Production Armor", "Mass-Production Shoes", "Mass-Production Accessory")) {
 			case 1: callsub PurchaseItem,2395,5,3; //Krieger_Suit2
@@ -222,9 +222,9 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 			case 3: callsub PurchaseItem,2773,7,3; //Krieger_Ring2
 			}
 		case 4:
-			mes "[Logistics]";
-			mes "You have selected the 'Popularized Armor/Accessory' category.";
-			mes "Please select a sub-category.";
+			mes("[Logistics]");
+			mes("You have selected the 'Popularized Armor/Accessory' category.");
+			mes("Please select a sub-category.");
 			next;
 			switch(select("Popularized Armor", "Popularized Shoes", "Popularized Accessory")) {
 			case 1: callsub PurchaseItem,2396,8,4; //Krieger_Suit3
@@ -233,33 +233,33 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	4_M_JOB_KNIGHT2,{
 			}
 		}
 	case 3:
-		mes "[Logistics]";
-		mes ""+ .@name$ +", your current points are ^580080"+ kvm_point +"^000000 KVM Points.";
+		mes("[Logistics]");
+		mesf("%s, your current points are ^580080%d^000000 KVM Points.", .@name$, kvm_point);
 		close;
 	case 4:
-		mes "[Logistics]";
-		mes "There are 3 categories in KVM Rewards: Weapon/Armor.Accessory.";
+		mes("[Logistics]");
+		mes("There are 3 categories in KVM Rewards: Weapon/Armor.Accessory.");
 		next;
-		mes "[Logistics]";
-		mes "Weapon rewards require 2,000 KVM points for each.";
-		mes "There are 3 types of Armor rewards and they require 840/630/580 KVM points fo each.";
-		mes "Accessory rewards require 1,200 KVM points for each.";
+		mes("[Logistics]");
+		mes("Weapon rewards require 2,000 KVM points for each.");
+		mes("There are 3 types of Armor rewards and they require 840/630/580 KVM points fo each.");
+		mes("Accessory rewards require 1,200 KVM points for each.");
 		next;
-		mes "[Logistics]";
-		mes "Kreiger Weapons are LV 4 Weapons, they can be upgraded and will have special effects: Slaughter, Destruction and Blessing.";
+		mes("[Logistics]");
+		mes("Kreiger Weapons are LV 4 Weapons, they can be upgraded and will have special effects: Slaughter, Destruction and Blessing.");
 		next;
-		mes "[Logistics]";
-		mes "When you can wear all 3 armors, you can have a special set of options.";
-		mes "Also, when Kreiger Accessory rewards are worn with medalsm it will bring you special set rewards.";
+		mes("[Logistics]");
+		mes("When you can wear all 3 armors, you can have a special set of options.");
+		mes("Also, when Kreiger Accessory rewards are worn with medalsm it will bring you special set rewards.");
 		next;
-		mes "[Logistics]";
-		mes "Finally, there are Mass-Production Armor and Accessory rewards.";
-		mes "Players whose Lvl is higher than 60 can equip Mass-Production Armors and there is a Lvl limit for Popularized Armor as well.";
+		mes("[Logistics]");
+		mes("Finally, there are Mass-Production Armor and Accessory rewards.");
+		mes("Players whose Lvl is higher than 60 can equip Mass-Production Armors and there is a Lvl limit for Popularized Armor as well.");
 		close;
 	case 5:
-		mes "[Logistics]";
-		mes "KVM Points are rewarded when you win, lose or draw in Kreiger Von Midgard (KVM).";
-		mes "You can have special Rewards by using these points.";
+		mes("[Logistics]");
+		mes("KVM Points are rewarded when you win, lose or draw in Kreiger Von Midgard (KVM).");
+		mes("You can have special Rewards by using these points.");
 		close;
 	}
 
@@ -267,64 +267,64 @@ PurchaseItem:
 	// Pricing for Weapon, Suit1, Muffler1, Shoes1, Ring1m Suit2, Shoes2, Ring2, Suit3, Shoes3, Ring3
 	setarray .@prices[0],2000,840,630,580,1200,120,70,200,15,10,30;
 
-	mes "[Logistics]";
+	mes("[Logistics]");
 
 	if (!getarg(2))
-		mes "You have selected ^ff0000"+getitemname(getarg(0))+"^000000.";
+		mesf("You have selected ^ff0000%s^000000.", getitemname(getarg(0)));
 	else if (getarg(2) == 1)
-		mes "There is only one "+callfunc("F_GetWeaponType",getarg(0))+": "+getitemname(getarg(0))+".";
+		mesf("There is only one %s: %s.", callfunc("F_GetWeaponType",getarg(0)), getitemname(getarg(0)));
 	else if (getarg(2) == 2) {
-		mes "You have selected '"+callfunc("F_GetArmorType",getarg(0))+"'.";
-		mes "The armor for one whose Lvl is more than 80 is: ^ff0000"+getitemname(getarg(0))+"^000000.";
+		mesf("You have selected '%s'.", callfunc("F_GetArmorType",getarg(0)));
+		mesf("The armor for one whose Lvl is more than 80 is: ^ff0000%s^000000.", getitemname(getarg(0)));
 	}
 	else if (getarg(2) == 3) {
-		mes "You have selected 'Mass-Production "+callfunc("F_GetArmorType",getarg(0))+"'.";
-		mes "There is only one Mass-Production "+callfunc("F_GetArmorType",getarg(0))+": ^ff0000"+getitemname(getarg(0))+"^000000.";
+		mesf("You have selected 'Mass-Production %s'.", callfunc("F_GetArmorType",getarg(0)));
+		mesf("There is only one Mass-Production %s: ^ff0000%s^000000.", callfunc("F_GetArmorType",getarg(0)), getitemname(getarg(0)));
 	}
 	else if (getarg(2) == 4) {
-		mes "You have selected 'Popularized "+callfunc("F_GetArmorType",getarg(0))+"'.";
-		mes "There is only one Popularized "+callfunc("F_GetArmorType",getarg(0))+": ^ff0000"+getitemname(getarg(0))+"^000000.";
+		mesf("You have selected 'Popularized %s'.", callfunc("F_GetArmorType",getarg(0)));
+		mesf("There is only one Popularized %s: ^ff0000%s^000000.", callfunc("F_GetArmorType",getarg(0)), getitemname(getarg(0)));
 	}
 
 	if (!getarg(1))
-		mes "It requires ^0000ff2,000^000000 KVM Points, and "+ .@name$ +", your points are: ^580080"+ kvm_point +"^000000.";
+		mesf("It requires ^0000ff2,000^000000 KVM Points, and %s, your points are: ^580080%d^000000.", .@name$, kvm_point);
 	else if (getarg(1) == 4)
-		mes "It requires ^0000ff1,200^000000 KVM Points, and "+ .@name$ +", your points are: ^580080"+ kvm_point +"^000000.";
+		mesf("It requires ^0000ff1,200^000000 KVM Points, and %s, your points are: ^580080%d^000000.", .@name$, kvm_point);
 	else
-		mes "It requires ^0000ff"+.@prices[getarg(1)]+"^000000 KVM Points, and "+ .@name$ +", your points are: ^580080"+ kvm_point +"^000000.";
+		mesf("It requires ^0000ff%d^000000 KVM Points, and %s, your points are: ^580080%d^000000.", .@prices[getarg(1)], .@name$, kvm_point);
 
-	mes "Are you sure you want this item?";
+	mes("Are you sure you want this item?");
 	next;
 	switch(select("No, I won't purchase it.", "Yes, I will purchase it.")) {
 	case 1:
-		mes "[Logistics]";
-		mes "You have selected 'I won't purchase it'.";
-		mes "When purchasing an item, please be careful there are no refunds.";
+		mes("[Logistics]");
+		mes("You have selected 'I won't purchase it'.");
+		mes("When purchasing an item, please be careful there are no refunds.");
 		break;
 	case 2:
 		if (kvm_point >= .@prices[getarg(1)]) {
 			kvm_point -= .@prices[getarg(1)];
 			getitem getarg(0),1;
-			mes "[Logistics]";
-			mes "You have purchased a "+getitemname(getarg(0))+".";
+			mes("[Logistics]");
+			mesf("You have purchased a %s.", getitemname(getarg(0)));
 			if (!getarg(1))
-				mes "Your KVM Points are reduced by ^0000ff"+getarg(1)+"^000000 points, your KVM Points are now ^580080"+kvm_point+"^000000.";
+				mesf("Your KVM Points are reduced by ^0000ff%d^000000 points, your KVM Points are now ^580080%d^000000.", getarg(1), kvm_point);
 			if (getarg(1) == 4)
-				mes "Your KVM Points are reduced by ^0000ff1,200^000000 points, your KVM Points are now ^580080"+kvm_point+"^000000.";
+				mesf("Your KVM Points are reduced by ^0000ff1,200^000000 points, your KVM Points are now ^580080%d^000000.", kvm_point);
 			else
-				mes "Your KVM Points are reduced by ^0000ff"+.@prices[getarg(1)]+"^000000 points, your KVM Points are now ^580080"+kvm_point+"^000000.";
+				mesf("Your KVM Points are reduced by ^0000ff%d^000000 points, your KVM Points are now ^580080%d^000000.", .@prices[getarg(1)], kvm_point);
 		}
 		else {
-			mes "[Logistics]";
+			mes("[Logistics]");
 			if (!getarg(1))
-				mes "You need ^0000ff2,000^000000 KVM Points to purchase this item.";
+				mes("You need ^0000ff2,000^000000 KVM Points to purchase this item.");
 			else if (getarg(1) == 4)
-				mes "You need ^0000ff1,200^000000 KVM Points to purchase this item.";
+				mes("You need ^0000ff1,200^000000 KVM Points to purchase this item.");
 			else
-				mes "You need ^0000ff"+.@prices[getarg(1)]+"^000000 KVM Points to purchase this item.";
-			mes "However, your KVM Points are now ^580080"+ kvm_point +"^000000.";
-			mes "Which are not enough to buy it.";
-			mes "When you get enough points, please come back again.";
+				mesf("You need ^0000ff%d^000000 KVM Points to purchase this item.", .@prices[getarg(1)]);
+			mesf("However, your KVM Points are now ^580080%d^000000.", kvm_point);
+			mes("Which are not enough to buy it.");
+			mes("When you get enough points, please come back again.");
 		}
 	}
 	close;