Commit graph

128 commits

Author SHA1 Message Date
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
NepDisk
98cdcf8593 Reapply "Replace shitty item box pop with flying debris and dust clouds"
This reverts commit e4f8b0119d.
2024-07-29 02:34:56 -04:00
NepDisk
e4f8b0119d Revert "Replace shitty item box pop with flying debris and dust clouds"
This reverts commit 8979dafd4c.
2024-07-29 02:33:00 -04:00
James R
8979dafd4c Replace shitty item box pop with flying debris and dust clouds
Debris flies forward and outward from the player in the
direction of momentum. Debris particles bounce once then
disappear when they hit the ground for the second time.
Clouds spawn on and trail behind the player for a short
duration.
2024-07-29 02:25:41 -04:00
Sally Coolatta
0141ea5a7c Infinite tether uses lightning shield effects 2022-08-23 20:27:19 -04:00
James R
b9409ff052 Flame shield clashes with invincibility and bigger players 2022-08-01 19:53:05 -07:00
Sally Coolatta
d053d5f8ba Fix blockmap WILD inconsistency when it's not PIT_CheckThing
An optimized error check was put into P_BlockThingsIterator for tmthing, but this meant that anything that was not using or even setting this variable (the supermajority of them) would exit after finding 1 thing in each block.

