Skip to content

Commit

Permalink
Adding Slipstream and updating about page
Browse files Browse the repository at this point in the history
  • Loading branch information
xephero committed Jan 25, 2022
1 parent 9a82205 commit 2dde983
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
7 changes: 4 additions & 3 deletions templates/about.html
Expand Up @@ -15,10 +15,9 @@ <h2>Does it account for...</h2>
<li>Excludes ticks from DoTs snapshotted after the tether window</li>
<li>Includes ticks from DoTs snapshotted inside the tether window, including ticks that happen afterward</li>
<li>Includes the portion of Wildfire damage generated by damage inside the tether window (Stormblood logs only)</li>
<li>Includes damage from ground effect DoTs (Shadow Flare, Doton, Salted Earth, Flamethrower)</li>
<li>Includes damage from ground effect DoTs (Shadow Flare, Doton, Salted Earth, Flamethrower, Slipstream)</li>
<li>Includes damage from Radiant Shield (when applicable)</li>
</ul>
<p>One thing it deliberately does not account for is range information. I don't check to make sure the tethered player is actually in range because in almost all cases, if someone is the target of a tether, there's nothing stopping them from being in range. Excluding damage just because someone is out of range, when they had no reason not to be, would give a skewed and inaccurate result of the real potential gains.</p>

<h2>How it works</h2>

Expand All @@ -40,7 +39,7 @@ <h2>How it works</h2>
<h2>Who made this?</h2>

<p>I am Platinum Xephera on the Ultros server. I made this because, while the methodology is fairly straightforward, it is incredibly tedious to do by hand with FFLogs. Doing it across many pulls, for every tether usage, is just way too much work compared to the bonus given. Many dragoons didn't bother, I know I didn't, and I thought more would if there was a tool that did the tedious stuff for them. I hope the {{ report_count }} analyzed reports have been useful.</p>
<p>If you notice any issues, feel free to join the <a href="https://discord.gg/2duJnXy">FFLogs Extensions discord</a>, or open issues and pull requests on the <a href="https://github.com/xephero/tethercalc">GitHub repo</a> for this site.</p>
<p>If you notice any issues, feel free to @ me in the dragoon channels in the balance, or open issues and pull requests on the <a href="https://github.com/xephero/tethercalc">GitHub repo</a> for this site.</p>

<h2>Changes</h2>

Expand All @@ -55,4 +54,6 @@ <h2>Changes</h2>
<p>On October 7, 2018, I fixed an error caused when wildfire expired on a target without dealing damage. This was addressed in commit <a href="https://github.com/xephero/tethercalc/commit/fe731abfbd74c0591ef19f23757d773a899442b2">fe731ab</a>

<p>On July 21, 2019, I added Shadowbringers support. Stormblood logs will still use the old logic and should produce the same results as before. Flamethrower damage was also not included in the damage totals previously, as it functions like a ground effect aoe but was not included in the special handling for those; as a result, even in Stormblood logs, machinists may see a few extra thousand damage. In Shadowbringers, wildfire functions conveniently like a normal dot, where all snapshotting takes place when the debuff is placed, and this behavior is accounted for properly now. This is addressed in <a href="https://github.com/xephero/tethercalc/commit/c2ea0b1f9e1fa2e2b7502f7857d454fa7650748a">c2ea0b1</a>.

<p>On January 24, 2022, I added support for Summoner's Slipstream ability (now sourced from the player, rather than garuda-egi) and updated the about page. This is addressed in <a href="https://github.com/xephero/tethercalc/commit/">fill-in</a>.</p>
{% endblock %}
9 changes: 6 additions & 3 deletions tethercalc.py
Expand Up @@ -122,6 +122,7 @@ def get_damages(report, start, end):
"""
Gets non-tick, non-pet damage caused between start and end
"""
# TODO: this should use calculateddamage events instead of damage-done table for higher accuracy
options = {
'start': start,
'end': end,
Expand Down Expand Up @@ -161,7 +162,8 @@ def get_tick_damages(report, version, start, end):
(
type="applybuff" or type="refreshbuff" or type="removebuff"
) and (
ability.id=1000190 or ability.id=1000749 or ability.id=1000501 or ability.id=1001205
ability.id=1000190 or ability.id=1000749 or ability.id=1000501 or
ability.id=1001205 or ability.id=1002706
)
) or (
type="damage" and ability.id=799
Expand All @@ -174,6 +176,7 @@ def get_tick_damages(report, version, start, end):
# 3. include debuff events
# 4. include individual dot ticks on enemy
# 5. include only buffs corresponding to ground effect dots
# (shadow flare, salted earth, doton, flamethrower, slipstream)
# 6. include radiant shield damage
}

Expand Down Expand Up @@ -402,7 +405,7 @@ def tethercalc(report, fight_id):
# If a tether is missing a start/end event for some reason, use the start/end of fight
if 'start' not in tether:
tether['start'] = encounter_start

if 'end' not in tether:
tether['end'] = encounter_end

Expand Down Expand Up @@ -433,7 +436,7 @@ def tethercalc(report, fight_id):

if not correct:
correct = 'Nobody?'

results.append({
'damages': damage_list,
'timing': str(timing)[2:11],
Expand Down

0 comments on commit 2dde983

Please sign in to comment.