feat: Impulse based (instead of force player position) indicator slam + more accurate slam damage - [merged]

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:34

_Merges indicatorrework -> staging

• Indicator slam now uses impulses to allow for object collision, and it no longer messes up camera control
• Fixed ground slam damage
• Added a couple lines of code to uppercut so its gravity changes don't interfere with indicator

To-do:

• See if it's possible to make redirection feel and function smoother
• Limit x-axis deviation when redirecting to prevent going around large objects and walls
• Fix slams where the player gets stuck and doesn't drop

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:38

added 2 commits

• ed412458 - 1 commit from branch staging
• d6107801 - Reworked indicator slam with other minor changes

Compare with previous version

[MaxwellJung]

You can safely delete this code (it's prserved in version history)

[MaxwellJung]

        eventPlayer.applyImpulse(directionTowards(eventPlayer.getPosition(), eventPlayer.indicator_slam_position), OW1_DOOMFIST_INDICATOR_SEISMIC_SLAM_SPEED, Relativity.TO_WORLD, Impulse.CANCEL_CONTRARY_MOTION)

Replace magic number with constant

[MaxwellJung]

        eventPlayer.applyImpulse(-eventPlayer.getVelocity(), eventPlayer.getSpeed() - OW1_DOOMFIST_INDICATOR_SEISMIC_SLAM_SPEED, Relativity.TO_WORLD, Impulse.INCORPORATE_CONTRARY_MOTION) # somewhat prevents doom from speeding up after getting caught on objects

Another magic number

[MaxwellJung]

    cancelMomentum(eventPlayer)

Replace with macrofunction from utilities/macro_functions.opy for readability

[MaxwellJung]

Why is this conditional on only ground slam? Why not just remove if check?

[MaxwellJung]

    if (eventPlayer.isUsingAbility1()): return
    eventPlayer.setGravity(50)

Shorten to single line (I just like it better asthetically)

[MaxwellJung]

    if (eventPlayer.isUsingAbility1()): return

Same comment as before

[MaxwellJung]

#Conditions for when to stop an indicator slam and drop the player
#!define indicatorCanContinue() \
    (distance(eventPlayer.getPosition(), eventPlayer.indicator_slam_position) > 2) \
and (eventPlayer.isUsingAbility1()) \
and (eventPlayer.getSpeed() > 0) \

Indent for clarity

[MaxwellJung]

Overall logic looks good; just need some changes to match code styling guidelines.

[MaxwellJung]

requested review from @MaxwellJung

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:56

Commented on src/ow1/heroes/doomfist/slam.opy line 216

The wait only fixes ground slam damage and not indicator

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:58

Commented on src/ow1/heroes/doomfist/slam.opy line 178

changed this line in version 3 of the diff

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:58

Commented on src/ow1/heroes/doomfist/slam.opy line 192

changed this line in version 3 of the diff

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:58

Commented on src/ow1/heroes/doomfist/slam.opy line 198

changed this line in version 3 of the diff

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:58

Commented on src/ow1/heroes/doomfist/uppercut.opy line 60

changed this line in version 3 of the diff

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:58

added 1 commit

• e7d297e3 - Apply 6 suggestion(s) to 2 file(s)

Compare with previous version

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:59

Commented on src/ow1/heroes/doomfist/slam.opy line 172

changed this line in version 4 of the diff

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 15:59

added 1 commit

• bad5a0b7 - Apply 1 suggestion(s) to 1 file(s)

Compare with previous version

[MaxwellJung]

If the intent of that code is to delay the damage ramp up by 1 tick, I think it applies to both ground and indicator slam and the if statement can be removed.

[MaxwellJung]

    waitUntil(not eventPlayer.isOnGround(), Math.INFINITY)
    if eventPlayer.slam_to_use == SlamType.GROUND: # Makes ground slam damage 49    
        wait()

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 16:05

Commented on src/ow1/heroes/doomfist/slam.opy line 216

Max range indicator damage gives 65 damage as is most of the time, sometimes I get 67 but any changes that reduce slam damage makes indicator always 63 damage and I can't get it up to 65. Indicator damage is very finicky for some reason

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 16:09

Commented on src/ow1/heroes/doomfist/slam.opy line 216

changed this line in version 5 of the diff

[MaxwellJung]

In GitLab by @hikiru on Nov 6, 2023, 16:09

added 1 commit

• 993d04dd - Apply 1 suggestion(s) to 1 file(s)

Compare with previous version

[MaxwellJung]

resolved all threads

[MaxwellJung]

marked this merge request as ready

[MaxwellJung]

approved this merge request

[MaxwellJung]

mentioned in commit 216e6018abfa27febce9f579bb49a8cf41db49a2

[MaxwellJung]

In GitLab by @ghost1 on Nov 7, 2023, 11:03

:tada: This MR is included in version 1.10.0 :tada:

The release is available on GitLab release.

Your semantic-release bot :package: :rocket:

[MaxwellJung]

fixes #367 #297 #116 #104