2 files changed, 42 insertions, 42 deletions
diff --git a/tools/cards.csv b/tools/cards.csv
index 7f41083..4a939ec 100644
--- a/tools/cards.csv
+++ b/tools/cards.csv
@@ -349,10 +349,10 @@ THE WHEATFIELD,,,,,,,,,,,,,,,,,,,,
 25,150A,red,Semmes,,,6,(5)/(6),,,Absorb,Voluntary,Kershaw,"When target suffers Hits, this unit suffers them instead.",,,,,rout_with=151A,"Whenever Kershaw makes an Attack, you MUST remove the dice from this card and use them as part of the Attack. <p>This Formation Routs automatically when Kershaw Routs.",
 25,151A,red,Kershaw,,,6,3/4,,,Attack,,"de Trobriand, Tilton, Kelly, Sweitzer",1 hit per die. 1 self per action. (But see Semmes.),Counterattack,Pair,Any enemy attacking it,"1 hit. Addtionally, this unit suffers one less hit.",take_from=150A,,
 25,152A,pink,Anderson,,,5,4,,,Attack,,"Ward, de Trobriand, Zook, Burbank",1 hit per die. 1 self per action.,Counterattack,Pair,Any enemy attacking it,1 hit.,,,
-25,153A,pink,Benning,,,5,3,,,Attack,,"Ward, Cross, Day, Burbank",1 hit per die. 1 self per action,Counterattack,Pair,Any enemy attacking it,1 hit.,,,
+25,153A,pink,Benning,,,5,3,,,Attack,,"Ward, Cross, Day, Burbank",1 hit per die. 1 self per action.,Counterattack,Pair,Any enemy attacking it,1 hit.,,,
 25,154A,red,Rebel Artillery,,,I,Straight 4,,,Screen,Voluntary,Any enemy formation,,,,,,,,
 25,155A,red,McLaws,,,1,1/2,,de Trobriand,Command,Full House,Wofford out of reserve,,,,,,,,
-25,156A,red,Wofford,,,5,4/5/6,,Commanded,Attack,,"Tilton, Sweitzer, Burbank, Day","1 hit, PLUS 1 hit per die. 1 self per action.",,,,,,"When this card enters play, the Union Formations Zook and Kelly immediately Retire. <p>This Formation can Attack targets even when those targets are in Reserve.",
+25,156A,red,Wofford,,,5,4/5/6,,Commanded,Attack,,"Tilton, Sweitzer, Burbank, Day","1 hit, PLUS 1 hit per die. 1 self per action.",,,,,attack_reserve,"When this card enters play, the Union Formations Zook and Kelly immediately Retire. <p>This Formation can Attack targets even when those targets are in Reserve.",
 25,157A,dkblue,Ward,,,4,1/2,,RETIRE,Attack,,"Benning, Anderson",1 hit per die. 1 self per action.,Screen,Pair,"Benning, Anderson",,,,
 25,158A,blue,de Trobriand,,,4,(3)/(4),,RETIRE,Attack,,"Kershaw, Anderson",1 hit per die. 1 self per action.,Counterattack,Pair,Any enemy attacking it,1 hit.,,,
 25,159A,blue,Tilton,,,4,(5)/(6),,RETIRE,Attack,,Kershaw,1 hit per die. 1 self per action.,Absorb,Voluntary,de Trobriand,"When target suffers Hits, this unit suffers 1 hit ONLY instead.",,,
@@ -406,9 +406,9 @@ CULP'S HILL,,,,,,,,,,,,,,,,,,,,
 28,159B,dkblue,Reserves,,,4*,Doubles,,,Absorb,Voluntary,Any friendly formation,"When target suffers Hits, this unit suffers them instead.",,,,,,,
 28,160B,blue,137th New York,,,2,Doubles,,Greene's Right,Attack,,Steuart,1 hit.,,,,,suffer_1_less_1_max,This Formation ALWAYS suffers one less Hit when Attacked and NEVER suffers more than one Hit in any given Attack.,
 28,161B,dkblue,Geary,,,V,Straight 4/3,,,,,,,,,,,start_with_no_cubes,"Unlike most Special Formations, this card begins the game with NO cubes on it. <p>If rolling five or more dice during your Roll Phase, you need a four-die straight to earn a cube. If rolling four or less dice, you need a three-die straight to earn a cube. <p>When there are FIVE cubes on this card, Geary's Division arrives, bringing the late hour battle to a close. The game ends immediately in a UNION VICTORY.",
-28,162B,red,Steuart,,,8,(5)/(6),,,Attack,,"Greene's Right, 137th New York",1 hit per die. 1 self per action.,Screen,Pair,"Greene's Right, 137th New York",,,,
-28,163B,pink,Williams,,,8,(4),,,Attack,,Greene's Center,1 hit per die. 1 self per action.,Screen,Pair,Greene's Center,,,,
-28,164B,pink,Jones,,,8,(3),,,Attack,,Greene's Left,1 hit per die. 1 self per action.,Screen,Pair,Greene's Left,,,,
+28,162B,red,Steuart,,,8,(5)/(6),,,Attack,,"Greene's Right, 137th New York",1 hit per die. 1 self per action.,Screen,Pair,"Greene's Right, 137th New York",,may_take_from_extra_self=165B,,
+28,163B,pink,Williams,,,8,(4),,,Attack,,Greene's Center,1 hit per die. 1 self per action.,Screen,Pair,Greene's Center,,may_take_from_extra_self=165B,,
+28,164B,pink,Jones,,,8,(3),,,Attack,,Greene's Left,1 hit per die. 1 self per action.,Screen,Pair,Greene's Left,,may_take_from_extra_self=165B,,
 28,165B,red,Johnson,,,1,(1)/(2),,,,,,,,,,,,"If there are dice on this card when you Attack with any of your Formations, you MAY expend all the dice on this card, adding them to the Attack. <p>If you choose to do so, your attacking Formation suffers one extra self hit.",
 ,,,,,,,,,,,,,,,,,,,,
 GETTYSBURG 2ND,,,,,,,,,,,,,,,,,,,,
