Commit graph

145 commits

Author SHA1 Message Date
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
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