Commit graph

23445 commits

Author SHA1 Message Date
James R
1184e6d674 Battle: win by having enough points when you kill a player 2023-06-29 23:32:17 -07:00
Oni
e6ba45e558 Merge branch 'fix-emerald-overtime-crash' into 'master'
Fix Overtime Barrier crash

See merge request KartKrew/Kart!1315
2023-06-30 06:23:30 +00:00
Oni
5a48dbc875 Merge branch 'dont-pickup-powerups' into 'master'
Don't pickup power-ups if you are flashing or (s)tumbling; fix Stumble damage floors

See merge request KartKrew/Kart!1314
2023-06-30 06:16:33 +00: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
Oni
0c94ce41eb Merge branch 'battle-ufo' into 'splitscreen-timer'
Battle: Power-up UFO

See merge request KartKrew/Kart!1308
2023-06-30 06:08:37 +00:00
James R
38f9922aa1 Fix crash from trying to spawn emerald sparkles on emeralds or monitors killed by the Overtime Barrier 2023-06-29 23:08:32 -07:00
James R
38c5703020 Add Battle UFO to minimap 2023-06-29 23:01:27 -07:00
James R
8b33c45cbd Fix Stumble damage floors damaging the player 2023-06-29 22:40:09 -07:00
James R
42f140399f Don't pickup power-ups if you are flashing or (s)tumbling 2023-06-29 22:39:51 -07:00
Oni
c8e260a1b0 Merge branch 'restart-level-above-resume' into 'master'
Pause menu: move Retry Map/Try Again directly above Resume Game

See merge request KartKrew/Kart!1312
2023-06-30 05:29:23 +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
SteelT
06acc1c07f Spawn powerup orb on death
Spawns random powerup
2023-06-29 22:22:00 -07:00
SteelT
dae2142fbe Fix UFO beam spawn height on scaled maps 2023-06-29 22:22:00 -07:00
SteelT
6e33281baf Despawn UFO after touching the ground 2023-06-29 22:22:00 -07:00
SteelT
41ca397881 Don't thrust player if the UFO is dead 2023-06-29 22:21:59 -07:00
SteelT
30adb8559e Increase UFO height 2023-06-29 22:21:28 -07:00
SteelT
fd56b67b1b Battle UFO instawhip damage 2023-06-29 22:21:28 -07:00
SteelT
cfe1e44428 No player contact damage
Make UFO solid
2023-06-29 22:21:28 -07:00
SteelT
ad3c2e0b21 UFO spawns 250 units above the spawner instead 2023-06-29 22:21:28 -07:00
SteelT
dd958dd502 Make UFO beam fullbright 2023-06-29 22:21:28 -07:00
SteelT
bf394f1f38 UFO beam spawning behavior
- Spawned from underneath the UFO and is thrusted downwards
- Is spawned as splats instead of papersprites
- Colorized to sapphire
- Despawns on any ground contact
2023-06-29 22:21:28 -07:00
SteelT
275358e394 Increase UFO radius 2023-06-29 22:21:28 -07:00
SteelT
c836d27448 Thrust player if they are under the UFO 2023-06-29 22:21:24 -07:00
Oni
83602df24a Merge branch 'super-flicky-fixes' into 'splitscreen-timer'
Fixes for Super Flicky

See merge request KartKrew/Kart!1311
2023-06-30 05:20:44 +00:00
James R
34b65a7c59 Add K_TranslateTimer, get the correct timer value for time limit; use this function for splitscreen timer 2023-06-29 21:44:31 -07:00
Oni
36bb219196 Merge branch 'more-powerups' into 'splitscreen-timer'
Battle: add remaining power-ups, Aura and HUD

See merge request KartKrew/Kart!1310
2023-06-30 04:24:07 +00:00
Oni
45d1d2cd48 Merge branch 'battle-cusp' into 'master'
Battle: small balance changes (also setspheres command)

See merge request KartKrew/Kart!1313
2023-06-30 04:16:19 +00:00
James R
b91489bec2 Power-up HUD: use player color as colormap 2023-06-29 21:10:25 -07:00
James R
427ab44471 Add setspheres command 2023-06-29 21:01:13 -07:00
James R
5546f7e7a7 Battle: spawn sphere boxes even less frequently, 2x -> 16x 2023-06-29 21:01:05 -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
9f3bee528a Battle: spawn 3 monitors at most 2023-06-29 21:01:03 -07:00
Oni
6ed75443ce Merge branch 'more-menu-bgs' into 'master'
Added all of Chengi's new menu backgrounds

See merge request KartKrew/Kart!1306
2023-06-30 03:54:19 +00:00
James R
a8134c89f2 Pause menu: move Retry Map/Try Again directly above Resume Game 2023-06-29 20:07:53 -07:00
SteelT
3ef583040e Add shadow to Battle UFO
Also add it to the CD SS ufo per request
2023-06-29 19:49:36 -07:00
James R
d3d6d4d671 MT_BATTLEUFO_SPAWNER: spawn with thing number 3786
Binary maps: angle becomes args[0] (ID for spawning order)
2023-06-29 19:49:36 -07:00
James R
f5d68783fc Battle UFO spawning behavior
- MT_BATTLEUFO_SPAWNER args[0] is the ID
- Spawn a random UFO from the list spawner at the start of
  Battle
- UFO spawns 200 units above the spawner
- After destroyig a UFO, wait 25 seconds before spawning
  the next UFO (next ID in the list)
2023-06-29 19:49:35 -07:00
James R
2ce05f018e Add g_battleufo global, add to netsave 2023-06-29 19:49:18 -07:00
SteelT
a24e9bb19f Add basic Battle UFO object functionality 2023-06-29 19:49:17 -07:00
SteelT
68f1626256 Add Battle UFO body/leg states and objects 2023-06-29 19:49:02 -07:00
James R
adaec93c44 Super Flicky: don't whip your own flickys 2023-06-29 19:41:11 -07:00
James R
6e80957e4f Super Flicky: fix erroneous timer past flicky exit 2023-06-29 19:41:11 -07:00
James R
da80096a67 Super Flicky: pad timer to compensate for exit time 2023-06-29 19:41:11 -07:00
James R
81dab762ff Add power-up HUD
- Power-up icons are sorted by time remaining, most to
  least, left to right
2023-06-29 19:37:22 -07:00
James R
c01a29c42a Add Power-Up Aura
- Spawns on player when they use their first power-up
- Lasts as long as player has any power-up
- A hexagon of animated, additive, fullbright papersprites
  surround and move with the player, takes player's angle
2023-06-29 19:37:22 -07:00
James R
b97dede82c kartitems_t: add ENDOFPOWERUPS and NUMPOWERUPS 2023-06-29 19:37:22 -07:00
James R
d747f31225 Add Power-Up Aura states
MT_POWERUP_AURA
SPR_RBOW
S_POWERUP_AURA
2023-06-29 19:31:27 -07:00
James R
47a5a0b6dc Add Rhythm Badge power-up, no instawhip cooldown 2023-06-29 19:31:27 -07:00
James R
065475ea29 Add Bumper power-up, give 5 bumpers to the player 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