Commit graph

3031 commits

Author SHA1 Message Date
AJ Martinez
4997c4c0ed Add K_IsPlayingDisplayPlayer for HUD sounds 2023-11-10 17:28:54 -07:00
AJ Martinez
81e7ec6aa3 itemflag tyop 2023-11-09 17:30:19 -07:00
AJ Martinez
06bc06869c Lite Steer profile option, itemstate pflags -> player.itemflags 2023-11-09 17:29:26 -07:00
Oni
cd06b34cd1 Merge branch 'ballhog-limited-tapfire' into 'master'
Easier ballhog tapfire

See merge request KartKrew/Kart!1594
2023-11-09 12:28:54 +00:00
AJ Martinez
19edcbe9c2 WIP: Trickpanel crack IV 2023-11-09 02:02:41 -07:00
AJ Martinez
c11394ce83 WIP: Trick panel decrackening 2023-11-09 00:45:50 -07:00
AJ Martinez
954bd85139 WIP: Trickpanel crack experiments 2023-11-08 01:52:07 -07:00
toaster
239388a1fa Add TRICKSTATE_ constants
Replaces the magic numpers <-- typo I have left in for posterity
2023-11-07 23:06:50 +00:00
toaster
6f22c5261e MT_POGOSPRING: Guarantee spawn of catholocism 2023-11-07 22:53:52 +00:00
toaster
2e760eff43 Merge branch 'trick-control-lock' of https://git.do.srb2.org/KartKrew/Kart into catholic-vfx
# Conflicts:
#	src/k_kart.c
2023-11-07 22:24:53 +00:00
toaster
c3d34e9377 Back Trick effect
A rising tornado swirling the opposite direction.
Sprites do not currently exist, but it's a one-line emergency-break-glass change if there's any danger of not shopping with them
2023-11-07 20:24:01 +00:00
toaster
c1f7546f99 Sneaker/invincibility: Trick Panel launch multiplier is 1.5x, nerfed from 2x 2023-11-07 20:10:01 +00:00
AJ Martinez
49fb2fe6b6 WIP: Trick Panel crack 2023-11-07 03:46:11 -07:00
toaster
af24fcd4bd Don't draw catholocism for other players
Your relationship with christ is personal
2023-11-06 22:18:27 +00:00
toaster
0016e8b9ec Boost the Trick Panel boost gotten from sneakers/invinc to 2* 2023-11-06 22:17:53 +00:00
toaster
48d93ec9f6 Side Trick effect
- Copiously reuses from MT_MAGICIANBOX, gomen
- Also set the lookback frame, for extra toaster-swag zaza
    - Because this feature is so old it predates lookback!?
2023-11-06 21:54:40 +00:00
toaster
aa0b626467 Trick catholic swipe needs to have all layers be fully visible, even at the peak of the arc 2023-11-06 21:47:16 +00:00
toaster
4ecc378bb6 Make weakest Trick Indicator colour white instead of grey
More opaque, due to additive behaviour
2023-11-06 19:27:24 +00:00
toaster
f8a6449033 Further Trick Indicator refinement
- Abstract K_TrickCatholocismBlast into its own function
    - Spawn one at an askance angle when you fail a trick for any reason
- Indicator is slightly closer to the player
- Smaller indicator base scale
- Indicator becomes more translucent the larger it is
- Swipe is at 1.5 scale relative to the indicator
2023-11-06 19:22:21 +00:00
toaster
e412b6ddd8 Call K_trickPanelTimingVisual only once per tic, to prevent pie duplication 2023-11-06 19:12:26 +00:00
toaster
2ecfe2f50f K_DoPogoSpring: Don't set Trick state if Player is in pain 2023-11-06 14:55:28 +00:00
toaster
e06d961574 Further refinement to Trick Indicator behaviour
- Set colour in K_DoPogoSpring based on relevant vertical momentum
    - Similar but seperate colour list to Dash Rings
- Improve interp state handling when starting a Trick
- Don't set to S_INVISIBLE every non-tricking frame
- Don't follow the player's movement during the very end of a swipe animation
- Add a catholocism blast of the outer D-Pad ring while tricking
2023-11-06 14:54:46 +00:00
toaster
5ffae81b08 Trick Indicator first pass
The author of this commit doesn't know what it's doing
2023-11-06 01:13:13 +00:00
toaster
ccbcd203dd Adjust PlayerPointerRemove macros + associated to check validity before removal 2023-11-06 01:11:29 +00:00
toaster
120b567ba2 K_DoPogoSpring: Handle player->trickpanel set directly 2023-11-06 01:09:06 +00:00
Oni
ef8c472a51 Merge branch 'failsafe-input-check' into 'master'
Failsafe fixes

