Add missing take_from rules.

1 files changed, 9 insertions, 9 deletions

diff --git a/tools/cards.csv b/tools/cards.csv
index 7895a0d..cbf644a 100644
--- a/tools/cards.csv
+++ b/tools/cards.csv
@@ -377,8 +377,8 @@ THE PEACH ORCHARD,,,,,,,,,,,,,,,,,,,,,
 26,175A,pink,3rd South Carolina Battalion,,,3,5,,,Attack,,"141st Pennsylvania, 68th Pennsylvania, 114th Pennsylvania",1 hit per die. 1 self.,,,,,,,,

 26,176A,pink,2nd South Carolina,,,4,6,,,Attack,,"141st Pennsylvania, 68th Pennsylvania, 114th Pennsylvania",1 hit per die. 1 self.,,,,,,,,

 26,177A,pink,Fatal Blunder,,,I,,,,,,,,,,,,,,"If after rolling you cannot or do not place any dice on a Pink Formation, remove the cube from this card, adding it to your Morale Cubes. This card is then removed from play and all remaining Pink Formations Rout immediately.","During the confusion of the battle, someone yelled out a false order, and the Carolina regiments wheeled to the right, exposing their flank to Union artillery. ""Hundreds of the bravest and best men of Carolina fell, victims of this fatal blunder,"" Kershaw wrote later."

-26,136B,blue,141st Pennsylvania,,,4,2,,,Attack,,"2nd South Carolina, 3rd South Carolina Battalion",1 hit per die. 1 self. Take dice from 68th Pennsylvania.,,Counterattack,Pair,Any enemy attacking it,1 hit.,,,

-26,137B,blue,68th Pennsylvania,,,4,3,,,Attack,,"21st Mississippi, 8th South Carolina",1 hit per die. 1 self. Take dice from 141st Pennsylvania.,,Counterattack,Pair,Any enemy attacking it,1 hit.,,,

+26,136B,blue,141st Pennsylvania,,,4,2,,,Attack,,"2nd South Carolina, 3rd South Carolina Battalion",1 hit per die. 1 self. Take dice from 68th Pennsylvania.,,Counterattack,Pair,Any enemy attacking it,1 hit.,take_from=137B,,

+26,137B,blue,68th Pennsylvania,,,4,3,,,Attack,,"21st Mississippi, 8th South Carolina",1 hit per die. 1 self. Take dice from 141st Pennsylvania.,,Counterattack,Pair,Any enemy attacking it,1 hit.,take_from=136B,,

 26,138B,blue,Wheatfield Road Artillery,,,II,Straight 3,,,Screen,,Any attack on 68th Pennsylvania or 141st Pennsylvania,,,,,,,"rout_with=136B,137B","If both the 68th and 141st Pennsylvania are Routed, this Formation immediately Routs as well. This DOES constitute a Rout and results in the exchange of a morale cube.",

 26,139B,dkblue,114th Pennsylvania,,,4,4,,63rd Pennsylvania,Attack,,"21st Mississippi, 17th Mississippi",1 hit per die. 1 self.,,Counterattack,Pair,Any enemy attacking it,1 hit. Suffers 1 less hit.,,,

 26,140B,dkblue,63rd Pennsylvania,,,4,Doubles,,RETIRE,Counterattack,Pair,Any Red formation,1 hit.,,Screen,"Pair, Voluntary",Any attack on 105th Pennsylvania,,,,

@@ -478,14 +478,14 @@ NASEBY,,,,,,,,,,,,,,,,,,,,,
 33,179B,pink,Lisle,,,4,(1/2),,,Attack,,"Fairfax, Montagu",1 hit per die. 1 self.,,Counterattack,Pair,Fairfax,1 hit. Suffers 1 less hit.,,,

 33,180B,pink,Bard,,,6,(3/4),,,Attack,,Pickering,1 hit per die. 1 self.,,Counterattack,Pair,Pickering,1 hit. Suffers 1 less hit.,,,

 33,181B,pink,Astley,,,4,(5/6),,,Attack,,"Skippon, Waller",1 hit per die. 1 self.,,Counterattack,Pair,Skippon,1 hit. Suffers 1 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. 1 self. Take dice from Astley.,,Screen,Pair,"Ireton, Skippon",,,,

