Commit graph

2516 commits

Author SHA1 Message Date
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
James R
1184e6d674 Battle: win by having enough points when you kill a player 2023-06-29 23:32:17 -07:00
Oni
da2e745bf7 Merge branch 'splitscreen-timer' into 'master'
Splitscreen level timer HUD

See merge request KartKrew/Kart!1309
2023-06-30 06:08:52 +00:00
James R
d8afc7597d Add K_FlingPaperItem, split off random thrust functionality
Battle UFO drops do not fling.
2023-06-29 22:22:00 -07:00
James R
17da46eda5 K_PointLimitForGametype: Battle, each player is worth 4 PTS, reduced from 5 2023-06-29 21:01:04 -07:00
James R
47a5a0b6dc Add Rhythm Badge power-up, no instawhip cooldown 2023-06-29 19:31:27 -07:00
James R
dafdb0fc10 Add K_GiveBumpersToPlayer, subset of K_TakeBumpersFromPlayer functionality 2023-06-29 19:31:27 -07:00
James R
ba114022b9 Add Barrier Power-Up
- Guard is always up, not activated by e-brake or spheres
- Guard can still be broken by player contact
- No instawhip cooldown from Guard being up
- No sphere loss while Guard is up
- Guard appears at max size
2023-06-29 19:31:27 -07:00
James R
e67ab6a116 Spawn Guard visual when player spawns, do not tie spawning to e-brake
Object already handles turning invisible if player has no
Guard.
2023-06-29 19:31:27 -07:00
James R
b0b7bf8185 Add S-Monitor power-up
- Give Invincibility effect to player
- Bumping players does not extend Invincibility time while
  power-up is active
2023-06-29 19:31:27 -07:00
toaster
f6ea3759c9 K_GlanceAtPlayers: Special handling for stopped players in Podium
1st: Look straight at camera, no matter what
2nd, 3rd: Look at any players with a better position, no matter how far away they are
Loser Valley: Stare forward like the serfs you are
2023-06-28 20:42:36 +01:00
toaster
e7ee979f1a Horncode
A much more focused replacement for Hornmod, specc'd out by Tyron and Oni working together and implemented by the author of this commit because it's pretty funny.

- Followers have `hornsound` in their SOC configuration.
    - The default sound for all followers without a provided one is sfx_horn00.
- They'll play this sound if you use lookback with one following you, and there's nearby players to get the player looking all the way around.
    - Only the players who are successfully considered for lookback will hear it.
- Has a v1-like visual with less randomisation, but still netsynced.
- Also controlled by the cvar `taunthorns`, which, like `tauntvoices`, takes "Tasteful" (default), "Meme", and "Off".

TODO: make the condition for horn a little delayed, so you have to hold lookback for a little bit.
2023-06-28 17:54:23 +01:00
toaster
1429a91cd9 Increase maximum # of Followers
Surprisingly easy as it requires negative values to mark "None", so it was already out of the range of UINT8
2023-06-28 16:36:36 +01:00
Oni
f393b9782b Merge branch 'super-flicky' into 'master'
Battle: Super Flicky power-up, give power-up command, general functions for interfacing power-ups (also Lua)

See merge request KartKrew/Kart!1301
2023-06-28 00:31:53 +00:00
James R
919c669863 Drop power-ups when whipped
- Dropped power-ups become paper items (overloaded to
  store power-ups instead of items).
- The dropped power-up stores its remaining duration.
- The power-up can be picked up during any state.
  - If you already have the same kind of power-up, the
    duration is simply extended.
2023-06-27 02:08:07 -07:00
James R
a0b0891009 Add K_DropPaperItem, split from K_DropItems but with custom item type and amount 2023-06-27 01:12:01 -07:00
James R
d737387132 Add flickyAttacker and powerupvars_t to player_t, add to netsave 2023-06-27 00:50:40 -07:00
AJ Martinez
c71bb7092e Merge remote-tracking branch 'origin/master' into ringbox 2023-06-26 19:19:21 -07:00
AJ Martinez
c495106ee5 Ringbox: playtest fixups 2023-06-26 19:02:39 -07:00
AJ Martinez
0a6bac0dcc Ringbox: HUD, transform time define, ring-box-only, scaling rewards 2023-06-26 17:36:41 -07:00
AJ Martinez
45547607bd Ringbox: item respawn refactor + box visuals 2023-06-26 06:36:37 -07:00
AJ Martinez
f371a21258 Ringbox proto functionality 2023-06-25 23:18:06 -07:00
James R
aa82d8da77 Instawhip Recharge VFX
- 3 splats spawn before the instawhip cooldown runs out
- Splats angle steeply outward in a triangle formation
- VFX is animated, animation runs out right when instawhip
  cooldown completely runs out
2023-06-18 01:57:03 -07:00
Sally Coolatta
7842032eee Split ringbox stuff from itembox stuff 2023-06-16 05:55:33 -04:00
Oni
d0bee29f1a Merge branch 'servant-hand' into 'master'
Servant Hand

See merge request KartKrew/Kart!1294
2023-06-15 20:19:32 +00:00
toaster
fa10ff629f servant-hand.c 2023-06-15 19:39:55 +01:00
toaster
1fee9f65fb Servant Hand
- Points in the direction of the best waypoint to take
- Vwoops in and out like a drop target squash-n-stretch
- Shows WRONG WAY only on debugwaypoints
- Flexible enough to be used for custom purposes and other gametypes, the only caveat being if those gametypes use GTR_CIRCUIT conflicting with the other purpose of PF_WRONGWAY
2023-06-15 18:46:44 +01:00
Sally Coolatta
a8467a22ce Fix speedometer in outrun mode 2023-06-15 12:12:41 -04:00
AJ Martinez
a18f84255b Ring Box items aren't real items 2023-06-14 23:59:45 -07:00
AJ Martinez
28a65043f9 Autofire Ring Box items 2023-06-14 23:45:20 -07:00
AJ Martinez
41540ed9e5 WIP: Ring Box 2023-06-14 23:32:31 -07:00
Sally Coolatta
d936c7aed9 Milky Way terrain
`OutRun 48.0` on Terrain block will make that texture add 48 units to driving top speed.
2023-06-14 10:29:19 -04:00
Sally Coolatta
cd37542edf Improve Item Capsule spawning
- Spawn them after player count has been calculated properly.
- Move gametype spawning into its own argument. Now instead of 1 flag that said it inverted Time Attack spawning but ACTUALLY just made it spawn in all modes, there's flags for the two gametypes which can be combined. Not setting any will use the old default behavior (rings are in both modes, items are multiplayer-only).
2023-06-14 07:13:26 -04:00
Oni
908d84b44b Merge branch 'whip-shadow' into 'master'
Whip shadow + polish

See merge request KartKrew/Kart!1282
2023-06-13 06:29:14 +00:00
AJ Martinez
c2f6c89eb4 Fix fastfall lockout not occurring if you were actually fastfalling 2023-06-12 15:35:04 -07:00
AJ Martinez
2dcfd9542f Instawhip polish round bleven 2023-06-11 20:29:43 -07:00
AJ Martinez
5be40749d4 Only do whip cooldown tether suppress if you could actually whip 2023-06-06 20:21:49 -07:00