Merge lp:~widelands-dev/widelands/map-filter-dropdowns into lp:widelands

[GunChleoc]

Redesign filters in Mapselect
- Add autofit text width capabilities to buttons and dropdowns
- Replace broken "Show all maps" checkbox with button
- Replace team-related checkboxes with dropdown
- New map tag "balanced" to complement "unbalanced", because the
  "balanced" state is the one that should be marked explicitly

[GunChleoc (gunchleoc)]

With the upcoming ferry branch, we will run out of screen space for map tags. So, I have grouped them into dropdown menus.

[GunChleoc (gunchleoc)]

I have marked all official maps that didn't have an "unbalanced" tag as "balanced"

=== modified file 'data/maps/Archipelago_Sea.wmf/elemental'
--- data/maps/Archipelago_Sea.wmf/elemental	2016-04-01 09:21:48 +0000
+++ data/maps/Archipelago_Sea.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="King of nowhere"
 descr=_"Between Sweden and Finland lies the archipelago sea. This place of incredible beauty is not land, and it is not sea, but it is both. Within a few hundred kilometers, there are no less than 50,000 islands and islets, most no more than a few acres across. The climate is quite mild for its latitude; farming thrives, berries are abundant, and fish plentiful. The small human population of this place never knew famine. You warlording bastards just couldn’t leave this little paradise in peace, could you?"
 hint=_"Large plots are rare on those small islands. Prioritize construction of large buildings on them. Sometimes you will need big military buildings to expand all the way to the next island. The AI will perform poorly."
-tags="official"
+tags="balanced,official"

=== modified file 'data/maps/Calvisson.wmf/elemental'
--- data/maps/Calvisson.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Calvisson.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="Kristin"
 descr=_"It’s a pleasure to settle in the beauty of this fissured countryside. But the ways to encompass these large territories are long and meandering, so it is easy to err into the land of the foreign clans."
 hint=
-tags="2teams,official,seafaring"
+tags="2teams,balanced,official,seafaring"
 
 [teams00]
 team1="0"

=== modified file 'data/maps/Checkmate.wmf/elemental'
--- data/maps/Checkmate.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Checkmate.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Winterwind"
 descr=_"Whether just one of nature’s strangest features or the creation of a mad (and game-hungry) god, this weird battleground awaits two opponents for another confrontation."
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"

=== modified file 'data/maps/Crater.wmf/elemental'
--- data/maps/Crater.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Crater.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Tarrei"
 descr=_"Long after a meteor crashed into a couple of mountains, life blossoms in the crater. Two tribes are now fighting for the rich resources."
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"

=== modified file 'data/maps/Crossing_the_Horizon_v2.wmf/elemental'
--- data/maps/Crossing_the_Horizon_v2.wmf/elemental	2018-02-16 11:34:08 +0000
+++ data/maps/Crossing_the_Horizon_v2.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Kristin – edited by 3plus4i"
 descr=_"Man your ship and sail to the horizon."
 hint=
-tags="2teams,artifacts,ffa,official,seafaring"
+tags="2teams,artifacts,balanced,ffa,official,seafaring"

=== modified file 'data/maps/Desert_Tournament.wmf/elemental'
--- data/maps/Desert_Tournament.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Desert_Tournament.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="ivh"
 descr=_"Four tribes struggle with their nearest neighbor to be the first to reach the mountain of gold that promises riches beyond belief. But can the two remaining ones share the resources wisely?"
 hint=
-tags="2teams,artifacts,ffa,official"
+tags="2teams,artifacts,balanced,ffa,official"
 
 [teams00]
 team1="0,1"

=== modified file 'data/maps/Dolomites_v2.wmf/elemental'
--- data/maps/Dolomites_v2.wmf/elemental	2016-04-04 17:04:56 +0000
+++ data/maps/Dolomites_v2.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="King of nowhere"
 descr=_"The jewel of the Alps, the Dolomites mountain range has been declared a World Heritage Site for its pristine beauty. This map is an as-faithful-as-reasonable reconstruction of the area delimited by Cortina d’Ampezzo in the north-east and Canazei in the south-west. If you have to be pitted in a duel to the death against your enemies, it may as well be in a beautiful place."
 hint=_"There is lot of flat ground on the mountains. Unfortunately, most of it is vertical. Use the little building space that you have wisely. A fortress at the mouth of a narrow mountain pass can be a formidable obstacle to an enemy army. Use the terrain to your advantage."
-tags="1v1,2teams,3teams,official"
+tags="1v1,2teams,3teams,balanced,official"

=== modified file 'data/maps/Elven_Forests.wmf/elemental'
--- data/maps/Elven_Forests.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Elven_Forests.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="Winterwind"
 descr=_"The breath-taking beauty of these emerald lands has lured many tribes into an attempt to take them for themselves."
 hint=
-tags="2teams,artifacts,ffa,official"
+tags="2teams,artifacts,balanced,ffa,official"
 
 [teams00]
 team1="0,1"

=== modified file 'data/maps/Fellowships_v2.wmf/elemental'
--- data/maps/Fellowships_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/Fellowships_v2.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Teppo"
 descr=_"Ships are your best fellows. Starting positions are similar, so the map should be fair."
 hint=_"This is a somewhat technical map, and it is best suited for two or three human players. Coal is hard to find – consider making some. There is gold near the starting point – do you see it?"
-tags="ffa,seafaring,official"
+tags="balanced,ffa,seafaring,official"

=== modified file 'data/maps/Four_Castles.wmf/elemental'
--- data/maps/Four_Castles.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Four_Castles.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="Winterwind"
 descr=_"Well protected in their mighty fortresses, four power-hungry warlords are completing their schemes to dominate these lands…"
 hint=
