Commit graph

532 commits

Author SHA1 Message Date
James R
920c6c0311 Obj_DLZSeasawUpdate: fix eflags typo 2023-11-21 01:06:06 -08:00
James R
ff3826466b Rename MT_DLZ_SEASAW_VISUAL to MT_SEASAW_VISUAL, reorganize seasaw states
In preparation for Gust Planet seasaws, I'm grouping these
separately from the rest of Dead Line states.

Because the visual object does no think for itself, rather
by proxy of the main seasaw object: I removed the DLZ tag,
since this object will be reused for Gust Planet.
2023-11-20 23:35:40 -08:00
AJ Martinez
e7e2cb93c4 Define out WPZ turbine bubbles until we actually know why they false-positive 2023-11-18 22:33:22 -07:00
Oni
94a593487b Merge branch 'fix-reducevfx' into 'master'
Fix `reducevfx` mkaing some VFX visible, when they shouldn't be

See merge request KartKrew/Kart!1622
2023-11-18 07:11:25 +00:00
James R
55fddd2132 objects/mega-barrier.cpp: fix undefined behavior
Calling a class method from a nullptr this is undefined
behavior.
2023-11-17 18:51:21 -08: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
James R
5788ea574c Power-up Aura: hide if Mega Barrier is the only power-up 2023-11-16 21:08:30 -08:00
James R
1df4094c65 Mega Barrier for Barrier power-up -- just a visual object 2023-11-16 21:08:30 -08:00
AJ Martinez
903ed414b8 3 secs springgrease on DLZ seeesaw 2023-11-15 22:55:33 -07:00
AJ Martinez
eb394ec5f8 Use more realistic practice conditions for SPB Attack 2023-11-15 15:41:33 -07:00
Oni
a51b889444 Merge branch 'fix-super-flicky-whip' into 'master'
Fix Super Flickys not being whippable

See merge request KartKrew/Kart!1627
2023-11-15 21:26:31 +00:00
AJ Martinez
0301847339 Fix double offset scale on charge sparks 2023-11-15 00:54:01 -07:00
James R
b1c0f6647e Obj_IsSuperFlickyWhippable: pass target
- Old behavior: if flicky is chasing itself. What? Why did
  I write this??
2023-11-14 21:01:53 -08:00
AJ Martinez
d54d2f6d04 Merge remote-tracking branch 'origin/master' into catholic-vfx 2023-11-14 21:47:51 -07:00
James R
cbe42f969b Obj_SuperFlickyOwner: check valid before returning source
- Flicky::source() dereferences a pointer
2023-11-14 01:05:06 -08:00
James R
ee7f3d7108 Replace K_ReduceVFX with K_ReduceVFXForEveryone, replace owner cases with RF_REDUCEVFX 2023-11-13 23:49:33 -08:00
AJ Martinez
aad6795ba7 Trickpanels: I don't even know who I am anymore 2023-11-13 16:41:09 -07:00
AJ Martinez
b946a66574 Trick Panel charge release WIP 2023-11-13 04:35:15 -07:00
AJ Martinez
041d7660ae Charge minimum viable visuals (plus future frame/obj setup) 2023-11-12 23:32:59 -07: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
toaster
9e49f761b0 Prison Egg polish: Spawn three Followers on hit
- Selected from the mapheader's Audience list
    - Since most Prison Break maps don't have Audience lists set, you'll be seeing a lot of Flicky/Motobuddy/Chao for now
- Yes, these will disappear in deathpits like in Sky Chase
- Intentionally did not do this for the CD Special Stage UFO
2023-11-12 22:43:07 +00:00
toaster
ec4ea384c3 Obj_AudienceInit: Clean up handling
- Don't require a mapthing to select a random Follower from the Audience list
- Don't print an error message if the mapheader Audience list is empty. This is probably intentional.
2023-11-12 22:43:06 +00:00
toaster
5cab2401b6 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into catholic-vfx 2023-11-12 16:24:47 +00:00
AJ Martinez
e20218a9d6 Trick Charge VFX WIP 2023-11-12 03:38:17 -07:00
James R.
f1c24d0eeb Merge branch 'loop-camera' into 'master'
Loop camera + camera turning interpolation fix