@@ -421,7 +421,7 @@ GETTYSBURG 2ND,,,,,,,,,,,,,,,,,,,,
 29,172B,blue,Meade,,,1,Any,,,Absorb,Voluntary,Any friendly but Little Round Top,"When this Reaction is used, choose any friendly Formation except Little Round Top, that Formation suffers the hits instead. The Meade Formation never suffers hits, and this Reaction can never be used to absorb hits for Little Round Top.",,,,,,,
 29,173B,pink,Johnson,,,4,(3)/(4),,,Attack,,Slocum,1 hit per die. 1 self per action.,,,,,,"Dice can only be placed on this card if there are dice on TWO Red cards. (This doesn't necessarily need to be the case when your turn begins, but does need to be the case the instant that you place dice on this card.)",
 29,174B,pink,Early,,,5,(1)/(2),,,Attack,,Howard,1 hit per die. 1 self per action.,,,,,,"Dice can only be placed on this card if there are dice on TWO Red cards. (This doesn't necessarily need to be the case when your turn begins, but does need to be the case the instant that you place dice on this card.)",
-29,175B,red,Anderson,,,5,5/6,,,Attack,,Hancock,"2 hits, PLUS hit per die. 1 self per action.",,,,,,Dice can only be placed on this card if there are already dice on McLaws.,
+29,175B,red,Anderson,,,5,5/6,,,Attack,,Hancock,"2 hits, PLUS 1 hit per die. 1 self per action.",,,,,,Dice can only be placed on this card if there are already dice on McLaws.,
 29,176B,red,McLaws,,,5,5/6,,,Attack,,"Sickles, Hancock","1 hit, PLUS 1 hit per die. 1 self per action.",,,,,,Dice can only be placed on this card if there are already dice on Hood.,
 29,177B,red,Hood,,,4,Doubles,,,Attack,,"Little Round Top, Sickles",1 hit per die. 1 self per action.,Screen,Voluntary,Little Round Top,,,,
 ,,,,,,,,,,,,,,,,,,,,
@@ -431,7 +431,7 @@ EDGEHILL,,,,,,,,,,,,,,,,,,,,
 30,178A,red,Royalist Guns,,,I,Full House,,,Screen,,Any enemy formation,,,,,,,"To earn a cube for this card, you must have five dice comprising a Double and Triple in a single roll.",
 30,179A,red,Wilmot,,,4,Doubles,,PURSUIT,Attack,Pair,Basil Fielding,2 hits.,Screen,Pair,Meldrum,,,,
 30,180A,pink,Wentworth,,,4,1/2,,RETIRE,Attack,,"Meldrum, Charles Essex",1 hit per die. 1 self per action. (But see William Fielding.),Counterattack,Pair,Meldrum,1 hit.,may_take_from=181A,,
-30,181A,pink,William Fielding,,,4,3/4,,,Absorb,Voluntary,Any other Pink formation,"When target suffers Hits, this unit suffers 1 hit ONLY instead.",,,,,,"When either Wentworth or Gerard makes an Attack, if there are dice on this card, you may (but don't have to) remove them and use them as part of that formation's Attack. <p>This is the Royalist father of Basil Fielding, Parliamentary cavalry commander.",
+30,181A,pink,William Fielding,,,4,3/4,,,Absorb,Voluntary,Any other Pink formation,"When target suffers Hits, this unit suffers 1 hit ONLY instead.",,,,,,"When either Wentworth or Gerard makes an Attack, if there are dice on this card, you may (but don't have to) remove them and use them as part of that formation's Attack.","This is the Royalist father of Basil Fielding, Parliamentary cavalry commander."
 30,182A,pink,Gerard,,,4,5/6,,RETIRE,Attack,,"Charles Essex, Ballard",1 hit per die (1 extra vs Essex). 1 self per action. (See W. Fielding.),Counterattack,Pair,"Charles Essex, Ballard",1 hit.,may_take_from=181A,,
 30,183A,red,Rupert of the Rhine,Rupert,,4,Doubles,,PURSUIT,Attack,Pair,Ramsay,2 hits.,Screen,Pair,Charles Essex,,,,
 30,184A,red,Byron,,,4,5/6,,Wentworth,Attack,,"Meldrum, Charles Essex, Ballard",1 hit per die. 1 self per action.,,,,,,,
@@ -442,8 +442,8 @@ EDGEHILL,,,,,,,,,,,,,,,,,,,,
 30,189A,blue,Meldrum,,,6,3/4,,,Attack,,"Wentworth, William Fielding, Byron",1 hit per die. 1 self per action.,Counterattack,Pair,"Wentworth, Byron",1 hit.,,,
 30,190A,dkblue,Basil Fielding,,,4,3/4,,PURSUIT,Attack,,Wilmot,1 hit.,Screen,Pair,"Wentworth, Byron",,,,The son of Royalist William Fielding. His father would die in battle the following spring.
 30,191A,blue,Ballard,,,6,5/6,,Charles Essex,Attack,,"Gerard, William Fielding, Belasyse",1 hit per die. 1 self per action.,Counterattack,Pair,"Gerard, Belasyse",1 hit.,,,