-tags="2teams,artifacts,ffa,official"
+tags="2teams,artifacts,balanced,ffa,official"
 
 [teams00]
 team1="0,1"

=== modified file 'data/maps/Four_Mountains.wmf/elemental'
--- data/maps/Four_Mountains.wmf/elemental	2016-03-31 07:40:54 +0000
+++ data/maps/Four_Mountains.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="Quappo"
 descr=_"Each tribe is surrounded by four mighty mountains. Who will first conquer them and claim the resources for his own tribe?"
 hint=_"I: Water can be found along the river. II: Snowmen mark additional water sources. III: Each mountain contains only one resource."
-tags="2teams,artifacts,ffa,official"
+tags="2teams,artifacts,balanced,ffa,official"
 
 [teams00]
 team1="0,1"

=== modified file 'data/maps/Full_Moon_v2.wmf/elemental'
--- data/maps/Full_Moon_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/Full_Moon_v2.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="fk"
 descr=_"Whether it is the latest solstice, or lunar illness, something moves these tribes towards their final ordeal."
 hint=
-tags="2teams,ffa,official"
+tags="2teams,balanced,ffa,official"
 
 [teams00]
 team1="0,1"

=== modified file 'data/maps/Glacier_Lake_v2.wmf/elemental'
--- data/maps/Glacier_Lake_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/Glacier_Lake_v2.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author=_"Nasenbaer – edited by king_of_nowhere"
 descr=_"Your tribe has dwelt on this beautiful and lonely glacier lake for a long time. No one disturbed you and the resources were sufficient for your whole tribe, but a few months ago another tribe came over the mountains and settled down. And you are sure that there is only enough space for one tribe."
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"

=== modified file 'data/maps/Golden_Peninsula.wmf/elemental'
--- data/maps/Golden_Peninsula.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Golden_Peninsula.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Winterwind"
 descr=_"Two empires race for the treasures of a legendary peninsula…"
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"

=== modified file 'data/maps/Ice_wars.wmf/elemental'
--- data/maps/Ice_wars.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Ice_wars.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Einstein13"
 descr=_"Autumn became winter. Some things are frozen, but not the war."
 hint=_"Start positions are clockwise"
-tags="2teams,3teams,4teams,official,seafaring"
+tags="2teams,3teams,4teams,balanced,official,seafaring"

=== modified file 'data/maps/Lake_of_Tranquility.wmf/elemental'
--- data/maps/Lake_of_Tranquility.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Lake_of_Tranquility.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Winterwind"
 descr=_"This lake, deep in the most ancient forests, has long been known for its beauty and idyllic peace. However, its sanctity has been disturbed now, as two hostile tribes have arrived at its shores…"
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"

=== modified file 'data/maps/Last_Bastion_v2.wmf/elemental'
--- data/maps/Last_Bastion_v2.wmf/elemental	2018-02-14 18:29:07 +0000
+++ data/maps/Last_Bastion_v2.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author=_"Another Barbarian – edited by king_of_nowhere"
 descr=_"The whimsical Gods didn’t answer our prayers. Instead, the increasing sunlight heated up the Earth a thousandfold and melted glaciers and people were plunged into the deep. But now – high in the majestic mountains, on the last scrap of land – two surviving tribes are sheltering. Even though the Gods showed mercy and the climate thus turned cooler again, the water is still rising and rising. Onto the last secure place – the highest mountain range where the amount of gold and the space to live merely suffice for one tribe – only two opposite paths lead. But remember, be careful… this last living space is also a hard and small place to live."
 hint=_"Don’t forget to take care of your timber supplies, you’ll need them."
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"

=== modified file 'data/maps/Last_Survivors.wmf/elemental'
--- data/maps/Last_Survivors.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Last_Survivors.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="fk"
 descr=_"Four tribes fighting for dominance in a stark area. Resources are scattered all over the map."
 hint=
-tags="2teams,ffa,official"
+tags="2teams,balanced,ffa,official"
 
 [teams00]
 team1="0,2"

=== modified file 'data/maps/MP_Scenarios/Island_Hopping.wmf/elemental'
--- data/maps/MP_Scenarios/Island_Hopping.wmf/elemental	2014-10-08 10:38:57 +0000
+++ data/maps/MP_Scenarios/Island_Hopping.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -7,4 +7,4 @@
 name=_"Island Hopping"
 author="SirVer,Nasenbaer"
 descr=_"A special tournament in Atlantean culture is the so-called ‘Island Hopping’, where two or more groups try to reach the center island as fast as possible, to be the first erecting a castle on the top of the central mountain."
-tags="official"
+tags="official,balanced"

=== modified file 'data/maps/MP_Scenarios/Smugglers.wmf/elemental'
--- data/maps/MP_Scenarios/Smugglers.wmf/elemental	2015-03-24 08:16:52 +0000
+++ data/maps/MP_Scenarios/Smugglers.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 name=_"Smugglers"
 author="Nasenbaer,SirVer"
 descr=_"Your well established smuggling routes suddenly got busy: two other tribes have appeared and now a rivalry among smugglers has started. Which team will be the first to smuggle a certain number of wares?"
-tags="official"
+tags="official,balanced"
 
 [teams00]
 team1=0,1

=== modified file 'data/maps/Rendez-Vous.wmf/elemental'
--- data/maps/Rendez-Vous.wmf/elemental	2016-09-18 07:01:55 +0000
+++ data/maps/Rendez-Vous.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Quappo"
 descr=_"Only a small hill in the centre of the map connects these four competing tribes. Lead your army to this hill right away and build a giant stronghold as a sign of your superiority!"
 hint=_"There is space for only one stronghold in the centre. Water can be found everywhere, so there is no need to send out geologists."
