Commit graph

22395 commits

Author SHA1 Message Date
James R
6d305deacc Fix 2P FINISH text scrolling
Was using the wrong center offset.
2023-03-08 19:01:02 -08:00
James R
3dd7ece9db Don't get points from killing other players in Break the Capsules or boss mode 2023-03-08 19:01:02 -08:00
James R
85a101cbd7 Replace battlecapsules || bossinfo.valid checks with K_Cooperative 2023-03-08 19:01:02 -08:00
James R
7669ae7bde Rankings HUD and minimap check for PF_ELIMINATED
Dying to the Barrier:

- crosses out your rankings icon
- hides your minimap icon
2023-03-08 19:01:02 -08:00
James R
f69d70043c Keep player alive at zero bumpers
Player have one more hit point than number of bumpers.
Break the Capsules gives zero bumpers.
2023-03-08 19:01:02 -08:00
James R
f6c8dd655a Do not kill player because of damage outside of GTR_BUMPERS
Removes more Karma Bomb crap.
2023-03-08 18:11:50 -08:00
James R
ed551114d5 Windows: add -noexchndl, disables loading exchndl.dll 2023-03-08 17:11:05 -08:00
Eidolon
f952be1e2c Only allow P1 to be assigned KBM 2023-03-08 18:39:51 -06:00
Eidolon
7ff7679ed1 Merge branch 'g-playeranaloginput-cleanup' into 'dynamic-controllers'
G_PlayerAnalogInput cleanup

See merge request KartKrew/Kart!1023
2023-03-09 00:32:11 +00:00
AJ Martinez
d8670bae20 Fix nonfunctional wizard guard for wizards 2023-03-08 16:58:15 -07:00
AJ Martinez
6d983852d9 Fix null ref in eggman transfer 2023-03-08 15:58:56 -07:00
Eidolon
610351b872 Normalize all volume scales to 0-100 2023-03-08 15:22:29 -06:00
James R
a3c64068e6 Replace bumpers completely with health
Adds some functions:

- K_Bumpers, bumper count for the count, intended for
  where player->bumpers was used in HUD and visual
  contexts.
- K_BumpersToHealth, converts bumper count to health
  points.

player->mo->health replaces player->bumpers where it was
used in health contexts.

Removes some functions:

- K_HandleBumperChanges
- K_DestroyBumpers

Everything K_HandleBumperChanges did has either been
removed or moved elsewhere. P_KillMobj also already called
K_CheckBumpers.

K_DestroyBumpers became pointless after player->bumpers
was removed.
2023-03-07 22:54:33 -08:00
James R
a1558f1fbd Move Break the Capsules and Boss elimination condition to P_KillMobj 2023-03-07 22:36:55 -08:00
James R
3843f0c3cd Remove more Karma Bomb crap
- remove Karma Bomb boost trail condition
- remove Karma Bomb condition for Eggman Mark
- remove Karma Bomb condition for hiding player name tags
- remove Karma Bomb player translucency
- remove Karma Bomb respawn invincibility
- remove Karma Bomb speed buff
- remove Karma Bomb sphere digestion
- remove Overtime Karma
2023-03-07 22:32:28 -08:00
James R
a648ff31f1 Let spectators watch players who just died in Battle
If they're going to respawn anyway, there's no reason not
to spectate them. PF_ELIMINATED condition above excludes
Overtime Barrier KO.
2023-03-07 22:29:50 -08:00
James R
f86f794d20 g_demo.c: track player mobj health instead of bumpers
Lord have mercy on my soul!!!
2023-03-07 22:29:49 -08:00
James R
86990d47d2 Merge branch 'i-error-if-missing-exchndl' into 'master'
Windows: close game with error if exchndl.dll is missing

See merge request KartKrew/Kart!1010
2023-03-08 03:25:10 +00:00
James R
6d530ec810 PARANOIA: snacpending negative error plays sfx_monch 2023-03-07 18:26:50 -08:00
James R
afa62f2402 I_Error if exchndl.dll is missing for Windows builds 2023-03-07 17:52:10 -08:00
Oni
216e4064dc Merge branch 'wavedash-sounds' into 'master'
Add sounds to sliptide zip / wavedashing

See merge request KartKrew/Kart!1024
2023-03-07 20:23:05 +00:00
toaster
84742e0376 G_LoadGameData: Remove print from recorded map record 2023-03-07 20:02:23 +00:00
toaster
d2c36c952a Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into conditions-cascading
# Conflicts:
#	src/k_grandprix.c
#	src/k_grandprix.h
2023-03-07 19:37:46 +00:00
toaster
1ccd41c3db R_RenderThickSideRange: Compilation fix
It seems `lighteffect` was not a comprehensive enough blockade to referencing an uninitialised `xwalllights` for my strictly-warning compiler.
2023-03-07 19:32:52 +00:00
AJ Martinez
da2aab1af1 Avoid sound iteration, if we can help it 2023-03-07 06:08:20 -07:00
AJ Martinez
06f583a15d Un-re-buff wavedash boost because tripwire 2023-03-07 05:57:01 -07:00
AJ Martinez
3463456976 Oni fixup gaiden
Passive sound when holding wavedash (waved4), wavedash delay TICRATE -> TICRATE/2, wavedash delay pauses while driftboosting
2023-03-07 04:58:17 -07:00
AJ Martinez
65b62e07c8 Add sounds to slipide zip / wavedashing 2023-03-07 03:20:41 -07:00
Sally Coolatta
edd5398373 G_PlayerAnalogInput cleanup
Emergency keyboard keys work again, and the input code is more straight-forward.
2023-03-07 05:01:26 -05:00
James R
df00ed4f64 Merge branch 'render-highlight' into 'master'
debugrender_contrast, debugrender_spriteclipping and debugrender_highlight

