Commit graph

1312 commits

Author SHA1 Message Date
wolfy852
4c780d8867 Hardcoding: Cloud logic 2024-01-10 20:38:31 -08:00
toaster
325079a39a Delete everything major flagged up by listunusedsprites
Notable deletions:
- Metal Sonic Race
    - Includes all the specialised recording/playback apparatus which made g_demo.c harder to read
- A bunch of hyperspecialised code inside several A_ actions
- EXCEPTION: intentfully left in the spriteless SMK stuff for Sal's add-on down the line.
2024-01-11 01:21:43 +00:00
James R
45eeb94513 Insta-Whip: pop player shield 2024-01-08 19:01:19 -08:00
AJ Martinez
f092e9283c Fix Invincibility extensions, uh, 2024-01-06 06:06:59 -07:00
AJ Martinez
0a9787054f Increase sphere pity when hit (5->10) 2024-01-06 05:25:55 -07:00
AJ Martinez
dd71c81b24 Battle: reduce damage hitlag + monitor hitlag 2024-01-06 01:56:27 -07:00
Oni
10f8bb5a3f Merge branch 'battle-release' into 'master'
Battle is (almost) ready for release

Closes #681

See merge request KartKrew/Kart!1788
2024-01-06 06:08:28 +00:00
James R
2bdb7d4349 Battle UFO: power-up drops take player momz, pick up immediately 2024-01-05 20:59:18 -08:00
James R
07e53b7b50 Battle: lose 5 spheres on guard instead of 10 2024-01-05 18:34:02 -08:00
Eidolon
61db93db0c Hardcode Joypolis trick balloons 2024-01-05 17:56:38 -06:00
Oni
0f468c4634 Merge branch 'auto-medal-times' into 'master'
Add automedal time configs and calculation

Closes #790

See merge request KartKrew/Kart!1777
2024-01-05 23:01:24 +00:00
toaster
e9b7ed8101 Intentfully permit gaps between Emblem IDs
Introduces ET_NONE, to match SECRET_NONE for Challenges
2024-01-05 20:50:54 +00:00
AJ Martinez
4a557010db Fix top being dropped when players hit your items 2024-01-02 23:57:47 -07:00
AJ Martinez
a3e09b3c7f Further nerf invinc time return 2023-12-31 19:01:51 -07:00
AJ Martinez
288a0a389f Reduce base invinc hit extension 2023-12-31 18:44:36 -07:00
AJ Martinez
6bedafc028 Invinc: GUNSTAR SOUND BABY 2023-12-31 18:34:39 -07:00
AJ Martinez
a2cfacfc2a Rebalanced Invinc 2023-12-31 17:34:25 -07:00
toaster
a15f6280d7 UCRP_TRACKHAZARD fixes
- describe as "course hazard", not "track hazard", to match updated player-facing lingo
- Add rudimentary handling to allow achievement in Prison Break, Versus
2023-12-27 15:16:03 +00:00
James R
8a54edf204 Obj_TryCrateDamage: return bool 2023-12-22 19:05:12 -08:00
toaster
fa6beeaaea GT_TUTORIAL: Allow MT_RANDOMITEM to respawn 2023-12-18 17:27:47 +00:00
toaster
97f39abef3 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into tutorial-pass 2023-12-09 17:33:47 +00:00
James R
b68947e636 Hardcode Endless Mine faucet / rain
- Note: rain does not use the weather system
2023-12-08 17:42:17 -08:00
James R
69541b9422 Hardcode bustable rocks -- Angel Island + Endless Mine 2023-12-08 17:42:17 -08:00
toaster
7d313af4db MT_ITEMCAPSULE: In GT_TUTORIAL, only respawn after 5 seconds 2023-12-08 22:18:13 +00:00
James R
5cba9d63b3 Hardcode Lost Colony Fuel Canisters 2023-12-07 19:19:02 -08:00
James R
c5968ad3ad Hardcode Ice Cap Blocks 2023-11-27 05:07:30 -08:00
James R
aec21cd114 Hardcode SA2 Crates 2023-11-27 05:07:30 -08:00
James R
b773fb9b33 P_DamageMobj: reformat if-statement into switch-case 2023-11-27 05:07:30 -08:00
AJ Martinez
bcf59845e3 Prison bonus time: fix a shitton of bad math 2023-11-26 20:27:04 -07:00
AJ Martinez
119f309cb8 Scale Prison bonus time to remaining time and difficulty 2023-11-26 15:34:11 -07:00
James R
401321e310 Hardcode Ivo Balls 2023-11-25 05:35:06 -08:00
James R
9ff174dd06 Hardcode Frozen Production Frost Throwers (ceiling and horizontal versions) 2023-11-22 23:53:14 -08:00
Oni
fa7b2f2076 Merge branch 'fix-sourceless-capsule-kills' into 'master'
Capsule followers use target flags if no source (fixes crash)

