data

1 files changed, 56 insertions, 78 deletions

diff --git a/data.js b/data.js
index f981389..235f759 100644
--- a/data.js
+++ b/data.js
@@ -2,7 +2,7 @@ const data = {
 scenarios: [
 	{
 		"number": 1,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "White Mountain",
 		"date": "8 November 1620",
 		"players": [
@@ -32,7 +32,7 @@ scenarios: [
 	},
 	{
 		"number": 2,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Marston Moor",
 		"date": "2 July 1644",
 		"players": [
@@ -66,7 +66,7 @@ scenarios: [
 	},
 	{
 		"number": 3,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "The Plains of Abraham",
 		"date": "13 September 1759",
 		"players": [
@@ -95,7 +95,7 @@ scenarios: [
 	},
 	{
 		"number": 4,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Bosworth Field",
 		"date": "22 August 1485",
 		"players": [
@@ -121,7 +121,7 @@ scenarios: [
 	},
 	{
 		"number": 5,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Malplaquet",
 		"date": "11 September 1709",
 		"players": [
@@ -151,7 +151,7 @@ scenarios: [
 	},
 	{
 		"number": 6,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Ivry",
 		"date": "14 March 1590",
 		"players": [
@@ -185,7 +185,7 @@ scenarios: [
 	},
 	{
 		"number": 7,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "The Dunes",
 		"date": "14 June 1658",
 		"players": [
@@ -220,7 +220,7 @@ scenarios: [
 	},
 	{
 		"number": 8,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Brooklyn Heights",
 		"date": "27 August 1776",
 		"players": [
@@ -489,7 +489,7 @@ scenarios: [
 	},
 	{
 		"number": 3201,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Gaines's Mill",
 		"date": "27 June 1862",
 		"players": [
@@ -518,7 +518,7 @@ scenarios: [
 	},
 	{
 		"number": 3202,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Bouvines",
 		"date": "27 July 1214",
 		"players": [
@@ -1088,50 +1088,6 @@ scenarios: [
 			{
 				"name": "Royalists",
 				"cards": [
-					349,
-					350,
-					351,
-					352,
-					353,
-					354,
-					355,
-					356,
-					357,
-					358,
-					359,
-					360,
-					361,
-					362,
-					363,
-					364,
-					365,
-					366,
-					367,
-					368,
-					369,
-					370,
-					371,
-					372,
-					373,
-					374,
-					375,
-					376,
-					377,
-					378,
-					379,
-					380,
-					381,
-					382,
-					383,
-					384,
-					385,
-					386,
-					387,
-					388,
-					389,
-					390,
-					391,
-					392,
 					393,
 					394,
 					395,
@@ -1227,7 +1183,7 @@ scenarios: [
 	},
 	{
 		"number": 36,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Pharsalus",
 		"date": "9 August 48 BCE",
 		"players": [
@@ -1256,7 +1212,7 @@ scenarios: [
 	},
 	{
 		"number": 37,
-		"expansion": "Table Battles",
+		"expansion": "Base Game",
 		"name": "Inkerman",
 		"date": "5 November 1854",
 		"players": [
@@ -9509,7 +9465,7 @@ cards: [
 			{
 				"type": "Attack",
 				"target": "Ward, Cross, Day, Burbank",
-				"effect": "1 hit per die. 1 self per action",
+				"effect": "1 hit per die. 1 self per action.",
 				"target_list": [
 					291,
 					295,
@@ -9609,6 +9565,9 @@ cards: [
 				]
 			}
 		],
+		"rules": {
+			"attack_reserve": 1
+		},
 		"rule_text": "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.",
 		"reserve": []
 	},
@@ -11032,7 +10991,12 @@ cards: [
 					336
 				]
 			}
-		]
+		],
+		"rules": {
+			"may_take_from_extra_self": [
+				341
+			]
+		}
 	},
 	{
 		"scenario": 28,
@@ -11059,7 +11023,12 @@ cards: [
 					333
 				]
 			}
-		]
+		],
+		"rules": {
+			"may_take_from_extra_self": [
+				341
+			]
+		}
 	},
 	{
 		"scenario": 28,
@@ -11086,7 +11055,12 @@ cards: [
 					332
 				]
 			}
-		]
+		],
+		"rules": {
+			"may_take_from_extra_self": [
+				341
+			]
+		}
 	},
 	{
 		"scenario": 28,
@@ -11332,7 +11306,7 @@ cards: [
 			{
 				"type": "Attack",
 				"target": "Hancock",
-				"effect": "2 hits, PLUS hit per die. 1 self per action.",
+				"effect": "2 hits, PLUS 1 hit per die. 1 self per action.",
 				"target_list": [
 					344
 				]
@@ -11499,7 +11473,8 @@ cards: [
 				]
 			}
 		],
-		"rule_text": "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."
+		"rule_text": "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.",
+		"lore_text": "This is the Royalist father of Basil Fielding, Parliamentary cavalry commander."
 	},
 	{
 		"scenario": 30,
@@ -11806,12 +11781,6 @@ cards: [
 				]
 			}
 		],
-		"rules": {
-			"reserve_and": [
-				355,
-				359
-			]
-		},
 		"rule_text": "When both Rupert of the Rhine and Wilmot have left play (either via Rout or Pursuit), this card comes out of reserve.",
 		"reserve": []
 	},
@@ -11835,12 +11804,6 @@ cards: [
 				]
 			}
 		],
-		"rules": {
-			"reserve_and": [
-				355,
-				359
-			]
-		},
 		"rule_text": "When both Rupert of the Rhine and Wilmot have left play (either via Rout or Pursuit), this card comes out of reserve.",
 		"reserve": []
 	},
@@ -12499,7 +12462,7 @@ cards: [
 				]
 			}
 		],
-		"lore_text": "Never gonna give you up"
+		"lore_text": "Never gonna give you up."
 	},
 	{
 		"scenario": 33,
@@ -12615,7 +12578,7 @@ cards: [
 				]
 			}
 		],
-		"lore_text": "Never gonna let you down"
+		"lore_text": "Never gonna let you down."
 	},
 	{
 		"scenario": 33,
@@ -12682,7 +12645,7 @@ cards: [
 				]
 			}
 		],
-		"lore_text": "Yeah, I know the card is red"
+		"lore_text": "Yeah, I know the card is red."
 	},
 	{
 		"scenario": 33,
@@ -13268,6 +13231,11 @@ cards: [
 				]
 			}
 		],
+		"rules": {
+			"rout_with": [
+				419
+			]
+		},
 		"rule_text": "If Campbell of Lawers Routs or Retires, Seaforth immediately Routs.",
 		"lore_text": "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."
 	},
@@ -13406,6 +13374,11 @@ cards: [
 				]
 			}
 		],
+		"rules": {
+			"retire_with": [
+				424
+			]
+		},
 		"rule_text": "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."
 	},
 	{
@@ -14170,6 +14143,11 @@ cards: [
 				]
 			}
 		],
+		"rules": {
+			"remove_with": [
+				450
+			]
+		},
 		"rule_text": "If Gournay's Horse is Routed, remove this Formation from play (this does not constitute a Rout).",
 		"lore_text": "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."
 	},
@@ -16041,7 +16019,7 @@ cards: [
 				]
 			}
 		],
-		"rule_text": "* - May only Screen Villars's Left is Broglie has Routed.",
+		"rule_text": "* - May only Screen Villars's Left if Broglie has Routed.",
 		"retire": 1
 	},
 	{