Commit graph

83 commits

Author SHA1 Message Date
Oni VelocitOni
3e9d6858bf Merge branch 'shield-shenanigans' into 'master'
Fix various shield checks using item instead of curshield

Closes #1501

See merge request kart-krew-dev/ring-racers-internal!2544
2025-05-20 22:46:45 +00:00
Antonio Martinez
eb79838ffb Ballhog buffs 2025-05-20 16:39:55 -04:00
Antonio Martinez
1009996ba4 Fix pickmeup bubble shield 2025-05-17 16:54:57 -04:00
Antonio Martinez
1a2f3b0d3b Merge remote-tracking branch 'origin/master' into pick-me-up 2025-05-16 22:26:35 -04:00
Antonio Martinez
bd82d4623f Fix various chield checks using item instead of curshield 2025-05-16 20:56:14 -04:00
Antonio Martinez
a1c99fa890 Fix unlobbable eggbox 2025-05-16 14:58:47 -04:00
Antonio Martinez
dcbbea4c4b WIP: pick-me-up 2025-05-16 11:44:57 -04:00
Lach
ca06b2a334 Replace further P_CanPickupItem constants and allow them to be parsed in Lua 2025-05-14 02:04:40 +10:00
Eidolon
cb7f437e60 Merge public master 2025-02-13 15:48:11 -06:00
Eidolon
a4d304a1f5 Update copyright years to 2025 2025-02-13 15:32:26 -06:00
Ashnal
70ad221aa0 Sneaker Lift 2024-08-25 23:50:10 +00:00
Antonio Martinez
1a4cb0c2df Fix droptarget amps 2024-08-24 16:31:47 -07:00
Antonio Martinez
e6db4e4d9b Backshots resurrection 2024-08-23 21:02:43 -07:00
Antonio Martinez
2b61497536 WIP - Overdrive polish 2024-07-22 20:35:28 -07:00
Antonio Martinez
199a92ebb2 WIP: Overdrive 2024-07-22 02:14:11 -07:00
AJ Martinez
d1070f5180 Reduce speed-based droptarget deflect dampening 2024-05-04 20:46:16 -07:00
AJ Martinez
cb61fc4513 Burger deflection 2024-05-04 20:01:00 -07:00
toaster
6c8242cd0a Don't count dunking a landmine on yourself for the landmine dunk challenge 2024-05-02 21:55:51 +01:00
Sally Coolatta
7dfa597c7d SRB2 -> DRRR copyright in src, acs, android folder
Be consistent with toaster's recent changes to copyright
2024-04-05 02:08:23 -04:00
AJ Martinez
71b352cd67 Check for removed target of MT_DROPTARGET_SHIELD 2024-02-22 03:11:00 -07:00
Eidolon
af7800c17b C++ compat: rename tm -> g_tm
This one's not even C++. It's in the ISO C standard library. :(
2024-02-19 19:36:42 -06:00
AJ Martinez
a2bcee60c0 Validate PvPTouchDamage (crash fix) 2024-02-05 19:04:22 -08:00
Oni
39b5a8ac2f Merge branch 'fix-whip-clash' into 'master'
Let Insta-Whip clashing ignore flashing tics

Closes #978

See merge request KartKrew/Kart!1870
2024-02-03 19:43:11 +00:00
James R
e30534e574 Let Insta-Whip clashing ignore flashing tics 2024-01-26 16:44:08 -08:00
toaster
5680514012 Per Sal's request, remove SMK stuff too 2024-01-26 00:56:01 +00:00
James R
fd175f4a5c Insta-Whip: scale knockback to map scale 2024-01-21 15:58:30 -08:00
James R
07ecf94999 Bubble: refactor collision code, goes in k_collide 2024-01-21 15:58:30 -08:00
Oni
973d5ba658 Merge branch 'objective-hud' into 'master'
Add persistent objective messages via K_AddMessage, expose to ACS

See merge request KartKrew/Kart!1843
2024-01-20 00:19:17 +00:00
James R
ecb20e8f64 Battle: put sting damage condition on zero bumpers instead of zero spheres 2024-01-16 22:36:16 -08:00
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