See merge request KartKrew/Kart!1599
2023-11-05 21:53:57 +00:00
toaster
89e97a6e76 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into other-progression 2023-11-05 18:52:20 +00:00
Oni
3b04bde5b9 Merge branch 'will-it-blend' into 'master'
Will It Blend

See merge request KartKrew/Kart!1589
2023-11-05 18:45:51 +00:00
AJ Martinez
38c096a5cd Clean up failsafe queue condition 2023-11-05 04:40:44 -07:00
AJ Martinez
7ba7e2b076 Prevent failsafe briefly after taking damage 2023-11-04 23:42:26 -07:00
AJ Martinez
1667ca591e Don't failsafe when twerking 2023-11-04 23:22:03 -07:00
AJ Martinez
c9d72499f1 Allow half-speed turning for side tricks 2023-11-04 22:56:58 -07:00
AJ Martinez
961372540a Flame Shield SFX, flame/lightning rescale 2023-11-04 20:43:27 -07:00
toaster
75d8f1539c HUD refinement for Rings tutorial
- Hide roundscore outside of GTR_POINTLIMIT
- Hide position number in K_Cooperative
    - Tutorial should have counted as K_Cooperative when implemented, fix that now
2023-11-04 23:59:17 +00:00
AJ Martinez
4db18b1225 Easier ballhog tapfire 2023-11-03 22:51:14 -07:00
Oni
6e6c0cd71f Merge branch 'ballhog-descam' into 'master'
Ballhog fixups (+ sound cleanup)

See merge request KartKrew/Kart!1590
2023-11-03 03:13:13 +00:00
Oni
b20fb26c04 Merge branch 'hanagumi-ringbox' into 'master'
Hanagumi Hall ring vent overflow (resolves #745)

Closes #745

See merge request KartKrew/Kart!1591
2023-11-03 03:12:35 +00:00
AJ Martinez
0ca7897327 Remove sliptide sound fix (revisit later) 2023-11-02 07:11:02 -07:00
AJ Martinez
506ab31f7f Mania-style time trials 2023-11-02 06:51:51 -07:00
toaster
263c968cc8 Fix the Hanagumi Hall ring vent overflow
The way the cap was being handled was kind of messed up, and was trying to subtract your existing Super Ring count.
But because the datatype doesn't support negative numbers, it rolled under to approx UINT16_MAX!
Fix the datatypes and add the extra over-range check to prevent this from happening again.
2023-11-02 11:24:54 +00:00
AJ Martinez
143320b577 Misc item fuckery 2023-11-01 23:11:24 -07:00
toaster
32c40dd7d6 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into will-it-blend 2023-10-29 22:05:58 +00:00
AJ Martinez
429f84f6b6 Fix bad null check for sliptide zip indicator 2023-10-29 15:02:05 -07:00
Oni
fc982e84fd Merge branch 'duel-items-in-bonus' into 'master'
Spawn Duel items in GP Bonus

See merge request KartKrew/Kart!1584
2023-10-29 16:07:29 +00:00
toaster
388b14e956 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into will-it-blend
# Conflicts:
#	src/k_podium.c
2023-10-29 12:36:30 +00:00
AJ Martinez
1a75bc2e00 Fix Duel Bonus items being shortcircuited in P_AllowMobjSpawn 2023-10-29 05:28:45 -07:00
Oni
d79f723138 Merge branch 'flame-shield-fixups' into 'master'
Flame Shield fixups

See merge request KartKrew/Kart!1585
2023-10-29 06:17:22 +00:00
Oni
f5c1180095 Merge branch 'turn-solver-leniency' into 'master'
Sliptide/drift exit cleanup

See merge request KartKrew/Kart!1576
2023-10-29 06:08:22 +00:00
Oni
8557a7250f Merge branch 'prison-difficulty' into 'master'
Prison difficulty modes

See merge request KartKrew/Kart!1583
2023-10-29 06:07:42 +00:00
AJ Martinez
79a2c9a61d Flame Shield fixups 2023-10-27 21:05:18 -07:00