Commit graph

1303 commits

Author SHA1 Message Date
AJ Martinez
0a5baa5d39 UFO polish 2024-02-12 18:12:17 -07:00
Oni
796e2b9517 Merge branch 'bumper-boats' into 'master'
Improved combo escape mechanics in Battle

See merge request KartKrew/Kart!1914
2024-02-12 18:50:20 +00:00
AJ Martinez
11f7eb4b26 Guard against out-of-range pitblame, reset pitblame when triggered 2024-02-11 23:43:42 -07:00
AJ Martinez
c0598610e9 Credit players for deathpits that result from their hits 2024-02-11 21:40:53 -07:00
AJ Martinez
e0494d5576 Merge remote-tracking branch 'origin/master' into bumper-boats 2024-02-09 22:32:25 -07:00
AJ Martinez
7b5abc19b9 Merge branch 'fix-spb-combo' into 'master'
SPB: fix endless combo on players in its path

Closes #1015

See merge request KartKrew/Kart!1900
2024-02-09 22:49:31 +00:00
AJ Martinez
78a727e9cb Guard against more unsafe accesses to P_DamageMobj source 2024-02-08 17:50:38 -08:00
AJ Martinez
290b97500a Fix crashes when P_DamageMobj was naively passed a removed source 2024-02-07 20:21:32 -07:00
AJ Martinez
6b980cb1c7 Fix stale reference in P_KillMobj (crash) 2024-02-07 15:09:26 -07:00
James R
fbd77ef6f7 SPB: fix endless combo on players in its path 2024-01-30 23:12:52 -08:00
AJ Martinez
9231e95101 WIP: Battle combo mitigation rework 2024-01-29 17:02:25 -07:00
AJ Martinez
0878946b7e Merge remote-tracking branch 'origin/master' into bumper-boats 2024-01-29 16:06:58 -07:00
toaster
106553f89d Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into srb2-tidy
# Conflicts:
#	src/p_mobj.c
2024-01-27 17:04:00 +00:00
James R
06514b0e8f Battle: fix losing points from dying after round ends 2024-01-26 14:30:55 -08:00
toaster
5680514012 Per Sal's request, remove SMK stuff too 2024-01-26 00:56:01 +00:00
toaster
6fdec66dc3 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into srb2-tidy 2024-01-26 00:29:06 +00:00
AJ Martinez
26677c612e WIP: Improved bumper defenses 2024-01-23 22:06:17 -07:00
James R
311cf5ceea Battle: darken map for players who die during Overtime 2024-01-22 16:42:30 -08:00
James R
6b27a656e8 Polish player corpse physics
- Flung a little higher into the air
- Takes momentum of whatever killed the player
- Bounces off walls
- Bounces off the floor once
- After bouncing off the floor once, corpse noclips
  through walls and floors
2024-01-22 16:42:30 -08:00
James R
255552d141 Battle: make battle bumper burst animation fly a little lower 2024-01-22 16:42:30 -08:00
James R
8a882c55e5 Battle: have 6 emeralds and touch the 7th to win instantly
Win instantly instead of waiting for the emerald to finish
swirling into your body.
2024-01-22 16:42:29 -08:00
James R
f7e3ea76d1 Fix Mine omega combo (instant death) 2024-01-21 15:58:29 -08:00
Oni
3aace4f777 Merge branch 'battle-whis-wednesday' into 'master'
Battle: Monitor drops, Overtime elimination, point cap

See merge request KartKrew/Kart!1851
2024-01-17 08:44:32 +00:00
James R
9e4b716ed1 Battle: any death is an elimination while Overtime Barrier is tangible 2024-01-17 00:22:22 -08:00
James R
91fdba650f Monitors: for 6 seconds, dropped items can only be picked up by the player who destroyed the monitor
- Paper items colorize to player color
  - Color flickers back to normal 1 second before the item
    can be picked up by anyone
- If a player who can't pick it up steps on the paper
  item, that player becomes shadowed
2024-01-17 00:22:22 -08:00
James R
ecf70c6eea Battle UFO: polish drops
- Whip
  - Player gets power-up instantly, no paper item spawned
