Commit graph

355 commits

Author SHA1 Message Date
toaster
6f6fcc9615 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/info.c
#	src/sounds.c
#	src/sounds.h
2018-09-12 15:04:53 +01:00
TehRealSalt
a794386d8e New drift sparks 2018-09-11 19:52:00 -04:00
TehRealSalt
538abbba99 Make Battle arrows consistent w/ the flashing item change earlier
Should make Hyudoro even more amazing in Battle, since you can tell which held items are off-limits~
2018-09-10 03:17:15 -04:00
toaster
baf50a1dbf * Slightly more papersprite stability!
* Slightly more sane Minecraft item scaling!
2018-09-07 14:26:00 +01:00
toaster
d13e999c99 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/info.c
2018-09-07 13:34:01 +01:00
TehRealSalt
52034646da Placeholder boost effect 2018-09-06 23:49:51 -04:00
toaster
6052573549 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-06 22:18:54 +01:00
toaster
4de68f7fe2 Dropping items!
* Shield Drop...
	* Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.)
	* Pops your Thunder Shield.
	* Happens upon ANY hit, except for deathpits.
* HUD Drop...
	* Also does the above, except for the Thunder Shield thing.
	* If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item!
	* You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type.
	* Happens upon Size Down and battle elimination.
	* Can also be forced on with `cv_kartdebughuddrop on`!
* Some other random stuff.
	* Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity.
	* Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter).
	* Allow shrunken players to pick up item boxes again.
	* Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.)
	* Break NiGHTS a little through my machinations.
2018-09-06 22:17:29 +01:00
TehRealSalt
e2643c5ebd Player arrows can show x10
Requires new patch.kart
2018-09-06 16:06:37 -04:00
TehRealSalt
d3913a72df Addressed some of Chrome's thoughts
- Don't drag
- Shield isn't visible to anyone but yourself
- Projectile is twice as heavy
2018-09-04 19:58:20 -04:00
TehRealSalt
001d46873d Ghost sink "shield"
Sink shield that makes it double-press to use, gives the trailing item slowdown, and shows other people that you have it, but doesn't have any collision
2018-09-04 19:14:44 -04:00
TehRealSalt
ff09c0643c Jawz reticule 2018-08-30 19:24:22 -04:00
TehRealSalt
c22d670fa5 Merge branch 'sonicitems' into sal-misc 2018-08-27 21:08:39 -04:00
toaster
ca8aceb059 Fix that thing where item boxes just wouldn't respawn in battle if you nabbed them all too quickly (which is very likely to happen in large netgames where we have the great fortune of playing on battal bowl). 2018-08-27 17:25:22 +01:00
TehRealSalt
6fdb743a59 Correct remaining instances where step up/down scales with the object instead of the map 2018-08-27 01:07:44 -04:00
toaster
7b31d7a9b9 Dumbass copypaste rectified, stplyr is NOT valid in mobjthinker code. toaster, stop making commits to sonicitems 2018-08-26 12:27:45 +01:00
toaster
a6813ae08e No longer are orbiting/trailing objects in charge of removing themselves.
* They're clearly not quick enough at the job, since it causes a bunch of silly race conditions.
	* Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed.
	* Also, tweak a few places so that trailers AND orbiters can use the same system.
Also, some minor thingies.
	* Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit.
	* Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 15:14:18 +01:00
toaster
e5566df4c2 Fix up the bugs from last night's hell netgame.
* The tab and intermissions rankings...
	* ...now have parity in behaviour!
	* ...now properly handle player counts over 8, and no longer supports player counts over 16!
* The Item Arrow in Battle...
	* No longer develops any extremely stupid bugs due to Orbinaut sprites that makes all objects in state S_INVISIBLE develop <!>'s! (Ask me about this if you're curious as to how it affected everything else too.)
2018-08-24 13:36:03 +01:00
toaster
9f96be6375 Hide non-splitscreen number for natural quantities of orbinaut spikeball.
Also, minor code tweaks.
2018-08-14 22:16:33 +01:00
toaster
c19a779851 Odds and ends of bugfixing and polish.
* Flashing Eggman-hit players.
* Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways.
* More complete playerarrow visuals for various items.
* Eggman fake (and debug) item get sounds.
2018-08-14 15:23:38 +01:00
TehRealSalt
cc009aca4f Flashing tics length depends on speed stat
Change to speed-weight when the bump buff gets added
2018-08-11 00:12:41 -04:00
toaster
a10c0f1bcf Fix issue where random boxes would become invisible after respawning in race. 2018-08-10 15:38:32 +01:00
toaster
c256f2ae29 * Tweak battle odds in a few ways, as authorised by Sal.
* Steal a point from Ballhog and give to Orbinaut.
	* Make it based on the maximum number of bumpers someone has, not the average for everyone.
	* Improve the odds a tad if you're Wanted.
	* Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item).
