Commit graph

2374 commits

Author SHA1 Message Date
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
wolfy852
37448a3e92 Merge remote-tracking branch 'remotes/origin/battle' into multi-admin 2017-11-20 21:49:42 -06:00
TehRealSalt
888515331f More lenient checkpoints
Doesn't really belong in this branch but shut up! I'm lazy :p
2017-11-20 02:00:19 -05: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
4af56c2fd6 Better Lua support(?)
Now can retrieve kartstuff, haven't tested but should be fine?
2017-11-17 22:00:10 -05:00
Sryder13
ff667b7e45 Fix the items hitting people you bump bug 2017-11-17 22:40:24 +00: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
TehRealSalt
005e01850d Fix magnet & star 2017-11-11 22:29:38 -05:00
Wolfy
25599ff813 Multiple admins 2017-11-10 23:34:37 -06: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
Steel Titanium
e61549d81f Opps, forgot to change this. 2017-11-08 14:50:27 -05:00
Steel Titanium
55c86f3e15 Successful attempt at restarting the music 2017-11-08 14:48:05 -05:00
Monster Iestyn
7cb0138293 Change version number to 2.1.20 2017-11-08 15:06:42 +00:00
Steel
dbbbc1cc06
Merge branch 'master' into window_center_fix 2017-11-08 00:32:23 -05:00
Steel Titanium
c1405137ec Extra tab space to make the compiler happy 2017-11-07 23:48:03 -05:00
TehRealSalt
890637c4ab Expose some functions to Lua 2017-11-07 18:35:05 -05:00
Steel Titanium
4f8b91c770 Attempt to restart music 2017-11-07 16:26:45 -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
TehRealSalt
a0b8eff8f1 fuck OFF stepmove dick 2017-11-05 12:29:19 -05: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
c0ed28e828 why didn't this merge before?? 2017-11-05 02:17:13 -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
7b01a6c46e Less strict item respawn requirement 2017-11-05 01:49:31 -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
bb35f222c9 1 tid duration on drifting too 2017-11-04 21:58:21 +00: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