Commit graph

21534 commits

Author SHA1 Message Date
James R
ec8e81ddb6 Always HUD track players in Duel mode 2023-02-24 23:21:47 -08:00
James R
e6da831e36 HUD target player with most points
- Replace battlewanted global with g_hiscore, keeps track
  of the current highest number of points.
- Adds HUD tracking for player(s) with the hiscore.
- Should target both players in a tie.
2023-02-24 23:21:47 -08:00
James R
9147a17bf3 Battle: change rankings priority
Highest to lowest:

1. points
2. emeralds
3. bumpers
2023-02-24 23:21:47 -08:00
James R
deac3a373f Battle: replace Karma Bomb with death
- Lose 2 points when you die.
- Respawn with 3 bumpers.
2023-02-24 23:21:47 -08:00
James R
87a6743c0f Battle: replace bumper elimination win condition with points cap
- Points cap is 3 * player count. E.g. for 3 players, the
  cap is 9 points.
- Once a player gets enough points, they win!
2023-02-24 23:21:47 -08:00
James R
8ba2155d89 Refactor timelimit and pointlimit to use "Default" option
- "Default" automatically updates the time/point limit
  according to the rules of the gametype.
- This fixes the bug where if you set timelimit at all,
  the default 2 minute limit will never be set again for
  Battle mode.
2023-02-24 23:19:07 -08:00
James R
917acfd16b Refactor pointlimit to be delayed until next round, like timelimit 2023-02-23 18:37:30 -08:00
Oni
ffb0596581 Merge branch 'fix-acs-includes' into 'master'
Fix ACS includes

See merge request KartKrew/Kart!963
2023-02-23 23:26:57 +00:00
Oni
5dadf48da1 Merge branch 'local-camera-fixes' into 'master'
Debounce cmd latency in local camera prediction

See merge request KartKrew/Kart!965
2023-02-23 23:25:54 +00:00
AJ Martinez
560050cf2c Remove old anglepredict debug print 2023-02-23 15:21:54 -07:00
AJ Martinez
4062447ee7 Debounce cmd latency in local camera prediction 2023-02-23 15:19:11 -07:00
Chromatian Keiske
aa76ba45db Merge branch 'fix-spb-lightning' into 'master'
Let Lightning Shield destroy SPB

Closes #427

See merge request KartKrew/Kart!933
2023-02-23 21:59:29 +00:00
Chromatian Keiske
016a3f82ca Merge branch 'separate-capsule-tracker' into 'master'
Only draw capsule icon for Break the Capsules HUD tracking

See merge request KartKrew/Kart!964
2023-02-23 21:45:58 +00:00
James R
ecd36144c8 Only draw capsule icon for Break the Capsules HUD tracking 2023-02-23 00:31:45 -08:00
VelocitOni
5bffc13db9 Reduce Gardentop Odds
A bit of a problem still, because I noticed that k_roulette.c isn't matched with our google doc. But this should be less annoying for now
2023-02-23 02:36:55 -05:00
James R
afec876f01 Add exception to let Lightning Shield destroy SPB 2023-02-22 03:42:25 -08:00
James R
c118b3cff1 Merge branch 'fix-cmake-ubuntu-2004' into 'master'
Fix CMake build on Ubuntu 20.04

See merge request KartKrew/Kart!948
2023-02-22 11:25:43 +00:00
James R
b0a4350454 Merge branch 'gachaboss' into 'master'
Use intermittent Gachabom in boss item table

See merge request KartKrew/Kart!954
2023-02-22 11:25:21 +00:00
James R
923b8414a1 Merge branch 'refactor-kitemcap' into 'master'
Refactor kitemcap

See merge request KartKrew/Kart!955
2023-02-22 11:23:51 +00:00
James R
03ada35269 Merge branch 'k-hud-track-cpp' into 'refactor-kitemcap'
Refactor capsule HUD tracking code to C++

See merge request KartKrew/Kart!956
2023-02-22 11:23:37 +00:00
James R
70cd31e04d ACS: include required C++ headers 2023-02-22 03:20:47 -08:00
James R
3e9b2e45e5 ACS: include libraries headers before any game headers 2023-02-22 03:20:47 -08:00
Oni
96862a2a6f Merge branch 'dont-fault-outside-of-race' into 'master'
Don't FAULT outside of Race modes

See merge request KartKrew/Kart!959
2023-02-22 09:59:47 +00:00
Oni
5dddf4c5e9 Merge branch 'despawn-empty-kart' into 'master'
Add 5 second fuse for empty kart, flickers right before despawning

