Commit Graph

973 Commits

Author SHA1 Message Date
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
Sryder13 28297d9f58 Add separate boost sound for start boost
Allows us to set it to be singular, stopping really loud start boosts with many players
2017-10-25 02:47:24 +01:00
TehRealSalt 0af023d8ca Merge master 2017-10-24 19:31:37 -04:00
Sryder13 fe31394277 Do a quake effect when hit by non-spinout things or explosions 2017-10-24 22:58:59 +01:00
Sryder13 436f7cb7c6 Tossed and shell hitting player sound
Made clash audiable from a bit further away
2017-10-24 20:59:09 +01:00
Sryder13 0422e40649 Add graphic for throwing items
Fix missing frame of clash
2017-10-24 17:19:14 +01:00
TehRealSalt 4be15a9020 Bumpy 2017-10-24 00:42:06 -04:00
TehRealSalt ccc2643459 Reintroduced weighted batle items
No more Boos and Mushrooms while they're broken and sucky, too
2017-10-23 22:24:10 -04:00
TehRealSalt b36fd5c5f9 Did you know: Battle Mode
- Different sizes for the balloons, depending on how many you have
- Balloons are fullbright, cast shadows, and stick closer to players
- Mega Mushrooms can now appear
- Can steal items with Boo in Battle Mode now, as intended
- Death pits make you lose only 1 balloon
- Balloons disappear properly if you use Boo
- Boo item icon should no longer appear if you're out of balloons
- You can now properly respawn in Battle Mode
- Can no longer collide with items if you are already holding one
2017-10-22 17:26:43 -04:00
TehRealSalt f84485c680 More equal, chaotic battle item odds 2017-10-22 04:17:44 -04:00
TehRealSalt 31a13e245c BATLLE MODE
AAAAAA
2017-10-22 03:06:35 -04:00
TehRealSalt 10aa83e614 More minor adjustments
- Display the skin's realname in RA menus
- Can no longer set your skincolor to none on the RA menu
- Edited several color names to fit within 14 characters
2017-10-21 13:22:54 -04:00
TehRealSalt 3994008d31 More score/rings cleanup, hide some hud elements, and most importantly: staff ghosts!
Would be nice to have an option to directly replay a specific staff
ghost, but this should be fine for now
2017-10-17 23:14:51 -04:00
TehRealSalt 9c0437bcd1 Thought I heard something about camera changing, it hasn't, so I decided to port work I did for internal
Basically:
1.) farther camera defaults
2.) different camera settings save
3.) cam_dist automatically increases with splitscreen (& analog mode,
but that's irrelevant for kart :p)

(IIRC someone said that this branch is fine to commit directly to,
please feel free to revert immediately if this isn't the case :V)
2017-10-16 23:52:13 -04:00
ZTsukei ba7580d8e2 = Nerfed Megas across the board.
- Rarer
 - Speed reduced from +25% to +20%
 - Getting squished doesn't last as long
= Nerfed the Banana Meta - or at least changed it
 - You don't wipeout for as long
 - You don't lose as much speed from wiping out (1/2 instead of 1/4)
= Respawning after death is faster
 - Lakitu drops you faster, only three floaty sounds instead of four
= Adjusted the camera to the values given by Sev
2017-10-13 15:44:17 -04:00
ZTsukei 7c71feb274 Fixed thrown items (99% sure)
Thrown items are thrown farther now; distance based on CC.
2017-10-11 10:49:14 -04:00
ZTsukei b95f1d568a Updated item weights
Fix attempt for thrown items
2017-10-10 21:09:38 -04:00
ZTsukei 80990da828 v1.3.18
-------
Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too?
Fixed Megashroom's growth animation lasting too long.
2017-08-09 18:14:20 -04:00
ZTsukei 8d19d18200 v1.3.17
-------
Lakitu returns from his ironically-not-pillowshaded-cloud grave
Dropboosting works on respawn
Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 12:06:29 -04:00
ZTsukei 6381791ca6 Swoopy Start & Lap Lakitu 2017-06-03 18:19:25 -04:00
ZTsukei 192647d4f1 Lakitu Start Lights 2017-05-21 18:25:34 -04:00
ZTsukei eaa5167f71 v1.3.16
--------
Fireballs narrower
Fake Item is no longer restricted while held
Held items that are restricted remain in the item wheel until used
Magnet now correctly hits nearby players and objects
2017-05-17 23:11:00 -04:00
ZTsukei 2972dc9b67 Fireballs work, added to roulette.
Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 11:15:35 -04:00
ZTsukei e72b2921fb Can get items during spin-outs now
Collision now correctly ignores boo and squish
Collision now ignores star
2017-05-11 20:51:53 -04:00
ZTsukei d29586716a v 1.3.13
--------
Added that plus sign
Collision no longer affects ghosted players
2017-05-09 21:21:12 -04:00
ZTsukei 1372cf55c9 Removed drown, maybe extended post-race time so it doesn't jump to results immediately
Added experimental player distance based items
2017-05-07 19:08:11 -04:00
ZTsukei cdf8d793bd v1.3.11
-------
Braking no longer stops on a dime, and instead reduces your speed input. The effect is different between braking and accelerating at the same time, and braking on its own.
Increased 'driftweight' to player->kartweight*14, up from player->kartweight*12.
Changed the base drift curve formula from a range of 447 - 303, to 415 - 303. This will result in a very slightly wider drift arc at low weights. This does not effect the strength of steering while drifting.
Drifting without holding a direction now has a bonus of 0.5 frames, up from 0.
Added kartweight to the required number of drift frames, at half value. Lighter characters take up to 4 additional frames to earn blue sparks, 8 for orange.
2017-04-20 21:51:57 -04:00
ZTsukei 04432f7789 v1.3.10
-------
Accelcode now factors in forwardmove value rather than a boolean. This is used to enable clutching (or whatever you call it; accel+brake) to give its own result.
Fixed Thwomps killing players rather than crushing them.
Reverted buggy collision experiment from previous version.
2017-04-19 21:05:17 -04:00
ZTsukei 74589aaea8 v1.3.09
-------
Reverted drift timer to 52 + player->kartspeed;
Reduced weight's effect on neutral drifting by 10%
Reduced weight's effect on collision by 50%
*EXPERIMENTAL*: Inverted collision's x and y. This should shunt players to the side instead of bump them forward?
2017-04-18 23:24:03 -04:00
ZTsukei 8dd47ef983 v1.3.08 - The Fat One
--------
Driftboost formula changed to:
49 + player->kartspeed*2;
(No longer factors weight from previous version)
Collision code now factors character weight for players.
Collision code now only plays the collision sound once, rather than per player.
Weight now factors into drifting's base value. A heavier character will drift more straight with no input and have less control.
Added a cheat check in SetPlayerSkinByNum(), to force speed and weight within the boundaries of 1 and 9.
Nerfed orange turbo to 50 frames, down from 60.
2017-04-18 21:04:56 -04:00
ZTsukei 1e576fb61f v1.3.07
-------
Changed the drift spark formula from:
51 + player->kartspeed;
To:
43 + player->kartspeed*2 + (10 - player->kartweight);
This allows an extreme heavy/accel to get sparks more often than an extreme light/speed character. Other extremes should be roughly where they were before.
2017-04-17 21:29:57 -04:00
ZTsukei 45dbdfa31c v1.3.06
-------
Increased weight's effect on drifting by 20% (10->12)
2017-04-17 20:38:32 -04:00
ZTsukei 3a90256ff8 v1.3.05
--------
Fixed Drift Sparks.
Added a "IF YOU CHANGE THIS" memo comment.
2017-04-17 13:46:41 -04:00
ZTsukei cfdb127630 v1.3.04 - The Bouncy One
--------
Hardcoded Collide.lua.
Added player boolean array "Collide", used by Collide.lua.
Walls are now bouncy by default again, like they were in 1.09.
Buffed Orange Drift sparks, the boost now lasts 60 frames up from 40.
2017-04-17 13:20:52 -04:00
ZTsukei 1c62f2ff14 v1.3.03
-------
Fixed offroad being applied to almost every sector special. Oops.
2017-04-16 21:51:46 -04:00
ZTsukei e6305ece38 v1.3.02
-------
Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now.
Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric))
Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-16 20:47:48 -04:00
ZTsukei 911508e262 1.3.01
------
Friction now correctly ignores FoFs over the sector (idk if it'll work on FoFs themselves yet)
Friction reduces speed to 1/3, was 1/2.
2017-04-16 16:17:22 -04:00
Sryder ba2cf198bf Make sure it actually compiles 2017-04-16 19:55:21 +01:00
Sryder 56153bbac0 Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value.
This reverts commit aff9a78d76.

# Conflicts:
#	src/d_player.h
#	src/g_game.c
#	src/k_kart.c
2017-04-16 19:01:32 +01:00
Sryder b702a8c121 Slightly buff mini turbo timer 2017-03-13 03:54:31 +00:00
Sryder 55e9df2865 Nerf mini-turbos to be more acceptable 2017-03-13 03:28:54 +00:00
Sryder e122908cb1 renamed mphspeed console var to speedometer
has 4 options, off, Kilometers, miles, and fracunits
2017-03-13 02:44:31 +00:00
Sryder 6c4e4bc457 Fix music not updating correctly 2017-03-11 00:09:10 +00:00
Sryder 8934cf69c7 Account for conveyor belts with no-accelerate movement
use R_PointToDist2 instead of P_AproxDistance for player->speed, more accurate and probably won't cause too much performance trouble
2017-03-10 22:54:54 +00:00
Sryder 603950fde3 Buff star acceleration 2017-03-10 21:27:53 +00:00
Sryder 1ac0f8c5a8 Fix really weird crash I should've checked for
Make the returning of top kart speed slightly cleaner
2017-03-10 03:24:15 +00:00
Sryder c6814943ec Account for scale when getting topspeed for accel code 2017-03-10 02:59:16 +00:00
Sryder a660c65c3f Nerf top speed of drift boost 2017-03-10 02:38:54 +00:00
Sryder 16e0dec70d Change momentum to be closer to the direction you're facing when not pressing the controls 2017-03-10 02:22:49 +00:00
Sryder ebd777fe8b Nerf speeds slightly 2017-03-09 22:09:32 +00:00
Sryder 27f36f208c If you'll be slowing yourself down accelerating, don't
friction can take care of that
2017-03-09 21:53:57 +00:00
Sryder 1e1c33adbf Partial rework to boost power function, uses fixed notation for more flexibility
Boost function returns highest boost instead of averaging them
Star gets acceleration boost
Removed shrunk speed boost
2017-03-09 21:41:11 +00:00
Sryder d6568bbfb9 mph hud speed option 2017-03-09 20:29:17 +00:00
Sryder 6dc9339ab0 Get rid of Lakitu and the specific things for the final lap sound
Lakitu is completely commented out currently and we will be able to re-add it back later
Final lap sounds do some wacky stuff with the variables of the local player only, and also block out the music just to restart it at the same speed currently, changed it to just be the lap sound, we can use a new sound for it later
2017-03-08 21:41:52 +00:00
Sryder 9e1783d092 Larger speed difference between kartspeeds 2017-03-08 01:11:14 +00:00
Sryder 0f754e6beb Hideous early speedometer 2017-03-08 00:28:31 +00:00
Sryder d6fef7ff29 Fix pressing drift button not allowing turning in mid-air 2017-03-07 23:12:46 +00:00
Sryder e13d061e39 Support controller with drifting countersteer 2017-03-07 18:31:37 +00:00
Sryder 7ad34f172c Smooth turning into the drift 2017-03-07 16:28:19 +00:00
Sryder 0d16d6c1f4 Further drift fixes
Fix weird start drifting wrong way bug
Drifting no longer adds to regular turn speed
Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
Sryder 680fdf1416 Re-implement the small turn-back after a drift ends 2017-03-07 03:27:44 +00:00
Sryder 6b83d1cdc5 Gradual turn into drift push angle 2017-03-07 03:00:10 +00:00
Sryder cac7171d48 Merge branch 'cleanupv2' into sonickart 2017-03-07 01:07:55 +00:00
Sryder 515054c599 Fix drifting
No longer does all the angle adjustments inside of the player thinker and instead does it with the controls
Should hopefully avoid any desynch from drifting
Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
Sryder 2807c45b03 Merge branch 'cleanupv2' into sonickart 2017-03-06 21:26:25 +00:00
Sryder bdd03bc830 Remove driftfix and disable looking backwards
I believe editing the player data in G_BuildTiccmd will cause desync, especially for anything that would effect gameplay
driftfix didn't seem to do much, will find a way to re-enable looking backwards properly later (probably change one of the buttons, DRIFTLEFT or DRIFRRIGHT?)
2017-03-06 21:24:23 +00:00
Sryder 7e45718be1 Merge branch 'cleanupv2' of http://git.magicalgirl.moe/KartKrew/Kart.git into sonickart 2017-03-06 16:20:06 +00:00
Sryder 75ba41a8cf Try to stop the weird desync that happens rarely with items 2017-03-06 15:58:10 +00:00
Sryder 88e2c460df Merge branch 'cleanupv2' into sonickart 2017-03-06 03:25:20 +00:00
Sryder aff9a78d76 Remove kart offroad variable and workings.
We can set a standard for friction sectors in maps and people can then do what they want with it.
Also caused problems with Ice and FOFs above friction sectors.
2017-03-06 02:38:35 +00:00
Sryder d860202b8a use R_PointToDist2 to avoid an overflow when walls glitch out and you can accelerate into them endlessly 2017-03-05 23:24:17 +00:00
Sryder ba9ca32c54 Fix the items being given as if having 1 more player than there should be 2017-03-05 19:16:38 +00:00
Sean Ryder d20d3cd478 Make the random items work without the global variables (they broke after the cleanup and started to cause desync) 2017-03-05 17:36:14 +00:00
Sean Ryder e673ea0088 Fix broken turning from earlier warning cleanup 2017-03-05 01:22:29 +00:00
Sean Ryder be3acfff0b Fix warnings
Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
ZTsukei 592c4482a9 Thwomps now squish the player - might need to reduce player height to 1 or something temporarily
Mushrooms rewritten to not use Instathrust, instead they jack up your accel to 10x. Feels nicer.
Floor mushroom panels no longer activate while above them
Mushrooms force player to accelerate (and cannot brake)
K_PlayTauntSound works now. (YES YES YES HUP HUP YES HUP HERE WE GO)
Star and Mega sfx might stop correctly now in netgames (need to test)
Item box radius and height increased from 32 to 36.
2017-03-02 17:59:38 -05:00
ZTsukei 87d09228fa Roulette timer stops manually again - as more players join the game, the player in first will have to wait longer to stop the roulette manually. Players further back will also wait slightly longer, while the person in last will always only take 1 second to stop the roulette.
Fixed drifting so it stops when you're too slow.
2017-02-27 23:54:02 -05:00
ZTsukei f1f78a2349 Reverting friction, but left a note for iceman's magic number.
Intermission timer is back down to 20 seconds unless something breaks with auto-transmissions again.
Also I remembered to enable Magnets this time. Super low odds on it though.
2017-02-27 18:16:53 -05:00
ZTsukei 5d0b9ef551 Friction updated. Added KARTSTUFF to lua. Added ->kartstuff to network syncing stuff (surprised it even worked before now???), also maybe items correctly reset at the end of level now. 2017-02-27 17:55:26 -05:00
ZTsukei f50ecc0dcd Most items work (netgame needs testing), will do fireballs later. 2017-02-26 17:38:24 -05:00
ZTsukei 98137822b8 Fake Items working - Still a weird bug where the item won't throw if you're turning. 2017-02-26 10:19:33 -05:00
ZTsukei e7280fc53a Some drift adjustments 2017-02-24 20:01:06 -05:00
ZTsukei d9944e9c41 Steering fixes, drifting changed, weight has effect now 2017-02-23 20:37:16 -05:00
ZTsukei 66a206cc55 Driftboosting now increases player accleration
Consolidated the turning and drifting values to k_kart functions for easier editing
Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-21 23:42:21 -05:00
ZTsukei 226e7ead59 DevEXE version 1.1.00: Added some MD5 checks, increased md2 triagle limit, temporarily disabled magnet 2017-02-20 20:08:24 -05:00
ZTsukei 28544af035 Star works, configured to work in multiplayer with just speed items for now... Will return to look for color stuff later. 2017-02-19 19:42:10 -05:00
ZTsukei 493436dc1a Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size 2017-02-19 15:54:23 -05:00
ZTsukei 7b7a6e5458 Added fancypants mega shroom, fixed drift boosting 2017-02-19 12:19:02 -05:00
ZTsukei 3fecdd7658 Item boxes no longer solid 2017-02-18 15:51:35 -05:00
ZTsukei 0a782bf79e Fixed thwomp sectors, Added Magnet Item. 2017-02-18 13:39:50 -05:00
Sryder 68d439a783 Merge branch 'upstream/next' into zarrotsu_vanillamerge
# Conflicts:
#	src/Makefile
#	src/doomdef.h
#	src/hardware/hw_main.c
#	src/p_mobj.c
#	src/p_user.c
#	src/r_segs.c
#	src/sdl/i_video.c
#	src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
ZTsukei 5cc8445812 Finished the item roulette numbers, thank god. 2017-02-17 10:26:41 -05:00
ZTsukei 370f290a08 Fixed position code, added some item numbers 2017-02-16 21:33:15 -05:00
ZTsukei b0b51f9a61 Some position code 2017-02-12 23:25:06 -05:00
ZTsukei fadcd17022 Some accelcode changes to let CC's work. 2017-02-09 23:57:36 -05:00
ZTsukei 580f909c6c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
ZTsukei 66c6b6885f Updates done a while ago... Not 100% sure what they were. :x 2016-11-20 23:23:10 -05:00
ZTsukei 82b0e9962e Toaster's friction code??? 2016-08-23 21:04:06 -04:00
ZTsukei da7a513c9a Some drift code, some control code 2016-08-21 17:55:37 -04:00
ZTsukei 3a3180ce05 Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
ZTsukei d631d0ef04 S_PLAY states, HUD stuff 2016-08-14 23:51:25 -04:00
ZTsukei 4112d44529 Some Color code, Kart powers 2016-08-11 21:42:16 -04:00