Commit graph

1114 commits

Author SHA1 Message Date
TehRealSalt
0f4fd73533 Try out boost stacking 2019-03-11 12:00:39 -04:00
TehRealSalt
5507a41d64 Make Grow not cancel if holding down from roulette 2019-03-11 11:10:53 -04:00
TehRealSalt
5afe936dd9 Remove Eggman monitor early detonation, allow using rings during the countdown 2019-03-11 11:01:01 -04:00
TehRealSalt
d11394f1bd Remove ring boost when hurt 2019-03-11 10:38:11 -04:00
TehRealSalt
c35e5cb095 Ring debt bump wipeout spawns hit sparks 2019-03-11 10:34:54 -04:00
TehRealSalt
13bedab061 Change HUD ring spin mechanic
Instead of spinning at max speed while boosting & slowing down after, the spinning speed depends on how much ring boost you're currently using. This means Tails/Chao's ring spins super fast, Metal/Omega's ring spins super slow.
2019-03-11 03:09:16 -04:00
TehRealSalt
f0cf1bb39b Merge branch 'rings' of https://git.magicalgirl.moe/KartKrew/Kart into rings 2019-03-10 06:15:30 -04:00
TehRealSalt
523e46b3fb Finally animate the spinning ring 2019-03-10 06:15:26 -04:00
colette
4cbc4b1835 Merge branch 'remove-pinvin' into 'next'
Kill invincibility item caps

