DDay : add us units count

2 files changed, 35 insertions, 21 deletions

diff --git a/DDayAtOmahaBeach/DDayOmaha.lou b/DDayAtOmahaBeach/DDayOmaha.lou
index cb3c330..54b76bf 100644
--- a/DDayAtOmahaBeach/DDayOmaha.lou
+++ b/DDayAtOmahaBeach/DDayOmaha.lou
@@ -87,7 +87,7 @@ On Placing Units in @I {Beach Landing Boxes}
 @ListItem{@B {Max 2 units} per @I {Beach Landing Boxes} (HQs and Generals do not count).}
 @ListItem{A General may not be placed alone if there are units scheduled to arrive with him.}
 @ListItem{Only @I rangers may be placed in @I {Charlie Beach Landing Boxes} (CH).}
-@ListItem{@B {Turn 7+} units may be delayed (place them on another turn).}
+@ListItem{@B {Turn 7+} units may be voluntarily delayed (place them on another turn).}
 @ListItem{@B {Turn 11+} a unit that has been delayed may be placed in any @I {Beach Landing Box}.}
 @EndList
 @End @Section
@@ -97,7 +97,6 @@ On Placing Units in @I {Beach Landing Boxes}
 @Section @Title {German Communication @Sym ampersand Depth @Sym ampersand Reinforcement} @NewPage { no } @Begin
 
 #@BeginSubSections
-@LP
 @BulletList
 @ListItem{Us units (not Generals) controls their hex, US Infantry @Sym ampersand tanks also control their 6 adjacent hexes.}
 @ListItem{Us units on high ground control adjacent hexes on @I beach, @I pavillon or @I draw hexes, the opposite is not true.}
@@ -349,11 +348,11 @@ y{foot+ysize+.8c}
     @ListItem{not in the field of fire of the attacked hex, unless it is @I armored.}
     @RawEndList
 }
-@ListItem{A @B {Naval fire}, may support if 1 attacking infantry at any range has a radio or is in command of an HQ.}
+@ListItem{@I Heroes from adjacent hex can provide 1 weapon (not @B FL) or a +1 to the attack, @B {not cumulative}.}
 @ListItem{@I {@B FL Flanking} : requires attacking from two hexes that are adjacent to the target but not to each other.}
 @ListItem{@I {@B FL Flanking} : if the unit and @I Depth marker require it, the attack must be conducted from 3+ hexes.}
-@ListItem{@I Heroes from adjacent hex can provide 1 weapon (not @B FL) or a +1 to the attack, @B {not cumulative}.}
-@ListItem{An infantry in command of an HQ, attacking from an adjacent hex is considered having a radio @B RD.}
+@ListItem{@I {@B RD Radio} : an infantry in command of an HQ, attacking from an adjacent hex is considered having a radio.}
+@ListItem{A @B {Naval fire}, may support if 1 attacking infantry at any range has a radio or is in command of an HQ.}
 @EndList
 #@LP
 #@Include{ german_defense.lou }
diff --git a/DDayAtOmahaBeach/us_units.lou b/DDayAtOmahaBeach/us_units.lou
index bf7b3a5..4104175 100644
--- a/DDayAtOmahaBeach/us_units.lou
+++ b/DDayAtOmahaBeach/us_units.lou
@@ -1,20 +1,20 @@
 @Tbl
     rule { yes }
     indentvertical { ctr }
