Commit graph

451 commits

Author SHA1 Message Date
TehRealSalt ea3b82791f Whoops, no break here 2018-06-10 21:05:09 -04:00
TehRealSalt a554763128 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 07a18e5185 Merge branch 'master' into sonicitems 2018-06-09 22:50:21 -04:00
Sryder 0a85e75eb8 Accidentally made HitEm sounds always play, even when hitting your own items 2018-06-09 16:42:03 +01:00
Sryder 2adbcd6dfd Merge branch 'master' into dust-kart 2018-06-09 01:00:03 +01:00
Sryder 17245b2d6b Merge branch 'master' into voice-loss-jpg
# Conflicts:
#	src/k_kart.c
2018-06-09 00:56:39 +01:00
Sryder 10270d20dd 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 3daf6fbfd7 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 f00e3dfd5a 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 4e2b30fcae Fixes 2018-06-08 00:02:28 -04:00
TehRealSalt 9b3751b30c Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
Sryder 97caf79f16 Whoops, accidental rename 2018-06-07 20:03:47 +01:00
Sryder 213749b115 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 6023f794ac Restore the removed voices 2018-06-07 19:34:13 +01:00
TehRealSalt 7611f2c610 1v1 battle no items fix 2018-06-06 20:52:13 -04:00
TehRealSalt 7100db62ca No bumping when respawning 2018-06-06 20:41:23 -04:00
TehRealSalt babc8be5da 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 eb8464744b 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 6301d0ee38 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 5f610982ea 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 d3793cb19c 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 173d780ab7 P_RestoreMusic restores level exit music as well
Splitscreen fix
2018-06-05 02:41:55 -04:00
TehRealSalt b4757779cd 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 ae66a8f769 Minimap offset support 2018-06-04 16:19:36 -04:00
TehRealSalt 09311bf061 WHOOPS 2018-06-04 00:29:31 -04:00
TehRealSalt 6d57d39e12 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 8408b1fef4 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 0906978a2a Remove collide debug stuff 2018-06-03 18:58:50 -04:00
TehRealSalt b0099bd1cc Less timer reduce on gold shroom 2018-06-03 18:25:28 -04:00
TehRealSalt dff33deb52 Fix Battle scoring, hopefully 2018-06-02 10:57:43 -04:00
TehRealSalt 73205c8229 Changed time requirements to accomedate lap changes 2018-06-02 10:29:43 -04:00
TehRealSalt bc5c279317 Messing with item distributions a tad 2018-06-01 02:19:40 -04:00
TehRealSalt bf3910cdca Incredibly rudimentary Jawz stuff 2018-05-31 20:51:05 -04:00
TehRealSalt 75e77189d6 Fix Star/Mega music persisting after death for splitscreen players 2018-05-30 18:38:30 -04:00
TehRealSalt 428a134cda Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-04-02 06:39:26 -04:00
TehRealSalt 15f0e16344 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 00e913bbcc 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 e974b6e4b7 MK rules for Battle scoring
and quick fix for karma items
2018-03-30 00:53:25 -04:00
TehRealSalt 3d8441fe54 Unsuck start boosts 2018-03-29 21:43:02 -04:00
TehRealSalt caa000d5d6 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 8e9d09121e Actually, this makes more sense :U 2018-03-28 15:28:50 -04:00
TehRealSalt 84944f1a52 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 ac6a996c0d HUD improvements
Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 18:22:33 -04:00
TehRealSalt e16bf1cf75 WIP karma item stuff 2018-03-26 20:36:16 -04:00
TehRealSalt d99339ecd0 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 e5798f7490 Rename fake item to eggman monitor 2018-03-13 21:07:08 -04:00
Sryder f26c96175d Make sure it's a waypoint before doing distance calculations 2018-03-13 05:25:04 +00:00
Sryder 07c7bc05c5 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 f25b2f0256 whoops 2018-03-12 01:23:42 -04:00
TehRealSalt 375f9a9291 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
TehRealSalt 7e007c2832 Restored bounce pad strafe 2018-03-06 01:31:49 -05:00
TehRealSalt f97ec30493 Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype
Should make it a lot easier to add more gametypes later.
Also some minor fixes:
- Changed up how shell speed scales in mobjscale juuuust slightly, so
it's less messy
- Fixed CHECK showing spectators
2018-03-04 15:27:52 -05:00
TehRealSalt 1e1867fe42 General fixes
- Flame trails don't spawn if you're not on the ground
- Mobjscale: Shells are now the correct speed
- Mobjscale: Explosion's wipeout hit height scales
2018-03-04 14:28:29 -05:00
TehRealSalt b0be1c7bbf Hopefully this fixes item throwing & distribution in mobjscale maps 2018-03-01 17:20:13 -05:00
TehRealSalt f0067d4719 Restore battle wait fade 2018-02-27 22:07:20 -05:00
TehRealSalt a144a04abb Taunt sound simplification 2018-02-27 21:18:42 -05:00
Sryder 631b96883a Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-02-24 22:38:28 +00:00
TehRealSalt cb593aa2b1 Battle Mode wins award (player count * 2) points now 2018-02-20 20:08:53 -05:00
TehRealSalt da32f9a4ed Fixed fourth taunt sound not playing
% 4 would output 0 to 3, not 1 to 4 guys :V
2018-02-20 19:33:50 -05:00
TehRealSalt 2a23549d63 Winning positions scale with number of players
Anyone in the top 50% gets winning music & blue position, everyone below
gets the losing music & red position. For odd numbers, it rounds up.
2p: 1st wins, 2nd loses
3p: 1-2 win, 3rd loses
4p:  1-2 win, 3-4 lose
5p: 1-3 win, 4-5 lose
6p: 1-3 win, 4-6 lose
7p: 1-4 win, 5-7 lose
8p: 1-4 win, 5-8 lose (SMK)
12p: 1-6 win, 7-12 lose (modern MK)
16p: 1-8 win, 9-16 lose (max player count)
In big netgames you won't just hear the losing music all of the time now
:V
2018-02-20 19:11:09 -05:00
TehRealSalt 275132da5f Minor but important fixes 2018-02-17 01:53:44 -05:00
TehRealSalt 3e7fbad490 Porting over some things from sonicitems 2018-02-13 16:48:09 -05:00
TehRealSalt 00d2038d61 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c

