Revert "Fixed ordering issues in official tilesets"

This reverts commit e0fd4af.

megamek/data/images/hexes/atmospheric.tileset

@@ -28,45 +28,41 @@
 # ground (base sets)
 # swamp
 # rough
-# rubble
 # woods
 # water
-# rapids / ice
-# bridges / roads / rail / maglev
+# road
+# ice / rapids
 # building
-# fluff / fuel tanks
+# bridge
 # fire
 # smoke
 # elevator
 
 include "StandardIncludes/StandardThemes.tileinc"
 
-include "StandardIncludes/StandardSpace.tileinc"
+include "StandardIncludes/StandardFluff.tileinc"
+include "StandardIncludes/StandardFuelTanks.tileinc"
 
-super * "water:0" "" "transparent/blue_water_1.png"
+include "lunar/LunarBuildings.tileinc"
+include "mars/MarsBuildings.tileinc"
+include "StandardIncludes/BuildingsNonSClassArmor.tileinc"
+include "StandardIncludes/BuildingsNonSClassNoArmor.tileinc"
+include "StandardIncludes/BuildingsSClassArmor.tileinc"
+include "StandardIncludes/BuildingsSClassNoArmor.tileinc"
+
+include "StandardIncludes/StandardRailMaglev.tileinc"
+include "StandardIncludes/StandardElevator.tileinc"
+include "StandardIncludes/StandardLimbs.tileinc"
+include "StandardIncludes/StandardSpace.tileinc"
 
 super * "swamp:1" "" "swamp/swamp_0.png;swamp/swamp_1.png;swamp/swamp_2.png;swamp/swamp_3.png"
 #levels 2 and 3 of swamp are for quicksand
 super * "swamp:2" "" "swamp/quicksand_0.gif;swamp/quicksand_1.gif;swamp/quicksand_2.gif;swamp/quicksand_3.gif"
 super * "swamp:3" "" "swamp/quicksand_0.gif;swamp/quicksand_1.gif;swamp/quicksand_2.gif;swamp/quicksand_3.gif"
 
-super * "fortified:1" "" "boring/sandbags.gif"
-
 super * "rough:1" "" "transparent/rough_0.png;transparent/rough_1.png;transparent/rough_2.png"
 super * "rough:2" "" "transparent/ultra_rough.png"
 
-super * "rubble:1" "" "boring/rubble_light.gif"
-super * "rubble:2" "" "boring/rubble_medium.gif"
-super * "rubble:3" "" "boring/rubble_heavy.gif"
-super * "rubble:4" "" "boring/rubble_hardened.gif"
-#level 5 is wall rubble
-super * "rubble:5" "" "boring/rubble_light.gif"
-super * "rubble:6" "" "boring/rubble_ultra.gif"
-
-include "StandardIncludes/StandardLimbs.tileinc"
-
-super * "water:1" "" "transparent/blue_water_1.png"
-
 super * "woods:1" "tropical" "jungle/light_jungle1.png;jungle/light_jungle2.png;jungle/light_jungle3.png;jungle/light_jungle4.png"
 super * "woods:2" "tropical" "jungle/heavy_jungle1.png;jungle/heavy_jungle2.png;jungle/heavy_jungle3.png"
 super * "woods:3" "tropical" "jungle/ultra_heavy_jungle1.png"
@@ -87,6 +83,8 @@ super * "jungle:1" "" "jungle/light_jungle1.png;jungle/light_jungle2.png;jungle/
 super * "jungle:2" "" "jungle/heavy_jungle1.png;jungle/heavy_jungle2.png;jungle/heavy_jungle3.png"
 super * "jungle:3" "" "jungle/ultra_heavy_jungle1.png"
 
+super * "water:0" "" "transparent/blue_water_1.png"
+super * "water:1" "" "transparent/blue_water_1.png"
 super * "water:2" "" "transparent/blue_water_2.png"
 super * "water:3" "" "transparent/blue_water_3.png"
 super * "water:4" "" "transparent/blue_water_4.png"
@@ -97,17 +95,22 @@ super * "rapids:2" "" "transparent/rapids.png"
 
 super * "ice:1" "" "transparent/ice.png"
 