-tags="2teams,ffa,official"
+tags="2teams,ffa,balanced,official"

=== modified file 'data/maps/Sun_of_Fire.wmf/elemental'
--- data/maps/Sun_of_Fire.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Sun_of_Fire.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Nasenbaer"
 descr=_"For hundreds of years, this island was kept as a sanctuary of the Gods. No human ever ventured to set a foot on it. But now that a tribe had finally been barefaced enough to settle on the coast of that island, a lot of others followed in its wake."
 hint=_"Start positions are clockwise"
-tags="2teams,3teams,4teams,ffa,official"
+tags="2teams,3teams,4teams,balanced,ffa,official"

=== modified file 'data/maps/Swamp_Monks.wmf/elemental'
--- data/maps/Swamp_Monks.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Swamp_Monks.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="Nasenbaer"
 descr=_"It is said that the old war monks, living in the even older swamps, are the key to control over the whole island."
 hint=
-tags="2teams,artifacts,official"
+tags="2teams,artifacts,balanced,official"
 
 [teams00]
 team1="0,1"

=== modified file 'data/maps/The_Far_North.wmf/elemental'
--- data/maps/The_Far_North.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/The_Far_North.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Another Barbarian"
 descr=_"Some say that impenetrable lands to the far north scared away even the most courageous settlers and the bravest of the brave warriors. Big and old forests, full of big and predatory game, cut across by wetlands and hills were shrouded in mystery. The ones who had managed to come back mentioned tremendous buildings, decorated with carvings and gold from majestic mountain ranges somewhere amongst the wilderness. Dozens of years after only some crumbly ruins remain of these good old times, covered with moss and trees. Their shapes give only an idea about the craftsmanship of ancient constructors. Nobody knows why they (have) disappeared. Nobody knows why. People say that now nothing is blocking the road to wealth. But many will die pulled apart by wolves, engulfed by swamp… encircled by hostile tribes."
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"

=== modified file 'data/maps/The_Green_Plateau.wmf/elemental'
--- data/maps/The_Green_Plateau.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/The_Green_Plateau.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="Nasenbaer"
 descr=_"You are standing on an island, crowned by mighty mountains which keep a wonderful and mighty treasure in their middle – The Green Plateau, which is hard to conquer but easy to lose. So, if you want it, be aware of the other clans."
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"
 
 [teams00]
 team1="0"

=== modified file 'data/maps/The_Nile_v2.wmf/elemental'
--- data/maps/The_Nile_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/The_Nile_v2.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -10,7 +10,7 @@
 descr=_"The river has always provided food and communication. This time, eight empires will fight for control over this land."
 hint=_"Use the river wisely. Your opponents will do the same. You will find the main ore resources deep in the desert."
 hint=
-tags="1v1,2teams,3teams,4teams,seafaring,official"
+tags="1v1,2teams,3teams,4teams,balanced,seafaring,official"
 
 [teams00]
 team1="0"

=== modified file 'data/maps/The_Oasis_Triangle.wmf/elemental'
--- data/maps/The_Oasis_Triangle.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/The_Oasis_Triangle.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Nasenbaer"
 descr=_"There is something mystical like a gray atmosphere around these three oases, which no one has found out about yet. Perhaps you will be the one, but be aware of the others who are searching too!"
 hint=
-tags="artifacts,ffa,official"
+tags="artifacts,balanced,ffa,official"

=== modified file 'data/maps/The_Pass_Through_the_Mountains.wmf/elemental'
--- data/maps/The_Pass_Through_the_Mountains.wmf/elemental	2016-10-31 09:34:27 +0000
+++ data/maps/The_Pass_Through_the_Mountains.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Quappo"
 descr=_"In this mountainous area two princes have settled. Now they are expanding their territories, unaware of the fact that they are not alone!"
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,balanced,official"

=== modified file 'data/maps/The_Thaw.wmf/elemental'
--- data/maps/The_Thaw.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/The_Thaw.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Another Barbarian"
 descr=_"Another thaw set in. Three tribes were sheltering from severe winter among majestic mountains. At the time of the solstice they listened to the oracle and went to war. The only survivor will sacrifice his enemies’ treasures on the ancient altar, build there a splendid castle and gain the goodwill and respect of the Gods."
 hint=
-tags="artifacts,ffa,official"
+tags="artifacts,balanced,ffa,official"

=== modified file 'data/maps/Three_Warriors.wmf/elemental'
--- data/maps/Three_Warriors.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Three_Warriors.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Quappo"
 descr=_"Mighty mountains divide this land into three fertile valleys. But a path connects the valleys and thus a fight seems inescapable!"
 hint=_"Water can be found around the lakes."
-tags="ffa,official"
+tags="ffa,balanced,official"

=== modified file 'data/maps/Together_We're_Strong.wmf/elemental'
--- data/maps/Together_We're_Strong.wmf/elemental	2016-03-29 18:23:38 +0000
+++ data/maps/Together_We're_Strong.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Nasenbaer"
 descr=_"The four mighty harbors of the Craw Islands have been trading their goods among each other for ages. All of them needed resources that they could not produce in their own territory and in exchange provided other resources to those that could not produce them. Based on these trades, a very friendly commerce was common between the four harbors and the people living on the Craw Islands – until recently, when two of the harbors united to form an exclusive trade alliance, forcing the other two to do the same. Suddenly, it seems only a matter of time before the first fights between the harbors will shatter the peaceful life that has lasted for so long…"
 hint=
-tags="1v1,artifacts,seafaring,official"
+tags="1v1,artifacts,balanced,seafaring,official"

