Merge pull request #19 from obla/master

Whitelist update + OWL 13

cfg/owl.cfg

@@ -11,4 +11,4 @@ mp_tournament_whitelist cfg/whitelists/owl.txt
 mp_tournament_restart
 
 sm_startmatch owl-push
-say - ozfortress OWL 12 push modifier loaded -
+say - ozfortress OWL 13 push modifier loaded -

cfg/owlfinals.cfg

@@ -11,4 +11,4 @@ mp_tournament_whitelist cfg/whitelists/owl.txt
 mp_tournament_restart
 
 sm_startmatch owl-push-finals
-say - ozfortress OWL 12 push modifier loaded -
+say - ozfortress OWL 13 push modifier loaded -

cfg/owlkoth.cfg

@@ -11,4 +11,4 @@ mp_tournament_whitelist cfg/whitelists/owl.txt
 mp_tournament_restart
 
 sm_startmatch owl-koth
-say - ozfortress OWL 12 koth modifier loaded -
+say - ozfortress OWL 13 koth modifier loaded -

cfg/owlkothfinals.cfg

@@ -11,4 +11,4 @@ mp_tournament_whitelist cfg/whitelists/owl.txt
 mp_tournament_restart
 
 sm_startmatch owl-koth-finals
-say - ozfortress OWL 12 koth modifier loaded -
+say - ozfortress OWL 13 koth modifier loaded -

cfg/ugc_HL_base.cfg

@@ -14,7 +14,7 @@ mp_logdetail "3"
 exec "ugc_HL_custom.cfg"
 
 //Item Whitelist
-mp_tournament_whitelist "cfg/item_whitelist_ugc_HL.txt"
+mp_tournament_whitelist "cfg/whitelists/item_whitelist_ugc_HL.txt"
 
 //Required SourceTV Settings  - STV recording is mandatory	
 tv_chattimelimit						"1"
@@ -30,6 +30,7 @@ tf_allow_sliding_taunt					"0"
 tf_arena_first_blood					"0"	
 tf_arena_round_time						"0"
 tf_arena_use_queue						"0"
+tf_avoidteammates_pushaway 				"0"
 tf_clamp_airducks						"1"	
 tf_ctf_bonus_time						"0"
 tf_damage_disablespread					"1"	

cfg/whitelists/item_whitelist_ugc_HL.txt

@@ -1,8 +1,8 @@
-// Whitelist generated at Mon, 25 May 2015 13:55:12 +0200
+// Whitelist generated at Tue, 16 Jun 2015 08:09:20 +0200
-// Whitelist: UGC Highlander (Season 15) (ID: 2794)
+// Whitelist: UGC Highlander (Season 16) (ID: 3738)
 
 // Share or view this whitelist:
-//	http://whitelist.tf/ugc_9v9_s15
+//	http://whitelist.tf/ugc_9v9_s16
 
 // New items added to the game are: NOT allowed
 // Hats are: allowed
@@ -18,12 +18,12 @@
 
 // Blocked weapons for Multiple classes
 // - Secondary
-//  * B.A.S.E. Jumper
 //  * Reserve Shooter
 
 // Blocked weapons for Scout
 // - Primary
 //  * Baby Face's Blaster
+//  * Soda Popper
 // - Secondary
 //  * Crit-a-Cola
 
@@ -64,6 +64,7 @@
 	//---------------- Allowed weapons (Total: 115) -----------------\\
 	//______________________ Multiple classes _______________________\\
 	"Panic Attack Shotgun"						"1"
+	"The B.A.S.E. Jumper"						"1"
 	"The Half-Zatoichi"						"1"
 	"The Pain Train"						"1"
 	//____________________________ Scout ____________________________\\
@@ -80,7 +81,6 @@
 	"The Force-a-Nature"						"1"
 	"The Sandman"							"1"
 	"The Shortstop"							"1"
-	"The Soda Popper"						"1"
 	"The Winger"							"1"
 	"The Wrap Assassin"						"1"
 	//___________________________ Soldier ___________________________\\