See merge request KartKrew/Kart-Public!108
2019-03-09 22:16:25 -05:00
Sryder
662bee1b4e Roulette Code: Electric Boogaloo 2019-03-10 00:04:09 +00:00
Sryder
60d2b6e37d Item roulette code proves once again to be one of the most fragile pieces of code I've seen
I assume we just need to move these other places to match the super ring ID moving.
2019-03-09 23:54:40 +00:00
TehRealSalt
d6d5d44153 Fix misc mistakes 2019-03-09 16:05:39 -05:00
Latapostrophe
00ddf6e9f3 Fix boost / rocket sneakers for antigrav 2019-03-09 17:25:42 +01:00
TehRealSalt
db8f23561d Minor (but important!) polishing
- Thunder Shield now attracts rings
- Colorize the ring counter at max yellow
- Rings in the collecting animation are considered for determining if you can't pick up rings anymore, preventing a LOT of rings being deleted from the map over time.
- Flung rings don't lose speed over time anymore
- Flund rings last way longer
- Using rings is much less touchy (holding the button from before an item roulette will let you continue using them until you let go, using certain items won't make you use a couple rings afterwards)
- 0 rings is now counted as debt when getting hit, making debt easier to get out of (getting hit by a spike now would put you at -2 instead of -5)
- Move Super Ring toward the end of the item (so I don't have to modify gfx.kart to fix dropped items)
2019-03-09 04:33:46 -05:00
TehRealSalt
4a68f98dc2 double ring hitbox, buff ring boost to 20% top speed increase 2019-03-08 20:33:44 -05:00
TehRealSalt
ff32e84b09 Fix macro expansion warning Sryder got 2019-03-08 19:06:27 -05:00
TehRealSalt
c9aab2579b Kill invincibility item caps
It's a holdover from another era, our item changes have stacked up enough that we don't really need this cap anymore
2019-03-08 18:36:25 -05:00
TehRealSalt
9b66e419f1 Fix bad merge errors 2019-03-08 18:34:03 -05:00
TehRealSalt
40c89dd9b8 Comment here for clarity 2019-03-07 21:33:01 -05:00
TehRealSalt
2c080cbd14 Wrong order here 2019-03-07 21:32:16 -05:00
TehRealSalt
74a757ad69 Merge remote-tracking branch 'kartpublic/next' into rings 2019-03-07 21:31:45 -05:00
Sal
897331a289 Merge branch 'colors-roundtwo' into 'next'
16 more colors

See merge request KartKrew/Kart-Public!101
2019-03-07 21:25:03 -05:00
TehRealSalt
6803e68420 Fix up item order of operations, spilled rings carry some momentum, don't pick up rings in spinout/wipeout 2019-03-07 21:23:28 -05:00
TehRealSalt
32ecf05f4b Fix HUD being off by a pixel 2019-03-07 19:37:00 -05:00
TehRealSalt
40da3594c8 Mashing in record attack is now 100% chance for rings
and also rings persist through death, and you start with 5
2019-03-07 19:18:20 -05:00
TehRealSalt
129268121d Added rings. 2019-03-07 17:11:31 -05:00
Sally Cochenour
5d0fbc2af0 Reorder colors, ensure colored names are set properly 2019-03-06 03:15:07 -05:00
Sally Cochenour
5dbdc903ba Make smoke opaque to reduce lag 2019-03-05 20:56:02 -05:00
Sally Cochenour
a2f0935bee Mine updates
- Increase gravity of super-forward throws
- Revert explosion radius change
- Nerf generic explosion stun (SPB explosion stun is identical)
2019-03-05 20:49:11 -05:00
Sally Cochenour
32a509beb1 SPB updates
- SPB Rush odds are not affected by player count.
- Thunder Shield cannot be rolled with SPB out.
- Reticule is displayed on minimap while SPB is out.
2019-03-05 19:45:20 -05:00
Sally Cochenour
19812c8a2f Misc changes
- Start cooldown deactivates exactly 30 sec, instead of after 30 seconds. Barely affects gameplay but it looks slightly less of a magic number looking at the code.
- Prevent multiple Thunder Shields being out via normal means.
- Slightly loosened up the invincibility item limits -- gives more invincibility items sooner for odd player counts but doesn't affect the numbers for the game's balancing points (4P, 8P)
- Update comments
2019-03-05 17:50:43 -05:00
Sally Cochenour
b785eda252 Merge branch 'next' into minor-item-tweaks 2019-03-05 17:18:27 -05:00
Alam Arias
03783a589d fix EOL in k_kart.c 2019-03-05 11:29:00 -05:00
Alam Arias
aaccb4edff fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
fickleheart
843bc6bc1b Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-03 20:24:39 -06:00
Sally Cochenour
d638d47fad 16 more colors
- Renamed Crimson to Maroon.
- Renamed Scarlet back to Crimson.
- Renamed Nova to Scarlet.
- Added Brick, Flame, Sunset, Popcorn, Camouflage, Caribbean, Plague, Platinum, Rust, Nova, Ultraviolet, Moonslam, Bubblegum, Mauve, Royal, and Fairy
- Updated Maroon, Robo-Hood, and Ketchup
- Shifted positioning of Aqua Super
2019-03-02 15:39:52 -05:00
Sal
506f98f5e2 Merge branch 'color-fixes' into 'next'
Color fixes

See merge request KartKrew/Kart-Public!93
2019-02-27 16:24:03 -05:00
Sally Cochenour
22cfbd8fd1 Merge branch 'next' into minor-item-tweaks 2019-02-27 01:15:24 -05:00
Sal
5f6c63f3b0 Merge branch 'water-update' into 'next'
Water update

See merge request KartKrew/Kart-Public!83
2019-02-27 01:12:35 -05:00
Sally Cochenour
e37417213e Merge branch 'next' into color-fixes 2019-02-27 00:09:39 -05:00
Sally Cochenour
008d9c9dc0 10 new colors
new Crimson (old Crimson was renamed to Scarlet), new Peach (the replacement from last commit was renamed to Cream), Cherry, Nova, Copper, Handheld, Algae, Pastel, Fuchsia, and Toxic. Also, updated Robo-Hood.
2019-02-27 00:08:13 -05:00
Sal
dedf6b5bd1 Merge branch 'wipeout-particle-tweak' into 'next'
Wipeout particle tweak

See merge request KartKrew/Kart-Public!84
2019-02-26 17:50:13 -05:00
Sally Cochenour
d88d8adf4c Fix Super colors from base SRB2 giving a garbage color 2019-02-26 07:14:03 -05:00
Sally Cochenour
e81df9474f Modify a few colors
- The following colors were given either more noticeable highlights or deeper shading for better colorized WANTED poster appearance: Nickel, Black, Beige, Brown, Leather, Salmon, Red, Crimson, Pumpkin, Rosewood, Burgundy, Pinetree, Swamp, Periwinkle, Blue, Blueberry, Dusk, Purple, Lavender, and Byzantium.
- Fixed an off-looking purple tone on Ruby.
- Salmon's outline & shading was made darker, to make it slightly easier on the eyes.
- Peach recieved a complete overhaul, featuring high contrast and yellow highlights.
- Add kartdebugcolorize for taking a quick glance at all of the colorizations
2019-02-26 04:30:51 -05:00
Sally Cochenour
de4eddb98e Revert this minor change 2019-02-22 22:50:13 -05:00
Sally Cochenour
a3c48d7c40 Update item table
Not looking forward to testing...
2019-02-22 22:49:27 -05:00
Sally Cochenour
12dd8e49c0 Merge branch 'next' into minor-item-tweaks 2019-02-22 19:30:52 -05:00
Sal
ea0da92c22 Merge branch 'ping-stuff-take2' into 'next'
Ping improvements

See merge request KartKrew/Kart-Public!68
2019-02-22 19:13:49 -05:00
Sal
e07d3b2b74 Merge branch 'item-odds-fixup' into 'next'
Simulate fractional precision on item odds

See merge request KartKrew/Kart-Public!70
2019-02-22 18:53:28 -05:00
Sally Cochenour
de6c99c9fb Grow cancel
Needs item table changes to make it less OP
2019-02-21 17:04:58 -05:00