=== modified file 'data/maps/Trident_of_Fire.wmf/elemental'
--- data/maps/Trident_of_Fire.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Trident_of_Fire.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,7 +9,7 @@
 author="Robnick"
 descr=_"In the vicinity of three major volcanoes, six lovely islands are inviting settlers to start a new life. Deserts and a quickly growing forest wait to be discovered. But only by becoming a naval power will your tribe be able to explore enough resources to compete with its opponents."
 hint=
-tags="1v1,2teams,3teams,official,seafaring"
+tags="1v1,2teams,3teams,balanced,official,seafaring"
 
 [teams00]
 team1="1"

=== modified file 'data/maps/Twin_Lagoons_v2.wmf/elemental'
--- data/maps/Twin_Lagoons_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/Twin_Lagoons_v2.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="fk"
 descr=_"When the wind swelled up and the first dunes were formed on these abandoned twin lagoons, nobody could have expected that two tribes that are desperately searching for more resources to support their endlessly ongoing wars, would end up in this forgotten place at the same time and for the same well-known reason."
 hint=_"Defend your transport lines, or use ships to bypass the opponent. Then remove all enemy activity."
-tags="1v1,seafaring,official"
+tags="1v1,balanced,seafaring,official"

=== modified file 'data/maps/Two_Frontiers.wmf/elemental'
--- data/maps/Two_Frontiers.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Two_Frontiers.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="ISCH"
 descr=_"A multiplayer battle map on a small circle-shaped island."
 hint=
-tags="ffa,official"
+tags="balanced,ffa,official"

=== modified file 'data/maps/Volcanic_Winter.wmf/elemental'
--- data/maps/Volcanic_Winter.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Volcanic_Winter.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Nasenbaer"
 descr=_"In the middle of summer, a series of volcanic eruptions drew the winter in. Suddenly, the sun seemed to be gone and the only light and heat sources left were those that enforced this dramatic change. Continents, oceans and seas are frozen now, only the volcanic islands seem to be left as habitable land."
 hint=
-tags="1v1,artifacts,official,seafaring"
+tags="1v1,artifacts,balanced,official,seafaring"

=== modified file 'data/maps/Wideworld.wmf/elemental'
--- data/maps/Wideworld.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Wideworld.wmf/elemental	2019-09-08 20:22:47 +0000
@@ -9,4 +9,4 @@
 author="Einstein13"
 descr=_"The world is not enough! If you want to win, you have to send some ships. But remember: your opponents are very close to you."
 hint=
-tags="seafaring,official"
+tags="seafaring,official,balanced"

=== modified file 'src/editor/ui_menus/main_menu_map_options.cc'
--- src/editor/ui_menus/main_menu_map_options.cc	2019-08-25 14:50:16 +0000
+++ src/editor/ui_menus/main_menu_map_options.cc	2019-09-08 20:22:47 +0000
@@ -78,10 +78,18 @@
      name_(&main_box_, 0, 0, max_w_, UI::PanelStyle::kWui),
      author_(&main_box_, 0, 0, max_w_, UI::PanelStyle::kWui),
      size_(&main_box_, 0, 0, max_w_ - indent_, labelh_, ""),
-
+	 balancing_dropdown_(&tags_box_,
+						"dropdown_balancing",
+						0,
+						0,
+						200,
+						50,
+						24,
+						"",
+						UI::DropdownType::kTextual,
+						UI::PanelStyle::kWui, UI::ButtonStyle::kWuiSecondary),
      teams_list_(
         &teams_box_, 0, 0, max_w_, 60, UI::PanelStyle::kWui, UI::ListselectLayout::kShowCheck),
-
      registry_(registry) {
 
 	tab_box_.set_size(max_w_, get_inner_h() - labelh_ - 2 * padding_);
@@ -120,13 +128,18 @@
 	main_box_.add_space(indent_);
 
 	tags_box_.add(new UI::Textarea(&tags_box_, 0, 0, max_w_, labelh_, _("Tags:")));
-	add_tag_checkbox(&tags_box_, "unbalanced", localize_tag("unbalanced"));
 	add_tag_checkbox(&tags_box_, "ffa", localize_tag("ffa"));
 	add_tag_checkbox(&tags_box_, "1v1", localize_tag("1v1"));
 	add_tag_checkbox(&tags_box_, "2teams", localize_tag("2teams"));
 	add_tag_checkbox(&tags_box_, "3teams", localize_tag("3teams"));
 	add_tag_checkbox(&tags_box_, "4teams", localize_tag("4teams"));
 
+	balancing_dropdown_.set_autoexpand_display_button();
+	balancing_dropdown_.add(localize_tag("balanced"), "balanced");
+	balancing_dropdown_.add(localize_tag("unbalanced"), "unbalanced");
+
+	tags_box_.add(&balancing_dropdown_);
+
 	teams_box_.add(new UI::Textarea(&teams_box_, 0, 0, max_w_, labelh_, _("Suggested Teams:")));
 	teams_box_.add(&teams_list_);
 	// TODO(GunChleoc): We need team images in the listselect here,
@@ -156,6 +169,8 @@
 		tag.second->changed.connect(boost::bind(&MainMenuMapOptions::changed, this));
 	}
 
+	balancing_dropdown_.selected.connect([this] { changed(); });
+
 	ok_.sigclicked.connect(boost::bind(&MainMenuMapOptions::clicked_ok, boost::ref(*this)));
 	cancel_.sigclicked.connect(boost::bind(&MainMenuMapOptions::clicked_cancel, boost::ref(*this)));
 
