Skip to content

Update log parser #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adnanmula merged 2 commits into from
Oct 5, 2025
Merged

Update log parser #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d17aa74
improve game log timeline
adnanmula Oct 5, 2025
cd94381
improve game log timeline
adnanmula Oct 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"ext-iconv": "*",
"ext-json": "*",
"adnanmula/criteria": "^0.4",
"adnanmula/keyforge-game-log-parser": "^0.2",
"adnanmula/keyforge-game-log-parser": "^0.2.1",
"adnanmula/tournament": "dev-master",
"beberlei/assert": "^3.3",
"doctrine/dbal": "^3.6",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 17 additions & 8 deletions src/Entrypoint/Controller/Keyforge/Game/Detail/game_stat_comparison.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,6 @@
} %}
{% endif %}

{% if log.timeline.filter(eventTypes.TOKEN_CREATED).count > 0 %}
{% include 'Keyforge/Game/Detail/game_stat_comparison_row.html.twig' with {
label: 'menu.tokens_created'|trans,
left: winner.timeline.filter(eventTypes.TOKEN_CREATED).count,
right: loser.timeline.filter(eventTypes.TOKEN_CREATED).count,
} %}
{% endif %}

{% if log.timeline.filter(eventTypes.TIDE_RAISED).count > 0 %}
{% include 'Keyforge/Game/Detail/game_stat_comparison_row.html.twig' with {
label: 'menu.tides_raised'|trans,
Expand All @@ -89,6 +81,14 @@
} %}
{% endif %}

{% if log.timeline.filter(eventTypes.TOKEN_CREATED).count > 0 %}
{% include 'Keyforge/Game/Detail/game_stat_comparison_row.html.twig' with {
label: 'menu.tokens_created'|trans,
left: winner.timeline.filter(eventTypes.TOKEN_CREATED).count,
right: loser.timeline.filter(eventTypes.TOKEN_CREATED).count,
} %}
{% endif %}

{% if log.timeline.filter(eventTypes.PROPHECY_ACTIVATED).count > 0 %}
{% include 'Keyforge/Game/Detail/game_stat_comparison_row.html.twig' with {
label: 'menu.prophecies_activated'|trans,
Expand All @@ -104,4 +104,13 @@
right: loser.timeline.filter(eventTypes.PROPHECY_FULFILLED).count,
} %}
{% endif %}

{% if log.timeline.filter(eventTypes.CHAINS_ADDED).count > 0 %}
{% include 'Keyforge/Game/Detail/game_stat_comparison_row.html.twig' with {
label: 'menu.chains_obtained'|trans,
left: winner.timeline.totalByValue(eventTypes.CHAINS_ADDED),
right: loser.timeline.totalByValue(eventTypes.CHAINS_ADDED),
color: false,
} %}
{% endif %}
</div>
8 changes: 8 additions & 0 deletions src/Entrypoint/Controller/Keyforge/Game/Detail/game_stat_comparison_row.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
{% set textLeftColor = 'text-danger' %}
{% endif %}

{% if color is defined and color == false %}
{% set textLeftColor = '' %}
{% endif %}

<div class="col-5 fw-bold {{ textLeftColor }}">{{ left }} {{ extraLeft|default('') }}</div>

<div class="col-2 text-muted small">
Expand All @@ -29,5 +33,9 @@
{% set textRightColor = 'text-danger' %}
{% endif %}

{% if color is defined and color == false %}
{% set textRightColor = '' %}
{% endif %}

<div class="col-5 fw-bold {{ textRightColor }}">{{ right }} {{ extraRight|default('') }}</div>
</div>
2 changes: 0 additions & 2 deletions src/Entrypoint/Controller/Keyforge/Game/Detail/game_timeline.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,7 @@
</div>

<script>
const cardsPlayedData = {{ log.timeline.filter(eventTypes.CARDS_PLAYED).items|json_encode|raw }};
const fullTimelineEvents = {{ log.timeline|json_encode|raw }};

const fullTimelineEventsGrouped = [];

fullTimelineEvents.forEach(entry => {
Expand Down
4 changes: 4 additions & 0 deletions src/Entrypoint/Controller/Keyforge/Stats/GeneralStatsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ public function winrateBySet(mixed $wrBySet): array
KeyforgeSet::DT->value => 0,
KeyforgeSet::WoE->value => 0,
KeyforgeSet::GR->value => 0,
KeyforgeSet::ToC->value => 0,
KeyforgeSet::AS->value => 0,
KeyforgeSet::PV->value => 0,
];

foreach ($wrBySet as $key => $value) {
Expand All @@ -126,7 +128,9 @@ private function avgStatsBySet(mixed $avgStatsBySet): array
KeyforgeSet::DT->value => 0,
KeyforgeSet::WoE->value => 0,
KeyforgeSet::GR->value => 0,
KeyforgeSet::ToC->value => 0,
KeyforgeSet::AS->value => 0,
KeyforgeSet::PV->value => 0,
];

foreach ($avgStatsBySet as $key => $value) {
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.en_GB.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ menu.join: Join
menu.leave: Leave
menu.extra_turns: Extra turns
menu.tokens_created: Tokens created
menu.tides_risen: Tides risen
menu.tides_raised: Tides raised
menu.prophecies_activated: Prophecies activated
menu.prophecies_fulfilled: Prophecies fulfilled
menu.chains_obtained: Chains obtained
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.es_ES.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ menu.join: Unirse
menu.leave: Salir
menu.extra_turns: Turnos extra
menu.tokens_created: Tokens creados
menu.tides_risen: Mareas subidas
menu.tides_raised: Mareas subidas
menu.prophecies_activated: Profecias activadas
menu.prophecies_fulfilled: Profecias cumplidas
menu.chains_obtained: Cadenas obtenidas
Expand Down