Merge balanced mod into this map, create new xmls to utilise ordered …

…combats
triplea-maps · Aug 27, 2016 · b3a482e · b3a482e
1 parent 2759c5a
commit b3a482e
Show file tree

Hide file tree

Showing 124 changed files with 38,254 additions and 2 deletions.
diff --git a/map/games/ww2global40_2nd_edition_ordered.xml b/map/games/ww2global40_2nd_edition_ordered.xml
diff --git a/map/games/ww2global40_balanced2_0.xml b/map/games/ww2global40_balanced2_0.xml
diff --git a/map/games/ww2global40_balanced_ordered.xml b/map/games/ww2global40_balanced_ordered.xml
diff --git a/map/map.properties b/map/map.properties
@@ -1,6 +1,6 @@
 color.Neutral=d8ba7c
 color.Neutral_True=d8ba7c
-color.Neutral_Axis=d8ba7c
+color.Neutral_Axis=6A5B3D
 color.Neutral_Allies=d8ba7c
 color.Italians=58360E
 color.British=916400
@@ -11,7 +11,7 @@ color.Impassable=d8ba7c
 color.Americans=5a5a00
 color.Russians=af2828
 color.Germans=5a5a5a
-color.Japanese=e6b937
+color.Japanese=DCB53F
 color.Chinese=713778
 color.ANZAC=4d7f7f
 color.Dutch=ff6d00

