Commit graph

2952 commits

Author SHA1 Message Date
AJ Martinez
fc821b7e8f Stop sliptides midair 2023-11-16 00:35:24 -07:00
AJ Martinez
d08170ecea Don't draw 1 tic of indicators on dying players 2023-11-15 23:55:45 -07:00
AJ Martinez
f2b364fd48 Allow all capsule spawns in Tutorial 2023-11-15 23:19:13 -07:00
James R
72f1414432 MT_KART_LEFTOVER: remove fuse, let it be killed
Gets punted into the air when it's killed.
2023-11-15 20:03:47 -08:00
Oni
9ed05b5c21 Merge branch 'spike-fixes' into 'master'
Bigger wall spikes hitbox, improved collision; entire spike hitbox hurts player, tumbles airborne; renderhitbox papercollision

See merge request KartKrew/Kart!1629
2023-11-16 03:12:44 +00:00
Oni
38a6ac33f0 Merge branch 'fix-shield-ring-spill' into 'master'
Fix losing rings even with a shield out; fix losing Garden Top before you even activate it

See merge request KartKrew/Kart!1625
2023-11-16 00:32:05 +00:00
James R
4065f56b98 MT_WALLSPIKE: always bounce toward tip 2023-11-15 15:36:49 -08:00
AJ Martinez
f0ddb79156 Allow bubblebounce from trick, but disable trick handling 2023-11-15 01:03:55 -07:00
AJ Martinez
d54d2f6d04 Merge remote-tracking branch 'origin/master' into catholic-vfx 2023-11-14 21:47:51 -07:00
James R
a7e6ed7607 K_PopPlayerShield: do not destroy Garden Top before it is deployed 2023-11-14 20:33:33 -08:00
James R
ee7f3d7108 Replace K_ReduceVFX with K_ReduceVFXForEveryone, replace owner cases with RF_REDUCEVFX 2023-11-13 23:49:33 -08:00
James R
61cad641bb Invincible player punts hazardous/solid things, unless MF_ELEMENTAL
If player is in one of these states:

- Invincibility
- Grow (K_IsBigger)
- Flame Shield dash
- Over 200% speed

And the other object:

- Does not have MF_DONTPUNT

Then, touching a solid object:

- Punts the object, unless the object has MF_ELEMENTAL
- Fizzles the object, if the object has MF_ELEMENTAL

Or, when an object damages the player:

- That object is punted, unless it has MF_ELEMENTAL
- The object fizzles, if it has MF_ELEMENTAL

Punting means:

- A copy of the object is made
- Both the player and copy receive 5 tics of hitlag
- The copy is thrust away from the player at a minimum of
  60 FU, or 2x either the player's or object's momentum,
  whichever is ultimately greater
- The copy despawns after 2 seconds
- The copy flickers constantly, while thrust away

Fizzling means:

- The object disappears completely
- A puff of smoke is spawned in place of the object
- No hitlag is applied to the player

Both punting and fizzling:

- Hide the original object (intangible and invisible)
- The original object reppears after 30 seconds
- For 2 seconds before reappearing, the object flickers
  back in, but is still intangible
2023-11-13 22:18:35 -08:00
AJ Martinez
aad6795ba7 Trickpanels: I don't even know who I am anymore 2023-11-13 16:41:09 -07:00
toaster
4379c62276 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into other-progression 2023-11-13 14:45:17 +00:00
Oni
9134e6a4e7 Merge branch 'bot-muffler' into 'master'
Don't force player sounds to full volume when exiting

See merge request KartKrew/Kart!1615
2023-11-13 13:30:51 +00:00
AJ Martinez
b946a66574 Trick Panel charge release WIP 2023-11-13 04:35:15 -07:00
AJ Martinez
041d7660ae Charge minimum viable visuals (plus future frame/obj setup) 2023-11-12 23:32:59 -07:00
toaster
3ab5da8a3e MT_CHARGEAURA: Fix target setting to track reference 2023-11-12 17:37:14 +00:00
toaster
1adfc7f2a4 TRICKSTATE_FORWARD blast effect
Fun and simple papersprite buffoonery
Hey remember when the author of this commit thought papersprites would be a one-off side feature

Also fixes a potential invalid dereference when getting the color for MT_SIDETRICK
2023-11-12 17:34:28 +00:00
toaster
5cab2401b6 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into catholic-vfx 2023-11-12 16:24:47 +00:00
AJ Martinez
e20218a9d6 Trick Charge VFX WIP 2023-11-12 03:38:17 -07:00
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