See merge request KartKrew/Kart!1021
2023-03-07 09:53:13 +00:00
Oni
cb6391c2cc Merge branch 'high-contrast-debug-waypoints' into 'render-highlight'
Make debugwaypoints radiuses more visible

See merge request KartKrew/Kart!1022
2023-03-07 09:52:24 +00:00
James R
aa927a5b00 Merge branch 'overtime-spectator' 2023-03-07 01:45:16 -08:00
James R
540bd6e18d Merge branch 'improve-battle-tracking' into 'master'
HUD TARGET for Battle Kiosk, Monitors and Emeralds; remove WANTED over players' heads

See merge request KartKrew/Kart!1016
2023-03-07 09:44:07 +00:00
Oni
e4ba544994 Merge branch 'buff-sliptide' into 'master'
Make sliptiding actually good

See merge request KartKrew/Kart!1020
2023-03-07 08:49:46 +00:00
James R
b8a503f56a Always sync health to bumpers in P_KillPlayer
Fixes Death Pit respawning in Battle.
2023-03-06 23:37:42 -08:00
James R
a55ddef528 Add cv_scrambleremoved, disable scramble on P_RemoveMobj
Because Monitors and players leaving leak references,
disable this crashing to be able to test other stuff at
least.
2023-03-06 22:55:01 -08:00
Eidolon
7ed5e7a7a5 Change gamepad LED colors on playercolor change 2023-03-07 00:07:47 -06:00
Eidolon
86a9579e16 Handle gamepads from interface dynamically
Fixes numerous issues with hotswapping, gamepad assignment, and menu
responsiveness.
2023-03-07 00:07:47 -06:00
Oni
cdc56ab2cc Merge branch 'podium' into 'master'
Podium

See merge request KartKrew/Kart!1014
2023-03-07 05:58:20 +00:00
AJ Martinez
5d79ecd065 Oni feedback fixup
Sneaker boosts now pause decay timer, boost strength reduced to prevent tripwire memes, boost lengthened based on proximity to bottom left, further improvements to handling boosts
2023-03-06 20:01:09 -07:00
James R
ccd933556d Battle: activate director after dying to Overtime Barrier 2023-03-06 18:52:59 -08:00
James R
d56be63249 Battle: eliminate players killed by the Overtime Barrier
- Players killed this way become invisible and unable to
  move.
- Ends the match when one player is remaining.
2023-03-06 18:52:59 -08:00
James R
f2c806185e Cycle color of player TARGET between held emeralds 2023-03-06 18:52:53 -08:00
James R
18ccc3db27 Remove g_hiscore since it's not used anymore 2023-03-06 18:52:53 -08:00
James R
b023b16561 Remove WANTED over players' heads, TARGET wanted player 2023-03-06 18:52:53 -08:00
James R
20fe13deb7 HUD TARGET for Battle Kiosk, Monitors and Emeralds
Except in Break the Capsules, Boss mode or DUEL mode:

- When Overtime begins, all TARGETs are hidden and the
  Kiosk is targeted instead. Blue colored TARGET.

- TARGET player themself sees TARGETs on emeralds and
  monitors with emeralds inside. TARGET color matches
  emerald.
2023-03-06 18:52:53 -08:00
toaster
4802f96249 UCRP_TRIGGER: Convert to roundconditions_t
- Previously was extern scope UINT32 for all players, but this permits one player in a netgame taking a secret path while others don't.
- Attempted to make user-specifiable string, but while I can undo the effects of strtok for the condition, I cannot undo the effects of strupr - so it's disabled for now until we come up with a more robust and hopefully direct system.
- Also removed some old SRB2-originated assumptions that you couldn't unlock anything in multiplayer from the unlocktrigger system.
2023-03-07 00:03:41 +00:00
AJ Martinez
a7cc5aac78 Fix Lua interface mangling writes to sliptideZipBoost 2023-03-06 16:53:14 -07:00
AJ Martinez
2fb6bc5f46 Require 25% minimum handleboost to sliptide, change sliptide zip to 24% 2023-03-06 16:51:41 -07:00
Sal
fa430a6d41 Merge branch 'ranking' into 'podium'
Ranking

See merge request KartKrew/Kart!1017
2023-03-06 23:35:19 +00:00