Commit graph

862 commits

Author SHA1 Message Date
lachablock
5e327e09c6 Merge master (resolve structgunch conflicts) 2021-04-20 16:09:59 +10:00
SteelT
411fa4a6d8 Only extend the invinc time for the player if the hit was direct 2021-04-06 23:41:54 -04:00
SteelT
fc8bd429f3 Merge branch 'master' into invinc-changes
Also made changes to sparkles, invincibility speedlines now replaces the sparkles if boosting.
2021-04-06 22:40:02 -04:00
Sally Coolatta
8bb1fa57d4 Merge branch 'master' into 22-merge-again 2021-04-05 01:11:26 -04:00
toaster
40cbc30bff Mammoth commit, sorry.
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.

Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.

If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
SteelT
106afa9ace Make spawning look less squished 2021-03-29 00:15:52 -04:00
SteelT
c8124a6c94 Some invincbility changes 2021-03-28 17:19:47 -04:00
toaster
5e70789cda Prevent hitlag from eating death events (resolves #112).
I could've used the existing `boolean force` here to skip over the check, but I think the MF_SHOOTABLE check is appropriate, and the DMG_CANTHURTSELF flag will be respected this way too.

Also, clean up a ridiculously long statement.
* `k_spinouttype` will never have the value of 2. This might've been a check for KSPIN_IFRAMES, but
    * that already controls `pw_flashing` earlier in the check
    * completely unlabeled, so it's nonsense that needs to be stripped
* `k_squishedtimer` wa mou shinderu.
2021-03-17 18:39:19 +00:00
toaster
08d087c6b5 Acceleration Kickstart, my little hobby project.
It's no secret that holding down a button a lot can fuck with your wrists and fingers. It's too late for me to be damageless, but I can at least create an option to reduce further harm.

This accessibility feature, when enabled (kickstartaccel and kickstartaccel2/3/4 in the console) behaves with the following properties:
* Hold accelerate for 1 second to lock it down.
* Press again to release.
* Short holds/presses do nothing (good for POSITION).
* Continue holding it during the releasing press to re-lock it.
* A small triangular UI element is added next to the speedometer sticker, which displays the current state of the acceleration kickstart for visual feedback. (NO SPLITS SUPPORT YET)

In addition:
* Add PF_ACCELDOWN and PF_BRAKEDOWN, and BT_REALACCELERATE (which ACCELDOWN tracks). Even if this feature never gets merged, BT_REALACCELERATE is required because sneakers and boosters force it on too (extending this is how I implemented it).
* Fix the dehacked playerflag list being out of shape.
* I replaced some existing flags during development of this branch, so their old uses have been whittled away.
2021-02-20 23:10:18 +00:00
Sal
db46507b81 Merge branch 'respawnstuff' into 'master'
Respawning, FAULTing and spectators

Closes #108

See merge request KartKrew/Kart!392
2021-02-18 18:15:27 -05:00
Sal
3ea8e23337 Merge branch 'ring-burst-reverse-gravity' into 'master'
Fix caltrop dropping in reverse gravity as well as not disappearing under some slope conditions

See merge request KartKrew/Kart!388
2021-02-18 18:07:47 -05:00
toaster
5310acc84e * As predicted, remove FAULTing from simply becoming a spectator at the start of the race - only apply it if you attempt to rejoin!
* Mark FAULTing players as in pain, preventing you from using your rings in mid-air (which is especially egregrious when re-entering the race from being a spectator uses the item button).
2021-02-18 11:11:50 +00:00
toaster
2ec943a214 Several changes to respawning and race start.
* Becoming a spectator is now instant, and leaves no bumpable corpse behind.
* Players will now FAULT if they:
    * change from a spectator into a player after the initial camera turnaround but before the end of POSITION.
    * touch an instant kill FOF or get crushed during POSITION.
    * become a spectator during POSITION. (I might change this later, seems overkill)
* If you respawn during POSITION, the jingle will not restart from the beginning.
* Change the FAULT animation to match spinout/currents.
* Clean up some of the spawning code to not place spectators on the ground.
2021-02-17 21:48:09 +00:00
James R
b77a67c085 Fix caltrop burst in reverse gravity; condense function
I'm not sure how the rings were working though.
2021-02-16 03:54:09 -08:00
toaster
b66965185a Caltrop calstop (resolves #114).
If a ring isn't lost from the counter, don't drop a caltrop.

This is done by changing the function signature of P_GivePlayerRings to return the number of rings it has successfully given (or taken away) (which can differ from the rings provided to it). This change has been done for Lua as well.

Super Ring absorbtion now uses this system too, so you only need to change one location to modify the maximum and minimum number of rings a player can have (as far as I am aware).
2021-02-14 21:48:55 +00:00
Sal
f467c051d5 Merge branch 'spindash-in-flashing' into 'master'
Allow spindash while flashing, but you lose rings while doing so.

See merge request KartKrew/Kart!368
2021-02-12 13:57:46 -05:00
James R
223e411fa5 parenthesism 2021-02-12 09:23:18 -08:00
James R
bf047291fd Fix double scaling on vertical momentum for ring burst
P_SetObjectMomZ already applies object scale. It also applies gravity flipping,
so both of these were being done twice. :v
2021-02-12 07:08:42 -08:00
Sally Coolatta
038dd17de3 Debt spikes set their fuse when they land
Another request from oni
2021-02-07 15:44:43 -05:00
James R
75ee9b465b Drop spikes once ring burst puts you into debt 2021-02-06 20:22:15 -08:00
James R
44ec94f287 Merge remote-tracking branch 'origin/master' into funny-spikes 2021-02-06 03:00:50 -08:00
James R
45b98298d9 Ring burst adjustment
Explosions and Tumble - 10 rings
SPB - 20 rings
2021-02-06 02:45:23 -08:00
James R
f9c6a5e8b5 Drop Funny Spikes when getting stung
DEBTA0-DEBTH0

Instead of dropping rings, drop non collectable spikes!
2021-02-06 02:31:24 -08:00
Sally Coolatta
cc2704bc87 Death animation
Art is missing, but functionality is complete.

The kart corpse is also placeable as type 4095. No way to set its color currently, it simply defaults to SKINCOLOR_RED.
2021-02-02 22:36:56 -05:00
Sally Coolatta
9cf77e12e3 BOTS CAN TOUCH STARPOSTS AGAIN
THANK YOU MERGE
2021-01-31 22:05:54 -05:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
Sal
542e0b88df Merge branch 'hitlag-fixes' into 'master'
Try and fix hitlag damage, lightning shield, & punting mines

See merge request KartKrew/Kart!340
2021-01-06 21:09:07 -05:00
Sally Coolatta
7c86c686cf Merge branch 'master' into hitlag-fixes 2021-01-06 18:30:23 -05:00
Latapostrophe
fe4d9ce889 New trick panel shit (but only the gameplay part) 2021-01-06 21:20:28 +01:00
Latapostrophe
74a39837bb Merge conflicts 2021-01-06 18:33:42 +01: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
c31efd8631 Give bumper destruction some sound effects 2020-11-16 02:59:41 -05:00
Sally Coolatta
8c5abf41ea Bumper destruction starts with the normal bumper sprite before transitioning into the giant bumper 2020-11-16 01:20:55 -05:00
Sally Coolatta
42f411399a Add bumper explosion effect 2020-11-15 12:56:03 -05:00
Sally Coolatta
827a1b5fca Refactor stealing & destroying bumpers
- Prevents being able to farm extra bumpers off of karma players
- Paves the way for bumper destroy animation later
2020-11-15 06:25:38 -05:00
Sally Coolatta
1a58d0d24b Try and fix hitlag damage, lightning shield, & punting mines 2020-11-12 01:43:37 -05:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Sally Coolatta
4abb14a158 Check for null 2020-11-10 23:22:05 -05:00
Sally Coolatta
bd495c7f55 Increase hitlag for bananas from 2 to 5, use 10 for normal damage by default instead
Ballhogs & Lightning Shield get intense hitlag again
2020-11-10 23:13:32 -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
0e28470228 Merge master 2020-11-08 02:34:24 -05:00
Sally Coolatta
0f492f4300 Merge branch 'battle-rethink' of https://git.do.srb2.org/KartKrew/Kart into battle-rethink 2020-11-02 02:04:02 -05:00
Sally Coolatta
7304dff3e5 Don't let karma players pick anything up 2020-11-02 02:03:50 -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
Sally Coolatta
961ff69241 You can drop Chaos Emeralds 2020-11-02 00:41:41 -05:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
James R
cb941050e2 Paper item hitbox extends just as far below 2020-10-28 23:48:16 -07:00
Sally Coolatta
48d8bb242a Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-25 09:58:25 -04:00