Commit graph

2601 commits

Author SHA1 Message Date
TehRealSalt
b783c54c44 Whoops, no break here 2018-06-10 21:05:09 -04:00
TehRealSalt
6fbb4f9b91 Maintenence
- Fix merge issues
- Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking
- K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player.
- Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 16:10:24 -04:00
TehRealSalt
a041efde6c Merge branch 'master' into sonicitems 2018-06-09 22:50:21 -04:00
Sryder
dabfea434c Accidentally made HitEm sounds always play, even when hitting your own items 2018-06-09 16:42:03 +01:00
Sryder
5a3f27b0fe Merge branch 'master' into dust-kart 2018-06-09 01:00:03 +01:00
Sryder
6b5df29681 Merge branch 'master' into voice-loss-jpg
# Conflicts:
#	src/k_kart.c
2018-06-09 00:56:39 +01:00
Sryder
4f19960324 HitEm voice line can always play
Still starts the timer to at least 3 seconds on other voices though
2018-06-09 00:18:49 +01:00
Sryder
0b3d031a55 Slightly longer delay between voices
Fix win/lose quotes to work based on actual win/lose criteria
Don't play overtake sound until at least 10 seconds into the race
2018-06-09 00:05:05 +01:00
Sryder
2329fddb25 New Drift dust
Applies all the time as long as the object is turning tight enough
New Sound
Works on Red Shells too!
2018-06-08 21:13:52 +01:00
TehRealSalt
5d8fbba2a1 Fixes 2018-06-08 00:02:28 -04:00
TehRealSalt
3d9f1a90e1 Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
Sryder
c94ab8d295 Whoops, accidental rename 2018-06-07 20:03:47 +01:00
Sryder
2a04059ace Big voices change
When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices
When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 19:56:26 +01:00
Sryder
4ab28e017e Restore the removed voices 2018-06-07 19:34:13 +01:00
TehRealSalt
c57d25b213 1v1 battle no items fix 2018-06-06 20:52:13 -04:00
TehRealSalt
795ed07a30 No bumping when respawning 2018-06-06 20:41:23 -04:00
TehRealSalt
118f8f8b2d Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support
(also more item changes from last night that I just forgot to commit earlier)
2018-06-06 18:36:39 -04:00
TehRealSalt
14dcbe1a21 Adjustin' BL based off the netgame, and mashing is back
Now it just cripples your chances for good items, mwaha
2018-06-05 23:46:25 -04:00
TehRealSalt
441f0f8abf Lightning cooldown change
- Lightning cooldown reduced to 20 seconds
- You can no longer mash to get an item quicker
2018-06-05 21:45:54 -04:00
TehRealSalt
09fa365bb1 The Lightning Update
- 30 sec cooldown on all lightning types
- Delay before Blue Lightning hits, based off of distance
- Blue Lightning can swap targets if 1st place is passed
- Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-05 21:36:48 -04:00
TehRealSalt
23d83423cc Lots of cmd restructuring.
- cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster.
- Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now.
- Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request.
- Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 17:12:42 -04:00
TehRealSalt
d00e29c7df P_RestoreMusic restores level exit music as well
Splitscreen fix
2018-06-05 02:41:55 -04:00
TehRealSalt
64c8423897 We did it, we finally fixed... The Shell Boost Bug
Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-04 22:53:45 -04:00
TehRealSalt
5a8eab9513 Minimap offset support 2018-06-04 16:19:36 -04:00
TehRealSalt
01d67c18b3 WHOOPS 2018-06-04 00:29:31 -04:00
TehRealSalt
049e0c231c SUPER CHARGED KARMA ITEMS
They give equal chance on a lot of good shit, instead of the normal boring pool of items, mwahaha

