From eaed6c0eb6f10e93614a5464f6ce504a8e0c1e89 Mon Sep 17 00:00:00 2001
From: Simon <simon58500@bigpond.com>
Date: Sun, 2 Apr 2017 18:25:51 +1000
Subject: [PATCH] Update colours and SBR comments

---
 map/games/G40Redesign_Test.xml             | 3 +--
 map/games/ww2global40_balanced2_0.xml      | 2 +-
 map/games/ww2global40_balanced_move1st.xml | 2 +-
 map/map.properties                         | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/map/games/G40Redesign_Test.xml b/map/games/G40Redesign_Test.xml
index 02ec4fa..449673d 100644
--- a/map/games/G40Redesign_Test.xml
+++ b/map/games/G40Redesign_Test.xml
@@ -2319,7 +2319,6 @@
     <attachment name="unitAttachment" attachTo="marine" javaClass="games.strategy.triplea.attachments.UnitAttachment" type="unitType">
       <option name="movement" value="1"/>
       <option name="transportCost" value="4"/>
-      <option name="isMarine" value="true"/>
       <option name="attack" value="1"/>
       <option name="defense" value="1"/>
       <!--<option name="artillerySupportable" value="false"/>-->
@@ -15274,7 +15273,7 @@
 <br><br>
 
 
-<b>New Unit - Marines:</b> Cost 5; Attack at 1 (2 during amphibious assaults); Defend at 2; No bonus from artillery; Can be loaded onto cruisers and battleships (1 to a ship). <br><br>
+<b>New Unit - Marines:</b> Cost 4; Attack at 1; Defend at 1; No bonus from artillery; Can be loaded onto cruisers and battleships (1 to a ship). <br><br>
 <b>Note:</b> During amphibious assaults, Battleships and Cruisers may bombard any adjacent territory in which an amphibious assault is occurring, regardless of where they unloaded their marines.
 
 <br><br>
diff --git a/map/games/ww2global40_balanced2_0.xml b/map/games/ww2global40_balanced2_0.xml
index 47f5bc5..be9dbbb 100644
--- a/map/games/ww2global40_balanced2_0.xml
+++ b/map/games/ww2global40_balanced2_0.xml
@@ -15487,7 +15487,7 @@ Fighters and/or Tactical bombers can be scrambled from any territory bordering a
 
 <b>Strategic Bombing Runs (SBR)</b><br>
 Bombing can now happen against both types of ICs, harbours, and airfields (attackers choice)[tactical bombers can not target factories though]. Fighters can participate in the bombing run as escorts. Fighters in the territory being bombed can be launched as interceptors (no airfield necessary).<br><br>
-<b>If interceptors are launched:</b> a one-round air battle takes place right away all air involved roll at 1 (jets rolls at 2). Either attacking bombers or fighters can be taken as casualties.<br><br>
+<b>If interceptors are launched:</b> a one-round air battle takes place right away all involved. Bombers roll at 1 and fighters involved roll at 2 (jets rolls at 3). Either attacking bombers or fighters can be taken as casualties.<br><br>
 After the air battle, or if there were no interceptors, the escorts are retreated and any bombers/tacs remaining can now be divied up to attack specific targets. Each target rolls its built-in AA gun against the bombers/tacs targetting it. If there is an AA gun in the territory being bombed it does <b>not</b> roll because its there to defend combat units and not complexes/bases.
 <br><br>
 
diff --git a/map/games/ww2global40_balanced_move1st.xml b/map/games/ww2global40_balanced_move1st.xml
index 79a111a..8d6cd3d 100644
--- a/map/games/ww2global40_balanced_move1st.xml
+++ b/map/games/ww2global40_balanced_move1st.xml
@@ -15494,7 +15494,7 @@ Fighters and/or Tactical bombers can be scrambled from any territory bordering a
 
 <b>Strategic Bombing Runs (SBR)</b><br>
 Bombing can now happen against both types of ICs, harbours, and airfields (attackers choice)[tactical bombers can not target factories though]. Fighters can participate in the bombing run as escorts. Fighters in the territory being bombed can be launched as interceptors (no airfield necessary).<br><br>
-<b>If interceptors are launched:</b> a one-round air battle takes place right away all air involved roll at 1 (jets rolls at 2). Either attacking bombers or fighters can be taken as casualties.<br><br>
+<b>If interceptors are launched:</b> a one-round air battle takes place right away. Bombers roll at 1 and all fighters involved roll at 2 (jets roll at 3). Either attacking bombers or fighters can be taken as casualties.<br><br>
 After the air battle, or if there were no interceptors, the escorts are retreated and any bombers/tacs remaining can now be divied up to attack specific targets. Each target rolls its built-in AA gun against the bombers/tacs targetting it. If there is an AA gun in the territory being bombed it does <b>not</b> roll because its there to defend combat units and not complexes/bases.
 <br><br>
 
diff --git a/map/map.properties b/map/map.properties
index 757430a..504f241 100644
--- a/map/map.properties
+++ b/map/map.properties
@@ -1,7 +1,7 @@
 color.Neutral=d8ba7c
-color.Neutral_True=d8ba7c
+color.Neutral_True=b88a6c
 color.Neutral_Axis=6A5B3D
-color.Neutral_Allies=b88a6c
+color.Neutral_Allies=d8ba7c
 color.Italians=58360E
 color.British=916400
 color.UK_Europe=916400