@@ -354,11 +354,11 @@
 
 	//------------- Blocked weapons/reskins (Total: 15) -------------\\
 	//______________________ Multiple classes _______________________\\
-	"The B.A.S.E. Jumper"						"0"
 	"The Reserve Shooter"						"0"
 	//____________________________ Scout ____________________________\\
 	"Baby Face's Blaster"						"0"
 	"Crit-a-Cola"							"0"
+	"The Soda Popper"						"0"
 	//___________________________ Soldier ___________________________\\
 	"The Beggar's Bazooka"						"0"
 	//___________________________ Demoman ___________________________\\
@@ -1120,7 +1120,7 @@
 	"The Stealth Steeler"						"1"
 	"tw_spybot_hood"						"1"
 
-	//--------------------- Miscs (Total: 1216) ---------------------\\
+	//--------------------- Miscs (Total: 1248) ---------------------\\
 	//_________________________ All classes _________________________\\
 	"AU Highlander Community League First Place Season 1"		"1"
 	"AU Highlander Community League Participant Season 1"		"1"
@@ -1708,6 +1708,26 @@
 	"OWL 12 Premier Division Participant"				"1"
 	"OWL 12 Premier Division Second Place"				"1"
 	"OWL 12 Premier Division Third Place"				"1"
+	"OWL 13 Division 2 First Place"					"1"
+	"OWL 13 Division 2 Participant"					"1"
+	"OWL 13 Division 2 Second Place"				"1"
+	"OWL 13 Division 2 Third Place"					"1"
+	"OWL 13 Division 3 First Place"					"1"
+	"OWL 13 Division 3 Participant"					"1"
+	"OWL 13 Division 3 Second Place"				"1"
+	"OWL 13 Division 3 Third Place"					"1"
+	"OWL 13 Division 4 First Place"					"1"
+	"OWL 13 Division 4 Participant"					"1"
+	"OWL 13 Division 4 Second Place"				"1"
+	"OWL 13 Division 4 Third Place"					"1"
+	"OWL 13 Division 5 First Place"					"1"
+	"OWL 13 Division 5 Participant"					"1"
+	"OWL 13 Division 5 Second Place"				"1"
+	"OWL 13 Division 5 Third Place"					"1"
+	"OWL 13 Premier Division First Place"				"1"
+	"OWL 13 Premier Division Participant"				"1"
+	"OWL 13 Premier Division Second Place"				"1"
+	"OWL 13 Premier Division Third Place"				"1"
 	"Pet Robro"							"1"
 	"Photo Badge"							"1"
 	"Polycount Pin"							"1"
@@ -1736,17 +1756,29 @@
 	"Spirit Of Giving"						"1"
 	"Summer Shades"							"1"
 	"TF2Connexion Division 1 Bronze Medal Season 14"		"1"
+	"TF2Connexion Division 1 Bronze Medal Season 15"		"1"
 	"TF2Connexion Division 1 Gold Medal Season 14"			"1"
+	"TF2Connexion Division 1 Gold Medal Season 15"			"1"
 	"TF2Connexion Division 1 Participant Season 14"			"1"
+	"TF2Connexion Division 1 Participant Season 15"			"1"
 	"TF2Connexion Division 1 Silver Medal Season 14"		"1"
+	"TF2Connexion Division 1 Silver Medal Season 15"		"1"
 	"TF2Connexion Division 2 Bronze Medal Season 14"		"1"
+	"TF2Connexion Division 2 Bronze Medal Season 15"		"1"
 	"TF2Connexion Division 2 Gold Medal Season 14"			"1"
+	"TF2Connexion Division 2 Gold Medal Season 15"			"1"
 	"TF2Connexion Division 2 Participant Season 14"			"1"
+	"TF2Connexion Division 2 Participant Season 15"			"1"
 	"TF2Connexion Division 2 Silver Medal Season 14"		"1"
+	"TF2Connexion Division 2 Silver Medal Season 15"		"1"
 	"TF2Connexion Division 3 Bronze Medal Season 14"		"1"