@@ -183,6 +198,8 @@
 	for (auto tag : tags_checkboxes_) {
 		tag.second->set_state(tags.count(tag.first) > 0);
 	}
+
+	balancing_dropdown_.select(tags.count("balanced") ? "balanced" : "unbalanced");
 }
 
 /**
@@ -205,6 +222,7 @@
 			eia().egbase().mutable_map()->add_tag(tag.first);
 		}
 	}
+	eia().egbase().mutable_map()->add_tag(balancing_dropdown_.get_selected());
 	Notifications::publish(NoteMapOptions());
 	registry_.destroy();
 }

=== modified file 'src/editor/ui_menus/main_menu_map_options.h'
--- src/editor/ui_menus/main_menu_map_options.h	2019-06-01 09:55:57 +0000
+++ src/editor/ui_menus/main_menu_map_options.h	2019-09-08 20:22:47 +0000
@@ -24,6 +24,7 @@
 #include "ui_basic/box.h"
 #include "ui_basic/button.h"
 #include "ui_basic/checkbox.h"
+#include "ui_basic/dropdown.h"
 #include "ui_basic/editbox.h"
 #include "ui_basic/listselect.h"
 #include "ui_basic/multilineeditbox.h"
@@ -63,10 +64,13 @@
 	UI::Textarea size_;
 	UI::MultilineEditbox* descr_;
 	UI::MultilineEditbox* hint_;
-	UI::Listselect<std::string> teams_list_;
 
 	// Tag, Checkbox
 	std::map<std::string, UI::Checkbox*> tags_checkboxes_;
+	UI::Dropdown<std::string> balancing_dropdown_;
+
+	UI::Listselect<std::string> teams_list_;
+
 	UI::UniqueWindow::Registry& registry_;
 };
 

=== modified file 'src/ui_basic/button.cc'
--- src/ui_basic/button.cc	2019-06-25 08:03:30 +0000
+++ src/ui_basic/button.cc	2019-09-08 20:22:47 +0000
@@ -63,7 +63,8 @@
 	assert(!get_can_focus());
 }
 
-Button::Button  //  for textual buttons. If h = 0, h will resize according to the font's height.
+/// For textual buttons. If h = 0, h will resize according to the font's height. If both h = 0 and w = 0, will resize for text width as well.
+Button::Button
    (Panel* const parent,
     const std::string& name,
     int32_t const x,
@@ -86,12 +87,21 @@
             tooltip_text,
             init_state,
             UI::Button::ImageMode::kShrink) {
-	// Automatically resize for font height and give it a margin.
-	if (h < 1) {
+	if (h == 0) {
+		// Automatically resize for font height and give it a margin.
+		int new_width = get_w();
 		const int new_height =
-		   text_height(g_gr->styles().button_style(init_style).enabled().font()) + 4;
-		set_desired_size(w, new_height);
-		set_size(w, new_height);
+		   std::max(text_height(g_gr->styles().button_style(init_style).enabled().font()),
+					text_height(g_gr->styles().button_style(init_style).disabled().font()))
+				+ 4 * kButtonImageMargin;
+		if (w == 0) {
+			// Automatically resize for text width too.
+			new_width = std::max(text_width(richtext_escape(title_), style_->enabled().font()),
+								 text_width(richtext_escape(title_), style_->disabled().font()))
+						+ 8 * kButtonImageMargin;
+		}
+		set_desired_size(new_width, new_height);
+		set_size(new_width, new_height);
 	}
 }
 

=== modified file 'src/ui_basic/dropdown.cc'
--- src/ui_basic/dropdown.cc	2019-07-28 11:33:50 +0000
+++ src/ui_basic/dropdown.cc	2019-09-08 20:22:47 +0000
@@ -98,7 +98,9 @@
                      label),
      label_(label),
      type_(type),
-     is_enabled_(true) {
+     is_enabled_(true),
+	 button_style_(button_style),
+	 autoexpand_display_button_(false) {
 	if (label.empty()) {
 		set_tooltip(pgettext("dropdown", "Select Item"));
 	} else {
@@ -213,17 +215,30 @@
 	layout();
 }
 
+void BaseDropdown::set_autoexpand_display_button() {
+	autoexpand_display_button_ = true;
+}
+
 void BaseDropdown::add(const std::string& name,
                        const uint32_t value,
                        const Image* pic,
                        const bool select_this,
-                       const std::string& tooltip_text,
-                       const std::string& hotkey = std::string()) {
+                       const std::string& tooltip_text, const std::string& hotkey) {
 	assert(pic != nullptr || type_ != DropdownType::kPictorial);
 	list_->add(name, value, pic, select_this, tooltip_text, hotkey);
 	if (select_this) {
 		set_value();
 	}
+
+	if (autoexpand_display_button_) {
+		/// Fit width of display button to make enough room for the entry's text
+		const std::string fitme = label_.empty() ? name : (boost::format(_("%1%: %2%")) % label_ % name).str();
+		const int new_width = text_width(richtext_escape(fitme), g_gr->styles().button_style(button_style_).enabled().font()) + 8;
+		if (new_width > display_button_.get_w()) {
+			set_desired_size(get_w() + new_width - display_button_.get_w(), get_h());
+			set_size(get_w() + new_width - display_button_.get_w(), get_h());
+		}
+	}
 	layout();
 }
 

=== modified file 'src/ui_basic/dropdown.h'
--- src/ui_basic/dropdown.h	2019-06-25 08:03:30 +0000
+++ src/ui_basic/dropdown.h	2019-09-08 20:22:47 +0000
@@ -141,6 +141,9 @@
 	void set_size(int nw, int nh) override;
 	void set_desired_size(int w, int h) override;
 
+	/// Expand display button to make enough room for each entry's text. Call this before adding yna entries.
+	void set_autoexpand_display_button();
+
 protected:
 	/// Add an element to the list
 	/// \param name         the display name of the entry
@@ -213,6 +216,8 @@
 	uint32_t current_selection_;
 	DropdownType type_;
 	bool is_enabled_;
+	ButtonStyle button_style_;
+	bool autoexpand_display_button_;
 };
 
 /// A dropdown menu that lets the user select a value of the datatype 'Entry'.

=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc	2019-05-26 17:21:15 +0000
+++ src/ui_fsmenu/mapselect.cc	2019-09-08 20:22:47 +0000
@@ -42,7 +42,7 @@
 FullscreenMenuMapSelect::FullscreenMenuMapSelect(GameSettingsProvider* const settings,
                                                  GameController* const ctrl)
    : FullscreenMenuLoadMapOrGame(),
-     checkbox_space_(25),
+     checkbox_space_(20),
      // Less padding for big fonts; space is tight.
      checkbox_padding_(UI::g_fh->fontset()->size_offset() > 0 ? 0 : 2 * padding_),
 
@@ -68,7 +68,8 @@
      basedir_(kMapsDir),
      settings_(settings),
      ctrl_(ctrl),
-     has_translated_mapname_(false) {
+     has_translated_mapname_(false),
+	 unspecified_balancing_found_(false) {
 	curdir_ = basedir_;
 	if (settings_->settings().multiplayer) {
 		back_.set_tooltip(_("Return to the multiplayer game setup"));
@@ -89,52 +90,114 @@
 
 	UI::Box* hbox = new UI::Box(&checkboxes_, 0, 0, UI::Box::Horizontal, checkbox_space_, get_w());
 
-	// Must be initialized before tag checkboxes
+	show_all_maps_ = new UI::Button(hbox, "show_all_maps", 0, 0, 0, 0, UI::ButtonStyle::kFsMenuSecondary, _("Show all maps"));
 	cb_dont_localize_mapnames_ =
 	   new UI::Checkbox(hbox, Vector2i::zero(), _("Show original map names"));
 	cb_dont_localize_mapnames_->set_state(false);
-	cb_dont_localize_mapnames_->changedto.connect(
-	   boost::bind(&FullscreenMenuMapSelect::fill_table, boost::ref(*this)));
-
-	cb_show_all_maps_ = add_tag_checkbox(hbox, "blumba", _("Show all maps"));
-	tags_checkboxes_.clear();  // Remove this again, it is a special tag checkbox
-	cb_show_all_maps_->set_state(true);
-
+
+	hbox->add(show_all_maps_, UI::Box::Resizing::kFullSize);
+	hbox->add_space(checkbox_space_);
 	hbox->add(cb_dont_localize_mapnames_, UI::Box::Resizing::kFullSize);
-	checkboxes_.add(hbox, UI::Box::Resizing::kFullSize);
-
-	hbox = new UI::Box(&checkboxes_, 0, 0, UI::Box::Horizontal, checkbox_space_, get_w());
-	add_tag_checkbox(hbox, "official", localize_tag("official"));
-	add_tag_checkbox(hbox, "unbalanced", localize_tag("unbalanced"));
+	hbox->add_inf_space();
+	checkboxes_.add(hbox, UI::Box::Resizing::kFullSize);
+
+	// Row with dropdowns
+
+	hbox = new UI::Box(&checkboxes_, 0, 0, UI::Box::Horizontal, checkbox_space_, get_w());
+
+	official_tags_dropdown_ = new UI::Dropdown<std::string>(hbox,
+					   "dropdown_official_tags",
+					   0,
+					   0,
+					   200,
+					   50,
+					   24,
+					   "",
+					   UI::DropdownType::kTextual,
+					   UI::PanelStyle::kFsMenu, UI::ButtonStyle::kFsMenuMenu);
+	official_tags_dropdown_->set_autoexpand_display_button();
+	official_tags_dropdown_->add(_("Official & Unofficial"), "");
+	official_tags_dropdown_->add(localize_tag("official"), "official");
+	official_tags_dropdown_->add(localize_tag("unofficial"), "unofficial");
+
+	hbox->add(official_tags_dropdown_, UI::Box::Resizing::kFullSize);
+
+	hbox->add_space(checkbox_space_);
+
+	team_tags_dropdown_ = new UI::Dropdown<std::string>(hbox,
+					   "dropdown_team_tags",
+					   0,
+					   0,
+					   200,
+					   50,
+					   24,
+					   "",
+					   UI::DropdownType::kTextual,
+					   UI::PanelStyle::kFsMenu, UI::ButtonStyle::kFsMenuMenu);
+	team_tags_dropdown_->set_autoexpand_display_button();
+	team_tags_dropdown_->add(_("Any Teams"), "");
+	team_tags_dropdown_->add(localize_tag("ffa"), "ffa");
+	team_tags_dropdown_->add(localize_tag("1v1"), "1v1");
+	team_tags_dropdown_->add(localize_tag("2teams"), "2teams");
+	team_tags_dropdown_->add(localize_tag("3teams"), "3teams");
+	team_tags_dropdown_->add(localize_tag("4teams"), "4teams");
+
+	hbox->add(team_tags_dropdown_, UI::Box::Resizing::kFullSize);
+
+	hbox->add_space(checkbox_space_);
+
+	balancing_tags_dropdown_ = new UI::Dropdown<std::string>(hbox,
+					   "dropdown_balancing",
+					   0,
+					   0,
+					   200,
+					   50,
+					   24,
+					   "",
+					   UI::DropdownType::kTextual,
+					   UI::PanelStyle::kFsMenu, UI::ButtonStyle::kFsMenuMenu);
+	balancing_tags_dropdown_->set_autoexpand_display_button();
+	rebuild_balancing_dropdown();
+
+	hbox->add(balancing_tags_dropdown_, UI::Box::Resizing::kFullSize);
+
+	checkboxes_.add(hbox, UI::Box::Resizing::kFullSize);
+
+	// Row with checkboxes
+
+	hbox = new UI::Box(&checkboxes_, 0, 0, UI::Box::Horizontal, checkbox_space_, get_w());
 	add_tag_checkbox(hbox, "seafaring", localize_tag("seafaring"));
 	add_tag_checkbox(hbox, "artifacts", localize_tag("artifacts"));
 	add_tag_checkbox(hbox, "scenario", localize_tag("scenario"));
-	checkboxes_.add(hbox, UI::Box::Resizing::kFullSize);
-
-	hbox = new UI::Box(&checkboxes_, 0, 0, UI::Box::Horizontal, checkbox_space_, get_w());
-	add_tag_checkbox(hbox, "ffa", localize_tag("ffa"));
-	add_tag_checkbox(hbox, "1v1", localize_tag("1v1"));
-	checkboxes_.add(hbox, UI::Box::Resizing::kFullSize);
-
-	hbox = new UI::Box(&checkboxes_, 0, 0, UI::Box::Horizontal, checkbox_space_, get_w());
-	add_tag_checkbox(hbox, "2teams", localize_tag("2teams"));
-	add_tag_checkbox(hbox, "3teams", localize_tag("3teams"));
-	add_tag_checkbox(hbox, "4teams", localize_tag("4teams"));
+	hbox->add_inf_space();
 	checkboxes_.add(hbox, UI::Box::Resizing::kFullSize);
 
 	table_.focus();
-	fill_table();
+	clear_filter();
 
 	// We don't need the unlocalizing option if there is nothing to unlocalize.
 	// We know this after the list is filled.
 	cb_dont_localize_mapnames_->set_visible(has_translated_mapname_);
+
+	cb_dont_localize_mapnames_->changedto.connect(
+	   boost::bind(&FullscreenMenuMapSelect::fill_table, boost::ref(*this)));
+
+	for (size_t i = 0; i < tags_checkboxes_.size(); ++i) {
+		tags_checkboxes_.at(i)->changedto.connect(boost::bind(&FullscreenMenuMapSelect::tagbox_changed, this, i, _1));
+	}
+
+	balancing_tags_dropdown_->selected.connect([this] { fill_table(); });
+	official_tags_dropdown_->selected.connect([this] { fill_table(); });
+	team_tags_dropdown_->selected.connect([this] { fill_table(); });
+	show_all_maps_->sigclicked.connect([this] { clear_filter(); });
+
 	layout();
 }
 
 void FullscreenMenuMapSelect::layout() {
 	title_.set_size(get_w(), title_.get_h());
 	FullscreenMenuLoadMapOrGame::layout();
-	checkboxes_y_ = tabley_ - 4 * (cb_show_all_maps_->get_h() + checkbox_padding_) - 2 * padding_;
+	checkboxes_y_ = tabley_ - 3 * (team_tags_dropdown_->get_h() + checkbox_padding_) - 2 * padding_;
 	title_.set_pos(Vector2i(0, checkboxes_y_ / 3));
 	checkboxes_.set_pos(Vector2i(tablex_, checkboxes_y_));
 	checkboxes_.set_size(get_w() - 2 * tablex_, tabley_ - checkboxes_y_);
@@ -222,6 +285,7 @@
  */
 void FullscreenMenuMapSelect::fill_table() {
 	has_translated_mapname_ = false;
+	bool unspecified_balancing_found = false;
 
 	maps_data_.clear();
 
@@ -272,9 +336,45 @@
 				   has_translated_mapname_ || (mapdata.name != mapdata.localized_name);
 
 				bool has_all_tags = true;
+				if (team_tags_dropdown_->has_selection()) {
+					const std::string selected_tag = team_tags_dropdown_->get_selected();
+					if (!selected_tag.empty()) {
+						has_all_tags &= mapdata.tags.count(selected_tag);
+					}
+				}
+				if (official_tags_dropdown_->has_selection()) {
+					const std::string selected_tag = official_tags_dropdown_->get_selected();
+					if (!selected_tag.empty()) {
+						if (selected_tag == "official") {
+							has_all_tags &= mapdata.tags.count("official");
+						} else {
+							has_all_tags &= !mapdata.tags.count("official");
+						}
+					}
+				}
+				if (balancing_tags_dropdown_->has_selection()) {
+					const std::string selected_tag = balancing_tags_dropdown_->get_selected();
+					if (!selected_tag.empty()) {
+						if (selected_tag == "unspecified") {
+							has_all_tags &= !mapdata.tags.count("balanced");
+							has_all_tags &= !mapdata.tags.count("unbalanced");
+						} else {
+							has_all_tags &= mapdata.tags.count(selected_tag);
+						}
+					}
+				}
+				// Backwards compatibility
+				if (!mapdata.tags.count("balanced") && !mapdata.tags.count("unbalanced")) {
+					unspecified_balancing_found = true;
+				} else if (mapdata.tags.count("balanced") && mapdata.tags.count("unbalanced")) {
+					log("WARNING: Map '%s' is both balanced and unbalanced - please fix the 'elemental' packet\n", mapfilename.c_str());
+				}
+
 				for (std::set<uint32_t>::const_iterator it = req_tags_.begin(); it != req_tags_.end();
-				     ++it)
+					 ++it) {
 					has_all_tags &= mapdata.tags.count(tags_ordered_[*it]);
+				}
+
 				if (!has_all_tags) {
 					continue;
 				}