-include "StandardIncludes/BasicBridges.tileinc"
-include "StandardIncludes/BasicRoads.tileinc"
-include "StandardIncludes/StandardRailMaglev.tileinc"
+super * "geyser:1" "" "boring/geyservent.gif"
+# geyser 2 is rendered with smoke
+super * "geyser:3" "" "boring/geyservent.gif"
 
-include "StandardIncludes/BuildingsNonSClassArmor.tileinc"
-include "StandardIncludes/BuildingsNonSClassNoArmor.tileinc"
-include "StandardIncludes/BuildingsSClassArmor.tileinc"
-include "StandardIncludes/BuildingsSClassNoArmor.tileinc"
+super * "fortified:1" "" "boring/sandbags.gif"
 
-include "StandardIncludes/StandardFluff.tileinc"
-include "StandardIncludes/StandardFuelTanks.tileinc"
+super * "rubble:1" "" "boring/rubble_light.gif"
+super * "rubble:2" "" "boring/rubble_medium.gif"
+super * "rubble:3" "" "boring/rubble_heavy.gif"
+super * "rubble:4" "" "boring/rubble_hardened.gif"
+#level 5 is wall rubble
+super * "rubble:5" "" "boring/rubble_light.gif"
+super * "rubble:6" "" "boring/rubble_ultra.gif"
+
+include "StandardIncludes/BasicBridges.tileinc"
+include "StandardIncludes/BasicRoads.tileinc"
 
 super * "heavy_industrial:*" "" "transparent/heavy_industrial_zone.gif"
 
@@ -123,11 +126,7 @@ super * "smoke:5" "" "transparent/chaff.gif"
 
 super * "screen:*" "" "boring/screen.gif"
 
-super * "geyser:1" "" "boring/geyservent.gif"
 super * "geyser:2" "" "transparent/geysererupt.png"
-super * "geyser:3" "" "boring/geyservent.gif"
-
-include "StandardIncludes/StandardElevator.tileinc"
 
 base 0 "" "" "boring/beige_plains_0.gif"
 base 1 "" "" "boring/beige_plains_1.gif"

megamek/data/images/hexes/bw_atmospheric.tileset

@@ -25,13 +25,12 @@
 # ground (base sets)
 # swamp
 # rough
-# rubble
 # woods
 # water
-# rapids / ice
-# bridges / roads / rail / maglev
+# road
+# ice / rapids
 # building
-# fluff / fuel tanks
+# bridge
 # fire
 # smoke
 # elevator
@@ -44,31 +43,26 @@ include "bloodwolf/snow/ThemeSnow.tileinc"
 base * "" "volcano" "largeTextures/textureVolcano.jpg"
 include "StandardIncludes/StandardThemes.tileinc"
 
-super * "water:0" "" "bloodwolf/hq_boring/blue_water_0.png"
+include "StandardIncludes/StandardFluff.tileinc"
+include "StandardIncludes/StandardFuelTanks.tileinc"
 
-super * "swamp:1" "grass" "bloodwolf/hq_boring/swamp_3.png;bloodwolf/hq_boring/swamp_4.png;bloodwolf/hq_boring/swamp_5.png"
-super * "swamp:1" "" "bloodwolf/hq_boring/swamp_0.png;bloodwolf/hq_boring/swamp_1.png;bloodwolf/hq_boring/swamp_2.png"
+include "lunar/LunarBuildings.tileinc"
+include "mars/MarsBuildings.tileinc"
+include "StandardIncludes/BuildingsNonSClassArmor.tileinc"
+include "StandardIncludes/BuildingsNonSClassNoArmor.tileinc"
+include "StandardIncludes/BuildingsSClassArmor.tileinc"
+include "StandardIncludes/BuildingsSClassNoArmor.tileinc"
 
-super * "fortified:1" "" "boring/sandbags.gif"
+include "StandardIncludes/StandardRailMaglev.tileinc"
+include "StandardIncludes/StandardElevator.tileinc"
+include "StandardIncludes/StandardLimbs.tileinc"
 