-30,192A,dkblue,Balfour,,,1,1-3,,See Above,Attack,,"Gerard, William Fielding, Belasyse",1 hit per die.,,,,,"reserve_and=179A,183A","When both Rupert of the Rhine and Wilmot have left play (either via Rout or Pursuit), this card comes out of reserve.",
-30,193A,dkblue,Stapleton,,,1,4-6,,See Above,Attack,,"Wentworth, William Fielding, Byron",1 hit per die.,,,,,"reserve_and=179A,183A","When both Rupert of the Rhine and Wilmot have left play (either via Rout or Pursuit), this card comes out of reserve.",
+30,192A,dkblue,Balfour,,,1,1-3,,See Above,Attack,,"Gerard, William Fielding, Belasyse",1 hit per die.,,,,,,"When both Rupert of the Rhine and Wilmot have left play (either via Rout or Pursuit), this card comes out of reserve.",
+30,193A,dkblue,Stapleton,,,1,4-6,,See Above,Attack,,"Wentworth, William Fielding, Byron",1 hit per die.,,,,,,"When both Rupert of the Rhine and Wilmot have left play (either via Rout or Pursuit), this card comes out of reserve.",
 ,,,,,,,,,,,,,,,,,,,,
 1ST NEWBURY,,,,,,,,,,,,,,,,,,,,
 31,194A,blue,Round Hill,,,I,Straight 4,,,Screen,,Any enemy formation,,,,,,remove_with=196A,"When Skippon routs, this card is removed from play (this does not constitute a rout).","Parliamentarian artillery was concentrated atop Round Hill, the position that Skippon occupied. Surrounding terrain funneled the enemy into narrow lanes within the firing zone. Dislodging Skippon and taking Round Hill in turn neutered the artillery, making that a key Royalist objective."
@@ -470,15 +470,15 @@ EDGEHILL,,,,,,,,,,,,,,,,,,,,
 32,213A,pink,Maurice,,,4,Doubles,,RETIRE,Attack,,Balfour,1 hit.,Screen,,Skippon,,,,
 32,214A,red,Goring,,,4,5/6,,,Attack,,Cromwell,1 hit per die. 1 self per action.,Absorb,,Any friendly formation,"When target suffers Hits, this unit suffers 1 less hit per die.",,,
 32,215A,red,Blagge,,,4,3/4,,Maurice or Astley,Attack,,Balfour,"1 hit, PLUS 1 hit per die. 1 self per action.",Counterattack,Pair,Balfour,"1 hit. Additionally, this unit suffers one less hit.",,,
-32,216A,red,Astley,,,4,(5)/(6),,,Attack,,Manchester,1 hit.,Screen,Pair,Manchester,,,,Never gonna give you up
+32,216A,red,Astley,,,4,(5)/(6),,,Attack,,Manchester,1 hit.,Screen,Pair,Manchester,,,,Never gonna give you up.
 ,,,,,,,,,,,,,,,,,,,,
 NASEBY,,,,,,,,,,,,,,,,,,,,
 33,178B,red,Langdale,,,4,5/6,,PURSUIT,Attack,,Cromwell,1 hit per die. 1 self per action.,Screen,Pair,"Cromwell, Fairfax",,,,
 33,179B,pink,Lisle,,,4,(1)/(2),,,Attack,,"Fairfax, Montagu",1 hit per die. 1 self per action.,Counterattack,Pair,Fairfax,"1 hit. Additionally, this unit suffers one less hit.",,,
 33,180B,pink,Bard,,,6,(3)/(4),,,Attack,,Pickering,1 hit per die. 1 self per action.,Counterattack,Pair,Pickering,"1 hit. Additionally, this unit suffers one less hit.",,,
-33,181B,pink,Astley,,,4,(5)/(6),,,Attack,,"Skippon, Waller",1 hit per die. 1 self per action.,Counterattack,Pair,Skippon,"1 hit. Additionally, this unit suffers one less hit.",,,Never gonna let you down
+33,181B,pink,Astley,,,4,(5)/(6),,,Attack,,"Skippon, Waller",1 hit per die. 1 self per action.,Counterattack,Pair,Skippon,"1 hit. Additionally, this unit suffers one less hit.",,,Never gonna let you down.
 33,182B,red,Rupert of the Rhine,Rupert,,6,1-3,,PURSUIT,Attack,,Ireton,1 hit per die (also take all dice from Astley). 1 self per action.,Screen,Pair,"Ireton, Skippon",,,,
-33,183B,red,Bluecoats,,,4*,5/6,,,Absorb,,Any Pink formation,"When target suffers Hits, this unit suffers 1 less hit per die.",Counterattack,Pair,Any enemy attacking it,1 hit. This unit suffers ONE less hit and never more than one.,,,"Yeah, I know the card is red"
+33,183B,red,Bluecoats,,,4*,5/6,,,Absorb,,Any Pink formation,"When target suffers Hits, this unit suffers 1 less hit per die.",Counterattack,Pair,Any enemy attacking it,1 hit. This unit suffers ONE less hit and never more than one.,,,"Yeah, I know the card is red."
 33,184B,dkblue,Ireton,,,5,5/6,,,Attack,,"Rupert of the Rhine, Astley",1 hit per die. 1 self per action.,Screen,Pair,"Rupert of the Rhine, Astley",,,,"Cromwell's son-in-law and a regicide. He died in 1651, and would be executed ten years later."
 33,185B,dkblue,Skippon,,,5,(5)/(6),,,Attack,,Astley,1 hit per die (also take all dice from Waller). 1 self per action.,Counterattack,Pair,Astley,"1 hit. Additionally, this unit suffers one less hit.",,,
 33,186B,blue,Waller,,,5,(5)/(6),,,Absorb,,Skippon or Pickering,"When target suffers Hits, this unit suffers 1 less hit.",,,,,,,"This is Hardresse Waller, cousin to the more famous Sir William. A regicide, he was condemned to death once Charles II was restored, but his life was spared due to the intervention of well-connected friends."