-    aformat { @Cell @B A | @Cell @I B | @Cell @B C | @Cell @I D | @Cell @B E }
-    bformat { @StartVSpan @Cell @B A | @Cell @I B | @Cell @B C | @Cell @I D | @Cell @B E }
-    cformat { @VSpan | @Cell @I B | @Cell @B C | @Cell @I D | @Cell @B E }
+    aformat { @Cell @B A | @Cell @I B | @Cell @B C | @Cell @I D | @Cell @B E | @Cell @B F }
+    bformat { @StartVSpan @Cell @B A | @Cell @I B | @Cell @B C | @Cell @I D | @Cell @B E | @StartVSpan @Cell @B F }
+    cformat { @VSpan | @Cell @I B | @Cell @B C | @Cell @I D | @Cell @B E | @VSpan }
 {
 @Row
     indent { ctr }
     paint { lightgrey }
     #format { @StartVSpan @Cell paint { rgb { .23 .47 .18 } @B A | @StartHSpan @Cell paint { rgb { .32 .47 .18 } } @B B | @HSpan | @StartHSpan @Cell paint { rgb { .13 .57 .25 } } @B C | @HSpan }
-    format { @StartVSpan @Cell @B A | @StartHSpan @Cell paint { rgb { .23 .47 .18 } } @B B | @HSpan | @StartHSpan @Cell paint { rgb { .28 .59 .23 } } @B C | @HSpan }
-    A { Turn } B { East Sector } C { West Sector }
+    format { @StartVSpan @Cell @B A | @StartHSpan @Cell paint { rgb { .23 .47 .18 } } @B B | @HSpan | @StartHSpan @Cell paint { rgb { .28 .59 .23 } } @B C | @HSpan | @StartVSpan @Cell @B F }
+    A { Turn } B { East Sector } C { West Sector } F { @Sym numbersign }
 @Row
     indent { ctr }
     paint { lightgrey }
-    format { @VSpan | @Cell @I A | @Cell @B B | @Cell @I C | @Cell @B D }
+    format { @VSpan | @Cell @I A | @Cell @B B | @Cell @I C | @Cell @B D | @VSpan }
     A { { 6p } @Font steps } B { Units } C { { 6p } @Font steps } D { Units }
 @Rowa
     A { 0 }
@@ -22,6 +22,7 @@
     C { 1{@Sym slash}B{@Sym slash}741 @I - 2{@Sym slash}B{@Sym slash}741 @I - 1{@Sym slash}C{@Sym slash}741 @I - 2{@Sym slash}C{@Sym slash}741 }
     D { 2 }
     E { 1{@Sym slash}B{@Sym slash}743 @I - 2{@Sym slash}B{@Sym slash}743 @I - 1{@Sym slash}C{@Sym slash}743 @I - 2{@Sym slash}C{@Sym slash}743 }
+    F { 8 }
 @Rowb
     paint { rgb { .95 .95 .95} }
     ruleabovewidth { 1p }
@@ -30,6 +31,7 @@
     C { 1{@Sym slash}A{@Sym slash}741 @I - 2{@Sym slash}A{@Sym slash}741 }
     D { 2 }
     E { C{@Sym slash}2R @I - 1{@Sym slash}A{@Sym slash}743 @I - 2{@Sym slash}A{@Sym slash}743 }
+    F { 13 }
 @Rowc
     paint { rgb { .95 .95 .95} }
     B { 3 }
@@ -43,6 +45,7 @@
     C { 1{@Bullet}2{@Sym slash}397 }
     D { 2 }
     E { 3{@Bullet}4{@Sym slash}397 @I - 5{@Bullet}6{@Sym slash}397 }
+    F { 7 }
 @Rowc
     B { 3 }
     C { G{@Sym slash}2{@Sym slash}16 @I - K{@Sym slash}3{@Sym slash}16 }
@@ -58,20 +61,22 @@
     E { C{@Sym slash}1{@Sym slash}116 @I - D{@Sym slash}1{@Sym slash}116
     @LLP I{@Sym slash}3{@Sym slash}116 @I - K{@Sym slash}3{@Sym slash}116 @I - L{@Sym slash}3{@Sym slash}116
     }
+    F { 7 }
 @Row
     ruleabovewidth { 1p }
-    format { @StartVSpan @Cell @B A | @StartVSpan @Cell @I B | @StartVSpan @Cell @B C | @Cell @I D | @Cell @B E }
+    format { @StartVSpan @Cell @B A | @StartVSpan @Cell @I B | @StartVSpan @Cell @B C | @Cell @I D | @Cell @B E | @StartVSpan @Cell @B F }
     A { 5 }
     B { 2 }
     C { A{@Bullet}C{@Sym slash}81C }
     D { }
     E { Gen. Cota @LLP 116{@Sym slash}HQ }
+    F { 6 }
 @Row
-    format { @VSpan | @VSpan | @VSpan | @Cell @I D | @Cell @B E }
+    format { @VSpan | @VSpan | @VSpan | @Cell @I D | @Cell @B E | @VSpan }
     D { 2 }
     E { B{@Bullet}D{@Sym slash}81C @I - A{@Bullet}B{@Sym slash}2R }
 @Row
-    format { @VSpan | @VSpan | @VSpan | @Cell @I D | @Cell @B E }
+    format { @VSpan | @VSpan | @VSpan | @Cell @I D | @Cell @B E | @VSpan }
     D { 3 }
     E { M{@Sym slash}3{@Sym slash}116 }
 @Rowa
@@ -82,20 +87,22 @@
     C { A{@Sym slash}1{@Sym slash}16 @I - B{@Sym slash}1{@Sym slash}16 @I - C{@Sym slash}1{@Sym slash}16 }
     D { 2 }
     E { A{@Bullet}B{@Sym slash}5R @I - C{@Bullet}D{@Sym slash}5R @I - E{@Bullet}F{@Sym slash}5R }
+    F { 6 }
 @Row
     ruleabovewidth { 1p }
-    format { @StartVSpan @Cell @B A | @Cell @I B | @Cell @B C | @StartVSpan @Cell @I D | @StartVSpan @Cell @B E }
+    format { @StartVSpan @Cell @B A | @Cell @I B | @Cell @B C | @StartVSpan @Cell @I D | @StartVSpan @Cell @B E | @StartVSpan @Cell @B F }
     A { 7 }
     B { }
     C { 16{@Sym slash}HQ }
     D { 4 }
     E { 58AFA }
+    F { 4 }
 @Row
-    format { @VSpan | @Cell @I B | @Cell @B C | @VSpan | @VSpan }
+    format { @VSpan | @Cell @I B | @Cell @B C | @VSpan | @VSpan | @VSpan }
     B { 3 }
     C { D{@Sym slash}1{@Sym slash}16 }
 @Row
-    format { @VSpan | @Cell @I B | @Cell @B C | @VSpan | @VSpan }
+    format { @VSpan | @Cell @I B | @Cell @B C | @VSpan | @VSpan | @VSpan }
     B { 4 }
     C { 62AFA }
 @Rowb
@@ -106,6 +113,7 @@
     C { Can{@Sym slash}16 }
     D { 2 }
     E { Can{@Sym slash}116 }
+    F { 4 }
 @Rowc
     paint { rgb { .95 .95 .95} }
     B { 4 }
@@ -119,6 +127,7 @@
     C { AT{@Sym slash}16 }
     D {  }
     E { AT{@Sym slash}116 }
+    F { 6 }
 @Rowc
     B { 2 }
     C { A{@Bullet}B{@Sym slash}197 @I - C{@Bullet}D{@Sym slash}197 }
@@ -130,6 +139,7 @@
     A { 10 }
     C { Gen. Wyman }
     E { @Sym emptyset }
+    F { 1 }
 @Rowa
     ruleabovewidth { 1p }
     A { 16 }
@@ -139,16 +149,18 @@
     E { A{@Sym slash}1{@Sym slash}115 @I - B{@Sym slash}1{@Sym slash}115 @I - C{@Sym slash}1{@Sym slash}115 @I - D{@Sym slash}1{@Sym slash}115
     @LLP E{@Sym slash}2{@Sym slash}115 @I - F{@Sym slash}2{@Sym slash}115 @I - G{@Sym slash}2{@Sym slash}115 @I - H{@Sym slash}2{@Sym slash}115
     }
+    F { 12 }
 @Row
     paint { @Lightgrey }
     ruleabovewidth { 1p }
-    format { @StartVSpan @Cell @B A | @StartVSpan @Cell @I B | @StartVSpan @Cell @B C | @Cell @I D | @Cell @B E }
+    format { @StartVSpan @Cell @B A | @StartVSpan @Cell @I B | @StartVSpan @Cell @B C | @Cell @I D | @Cell @B E | @StartVSpan @Cell @B F }
     A { 19 }
     C {@Sym emptyset }
     E { 115{@Sym slash}HQ }
+    F { 5 }
 @Row
     paint { @Lightgrey }
-    format { @VSpan | @VSpan | @VSpan | @Cell @I D | @Cell @B E }
+    format { @VSpan | @VSpan | @VSpan | @Cell @I D | @Cell @B E | @VSpan }
     D { 3 }
     E { I{@Sym slash}3{@Sym slash}115 @I - K{@Sym slash}3{@Sym slash}115 @I - L{@Sym slash}3{@Sym slash}115 @I - M{@Sym slash}3{@Sym slash}115 }
 @Rowa
@@ -157,16 +169,18 @@
     B { 3 }
     C { A{@Sym slash}1{@Sym slash}18 @I - B{@Sym slash}1{@Sym slash}18 @I - C{@Sym slash}1{@Sym slash}18 @I - D{@Sym slash}1{@Sym slash}18 }
     E { AT{@Sym slash}115 }
+    F { 5 }
 @Row
     paint { @Lightgrey }
     ruleabovewidth { 1p }
-    format { @StartVSpan @Cell @B A | @Cell @I B | @Cell @B C | @StartVSpan @Cell @I D | @StartVSpan @Cell @B E }
+    format { @StartVSpan @Cell @B A | @Cell @I B | @Cell @B C | @StartVSpan @Cell @I D | @StartVSpan @Cell @B E | @StartVSpan @Cell @B F }
     A { 22 }
     C { 18{@Sym slash}HQ }
     E { @Sym emptyset }
+    F { 5 }
 @Row
     paint { @Lightgrey }
-    format { @VSpan | @Cell @I B | @Cell @B C | @VSpan | @VSpan }
+    format { @VSpan | @Cell @I B | @Cell @B C | @VSpan | @VSpan | @VSpan }
     B { 3 }
     C { I{@Sym slash}3{@Sym slash}18 @I - K{@Sym slash}3{@Sym slash}18 @I - L{@Sym slash}3{@Sym slash}18 @I - M{@Sym slash}3{@Sym slash}18 }
 @Rowa
@@ -174,4 +188,5 @@
     A { 23 }
     C { AT{@Sym slash}18 }
     E {@Sym emptyset }
+    F { 1 }
 }