@@ -298,6 +398,10 @@
 		table_.select(0);
 	}
 	set_has_selection();
+	if (unspecified_balancing_found != unspecified_balancing_found_) {
+		unspecified_balancing_found_ = unspecified_balancing_found;
+		rebuild_balancing_dropdown();
+	}
 }
 
 /*
@@ -305,11 +409,9 @@
  */
 UI::Checkbox*
 FullscreenMenuMapSelect::add_tag_checkbox(UI::Box* box, std::string tag, std::string displ_name) {
-	int32_t id = tags_ordered_.size();
 	tags_ordered_.push_back(tag);
 
 	UI::Checkbox* cb = new UI::Checkbox(box, Vector2i::zero(), displ_name);
-	cb->changedto.connect(boost::bind(&FullscreenMenuMapSelect::tagbox_changed, this, id, _1));
 
 	box->add(cb, UI::Box::Resizing::kFullSize);
 	box->add_space(checkbox_space_);
@@ -322,24 +424,39 @@
  * One of the tagboxes has changed
  */
 void FullscreenMenuMapSelect::tagbox_changed(int32_t id, bool to) {
-	if (id == 0) {  // Show all maps checbox
-		if (to) {
-			for (UI::Checkbox* checkbox : tags_checkboxes_) {
-				checkbox->set_state(false);
-			}
-		}
-	} else {  // Any tag
-		if (to) {
-			req_tags_.insert(id);
-		} else {
-			req_tags_.erase(id);
-		}
-	}
-	if (req_tags_.empty()) {
-		cb_show_all_maps_->set_state(true);
-	} else {
-		cb_show_all_maps_->set_state(false);
-	}
-
-	fill_table();
+	if (to) {
+		req_tags_.insert(id);
+	} else {
+		req_tags_.erase(id);
+	}
+
+	fill_table();
+}
+
+void FullscreenMenuMapSelect::clear_filter() {
+	req_tags_.clear();
+	for (UI::Checkbox* checkbox : tags_checkboxes_) {
+		checkbox->set_state(false);
+	}
+
+	balancing_tags_dropdown_->select("");
+	official_tags_dropdown_->select("");
+	team_tags_dropdown_->select("");
+	fill_table();
+}
+
+void FullscreenMenuMapSelect::rebuild_balancing_dropdown() {
+	const std::string selected = balancing_tags_dropdown_->has_selection() ? balancing_tags_dropdown_->get_selected() : "";
+	balancing_tags_dropdown_->clear();
+	balancing_tags_dropdown_->add(_("Balanced & Unbalanced"), "");
+	balancing_tags_dropdown_->add(localize_tag("balanced"), "balanced");
+	balancing_tags_dropdown_->add(localize_tag("unbalanced"), "unbalanced");
+	if (unspecified_balancing_found_) {
+		// Backwards compatibility with old maps
+		balancing_tags_dropdown_->add(pgettext("balancing", "Unspecified"), "unspecified");
+		balancing_tags_dropdown_->select(selected);
+	} else {
+		balancing_tags_dropdown_->select(selected == "unspecified" ? "" : selected);
+		fill_table();
+	}
 }

=== modified file 'src/ui_fsmenu/mapselect.h'
--- src/ui_fsmenu/mapselect.h	2019-02-23 11:00:49 +0000
+++ src/ui_fsmenu/mapselect.h	2019-09-08 20:22:47 +0000
@@ -25,6 +25,7 @@
 
 #include "ui_basic/box.h"
 #include "ui_basic/checkbox.h"
+#include "ui_basic/dropdown.h"
 #include "ui_basic/textarea.h"
 #include "ui_fsmenu/base.h"
 #include "ui_fsmenu/load_map_or_game.h"
@@ -62,6 +63,8 @@
 	bool set_has_selection();
 	UI::Checkbox* add_tag_checkbox(UI::Box*, std::string, std::string);
 	void tagbox_changed(int32_t, bool);
+	void clear_filter();
+	void rebuild_balancing_dropdown();
 
 	int32_t const checkbox_space_;
 	const int checkbox_padding_;
@@ -84,9 +87,16 @@
 	UI::Checkbox* cb_dont_localize_mapnames_;
 	bool has_translated_mapname_;
 
-	UI::Checkbox* cb_show_all_maps_;
+	UI::Button* show_all_maps_;
 	std::vector<UI::Checkbox*> tags_checkboxes_;
 
+	UI::Dropdown<std::string>* official_tags_dropdown_;
+
+	UI::Dropdown<std::string>* balancing_tags_dropdown_;
+	bool unspecified_balancing_found_; // Backwards compatibility
+
+	UI::Dropdown<std::string>* team_tags_dropdown_;
+
 	std::vector<std::string> tags_ordered_;
 	std::set<uint32_t> req_tags_;
 

=== modified file 'src/wui/map_tags.cc'
--- src/wui/map_tags.cc	2019-02-23 11:00:49 +0000
+++ src/wui/map_tags.cc	2019-09-08 20:22:47 +0000
@@ -27,6 +27,10 @@
    /** TRANSLATORS: This is a map tag */
    {"official", _("Official")},
    /** TRANSLATORS: This is a map tag */
+   {"unofficial", _("Unofficial")},
+   /** TRANSLATORS: This is a map tag */
+   {"balanced", _("Balanced")},
+   /** TRANSLATORS: This is a map tag */
    {"unbalanced", _("Unbalanced")},
    /** TRANSLATORS: This is a map tag */
    {"seafaring", _("Seafaring")},