Commit graph

788 commits

Author SHA1 Message Date
toaster
d079625b52 * Fix Super players who die being eternally super.
* Fix music stack corruption in multiplayer where a super player dies and it's not you.
* Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch).

Resolves #259.
2019-10-24 18:51:12 +01:00
TehRealSalt
674c0aec17 Merge branch 'master' into new-items 2019-10-24 10:08:37 -04:00
lachwright
ab0bb76705 Put dashmode players in pain state when damaging enemy with >1HP 2019-10-23 13:54:15 +08:00
James
f9ea683312 P_PlayerTouchingSectorSpecial turned into P_MobjTouchingSectorSpecial 2019-10-22 08:45:38 -04:00
toaster
383b93e43a * New object types!
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-18 18:33:45 +01:00
lachwright
cf97857ec7 Merge branch 'master' into knuxstuff 2019-10-15 02:50:59 +08:00
lachwright
9642e8d4a5 Merge branch 'master' into knuxstuff 2019-10-15 02:49:44 +08:00
toaster
a07b747d9c Fix condition which was MEANT to allow attacking Fangboss from the side while bouncing, but instead made it extremely difficult to pull off. 2019-10-13 15:30:51 +01:00
toaster
e9867c4bd7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_map.c
2019-10-10 17:51:29 +01:00
MascaraSnake
68edb0e8fa Merge branch 'bumperstuff' into 'master'
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.

Closes #246

See merge request STJr/SRB2Internal!365
2019-10-10 02:35:33 -04: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
88b377c306 Make the Pyrefly glowing and damaging in its fire-spawning state 2019-10-07 22:23:52 +02:00
toaster
0ace4a2a3f Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9. 2019-10-07 13:08:49 +01:00
toaster
1db188ef70 * Fix Minus being intangible after launch.
* Implement MS's temp bodge-fix for the TNT getting stuck on the player.
2019-10-06 16:15:13 +01:00
toaster
4db78ba88a Fix Minus causing crashes if it picks up a Snapper. 2019-10-06 16:04:19 +01:00
toaster
cf4abf6b36 Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups
# Conflicts:
#	src/p_enemy.c
2019-10-06 15:18:59 +01:00
toaster
f0e9bdd0ec Resolve #208.
* Tailsbots can't get into Minecarts.
* Tailsbots will stop trying to move around when the player gets pw_carry, which usually means some sort of big gimmick is happening and trying to move along with it would make the tailsbot look stupid.
2019-10-06 12:13:13 +01:00
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
Sal
8338d3e71c Merge branch 'fortnite' into 'master'
Battle sudden death

See merge request KartKrew/Kart!166
2019-10-03 01:27:09 -04:00
MascaraSnake
12f555de25 Merge branch 'master' into acz-fixes 2019-09-30 20:50:33 +02:00
MascaraSnake
e75767ece8 Fix various minus carrying bugs 2019-09-30 20:35:47 +02:00
lachwright
e8a85570f8 Improve glide bounces 2019-09-30 16:35:05 +08:00
lachwright
741b2a4fad Merge branch 'master' into knuxstuff
Update to master (necessary for climbing changes)
2019-09-30 09:56:04 +08:00
MascaraSnake
309d26069f Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00
TehRealSalt
9a9a1c1374 This shouldn't be merged 2019-09-27 15:31:57 -04:00
toaster
7eb3aeb33b Merge branch 'lachfixes' into 'master'
Several bug fixes!

Closes #210, #192, and #189

