summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rules.js10
-rw-r--r--rules.ts31
2 files changed, 20 insertions, 21 deletions
diff --git a/rules.js b/rules.js
index 0deafa5..e2fbb0b 100644
--- a/rules.js
+++ b/rules.js
@@ -2605,10 +2605,11 @@ states.muster_lord = {
view.actions.commission_of_array = 1;
}
if (!is_rising_wages() || can_pay_from_shared(game.command, 2)) {
- if (can_add_troops_sof(game.command, here))
+ if (can_add_troops_sof(game.command, here)) {
view.actions.soldiers_of_fortune = 1;
- if (can_add_troops_sof(game.command, here) && (can_add_troops_irishmen(game.command, here)) || can_add_troops_sof(game.command, here) && (can_add_troops_beloved_warwick(game.command, here)))
- view.actions.soldiers_of_fortune_militia = 1;
+ if (can_add_troops_irishmen(game.command, here) || can_add_troops_beloved_warwick(game.command, here))
+ view.actions.soldiers_of_fortune_militia = 1;
+ }
}
}
}
@@ -9446,7 +9447,6 @@ states.soldiers_of_fortune = {
do_levy_troops();
},
};
-
states.soldiers_of_fortune_militia = {
inactive: "Muster",
prompt() {
@@ -9467,8 +9467,6 @@ states.soldiers_of_fortune_militia = {
end_levy_troops();
},
};
-
-
// === MUSTER CAPABILITY: COMMISSION OF ARRAY ===
states.commission_of_array = {
inactive: "Muster",
diff --git a/rules.ts b/rules.ts
index 7282d7a..6d122d3 100644
--- a/rules.ts
+++ b/rules.ts
@@ -3220,12 +3220,13 @@ states.muster_lord = {
if (can_add_troops_coa(game.command, here))
view.actions.commission_of_array = 1
}
- if (!is_rising_wages() || can_pay_from_shared(game.command, 2)) {
- if (can_add_troops_sof(game.command, here))
- view.actions.soldiers_of_fortune = 1;
- if (can_add_troops_sof(game.command, here) && (can_add_troops_irishmen(game.command, here)) || can_add_troops_sof(game.command, here) && (can_add_troops_beloved_warwick(game.command, here)))
- view.actions.soldiers_of_fortune_militia = 1;
- }
+ if (!is_rising_wages() || can_pay_from_shared(game.command, 2)) {
+ if (can_add_troops_sof(game.command, here)) {
+ view.actions.soldiers_of_fortune = 1
+ if (can_add_troops_irishmen(game.command, here) || can_add_troops_beloved_warwick(game.command, here))
+ view.actions.soldiers_of_fortune_militia = 1
+ }
+ }
}
} else {
@@ -3315,15 +3316,15 @@ states.muster_lord = {
},
soldiers_of_fortune_militia() {
- push_undo();
- log("Levy Troops.");
- logcap(AOW_YORK_SOLDIERS_OF_FORTUNE);
- if (lord_has_capability(game.command, AOW_YORK_IRISHMEN))
- logcap(AOW_YORK_IRISHMEN);
- if (lord_has_capability(game.command, AOW_YORK_BELOVED_WARWICK))
- logcap(AOW_YORK_BELOVED_WARWICK);
- game.state = "soldiers_of_fortune_militia";
- },
+ push_undo()
+ log("Levy Troops.")
+ logcap(AOW_YORK_SOLDIERS_OF_FORTUNE)
+ if (lord_has_capability(game.command, AOW_YORK_IRISHMEN))
+ logcap(AOW_YORK_IRISHMEN)
+ if (lord_has_capability(game.command, AOW_YORK_BELOVED_WARWICK))
+ logcap(AOW_YORK_BELOVED_WARWICK)
+ game.state = "soldiers_of_fortune_militia"
+ },
commission_of_array() {
push_undo()