-super * "rough:1" "lunar" "transparent/rough_0.png;transparent/rough_1.png;transparent/rough_2.png"
-super * "rough:2" "lunar" "transparent/ultra_rough.png"
+super * "swamp:1" "grass" "bloodwolf/hq_boring/swamp_3.png;bloodwolf/hq_boring/swamp_4.png;bloodwolf/hq_boring/swamp_5.png"
+super * "swamp:1" "" "bloodwolf/hq_boring/swamp_0.png;bloodwolf/hq_boring/swamp_1.png;bloodwolf/hq_boring/swamp_2.png"
 
 super * "rough:1" "" "hq_boring/rough_0.png;hq_boring/rough_1.png;hq_boring/rough_2.png;hq_boring/rough_3.png"
 super * "rough:2" "" "bloodwolf/hq_boring/ultra_rough.png"
 
-super * "rubble:1" "" "boring/rubble_light.gif"
-super * "rubble:2" "" "boring/rubble_medium.gif"
-super * "rubble:3" "" "boring/rubble_heavy.gif"
-super * "rubble:4" "" "boring/rubble_hardened.gif"
-#level 5 is wall rubble
-super * "rubble:5" "" "boring/rubble_light.gif"
-super * "rubble:6" "" "boring/rubble_ultra.gif"
-
-include "StandardIncludes/StandardLimbs.tileinc"
-
-super * "water:1" "" "bloodwolf/hq_boring/blue_water_1.png"
-
 super * "woods:1" "tropical" "bloodwolf/jungle/light_jungle1.png;bloodwolf/jungle/light_jungle2.png;bloodwolf/jungle/light_jungle3.png"
 super * "woods:2" "tropical" "bloodwolf/jungle/heavy_jungle1.png;bloodwolf/jungle/heavy_jungle2.png;bloodwolf/jungle/heavy_jungle3.png"
 super * "woods:3" "tropical" "bloodwolf/jungle/uhj0.png"
@@ -87,6 +81,8 @@ super * "jungle:1" "" "bloodwolf/jungle/light_jungle1.png;bloodwolf/jungle/light
 super * "jungle:2" "" "bloodwolf/jungle/heavy_jungle1.png;bloodwolf/jungle/heavy_jungle2.png;bloodwolf/jungle/heavy_jungle3.png"
 super * "jungle:3" "" "bloodwolf/jungle/uhj0.png"
 
+super * "water:0" "" "bloodwolf/hq_boring/blue_water_0.png"
+super * "water:1" "" "bloodwolf/hq_boring/blue_water_1.png"
 super * "water:2" "" "bloodwolf/hq_boring/blue_water_2.png"
 super * "water:3" "" "bloodwolf/hq_boring/blue_water_3.png"
 super * "water:4" "" "bloodwolf/hq_boring/blue_water_4.png"
@@ -97,17 +93,22 @@ super * "rapids:2" "" "transparent/rapids.png"
 
 super * "ice:1" "" "bloodwolf/hq_boring/ice_0.png;bloodwolf/hq_boring/ice_1.png;bloodwolf/hq_boring/ice_2.png"
 
-include "StandardIncludes/BasicBridges.tileinc"
-include "StandardIncludes/BasicRoadsSMV.tileinc"
-include "StandardIncludes/StandardRailMaglev.tileinc"
+super * "geyser:1" "" "boring/geyservent.gif"
+# geyser 2 is rendered with smoke
+super * "geyser:3" "" "boring/geyservent.gif"
 
-include "StandardIncludes/BuildingsNonSClassArmor.tileinc"
-include "StandardIncludes/BuildingsNonSClassNoArmor.tileinc"
-include "StandardIncludes/BuildingsSClassArmor.tileinc"
-include "StandardIncludes/BuildingsSClassNoArmorSMV.tileinc"
+super * "fortified:1" "" "boring/sandbags.gif"
 
-include "StandardIncludes/StandardFluff.tileinc"
-include "StandardIncludes/StandardFuelTanks.tileinc"
+super * "rubble:1" "" "boring/rubble_light.gif"
+super * "rubble:2" "" "boring/rubble_medium.gif"
+super * "rubble:3" "" "boring/rubble_heavy.gif"
+super * "rubble:4" "" "boring/rubble_hardened.gif"
+#level 5 is wall rubble
+super * "rubble:5" "" "boring/rubble_light.gif"
+super * "rubble:6" "" "boring/rubble_ultra.gif"
+
+include "StandardIncludes/BasicBridges.tileinc"
+include "StandardIncludes/BasicRoads.tileinc"
 
 super * "heavy_industrial:*" "" "transparent/heavy_industrial_zone.gif"
 
