Commit graph

912 commits

Author SHA1 Message Date
TehRealSalt
50826ef634 New drift sparks 2018-09-11 19:52:00 -04:00
toaster
d8f445f456 * Slightly more papersprite stability!
* Slightly more sane Minecraft item scaling!
2018-09-07 14:26:00 +01:00
mazmazz
56d9522a62 Merge branch 'master' into nights-dronebox 2018-09-07 09:06:32 -04:00
mazmazz
2a26f456d4 Stray nights-onfootfix line 2018-09-07 09:01:38 -04:00
mazmazz
520ee1e189 Revert "Ideya fixes when a player has more than one Ideya"
This reverts commit fe37d1e3e0.
2018-09-07 08:56:53 -04:00
mazmazz
6b97930889 Merge branch 'master' into nights-fastercapsule 2018-09-07 08:56:02 -04:00
mazmazz
54084b8aa4 Merge branch 'master' into nights-keeppoints 2018-09-07 08:13:57 -04:00
toaster
99fd66fb6d Dropping items!
* Shield Drop...
	* Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.)
	* Pops your Thunder Shield.
	* Happens upon ANY hit, except for deathpits.
* HUD Drop...
	* Also does the above, except for the Thunder Shield thing.
	* If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item!
	* You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type.
	* Happens upon Size Down and battle elimination.
	* Can also be forced on with `cv_kartdebughuddrop on`!
* Some other random stuff.
	* Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity.
	* Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter).
	* Allow shrunken players to pick up item boxes again.
	* Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.)
	* Break NiGHTS a little through my machinations.
2018-09-06 22:17:29 +01:00
TehRealSalt
1ecb8c5c8b If the game would normally end in a bomb kill, then always switch their places 2018-09-04 20:16:42 -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
mazmazz
dcca56bc04 Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
mazmazz
631a053e92 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
3c65251bb6 Merge branch 'master' into hud-cleaning
# Conflicts:
#	src/y_inter.c
2018-08-29 16:39:02 +01:00
mazmazz
2ee3228ee4 Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
toaster
9acd891394 No longer are orbiting/trailing objects in charge of removing themselves.
* They're clearly not quick enough at the job, since it causes a bunch of silly race conditions.
	* Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed.
	* Also, tweak a few places so that trailers AND orbiters can use the same system.
Also, some minor thingies.
	* Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit.
	* Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 15:14:18 +01:00
Monster Iestyn
dc6b52a449 Add INFLIVES macro, to make it easier to find infinite lives-related code 2018-08-23 20:09:39 +01:00
mazmazz
1381ffc3e6 Fix NiGHTS Bumper player positioning 2018-08-15 18:42:20 -04:00
mazmazz
9129f17ab0 Look for two anchorpoints if player has two Ideyas
* Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 17:48:14 -04:00
mazmazz
0838a81dd9 Ideya fixes when a player has more than one Ideya
# Conflicts:
#	src/p_inter.c

# Conflicts:
#	src/p_inter.c
2018-08-14 17:28:51 -04:00
mazmazz
0a110d9ef4 Ideya fixes when a player has more than one Ideya
# Conflicts:
#	src/p_inter.c
2018-08-14 17:21:49 -04:00
mazmazz
fe37d1e3e0 Ideya fixes when a player has more than one Ideya 2018-08-14 17:13:23 -04:00
mazmazz
d321ec83e1 Fix issue where player cannot destroy the NiGHTS Capsule if they have not transformed to NiGHTS 2018-08-14 14:18:18 -04:00
mazmazz
2a2569155a Deduct marescore when player hits ground
* ~~For speedrunning~~: Land on the Drone, keep your points!
2018-08-13 11:12:53 -04:00
mazmazz
87fc89d110 Make anchoring non-specific to Ideya states (now anchor anything!)
# Conflicts:
#	src/p_inter.c
2018-08-13 02:19:53 -04:00
mazmazz
d3d837392f Ideya anchoring optimization 2018-08-13 02:17:29 -04:00
mazmazz
ef9a03b021 Anchor Ideya logic
# Conflicts:
#	src/p_enemy.c
#	src/p_inter.c
2018-08-13 02:17:07 -04:00
mazmazz
c89e48e23c Fix attraction bug on non-NiGHTS and Nightopian Helper
* Switch from mo->movecount to mo->movefactor for type compat
* Adjust timings for regular and paraloop attraction
2018-08-12 23:03:12 -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
SeventhSentinel
a3e6d42815 revert this for the future 2018-08-12 11:17:30 -04:00
SeventhSentinel
4f213c9b43 added return 2018-08-12 11:12:18 -04:00
SeventhSentinel
5f2e419db3 fakes use MF_SPECIAL, no longer destroyable 2018-08-12 11:04:36 -04:00
SeventhSentinel
8e05aeb825 New pickup conditions for fakes
Instead of checking for item slot, it checks for invincibility or if you already have a fake
2018-08-12 10:22:28 -04:00
SeventhSentinel
79a848252e hud stuff
eggman nums & rocket sneaker bar
2018-08-12 10:15:55 -04:00
mazmazz
89cf2b8793 A_OrbitNights make actor scale to target
* Added `donotrescale` input to disable this behavior
* Reverted previous commit changes for scaling Ideya because unneeded
2018-08-12 01:07:26 -04:00
mazmazz
b534e01e28 Scale Ideyas when moving to/from NIGHTSDRONE and scaling changes to NIGHTSDRONE 2018-08-11 23:53:07 -04:00
mazmazz
f6c39495a8 Fix orbiting Ideya bug, now player gets them back again on exit 2018-08-11 22:13:33 -04:00
SeventhSentinel
3b71aa9be3 fixed n blame 2018-08-11 20:54:08 -04:00
SeventhSentinel
8dcee904a5 eggman
broken
2018-08-11 20:19:09 -04:00
mazmazz
d8cafeba7d Remove A_OrbitNights additional input offset on current target Z, don't need it 2018-08-11 12:06:50 -04:00
mazmazz
46f1463595 Scale player to Drone's scale on Nightserize, and reset scale on De-Nightserize
* Also correct player's position to Z center of Drone hitbox on Nightserize
2018-08-11 02:02:56 -04:00
TehRealSalt
6cdbb7c896 Flashing tics length depends on speed stat
Change to speed-weight when the bump buff gets added
2018-08-11 00:12:41 -04:00
mazmazz
6f1b9de436 Switch Ideya orbiting state to centered offset states when orbiting around Drone 2018-08-11 00:09:02 -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
9f41426008 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes 2018-08-10 15:00:41 -04:00
mazmazz
9e8784a376 SETSPHERES console command for debugging/cheating
Fixed sphere spill bug where no spheres spill if player->rings is 0
2018-08-10 13:06:53 -04:00
mazmazz
37b50ca5a4 Tag damage fix error 2018-08-10 02:34:21 -04:00
mazmazz
674b9e918f Correct player->spheres deduction upon losing spheres
player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.

Therefore, just deduct player->spheres.
2018-08-10 02:18:34 -04:00
mazmazz
c2f81eaf8f MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation 2018-08-10 02:18:24 -04:00
mazmazz
4d4e52d981 Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option 2018-08-09 23:14:14 -04:00
mazmazz
9d8af5da01 Snappier NiGHTS pickup attraction
* Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug.
* Thanks Inuyasha (KS) for original code 🐶
2018-08-09 21:24:01 -04:00