summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ccxvii.net>2023-12-15 00:18:06 +0100
committerTor Andersson <tor@ccxvii.net>2024-01-08 16:36:48 +0100
commit6ba7a172466a09a8905193639b19778d70887c4b (patch)
tree66429084bb82cdfd258d309c5680c20410350d33
parent89a3e6f8c8b6feb94f4cd7fe4694d75d523b4405 (diff)
downloadtable-battles-6ba7a172466a09a8905193639b19778d70887c4b.tar.gz
direct
-rw-r--r--rules.js22
1 files changed, 11 insertions, 11 deletions
diff --git a/rules.js b/rules.js
index 869c7cf..acf4d95 100644
--- a/rules.js
+++ b/rules.js
@@ -2176,12 +2176,12 @@ function goto_attack(target) {
game.state = "attack"
game.target = target
- update_attack1(false)
+ update_attack1(true)
update_attack2()
}
// Update hits and self hits.
-function update_attack1(reaction) {
+function update_attack1(direct) {
let a = current_action()
game.hits = get_attack_hits(game.selected, a)
@@ -2257,13 +2257,13 @@ function update_attack1(reaction) {
}
if (game.scenario === S41_BLENHEIM_SCENARIO) {
- if (!reaction)
+ if (direct)
if (game.selected === S41_CUTTS_COLUMN && game.target === S41_BLENHEIM_CARD)
game.hits *= 2
}
if (game.scenario === S43_DENAIN) {
- if (!reaction)
+ if (direct)
if (game.selected === S43_DUTCH_HORSE && game.target === S43_VILLARS_LEFT)
game.hits *= 2
}
@@ -2370,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(false)
+ update_attack1(true)
update_attack2()
return
}
@@ -2379,7 +2379,7 @@ states.attack = {
if (may_take_from_extra) {
take_all_dice(from, game.selected)
game.self2 = 1
- update_attack1(false)
+ update_attack1(true)
update_attack2()
return
}
@@ -2388,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(false)
+ update_attack1(true)
update_attack2()
return
}
@@ -2666,7 +2666,7 @@ function goto_screen(c, a) {
game.target = c
- update_attack1(true)
+ update_attack1(false)
switch (a.effect)
{
@@ -2720,7 +2720,7 @@ function goto_absorb(c, a) {
game.target = c
- update_attack1(true)
+ update_attack1(false)
switch (a.effect)
{
@@ -2759,7 +2759,7 @@ states.s29_meade = {
card(c) {
remove_dice(S29_MEADE)
game.target = c
- update_attack1(true)
+ update_attack1(false)
update_attack2()
game.state = "absorb"
}
@@ -2782,7 +2782,7 @@ states.absorb = {
function goto_counterattack(c, a) {
game.reacted = player_index()
- update_attack1(true)
+ update_attack1(false)
switch (a.effect)
{