@@ -123,11 +124,7 @@ super * "smoke:5" "" "transparent/chaff.gif"
 
 super * "screen:*" "" "boring/screen.gif"
 
-super * "geyser:1" "" "boring/geyservent.gif"
 super * "geyser:2" "" "transparent/geysererupt.png"
-super * "geyser:3" "" "boring/geyservent.gif"
-
-include "StandardIncludes/StandardElevator.tileinc"
 
 base 0 "" "" "bloodwolf/hq_boring/beige_plains_0.png"
 base 1 "" "" "bloodwolf/hq_boring/beige_plains_1.png"
@@ -180,17 +177,8 @@ base -2 "pavement:1" "" "boring/grey_pavement_7.gif"
 base -3 "pavement:1" "" "boring/grey_pavement_8.gif"
 
 base * "planted_fields:1" "" "boring/vineyard.png"
-base * "planted_fields:2" "" "boring/fields.gif"
-base * "planted_fields:3" "" "boring/soybeans.png"
-
-base -2 "magma:1" "" "magma/crust_-2.gif"
-base -1 "magma:1" "" "magma/crust_-1.gif"
-base 0 "magma:1" "" "magma/crust_0.gif"
-base 1 "magma:1" "" "magma/crust_1.gif"
-base 2 "magma:1" "" "magma/crust_2.gif"
-base 3 "magma:1" "" "magma/crust_3.gif"
 
-base * "magma:2" "" "largeTextures/BigMagma.jpg"
+base * "magma:1" "" "largeTextures/BigMagma.jpg"
 
 base -3 "mud:1" "" "bloodwolf/hq_boring/mud_-3.gif"
 base -2 "mud:1" "" "bloodwolf/hq_boring/mud_-2.gif"
@@ -200,13 +188,6 @@ base 1 "mud:1" "" "bloodwolf/hq_boring/mud_1.gif"
 base 2 "mud:1" "" "bloodwolf/hq_boring/mud_2.gif"
 base 3 "mud:1" "" "bloodwolf/hq_boring/mud_3.gif"
 
-base -2 "mud:2" "" "mud/deepmud_-2.gif"
-base -1 "mud:2" "" "mud/deepmud_-1.gif"
-base 0 "mud:2" "" "mud/deepmud_0.gif"
-base 1 "mud:2" "" "mud/deepmud_1.gif"
-base 2 "mud:2" "" "mud/deepmud_2.gif"
-base 3 "mud:2" "" "mud/deepmud_3.gif"
-
 base -3 "sand:1" "" "bloodwolf/hq_boring/sand_-3.png"
 base -2 "sand:1" "" "bloodwolf/hq_boring/sand_-2.png"
 base -1 "sand:1" "" "bloodwolf/hq_boring/sand_-1.png"

megamek/data/images/hexes/classic.tileset

@@ -4,36 +4,32 @@
 # ground (base sets)
 # swamp
 # rough
-# rubble
 # woods
 # water
-# rapids / ice
-# bridges / roads / rail / maglev
+# road
+# ice / rapids
 # building
-# fluff / fuel tanks
+# bridge
 # fire
 # smoke
 # elevator
 
 include "StandardIncludes/StandardThemes.tileinc"
 
-include "StandardIncludes/StandardSpace.tileinc"
-
-super * "water:0" "" "boring/blue_water_1.gif"
-
-super * "fortified:1" "" "boring/sandbags.gif"
+include "StandardIncludes/StandardFluff.tileinc"
+include "StandardIncludes/StandardFuelTanks.tileinc"
 
