Commit graph

47 commits

Author SHA1 Message Date
Eidolon
cb7f437e60 Merge public master 2025-02-13 15:48:11 -06:00
Eidolon
a4d304a1f5 Update copyright years to 2025 2025-02-13 15:32:26 -06:00
AJ Martinez
4cf38b3f3f Fix dodgy math in grow laser timer calculations 2024-06-29 18:38:45 -07:00
AJ Martinez
eab2900ac6 Increase shrink contact leniency 2024-05-20 18:47:22 -07:00
Sally Coolatta
08703be9d4 Shrink cooldown: 20sec -> 60sec 2024-05-20 17:19:42 -07:00
AJ Martinez
9dee22a7f6 Remove powerup timer debug print 2024-04-29 19:35:49 -07:00
AJ Martinez
fdf1be6a50 Grow/invinc tweakpass 2024-04-29 19:31:36 -07:00
toaster
6e9f53eab9 Correct pobby spawning for starting in reverse gravity but ending in normal gravity 2024-04-09 16:25:51 +01:00
Lach
f274d24560 Fix Poh-Bee behaviour for flipped waypoints 2024-04-09 23:34:18 +10:00
Sally Coolatta
747f09852d SRB2 -> DRRR copyright in objects folder 2024-04-05 10:26:52 -04:00
Oni
4de4c9e57d Merge branch 'pre-podium-music' into 'master'
Add pre-Podium intermission music

Closes #1084

See merge request KartKrew/Kart!2075
2024-03-10 21:08:11 +00:00
Sally Coolatta
9b93f56111 Add pre-Podium intermission music 2024-03-10 14:08:59 -04:00
James R
7a7ef7857a Shrink: store player ID on Pohbees, instead of mobj pointer
- Fixes owner being forgetten when they die (fly out of
  the kart)
2024-03-10 00:46:57 -08:00
AJ Martinez
9e76eed839 Don't SIGINT when doing shrink scaling (uninitialized cusval on gun) 2024-03-08 22:52:50 -07:00
AJ Martinez
ed6743911a Scale Shrink time to laser particle size 2024-03-08 22:15:22 -07:00
James R
8430489673 Replace darktimer/darkness with g_darkness
Modifies netsave.

- Instead of setting a timer, set a start time and end
  time
- Interpolated darkness value itself doesn't need to be
  netsynced
2024-01-05 15:56:24 -08: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
AJ Martinez
d3316ff614 Shrink growtime 2x, global darkness when using shrink 2023-09-01 20:40:52 -07:00
toaster
274e72ed2d Shrink Sync
Obj_CreateShrinkPohbees: Fix potential uninitialised memory being used that could cause a differing number of pobbys to spawn between client and server, causing an (extremely recoverable but still undesired) desync
2023-08-20 22:13:53 +01:00
James R
39f46a0f20 Replace music handling
(This commit does not compile. Sound test and tunes
command code needs to be ported after this.)

This is a big one. Here's the rundown:

The old music system was very direct, much of the time
just a proxy to the real sound API in i_sound.h.

You could change the music on command, but there wasn't
a consistent way to prevent some music from playing over
others. P_RestoreMusic is one example of needing to
address this problem. The jingles system was intended as
another solution. Furthermore, sound test (Stereo) has its
own needs.

I am removing all of that. Music handling in general is
now a very deliberate system, kind of similar to jingles.

In the new system, "tunes" are registered. The tune stores
info such as whether it should loop or fade out. Most of
the configuration is intended to be initialized only ONCE.
Tunes can be mapped to an actual music lump. They can be
remapped at any time too.

