From 36c4e048a34fab2444ba66140fad473591ef15e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 10 Nov 2020 18:02:10 +0100 Subject: DDAyOmaha : improve tables --- DDayAtOmahaBeach/DDayOmaha.lou | 1 + DDayAtOmahaBeach/german_fire.lou | 4 +--- DDayAtOmahaBeach/us_amphibious.lou | 3 +-- DDayAtOmahaBeach/us_attack.lou | 14 +++++++++----- DDayAtOmahaBeach/us_move.lou | 6 ++---- DDayAtOmahaBeach/us_weapons.lou | 5 ++--- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/DDayAtOmahaBeach/DDayOmaha.lou b/DDayAtOmahaBeach/DDayOmaha.lou index 7b95851..618bfab 100644 --- a/DDayAtOmahaBeach/DDayOmaha.lou +++ b/DDayAtOmahaBeach/DDayOmaha.lou @@ -17,6 +17,7 @@ def @PGreen right x { @Green @Colour x } def @POrange right x { @Orange @Colour x } def @Eliminated { {rgb 1 0 0} @Colour Eliminated } +def @Defeated { {rgb 1 0 0} @Colour Defeated } def @Steps { @PRed {-2 steps} } def @Step { @PRed {-1 step} } def @Disrupted { @POrange Disrupted} diff --git a/DDayAtOmahaBeach/german_fire.lou b/DDayAtOmahaBeach/german_fire.lou index 3e2a0a6..842c41b 100644 --- a/DDayAtOmahaBeach/german_fire.lou +++ b/DDayAtOmahaBeach/german_fire.lou @@ -6,9 +6,7 @@ aformat { @Cell @B A | @Cell @B B | @Cell @B C } bformat { @Cell @B A | @Cell @B B | @Cell @B C } { -@Rowa A { } B { clines @Break {@B WN or @B {Revealed -Reinforcement}}} C { clines @Break {@B {Unrevealed -Reinforcement} } } +@Rowa A { } B { @B WN or @B {Revealed @LLP Reinforcement} } C { @B {Unrevealed @LLP Reinforcement} } @Rowb A { @IncludeGraphic "imgs/intense.eps"} B { @Step } C { @Step + @Disrupted } @Rowb A { @IncludeGraphic "imgs/steady.eps" + @PBlue Non-Armored + sym } B { @Step } C { @Step + @Disrupted } @Rowb A { @IncludeGraphic "imgs/sporadic.eps" + @PBlue Non-Armored + sym } B { @Disrupted } C { @Disrupted } diff --git a/DDayAtOmahaBeach/us_amphibious.lou b/DDayAtOmahaBeach/us_amphibious.lou index 92faa19..4b3dc89 100644 --- a/DDayAtOmahaBeach/us_amphibious.lou +++ b/DDayAtOmahaBeach/us_amphibious.lou @@ -34,8 +34,7 @@ @Rowa A { Turn 4-14 } B { A } C { B } D { C } E { D } #@Rowb A { INF } @Rowb A { @IncludeGraphic "imgs/infantry.eps" } - B { clines @Break {@I {Rangers may} -@Left {[1-4]} } } + B { @I {Rangers may} @LLP @Left {[1-4]} } C { @Left 1 } D { @Left 4 } E { @Rightt 1 } diff --git a/DDayAtOmahaBeach/us_attack.lou b/DDayAtOmahaBeach/us_attack.lou index de0d966..f994a47 100644 --- a/DDayAtOmahaBeach/us_attack.lou +++ b/DDayAtOmahaBeach/us_attack.lou @@ -6,8 +6,6 @@ aformat { @Cell @B A | @Cell @B B | @Cell @B C | @Cell @B D | @Cell @B E } bformat { @StartVSpan @Cell @B A | @Cell @B B | @Cell @B C | @Cell @B D | @Cell @B E } cformat { @VSpan | @Cell @B B | @Cell @B C | @Cell @B D | @Cell @B E } - dformat { @VSpan | @Cell @B B | @Cell @B C | @StartVSpan @Cell @B D | @StartVSpan @Cell @B E } - eformat { @VSpan | @Cell @B B | @Cell @B C | @VSpan | @VSpan } { @Rowa A { Weapons } B { Delta } C { Alone } D { +Hidden Depth } E { + Revealed Depth } @Rowb A { @StartVSpan NO } B { @Sym lessequal } C { clines @Break {@PGreen {US Disrupted} @@ -16,10 +14,16 @@ @Rowc B { @Sym greater } C { + @Depth } D { @PGreen {US Disrupted} } E { @Sym emptyset } #@Rowc B { x2 } C { @Disrupted } D { @Disrupted } E { @Disrupted + @Purple @Colour attrition } @Rowc B { x2 } C { @Disrupted } D { @Disrupted } E { clines @Break {@Disrupted -+ [@Step adj -> @Eliminated]?} } ++ [@Step adj -> @Defeated]?} } @Rowb A { @StartVSpan YES } B { @Sym less } C { + @Depth } D { @PGreen {US Disrupted} } E { @Sym emptyset } @Rowc B { @Sym equal } C { @Disrupted } D { @Sym emptyset } E { @Disrupted } -@Rowd B { @Sym greater } C { @Eliminated } D { clines @Break {@Purple @Colour Reveal @Depth +@Row + format { @VSpan | @Cell @B B | @Cell @B C | @StartVSpan @Cell @B D | @Cell @B E } + B { @Sym greater } C { @Defeated } D { clines @Break {@Purple @Colour Reveal @Depth + resolve again} } E { @Disrupted - @Depth } -@Rowe B { x2 } C { @Eliminated } +@Row + format { @VSpan | @Cell @B B | @Cell @B C | @VSpan | @Cell @B E } + B { x2 } C { @Defeated } E { clines @Break {@Disrupted - @Depth +turn 16+ : @Defeated - @Depth +} } } diff --git a/DDayAtOmahaBeach/us_move.lou b/DDayAtOmahaBeach/us_move.lou index f86ffe7..0a2a742 100644 --- a/DDayAtOmahaBeach/us_move.lou +++ b/DDayAtOmahaBeach/us_move.lou @@ -7,11 +7,9 @@ bformat { @Cell @B A | @Cell @B B | @Cell @B C | @Cell @B D } { @Rowa A { } B { Infantry } C { Leaders } D { Others } -@Rowb A { clines @Break {Bocage, Orchard, Woods -Hedge, Seawall, Slope} } B { @Sym emptyset } C { @Sym emptyset } D { @POrange {unless via road} } +@Rowb A { Bocage, Orchard, Woods @LLP Hedge, Seawall, Slope } B { @Sym emptyset } C { @Sym emptyset } D { @POrange {unless via road} } @Rowb A { Bluff } B { @Blue @Colour climb } C { @PGreen {no climb} } D { @POrange {unless via road}} @Rowb A { Scaleable Cliff } B { @Blue @Colour {climb cliff} } C { @PRed No } D { @PRed No } -@Rowb A { clines @Break {Mined Roads, Shingle -Anti-Tank Ditch @Char slash Wall} } B { @Sym emptyset } C { @Sym emptyset } D { @PRed No } +@Rowb A { Mined Roads, Shingle @LLP Anti-Tank Ditch @Char slash Wall } B { @Sym emptyset } C { @Sym emptyset } D { @PRed No } @Rowb A { Rough, Sheer Cliff } B { @PRed No } C { @PRed No } D { @PRed No } } diff --git a/DDayAtOmahaBeach/us_weapons.lou b/DDayAtOmahaBeach/us_weapons.lou index f3bf0b7..350c51d 100644 --- a/DDayAtOmahaBeach/us_weapons.lou +++ b/DDayAtOmahaBeach/us_weapons.lou @@ -5,7 +5,7 @@ apaint { lightgrey } aformat { @StartHSpan @Cell @B A | @HSpan | @Cell @B C | @Cell @B D } bformat { @Cell A | @Cell B | @Cell @B C | @StartVSpan @Cell D } - cformat { @Cell A | @Cell B | @Cell @B C | @VSpan } + cformat { @Cell A | @Cell B | @Cell indent { left } @B C | @VSpan } { @Rowa A { Unit Type } C { Weapons } D { Definitions } @Rowb A { @IncludeGraphic "imgs/infantry.eps" @IncludeGraphic "imgs/ranger.eps" } B { Infantry } C { BG - BR - BZ - DE - MO - RD } D { lines @Break { @@ -22,8 +22,7 @@ } } @Rowc A { @IncludeGraphic "imgs/infantry.eps" } B { ranged from adj } C { @I above + MG } @Rowc A { @IncludeGraphic "imgs/infantry.eps" } B { ranged from dist } C { BR - BZ - MG - MO - RD } -@Rowc A { @IncludeGraphic "imgs/tank.eps" } B { Tank } C { clines @Break { @I {1-5 hex :} AR - BZ -@I {1-3 hex :} BR - MG } } +@Rowc A { @IncludeGraphic "imgs/tank.eps" } B { Tank } C { @I {1-5 hex :} AR - BZ @LLP @I {1-3 hex :} BR - MG } @Rowc A { @IncludeGraphic "imgs/aa.eps" @IncludeGraphic "imgs/mech_aa.eps" } B { Anti-Aircraft } C { BR - MG } @Rowc A { @IncludeGraphic "imgs/arty.eps" @IncludeGraphic "imgs/mech_arty.eps" } B { Artillery } C { AR - DE - MO } @Rowc A { @IncludeGraphic "imgs/at.eps" } B { Anti-Tank } C { AR - BZ } -- cgit v1.1-2-g2b99