-super * "rubble:1" "" "boring/rubble_light.gif"
-super * "rubble:2" "" "boring/rubble_medium.gif"
-super * "rubble:3" "" "boring/rubble_heavy.gif"
-super * "rubble:4" "" "boring/rubble_hardened.gif"
-#level 5 is wall rubble
-super * "rubble:5" "" "boring/rubble_light.gif"
-super * "rubble:6" "" "boring/rubble_ultra.gif"
+include "lunar/LunarBuildings.tileinc"
+include "mars/MarsBuildings.tileinc"
+include "StandardIncludes/BuildingsNonSClassArmor.tileinc"
+include "StandardIncludes/BuildingsNonSClassNoArmor.tileinc"
+include "StandardIncludes/BuildingsSClassArmor.tileinc"
+include "StandardIncludes/BuildingsSClassNoArmor.tileinc"
 
+include "StandardIncludes/StandardRailMaglev.tileinc"
+include "StandardIncludes/StandardElevator.tileinc"
 include "StandardIncludes/StandardLimbs.tileinc"
-
-super * "water:1" "" "boring/blue_water_1.gif"
+include "StandardIncludes/StandardSpace.tileinc"
 
 super * "woods:1" "tropical" "jungle/light_jungle1.png;jungle/light_jungle2.png;jungle/light_jungle3.png;jungle/light_jungle4.png"
 super * "woods:2" "tropical" "jungle/heavy_jungle1.png;jungle/heavy_jungle2.png;jungle/heavy_jungle3.png"
@@ -46,6 +42,8 @@ super * "jungle:1" "" "jungle/light_jungle1.png;jungle/light_jungle2.png;jungle/
 super * "jungle:2" "" "jungle/heavy_jungle1.png;jungle/heavy_jungle2.png;jungle/heavy_jungle3.png"
 super * "jungle:3" "" "jungle/ultra_heavy_jungle1.png"
 
+super * "water:0" "" "boring/blue_water_1.gif"
+super * "water:1" "" "boring/blue_water_1.gif"
 super * "water:2" "" "boring/blue_water_2.gif"
 super * "water:3" "" "boring/blue_water_3.gif"
 super * "water:4" "" "boring/blue_water_4.gif"
@@ -72,17 +70,22 @@ super -4 "ice:1" "" "boring/ice_-4.gif"
 super -5 "ice:1" "" "boring/ice_-5.gif"
 super -6 "ice:1" "" "boring/ice_-6.gif"
 
-include "StandardIncludes/BasicBridges.tileinc"
-include "StandardIncludes/BasicRoads.tileinc"
-include "StandardIncludes/StandardRailMaglev.tileinc"
+super * "geyser:1" "" "boring/geyservent.gif"
+# geyser 2 is rendered with smoke
+super * "geyser:3" "" "boring/geyservent.gif"
 
-include "StandardIncludes/BuildingsNonSClassArmor.tileinc"
-include "StandardIncludes/BuildingsNonSClassNoArmor.tileinc"
-include "StandardIncludes/BuildingsSClassArmor.tileinc"
-include "StandardIncludes/BuildingsSClassNoArmor.tileinc"
+super * "fortified:1" "" "boring/sandbags.gif"
 
-include "StandardIncludes/StandardFluff.tileinc"
-include "StandardIncludes/StandardFuelTanks.tileinc"
+super * "rubble:1" "" "boring/rubble_light.gif"
+super * "rubble:2" "" "boring/rubble_medium.gif"
+super * "rubble:3" "" "boring/rubble_heavy.gif"
+super * "rubble:4" "" "boring/rubble_hardened.gif"
+#level 5 is wall rubble
+super * "rubble:5" "" "boring/rubble_light.gif"
+super * "rubble:6" "" "boring/rubble_ultra.gif"
+
+include "StandardIncludes/BasicBridges.tileinc"
+include "StandardIncludes/BasicRoads.tileinc"
 
 super * "heavy_industrial:*" "" "transparent/heavy_industrial_zone.gif"
 
@@ -98,11 +101,7 @@ super * "fire:4" "" "boring/fire.gif"
 
 super * "screen:*" "" "boring/screen.gif"
 
-super * "geyser:1" "" "boring/geyservent.gif"
 super * "geyser:2" "" "transparent/geysererupt.png"
-super * "geyser:3" "" "boring/geyservent.gif"
-
-include "StandardIncludes/StandardElevator.tileinc"
 
 base 0 "" "" "boring/beige_plains_0.gif"
 base 1 "" "" "boring/beige_plains_1.gif"