Tunes are also configured with a priority number. This
determines which tune is heard, if multiple are supposed
to be playing at a time. You can even tell a tune how long
it should play, so it's unnecessary to track this with
bespoke timers.
2023-08-06 17:31:45 -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
toaster
5c36e72115 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into rng-states-2
# Conflicts:
#	src/p_enemy.c
2022-09-24 20:29:53 +01:00
Sally Coolatta
58f56de7cc fuck you NULL targets? 2022-09-23 05:30:19 -04:00
Sally Coolatta
f89d8d15c2 Properly separate SPB & Shrink cooldowns
Also refactors some of the result -> type & amount code
2022-09-23 03:35:18 -04:00
Sally Coolatta
1563660a39 Add a few RNG classes
- PR_ITEM_ROULETTE: Used for item results
- PR_ITEM_RINGS: Flung ring direction
- PR_ITEM_SHRINK: Shrink gun offsets
- PR_PLAYERSTARTS: Battle mode player starts
- PR_TERRAIN: TERRAIN particles
- PR_DECORATION: Generic decoration
- PR_VOICES: Player voice sounds
2022-09-19 00:55:11 -04:00
Sally Coolatta
a60d4a13a1 RNG classes, take 2
Redone version of my old branch
2022-09-19 00:04:57 -04:00
Sally Coolatta
fe960530da Pohbee turns around when reaching the waypoint 2022-09-18 05:20:29 -04:00
Sally Coolatta
ab8126b706 Add Tyron's sound 2022-09-18 05:06:45 -04:00
Sally Coolatta
dc350a77df Remove old powerup warning option 2022-09-18 04:58:17 -04:00
Sally Coolatta
e610c41d0f Add Poh-Bee sprites 2022-09-18 04:33:03 -04:00
Sally Coolatta
8f38555a86 fixme for james :) 2022-09-16 00:06:02 -04:00
Sally Coolatta
01b1a9d3a7 Prevent poh-bees on no-respawn waypoints 2022-09-15 21:44:45 -04:00
Sally Coolatta
cb2d2cb2ba Cleanup objects properly 2022-09-15 20:03:32 -04:00
Sally Coolatta
c80f46f7c7 Reduce code duplication 2022-09-15 19:52:35 -04:00
Sally Coolatta
b1f9dd8264 Line up the laser visual better 2022-09-15 02:42:16 -04:00
Sally Coolatta
dc44196c49 Bigger laser shimmer 2022-09-15 02:27:20 -04:00
Sally Coolatta
e2e984ec14 More consistent chain length 2022-09-15 01:54:19 -04:00
Sally Coolatta
71723a803d Implement pohbee chain
Crashes when drawing the sprites after looking at it for like half a second and idk why tf
2022-09-15 01:03:08 -04:00
Sally Coolatta
cee2c25e27 Don't drop items from Shrink 2022-09-14 19:17:45 -04:00
Sally Coolatta
c65e5af718 Reduce grow add from lasers 2022-09-14 19:15:42 -04:00
Sally Coolatta
a4b63f3ffa Make shrink lasers add timer instead of resetting 2022-09-14 03:15:03 -04:00
Sally Coolatta
07f2932d3a Set owner of particle 2022-09-12 00:18:35 -04:00
Sally Coolatta
135b444b5e Fix bad shrink position 2022-09-12 00:06:04 -04:00
Sally Coolatta
b8bbdda1f3 Improvements from the netgame
- Double active time
- Increase height they spawn from
- Slow down swing speed the tiniest bit
- Add an extra 7 for first place
- Increase hitbox
- Make particles into hitbox
- Tweak item odds
2022-09-11 23:31:53 -04:00
Sally Coolatta
6aaa608299 Playable Shrink 2022-09-11 21:40:24 -04:00
Sally Coolatta
a74506690f More shrink foundation
- Keeps track of ties. If multiple Poh-Bees would go to the same waypoint, then it will combine them into a single one, with multiple lasers attached to it.
- Added the laser shooters. Still purely visual.
- Added despawn behavior.
2022-09-11 02:15:44 -04:00
Sally Coolatta
cf9bfcae02 Start on new Shrink
Currently just spawns an object that goes along the waypoint path
2022-09-10 21:44:40 -04:00