Commit graph

21469 commits

Author SHA1 Message Date
James R
eb41362195 K_RunPaperItemSpawners: always give monitors 3 item types 2023-06-30 19:58:02 -07:00
James R
ea6db0a561 Draw MMAPDOT in front of players' facing angles on the minimap 2023-06-30 19:58:02 -07:00
James R
313d2f8fd2 During Overtime: point Servant Hand to Battle Kiosk, stop pointing to UFOs 2023-06-30 19:58:02 -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
James R
96eb60ee63 Don't pickup emeralds if in pain state 2023-06-30 19:58:02 -07:00
James R
99091036fb Kill Battle UFOs outside of the Overtime Barrier 2023-06-30 19:58:02 -07:00
James R
835981d299 Battle: scale Overtime Barrier to minimap size 2023-06-30 19:58:02 -07:00
James R
506e0c58c8 Always shrink Overtime Barrier in 30 seconds 2023-06-30 19:58:02 -07:00
James R
8ef03f29e5 K_SpawnOvertimeLaser: only move laser height with player if player goes above the top of the lasers 2023-06-30 19:58:02 -07:00
James R
cd87a8c59d Give Overtime Lasers infinite draw distance 2023-06-30 19:58:02 -07:00
James R
a387189487 Don't steal bumpers unless below 3 bumpers or dealing STEAL damage (sneakers) 2023-06-30 19:58:01 -07:00
James R
b1b0e579d0 Battle: power-up time 20 -> 30 seconds, UFO respawn 25 -> 20 seconds 2023-06-30 19:55:02 -07:00
James R
d4a0cdd3c0 Sphere Box: use extravalue2 for sphere count
extravalue1 is already used by timer
2023-06-30 17:07:25 -07:00
James R
5b27d2a84e Battle: time limit 2 -> 3 minutes 2023-06-30 04:04:33 -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
4c30b84588 Fix "S" extending invincibility timer on hit 2023-06-30 01:23:37 -07:00
James R
e03e1aff0c K_DropPowerUps: remove invincibilitytimer along with "S" 2023-06-30 01:23:17 -07:00
Oni
571fe1a903 Merge branch 'noplaybackmedals' into 'master'
demo.playback guard

Closes #567

See merge request KartKrew/Kart!1307
2023-06-30 07:58:33 +00:00
James R
5d4ec59a33 K_DropPowerUps: refactor to use more lambdas 2023-06-30 00:48:08 -07: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
609b0c0ae0 MT_FLOATINGITEM: check P_PlayerInPain before picking up power-ups 2023-06-30 00:46:52 -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
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
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