Commit graph

370 commits

Author SHA1 Message Date
mazmazz
4e3f0c9a84 Fade FOF lighting fixes; properly calculate destlightvalue 2018-09-09 15:41:30 -04:00
mazmazz
18c6f560e4 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-09 13:44:30 -04:00
mazmazz
cbf692fc52 Revert "Snap light level to software values (32 levels)"
This reverts commit 8ec3e23ed5.
2018-09-09 13:43:00 -04:00
mazmazz
96d8723238 Flag re-organization
* Change alternate param flag from BLOCKMONSTERS to DONTPEGBOTTOM
* Change tic-based flag from NOCLIMB to EFFECT5
2018-09-09 09:34:36 -04:00
mazmazz
47cf5ebdd7 Merge branch 'master' into change-colormap-ldef 2018-09-09 08:40:38 -04:00
mazmazz
baeb1f2aa5 Don't add a thinker if alpha is already equal 2018-09-09 08:10:45 -04:00
mazmazz
b0fca6b7b4 Polyobject Fade logic 2018-09-09 08:08:48 -04:00
mazmazz
deb0ba1648 Add light fading to FadeFakeFloor
* Declare P_RemoveLighting in header for p_spec.c use
2018-09-08 23:44:29 -04:00
mazmazz
8571b407c6 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-08 23:03:18 -04:00
mazmazz
8ec3e23ed5 Snap light level to software values (32 levels)
* New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`
2018-09-08 23:01:35 -04:00
mazmazz
07c6705bdb Implemented tic-based light fading
* ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets
* ML_NOCLIMB toggles tic-based logic
* Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`
2018-09-08 22:10:51 -04:00
mazmazz
b74fa1e9c8 Re-render lighting when setting FF_EXISTS 2018-09-08 20:49:32 -04:00
mazmazz
47dce92d8b Add dolighting flag to FadeFakeFloor thinker 2018-09-08 20:41:45 -04:00
mazmazz
e78ce5fdc3 When detecting invisible FOFs, don't include light blocks 2018-09-08 20:08:48 -04:00
mazmazz
c6ffa6fbe5 Initialize invisible FOF alpha to 1 on first fade 2018-09-08 09:31:23 -04:00
mazmazz
bbdf09f19e Handle rendering flags for invisible FOFs 2018-09-08 09:08:32 -04:00
mazmazz
6cd3fd8c7d Enable FF_CUTSOLIDS handling and updating by sector->moved 2018-09-08 08:59:17 -04:00
mazmazz
8ad62de044 Disable FadeFakeFloor for laser block 2018-09-08 01:33:12 -04:00
mazmazz
2a89fcfc87 Never handle FF_EXISTS if FF_BUSTUP 2018-09-08 01:23:15 -04:00
mazmazz
61960937b0 Fix Mario block triggering during ghost fade 2018-09-08 01:12:34 -04:00
mazmazz
9055c58783 Initial polyobj fade skeleton 2018-09-07 15:27:18 -04:00
mazmazz
71b1a78f76 Merge branch 'master' into le-fadefof 2018-09-06 18:12:24 -04:00
Monster Iestyn
cd8a46b3a1 Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround 2018-09-04 17:04:24 +01:00
mazmazz
c43c15ff10 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
mazmazz
3488501b03 Add "finalize" flag to Type 453 Stop Fade 2018-08-18 06:04:11 -04:00
mazmazz
95a6299ff6 P_ResetFakeFloorFader: Unclamp rover->alpha from software levels 2018-08-18 05:31:41 -04:00
mazmazz
ccf5a0a810 Add alpha clamping so OpenGL conforms to Software's translucent levels 2018-08-17 17:07:07 -04:00
mazmazz
81d7039f8e Cleanup fade fake floor code 2018-08-17 15:59:34 -04:00
mazmazz
5a3499f833 Refactor function and variable names; change defaults for fake floor fader line flags 2018-08-17 15:25:25 -04:00
mazmazz
9b88c25fda Revised and re-organized P_DoFakeFloorAlpha fading procedure
* dosolid routine now refers to spawnflags
2018-08-17 14:49:33 -04:00
mazmazz
1f51c8e076 Move fading thinker to ffloor_t.fadingdata 2018-08-17 02:28:52 -04:00
mazmazz
52f7b009f0 Move fadingdata (fade_t thinker) to line_t 2018-08-17 01:11:04 -04:00
mazmazz
9f9bf86d2b Rename dofadeinonly to doghostfade
* Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished
2018-08-16 22:27:26 -04:00
mazmazz
a49aa9babe Fix bonus time quirk where lines are run if player->marebonuslap is 0
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
2018-08-14 16:08:21 -04:00
mazmazz
6ba6454056 Comments 2018-08-14 14:57:58 -04:00
mazmazz
b1368078c6 Make Bonus Time Start executor into a general Egg Capsule Touch executor
* Entrance/exit flags
* Enough/not-enough-rings flags (with "doesn't matter" line option)
2018-08-14 12:00:37 -04:00
mazmazz
3a3976bd71 Make LE Ring triggers accept spheres for NiGHTS levels 2018-08-14 11:10:10 -04:00
mazmazz
e399d08d76 Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres 2018-08-14 10:48:50 -04:00
mazmazz
b658598a96 Whitespace 2018-08-13 22:10:16 -04:00
Monster Iestyn
c670b20c25 Merge branch 'master' into change-colormap-ldef 2018-08-10 20:05:04 +01:00
mazmazz
5e5ec4a71a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker 2018-08-10 15:03:07 -04:00
mazmazz
b3de1a5f6c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le
# Conflicts:
#	src/p_setup.c
#	src/p_user.c
2018-08-10 13:44:47 -04:00
Monster Iestyn
71d2280020 Added linedef 447 as the change colormap linedef exec special.
IMPORTANT NOTE: UNTESTED
2018-06-14 21:51:21 +01:00
toaster
c85e97a05d Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 19:36:48 +01:00
Monster Iestyn
105eee7e0a Merge branch 'public_next'
# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c
2018-06-09 19:35:36 +01:00
toaster
2cc8696bf1 Bit of a random one today, but the branch approaches completion...
* Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL.
* Blueberry bushes, both normal and Xmas, from patch.dta.
* BSZ tulips, also from patch.dta!
* Frozen Hillside badniks - Penguinator and Pophat.
* Frozen Hillside ice decoration!
* Fixed some big bugs with the DSZ light beams.
* Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c
* Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels.
* State optimisation.
* Serious cruft-removal of the NiGHTS drone thinker.
* Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs.
* Tweak NiGHTS player flashing.
* Add text colour support to the titlecard font.
* Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability.
* Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time.
* Fix that thing where flying mid-spin didn't enact autobrake.
* Modify graymap a little on Sryder's suggestion.
* [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 17:22:28 +01:00
toaster
849eeae3b9 MONSTER COMMIT.
OLD SPECIAL STAGES:
* Spheres in old special stages instead of rings!
* Individual timers in old special stages instead of a global one!
* Old special stages use a variant of the NiGHTS HUD now!
* Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres!
* All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore.
* Made emerald gaining function be based on special stage number rather than gained emeralds!
* Consistency with...

NiGHTS SPECIAL STAGES:
* Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif
* Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.)

SPECIAL STAGES IN GENERAL:
* useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS.
* CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif
* SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif

NiGHTS NON-SPECIAL STAGES:
* Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages.
* Colour Chips turn yellow in bonus time.
* Ideya!
* Its own "drowning" music!
* All of the object types for Dream Hill.
* GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif

RANDOM BS:
* Turn super with the spin button instead of the jump button!
* Followmobj now correctly set with P_SetTarget instead of pointer assignment.
* Emerald hunt uses new sprites!
* Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 22:41:54 +01:00
Monster Iestyn
745be2c641 Stop Each Time trigger linedefs and object-carrying scrollers from doing anything with FOFs without FF_EXISTS 2018-05-21 20:02:30 +01:00
MascaraSnake
ba7fa3a407 Consistency: Pointer declarations next to the variable name instead of the type 2018-05-15 09:39:52 +02:00
MascaraSnake
3e99456542 Change to linedef type 7 (flat alignment): If no tag is given, affect front sector. 2018-05-14 19:34:22 +02:00