+	"TF2Connexion Division 3 Bronze Medal Season 15"		"1"
 	"TF2Connexion Division 3 Gold Medal Season 14"			"1"
+	"TF2Connexion Division 3 Gold Medal Season 15"			"1"
 	"TF2Connexion Division 3 Participant Season 14"			"1"
+	"TF2Connexion Division 3 Participant Season 15"			"1"
 	"TF2Connexion Division 3 Silver Medal Season 14"		"1"
+	"TF2Connexion Division 3 Silver Medal Season 15"		"1"
 	"TF2Connexion Division 4 Bronze Medal Season 14"		"1"
 	"TF2Connexion Division 4 Gold Medal Season 14"			"1"
 	"TF2Connexion Division 4 Participant Season 14"			"1"

cfg/whitelists/owl.txt

@@ -1,4 +1,4 @@
-// Whitelist generated at Sun, 14 Jun 2015 14:21:52 +0200
+// Whitelist generated at Tue, 16 Jun 2015 07:43:32 +0200
 // Custom Whitelist ID: 3842
 
 // Share or view this whitelist:
@@ -2280,5 +2280,300 @@
 	"The Tartantaloons"						"1"
 	"The Whiskey Bib"						"1"
 	"dec2014 Viking Boots"						"1"
-	"tw_demo
+	"tw_demobot_armor"						"1"
+	"tw_sentrybuster"						"1"
+	//____________________________ Heavy ____________________________\\
+	"Aqua Flops"							"1"
+	"Combat Slacks"							"1"
+	"Der Maschinensoldaten-Helm"					"1"
+	"Die Regime-Panzerung"						"1"
+	"EOTL_Ursa Major"						"1"
+	"EOTL_sheavyshirt"						"1"
+	"Gone Commando"							"1"
+	"Jungle Booty"							"1"
+	"MvM GateBot Light Heavy"					"1"
+	"The Apparatchik's Apparel"					"1"
+	"The Bear Necessities"						"1"
+	"The Bolshevik Biker"						"1"
+	"The Borscht Belt"						"1"
+	"The Cuban Bristle Crisis"					"1"
+	"The Dictator"							"1"
+	"The Gabe Glasses"						"1"
+	"The Heavy Lifter"						"1"
+	"The Heavy-Weight Champ"					"1"
+	"The Hunger Force"						"1"
+	"The Leftover Trap"						"1"
+	"The Little Bear"						"1"
+	"The Mann of the House"						"1"
+	"The Purity Fist"						"1"
+	"The Rat Stompers"						"1"
+	"The Red Army Robin"						"1"
+	"The Samson Skewer"						"1"
+	"The Sandvich Safe"						"1"
+	"The Siberian Sophisticate"					"1"
+	"The Titanium Towel"						"1"
+	"The Toss-Proof Towel"						"1"
+	"The Tyurtlenek"						"1"
+	"The Unshaved Bear"						"1"
+	"The War Goggles"						"1"
+	"The Warmth Preserver"						"1"
+	"Weight Room Warmer"						"1"
+	"Yuri's Revenge"						"1"
+	"tw_heavybot_armor"						"1"
+	//__________________________ Engineer ___________________________\\
+	"EOTL_Insulated_innovator"					"1"
+	"EOTL_winter_pants"						"1"
+	"Ein"								"1"
+	"Face Full of Festive"						"1"
+	"Googly Gazer"							"1"
+	"Mining Light"							"1"
+	"Mister Bubbles"						"1"
+	"Pip-Boy"							"1"
+	"Prairie Heel Biters"						"1"
+	"Teddy Robobelt"						"1"
+	"Teddy Roosebelt"						"1"
+	"The Antarctic Researcher"					"1"
+	"The Beep Boy"							"1"
+	"The Brainiac Goggles"						"1"
+	"The Brainiac Hairpiece"					"1"
+	"The Builder's Blueprints"					"1"
+	"The Danger"							"1"
+	"The Dogfighter"						"1"
+	"The Dry Gulch Gulp"						"1"
+	"The Egghead's Overalls"					"1"
+	"The Endothermic Exowear"					"1"
+	"The Flared Frontiersman"					"1"
+	"The Gold Digger"						"1"
+	"The Grizzled Growth"						"1"
+	"The Idea Tube"							"1"
+	"The Joe-on-the-Go"						"1"
+	"The Level Three Chin"						"1"
+	"The Lonesome Loafers"						"1"
+	"The Pencil Pusher"						"1"
+	"The Pocket Purrer"						"1"
+	"The Pocket Pyro"						"1"
+	"The Prize Plushy"						"1"
+	"The Scotch Saver"						"1"
+	"The Special Eyes"						"1"
+	"The Stocking Stuffer"						"1"
+	"The Texas Half-Pants"						"1"
+	"The Tools of the Trade"					"1"
+	"The Trash Toter"						"1"
+	"The Trencher's Tunic"						"1"
+	"Wingstick"							"1"
+	"dec2014 Thermal Insulation Layer"				"1"
+	"dec2014 engineer_detectiveholster"				"1"
+	"dec2014 engineer_detectiveradio"				"1"
+	"dec2014 engineer_seal"						"1"
+	"tw_engineerbot_armor"						"1"
+	//____________________________ Medic ____________________________\\
+	"A Brush with Death"						"1"
+	"Archimedes"							"1"
+	"Couvre Corner"							"1"
+	"Das Fantzipantzen"						"1"
+	"Das Feelinbeterbager"						"1"
+	"Das Hazmattenhatten"						"1"
+	"Das Metalmeatencasen"						"1"
+	"Der Wintermantel"						"1"
+	"Doc's Holiday"							"1"
+	"Mecha-Medes"							"1"
+	"Medic Goggles"							"1"
+	"Pocket Heavy"							"1"
+	"Practitioner's Processing Mask"				"1"
+	"The Angel of Death"						"1"
+	"The Chronoscarf"						"1"
+	"The Colonel's Coat"						"1"
+	"The Dough Puncher"						"1"
+	"The Fashionable Megalomaniac"					"1"
+	"The Foppish Physician"						"1"
+	"The Gaiter Guards"						"1"
+	"The Heat of Winter"						"1"
+	"The Medic Mech-bag"						"1"
+	"The Medical Mystery"						"1"
+	"The Medicine Manpurse"						"1"
+	"The Mustachioed Mann"						"1"
+	"The Nine-Pipe Problem"						"1"
+	"The Quadwrangler"						"1"
+	"The Ruffled Ruprecht"						"1"
+	"The Smock Surgeon"						"1"
+	"The Steam Pipe"						"1"
+	"The Surgeon's Side Satchel"					"1"
+	"The Surgeon's Stethoscope"					"1"
+	"The Ward"							"1"
+	"Ze Ubermensch"							"1"
+	"dec2014 medic_unknown_mann"					"1"
+	"tw_medibot_chariot"						"1"
+	//___________________________ Sniper ____________________________\\
+	"Li'l Snaggletooth"						"1"
+	"Poacher's Safari Jacket"					"1"
+	"Sir Hootsalot"							"1"
+	"The Archers Groundings"					"1"
+	"The Birdman of Australiacatraz"				"1"
+	"The Chronomancer"						"1"
+	"The Cobber Chameleon"						"1"
+	"The Criminal Cloak"						"1"
+	"The Crocodile Smile"						"1"
+	"The Extra Layer"						"1"
+	"The Falconer"							"1"
+	"The Five-Month Shadow"						"1"
+	"The Golden Garment"						"1"
+	"The Huntsman's Essentials"					"1"
+	"The Koala Compact"						"1"
+	"The Outback Intellectual"					"1"
+	"The Scoper's Smoke"						"1"
+	"The Snow Scoper"						"1"
+	"The Steel Songbird"						"1"
+	"The Toowoomba Tunic"						"1"
+	"The Triggerman's Tacticals"					"1"
+	"dec2014 Wally Pocket"						"1"
+	"dec2014 hunter_beard"						"1"
+	"dec2014 hunter_ushanka"					"1"
+	"dec2014 hunter_vest"						"1"
+	"tw_sniperbot_armor"						"1"
+	//_____________________________ Spy _____________________________\\
+	"Camera Beard"							"1"
+	"Dead of Night"							"1"
+	"Escapist"							"1"
+	"Rogue's Col Roule"						"1"
+	"The After Dark"						"1"
+	"The Au Courant Assassin"					"1"
+	"The Backstabber's Boomslang"					"1"
+	"The Blood Banker"						"1"
+	"The Business Casual"						"1"
+	"The Cut-Throat Concierge"					"1"
+	"The Distinguished Rogue"					"1"
+	"The Exorcizor"							"1"
+	"The Frenchman's Formals"					"1"
+	"The Lady Killer"						"1"
+	"The Made Man"							"1"
+	"The Megapixel Beard"						"1"
+	"The Rogue's Brogues"						"1"
+	"The Rogue's Robe"						"1"
+	"The Sky Captain"						"1"
+	"The Sneaky Spats of Sneaking"					"1"
+	"The Spectre's Spectacles"					"1"
+	"The Spycrab"							"1"
+	"dec2014 Pocket Momma"						"1"
+	"dec2014 Stealthy Scarf"					"1"
+	"dec2014 The Puffy Provocateur"					"1"
+	"tw_spybot_armor"						"1"
 
