Commit graph

957 commits

Author SHA1 Message Date
mazmazz
2d86dddb00 Merge branch 'master' into flicky-things 2018-09-06 08:09:02 -04:00
mazmazz
a095b47980 Change flicky thing #s to 2200s 2018-09-06 07:24:46 -04:00
TehRealSalt
7012d94f15 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
5fa2ffd26e Jawz reticule 2018-08-30 19:24:22 -04:00
TehRealSalt
f549205721 Halved radius of MT_CHOMPER 2018-08-30 17:12:35 -04:00
toaster
5a1e52ba33 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
f2b73e15b4 * 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
Monster Iestyn
fa637475ae Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125 2018-08-22 17:16:11 +01:00
toaster
95c11ef732 Realised I'd forgotten to stop the item explosion from being encoremapped. 2018-08-16 15:29:34 +01:00
toaster
7b36e29cf9 Merge branch 'sonicitems' into encore 2018-08-14 15:25:38 +01:00
toaster
ef03450ef6 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
mazmazz
f445d9d934 MT_IDEYAANCHOR: Use type 1714 instead of 1717 2018-08-13 03:18:23 -04:00
mazmazz
1dab7b2f79 MT_IDEYAANCHOR info and spawn logic 2018-08-13 02:03:36 -04:00
mazmazz
b17f3e7e40 Set Drone hitbox radius by upmost 4 bits of Angle 2018-08-12 13:34:27 -04:00
mazmazz
123eb4bc3e MT_FLICKY_CENTER flag adjustments 2018-08-12 12:49:23 -04:00
toaster
de4468f0e6 Merge branch 'sonicitems' into encore
# Conflicts:
#	src/info.c
2018-08-12 16:16:21 +01:00
SeventhSentinel
5f2e419db3 fakes use MF_SPECIAL, no longer destroyable 2018-08-12 11:04:36 -04:00
mazmazz
14301a62d5 Make Drone hitbox height and player Z alignment configurable
* Default hitbox height is 80
* Drone Thing parameter sets height to multiples of 32
* Player aligns by default to bottom+24 of hitbox (offsetted)
* `MTF_OBJECTSPECIAL` aligns player to hitbox top
* `MTF_EXTRA` aligns to hitbox center
* `MTF_OBJECTSPECIAL|MTF_EXTRA` aligns to real bottom of hitbox
* Goalpost and sparkle Z alignment is changed to reflect configurableness
2018-08-11 15:52:42 -04:00
mazmazz
76dc4d99bc Remove ORBIDYA CENTER states, we don't need 'em 2018-08-11 12:06:17 -04:00
mazmazz
3b18d3984e * Bounce Droneman within hitbox instead of floorz
* Correct Droneman hiding so he always stays within hitbox even when invisible
2018-08-11 02:03:44 -04:00
mazmazz
3ec985dde9 ORBITEM CENTER states for A_OrbitNights target height offset 2018-08-10 23:49:02 -04:00
mazmazz
4e319541b6 Nights Drone mobj and state entries
* New entries: NIGHTSDRONE_MAN, NIGHTSDRONE_SPARKLING
* NIGHTSGOAL renamed to NIGHTSDRONE_GOAL
* MT_NIGHTSDRONE repurposed as an invisble, no-gravity hitbox
2018-08-10 18:24:31 -04:00
toaster
132dd5828a * 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
mazmazz
b680dafdb4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things 2018-08-10 14:58:27 -04:00
toaster
eac0af999d 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
mazmazz
cf48944384 Make bigger default Flicky follow trigger from 128 radius to 320 radius 2018-08-10 04:24:14 -04:00
mazmazz
f7a32c9fad MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries 2018-08-10 02:18:20 -04:00
mazmazz
ebb150a05e MT_FLICKY_x_CENTER defs 2018-08-09 12:08:06 -04:00
mazmazz
4d1d40aa5d Flicky stand animation fixes 2018-08-09 02:27:25 -04:00
mazmazz
304fdea710 Flicky stand states 2018-08-09 01:44:21 -04:00
mazmazz
41a438ece1 Mapthingnums for MT_SECRETFLICKYies 2018-08-09 01:01:20 -04:00
mazmazz
0bccca1a8b Assign mapthingnums to MT_FLICKY
* Type # 570-585
2018-08-09 00:17:46 -04:00
toaster
1348fa90ad Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore 2018-08-07 17:09:25 +01:00
toaster
2ff3b5c677 * 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
2090a8032d Orbinaut shield 2018-08-04 16:54:48 -04:00
TehRealSalt
101f4f7eba Thunder shield overlay 2018-08-04 15:48:31 -04:00
MascaraSnake
f0f8698d04 Reorganized the thing type numbers 2018-08-03 23:58:11 +02:00
Monster Iestyn
594cc953b5 Fix Cacolantern's preparing sound being played everywhere across the map
(or, in other words, fixing this to be the same as the equivalent state in the original SOC)
2018-08-02 16:15:30 +01:00
TehRealSalt
fd842de414 - Instashield on failed damge
- Ballhog explosion separated onto another sprite
- Disabled banana jitter
2018-07-26 20:12:42 -04:00
TehRealSalt
8b1f385748 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
d582a9dd97 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
220bab9b28 Orbinaut 2018-07-22 20:55:18 -04:00
TehRealSalt
6787334521 Merge branch 'sonicitems' into bumpstuff 2018-07-20 19:13:04 -04:00
toaster
dbc904e093 Fullbright drift sparks. 2018-07-20 13:08:38 +01:00
TehRealSalt
5af5954fa0 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
2ef24d85e0 Chao's requests 2018-07-16 21:27:50 -04:00
TehRealSalt
d99d6db248 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
4cee6ed333 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
04287136f6 * 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
644fcf4925 I forgot about dood balloons, oops 2018-07-03 15:34:14 -04:00