(also calls P_CheckRacers when someone spectates)
2018-06-03 20:58:52 -04:00
TehRealSalt
23af399f61 Some Battle fixes and additions
- mapgotboxes is synched
- Karma bombs/items flash while spinning out
- Karma bombs have a sound + explosion when hitting someone
- Karma bombs can no longer attempt to attack a player that is flashing and have to WAIT... again
- Fixed MT_GREENITEM's bounce sound, after breaking from last commit (WHY ARE YOU ABUSING MARIO MODE SOUNDS, STOP, AGHH)
2018-06-03 20:11:08 -04:00
TehRealSalt
937d95e5a8 Remove collide debug stuff 2018-06-03 18:58:50 -04:00
TehRealSalt
31c3b80039 Less timer reduce on gold shroom 2018-06-03 18:25:28 -04:00
TehRealSalt
d5d1073a79 Fix Battle scoring, hopefully 2018-06-02 10:57:43 -04:00
TehRealSalt
c5b95659b2 Changed time requirements to accomedate lap changes 2018-06-02 10:29:43 -04:00
TehRealSalt
abf1ae5a24 Messing with item distributions a tad 2018-06-01 02:19:40 -04:00
TehRealSalt
ddb8e7a8c4 Incredibly rudimentary Jawz stuff 2018-05-31 20:51:05 -04:00
TehRealSalt
91354d86b2 Fix Star/Mega music persisting after death for splitscreen players 2018-05-30 18:38:30 -04:00
TehRealSalt
a9a6ec9393 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-04-02 06:39:26 -04:00
TehRealSalt
bec43b3129 Race lap linedef executor
Set up similar to NiGHTS Mare linedef executors. Give a sector the "Race
Lap" sector type, tag it, then set the frontside x-offset on the trigger
line to the lap it should activate on minus 1. There are a few flags you
can check on the trigger line to modify its behavior.
- Normally the executor will only trigger if its exactly on the lap
specified. Check Not Climbable to make it execute on laps equal to or
greater than, or check Block Enemies to make it execute on laps equal to
or less than.
- By default, the executor will check current lap with the person in
last's lap. Check E4 to instead find the current lap from the player who
triggered it. This flag is better for triggering events ahead of the
players, while the default effect is better for triggering events behind
the players.
2018-03-31 14:48:49 -04:00
TehRealSalt
9ba13c8ea4 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_baselib.c
#	src/p_inter.c
#	src/p_spec.c
2018-03-31 00:44:03 -04:00
TehRealSalt
6298f4e6ee MK rules for Battle scoring
and quick fix for karma items
2018-03-30 00:53:25 -04:00
TehRealSalt
1b1f29bd2b Unsuck start boosts 2018-03-29 21:43:02 -04:00
TehRealSalt
8561d14727 A quick credits draft
Please give me corrections and people to add. I've not been here as long
as some people, so there is 100% probably people I missed
2018-03-28 16:17:04 -04:00
TehRealSalt
ab0fc15b81 Actually, this makes more sense :U 2018-03-28 15:28:50 -04:00
TehRealSalt
a4ae9a6fe6 Idea: Make Boo make you invisible instead of flash in splitscreen
There's no way atm to make you flash on your screen but not on everyone else's, so I think just making you invisible on all of them keeps the original SMK intent of "you have to pay extra close attention to their screen to know where they are at all" better
2018-03-27 18:30:02 -04:00
TehRealSalt
fb135aede6 HUD improvements
Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 18:22:33 -04:00
TehRealSalt
7264c284cf WIP karma item stuff 2018-03-26 20:36:16 -04:00
TehRealSalt
eb1b84ce5c Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/info.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_mobj.c
2018-03-14 16:12:15 -04:00
TehRealSalt
036029bbd7 Rename fake item to eggman monitor 2018-03-13 21:07:08 -04:00
Sryder
78e2021f4b Make sure it's a waypoint before doing distance calculations 2018-03-13 05:25:04 +00:00
Sryder
201392d34b Fix the item box related crashes
Removed Magnet item box pulling code. It's a mess, hacky, doesn't really help in races, and breaks things. We will implement something new for it soon.
2018-03-13 05:20:47 +00:00
TehRealSalt
638d2fce41 whoops 2018-03-12 01:23:42 -04:00
TehRealSalt
79ba08ac7d Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_user.c
#	src/sounds.c
#	src/sounds.h
#	src/y_inter.c
2018-03-12 00:58:13 -04:00