Commit graph

2952 commits

Author SHA1 Message Date
James R
2c8b889eee Apply sprzoff to Jawz reticle
Fixes alignment for UFO Catcher, and probably Garden Top.
2023-08-12 18:52:06 -07:00
James R
943086a902 K_TimerInit: disable POSITION in FREE PLAY 2023-08-12 16:38:01 -07:00
James R
ba77b97aaa K_SpawnKartMissile: try to step down for stairs 2023-08-12 16:19:17 -07:00
AJ Martinez
7a2841c407 "debugstart" cvar to skip POSITION/intro 2023-08-12 15:35:10 -07:00
James R
57a73dd1b0 K_SpawnKartMissile: interpolate Z position to standingslope 2023-08-12 14:51:17 -07:00
Oni
fe0de60369 Merge branch 'fix-water-missile-spawn' into 'master'
K_SpawnKartMissile: fix Z position at large step up and on top of water FOF

Closes #570

See merge request KartKrew/Kart!1383
2023-08-12 16:40:54 +00:00
James R
e75204a899 Replace instances of itemRoulette.active = false with K_StopRoulette
Properly clear ringbox state so it doesn't override egg
transfer item HUD.
2023-08-11 19:21:59 -07:00
James R
f154acde3a Merge branch 'crack' into 'master'
Reenable underwater wavedashing

See merge request KartKrew/Kart!1378
2023-08-11 23:10:26 +00:00
James R
20e0856268 K_SpawnKartMissile: fix Z position at large step up and on top of water FOF
- Fix missile teleporting onto the other side of a very
  large step up.
  - Such as when firing very close to a wall created by
    a change in sector floor height.
  - Or when firing close to a solid midtexture.

- Fix missiles teleporting below water FOFs, if fired
  while the player is water skipping or skiing on top of
  the FOF.
2023-08-11 14:51:31 -07:00
VelocitOni
581542c1c0 Nerf ringboost slightly
middleground between master and old value
2023-08-11 04:34:23 -04:00
AJ Martinez
e4ce30ed48 Reenable underwater wavedashing 2023-08-11 01:33:32 -07:00
Oni
21d00050a6 Merge branch 'quiet-ring-spam' into 'master'
Reduce ring sound volume as it's repeated

See merge request KartKrew/Kart!1370
2023-08-11 07:23:52 +00:00
VelocitOni
8f01f15540 Ringboost speedlines takes a lot longer to turn gold
TICRATE/3 -> TICRATE/6
2023-08-11 01:17:06 -04:00
VelocitOni
3283ced078 Stacked excess ring time = more power
x1.5 times stronger juice from excess rings stacked
2023-08-11 00:59:54 -04:00
James R
e89ecc7a2d Merge branch 'music-technology' into 'master'
Replace music handling

