Commit graph

143 commits

Author SHA1 Message Date
toaster
a8169e3844 Sound test is cool now!
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
2019-11-05 16:23:46 +00:00
toaster
ed304a5b19 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_mobj.c
2019-10-08 19:43:43 +01:00
MascaraSnake
c4f1085f02 Hardcoded the Pterabyte (without the grabbing mechanic) 2019-09-29 10:39:09 +02:00
toaster
85f50ef54b * Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH)
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 17:06:29 +01:00
toaster
de82d338bd Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was?
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.

To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.

Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 14:36:20 +01:00
TehRealSalt
1ef09699d1 Functional gameplay
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score

Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
toaster
ca616fe314 Add the new s1, s2, cd, 3db and kc sounds to sounds.c and sounds.h!
These have been in srb2.pk3 for a while, but they were inaccessible because of not having in-game references.
2019-09-10 15:06:20 +01:00
MascaraSnake
b50da9e3e6 Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
toaster
3c5cbd5980 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
# Conflicts:
#	src/p_mobj.c
#	src/sounds.c
#	src/sounds.h
2019-07-09 19:52:52 +01:00
toaster
0124e248ee ha ha ha how can i possibly describe this commit
Just wait for the MR, it won't be far behind.
2019-07-08 13:26:40 +01:00
toaster
c9c69d805a Now it's CA_TWINSPIN's turn to get the improvements!
* Remove PF_THOKKED every time a successful damage bounce occours.
* When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.)
* Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound.

Also, some other related tweaks:

* Optimisations to A_VultureBlast, which was used as a base for the particle creation.
* Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism.
* P_SpawnGhostMobj takes colorized into account.
* Fold Tails propeller damage into P_PlayerCanDamage.
* When performing an Attraction Blast, place the player in roll frames.
* Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well.
* Buff MT_LHRT travel distance at slow speeds.
2019-06-26 23:26:05 +01:00
MascaraSnake
faa43ea92d Merge branch 'master' into new-acz-minecarts 2019-06-17 20:43:21 +02:00
Latapostrophe
a35cea9243 chaos conflict 2019-06-11 17:02:47 +02:00
Monster Iestyn
67392baae0 Merge branch 'public_next'
# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
MascaraSnake
6f7b77f650 Hardcoded train cameo 2019-06-09 13:48:07 +02:00
MascaraSnake
3653d5b46e Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch) 2019-06-09 10:51:33 +02:00
Steel Titanium
8f19878781 Upped freeslots limit 2019-06-03 15:23:48 -04:00
mazmazz
5e06530829 Implement MIXNIGHTSCOUNTDOWN
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
2019-03-14 23:10:14 -04:00
TehRealSalt
6aa55bdbe2 Merge remote-tracking branch 'kartpublic/next' into fortnite 2019-03-11 13:49:12 -04:00
Sally Cochenour
02862f8010 Banana snipe sfx 2019-02-22 18:43:10 -05:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
TehRealSalt
43af067415 Add a 5-second delay before the kill-field kicks in
Until it's ready, the orbs are transparent and the minimap icon blinks. Also, tons more sounds. ALSO, Super Overtime mode.
2018-12-06 18:13:40 -05:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
TehRealSalt
9a25d4e988 This sound doesn't exist yet, but I'm defining it anyway 2018-11-26 03:19:31 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
c2941d6ea5 Item roulette fun-times
- Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged.
- Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was.
- New item roulette sound for mashing
- Fix TC_ limits in Lua
2018-11-23 19:15:14 -05:00
TehRealSalt
339a2a6ee6 Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
TehRealSalt
092caa59fc Separate grow & invincibility alarms, donated by VAda 2018-11-09 21:47:36 -05:00
wolfy852
40ad082bcf SOC_CHAO hardcode
TODO: fix comment alignment
2018-10-30 20:35:33 -05:00
Latapostrophe
7bf766eb25 Mementos hardcode 2018-10-20 21:17:13 +02:00
Latapostrophe
1a31fa726c Midnight Channel hardcode 2018-10-20 16:10:40 +02:00
TehRealSalt
cdef7f4e1d New engine sounds
9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-08 21:31:55 -04:00
toaster
54234ba8d9 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
#	src/info.c
#	src/info.h
#	src/sounds.c
#	src/sounds.h
2018-09-23 23:07:16 +01:00
toaster
b12c2516ec Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
2018-09-23 11:47:29 +01:00
Sal
1d1705d4e7 Merge branch 'new-voices' into 'master'
New voices

See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
toaster
ae002fa578 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/sounds.c
#	src/sounds.h
2018-09-22 23:11:14 +01:00
Sal
739bbd3808 Merge branch 'encore' into 'master'
Encore

See merge request KartKrew/Kart!7
2018-09-22 17:52:33 -04:00
toaster
ba9df6d0d5 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
#	src/info.c
2018-09-22 14:57:33 +01:00
TehRealSalt
6a8fa59277 Merge branch 'master' into new-voices 2018-09-21 21:13:46 -04:00
Latapostrophe
428ab9896d Did everything toaster suggested 2018-09-22 01:47:13 +02:00
Latapostrophe
213911fa11 Changed thundershield sound 2018-09-22 01:15:04 +02:00
toaster
15491fa809 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/info.c
#	src/k_kart.c
2018-09-21 21:05:47 +01:00
toaster
9ab42d91cb 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
toaster
d16021febd :shitsfree: 2018-09-20 17:45:19 +01:00
TehRealSalt
a3089a546f Spindash boost dust, pogo spring sfx 2018-09-19 20:13:48 -04:00
toaster
fd679bd2aa * 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
16caa08ddd 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
47dd9e2fc2 Drop Dash + alternate start boosts
New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker.

Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 01:47:23 -04:00
toaster
99fd66fb6d 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
7505fb72a8 Wrong order here 2018-08-28 18:50:59 -04:00