NWars : fix min AP, Subjugate, Manuelito, charts

1 files changed, 78 insertions, 54 deletions

diff --git a/NavajoWars/NavajoWars-charts.lou b/NavajoWars/NavajoWars-charts.lou
index 2c1dbb6..b4b11ff 100644
--- a/NavajoWars/NavajoWars-charts.lou
+++ b/NavajoWars/NavajoWars-charts.lou
@@ -19,12 +19,13 @@
   @PageType		      { A4 }
   @PageOrientation	{ Landscape }
   @ColumnNumber		  { 2 }
-  @TopMargin		    { 0.5c	@OrIfPlain 6f	}
-  @FootMargin		    { 0.5c	@OrIfPlain 6f	}
-  @OddLeftMargin	  { .2c	@OrIfPlain 10s	}
-  @OddRightMargin	  { .2c	@OrIfPlain 10s	}
-  @EvenLeftMargin	  { .2c	@OrIfPlain 10s	}
-  @EvenRightMargin	{ .2c	@OrIfPlain 10s	}
+  @ColumnGap		    { .5c }
+  @TopMargin		    { .5c	@OrIfPlain 6f	}
+  @FootMargin		    { .5c	@OrIfPlain 6f	}
+  @OddLeftMargin	  { .5c	@OrIfPlain 10s	}
+  @OddRightMargin	  { .5c	@OrIfPlain 10s	}
+  @EvenLeftMargin	  { .5c	@OrIfPlain 10s	}
+  @EvenRightMargin	{ .5c	@OrIfPlain 10s	}
 }
 @Use { @OrdinarySetup }
 @SysDatabase @FontDef  { fontdefs }
