Commit graph

2530 commits

Author SHA1 Message Date
Sally Coolatta
f4e14f5fe3 Faster ring respawn once again 2023-04-29 12:33:15 -04:00
James R
efcdfbe665 Fix some instances of boolean not being set to true exactly 2023-04-24 18:14:37 -07:00
James R
56dcfaedf8 Respawning: set MF2_OBJECTFLIP directly in P_GetMobjGravity
K_RespawnOffset is called before the player is actually at
the waypoint's position, so even if P_GetMobjGravity is
called there to check, it reflects the player's current
sector, which may not necessarily be the waypoint's
sector.
2023-04-24 18:13:37 -07:00
toaster
b0cb804fe4 Merge branch 'faster-cam-z' into 'master'
Improve camera Z following

See merge request KartKrew/Kart!1197
2023-04-24 22:35:09 +00:00
Sally Coolatta
85eaf2eeea Make camera follow platform momentum 2023-04-23 14:51:29 -04:00
toaster
af288571bd P_SetupEmblem: Correct flags *before* Obj_AudienceInit 2023-04-21 17:37:26 +01:00
toaster
945a00df6e Permit emblem pickups that take on the visage of a Follower
- If Global-type map emblem has GE_FOLLOWER, attempt to take on the appearance of the follower specified by var2.
    - Unlike MT_RANDOMAUDIENCE, this picks whether the object should be floating or hopping based on the specified mode of the source Follower.
    - Always chooses to face the nearest player.
- Rearrange some properties affected by Obj_Audience/audience.c to not conflict with MT_EMBLEM
2023-04-21 15:17:43 +01:00
toaster
8878bf8465 P_SetupEmblem: Only call Tag_FGet once, and store the result for loop iteration/error messages 2023-04-21 15:12:06 +01:00
toaster
1e5fadc901 Audience-related functions: Rename + adjust
- Since they're not necessarily going to be randomised, make the prefix Obj_Audience instead of Obj_RandomAudience.
- Externalise some properties that we may not want affecting all hypothetical uses.
    - Flag auto-application should be done externally, since this won't be general.
    - Focusing on player should be controlled by the function call, not an ambiguous flag.
2023-04-21 15:09:07 +01:00
toaster
a74b7995c9 Implement Follower Audience object
- Replaces Chao audience entirely
    - Convenient, because one of the two default follower types used in the audience is Chao
- Can provide one follower, or a list of followers, on the stringarg1 (seperated by spaces/commas) and it'll pick randomly between them
    - If not provided, uses the mapheader follower list
- Can provide one skincolor, or a list of skincolors, on the stringarg2 (seperated by spaces/commas) and it'll pick randomly between them
    - If not provided, uses the follower's default color
    - If the follower's default color is Match/Opposite or the user provides "Random" in stringarg2, pick a random skincolor
- If arg3 is set, floats in the air
    - MTF_OBJECTSPECIAL in binary format
- If arg4 is set, faces the closest player
    - MTF_AMBUSH in binary format
    - Uses some funny mathematical tricks to avoid checking on the same frame as every other audience member at once
2023-04-20 23:15:56 +01:00
toaster
9eacdb4be4 P_SetupSpawnedMapThing: Catch more P_MobjWasRemoved 2023-04-20 22:58:50 +01:00
Sally Coolatta
4e7b6f0cc3 Add ring shooter tire grabbers + more player logic 2023-04-17 00:23:08 -04:00
Sally Coolatta
319cee4afa Move ring shooter to its own file 2023-04-17 00:23:07 -04:00
Lach
f9317b265e Correct Ring Shooter countdown 2023-04-17 00:22:09 -04:00
lachablock
a458490639 Ring Shooter: countdown animation & experimental stretchy spawn 2023-04-17 00:22:08 -04:00
lachablock
c98ff9616b Start Ring Shooter respawn: while e-braking, enter the respawn command to spawn a Ring Shooter. Currently purely visual and does not despawn. Steals the player's face for funsies. 2023-04-17 00:22:07 -04:00
toaster
4edae065cb MT_RANDOMITEM: Fix Prison Break/Versus delayed spawn
`leveltime`'s behaviour was changed, and this code was fragile and dependent on the old behaviour
2023-04-14 20:58:54 +01:00
Oni
d6d8cf548a Merge branch 'optimize-precip-think' into 'master'
Optimize precipitation by eliminating the thinker entirely