See merge request STJr/SRB2Internal!345
2019-09-27 08:52:23 -04:00
James R
1d59d8305d Remove trailing whitespace 2019-09-26 14:39:23 -07:00
lachwright
aff47ebd1e Fixed spectators taking unwarranted damage in splitscreen 2019-09-25 17:13:03 +08:00
Lachlan Wright
e13c16ea9d Add parentheses over change 2019-09-25 05:00:43 -04:00
Lachlan Wright
d53e652028 AI players no longer take shield damage in Ultimate mode 2019-09-24 23:49:20 -04:00
TehRealSalt
7cfcb2f61a Don't select items in the air or with the Ambush flag for overtime 2019-09-24 02:00:27 -04:00
lachwright
5fa196606e Added bounce-off behavior for multi-hit enemies/bosses 2019-09-24 03:54:04 +08:00
TehRealSalt
38bb44e732 Separate into k_pwrlv.c, add defines to reduce amount of magic numbers 2019-09-23 08:26:42 -04:00
TehRealSalt
77aeb4663b Merge branch 'master' into versus-record 2019-09-23 07:03:56 -04:00
sphere
c4784e71eb Tweak bubble grabbing behavior. 2019-09-22 04:05:22 +02:00
TehRealSalt
b8a752e40a Merge master 2019-09-18 21:47:11 -04:00
Nev3r
2b0a0dd90f Merge branch 'deathstuff' into 'master'
Lots of death stuff

Closes #207

See merge request STJr/SRB2Internal!306
2019-09-16 16:32:45 -04:00
Nev3r
c732a4f2ad Merge branch 'abilityclean' into 'master'
Clean up an ungodly amount of shit relating to abilities.

Closes #195, #167, and #177

See merge request STJr/SRB2Internal!307
2019-09-16 16:09:20 -04: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
TehRealSalt
2648e5d3de Fix the inner capsule sides not moving outward 2019-09-15 17:33:49 -04:00
TehRealSalt
cd65381abc Add another file to handle Kart item collision functions, now items can damage anything with MF_SHOOTABLE
Now this code won't make me pull out my hair. Could possibly be enhanced by using a function or define to handle the big copy-pasted tmthing/thing switch blocks in p_map, but for now I'm way happier.

As a result, Battle capsules are now destructible.
2019-09-15 17:25:33 -04:00
TehRealSalt
b39482d721 Lua port of the capsule visual
No item collision or gameplay at all yet
2019-09-15 04:51:45 -04:00
toaster
41727318ff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-09 15:25:48 +01:00
toaster
1e11fe650f Merge branch 'flippost' into 'master'
Flippost

Closes #206 and #191

See merge request STJr/SRB2Internal!320
2019-09-08 16:24:58 -04:00
toaster
17a2038489 Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale. 2019-09-08 21:21:36 +01:00
toaster
5eb6b408a1 Fade time before Game Over track.
Notably, can no longer use P_PlayJingle because of pre-fade.
2019-09-08 18:00:01 +01:00
toaster
09f7dc1350 * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 22:12:47 +01:00
toaster
5040f4d7f7 * Allow CA2_GUNSLINGER users to pop monitors with their ability (as long as their weapon type isn't a pre-existing weapon ring).
* Correct the position of a carried player relative to Tails.
2019-09-07 11:33:26 +01:00
toaster
1311542c7f Clean up an ungodly amount of shit relating to abilities.
* Put everything in P_DoJumpStuff, instead of half in that function and half spread across the player thinker.
* Have a proper if else cascade that first tries shield abilities, then super transformation, then random abilities like CA_TELEKINESIS.
* Use this new arrangement to allow CA_TWINSPIN users to use their ability on spin if their secondary ability is CA2_MELEE (resolves #195).
* Random bugfixing. Didn't keep track of what I'd caused while working on this and what was already there, but there was a lot of it.

The only two abilities which have spin-button properties outside of the else block is CA_AIRDRILL and CA_FLY/CA_SWIM (which now also prevents you from swimming down in goowater).
2019-09-06 19:01:46 +01:00
toaster
0700ad229f Lots of death stuff.
* Genesis-style love and attention to the death event.
	* Only visibly decrement lives/rings when you're respawning (or game over, see below).
	* Faster no-button-press respawn.
* Game Over specific love.
	* Animation of Level Title font coming in from the sides.
	* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
	* Change gameovertics to 10 seconds instead of 15.
	* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
	* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.

Also, two not-quite death things which nonetheless were relevant to change:

* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
2019-09-01 15:55:23 +01:00