final charge check

3 files changed, 23 insertions, 23 deletions

diff --git a/data.js b/data.js
index c6ad551..8d6f1d8 100644
--- a/data.js
+++ b/data.js
@@ -200,7 +200,7 @@ vassals:[
 cards:[
 {"name":"Y1","event":"Leeward Battle Line","roses":0,"when":"hold","capability":"Culverins and falconets","lords":[0,1,2,3,4,5,6,7,8,9,10,11,12,13]},
 {"name":"Y2","event":"Flank Attack","roses":0,"when":"hold","capability":"Culverins and falconets","lords":[0,1,2,3,4,5,6,7,8,9,10,11,12,13]},
-{"name":"Y3","event":"Escape Ship","roses":0,"when":"hold","capability":"Muster'd my solders","lords":[0,1,2,3,4,5,6,7,8,9,10,11,12,13]},
+{"name":"Y3","event":"Escape Ship","roses":0,"when":"hold","capability":"Muster'd my soldiers","lords":[0,1,2,3,4,5,6,7,8,9,10,11,12,13]},
 {"name":"Y4","event":"Jack Cade","roses":0,"when":"this_levy","capability":"We done deeds of charity","lords":[0,1,2,3,4,5,6,7,8,9,10,11,12,13]},
 {"name":"Y5","event":"Suspicion","roses":0,"when":"hold","capability":"Thomas Bourchier","lords":[0,1,2,3,4,5,6,7,8,9,10,11,12,13]},
 {"name":"Y6","event":"Seamanship","roses":0,"when":"this_campaign","capability":"Great Ships","lords":[0,1,2,3,4,5,6,7,8,9,10,11,12,13]},
@@ -237,7 +237,7 @@ cards:[
 {"name":"Y37","event":"Patrick de la Mote","roses":3,"when":"hold","capability":"Percy's North","lords":[7,8]},
 {"name":"L1","event":"Leeward Battle Line","roses":0,"when":"hold","capability":"Culverins and falconets","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
 {"name":"L2","event":"Flank Attack","roses":0,"when":"hold","capability":"Culverins and falconets","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
-{"name":"L3","event":"Escape Ship","roses":0,"when":"hold","capability":"Muster’d my soldiers","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
+{"name":"L3","event":"Escape Ship","roses":0,"when":"hold","capability":"Muster'd my soldiers","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
 {"name":"L4","event":"Be sent for","roses":0,"when":"this_levy","capability":"Heralds","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
 {"name":"L5","event":"Suspicion","roses":0,"when":"hold","capability":"Church Blessing","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
 {"name":"L6","event":"Seamanship","roses":0,"when":"this_campaign","capability":"Great Ships","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
@@ -248,27 +248,27 @@ cards:[
 {"name":"L11","event":"Blocked Ford","roses":0,"when":"hold","capability":"In the Name of the King","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
 {"name":"L12","event":"Ravine","roses":0,"when":"hold","capability":"Commission of Array","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
 {"name":"L13","event":"Aspielles","roses":0,"when":"hold","capability":"Expert Counsellors","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
-{"name":"L14","event":"Scots","roses":1,"when":"now","capability":"Percy’s Power","lords":[21]},
-{"name":"L15","event":"Henry Pressures Parliament","roses":1,"when":"now","capability":"King’s Parley","lords":[14]},
+{"name":"L14","event":"Scots","roses":1,"when":"now","capability":"Percy's Power","lords":[21]},
+{"name":"L15","event":"Henry Pressures Parliament","roses":1,"when":"now","capability":"King's Parley","lords":[14]},
 {"name":"L16","event":"Warden of the Marches","roses":1,"when":"hold","capability":"Northmen","lords":[21]},
 {"name":"L17","event":"My crown is in my heart","roses":1,"when":"this_levy","capability":"Margaret","lords":[14]},
 {"name":"L18","event":"Parliament Votes","roses":1,"when":"this_levy","capability":"Council Member","lords":[16,17,18,19,20]},
-{"name":"L19","event":"Henry’s Proclamation","roses":1,"when":"now","capability":"Andrew Trollope","lords":[16,17,18,19,20]},
+{"name":"L19","event":"Henry's Proclamation","roses":1,"when":"now","capability":"Andrew Trollope","lords":[16,17,18,19,20]},
 {"name":"L20","event":"Parliament Truce","roses":1,"when":"hold","capability":"Veteran of French Wars","lords":[16,17,18,19]},
-{"name":"L21","event":"French Fleet","roses":1,"when":"this_campaign","capability":"My Father’s Blood","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
+{"name":"L21","event":"French Fleet","roses":1,"when":"this_campaign","capability":"My Father's Blood","lords":[14,15,16,17,18,19,20,21,22,23,24,25,26,27]},
 {"name":"L22","event":"French Troops","roses":1,"when":"now","capability":"Stafford Estates","lords":[20]},
-{"name":"L23","event":"Warwick’s Propaganda","roses":2,"when":"now","capability":"Montagu","lords":[27]},
-{"name":"L24","event":"Warwick’s Propaganda","roses":2,"when":"now","capability":"Married to a Neville","lords":[22]},
+{"name":"L23","event":"Warwick's Propaganda","roses":2,"when":"now","capability":"Montagu","lords":[27]},
+{"name":"L24","event":"Warwick's Propaganda","roses":2,"when":"now","capability":"Married to a Neville","lords":[22]},
 {"name":"L25","event":"Welsh Rebellion","roses":2,"when":"now","capability":"Welsh Lord","lords":[23,24]},
 {"name":"L26","event":"Henry Released","roses":2,"when":"now","capability":"Edward","lords":[15]},
-{"name":"L27","event":"L’Universelle Aragne","roses":2,"when":"now","capability":"Barded Horse","lords":[15,16,17,18,19]},
+{"name":"L27","event":"L'Universelle Aragne","roses":2,"when":"now","capability":"Barded Horse","lords":[15,16,17,18,19]},
 {"name":"L28","event":"Rebel Supply Depot","roses":2,"when":"hold","capability":"Loyal Somerset","lords":[16,17]},
 {"name":"L29","event":"To wilful disobedience","roses":2,"when":"now","capability":"High Admiral","lords":[18,19]},
 {"name":"L30","event":"French War Loans","roses":2,"when":"now","capability":"Merchants","lords":[27]},
-{"name":"L31","event":"Robin’s Rebellion","roses":2,"when":"now","capability":"Yeomen of the Crown","lords":[15]},
+{"name":"L31","event":"Robin's Rebellion","roses":2,"when":"now","capability":"Yeomen of the Crown","lords":[15]},
 {"name":"L32","event":"Tudor Banners","roses":3,"when":"now","capability":"Two Roses","lords":[25]},
 {"name":"L33","event":"Surprise Landing","roses":3,"when":"hold","capability":"Philibert de Chandée","lords":[25,26]},
-{"name":"L34","event":"Buckingham’s Plot","roses":3,"when":"this_levy","capability":"Piquiers","lords":[25,26]},
+{"name":"L34","event":"Buckingham's Plot","roses":3,"when":"this_levy","capability":"Piquiers","lords":[25,26]},
 {"name":"L35","event":"Margaret Beaufort","roses":3,"when":"this_levy","capability":"Thomas Stanley","lords":[23,24,25]},
 {"name":"L36","event":"Talbot to the Rescue","roses":3,"when":"hold","capability":"Chevaliers","lords":[23,24,25,26]},
 {"name":"L37","event":"The Earl of Richmond","roses":3,"when":"this_levy","capability":"Madame La Grande","lords":[23,24,25,26]},
diff --git a/rules.ts b/rules.ts
index 3bdf581..252c45b 100644
--- a/rules.ts
+++ b/rules.ts
@@ -7433,7 +7433,7 @@ function can_final_charge() {
 		for (let pos of game.battle.engagements[0]) {
 			let lord = game.battle.array[pos]
 			if (lord === LORD_RICHARD_III && get_lord_forces(lord, RETINUE) > 0)
-				return true
+				return lord_has_capability(lord, AOW_YORK_FINAL_CHARGE)
 		}
 	}
 	return false
diff --git a/tools/gendata.js b/tools/gendata.js
index 2620c66..87863dc 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -1182,7 +1182,7 @@ arts_of_war_event("Y37", "Patrick de la Mote", "hold")
 
 arts_of_war_capability("Y1", "Culverins and falconets", "any")
 arts_of_war_capability("Y2", "Culverins and falconets", "any")
-arts_of_war_capability("Y3", "Muster'd my solders", "any")
+arts_of_war_capability("Y3", "Muster'd my soldiers", "any")
 arts_of_war_capability("Y4", "We done deeds of charity", "any")
 arts_of_war_capability("Y5", "Thomas Bourchier", "any")
 arts_of_war_capability("Y6", "Great Ships", "any")
@@ -1240,29 +1240,29 @@ arts_of_war_event("L15", "Henry Pressures Parliament", "now")
 arts_of_war_event("L16", "Warden of the Marches", "hold")
 arts_of_war_event("L17", "My crown is in my heart", "this_levy")
 arts_of_war_event("L18", "Parliament Votes", "this_levy")
-arts_of_war_event("L19", "Henry’s Proclamation", "now")
+arts_of_war_event("L19", "Henry's Proclamation", "now")
 arts_of_war_event("L20", "Parliament Truce", "hold")
 arts_of_war_event("L21", "French Fleet", "this_campaign")
 arts_of_war_event("L22", "French Troops", "now")
-arts_of_war_event("L23", "Warwick’s Propaganda", "now")
-arts_of_war_event("L24", "Warwick’s Propaganda", "now")
+arts_of_war_event("L23", "Warwick's Propaganda", "now")
+arts_of_war_event("L24", "Warwick's Propaganda", "now")
 arts_of_war_event("L25", "Welsh Rebellion", "now")
 arts_of_war_event("L26", "Henry Released", "now")
-arts_of_war_event("L27", "L’Universelle Aragne", "now")
+arts_of_war_event("L27", "L'Universelle Aragne", "now")
 arts_of_war_event("L28", "Rebel Supply Depot", "hold")
 arts_of_war_event("L29", "To wilful disobedience", "now")
 arts_of_war_event("L30", "French War Loans", "now")
-arts_of_war_event("L31", "Robin’s Rebellion", "now")
+arts_of_war_event("L31", "Robin's Rebellion", "now")
 arts_of_war_event("L32", "Tudor Banners", "now")
 arts_of_war_event("L33", "Surprise Landing", "hold")
-arts_of_war_event("L34", "Buckingham’s Plot", "this_levy")
+arts_of_war_event("L34", "Buckingham's Plot", "this_levy")
 arts_of_war_event("L35", "Margaret Beaufort", "this_levy")
 arts_of_war_event("L36", "Talbot to the Rescue", "hold")
 arts_of_war_event("L37", "The Earl of Richmond", "this_levy")
 
 arts_of_war_capability("L1", "Culverins and falconets", "any")
 arts_of_war_capability("L2", "Culverins and falconets", "any")
-arts_of_war_capability("L3", "Muster’d my soldiers", "any")
+arts_of_war_capability("L3", "Muster'd my soldiers", "any")
 arts_of_war_capability("L4", "Heralds", "any")
 arts_of_war_capability("L5", "Church Blessing", "any")
 arts_of_war_capability("L6", "Great Ships", "any")
@@ -1273,14 +1273,14 @@ arts_of_war_capability("L10", "Chamberlains", "any")
 arts_of_war_capability("L11", "In the Name of the King", "any")
 arts_of_war_capability("L12", "Commission of Array", "any")
 arts_of_war_capability("L13", "Expert Counsellors", "any",)
-arts_of_war_capability("L14", "Percy’s Power", ["Northumberland L"])
-arts_of_war_capability("L15", "King’s Parley", ["Henry VI"])
+arts_of_war_capability("L14", "Percy's Power", ["Northumberland L"])
+arts_of_war_capability("L15", "King's Parley", ["Henry VI"])
 arts_of_war_capability("L16", "Northmen",  ["Northumberland L"])
 arts_of_war_capability("L17", "Margaret",  ["Henry VI"])
 arts_of_war_capability("L18", "Council Member", ["Exeter 1", "Exeter 2", "Somerset 1", "Somerset 2", "Buckingham"])
 arts_of_war_capability("L19", "Andrew Trollope",  ["Exeter 1", "Exeter 2", "Somerset 1", "Somerset 2", "Buckingham"])
 arts_of_war_capability("L20", "Veteran of French Wars", ["Exeter 1", "Exeter 2", "Somerset 1", "Somerset 2"])
-arts_of_war_capability("L21", "My Father’s Blood", "any")
+arts_of_war_capability("L21", "My Father's Blood", "any")
 arts_of_war_capability("L22", "Stafford Estates", ["Buckingham"])
 arts_of_war_capability("L23", "Montagu", ["Warwick L"])
 arts_of_war_capability("L24", "Married to a Neville", ["Clarence"])