toasterbabe
162c04c370
Bubblewrap shield now bounces on enemies and monitors instead of piercing through them.
2016-10-24 13:33:10 +01:00
toasterbabe
3ce411b62a
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 12:35:40 +01:00
toasterbabe
45d32b7f7c
* Flameaura shield now has boosh sprites.
...
* MF2_SHIELD calls shield thinker (P_AddShield/P_ShieldLook).
* Multiple types of force shields now handled.
2016-10-23 20:34:43 +01:00
toasterbabe
cfc9302bd3
Minor fix to ensure PF_FORCEJUMPDAMAGE is always known.
2016-10-23 17:05:17 +01:00
toasterbabe
956a8358c2
Important component for nojumpspin characters.
2016-10-23 16:26:36 +01:00
toasterbabe
c54d62851c
Okay, this is a MUCH better solution than PF_JUMPDAMAGE.
2016-10-23 16:04:02 +01:00
toasterbabe
76ff26e6fb
Revert "Thorough jumpdamage setting."
...
This reverts commit 8720252059
.
2016-10-23 15:53:12 +01:00
toasterbabe
c18c014bef
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-10-23 14:47:37 +01:00
toasterbabe
8720252059
Thorough jumpdamage setting.
2016-10-23 14:42:37 +01:00
Inuyasha
fa187c5ae7
Merge branch 'unslot-music' into 'master'
...
Hardcoded music name switches
Like I said earlier, it's better if all the hardcoded music switches in 2.2 start with an underscore so that it's harder to accidentally overwrite them.
Should be accepted when music.dta is updated.
See merge request !17
2016-10-23 06:46:33 -04:00
toasterbabe
5ad7fc8495
A better check than for skin==0.
2016-10-21 12:34:16 +01:00
toasterbabe
6abd4d20d3
Further tightening.
2016-10-21 12:31:06 +01:00
toasterbabe
bda630ce41
I could do better than the previous commit.
2016-10-21 11:57:59 +01:00
toasterbabe
4c0ef9f0a3
* No ridiculously-fast float animation.
...
* No falling when you accidentially press spin.
2016-10-21 11:48:41 +01:00
toasterbabe
b34dc93a18
Fix to the previous commit to basically do what I wanted it to do as opposed to accidentially altering behaviour of jumping on crawlas.
2016-10-21 11:31:44 +01:00
toasterbabe
a053b117e1
Moved the Super Sonic hover over to holding down the jump button (which conveniently links it pretty closely to the thok, which could be called the Float Thok or something I dunno.)
...
Also, only one shield ability is selectively blocked by being Super now, and that's because Invincibility does it too and therefore I assume that's a match balance thing instead of a keyboard clash.
2016-10-21 11:08:32 +01:00
toasterbabe
f145898ca4
Woops.
2016-10-20 21:39:58 +01:00
toasterbabe
769962c884
Minor cleanup.
2016-10-20 21:15:41 +01:00
toasterbabe
59fccab8e5
Restructured things so nojumpdamage characters can use the elemental, bubblewrap and attract shields.
2016-10-20 20:55:15 +01:00
toasterbabe
c1a8dd9a37
Minor refactor of what I did last night - as a modifiable state instead of hardcoded references.
2016-10-20 13:44:03 +01:00
toasterbabe
8fe932b0e7
* Force shield force stop completed
...
* Bubblewrap shield bounce now no longer allows thokking post-bounce, but still allows bouncing
* plus a bunch of tiny changes to clean up code around the place.
2016-10-20 00:33:12 +01:00
toasterbabe
9b4c81ed0b
Thundercoin shield complete.
2016-10-17 23:22:04 +01:00
toasterbabe
366e282495
Cleaned up the shield-ability stuff to be cleaner (and reduce MT_OVERLAY thinking).
2016-10-17 14:39:32 +01:00
toasterbabe
c693af96b1
* Bubble bounce completed (minus graphics).
...
* Flame burst fixed with respect to scale.
2016-10-17 14:03:32 +01:00
toasterbabe
76b30df528
* Slower Bubblewrap animation.
...
* Corrected bounce height for Elemental underwater.
* Using Elemental ability in goo is cancelled.
* Different Attract failure sound.
2016-10-17 00:27:29 +01:00
toasterbabe
5ff507213b
* Some shield constants renamed.
...
* Some shield sounds swapped (can be reverted later).
* Partial implementation of S3K shield abilities.
* The ability to elemental-groundpound onto gold monitors without going straight through them.
* Force shield ability removed because nobody could agree on it, we'll keep it blank until another idea can get through the disagreement juggernaut.
2016-10-16 22:28:50 +01:00
toasterbabe
2acfc72d86
Made P_SwitchShield take into account the force shield, then made A_ForceShield take the number of bonus hitpoints as its var1. (Also, drowning timer is properly reset by ALL protectwater shields, not just elemental.)
2016-10-16 12:45:31 +01:00
toasterbabe
aa8a454ea9
Turning some shield attributes into flags means that environmental protection and ring-pulling can be more elegantly handled. As a consequence, the S3 shields now have all their passives, and are just waiting on me to give them actives (two of which don't have the necessary sprites for...)
2016-10-16 01:23:00 +01:00
toasterbabe
3aa9d2a1b1
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-15 23:39:54 +01:00
toasterbabe
6e47a07a04
Fixed monitors not making sounds if you had that monitor already and it wasn't mariomode.
2016-10-15 17:58:08 +01:00
toasterbabe
91f9770caf
Fixed up the coin-looping.
2016-10-14 11:23:13 +01:00
toasterbabe
5e92ca1a4a
Okay, made the Mushroom a seperate shield instead of a hacked pity shield. This is a lot nicer in general.
2016-10-14 10:43:46 +01:00
toasterbabe
a119db3a85
Coins are no defense now! (This lecture is boring.)
2016-10-13 15:36:37 +01:00
toasterbabe
80300ac476
Fireflower is now on same level as all other shields, as opposed to being an additional stack layer. (MID LECTURE COMMIT STRATS YO)
2016-10-13 15:14:13 +01:00
toasterbabe
a36912baef
In Mario mode...
...
* shields give you 1000 points
* redundant shields don't make you puase
* checkpoints give you 2000 points
* falling down a deathpit is just falling, not bouncing
2016-10-12 23:47:18 +01:00
toasterbabe
d4f0afa0d1
A Heckloada Mario Stuff
...
https://gfycat.com/MasculineSatisfiedAfricanwilddog and https://gfycat.com/PastCompetentGypsymoth describe this all in varying states of completion
2016-10-12 17:55:07 +01:00
toasterbabe
64a1fa5421
Players are half height in Mario mode when they don't have any shields, the Mario mode pity shield is invisible, and Mario mode players immediately get a pity shield when they lose any other type of shield. So basically that's a Red Mushroom, right?
...
https://gfycat.com/ThoughtfulAcademicChrysalis
2016-10-11 23:35:48 +01:00
toasterbabe
d25e908b80
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
...
# Conflicts:
# src/p_map.c
2016-10-11 16:25:24 +01:00
toasterbabe
5614ff5691
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_sprites
...
# Conflicts:
# src/p_enemy.c
# src/p_mobj.c
2016-10-02 19:38:53 +01:00
toasterbabe
a694ebc348
Fixed issue where holding spin when going into a non-horizontal spring would use your whirlwind shield ability immediately.
2016-09-30 14:33:15 +01:00
toasterbabe
aa4fca0339
Added description to P_SwitchShield.
2016-09-30 14:18:13 +01:00
toasterbabe
4f79157a50
Fixed that bug the wrong way, THIS is a much better solution for what I wanted to tweak.
2016-09-30 14:12:26 +01:00
toasterbabe
dc57a34213
Revert "Fixed another bug where you were able to use the whirlwind shield ability after using the force shield's dodge dash."
...
This reverts commit cbe703478c
.
2016-09-30 14:06:53 +01:00
toasterbabe
cbe703478c
Fixed another bug where you were able to use the whirlwind shield ability after using the force shield's dodge dash.
2016-09-30 13:56:19 +01:00
toasterbabe
f1fb276e5a
Fixed a bug where using your shield ability just before your shield changed got you stuck in whatever state it left you.
...
To do that, P_SwitchShield was born! Don't use with Force.
2016-09-30 13:48:33 +01:00
toasterbabe
e05528e4a3
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-09-30 12:44:08 +01:00
toasterbabe
011af0daff
Tweaks to some sections of the code that recognise what shields the player has. Specifically:
...
* introducing the new friend, SH_FORCEHP (which is used as a bitmask to get the extra hitpoints of a force-shield user)
* P_DamageMobj now considers the unimplemented shield constants as well as the implemented ones.
2016-09-30 12:15:22 +01:00
Inuyasha
f1b8bfcfe7
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors
...
# Conflicts:
# src/info.c
# src/p_map.c
2016-09-29 18:08:50 -07:00
toasterbabe
d6a404e1ef
* On Mystic's reccomendation - an alternate method which has the direction to shoot off based on the direction you're moving, not the direction you're holding.
...
* When not pressing any direction, you now go backwards by default - to emphasise that this is primarily for defensive, not offensive, purposes.
* The camera can now handle the player going backwards without them going completely off-screen.
* Fixed some overzealous checks.
2016-09-30 00:34:17 +01:00
toasterbabe
3eb3caacd5
Tweaked the elemental shield's piercing ability. Specifically:
...
* The spinfire ring is now capable of damaging enemies. (god, what a terrible hack this is)
* When ground pounding, you now bounce off the floor a little bit to make the ability less spammable.
2016-09-29 21:25:15 +01:00