From 880660b69fbd90b39d5d35b56fa80a12543b704e Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Fri, 15 Dec 2023 00:16:15 +0100 Subject: Hohenfriedberg - fix card order. Blenheim only 2x on direct attack. --- data.js | 74 ++++++++++++++++++++++++++--------------------------- info/all-cards.html | 44 +++++++++++++++---------------- rules.js | 29 +++++++++++---------- tools/cards.csv | 8 +++--- 4 files changed, 78 insertions(+), 77 deletions(-) diff --git a/data.js b/data.js index 70627b6..2198fc0 100644 --- a/data.js +++ b/data.js @@ -16414,18 +16414,18 @@ cards: [ { "scenario": 44, "number": "267A", - "name": "Leopold's Right", + "name": "Leopold's Left", "wing": 3, "morale": 1, "strength": 6, - "dice": "1/2", + "dice": "5/6", "actions": [ { "type": "Attack", - "target": "Weissenfels, Lorraine's Left", + "target": "Lorraine's Right, Lorraine's Left", "effect": "1 hit per die. 1 self per action.", "target_list": [ - 537, + 539, 538, 536 ] @@ -16433,10 +16433,11 @@ cards: [ { "type": "Counterattack", "requirement": "Pair", - "target": "Weissenfels", + "target": "Lorraine's Right, Lorraine's Left", "effect": "1 hit.", "target_list": [ - 537, + 539, + 538, 536 ] } @@ -16444,7 +16445,7 @@ cards: [ "squeeze": 1, "infantry": 1, "link": [ - 528 + 530 ], "rule_text": "If neither target is in play, may attack Charles and suffers no self hits.", "reserve": "Commanded" @@ -16492,18 +16493,18 @@ cards: [ { "scenario": 44, "number": "269A", - "name": "Leopold's Left", + "name": "Leopold's Right", "wing": 3, "morale": 1, "strength": 6, - "dice": "5/6", + "dice": "1/2", "actions": [ { "type": "Attack", - "target": "Lorraine's Right, Lorraine's Left", + "target": "Weissenfels, Lorraine's Left", "effect": "1 hit per die. 1 self per action.", "target_list": [ - 539, + 537, 538, 536 ] @@ -16511,11 +16512,10 @@ cards: [ { "type": "Counterattack", "requirement": "Pair", - "target": "Lorraine's Right, Lorraine's Left", + "target": "Weissenfels", "effect": "1 hit.", "target_list": [ - 539, - 538, + 537, 536 ] } @@ -16523,7 +16523,7 @@ cards: [ "squeeze": 1, "infantry": 1, "link": [ - 532 + 530 ], "rule_text": "If neither target is in play, may attack Charles and suffers no self hits.", "reserve": "Commanded" @@ -16531,11 +16531,11 @@ cards: [ { "scenario": 44, "number": "270A", - "name": "Nassau", + "name": "Zieten", "wing": 2, "morale": 1, - "strength": 6, - "dice": "3/4", + "strength": 4, + "dice": "4-6", "actions": [ { "type": "Attack", @@ -16546,10 +16546,9 @@ cards: [ ] }, { - "type": "Counterattack", + "type": "Screen", "requirement": "Pair", "target": "Austrian Horse", - "effect": "1 hit.", "target_list": [ 540 ] @@ -16557,18 +16556,18 @@ cards: [ ], "cavalry": 1, "link": [ - 531 + 533 ], "reserve": "Commanded" }, { "scenario": 44, "number": "271A", - "name": "Zieten", + "name": "Nassau", "wing": 2, "morale": 1, - "strength": 4, - "dice": "4-6", + "strength": 6, + "dice": "3/4", "actions": [ { "type": "Attack", @@ -16579,9 +16578,10 @@ cards: [ ] }, { - "type": "Screen", + "type": "Counterattack", "requirement": "Pair", "target": "Austrian Horse", + "effect": "1 hit.", "target_list": [ 540 ] @@ -16589,7 +16589,7 @@ cards: [ ], "cavalry": 1, "link": [ - 534 + 532 ], "reserve": "Commanded" }, @@ -16639,7 +16639,7 @@ cards: [ "requirement": "Pair", "target": "Leopold's Right", "target_list": [ - 529 + 531 ] } ], @@ -16690,7 +16690,7 @@ cards: [ "target": "Leopold's Right", "effect": "1 hit per die. 1 self per action.", "target_list": [ - 529 + 531 ] }, { @@ -16699,7 +16699,7 @@ cards: [ "target": "Leopold's Right", "effect": "1 hit.", "target_list": [ - 529 + 531 ] } ], @@ -16724,7 +16724,7 @@ cards: [ "effect": "1 hit per die. 1 self per action.", "target_list": [ 530, - 531 + 529 ] }, { @@ -16734,7 +16734,7 @@ cards: [ "effect": "1 hit.", "target_list": [ 530, - 531 + 529 ] } ], @@ -16759,7 +16759,7 @@ cards: [ "target": "Leopold's Left, Leopold's Center", "effect": "1 hit per die. 1 self per action.", "target_list": [ - 531, + 529, 530 ] }, @@ -16769,7 +16769,7 @@ cards: [ "target": "Leopold's Left, Leopold's Center", "effect": "1 hit.", "target_list": [ - 531, + 529, 530 ] } @@ -16795,8 +16795,8 @@ cards: [ "target": "Nassau, Leopold's Left", "effect": "1 hit per die.", "target_list": [ - 532, - 531 + 533, + 529 ] }, { @@ -16804,8 +16804,8 @@ cards: [ "target": "Nassau or Zieten", "effect": "1 hit.", "target_list": [ - 532, - 533 + 533, + 532 ] } ], diff --git a/info/all-cards.html b/info/all-cards.html index 98436db..76aca82 100644 --- a/info/all-cards.html +++ b/info/all-cards.html @@ -9795,21 +9795,21 @@ h1{color: white}
-
Leopold's Right
+
Leopold's Left
6
-
-
1/2
+
+
5/6
Attack
-
Weissenfels, Lorraine's Left
+
Lorraine's Right, Lorraine's Left
1 hit per die. 1 self per action.
Counterattack
Pair
-
Weissenfels
+
Lorraine's Right, Lorraine's Left
1 hit.
If neither target is in play, may attack Charles and suffers no self hits.
@@ -9844,21 +9844,21 @@ h1{color: white}
-
Leopold's Left
+
Leopold's Right
6
-
-
5/6
+
+
1/2
Attack
-
Lorraine's Right, Lorraine's Left
+
Weissenfels, Lorraine's Left
1 hit per die. 1 self per action.
Counterattack
Pair
-
Lorraine's Right, Lorraine's Left
+
Weissenfels
1 hit.
If neither target is in play, may attack Charles and suffers no self hits.
@@ -9868,11 +9868,11 @@ h1{color: white}
-
Nassau
+
Zieten
-
6
-
-
3/4
+
4
+
+
4-6
Attack
@@ -9880,10 +9880,9 @@ h1{color: white}
1 hit per die. 1 self per action.
-
Counterattack
+
Screen
Pair
Austrian Horse
-
1 hit.
IN RESERVE (Commanded)
270A
@@ -9891,11 +9890,11 @@ h1{color: white}
-
Zieten
+
Nassau
-
4
-
-
4-6
+
6
+
+
3/4
Attack
@@ -9903,9 +9902,10 @@ h1{color: white}
1 hit per die. 1 self per action.
-
Screen
+
Counterattack
Pair
Austrian Horse
+
1 hit.
IN RESERVE (Commanded)
271A
@@ -11403,4 +11403,4 @@ h1{color: white}
303B
♦
- + \ No newline at end of file diff --git a/rules.js b/rules.js index 910c46f..4545802 100644 --- a/rules.js +++ b/rules.js @@ -2176,12 +2176,12 @@ function goto_attack(target) { game.state = "attack" game.target = target - update_attack1() + update_attack1(false) update_attack2() } // Update hits and self hits. -function update_attack1() { +function update_attack1(reaction) { let a = current_action() game.hits = get_attack_hits(game.selected, a) @@ -2257,14 +2257,15 @@ function update_attack1() { } if (game.scenario === S41_BLENHEIM_SCENARIO) { - // TODO: Original attack only, or also when Blenheim absorbs from Clerambault? - if (game.selected === S41_CUTTS_COLUMN && game.target === S41_BLENHEIM_CARD) - game.hits *= 2 + if (!reaction) + if (game.selected === S41_CUTTS_COLUMN && game.target === S41_BLENHEIM_CARD) + game.hits *= 2 } if (game.scenario === S43_DENAIN) { - if (game.selected === S43_DUTCH_HORSE && game.target === S43_VILLARS_LEFT) - game.hits *= 2 + if (!reaction) + if (game.selected === S43_DUTCH_HORSE && game.target === S43_VILLARS_LEFT) + game.hits *= 2 } if (game.scenario === S44_HOTHENFRIEDBERG) { @@ -2369,7 +2370,7 @@ states.attack = { let may_take_from = card_has_rule(game.selected, "may_take_from") if (may_take_from) { take_all_dice(from, game.selected) - update_attack1() + update_attack1(false) update_attack2() return } @@ -2378,7 +2379,7 @@ states.attack = { if (may_take_from_extra) { take_all_dice(from, game.selected) game.self2 = 1 - update_attack1() + update_attack1(false) update_attack2() return } @@ -2387,7 +2388,7 @@ states.attack = { if (game.selected === S39_CATINAT && from === S39_BAYONETS) { take_all_dice(from, game.selected) game.target2 = S39_BAYONETS - update_attack1() + update_attack1(false) update_attack2() return } @@ -2665,7 +2666,7 @@ function goto_screen(c, a) { game.target = c - update_attack1() + update_attack1(true) switch (a.effect) { @@ -2719,7 +2720,7 @@ function goto_absorb(c, a) { game.target = c - update_attack1() + update_attack1(true) switch (a.effect) { @@ -2758,7 +2759,7 @@ states.s29_meade = { card(c) { remove_dice(S29_MEADE) game.target = c - update_attack1() + update_attack1(true) update_attack2() game.state = "absorb" } @@ -2781,7 +2782,7 @@ states.absorb = { function goto_counterattack(c, a) { game.reacted = player_index() - update_attack1() + update_attack1(true) switch (a.effect) { diff --git a/tools/cards.csv b/tools/cards.csv index c68b29f..036958e 100644 --- a/tools/cards.csv +++ b/tools/cards.csv @@ -637,11 +637,11 @@ HOTHENFRIEDBERG,,,,,,,,,,,,,,,,,,,, 44,264A,dkblue,The Striegau River,,,III,Doubles,,,Command,Three Cubes,Frederick II out of reserve,,,,,,,,The bridge at the Striegau River created a bottleneck for Frederick's columns. 44,265A,blue,Frederick II,,,1,4-6,,Commanded,Command,,See Below,,,,,,"command_sequence=267A,268A,269A,270A,271A,272A","Each Command action brings into play the next card in this sequence: Leopold's Right, Leopold's Center, Leopold's Left, Nassau, Zieten, Bayreuth Dragoons.

If at the start of your turn you have no Infantry or Cavalry cards in play, you lose.", 44,266A,blue,Du Moulin,,cav,6,6,,,Attack,,Saxon Horse,1 hit per die. 1 self per action.,Screen,Pair,"Saxon Horse (Voluntary), Weissenfels",,,, -44,267A,dkblue,Leopold's Right,,inf,6,1/2,L,Commanded,Attack,,"Weissenfels, Lorraine's Left",1 hit per die. 1 self per action.,Counterattack,Pair,Weissenfels,1 hit.,,"If neither target is in play, may attack Charles and suffers no self hits.", +44,267A,dkblue,Leopold's Left,,inf,6,5/6,R,Commanded,Attack,,"Lorraine's Right, Lorraine's Left",1 hit per die. 1 self per action.,Counterattack,Pair,"Lorraine's Right, Lorraine's Left",1 hit.,,"If neither target is in play, may attack Charles and suffers no self hits.", 44,268A,dkblue,Leopold's Center,,inf,6,3/4,LR,Commanded,Attack,,"Lorraine's Left, Lorraine's Right",1 hit per die. 1 self per action.,Counterattack,Pair,"Lorraine's Left, Lorraine's Right",1 hit.,,"If neither target is in play, may attack Charles and suffers no self hits.", -44,269A,dkblue,Leopold's Left,,inf,6,5/6,R,Commanded,Attack,,"Lorraine's Right, Lorraine's Left",1 hit per die. 1 self per action.,Counterattack,Pair,"Lorraine's Right, Lorraine's Left",1 hit.,,"If neither target is in play, may attack Charles and suffers no self hits.", -44,270A,blue,Nassau,,cav,6,3/4,L,Commanded,Attack,,Austrian Horse,1 hit per die. 1 self per action.,Counterattack,Pair,Austrian Horse,1 hit.,,, -44,271A,blue,Zieten,,cav,4,4-6,R,Commanded,Attack,,Austrian Horse,1 hit per die. 1 self per action.,Screen,Pair,Austrian Horse,,,, +44,269A,dkblue,Leopold's Right,,inf,6,1/2,L,Commanded,Attack,,"Weissenfels, Lorraine's Left",1 hit per die. 1 self per action.,Counterattack,Pair,Weissenfels,1 hit.,,"If neither target is in play, may attack Charles and suffers no self hits.", +44,270A,blue,Zieten,,cav,4,4-6,R,Commanded,Attack,,Austrian Horse,1 hit per die. 1 self per action.,Screen,Pair,Austrian Horse,,,, +44,271A,blue,Nassau,,cav,6,3/4,L,Commanded,Attack,,Austrian Horse,1 hit per die. 1 self per action.,Counterattack,Pair,Austrian Horse,1 hit.,,, 44,272A,dkblue,Bayreuth Dragoons,,cav,1,1-3,,Commanded,Attack,,Lorraine's Left or Lorraine's Right,Two hits per die.,,,,,,"After making its first and only attack, this card is removed from play (this does not count as a Rout).","The justly famous charge of the Bayreuth Dragoons decisively broke the enemy line, securing for Frederick a major victory." 44,273A,pink,Saxon Horse,,cav,6,Doubles,,,Attack,,Du Moulin,1 hit.,Screen,Pair,Leopold's Right,,,, 44,274A,red,Charles,,,5*,5/6,,,Command,Three Dice,See Below,,Absorb,Voluntary,Any friendly formation,"When target suffers Hits, this card suffers 1 less hit per die.",,Each Command action brings into play the in-reserve card of your choice., -- cgit v1.2.3