(Also I added some extra music for voting, because I forgot I didn't
commit the merge :V)
2018-02-11 12:18:25 -05:00
TehRealSalt dbc664d4e7 Minor fixes, mostly mobjscale and spectators 2018-02-10 16:19:22 -05:00
TehRealSalt 4348be7d80 Chaotix sound effects, new music names 2018-02-10 16:01:09 -05:00
TehRealSalt 2889687d1d New invincibility effect, grow/shrink stuff
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
TehRealSalt 819d370fb3 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-02-09 21:16:10 -05:00
TehRealSalt 70f959815a Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-08 21:24:56 -05:00
Sryder13 844b1dc2c0 Some warning fixes 2018-02-09 00:58:10 +00:00
TehRealSalt 85a81ed087 Minor adjustments in hopes that I fixed the resynch bomb on gametype switch? 2018-02-08 17:13:06 -05:00
Sryder13 858a7adcb3 The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt e6c040b844 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-07 22:34:33 -05:00
TehRealSalt 8c2bdfd006 Belp
- Minimap heads that aren't yours are transparent
- Minimap has a visibility slider
- Bomb stuff renamed to Mine
2018-02-07 22:33:27 -05:00
TehRealSalt 00af56aa2a Merge remote-tracking branch 'refs/remotes/origin/flair' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/p_enemy.c
2018-02-05 21:08:01 -05:00
TehRealSalt e516d09ae4 Colored boom
Not tested *yet*
2018-02-05 20:10:20 -05:00
TehRealSalt f7813d6fef Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 2018-02-05 19:43:32 -05:00
TehRealSalt 3749914588 Fix more conflicts that I forgot 2018-02-05 19:40:26 -05:00
Sryder13 29acd26846 Fix the explosion smoke ring (and warning) 2018-02-06 00:23:10 +00:00
TehRealSalt d9c49d9527 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/dehacked.c
#	src/hardware/hw_main.c
#	src/info.c
#	src/info.h
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_user.c
#	src/r_things.c
2018-02-05 19:08:49 -05:00
TehRealSalt cbff4bbf44 So much
- Renamed fucking everything
- Threw out all of the item code because it looks at me funny
2018-02-05 18:55:52 -05:00
Sryder13 c52475a630 New bomb explosion effect 2018-02-05 22:53:31 +00:00
Sryder13 d41d5800eb Some explosion stuff
Sphere spawns at centre and quickly grows before stopping
While sphere grows players get flung up
Fix some issues with battle mode stuff stopping bobombs from working
2018-02-05 19:24:54 +00:00
Sryder13 68338f560b Draw Minimap at regular size
Also positioned the minimap completely at the side of the screen as they're 5% scaled anyway
2018-02-05 03:59:36 +00:00
Sryder13 ae55938646 Merge branch 'minimapfix' into flair 2018-02-05 03:28:09 +00:00
Sryder13 ac481ed185 Pure white and pure black shouldn't change on star colormap 2018-02-05 02:53:55 +00:00
Sryder13 4b06594dd0 Star colormap is decided to be used per mobj with mobj->colorize
Star creates afterimages that are colorized and fullbright
Star makes the player fullbright
2018-02-05 00:00:36 +00:00
TehRealSalt aa7fab06fc Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:44:41 -05:00
TehRealSalt 32b2818ab6 Quick fix :V 2018-01-29 19:43:22 -05:00
TehRealSalt 202ad11b43 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:20:23 -05:00
TehRealSalt 1e01e65a8b Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle 2018-01-29 19:15:25 -05:00
TehRealSalt 41f09816ce Functional, ready for netgame! 2018-01-27 23:52:01 -05:00
TehRealSalt 403e14e971 Merge remote-tracking branch 'refs/remotes/origin/master' into menus-cvars-unlocks
# Conflicts:
#	src/g_game.c
#	src/m_cheat.c
#	src/p_user.c
2018-01-24 16:24:36 -05:00
TehRealSalt f6cfcd4f89 Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu
No more weapon number buttons, button constants reordered, and BT_JUMP
renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff
we didn't need. Spectator-only support for looking up/down soon.
Keyboard defaults are just what I use, plan on adjusting it further
after more feedback
2018-01-24 02:45:06 -05:00
TehRealSalt 8b88a2ebd8 Spectating is properly implemented now
- Spectate button works
- Spectating & objectplace controls are usable now
- New spectator HUD
2018-01-22 22:18:57 -05:00
TehRealSalt b600fae9ba fut 2018-01-16 18:02:16 -05:00
TehRealSalt db09f7b3d6 Lots of changes
- Menus now have all of the Kart cvars
- Removed any cvars that aren't useful for Kart from the menu (they
still exist in the console, though)
- Removed SP and NiGHTS Mode options from the main menu
- "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples
of 50, or the terms "Relaxed", "Standard", and "Turbo"
- Many gametype options (game speed, frantic, mirror, & karma comeback)
are now changed on map load instead of instantly
- New cvar, "kartminimap", for disabling the minimap
- The maxplayers cvar now actually matches up with our 16 player limit
- Game now keeps track of matches played. Has a condition type
associated with it, as well.
- Game checks for unlocks and saves gamedata when finishing a match,
even in MP
- Removed most of the normal emblems, added a single emblem for Green
Hills. Didn't know what to do with extra emblems and such so I just left
them (FOR NOW c:<)
2018-01-15 22:31:14 -05:00
TehRealSalt 61a4ea6962 Mobj scale fixes
- MAXSTEPMOVE is affected by mobjscale
- Minimum bump speeds (both wall & object) are affected by mobjscale
- Minimum speed required for drifting is affected by player scale
- Speedometer speeds are proportional to mobjscale
- Camera no longer scales with player scale, to make the fact that
you're either Lightning'd or Mega'd more obvious :V
- Sevvvvvv go work on Dimension Heist
2018-01-15 16:14:45 -05:00
Sryder13 a7ba7cf276 Fix minimaps for any maps that are larger than half of the mappable area, in either direction. 2018-01-13 21:07:44 +00:00
TehRealSalt 3f1b312c77 Title screen 2018-01-13 14:24:02 -05:00
TehRealSalt 6b1b715502 Switched Gold 'shroom and Star's chances
Doesn't really belong in this branch, but it's also an experimental
change that needs a decent-sized netgame to test to make sure it doesn't
hurt anything. Done because Gold 'shroom is a lot harder to use as a
catch-up item now that it reduces timer whenever you use it
2018-01-08 16:51:38 -05:00
TehRealSalt 9908339989 A bunch of little things
- Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT
- Solid objects now bump players instead of stop them
- Bounce pad strength scales with object scale
- Fixed Boo stealing being inconsistent and sometimes not stealing
anything
2018-01-08 15:48:19 -05:00
TehRealSalt c70a2f51aa Tweeeeeaks
- MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples
- Made some Battle-related messages only happen in netgames
- Messed with the timing on the intro
2017-12-28 18:37:25 -05:00
TehRealSalt 6d263a0dff Lots more little adjustin's 2017-12-26 21:36:03 -05:00
TehRealSalt ab010f91b0 Last few finishing touches for the HUD
Battle Mode cards & Race countdown timers display properly
2017-12-25 10:05:36 -05:00
TehRealSalt 189d2f7a34 Fixed joysticks 3 & 4
fun typos
2017-12-24 15:02:41 -05:00
TehRealSalt 9c7aad2929 Okay lets ACTUALLY fix it now :V 2017-12-24 09:19:59 -05:00
TehRealSalt ae1fc244c5 agggh more minor 2017-12-24 09:02:40 -05:00
TehRealSalt df03c27ba4 minor 2p/4p fix 2017-12-24 08:58:04 -05:00
TehRealSalt c2db0ddca2 Battle hud stuff?! 2017-12-23 20:55:23 -05:00
TehRealSalt 7a5bd7c597 Closer to done HUD tweaking?
Splitscreen in Battle is left
2017-12-23 19:14:06 -05:00
TehRealSalt 508df2e269 thing 2017-12-22 16:24:20 -05:00
TehRealSalt 94a42d1bf6 Unfinished V_HORZSCREEN revamp 2017-12-22 10:16:41 -05:00
TehRealSalt 59976d3ce8 More post processor support, HUD tweaks, SP new game fix
Mirror Mode minimap, growing position nums, and general reorganization.
Some stuff needs more work but I'm exhausted rn
2017-12-19 01:55:33 -05:00
Sryder13 47ee5f3976 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart.git into quads 2017-12-19 03:12:30 +00:00
Sryder13 d0b4ad0ce7 Fix Minimap Icon positions for new Minimap scale 2017-12-19 03:11:51 +00:00
TehRealSalt 5db276173e Merge remote-tracking branch 'origin/quads' into quads
# Conflicts:
#	src/k_kart.c
2017-12-18 21:11:59 -05:00
TehRealSalt 349b27e0de Change splitscreen into UINT8, fix HUD slightly more 2017-12-18 20:59:04 -05:00
Wolfy 36439da320 Resurrect the minimap
Still kinda broken.
2017-12-18 18:07:38 -06:00
Wolfy ea49a4c009 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart into quads 2017-12-18 04:57:57 -06:00
Wolfy 2e26e79934 Fix 3P and 4P configuration screens
They don't crash anymore!
2017-12-18 04:56:38 -06:00
TehRealSalt 6346058f35 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart into quads 2017-12-18 01:03:14 -05:00
TehRealSalt 122eb82170 Merge remote-tracking branch 'refs/remotes/origin/battle' into quads
# Conflicts:
#	src/g_game.c
#	src/k_kart.c
2017-12-18 01:02:53 -05:00
Wolfy c5a4822df6 Reorganize minimap code 2017-12-17 23:12:51 -06:00
TehRealSalt d2425329ca HUD 2017-12-17 20:42:17 -05:00
TehRealSalt fc9d426660 More stuuuuff 2017-12-17 01:21:24 -05:00
TehRealSalt db1f584c13 MobjScale setting for map headers
Replacement for Oldbrak mode, lets you set any scale instead of only
1/2, also modified some of Kart's scale shenanigans to be compatible.