@@ -39,12 +40,12 @@ def @Initial {@B{Initial Raid counters} :
 
 def @PlaceRaid {@B{Place Raid counters} :
   @BulletList
-  @ListItem{in the next @I Area @B closest (in @I Mps) to a @I Family, @LLP alphabetic order @B but, then @B within @I Chelly}
+  @ListItem{in the next @I Area @B closest (in @I Mps) toLP alphabetic order @B but, then @B within @I Chelly}
   @ListItem{place 2 counters in @I Area with @I Corn or @I Harass counter @LLP if only 1 available @Sym arrowdblright @B{Raid Ends}}
   @EndList
 }
 
-def @PlayerReaction {@B{Player Reaction} :
+def @PlayerReaction {@B{Player Reaction} (never from @I{Canyon de Chelly} ) :
   @BulletList
   @ListItem{@B 1 Action with @B 1 @I Family not in an @I Area @Sym lessequal @I Outpost or with @I Fort}
   @ListItem{@B Ambush 1 @I AP, same @I Area, @I Military @Sym greater 0, @I Ferocity @Sym greater 0
@@ -67,11 +68,11 @@ def @PlayerReaction {@B{Player Reaction} :
     @RawEndList}
   @ListItem{@B Evade, free, same @I Area
     @BulletList
-    @ListItem{@B if 1d6 + @I Evade +1 @I Manuelito's @Sym greater {@Sym numbersign}@I Area :
+    @ListItem{@B if 1d6 + @I Evade +1 @I Manuelito's @Sym greater {@Sym numbersign}@I Area (fail on pure 1) :
       @BulletList
       @ListItem{move to result {@Sym numbersign}@I Area @B if there is no @I Raid counter}
       @RawEndList}
-    @ListItem{@B or pure 6 @B or 7+ : move to {@Sym numbersign}6 @I Area or any @I Chelly}
+    @ListItem{@B or pure 6 @B or 7+ : move to {@Sym numbersign}6 @I Area @B or any @I Chelly}
     @RawEndList}
   @EndList
 }
@@ -105,18 +106,19 @@ def @RaidEnds {@B{Raid Ends} :
   @ListItem{@Sym arrowdblright @B Build}
   @RawEndList}
 @ListItem{@B if @I Raid counters remains in @I{Santa F{@Char eacute}} @Sym arrowdblright @B Subvert with them}
-@ListItem{@B remove @I Raid @B and @I harass counters}
-#@ListItem{-1 @I{Enemy Morale} @B {if no} @I Family in @I Caught box}
-@ListItem{+1 @I{Enemy Morale} @Sym slash @I Family in @I Caught box, -1 @I{Enemy Morale} @B if none}
+@ListItem{@B remove @I Raid @B and @I Harass counters}
+@ListItem{-1 @I{Enemy Morale} @B {if no} @I Family in @I Caught box}
+@ListItem{+1 @I{Enemy Morale} @Sym slash @I Family in @I Caught box}
+#@ListItem{+1 @I{Enemy Morale} @Sym slash @I Family in @I Caught box, -1 @I{Enemy Morale} @B if none}
 @ListItem{@I Families in @I Caught or @I Escape boxes, @B if with @I Adult:
   @BulletList
-  @ListItem{place in @B any @I Area of that @I Territory with @B any @I Ferocity}
+  @ListItem{@B if with @I Adult : @Sym arrowdblright @B any @I Area of that @I Territory with @B any @I Ferocity}
+  @ListItem{@B else : @I Child @Sym arrowdblright @I{Passage of Time}, @I Family @Sym arrowdblright @I{Out of Play}}
   @RawEndList}
-@ListItem{@B else : @I Child @Sym arrowdblright @I{Passage of Time}, @I Family @Sym arrowdblright @I{Out of Play}}
 @EndList
 }
 
-def @InitialT {@B{Initial Raid counters} :
+def @InitialT {@B{Initial Tribal Raid counters} :
   @BulletList
   @ListItem{{@Sym numbersign}@I Families in-play}
   @EndList
@@ -135,26 +137,38 @@ def @RaidEndsT {@B{Raid Ends} :
   @EndList
 }
 
-def @MayEvade {@B{1 Family may Evade} :
+def @MayEvade {@B{one Family may Evade} :
   @BulletList
-  @ListItem{@B If 1d6 + @I Evade + 1 @I Manuelito @Sym greater {@Sym numbersign}@I Area:
+#  @ListItem{@B if 1d6 + @I Evade +1 @I Manuelito's @Sym greater {@Sym numbersign}@I Area :
+#    @BulletList
+#    @ListItem{move to result {@Sym numbersign}@I Area}
+#    @RawEndList}
+#  @ListItem{@B or pure 6 @B or 7+ : move to {@Sym numbersign}6 @I Area @B or any @I Chelly}
+#  @ListItem{@B fail on pure 1}
+  @ListItem{1d6 + @I Evade +1 @I Manuelito's :
     @BulletList
-    @ListItem{move to result {@Sym numbersign}@I Area}
+    @ListItem{7+ @B or pure 6 : move to {@Sym numbersign}6 @I Area @B or any @I Chelly}
+    @ListItem{@Sym greater {@Sym numbersign}@I Area : move to result {@Sym numbersign}@I Area}
     @RawEndList}
-  @ListItem{@B or pure 6 : move to {@Sym numbersign}6 @I Area or any @I Chelly}
+  @ListItem{@B fail on pure 1}
   @EndList
 }
 
-def @ConductRaid {@B{Conduct Raid} : 1d6
+def @ConductRaid {@B{Conduct Raid}
   @BulletList
-  @ListItem{-1 @Sym slash @I Resources @Sym arrowdblright @I{Out of Play}}
-  @ListItem{+1 @B if @I Comanche}
-  @ListItem{+highest {@Sym numbersign}Area with @I {Tribal Raid} - 1}
-  @ListItem{+3 @B during @I {Kit Carson} Campaign
+  @ListItem{@B success 1d6 + mod @Sym greaterequal {@Sym numbersign}@I Area @B or pure 6:
     @BulletList
-    @ListItem{@B and +2 @B if @I Fort in @I Territory}
-    @ListItem{@B and +{@Sym numbersign}@I Area with @I Outpost in @I Territory}
-    @RawEndList}
+    @ListItem{-1 @Sym slash @I Resources @Sym arrowdblright @I{Out of Play}}
+    @ListItem{+1 @B if @I Comanche}
+    @ListItem{+highest {@Sym numbersign}Area with @I {Tribal Raid} - 1}
+    @ListItem{+3 @B during @I {Kit Carson} Campaign
+      @BulletList
+      @ListItem{@B and +2 @B if @I Fort in @I Territory}
+      @ListItem{@B and +{@Sym numbersign}@I Area with @I Outpost in @I Territory}
+      @RawEndList}
+  @RawEndList}
+  #@ListItem{@B success on pure 6 @B or @Sym greaterequal {@Sym numbersign}@I Area}
+  @ListItem{@B failure on pure 1}
   @EndList
 }
 
@@ -174,7 +188,11 @@ def @RaidResolutionT {@B{Raid Resolution} :
 //
 @Text @Begin
 @CurveBox {
-  9p @Font @B {Enemy Raid} |1c @B Ignore @I Families that are in the same @I Area as a @I Fort.
+  @Tbl
+  {
+    @Row format {@Cell {@Xrgb firebrick} @Colour 9p @Font @B @Underline A | @Cell B | @Cell i {right} C}
+    A {Enemy Raid} B {@B Ignore @I Families that are in the same @I Area as a @I Fort.} C {v1.1}
+  }
   @LLP
   @Diag {
     @Tbl
@@ -191,8 +209,8 @@ def @RaidResolutionT {@B{Raid Resolution} :
        A { B:: @CurveBox @PlaceRaid }
       @Row
        format { @Cell A | @Cell ml {1c} mr{1c} B | @Cell C }
-       A { C:: @Diamond margin {14p} break {clines} {@I Raid counter @LLP in @I Chelly} }
-       B { D:: @Diamond margin {14p} break {clines} {@I Raid counter @LLP with a @I Family} }
+       A { C:: @Diamond margin {11p} break {clines} {@I Raid counter @LLP in @I Chelly} }
+       B { D:: @Diamond margin {11p} break {clines} {@I Raid counter @LLP with a @I Family} }
        C { G:: @Diamond margin {14p} {0 @I Raid in Santa F{@Char eacute} @LLP @B or 0 @I Family in-play} } @Rowa
       @Row
        format { @StartHSpan @Cell A | @HSpan | @Cell iv {ctr} C }
@@ -216,7 +234,11 @@ def @RaidResolutionT {@B{Raid Resolution} :
 @LP
 @LP
 @CurveBox {
-  9p @Font @B {Tribal Raid} |1c @B Ignore @I Families that are in the same @I Area as a @I Fort.
+  @Tbl
+  {
+    @Row format {@Cell {@Xrgb goldenrod} @Colour 9p @Font @B @Underline A | @Cell B | @Cell i {right} C}
+    A {Tribal Raid} B {@B Ignore @I Families that are in the same @I Area as a @I Fort or in an {@Sym numbersign}@I Area @Sym lessequal @I Outpost.} C {v1.1}
+  }
   @LLP
   @Diag {
     @Tbl
@@ -225,38 +247,40 @@ def @RaidResolutionT {@B{Raid Resolution} :
       iv {ctr}
     {
       @Row
-       format { @StartHSpan @Cell i {right} A | @HSpan | @Cell B }
-       A { A:: @CurveBox outlinewidth {1p} @InitialT }
-       B { B:: @CurveBox @PlaceRaidT }
+       format {@StartHSpan @Cell A | @HSpan }
+       A { C:: @CurveBox @MayEvade }
       @Row
-       format { @StartHSpan @Cell A | @HSpan | @Cell B }
-       A { F:: @CurveBox outlinewidth {1p} @RaidEndsT }
-       B { G:: @Diamond margin {14p} break {clines} {@I Raid counter @LLP with a @I Family} }
+       format {@Cell A | @Cell B }
+       A { A:: @CurveBox outlinewidth {1p} @InitialT}
+       B { G:: @Diamond margin {11p} break {clines} {@I Raid counter @LLP with a @I Family} }
       @Row
-       format { @StartVSpan @Cell i {right} A | @Cell B | @Cell C}
-       A { E:: @CurveBox @RaidResolutionT}
-       B { J:: @Diamond margin {14p} break {clines} {has more @LLP @I{Tribal Raid}} }
-       C { C:: @CurveBox @MayEvade }
+       format {@Cell A | @Cell B }
+       A { B:: @CurveBox @PlaceRaidT }
+       B { J:: @Diamond margin {11p} break {clines} {has more @LLP @I{Tribal Raid}} }
       @Row
-       format { @VSpan | @Cell i {right} iv {top} B | @StartVSpan @Cell C}
-       B { H:: @Diamond margin {10p} {pure 1} }
-       C { D:: @CurveBox margin {6p} @ConductRaid}
+       format {@StartHSpan @Cell A | @HSpan }
+       A { F:: @CurveBox outlinewidth {1p} @RaidEndsT }
+    }
+    @Tbl
+      rule {no}
+      m {0c}
+    {
+      @Row
+       format { @Cell A }
+       A { D:: @CurveBox @ConductRaid }
       @Row
-       format { @VSpan | @Cell i {left} iv {top} B | @VSpan }
-       B { I:: @Diamond margin {14p} break {clines} {pure 6 @B or @LLP {@Sym numbersign}@I Area @Sym lessequal result} @LLP @LLP @LLP }
+       format { @Cell ma {.4c}  A }
+       A { E:: @CurveBox @RaidResolutionT}
     }
     //
     @Arrow from { A } to { B }
     @Arrow from { B } to { G }
     @Arrow from { G } to { C } xlabel {@B Yes} pathcolor {@Xrgb olivedrab}
-    @Link  from { G } to { J } path {acurve} bias {10p} arrow {yes} xlabel {@B No} pathcolor {@Xrgb firebrick}
+    @Arrow from { G } to { J } ylabel {@B No} pathcolor {@Xrgb firebrick}
     @Arrow from { C } to { D }
-    @Arrow from { D } to { H }
-    @Arrow from { H } to { J } xlabel {@B Yes} pathcolor {@Xrgb olivedrab}
-    @Arrow from { H } to { I } xlabel {@B No} pathcolor {@Xrgb firebrick}
-    @Link  from { I } to { E } path {acurve} bias {10p} arrow {yes} xlabel {@B Yes} pathcolor {@Xrgb olivedrab}
-    @Link  from { I } to { J } path {ccurve} bias {10p} arrow {yes} xlabel {@B No} pathcolor {@Xrgb firebrick}
-    @Link  from { J } to { B } path {ccurve} bias {10p} arrow {yes} xlabel {@B Yes} pathcolor {@Xrgb olivedrab}
+    @Arrow from { D } to { J } ylabel {@B Failure} pathcolor {@Xrgb firebrick}
+    @Arrow from { D } to { E } ylabel {@B Success} pathcolor {@Xrgb olivedrab}
+    @Arrow from { J } to { B } ylabel {@B Yes} pathcolor {@Xrgb olivedrab}
     @Arrow from { J } to { F } xlabel {@B No} pathcolor {@Xrgb firebrick}
     @Arrow from { E } to { J }
   }