See merge request KartKrew/Kart!1645
2023-11-19 05:14:54 +00:00
AJ Martinez
263b73be38 Capsule followrs use target flags if no source (fixes crash) 2023-11-18 21:56:32 -07:00
toaster
a55803b690 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into other-progression 2023-11-18 18:00:05 +00:00
Oni
9a5515fb31 Merge branch 'empty-kart-fixes' into 'master'
Fix dead karts creating terrain splashes indefinitely; remove fuse but let them be killed

Closes #748

See merge request KartKrew/Kart!1631
2023-11-17 09:32:09 +00:00
Oni
c24f10a7e7 Merge branch 'fix-bungee-softlock' into 'master'
Add Obj_EndBungee, end bungee state when P_ResetPlayer and when player is damaged in any way

Closes #760

See merge request KartKrew/Kart!1641
2023-11-17 09:06:06 +00:00
James R
686f2e2e9d Add Obj_EndBungee, end bungee state when P_ResetPlayer and when player is damaged in any way 2023-11-17 00:49:26 -08:00
AJ Martinez
5e92177262 Try to keep death frames on-screen 2023-11-16 14:42:15 -07:00
toaster
97996d1a22 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into other-progression 2023-11-16 13:46:59 +00:00
James R
72f1414432 MT_KART_LEFTOVER: remove fuse, let it be killed
Gets punted into the air when it's killed.
2023-11-15 20:03:47 -08:00
Oni
38a6ac33f0 Merge branch 'fix-shield-ring-spill' into 'master'
Fix losing rings even with a shield out; fix losing Garden Top before you even activate it

See merge request KartKrew/Kart!1625
2023-11-16 00:32:05 +00:00
AJ Martinez
d54d2f6d04 Merge remote-tracking branch 'origin/master' into catholic-vfx 2023-11-14 21:47:51 -07:00
James R
19cd35a10f P_DamageMobj: do not spill rings if player has shield 2023-11-14 20:33:09 -08:00
James R
cd2219f605 P_PlayerRingBurst: check player->curshield directly, handles Garden Top correctly 2023-11-14 20:32:22 -08:00
James R
61cad641bb Invincible player punts hazardous/solid things, unless MF_ELEMENTAL
If player is in one of these states:

- Invincibility
- Grow (K_IsBigger)
- Flame Shield dash
- Over 200% speed

And the other object:

- Does not have MF_DONTPUNT

Then, touching a solid object:

- Punts the object, unless the object has MF_ELEMENTAL
- Fizzles the object, if the object has MF_ELEMENTAL

Or, when an object damages the player:

- That object is punted, unless it has MF_ELEMENTAL
- The object fizzles, if it has MF_ELEMENTAL

Punting means:

- A copy of the object is made
- Both the player and copy receive 5 tics of hitlag
- The copy is thrust away from the player at a minimum of
  60 FU, or 2x either the player's or object's momentum,
  whichever is ultimately greater
- The copy despawns after 2 seconds
- The copy flickers constantly, while thrust away

Fizzling means:

- The object disappears completely
- A puff of smoke is spawned in place of the object
- No hitlag is applied to the player

Both punting and fizzling:

- Hide the original object (intangible and invisible)
- The original object reppears after 30 seconds
- For 2 seconds before reappearing, the object flickers
  back in, but is still intangible
2023-11-13 22:18:35 -08:00
James R
39a7c3b3ad Remove MF_MONITOR 2023-11-13 19:23:54 -08:00
toaster
4f5997fbe6 Make players die in deathpits in GTR_CHECKPOINTS 2023-11-13 16:28:54 +00:00
toaster
83cf97bdad Fix Tutorial's automatic death-to-retry pipeline
Also makes PF_ELIMINATED work in non-bumpers gametypes... it wasn't gametyperule-dependent previously so Elimination could use it one day, and it doesn't break Sealed Stars to do it this way
2023-11-13 16:27:04 +00:00
toaster
3805a4d5f0 Adjust Prison followers based on feedback...
- Exist for 1.5 seconds before disappearing
    - Flickers away in the last half second
- Twice as many spawned, at half the size
- Different arc
    - Severely reduced gravity
    - Don't jump if they hypothetically touch the floor
2023-11-12 23:51:44 +00:00