See merge request KartKrew/Kart!1369
2023-08-08 22:19:36 +00:00
AJ Martinez
91d6fecaf9 Don't always register the fucking cvar 2023-08-07 19:20:57 -07:00
AJ Martinez
4b0a9ce7a6 Register the fucking cvar 2023-08-07 19:19:59 -07:00
AJ Martinez
bf48f64a5c Reduce ring sound volume as it's repeated 2023-08-07 05:59:06 -07: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
4cfa163cf5 Save a math operation sometimes 2023-07-31 03:15:27 -07:00
AJ Martinez
0d3b6c57b0 Don't ringboost-scale speedlines past 2x (3x with tripwire leniency) 2023-07-31 03:04:13 -07:00
AJ Martinez
0c45500901 Ring Box dopamine 2023-07-30 22:15:50 -07:00
Oni
1325bf7afa Merge branch 'slow-degrease' into 'master'
Slower players lose springgrease faster (resolves #242)

Closes #242

See merge request KartKrew/Kart!1360
2023-07-29 18:45:37 +00:00
Oni
e9cea99ae7 Merge branch 'dashrings' into 'master'
Hardcode MT_DASHRING & MT_RAINBOWDASHRING

See merge request KartKrew/Kart!1345
2023-07-29 18:29:08 +00:00
AJ Martinez
1a6b8d49ea Allow flameshield gauge to quickly grow on acquisition 2023-07-29 05:18:36 -07:00
AJ Martinez
6607722b64 Simpler 120-tic flame shield behavior 2023-07-29 05:10:14 -07:00
AJ Martinez
dc39566acf Clarify degrease magic number 2023-07-29 03:53:04 -07:00
AJ Martinez
424cda41d4 Slower players lose springgrease faster 2023-07-29 03:51:46 -07:00
toaster
16e036a0bd Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into dashrings 2023-07-28 23:12:06 +01:00
Oni
e2aea58474 Merge branch 'louder-wavedash' into 'master'
Play wavedash sounds at full volume

See merge request KartKrew/Kart!1348
2023-07-23 17:22:36 +00:00
toaster
e0b47b16e7 Improve Spectator entry handling
- Re-entry SHOULDN'T get stuck nonzero on first join for a given node
    - Set to 0 for all players on level start
    - Set to 0 for all players on level end
    - DEFINITELY never intentionally set on join with teamchange finalisation
    - This basically just prevents people from spamming New Challenger after hopping out mid-session, since the previous version, in addition to being buggy, was a little annoying.
- New Challenger no longer happens on tic 0 of mapload
    - Handles any late, pending PF_PF_WANTSTOJOINs without threat of reset in P_PostLoadLevel
2023-07-22 14:03:11 +01:00
AJ Martinez
5d144243e5 Play wavedash sounds at full volume 2023-07-21 00:48:41 -07:00
Lach
bb5070afb0 Merge remote-tracking branch 'origin/master' into dashrings 2023-07-20 19:04:42 +10:00
Lach
a21e509a94 Hardcode MT_DASHRING & MT_RAINBOWDASHRING 2023-07-19 21:47:41 +10:00
toaster
ce08ac0f33 General tidy of mobj_t pointers on player_t struct
- CL_ClearPlayer
    - Delete followmobj, stumbleIndicator, and sliptideZipIndicator
    - Wipe flickyAttacker and powerup.flickyController
- G_PlayerReborn
    - Properly destroy the Follower and its bubble overlays, etc
    - Ensure ringShooter pointer is kept
    - Delete followmobj, stumbleIndicator, and sliptideZipIndicator
    - Wipe flickyAttacker and powerup.flickyController
- P_PlayerThink
    - Ensure all invalid pointers are erased, even on hitlag frames
2023-07-18 15:50:39 +01:00
toaster
e6619df2d4 Servant Hand: Refactor to use its own thinker
Since it's already ticking for the sake of a fuse, make it handle its own movement/scaling as well.

Spawning is still handled by the player thinker (and can be blocked by hitlag), but this permits it to disappear when a player dies/disconnects the server.
2023-07-18 15:45:49 +01:00
VelocitOni
30d21e960a Merge branch 'master' into hit-stop-efx
# Conflicts:
#	src/objects/ufo.c
2023-07-03 06:24:27 -04:00
James R
e94ae5bfef K_BattleAwardHit: evaluate win condition before adding points 2023-07-03 06:20:21 -04:00
AJ Martinez
1c633dd9ee Direct players to battle UFOs via Obj_PointPlayersToXY 2023-07-03 06:20:19 -04:00
James R
a98db957e6 WANTED player or Lightning Shield attracts emeralds 2023-07-03 06:20:19 -04:00
AJ Martinez
30207327c7 Use only Ring Box in SPB Attack 2023-07-01 15:43:41 -07:00
Sally Coolatta
5067bb854a Split hitlag into its own file 2023-06-30 23:05:40 -07:00
Sally Coolatta
98841e5c15 Calc scale once + ignore 0 tics 2023-06-30 23:04:34 -07:00
Sally Coolatta
4a98afc273 Set up future code for multi-sparks 2023-06-30 23:04:34 -07:00
Sally Coolatta
8c273039ab Add first pass at hitlag EFX
Only 9-tic animation is here currently, so hitlag is forced to 9 tics for testing.
2023-06-30 23:04:33 -07:00
James R
4f972588b4 K_BattleAwardHit: evaluate win condition before adding points 2023-06-30 21:35:15 -07:00
AJ Martinez
f8131cbd4e Direct players to battle UFOs via Obj_PointPlayersToXY 2023-06-30 19:58:02 -07:00
James R
43aa03bfc3 WANTED player or Lightning Shield attracts emeralds 2023-06-30 19:58:02 -07:00
Oni
219f3407cb Merge branch 'small-battle-fix-friday' into 'master'
Don't Guard Break when damage state player collides; remove invincibility effect when dropping "S" power-up

See merge request KartKrew/Kart!1317
2023-06-30 09:04:20 +00:00
James R
d4b0ee21ab Don't Guard Break if other player is in pain state 2023-06-30 00:47:14 -07:00