+33,182B,red,Rupert of the Rhine,Rupert,,6,1-3,,PURSUIT,Attack,,Ireton,1 hit per die. 1 self. Take dice from Astley.,,Screen,Pair,"Ireton, Skippon",,take_from=181B,,

 33,183B,red,Bluecoats,,,4*,5/6,,,Absorb,,Any Pink formation,Suffers 1 less hit per die.,,Counterattack,Pair,Any enemy attacking it,1 hit. Suffers 1 less hit and never more than 1.,,,"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.,,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. 1 self. Take dice from Waller.,,Counterattack,Pair,Astley,1 hit. Suffers 1 less hit.,,,

+33,185B,dkblue,Skippon,,,5,(5/6),,,Attack,,Astley,1 hit per die. 1 self. Take dice from Waller.,,Counterattack,Pair,Astley,1 hit. Suffers 1 less hit.,take_from=186B,,

 33,186B,blue,Waller,,,5,(5/6),,,Absorb,,Skippon or Pickering,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."

 33,187B,blue,Pickering,,,5,(3/4),,,Attack,,Bard,1 hit per die. 1 self.,,Counterattack,Pair,Bard,1 hit.,,,

 33,188B,blue,Montagu,,,5,(1/2),,,Absorb,,Fairfax or Pickering,Suffers 1 less hit.,,,,,,,,"Montagu was reliably Cromwell's man up until the future Lord Protector's death. Seeing the restoration as inevitable, he was instrumental in bringing Charles II to the throne, not only saving his own neck, but being created the first Earl of Sandwich. Decades later, his great-grandson decided to put stuff between two slices of bread."

-33,189B,dkblue,Fairfax,,,5,(1/2),,,Attack,,"Lisle, Bluecoats",1 hit per die. 1 self. Take dice from Montagu.,,Counterattack,Pair,Lisle,1 hit. Suffers 1 less hit.,,,

+33,189B,dkblue,Fairfax,,,5,(1/2),,,Attack,,"Lisle, Bluecoats",1 hit per die. 1 self. Take dice from Montagu.,,Counterattack,Pair,Lisle,1 hit. Suffers 1 less hit.,take_from=188B,,

 33,190B,dkblue,Cromwell,,,5,1-3,,,Attack,,"Langdale, Lisle, Bluecoats",1 hit per die. 1 self.,,Screen,Pair,"Langdale, Lisle",,,,

 ,,,,,,,,,,,,,,,,,,,,,

 TIPPERMUIR,,,,,,,,,,,,,,,,,,,,,

@@ -497,14 +497,14 @@ TIPPERMUIR,,,,,,,,,,,,,,,,,,,,,
 34,196B,dkblue,Levies,,,4,(1/2),,,Absorb,,Any Blue formation,Suffers 1 less hit per die.,,,,,,,,

 34,197B,red,MacDonalds,,,4,(3/4),,,Attack,,Drummond,1 hit per die. 1 self.,,,,,,,,"Specifically, these are highlanders from Clan MacDonald of Keppoch."

 34,198B,red,Kilpont,,,4,(5/6),,,Attack,,Elcho,1 hit.,,Absorb,,Laghtnan,Suffers 1 less hit per die.,,,These were raised by Elcho but immediately defected.

-34,199B,pink,Laghtnan,,,4,1/2,,,Attack,,Elcho,1 hit per die. 1 self. Take dice from Kilpont.,,Counterattack,,Elcho,1 hit. Suffers 1 less hit per die.,extra_hit_if_dice_on=202B,,

