Commit graph

102 commits

Author SHA1 Message Date
NepDisk
39f507d2b5 Make Ring drop on bumps consistent 2025-05-17 20:23:18 -04:00
NepDisk
61e7d86d78 Instashield on Clash 2025-05-15 19:27:18 -04:00
NepDisk
a1c3c6b9e1 Reimplement ringloss on bump. Also fix some shield issues. 2025-05-13 13:36:11 -04:00
NepDisk
1d6dd4125a Remove Droptarget. 2025-05-10 07:31:51 -04:00
NepDisk
fea7aa001b Use constants instead of magic numbers for roulette info 2025-05-03 12:48:02 -04:00
NepDisk
9584982685 Revert Rewrite mines
As much as this pains me, this might be needed for lua compat.

This reverts commit 1381a56077.
2025-04-29 18:10:57 -04:00
James R
ea32b85587 Kill mine when running into it during explosion state
Fixes punting a mine if you run straight into it while
invincible.
2025-04-26 23:11:37 -04:00
NepDisk
5d886b83ba Fix RAGuard and other minor fixes 2025-04-13 15:07:10 -04:00
NepDisk
daf5fdf748 Remove Bumper Death animation 2025-04-07 21:01:01 -04:00
NepDisk
1e47df835a Don't waste bubble if it doesn't collide 2025-03-21 10:34:32 -04:00
NepDisk
9ca6075a9e Fix thundershield not killing the spb and add DMG_VOLTAGE
Ported the fix from RR since it made the most sense
2025-03-18 01:11:28 -04:00
NepDisk
24d52d593e Refactor bubbleshield collide, use splitflags for analog input display, don't run waypoint update code on legacy checkpoints 2025-03-14 17:31:51 -04:00
NepDisk
da4f6c62a2 Rings rebalances
Ring burst now depends on damagetype. ie 5 from orbinaut and jawz and 3 from banana and 10 for sniping. Ring Fuse has also been lowered to 20*TICRATE from 60*TICRATE
Kitchen Sink targets get all their rings dropped at once on impact.
2025-03-13 03:54:18 -04:00
NepDisk
fbb7335011 Revert "Fix Bubble Shield duplicate collisions"
This doesn't really apply to us since we don't have hitlag and it causes problems.

