Commit graph

739 commits

Author SHA1 Message Date
mazmazz
5a3499f833 Refactor function and variable names; change defaults for fake floor fader line flags 2018-08-17 15:25:25 -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
4f5ca26ce5 Attach fade_t thinker to proper control sector upon savegame load 2018-08-13 22:17:58 -04:00
mazmazz
d24de8bc2f totalmarescore player variable for NiGHTS scoring
# Conflicts:
#	src/p_setup.c
2018-08-12 19:59:34 -04:00
mazmazz
9a9a2d94cc totalmarelap and totalmarebonuslap player variables 2018-08-12 19:57:33 -04:00
mazmazz
269c1a70ba Add lapbegunat and lapstartedtime player variables
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-12 14:21:26 -04:00
toaster
0b65b7a009 Fixed Encore remappings not being loaded when joining mid-netgame. 2018-08-12 11:20:53 +01:00
mazmazz
c5d6dd55d5 player->oldscale var for pre-Nightserize scale 2018-08-11 00:49:28 -04:00
mazmazz
60f6792ad0 Basic implementation for player position correction to Drone center
* player->drone mobj variable
* P_MoveNiGHTSToDrone, will change later
2018-08-10 19:25:49 -04:00
mazmazz
2f5186d014 Add lastmarelap and lastmarebonuslap player variables 2018-08-10 16:30:49 -04:00
mazmazz
79d5c553c3 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
2018-08-10 15:10:26 -04: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
052bd347bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic
# Conflicts:
#	src/p_setup.c
2018-08-10 13:35:59 -04:00
mazmazz
f8a3343500 Track player's previous mare rings with player->finishedrings.
There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.
2018-08-10 04:05:20 -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
08066c1cf4 Map reset timer 2018-07-21 15:54:05 -04:00
Sryder
a7ea4db50d Merge branch 'master' into sonicitems 2018-07-06 23:33:54 +01:00
toaster
3d5ee263e0 Fix a crashy oversight in the archiving! 2018-07-06 23:18:18 +01:00
toaster
da7407b6ad Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-06 20:40:47 +01:00
Sryder
47230e69c5 Always send gamestate to joiners.
It's cut down already outside of levels, needed to stop Lua sending mobj references during intermission though.
This is needed because in the past there was a separate way to send player information to joiners that has since been removed. Meaning player information is always desynched for joiners during anything but levels.
2018-07-06 20:25:13 +01:00
TehRealSalt
cbcd2cbb07 WANTED recalculates on hit, tons of spectator changes 2018-07-03 21:12:25 -04:00
TehRealSalt
d4c5a92c7b WANTED 2018-07-01 04:36:09 -04:00
toaster
2efe86e387 * AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN!
* Super important to allow dedicated servers to continue forever without needing to add Terminal.
    * To facilitate understanding, add gametype dog-ears to the vote screen!
    * To do the above, add V_DrawDiag! Works in GL, too!!
* Unrelated shit!
    * Fix a buffer overrun in the randmapbuffer!
    * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn...
    * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 15:47:56 +01:00
SeventhSentinel
b18406aaa1 Disable viewheight cvar and vanilla's irrelevant first person HUD stuff, move Viewpoint HUD to a nicer spot 2018-06-26 11:33:54 -04:00
TehRealSalt
b6314e1c1d Misc tweaks just about everywhere
- More Jawz states for later
- Jawz orbit their user in the right direction now.
- Banana trails made closer to each other
- wheels.lua hardcoded
- All held items take a double press, for consistency.
- Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 00:42:53 -04:00
TehRealSalt
3f434fd250 Linked list bananas, hnext/hprev fixes 2018-06-16 19:57:08 -04:00
TehRealSalt
6dcf8aa431 Trailling items
Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 17:54:12 -04:00
TehRealSalt
c1b1427676 SPB fixes
Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 01:51:50 -04:00
TehRealSalt
3d9f1a90e1 Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
TehRealSalt
09fa365bb1 The Lightning Update
- 30 sec cooldown on all lightning types
- Delay before Blue Lightning hits, based off of distance
- Blue Lightning can swap targets if 1st place is passed
- Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-05 21:36:48 -04:00
TehRealSalt
23af399f61 Some Battle fixes and additions
- mapgotboxes is synched
- Karma bombs/items flash while spinning out
- Karma bombs have a sound + explosion when hitting someone
- Karma bombs can no longer attempt to attack a player that is flashing and have to WAIT... again
- Fixed MT_GREENITEM's bounce sound, after breaking from last commit (WHY ARE YOU ABUSING MARIO MODE SOUNDS, STOP, AGHH)
2018-06-03 20:11:08 -04: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
mazmazz
94bea03ae5 Allow immediate alpha setting when speed = 0; refactoring
* Separate fade logic into P_FindFakeFloorsDoAlpha, P_DoFakeFloorAlpha
* Change INT32 destvalue and speed to INT16
2018-04-07 07:09:04 -04:00
mazmazz
ef733de678 Refactor flag handling toggles 2018-04-06 23:14:48 -04:00
mazmazz
378fdf0177 Add fadingdata to sector_t 2018-03-31 00:41:20 -04:00
mazmazz
7d5b40a306 Fix fade_t handleflags to UINT32 2018-03-31 00:02:37 -04:00
mazmazz
1df029ccad Add predefined behaviors for fading FOF flags
* ML_BLOCKMONSTERS: Handle FF_EXISTS
* ML_NOCLIMB: Handle FF_SOLID
* ML_EFFECT1: Don't handle FF_TRANSLUCENT
2018-03-30 22:43:13 -04:00
mazmazz
02d525ae15 Add player_t marelap and marebonuslap, with logic 2018-03-30 20:28:27 -04:00
Marco Z
0c63e44cea fade_t fields 2018-03-30 16:19:19 -04:00
Marco Z
3332298f9e Define fader thinker names 2018-03-30 15:33:03 -04:00
TehRealSalt
782a5d7fd9 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-07 22:34:33 -05:00
Sryder13
fe89ce941b Star colormap is decided to be used per mobj with mobj->colorize
Star creates afterimages that are colorized and fullbright
Star makes the player fullbright
2018-02-05 00:00:36 +00:00
TehRealSalt
62192316ba Everything
Been a while since I synced :V
2018-02-03 23:47:47 -05:00
TehRealSalt
921222ba95 welp 2018-01-29 21:39:13 -05:00
TehRealSalt
912cf14781 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-01-29 19:20:23 -05:00
TehRealSalt
1ed0202b1e Work so far
Crashes, but baseline's there
2018-01-27 01:17:08 -05:00
TehRealSalt
5981ae6ac0 Instead of player->laptime, lets add curlap
Since lap time will only ever be used locally, it makes more sense to
just use one variable instead of a player struct variable
2018-01-21 21:03:44 -05:00
TehRealSalt
5d3c9a1d73 Record best lap time in Record Attack
- Record Attack replays now save best lap time
- Removed instances of NiGHTS Attack
- Removed a lot of unlockable that have no use in Kart (ultimate mode,
perfect bonus, score emblems, etc)
- Removed all methods of activating ultimate mode
2018-01-21 19:15:26 -05:00