Commit graph

29136 commits

Author SHA1 Message Date
Antonio Martinez
e6091cc8b4 Start condition rework 2025-08-04 04:38:16 -04:00
Antonio Martinez
59ae7240f5 Don't consider speed in TA Ring Box bonus 2025-08-04 04:37:50 -04:00
Antonio Martinez
0468f1f988 Nudge some constants, startline startboost in TA 2025-08-04 04:37:50 -04:00
Antonio Martinez
6d020fca06 TA rebalance pass one fucktillion and two 2025-08-04 04:37:50 -04:00
Antonio Martinez
1457a16bd5 Merge up to master 2025-08-04 04:37:50 -04:00
Oni VelocitOni
5aa6af4f97 Merge branch 'spb-sliptide-disabled-during-switch' into 'master'
SPB Sliptide disabled during "Hot Potato" (Resolves #1596)

Closes #1596

See merge request kart-krew-dev/ring-racers-internal!2720
2025-08-04 05:32:26 +00:00
Oni VelocitOni
f37a1157f1 Merge branch 'finish-a-perfect-round-wording' into 'master'
"finish a perfect round" mentions Gear 1 (Resolves #1589 & #1410)

Closes #1589

See merge request kart-krew-dev/ring-racers-internal!2719
2025-08-03 21:53:13 +00:00
Oni VelocitOni
f0bc1071f9 Merge branch 'bot-minor' into 'master'
K_RetireBots revamp (resolves #1498, #1535, #1615, #1616)

Closes #1498, #1535, #1615, and #1616

See merge request kart-krew-dev/ring-racers-internal!2716
2025-08-03 21:53:07 +00:00
VelocitOni
c8ba383f22 SPB intangibility call fixes
SPB is intangible when "flashing" now, as in flashing WHITE during it's 'give up' LOL (this never happened before, it was purely visual, so my check was useless). SPB intangibility also now checks for just 0 instead of flashing. Works.
2025-08-03 17:52:14 -04:00
VelocitOni
c83decd4a2 Put the if statement where its actually happening
Moved the if statement to where the functions are actually being called for sliptide and 'dust'
2025-08-03 16:31:27 -04:00
VelocitOni
06d2843114 If *not*, not if...
I am an artist, not a coder
2025-08-03 15:58:29 -04:00
VelocitOni
211452456d Use SPB_intangible instead
Smaller if, catches more, put on the red tether dust too
2025-08-03 15:52:37 -04:00
toaster
7b134a1a90 Resolve #1616 2025-08-03 20:17:15 +01:00
VelocitOni
c6deb0a7b0 If "spb_swapcount" is GREATER than maxswaps, kill damaging stuff
I can make 200 frame sakuga animations but I can't read a simple statement
2025-08-03 14:59:07 -04:00
Oni VelocitOni
f0f33dfc7c Merge branch 'tripwire-lockout-vfx' into 'master'
Tripwire Lockout VFX's initial setup

See merge request kart-krew-dev/ring-racers-internal!2721
2025-08-03 18:30:58 +00:00
VelocitOni
259f0455ed Put it in more spots
Forgot the MT_ versions in a couple of spots. The actual MT_ in deh_tables now uses the actual sprite & not a placeholder
2025-08-03 14:16:49 -04:00
VelocitOni
1f14ac76bc Flip sign around
This might've meant it was still spawning sliptides when giving up after too much hot potato
2025-08-03 13:53:54 -04:00
VelocitOni
bd09ab2bec Merge branch 'master' into tripwire-lockout-vfx
# Conflicts:
#	src/info.c
#	src/info.h
2025-08-03 02:47:32 -04:00
VelocitOni
64592326ec SPB Sliptide disabled during SPBHotPotato
S.P.B.'s sliptide dust should be disabled during both regular target swapping & it's death animation; we've never actually seen the intended metagame of this as a result in Ring Racers. EVER.
2025-08-03 01:53:51 -04:00
VelocitOni
62e14fb2a3 Change some menu wording
"finish a perfect round" specifies above Gear 1, and Intense GP mentions top half instead of "4th" (because this changes in co-op)
2025-08-03 01:22:35 -04:00
Oni VelocitOni
07e7c00fb5 Merge branch 'cap-spindash-thrust' into 'master'
Cap spindash thrust according to max charge time

See merge request kart-krew-dev/ring-racers-internal!2717
2025-08-03 04:53:51 +00:00
Oni VelocitOni
cb1c00ae2b Merge branch 'reduce-bailstun-by-1-more-second' into 'master'
Lower bail-stun by 1 more second

See merge request kart-krew-dev/ring-racers-internal!2718
2025-08-03 03:58:23 +00:00
VelocitOni
9c428bad16 Lower bail-stun by 1 more second
Just 1 more second, feels like the appropriate sweetspot. I want people to like this button just a tiny bit more
2025-08-02 03:38:49 -04:00
Oni VelocitOni
14940276b8 Merge branch 'demeteor-spikes' into 'master'
De-meteor Spikes

See merge request kart-krew-dev/ring-racers-internal!2714
2025-08-02 05:06:35 +00:00
Antonio Martinez
4f45393c9b Cap spindash thrust according to max charge time 2025-08-02 00:06:33 -04:00
toaster
5da7e1612e Don't show "position" in GT_TUTORIAL tab rankings, as everybody's in 1st place all the time 2025-08-01 23:38:11 +01:00
toaster
9675dcfa2d Pretend that Eggman CPU in Rings tutorial is actually another local player for hudtracking purposes 2025-08-01 23:37:42 +01:00
toaster
4bbaab0381 K_RetireBots revamp (resolves #1615)
- All Shuffle Loser code first
- Replace all NOCONTESTed CPU per previous behaviour
- Fix "0"-prefixed character regression
- Instead of tying it to GP specifically, simply don't shuffle bots/players past the final (non-special) round of the Queue
2025-08-01 23:01:04 +01:00
toaster
1c6254c426 Anti-marbel-garden softlock
Stumble if you touch a spike while already flashing/spunout (and not just collided with it 2 tics ago)
2025-08-01 21:27:51 +01:00
Oni VelocitOni
1867079623 Merge branch 'jartha/mach-spheres-half' into 'master'
Nerf Phantom Cup Blue Spheres, 30 ring boost -> 10, each sphere awards 1 ring

See merge request kart-krew-dev/ring-racers-internal!2696
2025-08-01 16:00:48 +00:00
Oni VelocitOni
47248f2030 Merge branch 'bubble-mash' into 'master'
Bubble shield mash limit (resolves #1613)

Closes #1613

See merge request kart-krew-dev/ring-racers-internal!2712
2025-08-01 14:31:52 +00:00
toaster
d63d0279e6 Falling into infinite shrinkage in death pit should not do drift/tumble sounds/bounces
Discovered while testing Atlantis with improved spike behaviour
2025-08-01 15:08:46 +01:00
toaster
2726da8e86 MT_WALLSPIKE bumps are now literally reusing wallspring code
The code clearly *wanted* them to behave like wallsprings, but it was a mess so they were instead nuclear railguns. Now they're grey springs with damage but without tiregrease!

Also:
- Fixes pop-out wallspike interactions
- If a custom MF_SPRING has a "starcolor" (tiregrease stars) of SKINCOLOR_NONE, instead don't apply any tiregrease
2025-08-01 14:46:42 +01:00
toaster
763b9e970a P_DoSpringEx: Only permit new detaching from ground if the spring has a vertical component to its momentum 2025-08-01 14:02:51 +01:00
James R
1754ff0782 Mach Spheres: do not collect in stun 2025-08-01 01:10:12 -07:00
James R
fcf2dc1909 Mach Spheres: do not award rings in stun 2025-08-01 01:08:28 -07:00
Antonio Martinez
8c0f07ad6d Refactor bubble speed limit, trap duration 3.5sec, 6 inputs per second 2025-07-29 19:08:29 -04:00
Antonio Martinez
3e78ba17ac Bubble shield mash limit 2025-07-29 17:55:18 -04:00
Oni VelocitOni
efd7442c65 Merge branch 'bail-move-drain' into 'master'
Move bail ring drain to end of hitlag, bail stun reduction based on charge

See merge request kart-krew-dev/ring-racers-internal!2711
2025-07-28 06:44:39 +00:00
VelocitOni
2e516b0761 Even more forgiving
+ 125%
2025-07-27 18:17:44 -04:00
Ashnal
2b291c107f Remove debugprint 2025-07-27 15:10:57 -04:00
Ashnal
16628c59ca Rework logic ordering
fixes charge logic
2025-07-27 14:44:21 -04:00
Ashnal
371e34122a move bail ring deduction to after hitlag 2025-07-25 21:49:41 -04:00
Ashnal
5e4bd6adbb bailquake rename to bailhitlag 2025-07-25 21:16:04 -04:00
Oni VelocitOni
df9d4cf177 Merge branch 'ringbox-115-percent' into 'master'
Ringbox 115%

See merge request kart-krew-dev/ring-racers-internal!2709
2025-07-25 06:02:27 +00:00
VelocitOni
38951e892b Ringbox 115%
Made a change, we all tested on it, I didn't commit it and merged it. Has happened twice in my life now and I just don't understand why I do it
2025-07-25 02:00:38 -04:00
Oni VelocitOni
aabfe728c2 Merge branch 'recorrect-ringbox-buff-mistake' into 'master'
Ringbox now actually gives +10% more

See merge request kart-krew-dev/ring-racers-internal!2707
2025-07-25 05:50:19 +00:00
Oni VelocitOni
e7917b2f05 Merge branch 'change-public-server-wording' into 'master'
Advertising a Server & Voice Chat Menu Rewording

See merge request kart-krew-dev/ring-racers-internal!2705
2025-07-25 04:52:14 +00:00
Eidolon
4fd5f1f986 Fix remaining issues with voice cvar logic flip 2025-07-24 22:59:25 -05:00
Eidolon
4e7816c05c Merge public master 2025-07-24 22:52:12 -05:00