Skip to content

Commit 72a0110

Browse files
committed
fix: use ante instead of computation of ante from round
1 parent ae45b4d commit 72a0110

1 file changed

Lines changed: 23 additions & 5 deletions

File tree

src/balatrollm/strategies/default/GAMESTATE.md.jinja

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
{% if G.state == 7 -%}
44
- **Phase**: Blind Select Phase
55
- **Round**: {{ G.game.round }}
6-
- **Ante**: {{ 1 if (G.game.round == 0) else ((G.game.round - 1) // 3) + 1 }}/8
6+
- **Ante**: {{ G.game.round_resets.ante }}/8
77
- **Money**: ${{ G.game.dollars }}
88
{%- elif G.state == 1 -%}
99
- **Phase**: Playing Phase
1010
- **Round**: {{ G.game.round }}
11-
- **Ante**: {{ 1 if (G.game.round == 0) else ((G.game.round - 1) // 3) + 1 }}/8
11+
- **Ante**: {{ G.game.round_resets.ante }}/8
1212
- **Money**: ${{ G.game.dollars }}
1313
- **Hands left**: {{ G.game.current_round.hands_left}}/{{ G.game.current_round.hands_left + G.game.current_round.hands_played}}
1414
- **Discards left**: {{ G.game.current_round.discards_left }}/{{ G.game.current_round.discards_left + G.game.current_round.discards_used }}
@@ -17,12 +17,12 @@
1717
{%- elif G.state == 8 -%}
1818
- **Phase**: Round Evaluation Phase
1919
- **Round**: {{ G.game.round }}
20-
- **Ante**: {{ 1 if (G.game.round == 0) else ((G.game.round - 1) // 3) + 1 }}/8
20+
- **Ante**: {{ G.game.round_resets.ante }}/8
2121
- **Money**: ${{ G.game.dollars }}
2222
{%- elif G.state == 5 %}
2323
- **Phase**: Shop Phase
2424
- **Round**: {{ G.game.round }}
25-
- **Ante**: {{ 1 if (G.game.round == 0) else ((G.game.round - 1) // 3) + 1 }}/8
25+
- **Ante**: {{ G.game.round_resets.ante }}/8
2626
- **Money**: ${{ G.game.dollars }}
2727
{%- endif %}
2828

@@ -116,7 +116,7 @@ You can play or discard up to {{ G.hand.config.highlighted_limit }} cards.
116116
{%- if c.facing == "front" %}
117117
{%- if c.ability.name == "Stone Card" %}
118118
- {{ loop.index0 }}: this is a stone card (no suit and no rank)
119-
{%- else %}
119+
{%- elif c.config.card %}
120120
- {{ loop.index0 }}: {{ c.config.card.value }} of {{ c.config.card.suit }} (`{{ c.config.card_key }}`)
121121
{%- if c.edition %}
122122
- **{{ c.edition.type|title }} Edition**: {{ constants.editions[c.edition.key] }}
@@ -130,6 +130,11 @@ You can play or discard up to {{ G.hand.config.highlighted_limit }} cards.
130130
{%- if c.debuff %}
131131
- **Debuff**: this card is debuffed and will not be counted in scoring
132132
{%- endif %}
133+
{%- else %}
134+
- {{ loop.index0 }}: {{ c.label if c.label else "Unknown card" }}
135+
{%- if c.debuff %}
136+
- **Debuff**: this card is debuffed and will not be counted in scoring
137+
{%- endif %}
133138
{%- endif %}
134139
{%- else %}
135140
- {{ loop.index0 }}: the card is face down
@@ -170,6 +175,7 @@ Here are the available cards in the shop:
170175
- **Cost**: ${{ card.cost }}
171176
- **Sell value**: ${{ card.sell_cost }}
172177
{%- else %}
178+
{%- if card.config.card %}
173179
- {{ loop.index0 }}: {{ card.config.card.value }} of {{ card.config.card.suit }} (`{{ card.config.card_key }}`)
174180
- **Set**: {{ card.ability.set }}
175181
- **Cost**: ${{ card.cost }}
@@ -186,6 +192,18 @@ Here are the available cards in the shop:
186192
{%- if card.debuff %}
187193
- **Debuff**: this card is debuffed and will not be counted in scoring
188194
{%- endif %}
195+
{%- else %}
196+
- {{ loop.index0 }}: {{ card.label }} ({{ card.ability.set if card.ability.set else "Unknown" }})
197+
- **Set**: {{ card.ability.set }}
198+
- **Cost**: ${{ card.cost }}
199+
- **Sell value**: ${{ card.sell_cost }}
200+
{%- if card.edition %}
201+
- **{{ card.edition.type|title }} Edition**: {{ constants.editions[card.edition.key] }}
202+
{%- endif %}
203+
{%- if card.debuff %}
204+
- **Debuff**: this card is debuffed and will not be counted in scoring
205+
{%- endif %}
206+
{%- endif %}
189207
{%- endif %}
190208
{%- endif %}
191209
{%- else %}

0 commit comments

Comments
 (0)