This reverts commit b048467aa2.
2025-03-07 17:30:53 -05:00
NepDisk
8b5b674364 Fix flameshield collide 2025-03-01 11:01:29 -05:00
NepDisk
ef11c55b41 Merge and Update Flameshield overhaul concept 2025-02-28 00:54:24 -05:00
NepDisk
d0327c4079 Auto Shrink Bubbleshield on successful attack/defend and add delay 2025-02-27 13:51:02 -05:00
NepDisk
b048467aa2 Fix Bubble Shield duplicate collisions
8c1771112c
2025-02-27 12:34:28 -05:00
NepDisk
fe97d7263b Fix bubblepop not being reset in some cases 2025-02-26 20:59:57 -05:00
NepDisk
064be1b201 Merge branch 'bortsport' into blankart-dev 2025-02-26 19:43:22 -05:00
NepDisk
8b142ceb62 Add kartstats
4942db2806
2025-02-25 14:00:10 -05:00
NepDisk
475524e7ad Add shield sounds and rework bubbleshield
BS now only has two defend / attack uses, trap gives less height and you can dropdash from the trap
2025-02-25 11:40:25 -05:00
NepDisk
c6daa4da80 Revert 'New solid object bouncing, and updated player bouncing'
This reverts commit 5ac5ca89d0.
2025-02-23 18:04:20 -05:00
NepDisk
4b8df73495 Merge branch 'blankart-dev' into bortsport 2025-02-22 22:28:11 -05:00
NepDisk
69b064050a Remove rest of ringsting leftovers 2025-02-22 22:27:56 -05:00
NepDisk
0d4c4a74f6 Merge branch 'blankart-dev' into bortsport 2025-02-22 22:21:09 -05:00
NepDisk
e562d838b5 bumpspark, bumpspring and small code refactoring and cleanup 2025-02-22 21:53:09 -05:00
NepDisk
51154e346c rename tm to g_tm to fix C conflict 2025-02-22 01:24:53 -05:00
NepDisk
4eb0901ff7 Experimental rings rebalance
Ring Sting is commented out. Item Boxes give 3 rings for first, 5 for middle position and 10 for back. The Super ring item gives 5 for first, 10 for middle, 15 for back.
2025-02-04 17:10:15 -05:00
NepDisk
a148d4e17b Seperate out itemflags 2025-01-27 12:24:19 -05:00
NepDisk
ac3e8827a7 Rename back to thundershield, update doomdata.h ml_flags, update constants 2024-12-31 01:31:03 -05:00
NepDisk
3622b78b3e Readd SPB karma modes, remove every hit rewarding bumpers, allow flashtics again 2024-12-17 17:57:47 -05:00
NepDisk
13703c3c2a Flameshield rework
The idea is to return it as a meter item while keeping and putting a restriciton on the speed building and storing part from the previous version. Using the boost while its active will drain time from the main timer to fill up store as it were, this store is what handles the boost duration which caps at 2 seconds. The speed increase from using the flame shield more and more now diminishes and caps around 81 fu/t on knuckles for example and is done seprately from the main drain timer and the store.
2024-10-20 04:36:43 -04:00
NepDisk
afecac0c00 Remove unused titlecard code, some unused sounds and simplify pvp damage code 2024-10-12 22:02:51 -04:00
NepDisk
9d6c643f6c Remove DMG_WUMBO comboing and fix respawn lua value 2024-10-08 21:38:59 -04:00
NepDisk
2788d699d4 Fix make battle more similar to v1 and fix smk iceblocks
This commit removes gametype rules to make battle closer to v1, also iceblocks bonk
2024-10-05 20:52:19 -04:00
NepDisk
000c5cf15a Lua indecent exposure 2024-10-04 15:58:46 -04:00
NepDisk
d8aaf8552c Use mapobjectscale instead of FRACUNIT for droptarget pushback code
This makes it so droptarget knockback is the same regardless of mapscale, this also makes the item more fair and less annoying to go up against

Also remove the scaling effect from it as it was bugged and looked goofy
2024-09-20 19:18:49 -04:00
Sally Coolatta
55a8643dd3 Put tm* variables into a struct
This makes it significantly easier to save/restore the state of these variables, whenever we need to do so for calling movement functions in the middle of other movement functions. This will also make it easier to move it out of global variable hell if desired later.
2024-09-13 11:29:30 -04:00
toaster
0532cc8484 Remove P_InitAngle and its kin, considered on a case-by-case basis for also setting old_angle as well. 2024-09-04 01:18:51 -04:00
James R
fa1ac4efd3 Let Drop Targets collide with other items immediately after being thrown
see efc415e5
2024-08-21 17:21:52 -04:00
James R
35a181e0db Let Drop Targets collide with other players immediately after being thrown 2024-08-21 17:20:34 -04:00
NepDisk
f0683f05ca Restore MF_BOUNCE 2024-08-16 14:42:30 -04:00
NepDisk
9ba2140b3d Restore old respawn PT1
All the code from k_respawn.c has been nuked. The gameplay of respawning works but it doesn't currently drop the player in the right spot for both legacy and new waypoints
2024-08-12 14:49:12 -04:00
NepDisk
5f7609563c Lock more stuff behind ringtoggle 2024-08-01 17:44:18 -04:00
NepDisk
ac72e705a6 Reimplement squishing damange 2024-07-31 17:05:16 -04:00
Latapostrophe
75c169d984 fix orbiting items not protecting you against your own items
(cherry picked from commit 705851b38a)
2024-07-31 02:19:03 -04:00
NepDisk
48871a8b68 Remove tumble. 2024-07-29 03:40:28 -04:00
NepDisk
8f3b2db7d3 Remove hitlag. 2024-07-29 03:24:40 -04:00
NepDisk
1e43b1b013 Revert "Reapply "Replace shitty item box pop with flying debris and dust clouds""
This reverts commit 98cdcf8593.
2024-07-29 02:37:11 -04:00