Commit graph

2240 commits

Author SHA1 Message Date
James R
b2fb1b4ccd Make timelimit cvar seconds based
Easier for activating Overtime Barrier. Previously would
have to wait a minute at minimum :sandevastated:
2023-03-02 22:07:11 -08:00
toaster
884f03c043 Merge branch 'fix-grow-music' into 'master'
Fix powerup music inconsistencies (resolves #460)

Closes #460

See merge request KartKrew/Kart!1001
2023-03-02 14:37:21 +00:00
AJ Martinez
746171a8ad Fix powerup music inconsistencies 2023-03-02 02:47:29 -07:00
toaster
ac086fe09a K_PuntMine: Same MF_NOCLIP change regression fix 2023-03-01 19:03:51 +00:00
Oni
ec4c74c10e Merge branch 'race-start-stuff' into 'master'
Race start stuff

See merge request KartKrew/Kart!996
2023-03-01 18:28:37 +00:00
toaster
13a987a0a2 Move starting countdown sounds to p_tick.c
Fixes an issue where the starting countdown wouldn't play in spectator mode or hitlag
2023-03-01 16:32:23 +00:00
James R
393cf6e7f3 Don't let the player use the item button until completely finished respawning 2023-03-01 07:43:23 -08:00
toaster
c5a6d1169c Merge branch 'desperation-leniency' into 'master'
More friendly desperation spindash

See merge request KartKrew/Kart!983
2023-02-27 11:37:32 +00:00
AJ Martinez
4d8a1c1d27 Desperation spindash unique sound, no longer blows up at 2x speed 2023-02-26 19:00:27 -07:00
AJ Martinez
b0ae0b55db Fix music restart when stacking Grow from item box 2023-02-26 18:07:00 -07:00
AJ Martinez
2cbc035411 Make Grow less irritating (allow stack, don't insta strip from shrink) 2023-02-26 17:25:28 -07:00
AJ Martinez
afb82e7990 Pause Grow/Invinc/Rocket timers in midair 2023-02-26 15:51:01 -07:00
Oni
dbc7b27051 Merge branch 'longer-eggbox' into 'master'
Eggmanexplode 4*TICRATE -> 6*TICRATE

See merge request KartKrew/Kart!977
2023-02-26 02:58:29 +00:00
AJ Martinez
3212a97547 Eggmanexplode 4*TICRATE -> 6*TICRATE 2023-02-25 19:26:58 -07:00
VelocitOni
ffae37e619 Normalize Gardentop tether
Removed Gardentop from hasinfinitetether
2023-02-25 21:13:24 -05:00
Oni
912e062efa Merge branch 'battle-points' into 'master'
Battle points changes

See merge request KartKrew/Kart!962
2023-02-26 00:08:25 +00:00
Oni
97ab743506 Merge branch 'timelimit-auto' into 'master'
Refactor timelimit and pointlimit to use an "Auto" option

See merge request KartKrew/Kart!969
2023-02-25 23:46:28 +00:00
James R
67062bb920 Merge branch 'refactor-pointlimit' into 'master'
Refactor pointlimit to be delayed until next round, just like timelimit

See merge request KartKrew/Kart!966
2023-02-25 07:33:25 +00:00
James R
ea4890b4b3 Simplify bumper death code flow 2023-02-24 23:21:47 -08:00
James R
01227814b9 Refactor Battle points cap to use g_pointlimit
Fixes players leaving mid-game lowering the point limit
and instantly ending the match.

see 94c811b55
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
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
d76a10f2fa Merge branch 'block-tripwire-abuse' into 'master'
Tripwire anti-cheese

See merge request KartKrew/Kart!968
2023-02-24 08:48:54 +00:00
AJ Martinez
9b5bd70cae Briefly lock out TRIPWIRE_BLASTER after failing a tripwire 2023-02-24 00:30:21 -07:00
AJ Martinez
2cc02f43fd Double-speed spindash at 0 rings, remove Battle spindash buffs 2023-02-23 23:49:24 -07:00
James R
917acfd16b Refactor pointlimit to be delayed until next round, like timelimit 2023-02-23 18:37:30 -08: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
AJ Martinez
00aa69ca0a Buff eggbox speed, allow contact transfers 2023-02-21 23:00:56 -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
James R
1f496e05ec Refactor objects/orbinaut.c for Gacha Bom
- Add flags variable to toggle much of Orbinaut behavior.
- Don't spawn afterimages for Gacha Bom.
- Animate facing angle of Gacha Bom when thrown backward.
- Let tossed Gacha Bom drive forward after landing.
2023-02-20 20:57:17 -08:00
AJ Martinez
4d9af8d478 Fix typo causing crash on tumble interrupt 2023-02-20 19:36:08 -07:00
Oni
a096f10236 Merge branch 'normalize-magician-box-offsets' into 'master'
Normalize magician box offsets

See merge request KartKrew/Kart!941
2023-02-18 23:47:33 +00:00
James R
ba908edf55 Add player sprzoff to Heavy Magician Box 2023-02-18 14:49:38 -08:00
James R
8fae89cb9a Make K_SpawnMagicianParticles offsets consistent across different mobj scales 2023-02-18 14:40:27 -08:00
James R
ecec400ca4 NULL check Garden Top when throwing backward 2023-02-18 01:21:22 -08:00
James R
8ab2962830 Nullify Garden Top friction at +200% 2023-02-17 23:55:28 -08:00
James R
b89b3cb6a7 Blue sparks skin color Sapphire -> Blue
Blue
2023-02-17 01:40:27 -08:00
Oni
e9668598d2 Merge branch 'splitplayers-mapcommand' into 'master'
Splitplayers Fixes

Closes #408

See merge request KartKrew/Kart!927
2023-02-17 05:11:15 +00:00
Oni
a7a3a2c5d5 Merge branch 'special-out' into 'master'
Special Out

See merge request KartKrew/Kart!921
2023-02-17 05:04:34 +00:00
toaster
c4b008e17e Merge branch 'fix-mobj-reference-counting' into 'master'
Fix negative mobj reference counts all over the place

See merge request KartKrew/Kart!926
2023-02-17 00:56:39 +00:00
James R
aaffc84242 Merge branch 'frozen-position-number' into 'master'
Update positiondelay during hitlag

See merge request KartKrew/Kart!922
2023-02-17 00:56:28 +00:00
toaster
472d7bf25c Match old behaviour of GTR_BOSS: DMG_TIMEOVER a player that has lost all their bumpers 2023-02-16 17:04:59 +00:00
toaster
1b2be7b6c9 K_CheckBumpers, K_HandleBumperChanges: Make 2P behaviour in battle capsules mode function
- Only exit Capsules/Versus round if number of players with no bumpers is equal to number of players in game.
- Apply Eliminated flags in relevant context, to prevent griefing.
2023-02-16 16:35:52 +00:00
James R
701324fb42 k_kart.c: reference count HOLD bubble 2023-02-14 04:17:04 -08:00
AJ Martinez
9c3bcd44c7 Update positiondelay during hitlag 2023-02-13 16:01:19 -07:00
toaster
98c333e313 Per discussion, always use short, FINISHless exit for special stage failure. 2023-02-13 18:18:54 +00:00
toaster
8b14d10506 Special Stages: Distinguish between failures with and without lives.
- With lives remaining: No FINISH text, 1 second before restart
- With no lives remaining: Yes FINISH text, 2 and a half seconds before return to menu(/emeraldless podium when implemented)
2023-02-13 18:03:56 +00:00