+34,199B,pink,Laghtnan,,,4,1/2,,,Attack,,Elcho,1 hit per die. 1 self. Take dice from Kilpont.,,Counterattack,,Elcho,1 hit. Suffers 1 less hit per die.,extra_hit_if_dice_on=202B; take_from=198B,,

 34,200B,pink,O'Cahan,,,4,3/4,,,Attack,,Perth Trained Bands,1 hit per die. 1 self.,,Counterattack,,Perth Trained Bands,1 hit. Suffers 1 less hit per die.,extra_hit_if_dice_on=202B,,

 34,201B,pink,Macdonnell,,,4,5/6,,,Attack,,Tullibardine,1 hit per die. 1 self.,,Counterattack,,Tullibardine,1 hit. Suffers 1 less hit per die.,extra_hit_if_dice_on=202B,,

 34,202B,red,Montrose,,,4,5/6,,,Attack,,"Scott of Rossie, Tullibardine",1 hit per die. 1 self.<br>1 extra vs Tullibardine.,,Screen,,Scott of Rossie,,,"If there are dice on this card, all Pink Formations inflict one extra hit when attacking.",

 ,,,,,,,,,,,,,,,,,,,,,

 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. 1 self. Take dice from Lawers's Horse.,,Counterattack,,Any enemy attacking it,1 hit. Suffers 1 less hit per die.,,,

+35,204B,blue,Campbell of Lawers,,,6,(4-6),,RETIRE,Attack,,"Garlic Hill, MacColla's Lifeguard",1 hit per die. 1 self. Take dice from Lawers's Horse.,,Counterattack,,Any enemy attacking it,1 hit. Suffers 1 less hit per die.,take_from=203B,,

 35,205B,blue,Seaforth,,,4,Doubles,,,Absorb,Pair,Campbell of Lawers,Suffers 1 hit only.,,,,,,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.,,Counterattack,Pair,Irish Right,1 hit.,,,

@@ -590,8 +590,8 @@ CHIARI,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,

 BLENHEIM,,,,,,,,,,,,,,,,,,,,,

 41,226B,red,Cutt's Column,,,6,(5/6),,,Attack,,"Clerambault, Blenheim",1 hit per die (2 hits per die versus Blenheim). 1 self.,,Screen,Pair,Clerambault,,,,

-41,227B,red,Ingoldsby,,,5,(3/4),R,,Attack,,"St. Pierre, Oberglauheim",1 hit per die. 1 self. Take dice from Horn.,,Absorb,,Horn,Suffers 1 less hit per die.,,,

-41,228B,red,Horn,,,5*,(1/2),L,,Attack,,"Oberglauheim, St. Pierre",1 hit per die. 1 self. Take dice from Ingoldsby.,,Counterattack,Pair,"Oberglauheim, St. Pierre",1 hit.,,,

+41,227B,red,Ingoldsby,,,5,(3/4),R,,Attack,,"St. Pierre, Oberglauheim",1 hit per die. 1 self. Take dice from Horn.,,Absorb,,Horn,Suffers 1 less hit per die.,take_from=228B,,

+41,228B,red,Horn,,,5*,(1/2),L,,Attack,,"Oberglauheim, St. Pierre",1 hit per die. 1 self. Take dice from Ingoldsby.,,Counterattack,Pair,"Oberglauheim, St. Pierre",1 hit.,take_from=227B,,

 41,229B,red,Shock Cavalry,,,4,5/6,,,Attack,,d'Humieres,1 hit per die. 1 self.,,Screen,Pair,Any Dark Blue formation,,,,"French cavalry fought with pistols at a distance, while Marlborough's horsemen charged home with flashes of hot steel."

 41,230B,red,Alliance Guns,,,I,Straight 4,,,Screen,,Any enemy attack,,,,,,,,,

 41,231B,pink,Eugene's Horse,,,4,Doubles,,,Attack,,De Bourg,1 hit.,,Screen,Pair,Any Blue formation,,,,