To keep this error check & keep it optimized, the PIT_ functions were expanded to three options instead of two: BMIT_CONTINUE lets the search continue. If used as the last mobj, it will return true when the iterator finishes. BMIT_ABORT ends the search and forces the iterator to return false.
BMIT_STOP ends the search and forces the iterator to return true.
2022-05-23 17:37:29 -04:00
Sally Coolatta
6e8e0ad0f5 Lightning Shield fixs
- Rename to Lightning Shield (it keeps fucking me up when I want to kartgiveitem it to myself)
- Fix inflictors causing damage being considered damage hitlag. Fixes the player using Lightning Shield being in damage hitlag state (most notable in the DI branch because hurting someone with it lets you DI afterwards, which also fucks with your turning)
- Rewrote attack function to use custom blockmap search instead of P_NukeEnemies.
- It can no longer attack below you, only above & around you.
- Increased the attack radius, so that it actually lines up with the sprites...
- Fixed extremely inconsistent ring blockmap search by moving it to playerafterthink (don't ask me why)
- Rings get joulsted by Lightning Shield when you pass by them without
- Added MAXRADIUS to the blockmap checks for lightning shield & mines, to reduce blockmap inconsistencies
2022-05-20 18:12:34 -04:00
AJ Martinez
dd48ec2df5 Add FX for powerup clash collision 2022-05-12 17:54:12 -05:00
Sally Coolatta
1381a56077 Rewrite mines
Get rid of the tons of extra objects it uses for sounds & collision, do it all from the actual object PLEASE...
2022-05-07 22:59:38 -04:00
AJ Martinez
4655df9d9e Dynamic sounds for drop target collision 2022-04-25 18:49:08 -05:00
SteelT
dbdaebbb04 Merge branch 'droptarget' into 'master'
"Drop Target" item

See merge request KartKrew/Kart!562
2022-03-22 03:33:54 +00:00
toaster
52d2472ed7 "Drop Target" item initial commit.
Most of the way there, but still a bit left to do.
2022-03-21 23:40:30 +00:00
toaster
c68e0d46c0 Fixed sneaker-induced bumper theft (for those who saw my comment in MKD, turns out a simple P_PlayerInPain saves you from the multi-steal threat I considered) 2022-03-13 17:00:43 +00:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +00:00
toaster
c3e9eceda2 * Instead of checking for a player moving up, check for a player moving up that's only JUST been tumbled.
* Remove the DMG_WOMBO flag from PVP touch damage tumbles as that was restricting tumble combos in this branch, not allowing it.
2022-02-08 21:38:24 +00:00
SinnamonLat
d55e23d767 Add DMG_WOMBO to all player contact damage 2022-01-23 17:52:31 +01:00
SinnamonLat
191103fec1 Fix a dumb mistake, add DMG_WOMBO to orbinauts, jawz and banana hits 2022-01-22 11:41:49 +01:00
Sally Coolatta
50eb3eeda2 Don't use damage hitlag effects on a person when they "win" a ring sting exchange
Only applies to ring sting collision (no other types of damage touching), only applies to the person not getting stung. The person who is getting stung & sting trades are unaffected.
2022-01-04 00:39:01 -05:00
Sally Coolatta
cab1af5498 Don't do hitlag combo with items with threshold
Prevents instakill ballhog
2022-01-04 00:23:12 -05:00
James R
07f965d4eb Check to sting player before removing one ring 2021-12-29 22:25:11 -08:00
Sally Coolatta
5ac5ca89d0 New solid object bouncing, and updated player bouncing
- Solid objects have new bouncing physics, it's a mix of the object bumping and wall bumping. It replaces the "solid" option on K_KartBouncing.
- Goomba stomp momentum is decided in K_KartBouncing itself instead of needing to be manually passed in as a boolean, so you'll be able to goomba stomp all objects instead of just players.
- Fixed bumping not carrying all of its intended momentum, due to a bug making friction apply very strongly.
2021-04-22 20:29:59 -04:00
toaster
00972a83d2 remove the prefix since everything seems to function 2021-04-17 11:30:08 +01:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
Sally Coolatta
e16c7d722f Cherry-pick e1b265df2 2020-11-16 19:55:28 -05:00
Sally Coolatta
14b379fd27 Cherry-pick 4eb69a664 2020-11-16 19:52:26 -05:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Sally Coolatta
87e3dd518b Don't set hitlag for punted mines multiple times 2020-11-10 23:42:30 -05:00
Sally Coolatta
c86d496fef Removed fixed length hit lag 2020-11-10 23:02:58 -05:00
Sally Coolatta
8b5a78114e Hitlag occurs on registered damage instead of being before damage calls 2020-11-09 21:35:08 -05:00
Sally Coolatta
470e399abe Merge master, add support for hitlag jitter in OpenGL 2020-11-08 01:56:27 -05:00
Sally Coolatta
4a9a438270 Dummy out wanted system
- Remove WANTED hud item
- Person in 1st place is the bonus points giver
- Sort players by Emeralds > Bumpers > Points
2020-11-02 03:51:16 -05:00
James R
896b29f002 Replace special handling for picking up items from below with MF_PICKUPFROMBELOW 2020-11-01 22:33:42 -08:00
James R
76e0102b3f Fix paper items not being removed after shrunk 2020-10-30 21:13:36 -07:00
James R
6864705b67 Fix fuckup 2020-10-30 19:00:37 -07:00
James R
cb941050e2 Paper item hitbox extends just as far below 2020-10-28 23:48:16 -07:00
Sally Coolatta
0969ca1af9 Karma bombs rework
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Sally Coolatta
3e446a167c Restructure how damage works in kart COMPLETELY
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sally Coolatta
9863171879 Remove MF_BOUNCE, use MF_SLIDEME to enable P_SlideMove for an object 2020-08-16 03:03:04 -04:00
Sally Coolatta
5a6263c36b Make it past p_mobj 2020-08-14 20:48:06 -04:00
Sally Coolatta
bb988d1dd3 Minor fixes to g_demo 2020-08-12 18:45:55 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
3dc2f4804f Angle & scale now impact how long you're in hitlag 2020-08-02 10:26:29 -04:00
Sally Coolatta
a8908d22cf K_SetHitlagForObjects, sets hitlag based on speed 2020-08-01 01:14:18 -04:00
Sally Coolatta
0db881d058 Allow hitting players who are flashing, but are still in hitlag 2020-07-31 22:29:08 -04:00
Sally Coolatta
0cb123f74e Apply to more things, make the timing more reasonable 2020-07-31 00:07:24 -04:00
Sally Coolatta
c9b17c456d Re-attempt at hitlag
I remember when I tried to fix wolfs' branch I was having issues, but this ended up working pretty much fine? Don't remember why the old branch was messed up though (it was simply too old & not substantial enough to try and work off of imo)
2020-07-29 09:30:29 -04:00
Sally Coolatta
c9b2396efb Fix items vs springs crash 2020-05-03 20:12:01 -04:00
Sally Cochenour
b6c282ec12 Move Eggman item code to k_collide 2020-03-26 00:47:30 -04:00
Sally Cochenour
985aa44c95 Flame shield destroys items while being used 2020-03-26 00:47:03 -04:00
Sally Cochenour
88709aafaa Fix eggman items having no collision 2020-03-24 12:55:48 -04:00
TehRealSalt
cd65381abc Add another file to handle Kart item collision functions, now items can damage anything with MF_SHOOTABLE
Now this code won't make me pull out my hair. Could possibly be enhanced by using a function or define to handle the big copy-pasted tmthing/thing switch blocks in p_map, but for now I'm way happier.

As a result, Battle capsules are now destructible.
2019-09-15 17:25:33 -04:00