Commit graph

444 commits

Author SHA1 Message Date
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
toaster
01b97cb829 Update UCRP_UFOATTACKMETHOD into UCRP_TARGETATTACKMETHOD
Supports Prison Eggs and Gachabom now as well.
For the original behaviour, combine with the new UCRP_SMASHUFO.
2023-10-17 21:03:20 +01:00
toaster
3836cfddcb UCRP_UFOATTACKMETHOD: Only check roundconditions the frame the UFO is destroyed, not hit 2023-10-17 12:49:50 +01:00
toaster
d11fe78e90 UCRP_UFOATTACKMETHOD
`Condition1 = UfoAttackMethod [type]`
    - "smash a UFO Catcher using only [type]"
        - Combine with `Prefix_SealedStar` or `Prefix_IsMap [special stage stage]`
        - Shows up as "???"
    - Types supported:
        - `Boost` - "boost power" (sneakers)
        - `Whip` - "Insta-Whip"
        - `Banana` - "Bananas"
        - `Orbinaut`- "Orbinauts"
        - `Jawz` - "Jawz"
        - `SPB` - "Self Propelled Bombs"
    - Other types could be added on request, these were just the easy ones

In addition, the prototype for P_MobjWasRemoved was moved to `p_mobj.h`.
It's EXTREMELY important that we're able to safely check mobj pointers anywhere a mobj_t is possible to observe, without including the full `p_local.h`...
2023-10-17 01:07:03 +01:00
AJ Martinez
53a001da08 Fix visual type desync on respawned battle items 2023-10-15 18:03:53 -07:00
AJ Martinez
8023b7c1b0 Change perma ringbox flag to dodge mace flags 2023-10-15 16:20:26 -07:00
James R
428106c014 Loops: correct origin point over duration of loop
- Players moving into a gate with a lot of momentum would
  offset the origin point from its intended position
- Find intersection of player movement and gate
- Correct origin point between loop entry and exit by
  interpolating the difference between player position on
  entry and intersection point
2023-10-14 21:28:10 -07:00
James R
b9615d7225 objects/loop.c -> objects/loops.cpp 2023-10-14 19:27:31 -07:00
AJ Martinez
b67aa8af4f Charge instawhip test fixups 2 2023-10-14 05:56:42 -07:00
AJ Martinez
4928fec622 Reduce whip charge time 2023-10-13 22:49:06 -07:00
AJ Martinez
2a0f9da975 More instawhip tuning cleanup 2023-10-13 17:36:06 -07:00
AJ Martinez
f36e699398 Instawhip reject vfx first pass 2023-10-13 17:09:25 -07:00
AJ Martinez
a9ec1cea68 WIP: Instawhip charge input 2023-10-13 02:23:28 -07:00
toaster
756f42bc26 Fix DLZ Ring Sucker effect
- Fix infinite loop caused by not actually using the intended object type
- Fix integer multiply of two fixed-scale numbers causing overflow
2023-10-07 23:43:42 +01:00
toaster
dbcb39d7ed Fix Leaf Storm Eggball
- Map object num was incorrectly copypasted onto the Dead Line Ring Vaccuum as well
- Was getting destroyed instantly because its first spawnpoint is a deathpit. Now it only kills itself when it lands on a deathpit, not if it started on one
- Use destscale instead of scaling every frame
- Reduce duplicate P_IsObjectOnGround calls
- Now has its own state
2023-10-07 23:15:27 +01:00
Lat
baa668895a Move transfer line dismount hack to linedef type 2005 2023-10-07 12:22:53 +02:00
Lat
dc6bb1bfa9 solve conflicts and update to master 2023-10-07 11:15:47 +02:00
Lat
bb3d666852 Whitespaces 2023-10-07 10:24:14 +02:00
Lat
085c3c650c Fix DLZ seasaws snapping to floors/ceilings 2023-10-07 10:21:18 +02:00
Lat
1e86d661a5 Change turbine fast speed criteria from 133 to 200% 2023-10-07 09:56:19 +02:00
Oni
1387fa81a8 Merge branch 'ballz-activation' into 'master'
Ball Switch

See merge request KartKrew/Kart!1534
2023-10-02 05:41:46 +00:00
toaster
c17b2a44b3 Obj_getPlayerOffRideroid: NULL check 2023-09-26 22:17:52 +01:00
toaster
4f980dc949 Obj_rideroidTrail: Use (RF_DONTDRAW & ~K_GetPlayerDontDrawFlag) instead of consoleplayer hack 2023-09-26 22:14:05 +01:00
toaster
d3e6c6ab02 Newly added object files: Fix Random classes
- Was previously abusing PR_FUZZ
- Add PR_TRACKHAZARD, for randomised track hazards
2023-09-26 22:10:43 +01:00
toaster
490959b6f7 Newly added object files: Fix trailing whitespace + EOF newline 2023-09-26 22:04:14 +01:00
toaster
bee1cb9a04 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into rideroid-hardcode
# Conflicts:
#	src/sounds.c
2023-09-26 21:39:19 +01:00
Sally Coolatta
288110539a Fix activating more than once 2023-09-26 11:40:29 -04:00
Sally Coolatta
643cf46b61 Ball switch 2023-09-26 08:37:10 -04:00
Lat
08ee7dabac Fix Klagen spawn height 2023-09-25 10:39:02 +02:00
Lat
0aa6d8c86b Fix missing bubbles on underwater WPZ turbines 2023-09-24 17:08:59 +02:00
Lat
b1c1b658da Speed up DLZ rockets with first blood 2023-09-24 14:29:44 +02:00
Lat
3be4156e59 Make rideroid speed up to 150% speed with first blood 2023-09-24 14:21:49 +02:00
Lat
32620fbb4f Fix these godforsaken rideroids 2023-09-24 13:57:42 +02:00
Lat
a710237fde Hardcode the remainder of the WPZ objects 2023-09-23 17:05:21 +02:00
Lat
df31c65ebb Hardcode these godforsaken turbines 2023-09-23 16:32:32 +02:00
Sally Coolatta
91955b1383 Broly screen shake is done on the source object
Screen shake was being done from the Broly vfx, which does scaling shenanigans so it caused Proximity Mine explosions to make the camera go apeshit.

I'm also pretty sure the hitlag calcs Proximity Mine did for the broly effect was wrong, not sure though? I'm trying something else and I think it's better.
2023-09-23 07:57:55 -04:00
Lat
058a1c03b5 Seasaw defs, variables + new function to sanitize checks for my hardcoded mess 2023-09-23 12:48:52 +02:00
Lat
fddc15f11f Make sure to update seasaw reverse gravity flags 2023-09-23 11:32:59 +02:00
Lat
12b80b392b hardcode ring vaccums 2023-09-23 11:26:56 +02:00