Commit graph

204 commits

Author SHA1 Message Date
toaster
084b99a5c9 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
# Conflicts:
#	src/info.c
#	src/m_menu.c
#	src/y_inter.c
2018-09-21 20:54:38 +01:00
TehRealSalt
4fa1860543 Merge branch 'master' into this-is-a-sign 2018-09-21 15:40:12 -04:00
Latapostrophe
73c66e3bc4 Spark radius now follows players 2018-09-20 18:31:38 +02:00
TehRealSalt
f425ba4423 Spindash boost dust, pogo spring sfx 2018-09-19 20:13:48 -04:00
Latapostrophe
ce5abdc6e3 Thunder Shield effect hardcode. 2018-09-16 10:31:24 +02:00
TehRealSalt
cf7198f765 Updated speed lines 2018-09-15 01:24:29 -04:00
TehRealSalt
7d4d181715 Speed lines 2018-09-13 20:26:43 -04:00
toaster
fadef55b1e angel island drift strat plus ketchup 2018-09-14 00:19:23 +01:00
TehRealSalt
250c61dd00 This is a sign
Signpost with the face of the person in 1st falls down at a pre-determined location on race finish (or at the finishing player if none is found)
2018-09-13 17:42:34 -04:00
toaster
32d64a8282 Make these sparks fullbright (thanks, Ancient Tomb!) 2018-09-13 20:51:30 +01:00
toaster
57d333b6b5 Thunder shield stuff!
* Slightly bigger visual size!
	* Light-shadow!
	* Makes player fullbright if you have it!
	* Visuals finally removed instantly on shield drop!
	* Uses dark background for item icons!
	* Goes behind the player on some frames, faking layering!
2018-09-13 19:01:36 +01:00
toaster
b1db70b38a * Chao audience!
* Replaces the CZ64-era hopping Mario guys.
	* ~50% randomised colours!
	* 1/9 are FANS!
		* On mapload, some Chao select a random player in the server (even spectators) as their idol.
		* The fans cheer for their idol when they cross the finish line in a winning position!
		* They also sob when their idol loses.
	* The remaining percentage are the canon Aqua.