See merge request KartKrew/Kart!1557
2023-11-12 02:28:52 +00:00
toaster
bbe2477331 Obj_RainbowDashRingSpawn: Fix copypaste error that could have resulted in out-of-bounds access 2023-11-06 14:47:54 +00:00
toaster
120b567ba2 K_DoPogoSpring: Handle player->trickpanel set directly 2023-11-06 01:09:06 +00:00
toaster
71d301779b Blend Eye Hardcode part EX: Code the rest of the owl 2023-10-31 21:47:18 +00:00
toaster
0bf9ad85c1 Obj_OrbinautJawzCollide: Orbinauts, Jawz, and Gachabom will die on collision with MF_PAIN objects 2023-10-31 20:13:50 +00:00
toaster
7e362b1ee8 MT_BLENDEYE_PUYO, MT_SPIKEDTARGET: Hardcode simple thinkers/init/death behaviour 2023-10-30 00:13:03 +00:00
toaster
c3380b8f5d Boss-related files: Adjust/add top-of-file copyright info 2023-10-30 00:12:12 +00:00
toaster
d9d137be77 VS_PredictAroundArena: Tidy up condition 2023-10-30 00:11:05 +00:00
toaster
1c12b28498 Blend Eye Hardcode part 2
- VS_ArenaCenterInit - setting up the boss arena centerpoint
- VS_GetArena - Getting a particular arena
- VS_PredictAroundArena - Predict momentum of object around arena
- VS_RandomPointOnArena - Select random position around arena
2023-10-29 22:04:50 +00:00
toaster
4e2cc4bc34 MT_RANDOMITEM: Fixes relevant to Blend Eye development
- Custom Mace system
    - Change the OTHER MF2_ that MT_RANDOMITEM uses to also not conflict with the sound-creating property
    - Support being counted for the P_RespawnBattleBoxes system
- If there's only one Random Item on the course, have an extra delay before its respawn is forced
- More prevention of S_RINGBOX1 set in GTR_SPHERES
- Fix potential state issue for Ring Box conversion
2023-10-24 23:10:17 +01:00
toaster
844f868bed Merge branch 'fix-whip-buzzsaw' into 'master'
Fix instawhip buzzsaw oneshotting the UFO

See merge request KartKrew/Kart!1579
2023-10-24 09:00:21 +00:00
AJ Martinez
8b9b1e1640 Fix instawhip buzzsaw oneshotting the UFO 2023-10-22 03:30:04 -07:00
AJ Martinez
dc7fea1d26 Gachabom rebound: initialize soundplayed flag 2023-10-22 01:45:11 -07:00
AJ Martinez
31fbb29b88 Gachabom fixups 2023-10-22 00:06:07 -07:00
Oni
2cc14bf8f8 Merge branch 'fix-random-item-retransform' into 'master'
Don't retransform random items (resolves #726)

Closes #726

See merge request KartKrew/Kart!1569
2023-10-21 23:49:32 +00:00
James R
44245a18d0 Default loop camera settings if camera distance is not set 2023-10-20 03:45:21 -07:00
James R
0e57da56b0 Loop camera
It zooms out, pans to the side and toward the player.

Loop Center thing:

- arg2: zoom-out speed in tics (zooms out when entering the loop)
- arg3: zoom-in speed in tics (zooms in when exiting the loop)
- arg4: zoom-out distance in fracunits (multiply by 65536)
- arg5: angle to pan to the side of the loop in degrees fracunits (multiply by 65536)
  - This will be flipped depending on where the camera was
    facing before entering the loop.
- arg6: panning speed in degrees fracunits (multiply by 65536)
- arg7: panning acceleration in tics (camera gradually pans to side of loop)
- arg8: panning deceleration in tics (camera gradually pans back to normal)
2023-10-20 03:44:53 -07:00
AJ Martinez
52c569c0ee Don't retransform random items 2023-10-19 14:52:53 -07:00
toaster
42233cfb9e UCRP_GROWCONSECUTIVEBEAMS
- Condition1 = GrowConsecutiveBeams 4
- "touch the blue beams from your own Shrink at least 4 times before returning to normal size
2023-10-19 19:44:37 +01:00
toaster
0478d9a2e3 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into break-through-them-all 2023-10-19 17:32:35 +01:00
toaster
5680e00deb P_TrackRoundConditionTargetDamage, Obj_SpecialUFODamage: Fix incorrect non-g_localplayers indexing into player table
Destroying the UFO has now been promoted to a full deferred condition check
2023-10-19 16:38:50 +01:00
James R.
96e36521d8 Merge branch 'no-battle-ring-box' into 'master'
Fix visual type desync on respawned battle items

See merge request KartKrew/Kart!1556
2023-10-18 01:05:00 +00:00
toaster
acad8754c8 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into break-through-them-all 2023-10-17 23:32:08 +01:00
toaster
9e1aec4298 UCRP_RETURNMARKTOSENDER
"when cursed with Eggmark, blow up the racer responsible"
Just a simple condition. Either it happens or it doesn't.
MT_SPBEXPLOSION now tracks whether it was made by KITEM_EGGMAN or KITEM_SPB, too!
2023-10-17 22:25:47 +01:00
toaster
3e494a342c UCRP_GACHABOMMISER
Break a target (Prison Egg/UFO) using exactly one Gachabom again and again
Becomes invalid if an Insta-Whip collides with a target, or you throw two at the same time
2023-10-17 21:09:22 +01:00