diff --git a/map/objectives.properties b/map/objectives.properties
diff --git a/map/units/ANZAC/marine.png b/map/units/ANZAC/marine.png
diff --git a/map/units/Americans/marine.png b/map/units/Americans/marine.png
diff --git a/map/units/British/marine.png b/map/units/British/marine.png
diff --git a/map/units/Chinese/marine.png b/map/units/Chinese/marine.png
diff --git a/map/units/Dutch/marine.png b/map/units/Dutch/marine.png
diff --git a/map/units/French/marine.png b/map/units/French/marine.png
diff --git a/map/units/Germans/marine.png b/map/units/Germans/marine.png
diff --git a/map/units/Italians/marine.png b/map/units/Italians/marine.png
diff --git a/map/units/Italians_blue/marine.png b/map/units/Italians_blue/marine.png
diff --git a/map/units/Japanese/marine.png b/map/units/Japanese/marine.png
diff --git a/map/units/Mongolians/marine.png b/map/units/Mongolians/marine.png
diff --git a/map/units/Neutral/aaGun.png b/map/units/Neutral/aaGun.png
diff --git a/map/units/Neutral/aaGun_old.png b/map/units/Neutral/aaGun_old.png
diff --git a/map/units/Neutral/aaGun_r.png b/map/units/Neutral/aaGun_r.png
diff --git a/map/units/Neutral/air_base.png b/map/units/Neutral/air_base.png
diff --git a/map/units/Neutral/air_base_hit.png b/map/units/Neutral/air_base_hit.png
diff --git a/map/units/Neutral/airfield.png b/map/units/Neutral/airfield.png
diff --git a/map/units/Neutral/airfield_disabled.png b/map/units/Neutral/airfield_disabled.png
diff --git a/map/units/Neutral/airfield_hit.png b/map/units/Neutral/airfield_hit.png
diff --git a/map/units/Neutral/airfield_r.png b/map/units/Neutral/airfield_r.png
diff --git a/map/units/Neutral/airfield_r_disabled.png b/map/units/Neutral/airfield_r_disabled.png
diff --git a/map/units/Neutral/airfield_r_hit.png b/map/units/Neutral/airfield_r_hit.png
diff --git a/map/units/Neutral/airfield_rockets.png b/map/units/Neutral/airfield_rockets.png
diff --git a/map/units/Neutral/airfield_rockets_disabled.png b/map/units/Neutral/airfield_rockets_disabled.png
diff --git a/map/units/Neutral/airfield_rockets_hit.png b/map/units/Neutral/airfield_rockets_hit.png
diff --git a/map/units/Neutral/airfield_rockets_r.png b/map/units/Neutral/airfield_rockets_r.png
diff --git a/map/units/Neutral/airfield_rockets_r_disabled.png b/map/units/Neutral/airfield_rockets_r_disabled.png
diff --git a/map/units/Neutral/airfield_rockets_r_hit.png b/map/units/Neutral/airfield_rockets_r_hit.png
diff --git a/map/units/Neutral/armour.png b/map/units/Neutral/armour.png
diff --git a/map/units/Neutral/artillery.png b/map/units/Neutral/artillery.png
diff --git a/map/units/Neutral/battlecruiser.png b/map/units/Neutral/battlecruiser.png
diff --git a/map/units/Neutral/battleship.png b/map/units/Neutral/battleship.png
diff --git a/map/units/Neutral/battleship_hit.png b/map/units/Neutral/battleship_hit.png
diff --git a/map/units/Neutral/bomber.png b/map/units/Neutral/bomber.png
diff --git a/map/units/Neutral/bomber_hb.png b/map/units/Neutral/bomber_hb.png
diff --git a/map/units/Neutral/bomber_lr.png b/map/units/Neutral/bomber_lr.png
diff --git a/map/units/Neutral/bomber_lr_hb.png b/map/units/Neutral/bomber_lr_hb.png
diff --git a/map/units/Neutral/bunker.png b/map/units/Neutral/bunker.png
diff --git a/map/units/Neutral/bunker_disabled.png b/map/units/Neutral/bunker_disabled.png
diff --git a/map/units/Neutral/bunker_hit.png b/map/units/Neutral/bunker_hit.png
diff --git a/map/units/Neutral/carrier.png b/map/units/Neutral/carrier.png
diff --git a/map/units/Neutral/carrier_hit.png b/map/units/Neutral/carrier_hit.png
diff --git a/map/units/Neutral/carrier_hit_old.png b/map/units/Neutral/carrier_hit_old.png
diff --git a/map/units/Neutral/cruiser.png b/map/units/Neutral/cruiser.png
diff --git a/map/units/Neutral/cruiser_old.png b/map/units/Neutral/cruiser_old.png
diff --git a/map/units/Neutral/destroyer.png b/map/units/Neutral/destroyer.png
diff --git a/map/units/Neutral/divebomber.png b/map/units/Neutral/divebomber.png
diff --git a/map/units/Neutral/divebomber_jp.png b/map/units/Neutral/divebomber_jp.png
diff --git a/map/units/Neutral/divebomber_lr.png b/map/units/Neutral/divebomber_lr.png
diff --git a/map/units/Neutral/divebomber_lr_jp.png b/map/units/Neutral/divebomber_lr_jp.png
diff --git a/map/units/Neutral/factory.png b/map/units/Neutral/factory.png
diff --git a/map/units/Neutral/factory_hit.png b/map/units/Neutral/factory_hit.png
diff --git a/map/units/Neutral/factory_it.png b/map/units/Neutral/factory_it.png
diff --git a/map/units/Neutral/factory_it_hit.png b/map/units/Neutral/factory_it_hit.png
diff --git a/map/units/Neutral/factory_major.png b/map/units/Neutral/factory_major.png
diff --git a/map/units/Neutral/factory_major_hit.png b/map/units/Neutral/factory_major_hit.png
diff --git a/map/units/Neutral/factory_major_it.png b/map/units/Neutral/factory_major_it.png
diff --git a/map/units/Neutral/factory_major_it_hit.png b/map/units/Neutral/factory_major_it_hit.png
diff --git a/map/units/Neutral/factory_major_r.png b/map/units/Neutral/factory_major_r.png
diff --git a/map/units/Neutral/factory_major_r_hit.png b/map/units/Neutral/factory_major_r_hit.png
diff --git a/map/units/Neutral/factory_major_r_it.png b/map/units/Neutral/factory_major_r_it.png
diff --git a/map/units/Neutral/factory_major_r_it_hit.png b/map/units/Neutral/factory_major_r_it_hit.png
diff --git a/map/units/Neutral/factory_minor.png b/map/units/Neutral/factory_minor.png
diff --git a/map/units/Neutral/factory_minor_hit.png b/map/units/Neutral/factory_minor_hit.png
diff --git a/map/units/Neutral/factory_minor_it.png b/map/units/Neutral/factory_minor_it.png
diff --git a/map/units/Neutral/factory_minor_it_hit.png b/map/units/Neutral/factory_minor_it_hit.png
diff --git a/map/units/Neutral/factory_minor_r.png b/map/units/Neutral/factory_minor_r.png
diff --git a/map/units/Neutral/factory_minor_r_hit.png b/map/units/Neutral/factory_minor_r_hit.png
diff --git a/map/units/Neutral/factory_minor_r_it.png b/map/units/Neutral/factory_minor_r_it.png
diff --git a/map/units/Neutral/factory_minor_r_it_hit.png b/map/units/Neutral/factory_minor_r_it_hit.png
diff --git a/map/units/Neutral/factory_r.png b/map/units/Neutral/factory_r.png
diff --git a/map/units/Neutral/factory_r_hit.png b/map/units/Neutral/factory_r_hit.png
diff --git a/map/units/Neutral/factory_r_it.png b/map/units/Neutral/factory_r_it.png
diff --git a/map/units/Neutral/factory_r_it_hit.png b/map/units/Neutral/factory_r_it_hit.png
diff --git a/map/units/Neutral/factory_upgrade.png b/map/units/Neutral/factory_upgrade.png
diff --git a/map/units/Neutral/factory_upgrade_hit.png b/map/units/Neutral/factory_upgrade_hit.png
diff --git a/map/units/Neutral/factory_upgrade_it.png b/map/units/Neutral/factory_upgrade_it.png
diff --git a/map/units/Neutral/factory_upgrade_it_hit.png b/map/units/Neutral/factory_upgrade_it_hit.png
diff --git a/map/units/Neutral/factory_upgrade_r.png b/map/units/Neutral/factory_upgrade_r.png
diff --git a/map/units/Neutral/factory_upgrade_r_hit.png b/map/units/Neutral/factory_upgrade_r_hit.png
diff --git a/map/units/Neutral/factory_upgrade_r_it.png b/map/units/Neutral/factory_upgrade_r_it.png
diff --git a/map/units/Neutral/factory_upgrade_r_it_hit.png b/map/units/Neutral/factory_upgrade_r_it_hit.png
diff --git a/map/units/Neutral/fighter.png b/map/units/Neutral/fighter.png
diff --git a/map/units/Neutral/fighter_jp.png b/map/units/Neutral/fighter_jp.png
diff --git a/map/units/Neutral/fighter_lr.png b/map/units/Neutral/fighter_lr.png
diff --git a/map/units/Neutral/fighter_lr_jp.png b/map/units/Neutral/fighter_lr_jp.png
diff --git a/map/units/Neutral/halftrack.png b/map/units/Neutral/halftrack.png
diff --git a/map/units/Neutral/harbour.png b/map/units/Neutral/harbour.png
diff --git a/map/units/Neutral/harbour_disabled.png b/map/units/Neutral/harbour_disabled.png
diff --git a/map/units/Neutral/harbour_hit.png b/map/units/Neutral/harbour_hit.png
diff --git a/map/units/Neutral/harbour_r.png b/map/units/Neutral/harbour_r.png
diff --git a/map/units/Neutral/harbour_r_disabled.png b/map/units/Neutral/harbour_r_disabled.png
diff --git a/map/units/Neutral/harbour_r_hit.png b/map/units/Neutral/harbour_r_hit.png
diff --git a/map/units/Neutral/infantry.png b/map/units/Neutral/infantry.png
diff --git a/map/units/Neutral/marine.png b/map/units/Neutral/marine.png
diff --git a/map/units/Neutral/mech_infantry.png b/map/units/Neutral/mech_infantry.png
diff --git a/map/units/Neutral/naval_base.png b/map/units/Neutral/naval_base.png
diff --git a/map/units/Neutral/naval_base_hit.png b/map/units/Neutral/naval_base_hit.png
diff --git a/map/units/Neutral/neutral_mech.png b/map/units/Neutral/neutral_mech.png
diff --git a/map/units/Neutral/rockets.png b/map/units/Neutral/rockets.png
diff --git a/map/units/Neutral/rockets_old.png b/map/units/Neutral/rockets_old.png
diff --git a/map/units/Neutral/rockets_r.png b/map/units/Neutral/rockets_r.png
diff --git a/map/units/Neutral/s_destroyer.png b/map/units/Neutral/s_destroyer.png
diff --git a/map/units/Neutral/submarine.png b/map/units/Neutral/submarine.png
diff --git a/map/units/Neutral/submarine_r.png b/map/units/Neutral/submarine_r.png
diff --git a/map/units/Neutral/submarine_r_ss.png b/map/units/Neutral/submarine_r_ss.png
diff --git a/map/units/Neutral/submarine_ss.png b/map/units/Neutral/submarine_ss.png
diff --git a/map/units/Neutral/tactical_bomber.png b/map/units/Neutral/tactical_bomber.png
diff --git a/map/units/Neutral/tactical_bomber_hb.png b/map/units/Neutral/tactical_bomber_hb.png
diff --git a/map/units/Neutral/tactical_bomber_jp.png b/map/units/Neutral/tactical_bomber_jp.png
diff --git a/map/units/Neutral/tactical_bomber_lr.png b/map/units/Neutral/tactical_bomber_lr.png
diff --git a/map/units/Neutral/tactical_bomber_lr_hb.png b/map/units/Neutral/tactical_bomber_lr_hb.png
diff --git a/map/units/Neutral/tactical_bomber_lr_jp.png b/map/units/Neutral/tactical_bomber_lr_jp.png
diff --git a/map/units/Neutral/transport.png b/map/units/Neutral/transport.png
diff --git a/map/units/Neutral_Allies/marine.png b/map/units/Neutral_Allies/marine.png
diff --git a/map/units/Neutral_Axis/marine.png b/map/units/Neutral_Axis/marine.png
diff --git a/map/units/Neutral_True/marine.png b/map/units/Neutral_True/marine.png
diff --git a/map/units/Russians/marine.png b/map/units/Russians/marine.png
diff --git a/map/units/UK_Pacific/marine.png b/map/units/UK_Pacific/marine.png