toasterbabe
578b809557
* Turned CA_DASHMODE into SF_DASHMODE.
...
* SF_DASHMODE users can now dash on water.
* Gave CA_HOVER its own states/sprite2s.
* Gave Super Sonic's hover his own hover-run state/sprite2.
2016-12-24 20:57:39 +00:00
toasterbabe
102f26182b
* Tweaks to CA_BOUNCE.
...
* Tweaks to drowning number placement for altered sizes.
2016-12-24 14:23:11 +00:00
toasterbabe
942065ba9f
* CA_BOUNCE users now play animation/sound when bouncing on enemies, monitors.
...
* CA_BOUNCE users harmlessly bounce off Sharps.
2016-12-24 13:17:53 +00:00
toasterbabe
a61f5e4521
* CA_BOUNCE can now break downwards.
2016-12-23 23:58:12 +00:00
toasterbabe
0a7fe9569d
* Fixed issue where CA_BOUNCE users can harmlessly bounce on deathpits (and not Cakewalk style!)
...
* Minor quality-of-life improvements to CA_BOUNCE handling.
2016-12-23 23:13:31 +00:00
toasterbabe
10a137620a
First commit, CA_BOUNCE almost completed.
2016-12-23 17:31:07 +00:00
toasterbabe
d8d5f31898
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-12-13 22:03:59 +00:00
Monster Iestyn
6f8969aec0
Merge branch 'spindash-dust' into 'master'
...
Spindash dust
Charging a spindash kicks up dust, we all know this feature was dying to get in at some point. Bubble and flame forms of spin dust are included from FSonic, for underwater and elemental respectively.
Oh, and as a bonus I reorganised the spindash/spinning/other ability2 stuff code to look a bit neater and more organised.
New resources:
* MT_SPINDUST - the object
* S_SPINDUST1 to 4 - the normal form's states
* S_SPINDUST_BUBBLE1 to 4 - the bubble form's states
* S_SPINDUST_FIRE1 to 4 - the bubble form's states
* SPR_DUST - the normal form's sprite set (uses frames A to D, just pinch FSonic's sprites really)
* SPR_FPRT - the flame form's sprite set (frame A only)
SF_NOSPINDASHDUST disables spindash dust for a character
See merge request !52
2016-12-13 15:15:33 -05:00
toasterbabe
c833497d39
Correcting slip-up I made when originally improving zoom tubes.
2016-12-01 14:40:58 +00:00
toasterbabe
095a438e9e
* Super float now back on spin button, again takes precedence over shield actives.
...
* Fixed BIG mistake where ShieldSpecial hook bailed out of the entire function instead of just the shield section.
2016-11-24 14:29:29 +00:00
toasterbabe
1424c3f6cd
Regardless of what I'm doing next, this removal of limits in this place still should've been done a while ago.
2016-11-23 22:20:47 +00:00
toasterbabe
85fb02aaf6
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
...
# Conflicts:
# src/p_inter.c
# src/p_user.c
# src/st_stuff.c
2016-11-20 16:44:38 +00:00
Monster Iestyn
6e70acc82d
Added SF_NOSPINDASHDUST to disable spindash dust
2016-11-13 22:33:57 +00:00
Monster Iestyn
c81665b9af
Added flame version
2016-11-13 22:02:29 +00:00
Monster Iestyn
47c67472ff
Added bubble form of spin dust
2016-11-10 21:09:05 +00:00
Monster Iestyn
ce97c1e986
Added basic spindash dust
...
Also cleaned up some of the code in P_DoSpinAbility while I was at it
2016-11-10 17:51:10 +00:00
toasterbabe
f77c3444a3
Don't use shield abilities after the armageddon's used up!
2016-10-30 14:23:53 +00:00
toasterbabe
08a4fc8382
Tweaks to the way the force whoosh is handled so it stays centered AND doesn't allow an infinitesimal jump.
2016-10-30 14:01:56 +00:00
toasterbabe
5a798bddbd
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-10-29 17:14:45 +01:00
Monster Iestyn
82d29b59c1
Merge branch 'master' into damage-control
2016-10-29 17:05:59 +01:00
Monster Iestyn
cd3895f676
Merge branch 'public_next'
2016-10-29 17:03:38 +01:00
toasterbabe
ff443251b1
P_IsPointInSubsector now works in both Software and GL, which means it can be used as the main driver behind support for Knuckles climbing on one-sided walls.
...
Also, the "teleport" devmode command can now gracefully handle coordinates specified outside maps with no/few thok barriers, which previously prevented teleport via the thok barrier bleed's sector floor and ceiling being equal.
2016-10-29 11:54:47 -04:00
toasterbabe
a533701d85
You know what, let's make this less hacky.
2016-10-24 18:53:22 +01:00
toasterbabe
cc4d780371
Making things more scale-friendly (but it's not perfect...)
2016-10-24 18:40:48 +01:00
toasterbabe
0ee2937392
Adding ShieldSpecial hook. (Activates under different circumstances to the JumpSpinSpecial hook, and can be used to cancel existing shield actions.)
2016-10-24 13:52:52 +01:00
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
Monster Iestyn
a7c8c60379
Merge branch 'master' into damage-control
2016-10-23 21:08:17 +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