* Minor on-field spikeball/fake radius alterations requested by Oni.
2018-09-12 19:03:45 +01:00
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
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
82cf95d9f1 Forgot this 2018-09-06 16:09:17 -04:00
TehRealSalt
d299e59ce9 Sink bug fix
Sink would only spawn its trail ever if you threw it on a tic that was (leveltime % 4 == 0), because it called its action every 4 tics instead of every tic
2018-09-06 15:52:27 -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
0ff7fad0c6 Halved radius of MT_CHOMPER 2018-08-30 17:12:35 -04:00
toaster
bd7e0e75f0 Overlays and rings now properly handle encore-ness, in that they are sans encore (most of the time).
... :V
2018-08-30 13:13:25 +01:00
toaster
cdf5874ff5 * Exempt drop shadows from encore remapping.
* Make MT_GHOST's encoremapping depend on whether the source was encoremapped.
* Revamp how sector typegroup 2, type 15 inverts the encoremapping (so planes don't get awkwardly desynchronised).
2018-08-26 15:15:03 +01:00
toaster
acba635c90 Realised I'd forgotten to stop the item explosion from being encoremapped. 2018-08-16 15:29:34 +01:00
toaster
2d92aefc29 Merge branch 'sonicitems' into encore 2018-08-14 15:25:38 +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
toaster
57740bcc9b Merge branch 'sonicitems' into encore
# Conflicts:
#	src/info.c
2018-08-12 16:16:21 +01:00
SeventhSentinel
6fa4c27bf6 fakes use MF_SPECIAL, no longer destroyable 2018-08-12 11:04:36 -04:00
toaster
202e98957d * For testing purposes, show Encoremaps on the level select icons.
* HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit...
* Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 21:11:45 +01:00
toaster
500b71c0b3 More control over what stuff get Encore mapping applied to it, with sensible defaults so you don't have to do much to your map to get it to be supported!
* Objects!
	* Gone is the arcane, difficult-to-remember list of random flags. Say hello to MF_DONTENCOREMAP!
	* Alternatively, if the object has a skincolour applied to it, it isn't encoremapped either. (Useful for ghosts, for example.)
* Sectors!
	* The autodetecting of sneaker and spring panels is now much more intelligent, and only avoids remapping the plane(s) the effect is availible upon.
	* Sector special group 2 no. 15 is now "Invert Encore Remap". It inverts the above detection.
* Linedefs!
	* The "Transfer Line" linedef flag can now also be used to deny Encore remappings on linedef textures.
	* Right now it applies to every pixel drawn specifically belonging to that linedef, but if people decide it needs changing, we CAN make it apply to midtextures only (like linedef types 900-910).
2018-08-10 19:31:30 +01:00
toaster
cfaaac78be Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore 2018-08-07 17:09:25 +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
ad15ad4b89 Orbinaut shield 2018-08-04 16:54:48 -04:00
TehRealSalt
97ec385234 Thunder shield overlay 2018-08-04 15:48:31 -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
toaster
bd78c34b99 Encore mode - a fresh take on mirror mode!
* Palette remaps.
* Branding.

TODO:
* Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but...
* Transmaps are broken in Encore for some reason.
* I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 23:50:41 +01:00
TehRealSalt
f820733d9b Orbinaut 2018-07-22 20:55:18 -04:00
TehRealSalt
a63b172351 Merge branch 'sonicitems' into bumpstuff 2018-07-20 19:13:04 -04:00
toaster
a69eef9d82 Fullbright drift sparks. 2018-07-20 13:08:38 +01: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
f6e5571948 Chao's requests 2018-07-16 21:27:50 -04:00
TehRealSalt
c44d4c78f1 Sping panel tweaks
- Spring panels have a higher minimum forward speed, and you can no longer drop below that speed.
- New, separate type of spring panel that has a maximum speed cap, for small jumps.
- Unrelated: The SMK Donut Plains bushes now have much less thinker overhead.
- Unrelated: Fixed my earlier attempt at getting momentum redirect to work when you just hit the ground.
2018-07-13 20:45:18 -04:00
TehRealSalt
d6c1d67662 Allow K_MomentumToFacing to work when you just hit the floor
(also prevent a crash when Ballhog balls die)
2018-07-10 19:34:45 -04:00
toaster
1a2dfaed79 * Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu.
* Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 20:40:42 +01:00
SeventhSentinel
9e44f6e705 I forgot about dood balloons, oops 2018-07-03 15:34:14 -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
SeventhSentinel
041e31efdc Splitscreen items
(also fixed Big Ring flags)
2018-06-28 20:54:06 -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
SeventhSentinel
bd5c2d0720 Use patch.kart instead, almost finished Ballhog 2018-06-27 10:10:53 -04:00
SeventhSentinel
10346f5ea9 First person fun 2018-06-26 16:12:42 -04:00
SeventhSentinel
920ce3807f Some fun sound changes
- Peelout sound for sneaker boosts
- Flicky grab sound for stealing balloons
- Adaptive sounds for start boosts (drift boost for sub-optimal boosts, sneaker boost for good boosts, super transform sound for the frame perfect boost)
- Orbinaut rollling sound
2018-06-26 12:02:14 -04:00
SeventhSentinel
cfaff6d2a8 Ballhog stuff 2018-06-25 18:17:03 -04:00
SeventhSentinel
501bfae9ac Revert MT_FIREBALL to vanilla, remove MT_FIRETRAIL, MT_BALLHOG added, bigger Jawz explosions 2018-06-25 17:12:01 -04:00
SeventhSentinel
d726f82000 Fix up the sink some 2018-06-25 07:28:27 -04:00
SeventhSentinel
16e1569af1 Lakitu murder & countdown improvements
(I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-24 22:15:22 -04:00
TehRealSalt
35ec8a4f6d Finished Jawz, item odds changes, sound effect distance increases 2018-06-18 21:52:26 -04:00
TehRealSalt
612b2a151f Misc tweaks just about everywhere
- More Jawz states for later
- Jawz orbit their user in the right direction now.
- Banana trails made closer to each other
- wheels.lua hardcoded
- All held items take a double press, for consistency.
- Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 00:42:53 -04:00
TehRealSalt
d1929d3a37 Linked list bananas, hnext/hprev fixes 2018-06-16 19:57:08 -04:00
TehRealSalt
da83809d44 Trailling items
Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 17:54:12 -04:00
TehRealSalt
98c6d0f6d9 Redid how karma bombs/items work. Again
The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 00:00:46 -04:00
TehRealSalt
788c98144f Item tweakings
- Mines last twice as long
- Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting
- Mine shiiiiink sound no longer plays globally
- Thrown Bananas and Eggman Monitors bounce off walls like Mines
- Hyudoro can steal from anyone
- Halved invincibility alarm/music distance
- Getting out Orbinaut/Jawz plays a shield sound
- Using Shrink plays a devastating Chaotix sound
- SPB plays a high-pitched wail when it's locked in
- Hyudoro plays a ghosty sound when used
- Fixed Battle arrow roulette
2018-06-15 02:18:43 -04:00
TehRealSalt
e1a8267563 More lenient bombs
They can now blow up after they first stick their spikes out in the deploy animation. They also make a spikey sound effect to indicate when they can blow up.
2018-06-14 20:23:04 -04:00
TehRealSalt
118721ebc1 Random items poof instead of sparkle
Also added a poof when they respawn in Battle
2018-06-13 23:37:37 -04:00
TehRealSalt
ff09a51915 Fix invincibility white flash
Calls P_TeleportMove instead of A_CapeChase, object was given a dispoffset
2018-06-13 22:24:31 -04:00
TehRealSalt
a417b57bc7 Fixed Battle arrows 2018-06-11 00:59:20 -04:00
TehRealSalt
a554763128 Maintenence
- Fix merge issues
- Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking
- K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player.
- Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 16:10:24 -04:00
TehRealSalt
07a18e5185 Merge branch 'master' into sonicitems 2018-06-09 22:50:21 -04:00
Sryder
2adbcd6dfd Merge branch 'master' into dust-kart 2018-06-09 01:00:03 +01:00
Sryder
f00e3dfd5a New Drift dust
Applies all the time as long as the object is turning tight enough
New Sound
Works on Red Shells too!
2018-06-08 21:13:52 +01:00
TehRealSalt
4e2b30fcae Fixes 2018-06-08 00:02:28 -04:00
TehRealSalt
9b3751b30c Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
TehRealSalt
babc8be5da Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support
(also more item changes from last night that I just forgot to commit earlier)
2018-06-06 18:36:39 -04:00
TehRealSalt
8408b1fef4 Some Battle fixes and additions
- mapgotboxes is synched
- Karma bombs/items flash while spinning out
- Karma bombs have a sound + explosion when hitting someone
- Karma bombs can no longer attempt to attack a player that is flashing and have to WAIT... again
- Fixed MT_GREENITEM's bounce sound, after breaking from last commit (WHY ARE YOU ABUSING MARIO MODE SOUNDS, STOP, AGHH)
2018-06-03 20:11:08 -04:00
TehRealSalt
a223218155 Exit siren, disable constant forcing of Mario Mode sounds 2018-06-03 18:20:21 -04:00
TehRealSalt
bf3910cdca Incredibly rudimentary Jawz stuff 2018-05-31 20:51:05 -04:00
TehRealSalt
00e913bbcc Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_baselib.c
#	src/p_inter.c
#	src/p_spec.c
2018-03-31 00:44:03 -04:00
TehRealSalt
e16bf1cf75 WIP karma item stuff 2018-03-26 20:36:16 -04:00
TehRealSalt
ee977ca8db missed something 2018-03-14 16:37:42 -04:00
TehRealSalt
d99339ecd0 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/info.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_mobj.c
2018-03-14 16:12:15 -04:00
Sryder
2a4a0f24d4 Fix Bombs
Use reactiontime instead of health so chain reactions can occur when multiple bombs are layered.
Make the check for nearby players happen BEFORE the spawning of explosion objects.
Remove MF_NOCLIPTHING and MF_MISSILE from bombs so they don't try and die when they hit the floor sometimes.
2018-03-13 11:07:08 +00:00
Sryder
07c7bc05c5 Fix the item box related crashes
Removed Magnet item box pulling code. It's a mess, hacky, doesn't really help in races, and breaks things. We will implement something new for it soon.
2018-03-13 05:20:47 +00:00
TehRealSalt
375f9a9291 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_user.c
#	src/sounds.c
#	src/sounds.h
#	src/y_inter.c
2018-03-12 00:58:13 -04:00
Sryder
631b96883a Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-02-24 22:38:28 +00:00
TehRealSalt
581e231a3e sonicitems porting, Part 2
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
TehRealSalt
889e547550 Updated player arrows 2018-02-11 21:47:19 -05:00
TehRealSalt
4348be7d80 Chaotix sound effects, new music names 2018-02-10 16:01:09 -05:00
TehRealSalt
2889687d1d New invincibility effect, grow/shrink stuff
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
Sryder13
858a7adcb3 The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt
8c2bdfd006 Belp
- Minimap heads that aren't yours are transparent
- Minimap has a visibility slider
- Bomb stuff renamed to Mine
2018-02-07 22:33:27 -05:00
TehRealSalt
00af56aa2a Merge remote-tracking branch 'refs/remotes/origin/flair' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/p_enemy.c
2018-02-05 21:08:01 -05:00
TehRealSalt
3749914588 Fix more conflicts that I forgot 2018-02-05 19:40:26 -05:00
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
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