summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data.js6
-rw-r--r--data.ts6
-rw-r--r--play.css2
-rw-r--r--play.js2
-rw-r--r--rules.js9
-rw-r--r--rules.ts11
-rw-r--r--types.d.ts1
7 files changed, 24 insertions, 13 deletions
diff --git a/data.js b/data.js
index eaebba1..e7cbecb 100644
--- a/data.js
+++ b/data.js
@@ -1267,7 +1267,7 @@ const data = {
effects: [
create_effect('attack', CLOSEST_TO_DEFEAT, -4, INITIATIVE_PLAYER),
create_effect('attack', CLOSEST_TO_VICTORY, -4, INITIATIVE_PLAYER),
- create_effect('track', COLLECTIVIZATION, -1, INITIATIVE_PLAYER),
+ create_effect('track', LIBERTY, -1, INITIATIVE_PLAYER),
],
test: {
front: MADRID,
@@ -1784,12 +1784,12 @@ const data = {
{
id: PROPAGANDA_MEDALLION_ID,
name: 'Propaganda',
- tooltip: '+1 card when drawing from your deck & keep +1 in hand at End of the Year.'
+ tooltip: "Gain 2 extra Hero points form each Successful Test (even if you didn't support)."
},
{
id: INTELLIGENCE_MEDALLION_ID,
name: 'Intelligence',
- tooltip: "Gain 2 extra Hero points form each Successful Test (even if you didn't support)."
+ tooltip: '+1 card when drawing from your deck & keep +1 in hand at End of the Year.'
},
{
id: VOLUNTEERS_MEDALLION_ID,
diff --git a/data.ts b/data.ts
index de4774f..3e7e159 100644
--- a/data.ts
+++ b/data.ts
@@ -1305,7 +1305,7 @@ const data: StaticData = {
effects: [
create_effect('attack', CLOSEST_TO_DEFEAT, -4, INITIATIVE_PLAYER),
create_effect('attack', CLOSEST_TO_VICTORY, -4, INITIATIVE_PLAYER),
- create_effect('track', COLLECTIVIZATION, -1, INITIATIVE_PLAYER),
+ create_effect('track', LIBERTY, -1, INITIATIVE_PLAYER),
],
test: {
front: MADRID,
@@ -1857,12 +1857,12 @@ const data: StaticData = {
{
id: PROPAGANDA_MEDALLION_ID,
name: 'Propaganda',
- tooltip: '+1 card when drawing from your deck & keep +1 in hand at End of the Year.'
+ tooltip: "Gain 2 extra Hero points form each Successful Test (even if you didn't support)."
},
{
id: INTELLIGENCE_MEDALLION_ID,
name: 'Intelligence',
- tooltip: "Gain 2 extra Hero points form each Successful Test (even if you didn't support)."
+ tooltip: '+1 card when drawing from your deck & keep +1 in hand at End of the Year.'
},
{
id: VOLUNTEERS_MEDALLION_ID,
diff --git a/play.css b/play.css
index 7072619..7f32d5c 100644
--- a/play.css
+++ b/play.css
@@ -174,7 +174,7 @@ body.Observer #toggle_trash {
}
#hero_point_pool .token {
- margin-bottom: -25px;
+ margin-bottom: -30px;
}
.front_container {
diff --git a/play.js b/play.js
index a7d8ce7..751170a 100644
--- a/play.js
+++ b/play.js
@@ -496,7 +496,7 @@ function on_update() { // eslint-disable-line no-unused-vars
ui.trash.replaceChildren()
place_cards(ui.trash, view.trash)
- if (view.actions && view.actions.trash)
+ if (view.show_trash)
ui.trash_panel.classList.remove("hide")
else
ui.trash_panel.classList.toggle("hide", trash_toggle)
diff --git a/rules.js b/rules.js
index f08657f..046a003 100644
--- a/rules.js
+++ b/rules.js
@@ -1145,6 +1145,11 @@ states.choose_medallion = {
};
states.confirm_turn = {
inactive: 'confirm their move',
+ auto_resolve() {
+ if (game.fascist === 1)
+ return true;
+ return false;
+ },
prompt() {
if (game.fascist === 2)
view.prompt = 'Fascist Test: Done.';
@@ -1813,6 +1818,7 @@ states.return_card = {
const faction = get_active_faction();
gen_spend_hero_points();
view.prompt = 'Return a card to your hand.';
+ view.show_trash = true;
let possible = false;
for (let c of game.trash[faction]) {
if (c !== game.played_card) {
@@ -2321,10 +2327,9 @@ function end_of_year() {
false,
false,
];
- const player_order = get_player_order();
const engine = [];
for (let i = 0; i < glory_to_draw[game.year]; ++i) {
- engine.push(create_state_node('draw_glory', player_order[i % 3]));
+ engine.push(create_state_node('draw_glory', game.initiative));
}
engine.push(create_function_node('end_of_year_cleanup'));
game.engine = engine;
diff --git a/rules.ts b/rules.ts
index cc1fb2d..2727d4b 100644
--- a/rules.ts
+++ b/rules.ts
@@ -1443,6 +1443,12 @@ states.choose_medallion = {
states.confirm_turn = {
inactive: 'confirm their move',
+ auto_resolve() {
+ // don't pause to confirm actions during fascist event
+ if (game.fascist === 1)
+ return true
+ return false
+ },
prompt() {
if (game.fascist === 2)
view.prompt = 'Fascist Test: Done.'
@@ -2208,6 +2214,7 @@ states.return_card = {
const faction = get_active_faction();
gen_spend_hero_points();
view.prompt = 'Return a card to your hand.';
+ view.show_trash = true;
let possible = false;
for (let c of game.trash[faction]) {
if (c !== game.played_card) {
@@ -2821,12 +2828,10 @@ function end_of_year() {
false,
];
- const player_order = get_player_order();
-
const engine = [];
for (let i = 0; i < glory_to_draw[game.year]; ++i) {
- engine.push(create_state_node('draw_glory', player_order[i % 3]));
+ engine.push(create_state_node('draw_glory', game.initiative));
}
engine.push(create_function_node('end_of_year_cleanup'));
diff --git a/types.d.ts b/types.d.ts
index 0b901d5..6740ba8 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -121,6 +121,7 @@ export interface View {
used_medallions: Game['used_medallions'];
year: number;
fascist?: number;
+ show_trash?: boolean;
}
export type States = {