- Items
  - Put a small delay on the drop appearing
  - Adjusted drop spawn position so it spawns right under
    the UFO
2024-01-16 22:36:15 -08:00
James R
3724dd542b Battle: do not reduce hitlag for Insta-Whip (DMG_WHUMBLE), prevent double-damage window 2024-01-16 22:36:15 -08:00
James R
9fa7cb096b P_DamageMobj: items and PvP damage bypass flashing tics if the victim is in a damage state 2024-01-13 22:56:16 -08:00
James R
a349b1acf0 Revert "Add K_UpdateDamageFlashing, refactor Battle 0-flashing tics"
This reverts commit 3856fbf1c6.
2024-01-13 22:56:16 -08:00
toaster
1d13cb64c0 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into srb2-tidy
# Conflicts:
#	src/p_mobj.c
2024-01-13 22:08:44 +00:00
Oni
1aaac393c1 Merge branch 'battle-fixes-friday' into 'master'
Battle Fixes Friday

Closes #901, #890, #865, #891, #883, #887, #885, and #888

See merge request KartKrew/Kart!1829
2024-01-13 02:21:19 +00:00
Oni
6d641f8be8 Merge branch 'fix-respawn-explosion' into 'master'
Let last-place explosion kill respawning player

Closes #507

See merge request KartKrew/Kart!1824
2024-01-12 20:28:22 +00: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
James R
182df7bf44 Give player 2 seconds of flashing tics when picking up power-ups 2024-01-11 22:02:44 -08:00
James R
3856fbf1c6 Add K_UpdateDamageFlashing, refactor Battle 0-flashing tics
Instead of setting flashing tics to 0 in Battle, simply
don't update the value in damage contexts (if Battle).
2024-01-11 22:01:37 -08:00
Oni
ab82e417bc Merge branch 'ensure-emerald-pickup' into 'master'
Ensure player picking up dropped Emerald actualls receives it

Closes #886

See merge request KartKrew/Kart!1819
2024-01-12 03:51:58 +00:00
James R
6c8c0e7435 Let last-place explosion kill respawning player 2024-01-11 19:35:54 -08:00
James R
be5f632381 Ensure player picking up dropped Emerald actualls receives it 2024-01-11 15:10:36 -08:00
Eidolon
58557b274f Hardcode Sealed Star objects 2024-01-11 14:18:15 -08:00
James R.
b932e23187 Merge branch 'cloud-hardcoding' into 'master'
Cloud hardcoding

See merge request KartKrew/Kart!1670
2024-01-11 06:40:34 +00:00
James R
5248c2748b Hardcoding: fix cloud compiler errors (except one) 2024-01-10 20:38:47 -08:00
wolfy852
4c780d8867 Hardcoding: Cloud logic 2024-01-10 20:38:31 -08:00
toaster
325079a39a Delete everything major flagged up by listunusedsprites
Notable deletions:
- Metal Sonic Race
    - Includes all the specialised recording/playback apparatus which made g_demo.c harder to read
- A bunch of hyperspecialised code inside several A_ actions
- EXCEPTION: intentfully left in the spriteless SMK stuff for Sal's add-on down the line.
2024-01-11 01:21:43 +00:00
James R
45eeb94513 Insta-Whip: pop player shield 2024-01-08 19:01:19 -08:00
AJ Martinez
f092e9283c Fix Invincibility extensions, uh, 2024-01-06 06:06:59 -07:00
AJ Martinez
0a9787054f Increase sphere pity when hit (5->10) 2024-01-06 05:25:55 -07:00
AJ Martinez
dd71c81b24 Battle: reduce damage hitlag + monitor hitlag 2024-01-06 01:56:27 -07:00
Oni
10f8bb5a3f Merge branch 'battle-release' into 'master'
Battle is (almost) ready for release

Closes #681

See merge request KartKrew/Kart!1788
2024-01-06 06:08:28 +00:00
James R
2bdb7d4349 Battle UFO: power-up drops take player momz, pick up immediately 2024-01-05 20:59:18 -08:00
James R
07e53b7b50 Battle: lose 5 spheres on guard instead of 10 2024-01-05 18:34:02 -08:00