Commit graph

2616 commits

Author SHA1 Message Date
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
AJ Martinez
4d97c4b51f Charge whip test fixups 2023-10-13 20:51:03 -07:00
AJ Martinez
17a9d39877 Fix final-ring whip charge delay edge case 2023-10-13 18:54:56 -07:00
AJ Martinez
c41b8e97da Fix instawhip charge lockout conditions 2023-10-13 18:34:34 -07:00
AJ Martinez
22d09d8a4a No eggbox whip charge 2023-10-13 18:05:40 -07:00
AJ Martinez
2a0f9da975 More instawhip tuning cleanup 2023-10-13 17:36:06 -07:00
AJ Martinez
f36e699398 Instawhip reject vfx first pass 2023-10-13 17:09:25 -07:00
AJ Martinez
85641036ea Clean up whip/guard timing defs 2023-10-13 03:19:24 -07:00
AJ Martinez
8fced1890b Fix up guard conditions 2023-10-13 03:16:54 -07:00
AJ Martinez
6ae427447c No stored whip after Gachabom rebound collect 2023-10-13 03:03:23 -07:00
AJ Martinez
3e5a5baf50 Charge instawhip QoL 2023-10-13 02:48:28 -07:00
AJ Martinez
a9ec1cea68 WIP: Instawhip charge input 2023-10-13 02:23:28 -07:00
toaster
f8de2cfc83 UC_PRISONEGGCD
Gamedata minor version was updated again.
(God this was a weirdly big amount of work and it's not even polished.)
- Condition1 = PrisonEggCD [Level that has to be unlocked]
- Approximately every 30 Prison Eggs destroyed, you get a shot at a Prison Egg Drop.
    - The only Prison Egg Drop implemented right now is an Alt Music CD.
    - Your [Wild Prize] is guaranteed to be selected only from conditions associated with levels that are unlocked!
- Only spawns in Grand Prix Bonus Rounds, for netsync and game design.
- The number is fuzzed. If you start the level with 0 Prison Eggs to destroy, it selects a random number of Prisons in the level to bust.
- If you miss the pickup (such as into a deathpit), you'll get another shot in the immediate next Bonus Round you play.

Also:
- The number of Chao Keys you start your gamedata with is now part of the header file, not buried in the wiping function.
- Removed the ACTUAL last object definition vestiges of the Emerald Hunt gamemode.
2023-10-12 21:12:08 +01:00
toaster
3fe7a76c5e Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into break-through-them-all 2023-10-09 12:28:52 +01:00
James R
fa89576f34 Move freecam state to camera_t, lets splitscreen players use freecam independently of each other 2023-10-08 14:26:21 -07:00
toaster
8c734d3646 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into break-through-them-all 2023-10-07 12:42:07 +01:00
Lat
dc6bb1bfa9 solve conflicts and update to master 2023-10-07 11:15:47 +02:00
toaster
e96bae393c Ancient Shrine implementation beginning
- Players will glance at Ancient Shrines near/behind them.
- Look back at these Shrines to activate your follower's horn!
    - Currently, this even works if horns are turned off, as a sort of tutorial.
    - TODO: A special horn will be able to activate them...
2023-10-05 23:07:46 +01:00
James R.
7b3010c93d Fix many instances of splitscreen view number if there are duplicate displayplayers
- Avoid iterating displayplayers to find view number and
  prefer R_GetViewNumber.
- Iterate over all matching displayplayers if necessary,
  instead of stopping at the first match.
2023-10-03 21:28:33 -07:00
James R.
d5bac57409 Ring sting indicator: show for owner player as well 2023-10-03 21:28:33 -07:00
Lach
7cd059dfb3 Merge remote-tracking branch 'origin/master' into hardcode-chaos-chute 2023-09-29 22:41:31 +10:00
Lach
2bdc055139 Scale Chaos Chute objects 2023-09-29 20:27:13 +10:00
toaster
a68a0b0135 All other modified files: Trailing whitespace cleanup 2023-09-26 22:51:58 +01:00
toaster
bee1cb9a04 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into rideroid-hardcode
# Conflicts:
#	src/sounds.c
2023-09-26 21:39:19 +01:00
Lach
7a8bb8ec40 Hardcode Chaos Chute objects 2023-09-24 22:29:52 +10:00
Lat
df31c65ebb Hardcode these godforsaken turbines 2023-09-23 16:32:32 +02:00
Sally Coolatta
91955b1383 Broly screen shake is done on the source object
Screen shake was being done from the Broly vfx, which does scaling shenanigans so it caused Proximity Mine explosions to make the camera go apeshit.

I'm also pretty sure the hitlag calcs Proximity Mine did for the broly effect was wrong, not sure though? I'm trying something else and I think it's better.
2023-09-23 07:57:55 -04:00
Lat
058a1c03b5 Seasaw defs, variables + new function to sanitize checks for my hardcoded mess 2023-09-23 12:48:52 +02:00
Oni
d0b16f2025 Merge branch 'bot-nerfs' into 'master'
Track-based bot difficulty

See merge request KartKrew/Kart!1482
2023-09-23 03:28:43 +00:00
Sal
bb8499b43d Track-based bot difficulty 2023-09-23 03:28:43 +00:00
AJ Martinez
958aa6bccb Stronger underwater sliptiding 2023-09-22 18:58:34 -07:00
Lat
a565d923c0 Hardcode these cursed seasaws 2023-09-22 18:14:38 +02:00
Lat
fb91a9a0f7 DLZ rocket hardcode 2023-09-21 15:42:10 +02:00
Lat
5a6ecd051a Fix conflict in cmakelist w/ master merge 2023-09-20 17:17:33 +02:00
Lat
9b432381c6 Finalize Bungee hardcode 2023-09-20 15:03:45 +02:00
Lat
ea8e871176 LSZ bungee: first pass 2023-09-20 14:42:39 +02:00
James R.
307fd0eb71 K_FastFallBounce: use consistent bounce strength, regardless of Shrink/Grow 2023-09-18 11:42:52 -07:00
James R.
37ce3dba27 E-Brake ring: visual consistency and polish
- Always spawns on the ground below the player
- If falling fast enough, spawn afterimages around the
  player like "falling through hoops"
- Also fix scaling to Shrink/Grow
2023-09-18 11:42:52 -07:00