Commit graph

104 commits

Author SHA1 Message Date
James R
acee24939f Fix Guard vs Guard clash 2024-01-16 21:32:53 -08:00
AJ Martinez
9b224356fe Add persistent objective messages via K_AddMessage, expose to ACS 2024-01-15 17:49:10 -07:00
AJ Martinez
6f2d467542 Merge remote-tracking branch 'origin/master' into message-drawer 2024-01-14 17:58:52 -07:00
AJ Martinez
516e418912 HUD messages: 2P split fixes, text revisions 2024-01-14 17:30:09 -07:00
AJ Martinez
25149db4eb WIP: Per-player mid-round announcements 2024-01-14 04:18:54 -07:00
James R
ce1fe0028a Insta-Whip: respect flashing tics unless player is in damage state
- Matches new flashing tics behavior
2024-01-13 22:56:19 -08:00
James R
9af09ec507 Bubble/Guard: fix reflected item intangibility, transfer ownership of reflected items
- Ignores item just-thrown intangibility only if the item
  owner is the same (standard behavior)
- Player who reflected the item takes ownership of it
  - Required to make intangibility work correctly
  - Improvement to game design
2024-01-13 22:56:18 -08:00
James R
f8f2c51a8d Bubble/Guard: reflect strength 4x -> 6x 2024-01-13 22:56:18 -08:00
James R
9e650fa6c0 Guard: reflect items like Bubble
- Clash + player knockback
2024-01-13 22:56:18 -08:00
James R
99a2a3fb74 Let Bubble blow-up destroy any MF_SHOOTABLE object 2024-01-13 22:56:18 -08:00
James R
ecf9fd53f6 Players cannot be invincible to Insta-whip vs Guard counter
Hacked into P_DamageMobj by way of inflictor == target
2024-01-11 22:34:00 -08:00
AJ Martinez
1a2a2df383 Refactor guard/whip cooldown checks 2024-01-09 20:26:35 -07:00
AJ Martinez
bc4859cf75 Also tumble on guarding whip 2024-01-06 05:00:09 -07:00
Oni
8a250e3237 Merge branch 'fix-crate-instawhip' into 'master'
Fix Metal Crate instawhip hitlag

Closes #800

See merge request KartKrew/Kart!1696
2023-12-23 22:41:02 +00:00
James R
98c4b34530 Fix dereferncing Broly null pointer 2023-12-23 00:26:40 -08:00
James R
5d91834c60 K_InstaWhipCollide: check P_DamageMobj succeeds before applying hitlag to attacker 2023-12-22 19:04:58 -08:00
James R
38d9875d4c Let player kill shootable objects if player can punt 2023-12-03 16:28:56 -08:00
James R
b1c0f6647e Obj_IsSuperFlickyWhippable: pass target
- Old behavior: if flicky is chasing itself. What? Why did
  I write this??
2023-11-14 21:01:53 -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
06bc06869c Lite Steer profile option, itemstate pflags -> player.itemflags 2023-11-09 17:29:26 -07:00
AJ Martinez
3f8b557d5e Whip fixups #69 2023-10-21 18:05:49 -07:00
toaster
a7940684f6 UCRP_WHIPHYUU
Insta-Whip another racer while you yourself are invisible from Hyuudoro, it's shrimple
Also updates the phrasing used for UCRP_TRIPWIREHYUU to match ("afflicted by Hyudoro")
2023-10-18 01:18:34 +01:00
AJ Martinez
a9ec1cea68 WIP: Instawhip charge input 2023-10-13 02:23:28 -07:00
Oni
1387fa81a8 Merge branch 'ballz-activation' into 'master'
Ball Switch

See merge request KartKrew/Kart!1534
2023-10-02 05:41:46 +00:00
Sally Coolatta
643cf46b61 Ball switch 2023-09-26 08:37:10 -04:00
Sally Coolatta
91955b1383 Broly screen shake is done on the source object
Screen shake was being done from the Broly vfx, which does scaling shenanigans so it caused Proximity Mine explosions to make the camera go apeshit.

I'm also pretty sure the hitlag calcs Proximity Mine did for the broly effect was wrong, not sure though? I'm trying something else and I think it's better.
2023-09-23 07:57:55 -04:00
James R.
c850248873 PIT_SSMineChecks: do not trip Mine radius if player has hyudorotimer 2023-09-17 21:56:18 -07:00
James R
91170d9287 PIT_SSMineExplode: don't do spinout damage to UFO Catcher 2023-08-12 17:06:23 -07:00
James R
b15a770f89 Let UFO Catcher destroy Mines in radius 2023-08-11 12:34:38 -07:00
toaster
a812ef8809 DMG_WHUMBLE
There are two differences between Whumble and Stumble.
- Stumble cannot be combo'd on upwards momentum, while whumble can. (Resolves #522)
- Whumble takes bumpers, while stumble does not.
    - Removes the MT_INSTAWHIP hack.
2023-07-18 17:39:17 +01:00
Sally Coolatta
5067bb854a Split hitlag into its own file 2023-06-30 23:05:40 -07:00
SteelT
fd56b67b1b Battle UFO instawhip damage 2023-06-29 22:21:28 -07:00
James R
919c669863 Drop power-ups when whipped
- Dropped power-ups become paper items (overloaded to
  store power-ups instead of items).
- The dropped power-up stores its remaining duration.
- The power-up can be picked up during any state.
  - If you already have the same kind of power-up, the
    duration is simply extended.
2023-06-27 02:08:07 -07:00
James R
b9820e3264 Whip Super Flicky 2023-06-27 01:12:01 -07:00
AJ Martinez
50eab03fc0 Instawhip nerfs galore 2023-06-06 19:28:08 -07:00
Eidolon
3dbd9720da Include missing algorithm header in k_collide.cpp 2023-06-01 05:15:38 -05:00
AJ Martinez
18d84c6c2c Fix instawhip follow hitlag 2023-05-20 14:35:48 -07:00
AJ Martinez
3b947ebf85 Instawhip: On mutual contact, clash! 2023-05-20 02:39:05 -07:00
AJ Martinez
211e28611b Instawhip: No mercy 2023-05-20 00:15:05 -07:00
AJ Martinez
53a2a999d2 Whoops, that's a testing condition 2023-05-19 23:45:52 -07:00
AJ Martinez
2c44bafe74 Misc fixup 2023-05-19 23:43:53 -07:00
AJ Martinez
de8f4812cf Split instashield and guard cooldown 2023-05-19 23:30:20 -07:00
AJ Martinez
9aa4a459ce Guard break, UFO instawhip 2023-05-19 18:45:27 -07:00
AJ Martinez
6f02923d89 Shield VFX 2023-05-19 17:59:47 -07:00
AJ Martinez
dadaab1817 Add guarding while ebraking with spheres 2023-05-19 01:53:14 -07:00
AJ Martinez
1b16b3f777 Instawhip: Damage sourcing and consistency fixes 2023-05-18 16:17:52 -07:00
AJ Martinez
57e03e8a80 Instawhip monitor hack: one contact per whip 2023-05-17 14:28:46 -07:00
AJ Martinez
d68de3a0e5 Instawhip: Bump up attacker hitlag 2023-05-17 14:06:37 -07:00
AJ Martinez
a3cc422706 WIP: the sequel 2023-05-17 01:50:17 -07:00
AJ Martinez
18c45d8a8a WIP: Insta-"whip" 2023-05-16 23:36:38 -07:00