See merge request KartKrew/Kart!1157
2023-04-09 05:31:31 +00:00
James R
9eab5317f3 Stop calling P_NullPrecipThinker
In levels with tens of thousands of precipmobjs, the
overhead of running a thinker for all of them is too much,
no matter how small the thinker is.

ALL thinking is done inside the renderer now, where it can
be limited by distance. Precipmobjs track the last
leveltime they thunk, so interpolated frames don't think
twice.
2023-04-08 13:34:42 -07:00
Sally Coolatta
010fc344df Add equivalent of "Each Time" triggers for ACS 2023-04-06 18:05:05 +01:00
James R
652fb5452e MF_NOCLIPHEIGHT: remove restrictions on first-person camera
Fixes spectator noclip camera being clamped to
floor/ceiling heights.
2023-04-02 05:22:17 -07:00
James R
56694b2740 Merge branch 'udmf-riser' into 'master'
Add foflayer field to UDMF things, spawn offset from a specific FOF in the thing's sector

Closes #417

See merge request KartKrew/Kart!1120
2023-04-02 07:27:51 +00:00
James R
1c9ccab159 Use foflayer when spawning mapthings
- foflayer offsets the thing from an FOF in its sector.
  - foflayer 0 uses the base sector heights.
  - foflayer 1 uses the lowest FOF top height, or highest
    FOF bottom height when the thing is flipped.
  - foflayer 2 uses the second lowest / second highest and
    so on.
2023-03-29 22:23:56 -07:00
James R
75d5c5b68f Move P_GetMobjSpawnHeight to p_mapthing.cpp 2023-03-29 20:21:57 -07:00
James R
ed0d3adccc Don't render item capsule numbers mirrored in Encore mode 2023-03-29 19:09:45 -07:00
Sal
83b5b26a12 Merge branch 'packet-hack' into 'master'
Experimental: Improve level load processing

See merge request KartKrew/Kart!1077
2023-03-28 23:41:33 +00:00
James R
04bc0b6b9d Add fuse to Emeralds in Battle, same as dropped items 2023-03-23 19:39:28 -07:00
Oni
b9bbb6cb8a Merge branch 'conditions-cascading' into 'master'
Conditions Cascading

Closes #366

See merge request KartKrew/Kart!1053
2023-03-23 23:51:30 +00:00
Chromatian Keiske
fd122e7d62 Merge branch 'paranoia-mobj-reference-count' into 'master'
Tune up PARANOIA warnings for mobj reference count

See merge request KartKrew/Kart!1070
2023-03-23 08:11:04 +00:00
Gunla
6f6df2cfe2 Merge branch 'fix-perpetual-damage-floor-respawn' into 'master'
Reset TERRAIN when respawning

See merge request KartKrew/Kart!1068
2023-03-23 01:00:49 +00:00
Sally Coolatta
ffb65a3583 Experimental: Improve level load processing
- P_PreTicker ("defrosting") is dead. Levels now actually start on tic 0 instead of tic 2.
- Netxcmds are ran before G_Ticker, instead of after.
- All netxcmds are required to be processed before the level will finish loading (up to 5 gametics, to prevent any possible lock-up from malicious clients).
2023-03-22 10:59:29 -04:00
AJ Martinez
312e847151 Merge branch 'fix-faulty-mobj-references' into 'master'
Fix faulty references for monitors and players

See merge request KartKrew/Kart!1071
2023-03-22 07:43:37 +00:00
Gunla
9b1179518a Merge branch 'blue-target' into 'master'
Give Drop Target a weaker state when thrown forward

Closes #471

See merge request KartKrew/Kart!1049
2023-03-22 00:37:44 +00:00
James R
a396ffe676 Init mobj references before mobj specific spawning in P_SpawnMobj
Fixes MT_MONITOR leaking references due to
Obj_MonitorSpawnParts called before P_AddThinker.

