Skip to content

Commit

Permalink
gh-pages build: util: fix encounter start bug in make/test timeline s…
Browse files Browse the repository at this point in the history
…cripts (#15)

(sorry for the git bork/closed PR - one more time...)

This PR should address the encounter sync drift referenced in
quisquous#5635 and quisquous#6048, as well as the
missing zone-seal sync referenced in quisquous#5716.

There were a couple of separate but related issues that I found:

1. `encounter_tools` had not (yet) been updated to use `InCombat` lines
to start encounters, even though `make_timeline` is inserting an
`InCombat` sync at the start of a new timeline.
2. For fights that do not have zone seals, `encounter_tools` would fall
back on using `playerAttackingMob` or `mobAttackingPlayer` regex. While
this mostly still worked (with minor drift issues), it was also counting
faerie healing actions as the start of the fight. I confirmed this was
the case with the log in issue 6048. I don't have logs for the original
report from issue 5635, but I suspect a similar cause there, as I was
unable to repro in e6n when on non-pet classes.
3. I think there was a minor logic bug in `encounter_tools` re: pushing
the fight-starting log line into `logLines`. When encountering certain
log lines that should trigger a new fight encounter, `onStartFight()`
would reinitialize `this.currentFight` and set `.startTime`; but when
`storeStartLine()` was subsequently called, it would not push the
starting log line into `.logLines` because the fight already had a start
time set. This was causing make/test_timeline to sometimes not have
access to (and not be able to sync on) the log line that started the
encounter.

I'm wary about unintentional breakage, given the various different
events that should (or should not) start a timeline. cc: @xiashtra and
@JLGarber, would appreciate an extra set of eyes. eab4545
  • Loading branch information
github-actions committed Dec 24, 2023
0 parents commit b6301db
Show file tree
Hide file tree
Showing 216 changed files with 520,047 additions and 0 deletions.
6 changes: 6 additions & 0 deletions resources/ffxiv/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Files in this folder are art reused from Final Fantasy XIV.

FINAL FANTASY is a registered trademark of Square Enix Holdings Co., Ltd.

Final Fantasy art and icons reused non-commercially under the
[FINAL FANTASY® XIV Materials Usage License](https://support.na.square-enix.com/rule.php?id=5382).
Binary file added resources/ffxiv/jobs/acn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/alc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/arc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/arm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/ast-framed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/ast-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/ast.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/blm-framed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/blm-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/blm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/blu-framed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/blu-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/blu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/bot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/brd-framed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/brd-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/brd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/bsm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/cho.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/cnj.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/crp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/cul.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/dnc-framed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/dnc-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/dnc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/ffxiv/jobs/drg-framed.png
Binary file added resources/ffxiv/jobs/drg-large.png
Binary file added resources/ffxiv/jobs/drg.png
Binary file added resources/ffxiv/jobs/drk-framed.png
Binary file added resources/ffxiv/jobs/drk-large.png
Binary file added resources/ffxiv/jobs/drk.png
Binary file added resources/ffxiv/jobs/fsh.png
Binary file added resources/ffxiv/jobs/gla.png
Binary file added resources/ffxiv/jobs/gnb-framed.png
Binary file added resources/ffxiv/jobs/gnb-large.png
Binary file added resources/ffxiv/jobs/gnb.png
Binary file added resources/ffxiv/jobs/gsm.png
Binary file added resources/ffxiv/jobs/limit break.png
Binary file added resources/ffxiv/jobs/lnc.png
Binary file added resources/ffxiv/jobs/ltw.png
Binary file added resources/ffxiv/jobs/mch-framed.png
Binary file added resources/ffxiv/jobs/mch-large.png
Binary file added resources/ffxiv/jobs/mch.png
Binary file added resources/ffxiv/jobs/min.png
Binary file added resources/ffxiv/jobs/mnk-framed.png
Binary file added resources/ffxiv/jobs/mnk-large.png
Binary file added resources/ffxiv/jobs/mnk.png
Binary file added resources/ffxiv/jobs/mrd.png
Binary file added resources/ffxiv/jobs/nin-framed.png
Binary file added resources/ffxiv/jobs/nin-large.png
Binary file added resources/ffxiv/jobs/nin.png
Binary file added resources/ffxiv/jobs/pet.png
Binary file added resources/ffxiv/jobs/pgl.png
Binary file added resources/ffxiv/jobs/pld-framed.png
Binary file added resources/ffxiv/jobs/pld-large.png
Binary file added resources/ffxiv/jobs/pld.png
Binary file added resources/ffxiv/jobs/rdm-framed.png
Binary file added resources/ffxiv/jobs/rdm-large.png
Binary file added resources/ffxiv/jobs/rdm.png
Binary file added resources/ffxiv/jobs/rog.png
Binary file added resources/ffxiv/jobs/rpr-framed.png
Binary file added resources/ffxiv/jobs/rpr-large.png
Binary file added resources/ffxiv/jobs/rpr.png
Binary file added resources/ffxiv/jobs/sam-framed.png
Binary file added resources/ffxiv/jobs/sam-large.png
Binary file added resources/ffxiv/jobs/sam.png
Binary file added resources/ffxiv/jobs/sch-framed.png
Binary file added resources/ffxiv/jobs/sch-large.png
Binary file added resources/ffxiv/jobs/sch.png
Binary file added resources/ffxiv/jobs/sge-framed.png
Binary file added resources/ffxiv/jobs/sge-large.png
Binary file added resources/ffxiv/jobs/sge.png
Binary file added resources/ffxiv/jobs/smn-framed.png
Binary file added resources/ffxiv/jobs/smn-large.png
Binary file added resources/ffxiv/jobs/smn.png
Binary file added resources/ffxiv/jobs/thm.png
Binary file added resources/ffxiv/jobs/war-framed.png
Binary file added resources/ffxiv/jobs/war-large.png
Binary file added resources/ffxiv/jobs/war.png
Binary file added resources/ffxiv/jobs/whm-framed.png
Binary file added resources/ffxiv/jobs/whm-large.png
Binary file added resources/ffxiv/jobs/whm.png
Binary file added resources/ffxiv/jobs/wvr.png
Binary file added resources/ffxiv/status/arcane-circle.png
Binary file added resources/ffxiv/status/arrow.png
Binary file added resources/ffxiv/status/astral.png
Binary file added resources/ffxiv/status/balance.png
Binary file added resources/ffxiv/status/battle-litany.png
Binary file added resources/ffxiv/status/battlevoice.png
Binary file added resources/ffxiv/status/bole.png
Binary file added resources/ffxiv/status/brotherhood.png
Binary file added resources/ffxiv/status/chain-stratagem.png
Binary file added resources/ffxiv/status/contagion.png
Binary file added resources/ffxiv/status/devilment.png
Binary file added resources/ffxiv/status/devotion.png
Binary file added resources/ffxiv/status/divination.png
Binary file added resources/ffxiv/status/dragon-sight.png
Binary file added resources/ffxiv/status/earth.png
Binary file added resources/ffxiv/status/embolden.png
Binary file added resources/ffxiv/status/ewer.png
Binary file added resources/ffxiv/status/fire.png
Binary file added resources/ffxiv/status/foes-requiem.png
Binary file added resources/ffxiv/status/food.png
Binary file added resources/ffxiv/status/hypercharge.png
Binary file added resources/ffxiv/status/ice.png
Binary file added resources/ffxiv/status/lady-of-crowns.png
Binary file added resources/ffxiv/status/lightning.png
Binary file added resources/ffxiv/status/lord-of-crowns.png
Binary file added resources/ffxiv/status/mug.png
Binary file added resources/ffxiv/status/offguard.png
Binary file added resources/ffxiv/status/peculiar-light.png
Binary file added resources/ffxiv/status/physical.png
Binary file added resources/ffxiv/status/potion.png
Binary file added resources/ffxiv/status/radiant-finale.png
Binary file added resources/ffxiv/status/searing-light-6.0.png
Binary file added resources/ffxiv/status/searing-light.png
Binary file added resources/ffxiv/status/spear.png
Binary file added resources/ffxiv/status/spire.png
Binary file added resources/ffxiv/status/standard-finish.png
Binary file added resources/ffxiv/status/technical-finish.png
Binary file added resources/ffxiv/status/trick-attack.png
Binary file added resources/ffxiv/status/umbral.png
Binary file added resources/ffxiv/status/water.png
Binary file added resources/ffxiv/status/wind.png
Binary file not shown.
Binary file added resources/sounds/BigWigs/Alarm.webm
Binary file not shown.
Binary file added resources/sounds/BigWigs/Alert.webm
Binary file not shown.
Binary file added resources/sounds/BigWigs/Info.webm
Binary file not shown.
Binary file added resources/sounds/BigWigs/Long.webm
Binary file not shown.
6 changes: 6 additions & 0 deletions resources/sounds/BigWigs/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
We acquired them from the BigWigs World of Warcraft addon
project, and were told these were contributed from an unknown
source. We believe these sounds come from freesound.org,
which would make them licensed under the Creative Commons
License.

Binary file not shown.
Binary file added resources/sounds/Overwatch/D.Va_-_Game_on.webm
Binary file not shown.
Binary file added resources/sounds/Overwatch/Hanzo_-_Sake.webm
Binary file not shown.
6 changes: 6 additions & 0 deletions resources/sounds/Overwatch/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Files in this directory come from: https://overwatch.gamepedia.com and are used
without modification.

They are distributed under the Attribution-NonCommercial-ShareAlike 3.0
Unported (CC BY-NC-SA 3.0) license. Full license text can be found at
https://creativecommons.org/licenses/by-nc-sa/3.0/
Binary file not shown.
29 changes: 29 additions & 0 deletions resources/sounds/freesound/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
These sounds from freesound.org and licensed via Creative Commons licenses.
The details of each license along with source for each sound is listed below.
All sounds have been converted from .wav to .webm for space.

alarm.webm
https://freesound.org/people/ZyryTSounds/sounds/219244/
http://creativecommons.org/publicdomain/zero/1.0/
modifications: shortened to first second

amy/
http://www.freesound.org/people/Timbre/sounds/83033/
https://creativecommons.org/licenses/by-nc/3.0/
modifications: sound cut into separate files

percussion_hit.webm
https://freesound.org/people/Stumber/sounds/207863/
https://creativecommons.org/publicdomain/zero/1.0/

power_up.webm
https://freesound.org/people/GameAudio/sounds/220173/
https://creativecommons.org/publicdomain/zero/1.0/

sonar.webm
https://freesound.org/people/NoiseCollector/sounds/6164/
https://creativecommons.org/licenses/by/3.0/

water_drop.webm
https://freesound.org/people/paespedro/sounds/174718/
https://creativecommons.org/publicdomain/zero/1.0/
Binary file added resources/sounds/freesound/alarm.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/1.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/10.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/2.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/3.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/4.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/5.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/6.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/7.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/8.webm
Binary file not shown.
Binary file added resources/sounds/freesound/amy/9.webm
Binary file not shown.
Binary file added resources/sounds/freesound/percussion_hit.webm
Binary file not shown.
Binary file added resources/sounds/freesound/power_up.webm
Binary file not shown.
Binary file added resources/sounds/freesound/sonar.webm
Binary file not shown.
Binary file added resources/sounds/freesound/water_drop.webm
Binary file not shown.
Loading

0 comments on commit b6301db

Please sign in to comment.