Commit graph

3153 commits

Author SHA1 Message Date
AJ Martinez
38c096a5cd Clean up failsafe queue condition 2023-11-05 04:40:44 -07:00
AJ Martinez
7ba7e2b076 Prevent failsafe briefly after taking damage 2023-11-04 23:42:26 -07:00
AJ Martinez
1667ca591e Don't failsafe when twerking 2023-11-04 23:22:03 -07:00
AJ Martinez
c9d72499f1 Allow half-speed turning for side tricks 2023-11-04 22:56:58 -07:00
AJ Martinez
961372540a Flame Shield SFX, flame/lightning rescale 2023-11-04 20:43:27 -07:00
toaster
75d8f1539c HUD refinement for Rings tutorial
- Hide roundscore outside of GTR_POINTLIMIT
- Hide position number in K_Cooperative
    - Tutorial should have counted as K_Cooperative when implemented, fix that now
2023-11-04 23:59:17 +00:00
AJ Martinez
4db18b1225 Easier ballhog tapfire 2023-11-03 22:51:14 -07:00
Oni
6e6c0cd71f Merge branch 'ballhog-descam' into 'master'
Ballhog fixups (+ sound cleanup)

See merge request KartKrew/Kart!1590
2023-11-03 03:13:13 +00:00
Oni
b20fb26c04 Merge branch 'hanagumi-ringbox' into 'master'
Hanagumi Hall ring vent overflow (resolves #745)

Closes #745

See merge request KartKrew/Kart!1591
2023-11-03 03:12:35 +00:00
AJ Martinez
0ca7897327 Remove sliptide sound fix (revisit later) 2023-11-02 07:11:02 -07:00
AJ Martinez
506ab31f7f Mania-style time trials 2023-11-02 06:51:51 -07:00
toaster
263c968cc8 Fix the Hanagumi Hall ring vent overflow
The way the cap was being handled was kind of messed up, and was trying to subtract your existing Super Ring count.
But because the datatype doesn't support negative numbers, it rolled under to approx UINT16_MAX!
Fix the datatypes and add the extra over-range check to prevent this from happening again.
2023-11-02 11:24:54 +00:00
AJ Martinez
143320b577 Misc item fuckery 2023-11-01 23:11:24 -07:00
toaster
32c40dd7d6 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into will-it-blend 2023-10-29 22:05:58 +00:00
AJ Martinez
429f84f6b6 Fix bad null check for sliptide zip indicator 2023-10-29 15:02:05 -07:00
Oni
fc982e84fd Merge branch 'duel-items-in-bonus' into 'master'
Spawn Duel items in GP Bonus

See merge request KartKrew/Kart!1584
2023-10-29 16:07:29 +00:00
toaster
388b14e956 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into will-it-blend
# Conflicts:
#	src/k_podium.c
2023-10-29 12:36:30 +00:00
AJ Martinez
1a75bc2e00 Fix Duel Bonus items being shortcircuited in P_AllowMobjSpawn 2023-10-29 05:28:45 -07:00
Oni
d79f723138 Merge branch 'flame-shield-fixups' into 'master'
Flame Shield fixups

See merge request KartKrew/Kart!1585
2023-10-29 06:17:22 +00:00
Oni
f5c1180095 Merge branch 'turn-solver-leniency' into 'master'
Sliptide/drift exit cleanup

See merge request KartKrew/Kart!1576
2023-10-29 06:08:22 +00:00
Oni
8557a7250f Merge branch 'prison-difficulty' into 'master'
Prison difficulty modes

See merge request KartKrew/Kart!1583
2023-10-29 06:07:42 +00:00
AJ Martinez
79a2c9a61d Flame Shield fixups 2023-10-27 21:05:18 -07:00
toaster
c673bb3ea9 K_PointLimitForGametype: Fix up cv_pointlimit handling
- K_Cooperative is 1st priority
- K_CanChangeRules is 2nd
2023-10-25 18:08:31 +01:00
AJ Martinez
b2349ed6bf Spawn Duel items in GP Bonus 2023-10-24 01:44:56 -07:00
AJ Martinez
dbe25d8be4 Fix Prisons difficulty to respond to GP settings 2023-10-23 19:55:54 -07:00
AJ Martinez
5cdedd53ba Prisons: respond to game difficulty 2023-10-22 17:16:04 -07:00
AJ Martinez
730f788a07 Sliptide SFX perf optimization 2023-10-22 01:51:58 -07:00
AJ Martinez
395675e5b0 Fix whip input lockout on instant use items 2023-10-21 22:01:08 -07:00
AJ Martinez
6ad7c7692c Sliptide/drift exit cleanup 2023-10-21 19:50:21 -07:00
AJ Martinez
3f8b557d5e Whip fixups #69 2023-10-21 18:05:49 -07:00
toaster
d8e6e1d1a4 UC_TOTALTUMBLETIME
`Condition1 = TotalTumbleTime 30*TICRATE
"tumble through the air for 30:00"

Also makes all the time-based non-playing Conditions use get_number so TICRATE can be provided
2023-10-19 20:22:17 +01:00
toaster
42233cfb9e UCRP_GROWCONSECUTIVEBEAMS
- Condition1 = GrowConsecutiveBeams 4
- "touch the blue beams from your own Shrink at least 4 times before returning to normal size
2023-10-19 19:44:37 +01:00
toaster
0478d9a2e3 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into break-through-them-all 2023-10-19 17:32:35 +01:00
AJ Martinez
f0d0a0f07b Reset player lap when they reset to track 2023-10-17 22:18:49 -07:00
AJ Martinez
5235408b0e Update respawn waypoint on fastfall bounce 2023-10-17 21:31:20 -07:00
toaster
a6ef8d357c UCRP_DRAFTDURATION
"consistently draft off other racers for [parameter] seconds"
Actually counts leniency tics too, but if the leniency hits 0 it gets reset.
2023-10-18 02:32:46 +01:00
toaster
417afd0ac9 UCRP_FALLOFF, UCRP_TOUCHOFFROAD, UCRP_TOUCHSNEAKERPANEL, UCRP_RINGDEBT: Don't flag if it happens to the player after they exit
UCRP_FALLOFF, // Fall off (or don't)
 UCRP_TOUCHOFFROAD, // Touch offroad (or don't)
 UCRP_TOUCHSNEAKERPANEL, // Either touch sneaker panel (or don't)
 UCRP_RINGDEBT, // Go into debt (or don't)
2023-10-18 00:27:44 +01:00
toaster
acad8754c8 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into break-through-them-all 2023-10-17 23:32:08 +01:00
toaster
9e1aec4298 UCRP_RETURNMARKTOSENDER
"when cursed with Eggmark, blow up the racer responsible"
Just a simple condition. Either it happens or it doesn't.
MT_SPBEXPLOSION now tracks whether it was made by KITEM_EGGMAN or KITEM_SPB, too!
2023-10-17 22:25:47 +01:00
toaster
54137ad468 Eggmark fixes
- Update eggmanblame on K_EggmanTransfer
    - Currently blames the bumper, but could blame the source's eggmanblame if we wanted to change that
- Use K_FlipFromObject for correct reverse gravity placement
2023-10-17 22:19:16 +01:00
toaster
3e494a342c UCRP_GACHABOMMISER
Break a target (Prison Egg/UFO) using exactly one Gachabom again and again
Becomes invalid if an Insta-Whip collides with a target, or you throw two at the same time
2023-10-17 21:09:22 +01:00
James R
905592003d Add K_SetTireGrease, spawn spring grease VFX and set tiregrease 2023-10-14 21:28:11 -07:00
James R
c87ffeba29 Loops: try to position player so hitbox edge touches loop radius
Large enough momentum will still position the player
beyond the loop radius initially. This is intentional so
that there is no jerk when entering the loop. Without
a more sophisticated algorithm to revolve asymmetrically,
this is the best I can do. The player is guaranteed to
exit at the correct position, though.
2023-10-14 21:28:11 -07:00
Oni
97ddaba295 Merge branch 'charge-instawhip' into 'master'
More flexible instawhip

See merge request KartKrew/Kart!1551
2023-10-15 01:40:43 +00:00
AJ Martinez
763a7e03bf Charge instawhip test fixes 3 2023-10-14 18:25:03 -07:00
AJ Martinez
17cfff1dfd More lenient whip charge tether 2023-10-14 17:42:14 -07:00
AJ Martinez
1eab3a6838 More whip tuning 2023-10-14 16:09:21 -07:00
AJ Martinez
b67aa8af4f Charge instawhip test fixups 2 2023-10-14 05:56:42 -07:00
AJ Martinez
0b341a02aa No charging whip with rocketsneakers 2023-10-13 23:41:14 -07:00
AJ Martinez
2320d46de1 Increase held-input whip charge delay 2023-10-13 21:33:07 -07:00