Commit graph

23476 commits

Author SHA1 Message Date
James R
82cf995e35 Kill Battle UFOs outside of the Overtime Barrier 2023-07-03 06:20:18 -04:00
James R
4d24eb71b6 Battle: scale Overtime Barrier to minimap size 2023-07-03 06:20:18 -04:00
James R
8931c7f570 Always shrink Overtime Barrier in 30 seconds 2023-07-03 06:20:18 -04:00
James R
2eaf17f9d7 K_SpawnOvertimeLaser: only move laser height with player if player goes above the top of the lasers 2023-07-03 06:20:17 -04:00
James R
c1d54f50f5 Give Overtime Lasers infinite draw distance 2023-07-03 06:20:17 -04:00
James R
9c8ce17c1e Don't steal bumpers unless below 3 bumpers or dealing STEAL damage (sneakers) 2023-07-03 06:20:17 -04:00
James R
d34760b7bf Battle: power-up time 20 -> 30 seconds, UFO respawn 25 -> 20 seconds 2023-07-03 06:20:16 -04:00
James R
2f021344d9 Battle: time limit 2 -> 3 minutes 2023-07-03 06:20:16 -04:00
James R
655b5decb5 writetextmap: save waypoints correctly, account for risers and anchors 2023-07-03 06:20:16 -04:00
James R
7def36aaeb Split apart some of P_WriteTextmap 2023-07-03 06:20:16 -04:00
James R
19eae9f95a P_ConvertBinaryThingTypes: convert dash rings (not yet hardcoded) 2023-07-03 06:20:15 -04:00
VelocitOni
b1054f486e Added level 8 hitsparks
Added level 8 hitsparks, 2 more to go. Gonna take MR out of draft though and do the other 2 later.
2023-07-03 06:15:03 -04:00
AJ Martinez
c0d025c1c4 Fix stagger off-by-one in hitstop VFX 2023-07-01 18:52:57 -07:00
AJ Martinez
5f30f99c62 Fix duration clamping in hitlag VFX 2023-07-01 18:07:26 -07:00
VelocitOni
25c0ff738c Added stages 4, 5, and 6 of hitsparks, maxhitlag 30
Now the amount of hitsparks is 7, need to do 3 more.
2023-07-01 20:48:20 -04: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
VelocitOni
8c53e56f3b Set up the states for stages 1-3
Just got them ready for putting in :cantfuckingtakeit: why do you have to touch so many fucking spots for a sprite???
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
Gunla
a8a8d375c3 Merge branch 'fix-sphere-box' into 'master'
Fix Sphere Boxes not awarding spheres

See merge request KartKrew/Kart!1319
2023-07-01 02:22:43 +00: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
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
Oni
6e22ab5fa6 Merge branch 'battle-win-by-kill' into 'master'
Battle: win by having enough points when you kill a player

See merge request KartKrew/Kart!1316
2023-06-30 07:48:08 +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
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