Thanks to toaster
2023-03-20 20:00:10 -07:00
James R
d0719ef5ba Fix mobj reference management of player->mo
Thanks to toaster
2023-03-20 20:00:10 -07:00
James R
67f4505a06 Revert "Add cv_scrambleremoved, disable scramble on P_RemoveMobj"
This reverts commit a55ddef528.
2023-03-20 19:57:00 -07:00
James R
509a023329 PARANOIA: add debug to P_SetTarget if references go negative
Prints mobj address, mobj type, thinker function,
reference count and source code line number.
2023-03-20 19:57:00 -07:00
James R
abc11fc16f Reset TERRAIN when respawning
Fixes damage floor TERRAIN applying for the entire
duration of lightsnake.
2023-03-19 22:40:43 -07:00
toaster
4c0077e07c Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into conditions-cascading 2023-03-19 13:01:06 +00:00
toaster
bfbbfc2842 Merge branch 'prison-ufos' into 'master'
Prison UFOs

See merge request KartKrew/Kart!1060
2023-03-19 13:00:31 +00:00
James R
dc024b874b Morph Drop Target from forward thrown white to lime
Blends from white into lime over 27 tics.
2023-03-19 03:52:25 -07:00
Gunla
b8f3c7e357 Merge branch 'fastfall-with-speed' into 'master'
Scale fast fall momentum with speed at time of trigger

See merge request KartKrew/Kart!1047
2023-03-18 23:00:06 +00:00
toaster
81e880464a CD Special Stage UFO changes
- MT_CDUFO is now a valid type of Prison in Prison Break
    - Tracked on counter
    - Tracked on HUD
    - Tracked on minimap
- P_AddBrokenPrison in p_inter.c
    - Generalises behaviour on breaking a Prison Break object
- MT_CDUFO polish
    - Can now be broken with all damaging objects EXCEPT Shield Orbinaut/Shield Jawz
        - These two are exceptions to prevent them from denying you your on-contact item grab., which these will still give you if you touch them
    - Breaking the object by touching it now causes hitlag instead of fireworks
        - The fireworks were to make touching it feel good... but hitlag feels better :P
    - Now supports mapobjectscale directly.
    - Scaled 1.5x mapobjectscale
    - Hitbox now far closer to actual sprite (which was just replaced, but was inexplicably far away from the old one too)
2023-03-18 00:22:44 +00:00
toaster
fcfaf1321c Flame shield polish
- MT_FLAMESHIELD: Flicker dispoffset depending on whether frame is supposed to be behind or in front of player
- MT_FLAMESHILEDUNDERLAY: Use P_SpawnMobjFromMobj to match interpolation coordintes, any other relevant properties, etc
2023-03-17 21:31:50 +00:00
toaster
a134465e65 S3K Shields: remove splitscreen-dependent mobj position behaviour
Was especially egregrious for bubble shield, which literally has a hitbox and could've caused live desync.
2023-03-17 21:27:19 +00:00
toaster
2e1efaff0c Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into conditions-cascading
# Conflicts:
#	src/k_battle.c
#	src/k_hud_track.cpp
#	src/k_kart.c
#	src/p_inter.c
2023-03-14 21:59:19 +00:00
James R
f390ff26ec Scale fast fall momentum with speed at time of trigger
Previous was 4x gravity. Now 3x at the lowest, scales up
to around 8x at 200% speed (can go further).
2023-03-13 20:11:53 -07:00
James R
1f70b9c63c Merge remote-tracking branch 'origin/bumpers-ARE-health' 2023-03-13 00:51:44 -07:00
Sal
073b787a82 Merge branch 'fix-director-reset-if-others-join' into 'master'
Only toggle director when you yourself spawn or when the first player in the level spawns

See merge request KartKrew/Kart!1006
2023-03-13 04:07:46 +00:00
toaster
241475155b Rename "Break the Capsules" to "Prison Break"
We had this collective consciousness bigbrain moment in VC together, and it can literally only happen in this branch because unlocks.pk3 is the only main-game asset that needs to change for it
Solves the big problem we had with mixing up Item Capsules and ~~Battle Capsules~~ PRISON EGGS
2023-03-12 20:17:46 +00:00