@@ -504,12 +504,12 @@ TIPPERMUIR,,,,,,,,,,,,,,,,,,,,
 AULDEARN,,,,,,,,,,,,,,,,,,,,
 35,203B,dkblue,Lawers's Horse,,,1,4,,,Screen,Pair,"Garlic Hill, Irish Right",,,,,,,,A single troop of about thirty men (and presumably the same number of horses) that would be easily routed by the arrival of two hundred cavalry under Gordon.
 35,204B,blue,Campbell of Lawers,,,6,(4-6),,RETIRE,Attack,,"Garlic Hill, MacColla's Lifeguard",1 hit per die (also take all dice from Lawers's Horse). 1 self per action.,Counterattack,,Any enemy attacking it,"1 hit. Additionally, this unit suffers one less hit per die.",,,
-35,205B,blue,Seaforth,,,4,Doubles,,,Absorb,Pair,Campbell of Lawers,"When target suffers Hits, this unit suffers 1 hit ONLY instead.",,,,,,"If Campbell of Lawers Routs or Retires, Seaforth immediately Routs.","Rather than deploying in a battleline, the Covenanter regiments were secunded - one after the other. Once Lawers's men broke, they ran into and through the men behind them; the result was anarchy."
+35,205B,blue,Seaforth,,,4,Doubles,,,Absorb,Pair,Campbell of Lawers,"When target suffers Hits, this unit suffers 1 hit ONLY instead.",,,,,rout_with=204B,"If Campbell of Lawers Routs or Retires, Seaforth immediately Routs.","Rather than deploying in a battleline, the Covenanter regiments were secunded - one after the other. Once Lawers's men broke, they ran into and through the men behind them; the result was anarchy."
 35,206B,dkblue,Drummond,,,2,3/4,,,Attack,,Aboyne,1 hit per die.,Screen,Pair,Aboyne,,,,
 35,207B,blue,Lothian,,,4,3/4,,Campbell of Lawers,Attack,,Irish Right,1 hit per die. 1 self per action.,Counterattack,Pair,Irish Right,1 hit.,,,
 35,208B,blue,Lord Chancellor's,,,4,5/6,,Drummond,Attack,,Irish Left,1 hit per die. 1 self per action.,Counterattack,Pair,Irish Left,1 hit.,,,
 35,209B,red,Garlic Hill,,,4,(5)/(6),,RETIRE,Attack,,Campbell of Lawers,1 hit.,Counterattack,,Campbell of Lawers,"1 hit. Additionally, this unit suffers one less hit per die.",,,
-35,210B,pink,Moneymore,,,1,3/4,,,Screen,Pair,Campbell of Lawers,,,,,,,"When Garlic Hill Retires, so does this card; they are all falling back to the position represented by the MacColla's Lifeguard card, in Auldearn.",
+35,210B,pink,Moneymore,,,1,3/4,,,Screen,Pair,Campbell of Lawers,,,,,,retire_with=209B,"When Garlic Hill Retires, so does this card; they are all falling back to the position represented by the MacColla's Lifeguard card, in Auldearn.",
 35,211B,red,MacColla's Lifeguard,,,3,(5)/(6),,Garlic Hill,Attack,,Campbell of Lawers,"1 hit, PLUS 1 hit per die.",,,,,suffer_1_less_1_max,This Formation ALWAYS suffers one less Hit when Attacked and NEVER suffers more than one Hit in any given Attack.,"Forced to abandon his position on Garlic Hill, MacColla fell back to Auldearn itself. The fighting there was fierce, and Mungo Campbell of Lawers was killed in action."
 35,212B,pink,Montrose,,,1,1-3,,,Command,Full House,Gordon and Aboyne out of reserve,,Command,Two Pairs,Irish Left and Irish Right out of reserve,,,Montrose may only perform the second action after having previously performed the first.,Montrose's horse went around the village and smashed the enemy wings; then his foot came through the village to engage.
 35,213B,pink,Aboyne,,,4,4-6,,Commanded,Attack,,"Drummond, Lord Chancellor's",1 hit per die. 1 self per action.,Screen,Pair,"Drummond, Lord Chancellor's",,,,
@@ -546,7 +546,7 @@ EXPANSION 5 - THE GRAND ALLIANCE,,,,,,,,,,,,,,,,,,,,
 FLEURUS,,,,,,,,,,,,,,,,,,,,
 38,226A,blue,Gournay's Horse,,,4*,5/6,,,Attack,,"Spanish Horse, Dutch Right Foot",1 hit per die. 1 self per action.,Screen,Pair,"Spanish Horse, Dutch Right Foot",,,,"Jean Christophe, comte de Gournay, died leading a charge against the enemy horse, leaving his cavalry in disarray."
 38,227A,blue,French Left,,,6*,3/4,,,Attack,,"Dutch Right Foot, Dutch Left Foot",1 hit per die. 1 self per action.,Counterattack,Pair,Any enemy attacking it,1 hit.,,,
-38,228A,blue,French Guns,,,II,Straight 4,,,Screen,,Any enemy attack,,,,,,,"If Gournay's Horse is Routed, remove this Formation from play (this does not constitute a Rout).","Though the Dutch cavalry on Waldeck's left was swept by Luxembourg's attack, the Spanish horse under d'Huby protected his right, repulsed the French assaults, and even managed to make off with some of the French cannons."
+38,228A,blue,French Guns,,,II,Straight 4,,,Screen,,Any enemy attack,,,,,,remove_with=226A,"If Gournay's Horse is Routed, remove this Formation from play (this does not constitute a Rout).","Though the Dutch cavalry on Waldeck's left was swept by Luxembourg's attack, the Spanish horse under d'Huby protected his right, repulsed the French assaults, and even managed to make off with some of the French cannons."
 38,229A,dkblue,French Center,,,6*,1-3,,Luxembourg's Horse,Attack,,"Dutch Right Foot, Van Aylva",1 hit per die. 1 self per action.,Counterattack,Pair,Any enemy attacking it,"1 hit. Additionally, this unit suffers one less hit per die.",,,
 38,230A,dkblue,French Right,,,6*,3/4,,,Attack,,"Dutch Left Foot, Dutch Right Foot",1 hit per die. 1 self per action. Does 1 extra hit if Dutch Horse Routed.,Counterattack,Pair,Any enemy attacking it,1 hit.,,,
 38,231A,dkblue,Luxembourg's Horse,,,6*,4-6,,RETIRE,Attack,,"Dutch Horse, Dutch Left Foot",1 hit per die. 1 self per action. Does 1 extra hit versus Dutch Left Foot.,Screen,Pair,"Dutch Horse, Dutch Left Foot",,,"If this card ""retires"", Gournay's Horse is reinforced: add any remaining unit sticks from this card to Gournay's.",
@@ -622,7 +622,7 @@ RAMILLIES,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,
 DENAIN,,,,,,,,,,,,,,,,,,,,
 43,255B,red,Dutch Garrison,,,6*,5/6,,,Attack,,"Villars's Right, Villars's Left","1 hit per die. 1 self per action. If reduced to one stick, no self hits.",Counterattack,Pair,Any enemy attack,"1 hit. Additionally, this unit suffers one less hit.",,,
-43,256B,red,Dutch Horse,,,6,3/4,,RETIRE,Attack,,"Broglie, Villars's Left",1 hit per die (two per die vs. Villar's Left). 1 self per action.,Screen,Pair,"Broglie, Villars's Left*",,,* - May only Screen Villars's Left is Broglie has Routed.,
+43,256B,red,Dutch Horse,,,6,3/4,,RETIRE,Attack,,"Broglie, Villars's Left",1 hit per die (two per die vs. Villar's Left). 1 self per action.,Screen,Pair,"Broglie, Villars's Left*",,,* - May only Screen Villars's Left if Broglie has Routed.,
 43,257B,red,Fortress Guns,,,1,Doubles,,,Screen,,"Villars's Left, Villars's Right",,,,,,,"When the Dutch Garrison Routs, this card Routs immediately.","While sheer numbers made the French victory over the small garrison perhaps inevitable, Dutch artillery ensured they paid for their victory in blood. Eventually a grisly bayonet charge breached the walls, forcing the doomed garrison to retreat across a mill bridge. It collapsed from underneath them; hundreds drowned."
 43,258B,pink,Albemarle,,,4,5/6,,,Command,Two Pairs,Eugene out of reserve,,Absorb,"Pair, Voluntary",Dutch Garrison,"When target suffers Hits, this card suffers 1 hit ONLY instead.",,,The Earl of Albemarle held out as long as he could against overwhelming odds. He and the survivors were taken prisoner.
 43,259B,pink,Eugene,,,6*,3/4,,Commanded,Attack,,Prince de Tingry,1 hit per die. 1 self per action.,Counterattack,Pair,Prince de Tingry,1 hit.,,,
diff --git a/tools/scenarios.csv b/tools/scenarios.csv
index 6bbdd35..5a2d6af 100644
--- a/tools/scenarios.csv
+++ b/tools/scenarios.csv
@@ -1,12 +1,12 @@
 status,expansion,number,name,date,player1,cards1,morale1,tactical1,player2,cards2,morale2,tactical2,rule,rule_text,lore_text
-1,Table Battles,1,White Mountain,8 November 1620,The Bohemian Revolt,7A-10A,4,,Imperials & Catholic League,1A-6A,2,,,,"A strong defensive position is squandered by the hapless rebel leadership, effectively ending the Bohemian Revolt. Incredibly, the war it ignited would continue on, engulfing most of Europe for three decades. A simple battle to get your feet wet."
-1,Table Battles,2,Marston Moor,2 July 1644,Royalists,11A-17A,2,,Parliament & Covenanters,18A-24A,3,,,,A letter from King Charles convinced Prince Rupert of the Rhine that he ought to fight a much larger army. Parliament won a lopsided victory. Only the stubborn stand of the Whitecoats prevented total disaster. This has more moving parts than the White Mountain scenario.
-1,Table Battles,3,The Plains of Abraham,13 September 1759,British,25A-28A,0 - see below,,French,29A-32A,3 - see below,,,"To win, the British must Rout all 3 French cards without losing any of their own. If the French Rout a single card, they win (even if they lose their last card when doing so). ",The battle that won Canada for the British. This battle introduces Counter-attack Reactions.
-1,Table Battles,4,Bosworth Field,22 August 1485,House of York,33A-35A,2,,House of Lancaster (Tudor),36A-38A,1,,,,"The battle that ended the Wars of the Roses, and saw the ascendancy of the Tudors. This small and curious scenario gives you a peek at the Absorb reaction and introduces Command actions, turning on the timely arrival of fresh troops."
-1,Table Battles,5,Malplaquet,11 September 1709,French,39A-42A,2,,The Grand Alliance,1B-6B,3,,,,"The Grand Alliance broke the French line &ndash; but paid for it with heavy losses. French commander Villars wrote to the king after the battle: ""If it pleases God to give your majesty's enemies another such victory, they are ruined."""
-1,Table Battles,6,Ivry,14 March 1590,Royalists,7B-13B,4,,The Catholic (Holy) League,14B-20B,4,,,,"Henri IV defeated his Catholic opposition, thanks in part to enemy mercenaries who were sympathetic to his cause. It wasn't enough to win over Paris; his rule would not be accepted until he converted. This is a tricky scenario &ndash; a dance of screens."
-1,Table Battles,7,The Dunes,14 June 1658,French & English,21B-28B,2,,"Spanish, French & English",29B-35B,3,,,,"Complicated politics saw French and English troops on both sides of this battlefield, widely admired as Turenne's masterpiece. You will need to master all three Reaction types to triumph here."
-1,Table Battles,8,Brooklyn Heights,27 August 1776,Colonials,39B-42B,1,,British & Their Vile Hessians,36B-38B,1,,,,"A diversionary attack by Grant disguised Clinton's advance on the Patriot flank. Outgunned, outmanned, outnumbered and outplanned, they've gotta make an all-out stand &ndash; at least until the main body of the army can escape. For experienced players."
+1,Base Game,1,White Mountain,8 November 1620,The Bohemian Revolt,7A-10A,4,,Imperials & Catholic League,1A-6A,2,,,,"A strong defensive position is squandered by the hapless rebel leadership, effectively ending the Bohemian Revolt. Incredibly, the war it ignited would continue on, engulfing most of Europe for three decades. A simple battle to get your feet wet."
+1,Base Game,2,Marston Moor,2 July 1644,Royalists,11A-17A,2,,Parliament & Covenanters,18A-24A,3,,,,A letter from King Charles convinced Prince Rupert of the Rhine that he ought to fight a much larger army. Parliament won a lopsided victory. Only the stubborn stand of the Whitecoats prevented total disaster. This has more moving parts than the White Mountain scenario.
+1,Base Game,3,The Plains of Abraham,13 September 1759,British,25A-28A,0 - see below,,French,29A-32A,3 - see below,,,"To win, the British must Rout all 3 French cards without losing any of their own. If the French Rout a single card, they win (even if they lose their last card when doing so). ",The battle that won Canada for the British. This battle introduces Counter-attack Reactions.
+1,Base Game,4,Bosworth Field,22 August 1485,House of York,33A-35A,2,,House of Lancaster (Tudor),36A-38A,1,,,,"The battle that ended the Wars of the Roses, and saw the ascendancy of the Tudors. This small and curious scenario gives you a peek at the Absorb reaction and introduces Command actions, turning on the timely arrival of fresh troops."
+1,Base Game,5,Malplaquet,11 September 1709,French,39A-42A,2,,The Grand Alliance,1B-6B,3,,,,"The Grand Alliance broke the French line &ndash; but paid for it with heavy losses. French commander Villars wrote to the king after the battle: ""If it pleases God to give your majesty's enemies another such victory, they are ruined."""
+1,Base Game,6,Ivry,14 March 1590,Royalists,7B-13B,4,,The Catholic (Holy) League,14B-20B,4,,,,"Henri IV defeated his Catholic opposition, thanks in part to enemy mercenaries who were sympathetic to his cause. It wasn't enough to win over Paris; his rule would not be accepted until he converted. This is a tricky scenario &ndash; a dance of screens."
+1,Base Game,7,The Dunes,14 June 1658,French & English,21B-28B,2,,"Spanish, French & English",29B-35B,3,,,,"Complicated politics saw French and English troops on both sides of this battlefield, widely admired as Turenne's masterpiece. You will need to master all three Reaction types to triumph here."
+1,Base Game,8,Brooklyn Heights,27 August 1776,Colonials,39B-42B,1,,British & Their Vile Hessians,36B-38B,1,,,,"A diversionary attack by Grant disguised Clinton's advance on the Patriot flank. Outgunned, outmanned, outnumbered and outplanned, they've gotta make an all-out stand &ndash; at least until the main body of the army can escape. For experienced players."
 ,,,,,,,,,,,,,,,
 1,Wars of the Roses,9,St. Albans,22 May 1455,House of York,43A-46A,1,,House of Lancaster,47A-49A,2,,,,
 1,Wars of the Roses,10,Blore Heath,22 September 1459,House of Lancaster,50A-55A,3,,House of York,56A-60A,1,,,,
@@ -17,8 +17,8 @@ status,expansion,number,name,date,player1,cards1,morale1,tactical1,player2,cards
 1,Wars of the Roses,15,Tewkesbury,4 May 1471,House of York,63B-67B,2,,House of Lancaster,68B-71B,3,,,,
 1,Wars of the Roses,16,Stoke Field,16 June 1487,"An Imposter, Lambert Simnel",72B-75B,3,,House of Tudor,76B-82B,1,,,,
 ,,,,,,,,,,,,,,,
-1,Table Battles,3201,Gaines's Mill,27 June 1862,Union,83A-87A,2,,Confederate,88A-91A,2,,,,From C3i #32
-1,Table Battles,3202,Bouvines,27 July 1214,French,83B-86B,1,,Coalition,87B-91B,2,,,,From C3i #32
+1,Base Game,3201,Gaines's Mill,27 June 1862,Union,83A-87A,2,,Confederate,88A-91A,2,,,,From C3i #32
+1,Base Game,3202,Bouvines,27 July 1214,French,83B-86B,1,,Coalition,87B-91B,2,,,,From C3i #32
 ,,,,,,,,,,,,,,,
 1,Age of Alexander,17,Chaeronea,2 August 338 BCE,Philip II,92A-96A,1,,Greek Alliance,97A-101A,3,,,,"If Polyaenus is to be believed (a big if!), Philip isolated the Greek left with a faked retreat, while the teenaged Alexander destroyed the famous Sacred Band of Thebes and smashed the Greek right."
 1,Age of Alexander,18,The Granicus,May 334 BCE,Various Squabbling Satraps,102A-108A,3,,Alexander III,109A-114A,1,,,,"Persia's light cavalry is no match for our boy's infantry and Companions, and it doesn't help the Persian cause that no one is really in charge. About the only thing they have going for them is they're on the other side of a river. Will it be enough?"
@@ -28,22 +28,22 @@ status,expansion,number,name,date,player1,cards1,morale1,tactical1,player2,cards
 1,Age of Alexander,22,Gabiene,316 BCE,Eumenes,114B-119B,2,,Antigonus,120B-123B,2,,,,"One of the many battles fought by Alexander's successors (the Diadochi), this one proved tactically inconclusive. But the capture of Eumenes's baggage was enough for his Silver Shields to turn him over to Antigonus for execution."
 1,Age of Alexander,23,Ipsus,301 BCE,Antigonus,124B-129B,2,,Seleucus,130B-135B,2,,,,"Like Gabiene and many other battles from the Wars of the Diadochi, this battle saw two armies that were mostly identical in structure and tactics. And like many ancient battles, the death of a single man, the enemy commander (in this case Antigonus), was sufficient to secure victory."
 ,,,,,,,,,,,,,,,
-,Gettysburg,24,Little Round Top,2 July 1863,Union,136A-143A,1,,Confederate,144A-149A,2,,,,"One of the most famous actions of the day saw fewer than three thousand men mount a desperate, hard-fought, and ingenious defense of the Union left flank against the repeated assaults of nearly five thousand butternuts."
-,Gettysburg,25,The Wheatfield,2 July 1863,Confederate,150A-156A,3,,Union,157A-167A,3,,,,"Confederate assaults caused the Union to retreat, then Union assoults caused the rebs to fall back, and on and on, back and forth, possession of the Wheatfield changing hands repeatedly, neither side gaining any real advantage, with thousands of casualties"
-,Gettysburg,26,The Peach Orchard,2 July 1863,Confederate,168A-177A,4,,Union,136B-143B,2,,,,"Sickle's line formed a salient at the Peach Orchard, which collapsed under pressure from the Confederates. Sickles himself was hit in the leg by a cannonball. To counter rumors that he had died, he sat up on his stretcher and puffed at a cigar to show that he was still breathing."
-,Gettysburg,27,Cemetery Ridge,2 July 1863,Confederate,144B-147B,1,,Union,148B-154B,3,,,,"Anderson's attack on the Union center came close to breaking it, opening a gap in the line. The line &ndash; perhaps even the Union &ndash; was saved byt he 262 men of the First Minnesota Volunteer Infantry Regiment, which charged a brigade over five times its size, suffering 215 casualties."
-,Gettysburg,28,Culp's Hill,2 July 1863,Union,155B-161B,1,,Confederate,162B-165B,3,,,,"Impressive defensive works constructed on the initiative of Brig. Gen. Goerge Greene (a civil engineer) allowedh a desperately thin blue line of around two thousand men to beat back nearly five thousand rebs. (Before playing, be sure to read the ""Geary"" card and keep its effects in mind.)"
-,Gettysburg,29,2nd Day of Gettysburg,2 July 1863,Union,166B-172B,2,,Confederate,173B-177B,2,,,,"The Confederates attacked the Union line <i>en echelon</i> in a series of bloody assaults. Meade shuffled men from one part of the ""fish hook"" to the next, pushing back and plugging holes in his line. At the end of the day, the line held."
-,,,,,,,,,,,,,,,
-,English Civil War,30,Edgehill,23 October 1642,Royalists,178A-185A,2,18,Parliamentarians,186A-193A,3,,,,"Initial success on the wings and a stubborn infantry contest had all the makings of a decisive Royalist victory. But the cavalier cavalry pursued the main roundhead horse, and the unsupported infantry was scattered by Parliamentarian reservee cavalry."
-,English Civil War,31,1st Newbury,20 September 1643,Parliamentarians,194A-199A,2,,Royalists,200A-206A,1,,,,"A surprise attack grabbed key terrain and threatened the Royalist flanks. Recovering from the chaos, a counterattack broke the roundhead center, splitting Essex's army. An attempt to envelop the two halves was thwarted by the London Trained Bands."
-,English Civil War,32,2nd Newbury,27 October 1644,Parliamentarians,207A-211A,1,16,Royalists,212A-216A,2,16,,,"Attacked from opposite directions and outnumbered more than two to one, the King appeared to be doomed. But the enemy just couldn't coordinate; stubborn Royalist resistance denied Essex anything more than a tactical victory."
-,English Civil War,33,Naseby,14 June 1645,Royalists,173B-183B,2,20,Parliamentarians,184B-190B,2,,,,"The New Model Army at last achieved decisive victory at Naseby, leaving Charles without a field army. It was also a political victory, as they captured (and published) letters in which the King plotted with foreign troops against his subjects."
-,English Civil War,34,Tippermuir,1 September 1644,Covenanters,191B-196B,4,,Royalists,197B-202B,0 - see below,,,"If any Royalist card Routs, the Covenanters win immediately.","Meanwhile, in Scotland, Montrose sought to block the intervention of the Solemn League and Covenant, and near Perth won a decisive victory &ndash; supposedly losing only one man to Elcho's two thousand dead. Yeah, sure."
-,English Civil War,35,Auldearn,9 May 1645,Covenanters,203B-208B,5,,Royalists,209B-216B,0 - see below,,,"If any Royalist card Routs, the Covenanters win immediately.","400 desperate men defend Auldearn from a Covenanter army nearly 2,000 strong. Their only hope is that Montrose will arrive in time to turn the tide. He better hurry it up!"
-,,,,,,,,,,,,,,,
-1,Table Battles,36,Pharsalus,9 August 48 BCE,Gnaeus Pompeius Magnus,217A-220A,2,,Gaius Iulius Caesar,221A-225A,2,,,,"The decisive battle of Caesar's Civil War saw him square off against his old ally Pompey the Great. Knowing he would lose a straightforward clash of arms, Caesar gambled everything on a bold stratagem."
-1,Table Battles,37,Inkerman,5 November 1854,Russian Empire,217B-220B,1,,Anglo-French Alliance,221B-225B,2,,,,"In a dense fog, a massive &ndash; but badly coordinated &ndash; Russian army launched a surprise attack. As the fog lifted and fresh Allied troops poured in, their desperate, doomed defense improbably turned into a lopsided victory."
+1,Gettysburg,24,Little Round Top,2 July 1863,Union,136A-143A,1,,Confederate,144A-149A,2,,,,"One of the most famous actions of the day saw fewer than three thousand men mount a desperate, hard-fought, and ingenious defense of the Union left flank against the repeated assaults of nearly five thousand butternuts."
+"wofford,stony hill",Gettysburg,25,The Wheatfield,2 July 1863,Confederate,150A-156A,3,,Union,157A-167A,3,,,,"Confederate assaults caused the Union to retreat, then Union assoults caused the rebs to fall back, and on and on, back and forth, possession of the Wheatfield changing hands repeatedly, neither side gaining any real advantage, with thousands of casualties"
+fatal blunder,Gettysburg,26,The Peach Orchard,2 July 1863,Confederate,168A-177A,4,,Union,136B-143B,2,,,,"Sickle's line formed a salient at the Peach Orchard, which collapsed under pressure from the Confederates. Sickles himself was hit in the leg by a cannonball. To counter rumors that he had died, he sat up on his stretcher and puffed at a cigar to show that he was still breathing."
+1,Gettysburg,27,Cemetery Ridge,2 July 1863,Confederate,144B-147B,1,,Union,148B-154B,3,,,,"Anderson's attack on the Union center came close to breaking it, opening a gap in the line. The line &ndash; perhaps even the Union &ndash; was saved byt he 262 men of the First Minnesota Volunteer Infantry Regiment, which charged a brigade over five times its size, suffering 215 casualties."
+"breastworks,geary",Gettysburg,28,Culp's Hill,2 July 1863,Union,155B-161B,1,,Confederate,162B-165B,3,,,,"Impressive defensive works constructed on the initiative of Brig. Gen. Goerge Greene (a civil engineer) allowedh a desperately thin blue line of around two thousand men to beat back nearly five thousand rebs. (Before playing, be sure to read the ""Geary"" card and keep its effects in mind.)"
+"meade,etc",Gettysburg,29,2nd Day of Gettysburg,2 July 1863,Union,166B-172B,2,,Confederate,173B-177B,2,,,,"The Confederates attacked the Union line <i>en echelon</i> in a series of bloody assaults. Meade shuffled men from one part of the ""fish hook"" to the next, pushing back and plugging holes in his line. At the end of the day, the line held."
+,,,,,,,,,,,,,,,
+reserve_and,English Civil War,30,Edgehill,23 October 1642,Royalists,178A-185A,2,18,Parliamentarians,186A-193A,3,,,,"Initial success on the wings and a stubborn infantry contest had all the makings of a decisive Royalist victory. But the cavalier cavalry pursued the main roundhead horse, and the unsupported infantry was scattered by Parliamentarian reservee cavalry."
+s34/byron/etc,English Civil War,31,1st Newbury,20 September 1643,Parliamentarians,194A-199A,2,,Royalists,200A-206A,1,,,,"A surprise attack grabbed key terrain and threatened the Royalist flanks. Recovering from the chaos, a counterattack broke the roundhead center, splitting Essex's army. An attempt to envelop the two halves was thwarted by the London Trained Bands."
+all_extra,English Civil War,32,2nd Newbury,27 October 1644,Parliamentarians,207A-211A,1,16,Royalists,212A-216A,2,16,,,"Attacked from opposite directions and outnumbered more than two to one, the King appeared to be doomed. But the enemy just couldn't coordinate; stubborn Royalist resistance denied Essex anything more than a tactical victory."
+1,English Civil War,33,Naseby,14 June 1645,Royalists,173B-183B,2,20,Parliamentarians,184B-190B,2,,,,"The New Model Army at last achieved decisive victory at Naseby, leaving Charles without a field army. It was also a political victory, as they captured (and published) letters in which the King plotted with foreign troops against his subjects."
+all_extra,English Civil War,34,Tippermuir,1 September 1644,Covenanters,191B-196B,4,,Royalists,197B-202B,0 - see below,,,"If any Royalist card Routs, the Covenanters win immediately.","Meanwhile, in Scotland, Montrose sought to block the intervention of the Solemn League and Covenant, and near Perth won a decisive victory &ndash; supposedly losing only one man to Elcho's two thousand dead. Yeah, sure."
+montrose,English Civil War,35,Auldearn,9 May 1645,Covenanters,203B-208B,5,,Royalists,209B-216B,0 - see below,,,"If any Royalist card Routs, the Covenanters win immediately.","400 desperate men defend Auldearn from a Covenanter army nearly 2,000 strong. Their only hope is that Montrose will arrive in time to turn the tide. He better hurry it up!"
+,,,,,,,,,,,,,,,
+1,Base Game,36,Pharsalus,9 August 48 BCE,Gnaeus Pompeius Magnus,217A-220A,2,,Gaius Iulius Caesar,221A-225A,2,,,,"The decisive battle of Caesar's Civil War saw him square off against his old ally Pompey the Great. Knowing he would lose a straightforward clash of arms, Caesar gambled everything on a bold stratagem."
+1,Base Game,37,Inkerman,5 November 1854,Russian Empire,217B-220B,1,,Anglo-French Alliance,221B-225B,2,,,,"In a dense fog, a massive &ndash; but badly coordinated &ndash; Russian army launched a surprise attack. As the fog lifted and fresh Allied troops poured in, their desperate, doomed defense improbably turned into a lopsided victory."
 ,,,,,,,,,,,,,,,
 ,The Grand Alliance,38,Fleurus,1 July 1690,French,226A-231A,1,,The Grand Alliance,232A-239A,3,,,,"Luxembourg split the French army in two, attempting a risky double envelopment of Waldeck's line. He succeeded, and the enemy only escaped total destruction by the skin of its teeth. Both players should read the ""Retreat to Nivelles"" card carefully before playing."
 ,The Grand Alliance,39,Marsaglia,4 October 1693,The Grand Alliance,240A-245A,2,,French,246A-251A,2,,,"In this scenario, if a player loses both linked formations, they immediately lose (if it happens to both players at the same time, The Grand Alliance wins).",Catinat's superb generalhsip and innovative use of a mass bayonet charge turned nearly even odds into a smashing victory.