Requested by Sev for Dimension Heist
2017-12-16 15:38:15 -05:00
TehRealSalt 6e47a14815 Some HUD tweaks
- CHECK now works in Mirror Mode
- Lakitu flips in Mirror Mode
- CHECK now shows up in splitscreen, because why not
- Fixed a compiling error as a result of me attempting to revert wipeout
2017-12-13 18:01:26 -05:00
TehRealSalt f69270027c Reverted wipeout 2017-12-12 19:58:44 -05:00
TehRealSalt ffbf6e8752 Mirror Mode
- Added kartmirror cvar, flips the screen & player controls. The
post-processing effect is currently Software only; will need an OpenGL
implementation but I don't know enough to make that happen
- Moved adminplayer = -1 setting to SV_ResetServer instead of
SV_StartServer
2017-12-12 00:07:14 -05:00
Wolfy fb976ab26c more quad stuff 2017-12-11 00:12:38 -06:00
TehRealSalt f5650eba09 Wipeout & minor tweaks
- SMK-style wipeout
- Using goldshroom removes some of its timer again
- Karma item boxes follow the player more closely
- "ATTACK OR PROTECT" no longer appears when you die if you've already
seen it
- Lua support for our SOC actions
- Fixed KARTSTUFF_LIST for Lua/SOC
- "Battle" is now an accepted word in level headers for setting
TOL_MATCH
- Default map numlaps is now 3 instead of 4
- Reverted making LF2_RECORDATTACK and LF2_NOVISITNEEDED default menu
flags, needs to be set manually now
2017-12-10 20:58:34 -05:00
wolfy852 8de9c46b68 Merge branch 'multi-admin' into battle
# Conflicts:
#	src/k_kart.c
2017-12-03 16:32:44 -06:00
TehRealSalt 73217690ab okay THIS time i actually made sure it compiled 2017-11-30 18:25:59 -05:00
TehRealSalt e430a3bced Mooore tweaks
- Fixed position numbers; orders by balloons first then points (before
it was doing it the other way around), and the leading players should
never display as like 3 or something if there's ties :v
- Messed with Boo & Feather frequencies to be less common in Battle
- Fixed the issue when a karma bomb steals a balloon from one of the two
last people standing, kills them, and comes back, and the game ends
anyway, giving two players the "win" bonus
- Removed karma items being able to pass their items to other karma
bombs. This never worked correctly in the first place, and I'm 95% sure
it's what's been causing people to be ghosts forever
2017-11-30 17:34:48 -05:00
TehRealSalt 1e5c016eb1 X & balloons on ranking
no i still haven't fixed the numbers yet, but the order should still be
ok :V
2017-11-29 19:35:37 -05:00
TehRealSalt d43c731b55 3 minor tweaks
- Enemies can no longer award points
- You should no longer get karma for "bombing" someone during their
invincibility frames
- Red shells have slightly more friction in Battle
2017-11-29 18:31:17 -05:00
TehRealSalt 10e09e5719 aaaaand another little bugfix 2017-11-29 02:09:42 -05:00
TehRealSalt 2f23ff466c More tweaks to cards 2017-11-29 02:07:22 -05:00
TehRealSalt c3ca835284 Forgot to change a line back after I finished testing something, oops 2017-11-29 01:11:30 -05:00
TehRealSalt addfde0f09 Battle card animations
Was hoping not to waste another variable on this, but oh well
2017-11-29 01:09:46 -05:00
TehRealSalt 9b7893995f And I changed my mind again!
Even *more* extreme
2017-11-28 22:42:09 -05:00
TehRealSalt 5e2f06b4e1 Tweaking balloon-based items further
The last change was a step in the right direction and there was more
item variety going on, but the differences need to be just sliiightly
more extreme
2017-11-28 22:26:35 -05:00
TehRealSalt 198685582f Previous EXE: The Better Edition
- Improve balloon-based items. Much more distinguished differences
between the different ranks
- Reverted Feather strafing. You can now just... properly move in the
air, if you're using a Feather or a Bounce Pad.
- Bounce pads are now stronger while using speed items.
- Fixed the long standing bug about offroad & ziplines working when
you're on FOFs above them. This is a tricky subject, so please report
any issues you may come across related to this.
- Shells should no longer travel to Mars, nor will they  when using
bounce pads. They should now do a gentle hop.
- :WIP: new MP Player Setup screen, now shows character stats. Will
later feature the list of characters in a row of icons, and a backported
2.2 color selector with toast's permission
- Renamed "Match" to "Battle" :p
- Yet MORE minor cases where kartspeed & kartweight were being read as
fixed_t when they're freakin' UINT8's, people!
2017-11-28 01:13:23 -05:00
TehRealSalt 4288d6c668 Fix up balloon-based items 2017-11-23 22:34:36 -05:00
TehRealSalt 8638e8f4c7 Many things!
- Position faces are now drawn in Battle, categorized first by balloons,
then by points
- Balloon-based items, gives people who are worse off better items, and
people who are better off worse items.
- You can strafe while using feather or while using a bounce pad
- Reduced the strength of bounce pad thrust on items
- Increased bounce pad's minimum forward push on players
- Made Frantic Mode just a teeeeensy bit more frantic
- Fixed being able to use Feathers mid-air
- Fixed being unable to steal Feathers
- Drift sparks use frameangle instead of angle
2017-11-22 21:40:17 -05:00
wolfy852 732cef777f Merge in battle, unfuck the code 2017-11-21 01:23:06 -06:00
TehRealSalt a2767fe341 Some more minor comeback tweaks
- Comeback players are now 1 speed with -20 friction
- Bombing gives 2 karma now
- Item players should no longer be able to be hit
- Attempted to fix instances of trying to bomb someone while they can't
be touched causing you to lose all your karma and start a console
message saying you're back in the game, despite not rewarding a balloon
- Fixed a few places where kartspeed & kartweight were being read as
fixed point numbers, despite being UINT8's
- Fixed up kartstuff Lua support more, functions properly now
2017-11-19 19:39:40 -05:00
TehRealSalt 81c723b9b5 Bounce Pad stuff
- K_DoBouncePad now uses mobj_t instead of player_t
- Bounce pads can now bump thrown shells
- Bounce pads now give heavier gravity to players
- The suicide command now works in all gamemodes
2017-11-19 02:37:28 -05:00
TehRealSalt f601520199 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle 2017-11-17 22:01:57 -05:00
TehRealSalt 06eca5fbb5 Minor things
- crash fix
- commented out player 2 spawning with balloons
- double checked battle exiting is 10 sec
2017-11-17 17:36:04 -05:00
TehRealSalt cca30d1095 Lots of small tweaks & fixes, that should make Battle a LOT more bearable
- Comeback timer is now always 10 seconds instead of scaling
- Takes 10 seconds before exiting
- Flashing tics is doubled in Battle Mode
- Removed a bunch of bomb nerfs
- Bombs are back to making only 1 point per hit
- Exposed K_GetKartAccel & K_GetKartFlashing to Lua
- Item boxes should no longer drop while going up slopes
- Trading item boxes with a bomb should turn you back into a bomb
- Balloons should no longer all respawn when dying in pits in 2-player
games
- Flashing players are able to kill *thrown* shells again (shields and
trap items are still unkillable). Prevents red shells from being able to
stick to a flashing player and hurt them again as soon as they're done
flashing
- CHECK appears at a farther distance
2017-11-17 00:48:36 -05:00
TehRealSalt 3d3972fac9 Battle HUD stuff 2017-11-13 20:45:57 -05:00
TehRealSalt b64e9a1501 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle 2017-11-13 17:02:56 -05:00
TehRealSalt 2360516e66 Yet more comeback stuff!
- You can now choose to carry an item to someone instead of bombing
- You need to bomb someone or give an item a combined total of three
times in order to come back.
- Bombing somone gives 2 points while giving items doesn't award you any
points.
- Position number still flashes after you've won, and it flashes rainbow
for people who have won and are in 1st place!
- Flashing players can no longer eat items
- Fixed kartstarsfx playing the alarm in conjunction with music
- Fixed some items no longer causing wipeout
2017-11-12 22:48:32 -05:00
Sryder13 3eb3a74b5d Merge branch 'battle' of http://git.magicalgirl.moe/KartKrew/Kart.git into battle 2017-11-11 03:28:39 +00:00
Sryder13 1f6877e1e7 Don't allow the player to respawn on a mapthing if it will collide them with another player
Mainly effects battle where match starts are used, race will be effected at the beginning of races though
2017-11-11 03:28:20 +00:00
TehRealSalt c5920b431f Lots of misc stuff
- Bomb overlay is invisible during comeback timer, and flickers back in
when it's almost up
- Show comeback timer on HUD
- Feather is stronger & has more gravity
- Option to use SMK star alarm instead of overlapping music
- Using P_MobjDamage normally on players now defaults to normal spinout
instead of shell's instant stop
- Some general gametype case fixes (most notably, being able to spin
people out in Race using a mushroom)
2017-11-10 21:10:01 -05:00
Sryder13 d480ce24a9 Stop players bumping when they're reborn 2017-11-11 01:17:42 +00:00
Sryder13 8fbdbb4c64 Fix shells spawning under FOFs
Make items dropped behind you fall on the floor properly
Fix bananas getting stuck in midair if they aren't moving
2017-11-11 00:25:57 +00:00
TehRealSalt 890637c4ab Expose some functions to Lua 2017-11-07 18:35:05 -05:00
TehRealSalt cacc9ee97f Made Frantic Mode work in Battle Mode & provide more silly results
Also fixed flashing
2017-11-07 15:04:21 -05:00
TehRealSalt 01afd52ad0 Bounce pad sector type
Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 02:36:27 -05:00
TehRealSalt 7fcca8f2d1 Added feather 2017-11-07 00:57:42 -05:00
TehRealSalt 7eb9f56741 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
# Conflicts:
#	src/p_mobj.c
2017-11-06 17:44:32 -05:00
TehRealSalt bd7e5bc313 HUD shenanigans
In battle because it messes with CHECK, and also I'm too lazy to switch
branches
2017-11-06 17:31:52 -05:00
Sryder13 8f532b48ef Various held and thrown items tweaks
"Missile" items are spawned on the ground and should follow slopes when the player is on the ground
Forwards thrown items should work in reverse gravity
Dropped items are dropped slightly closer (depends on player and item radius) and have their position set correctly
Held items are held closer (depends on player and item radius)
2017-11-06 15:27:15 +00:00
TehRealSalt 7eb4a958f7 More adjustments
- Comeback timer gets higher the more you get hit
- Your ghost appears over the bomb
- Speed & accel is set to worst while a bomb
- CHECK range scales with kartcc
2017-11-05 23:18:58 -05:00
TehRealSalt 8756293906 Minor fixes 2017-11-05 20:41:54 -05:00
TehRealSalt 98afcbbd5a Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle 2017-11-05 16:45:31 -05:00
TehRealSalt 9bea44e5c1 Fix this garbage 2017-11-05 16:34:12 -05:00
Sryder13 3d11e2ae28 Increase minimum bounce
Don't run xy bouncing if objects are directly ontop of each other
Don't run xy bouncing if objects are moving away from each other
Move z bouncing to be done first so that returning from xy collision doesn't stop it
2017-11-05 21:33:22 +00:00
Sryder13 351670513d Give explosion particle mobjs the target of who spawned it (bomb thrower, blue lightning user)
So that explosion particles can trigger voice lines (and not crash) and add points for players in battle
Also don't play voice lines when you hit yourself
2017-11-05 17:15:19 +00:00
Sryder13 10818f254b Minimum bounce speed 2017-11-05 16:46:26 +00:00
Sryder13 5054ce72e0 Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks
# Conflicts:
#	src/d_player.h
#	src/k_kart.h
#	src/lua_playerlib.c
2017-11-05 14:51:52 +00:00
TehRealSalt 57b4d73ec2 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
# Conflicts:
#	src/k_kart.h
2017-11-05 02:19:05 -05:00
TehRealSalt d3e888cc44 Merge remote-tracking branch 'refs/remotes/origin/master' into battle
# Conflicts:
#	src/d_player.h
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_playerlib.c
2017-11-05 02:16:39 -05:00
TehRealSalt a9c1b3e747 Everything.
- Player arrows now show if a player is in the item roulette
- Boo has been improved, and added back to Battle's item roulette
- The CHECK HUD item is now more accurate, and should appear more often
- Early comeback mechanic. Functional, but really unpolished
- Attempted (again) to make the first player to join in a netgame spawn
with balloons
- No longer shows respawn text on death
2017-11-05 01:43:47 -05:00
Sryder13 51af54d0ff Voices for when you hit someone else
Not totally sure on them, but it's worth a try, would make it more obvious when you hit someone with a trap item in battle anyway
2017-11-04 20:42:01 +00:00
Sryder13 c9ddb7a4b5 Re-add lost player vibration frames
Separate sprites for fast moving frames
Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
Sryder13 81a077b9af New player frameangle used instead of mobj angle for players
Set to mobj angle except when spinning where it's set to spin
Only 1 spin frame needed now
2017-11-04 14:07:53 +00:00
Sryder13 8315ccd475 Change player collision again, they bounce away from each other naturally
Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
TehRealSalt 1dcdaf0c44 I actually didn't do any of this right!! Whoops!!
Also made red shells dumb in battle mode
2017-11-02 21:40:06 -04:00
TehRealSalt 2cbef008c8 Merge remote-tracking branch 'refs/remotes/origin/gameplay-tweaks' into battle
# Conflicts:
#	src/k_kart.c
2017-11-02 21:03:14 -04:00
Sryder13 e5a32eb699 New collision mechanics, player's transfer their speed along movement when they collide, then bounce off at a set speed away depending on weight from each other 2017-11-03 00:43:51 +00:00
TehRealSalt 9a822fae80 Balloon stealing! Mushroom is back! 2017-11-02 20:43:03 -04:00
TehRealSalt d0a455c7dd More tinkering with the item list
Increased item variety (triple reds added with same chances as star &
megashroom, triple bananas are back), and the deadliest items should be
less likely due to more weight on the weak items. Doesn't add up to 20
anymore, though; will likely be fixed when balloon-based items get
implemented.
2017-11-02 01:18:16 -04:00
TehRealSalt b7432cd154 Change draw order
Lakitu is a bottom
2017-11-02 00:41:04 -04:00
TehRealSalt 9522e1b95e CHECK indicator
Turn it off with the kartcheck console var
2017-11-02 00:35:10 -04:00
TehRealSalt cc01d2c3f0 Balloon revamp
Supports arbitrary balloon counts now
2017-11-01 18:46:35 -04:00
TehRealSalt 4fce06d80e Dang it. 2017-11-01 16:24:40 -04:00
Sryder13 e60b3e1b88 Move Player collision check into the regular collision checking 2017-11-01 18:40:32 +00:00
TehRealSalt b4a1ad4ef2 Just bumped timer 2017-10-31 16:14:17 -04:00
Sryder13 48e0d64525 More changes to thrown items, higher gravity and fly faster 2017-10-28 02:44:25 +01:00
TehRealSalt 4a02e166a1 Merge remote-tracking branch 'refs/remotes/origin/master' into battle 2017-10-26 19:39:02 -04:00
TehRealSalt b127c02e2c Maybe message fix 2017-10-26 19:37:13 -04:00
Sryder13 bda85bea4a Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks 2017-10-27 00:02:05 +01:00
Sryder13 a00123e663 Item Throw distance/height experimentation 2017-10-27 00:01:59 +01:00
Sryder13 8742b3b2d9 Star power translation tables
Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 20:04:05 +01:00
TehRealSalt 69d6d43fea Everything I did today; mainly player arrows
Also some minor tweaks and bug fixes all around
2017-10-26 02:31:01 -04:00
TehRealSalt 6c1269a6f4 Balloons message 2017-10-25 16:20:28 -04:00