* Allow Karma players to drop their Random box.
	* These boxes flicker out of existence after 15 seconds.
	* Causes a WAIT penalty, too.
* Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 18:37:03 +01:00
toaster
59c64e1ec7 * Change/add a handful of sounds.
* Make Orbinaut Shields animate at 3 tics per frame, not 1.
* Make dead items flash in and out of visibility.
* Related to above, fix a few circumstances where returning was not properly handled after removing a mobj in mobjthinker.
2018-08-05 16:38:46 +01:00
TehRealSalt
97ec385234 Thunder shield overlay 2018-08-04 15:48:31 -04:00
TehRealSalt
f0f9e204aa Reverse gravity fixes pt 1: basic driving
- Turning dust is spawned in the correct position
- Turning dust sprites are flipped
- Shadows display on the ceiling for flipped objects
- Drift sparks display in the correct position for flipped players

Will continue with item fixes tomorrow
2018-07-28 02:37:00 -04:00
TehRealSalt
f9e5a11060 - Instashield on failed damge
- Ballhog explosion separated onto another sprite
- Disabled banana jitter
2018-07-26 20:12:42 -04:00
TehRealSalt
b42d083b99 Finishing touches on Ballhog
- Ballhog has explosion + sound on death
- Ballhog shrinks to nothing if it didn't hit anything
- Replaced a Mario sound on Orbinaut
- Fixed Jawz's sound effect
- Fixed Mines not being removed on death pits
2018-07-24 22:47:09 -04:00
TehRealSalt
f820733d9b Orbinaut 2018-07-22 20:55:18 -04:00
TehRealSalt
cac613f3ef Merge branch 'sonicitems' into bumpstuff 2018-07-22 00:32:11 -04:00
TehRealSalt
77165631c4 HERE COMES A NEW CHALLENGER 2018-07-22 00:31:02 -04:00
TehRealSalt
87cc2c28ce Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-21 17:45:25 -04:00
toaster
b818c8a2cf * Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.)
* Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet.
* Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS.
* Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up.
* Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code.
	* NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it.
* Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter.
* (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 16:45:08 +01:00
TehRealSalt
584082882c More tweaking
- Getting wipeout bumped into offroad slows you down
- Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight
- Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 16:13:02 -04:00
TehRealSalt
d25cb1aa56 Wipeout bumps
- You can bump other people during spinout.
- Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics.
- You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-19 22:37:32 -04:00
TehRealSalt
e2a6d5ceb3 Water skipping
No way to disable it yet, let's see if we even need it
2018-07-16 22:51:31 -04:00
TehRealSalt
f6e5571948 Chao's requests 2018-07-16 21:27:50 -04:00
toaster
1d88cdf40d Mammoth commit!
* Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla..
* Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves.
* Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three.
* Major tweaks to the First Person HUD.
	* I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes.
	* Dontdraw-ness, transparency, and colorization match the player's object!
	* Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer!
	* Flashes the colour of your drift sparks.
* Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step.
	* Countdowns now play the drowning music again.
	* Removed/disabled extraenous P_RestoreMusics.
	* Made map-ending music called by its own function, P_EndingMusic(player_t *player).
	* Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first.
* Make dead players spinout and clip through the floor, at least until we add the new death anims.
* Fix prior pogo spring usage making dead players fall faster.
* Make the time over countdown use the kart font when not splitscreen with 3 or 4 players.
* Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 20:19:30 +01:00
TehRealSalt
6574e1f0fc Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame 2018-07-12 01:31:33 -04:00
TehRealSalt
44e2215448 The last error
Sryder & toaster, please check for me with your compile setups, but this looks like the last warning, in both Release & Debug builds
2018-07-08 18:05:22 -04:00
TehRealSalt
fbcf566874 WANTED recalculates on hit, tons of spectator changes 2018-07-03 21:12:25 -04:00
SeventhSentinel
80c2b56927 Changed all instances of "balloon" to "bumper"
Also changed "It's you!" to "Select character & color..."
2018-07-03 15:14:47 -04:00
TehRealSalt
c00736efac WANTED 2 2018-07-01 14:11:48 -04:00
TehRealSalt
5c7b66cc0f WANTED 2018-07-01 04:36:09 -04:00
TehRealSalt
2f8801902f Fix scale issues with karma hitbox if recently used Grow 2018-06-30 23:49:37 -04:00
TehRealSalt
389cd7ea7d Little things 2018-06-30 21:18:38 -04:00
SeventhSentinel
94cb3821f6 Chaotix big ring replacement
(Sev *actually* did this, not Sal! She's very proud :p)
2018-06-28 19:07:12 -04:00
toaster
f942671607 First substantial commit!
* PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count.
* Fix an issue with incorrect scale setting for shield items.
* Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...)
* Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 01:20:19 +01:00
SeventhSentinel
dd04d68c09 Held item changes 2018-06-27 15:58:43 -04:00
SeventhSentinel
06646252c1 Up ghost tics on ballhog 2018-06-27 10:37:19 -04:00