See merge request KartKrew/Kart!961
2023-02-22 09:56:11 +00:00
Oni
b368e6835c Merge branch 'improve-vissprite-rangecheck-message' into 'master'
Add more details to R_DrawVisSprite RANGECHECK message

See merge request KartKrew/Kart!946
2023-02-22 09:29:49 +00:00
Oni
5217650583 Merge branch 'seg-fault-on-i-error' into 'master'
Generate a backtrace for I_Error; add a crash command

See merge request KartKrew/Kart!947
2023-02-22 09:29:26 +00:00
Oni
fd29a03a2b Merge branch 'claw-speedup-noise' into 'master'
More UFO FX

See merge request KartKrew/Kart!960
2023-02-22 08:17:36 +00:00
James R
b4b1543e0e Add 5 second fuse for empty kart, flickers right before despawning 2023-02-22 00:16:40 -08:00
AJ Martinez
fa73500787 More UFO FX 2023-02-22 01:09:34 -07:00
James R
d90351d660 Don't FAULT outside of Race modes 2023-02-21 23:59:56 -08:00
Oni
0fe70c373b Merge branch 'neo-eggbox' into 'master'
Contact-transfer eggboxes

See merge request KartKrew/Kart!958
2023-02-22 07:17:03 +00:00
Oni
63edb1f3f1 Merge branch 'random-means-dont-care' into 'master'
Change Random map vote to "don't care"

See merge request KartKrew/Kart!953
2023-02-22 06:49:06 +00:00
Oni
022665b7dc Merge branch 'hud-track-anything' into 'k-hud-track-cpp'
HUD track UFO catcher; hide TARGET text in 3P and 4P splitscreen

See merge request KartKrew/Kart!957
2023-02-22 06:26:33 +00:00
AJ Martinez
00aa69ca0a Buff eggbox speed, allow contact transfers 2023-02-21 23:00:56 -07:00
James R
c041ff834c alias-bootstrap.sh: use i686-w64-mingw32-cmake-static 2023-02-21 21:56:55 -08:00
James R
75c9ee253e k_hud_track.cpp: only draw TARGET text in 1P or 2P splitscreen 2023-02-21 21:09:32 -08:00
James R
4adf585590 Give TARGET HUD tracking to UFO Catcher 2023-02-21 20:12:37 -08:00
James R
e79ff76758 k_hud_track.cpp: refactor to use C++ STL
- Use std::vector instead of fixed size array.
- Use std::sort instead of custom sorting algorithm.
2023-02-21 20:11:58 -08:00
James R
13762ee4e1 k_hud_track.cpp: "capsule" -> "track" 2023-02-21 20:10:47 -08:00
James R
83051728f0 Move capsule target code out of k_hud.c, to k_hud_track.cpp 2023-02-21 20:09:06 -08:00
AJ Martinez
ccef5bc5c9 Use intermittent Gachabom in boss item table 2023-02-21 20:34:50 -07:00
James R
061e5b01ec Refactor trackercap
- Don't clear every tic. This is what P_RemoveTracker is
  for.
- Link in P_SpawnMobj. Should cover all cases.
- Remove excess objects. These were leftover from when
  Shrink destroyed items. Just track Jawz, SPB and Break
  the Capsules.
2023-02-21 18:27:46 -08:00
James R
be4c341316 Rename kitemcap to trackercap 2023-02-21 17:48:14 -08:00
AJ Martinez
53f14bd14a Make Random map vote only use the visible vote choices (random = don't care) 2023-02-21 16:29:52 -07:00
Oni
c41d0dee32 Merge branch 'enable-bustables' into 'master'
Let players bust bustable FOFs again

Closes #351

See merge request KartKrew/Kart!945
2023-02-21 06:44:13 +00:00
Oni
9dedbb2508 Merge branch 'alt-music-tunesfix' into 'master'
Fix tunes -default to use stored RNG value

See merge request KartKrew/Kart!951
2023-02-21 06:43:19 +00:00
Oni
3389c882b3 Merge branch 'gachabom-sprites' into 'master'
Add Gacha Bom sprites

See merge request KartKrew/Kart!950
2023-02-21 06:39:58 +00:00
Oni
1f968d51c5 Merge branch 'pogo-fuse' into 'master'
Add fuse to Pogo Spring

See merge request KartKrew/Kart!942
2023-02-21 06:16:50 +00:00
wolfy852
29663c23d6 Fix tunes -default to use stored RNG value 2023-02-20 23:40:13 -06:00
James R
93f335c636 Add Gacha Bom item HUD graphics 2023-02-20 21:25:38 -08:00