Commit graph

872 commits

Author SHA1 Message Date
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
Lat
ca90d27e30 Hardcode DLZ Hover thingies + rocket fixes 2023-09-23 11:00:00 +02:00
Sal
bb8499b43d Track-based bot difficulty 2023-09-23 03:28:43 +00:00
Lat
a565d923c0 Hardcode these cursed seasaws 2023-09-22 18:14:38 +02:00
Lat
fb91a9a0f7 DLZ rocket hardcode 2023-09-21 15:42:10 +02:00
Lat
6ff02ab075 Change Rideroid starting speed back to full value 2023-09-21 08:08:33 +02:00
Lat
5a6ecd051a Fix conflict in cmakelist w/ master merge 2023-09-20 17:17:33 +02:00
Lat
42cbb93ca2 Hardcode Leaf Storm Eggman balls 2023-09-20 16:33:07 +02:00
Lat
9b432381c6 Finalize Bungee hardcode 2023-09-20 15:03:45 +02:00
Lat
85a103e743 Fix warnings in rideroid.c that popped up after I unfucked my compile flags 2023-09-20 14:46:02 +02:00
Lat
ea8e871176 LSZ bungee: first pass 2023-09-20 14:42:39 +02:00
Lat
908bbba4ec Rideroid: second pass 2023-09-18 18:14:00 +02:00
Lat
aef958d7ed Rideroid: first pass 2023-09-18 16:54:16 +02:00
James R.
543fd03b11 Add Obj_EmeraldCanHUDTrack to handle MT_EMERALD being used for Hyudoro orbiting 2023-09-18 04:21:10 -07:00
James R.
08056a9ae2 hyudoro_patrol_hit_player: do not make 1st place invisible 2023-09-17 21:59:35 -07:00
James R.
4347af5069 Hyudoro: increase hitbox size 2023-09-17 21:56:20 -07:00
James R.
6878c7dd90 Apply PF_CASTSHADOW when player touches patrolling Hyudoro's shadow, darken player to pure black 2023-09-17 21:56:20 -07:00
James R.
5c1332f977 Add R_CustomShadowZ, Obj_FakeShadowZ, Obj_HyudoroShadowZ; let Hyudoro shadow float while patrolling 2023-09-17 21:56:19 -07:00
James R.
25837afc8c Hyudoro: use B frame when holding item 2023-09-17 21:56:19 -07:00
James R.
0a6fedc48a Hyudoro: carry item capsule back to player, use MT_EMERALD for collect animation
- Carry back item capsule, painted with the skincolor of
  the player who was stolen from
- Give player item by orbiting and shrinking into the
  player like an emerald
  - Lock player item box while animation plays, draw an
    empty item box on the HUD
  - At end of animation, burst item capsule to place item
    in player's hotbar
- Hyudoros can no longer stack items in the hotbar --
  consistent with item capsules
  - (If you have a Super Ring in your hotbar and Hyudoro
    is holding a Super Ring too, it will wait for you to
    use yours)

---

MT_ITEMCAPSULE changes:

- extravalue2 != 0: use this color on caps
- MF2_STRONGBOX: award items like the roulette
  - Super Ring is placed in the hotbar instead of awarding
    rings directly
  - SPB is placed in the hotbar instead of throwing it
    immediately
- DMG_INSTAKILL: don't respawn
2023-09-17 21:56:19 -07:00
James R.
3eeaaefc5f Hyudoro: stack uses modulate blendmode (with ghost trick) if player is in first place
- If player is in first place, they cannot use the stack
- Use ghost trick to lessen the effect, since modulate
  blendmode cannot be controlled with translucency
2023-09-17 21:56:19 -07:00
James R.
e0d7d08dde Hyudoro: flickering shadows for patrolling and stealing from a player
- Shadow flickers in high contrast colors while patrolling
- Shadow flickers black/white for short time after Hyudoro
  steals from a player
- (Resetting shadow for hovering stack already handled by
  append_hyudoro)
2023-09-17 21:56:19 -07:00
James R.
43ca8a2f4c Hyudoro: toggle shadow in hovering stack so multiple shadows are not rendered 2023-09-17 21:56:19 -07:00