+	//------------------- Noisemakers (Total: 14) -------------------\\
+	"Charity Noise Maker - Bell"					"0"
+	"Charity Noise Maker - Tingsha"					"0"
+	"Halloween Noise Maker - Banshee"				"0"
+	"Halloween Noise Maker - Black Cat"				"0"
+	"Halloween Noise Maker - Crazy Laugh"				"0"
+	"Halloween Noise Maker - Gremlin"				"0"
+	"Halloween Noise Maker - Stabby"				"0"
+	"Halloween Noise Maker - Werewolf"				"0"
+	"Halloween Noise Maker - Witch"					"0"
+	"Noise Maker - TF Birthday"					"0"
+	"Noise Maker - Vuvuzela"					"0"
+	"Noise Maker - Winter 2011"					"0"
+	"Promotional Noise Maker - Fireworks"				"0"
+	"Promotional Noise Maker - Koto"				"0"
+
+	//---------------------- Other (Total: 15) ----------------------\\
+	//_________________________ All classes _________________________\\
+	"Basic Spellbook"						"1"
+	"Duck Badge"							"1"
+	"Halloween Spellbook"						"1"
+	"Secret Diary"							"1"
+	"TF_WEAPON_GRAPPLINGHOOK"					"1"
+	"TF_WEAPON_SPELLBOOK"						"1"
+	"CheatDetectedHonesty"						"1"
+	"CheatDetectedMajor"						"1"
+	"CheatDetectedMinor"						"1"
+	"July 2013 Claim Check"						"1"
+	"Pile Of Ash"							"1"
+	"Pile Of Curses"						"1"
+	"Summer Adventure Pack"						"1"
+	"Summer Starter Kit"						"1"
+	"Valve Store Shipment Box"					"1"
+
+	//-------------- Pyro/Romevision items (Total: 9) ---------------\\
+	//_________________________ All classes _________________________\\
+	"Autogrant Pyrovision Goggles"					"0"
+	"Pet Balloonicorn"						"0"
+	"Pet Reindoonicorn"						"0"
+	"Pyrovision Goggles"						"0"
+	"The Hardy Laurel"						"1"
+	//____________________________ Pyro _____________________________\\
+	"The Burning Bongos"						"0"
+	"The Infernal Orchestrina"					"0"
+	"The Lollichop"							"0"
+	"The Rainblower"						"0"
+
+	//------ Noise making/Explosion on death miscs (Total: 3) -------\\
+	"Bombinomicon"							"0"
+	"The Bootie Time"						"0"
+	"The Jingle Belt"						"0"
+
+	//------------------ Stock weapons (Total: 25) ------------------\\
+	"Upgradeable TF_WEAPON_PISTOL"					"1"
+	"Upgradeable TF_WEAPON_SHOTGUN_PRIMARY"				"1"
+	"Upgradeable TF_WEAPON_BAT"					"1"
+	"Upgradeable TF_WEAPON_SCATTERGUN"				"1"
+	"Upgradeable TF_WEAPON_ROCKETLAUNCHER"				"1"
+	"Upgradeable TF_WEAPON_SHOVEL"					"1"
+	"Upgradeable TF_WEAPON_FIREAXE"					"1"
+	"Upgradeable TF_WEAPON_FLAMETHROWER"				"1"
+	"Upgradeable TF_WEAPON_BOTTLE"					"1"
+	"Upgradeable TF_WEAPON_GRENADELAUNCHER"				"1"
+	"Upgradeable TF_WEAPON_PIPEBOMBLAUNCHER"			"1"
+	"Upgradeable TF_WEAPON_FISTS"					"1"
+	"Upgradeable TF_WEAPON_MINIGUN"					"1"
+	"Upgradeable TF_WEAPON_PDA_ENGINEER_BUILD"			"1"
+	"Upgradeable TF_WEAPON_WRENCH"					"1"
+	"Upgradeable TF_WEAPON_BONESAW"					"1"
+	"Upgradeable TF_WEAPON_MEDIGUN"					"1"
+	"Upgradeable TF_WEAPON_SYRINGEGUN_MEDIC"			"1"
+	"Upgradeable TF_WEAPON_CLUB"					"1"
+	"Upgradeable TF_WEAPON_SMG"					"1"
+	"Upgradeable TF_WEAPON_SNIPERRIFLE"				"1"
+	"Upgradeable TF_WEAPON_BUILDER_SPY"				"1"
+	"Upgradeable TF_WEAPON_INVIS"					"1"
+	"Upgradeable TF_WEAPON_KNIFE"					"1"
+	"Upgradeable TF_WEAPON_REVOLVER"				"1"
+
+	//--------------------- Taunts (Total: 24) ----------------------\\
+	//_________________________ All classes _________________________\\
+	"Conga Taunt"							"0"
+	"Flippin' Awesome Taunt"					"0"
+	"High Five Taunt"						"0"
+	"Laugh Taunt"							"1"
+	"RPS Taunt"							"0"
+	"Replay Taunt"							"0"
+	"Skullcracker Taunt"						"0"
+	"Square Dance Taunt"						"0"
+	"The Shred Alert"						"1"
+	//____________________________ Scout ____________________________\\
+	"Battin' a Thousand Taunt"					"1"
+	"Deep Fried Desire Taunt"					"1"
+	"Taunt: The Boston Breakdance"					"1"
+	//___________________________ Soldier ___________________________\\
+	"Fresh Brewed Victory Taunt"					"1"
+	//____________________________ Pyro _____________________________\\
+	"Party Trick Taunt"						"1"
+	"Pool Party Taunt"						"1"
+	//___________________________ Demoman ___________________________\\
+	"Oblooterated Taunt"						"1"
+	"Spent Well Spirits Taunt"					"1"
+	//__________________________ Engineer ___________________________\\
+	"Rancho Relaxo Taunt"						"0"
+	//____________________________ Medic ____________________________\\
+	"Meet the Medic Heroic Taunt"					"1"
+	"Results Are In Taunt"						"1"
+	//___________________________ Sniper ____________________________\\
+	"I See You Taunt"						"1"
+	"Taunt: Most Wanted"						"1"
+	"Taunt: The Killer Solo"					"1"
+	//_____________________________ Spy _____________________________\\
+	"Buy A Life Taunt"						"1"
+
+	//--------- Usable action items/MvM canteens (Total: 3) ---------\\
+	"Battery Canteens"						"1"
+	"Duel MiniGame"							"1"
+	"Power Up Canteen (MvM)"					"1"
+}