mazmazz
03c4a626c3
Line from revert
2018-08-16 11:35:35 -04:00
mazmazz
365a59f186
Revert "SETSPHERES console command for debugging/cheating"
...
This reverts commit 4cb7036f51
2018-08-16 11:34:57 -04:00
mazmazz
08f35c0792
Don't apply autobrake on NiGHTS bumpers
2018-08-15 23:40:42 -04:00
mazmazz
81dade0cc4
Force non-nights player into rolling animation when destructing capsule
2018-08-15 23:11:32 -04:00
mazmazz
c3cb08d712
Reconcile spheres at end of destruct if you somehow gained or lost an unexpected # after timing calculations
2018-08-15 22:35:09 -04:00
mazmazz
432c1ab862
Also center non-NiGHTS players on NiGHTS bumpers
2018-08-15 19:09:54 -04:00
mazmazz
67da64a064
Use more efficient position setting. For Z, also adjust for bumper mobj scale.
2018-08-15 18:50:28 -04:00
mazmazz
55d2da2201
Fix NiGHTS Bumper player positioning
2018-08-15 18:42:20 -04:00
mazmazz
45612f9add
Recalc capsule timing when leaving the capsule during destruct sequence (somehow)
...
* Would be nice to have more sophisticated behavior, e.g., resume the old timing; or drop out the capsule entirely. But how often is this case really going to happen?
2018-08-15 13:59:27 -04:00
mazmazz
ae0b7c9be8
Fix issue where capsule immediately re-triggers if player gains rings during destruct
2018-08-15 13:49:03 -04:00
mazmazz
2e8c4b5545
Fixed capsule timing logic
...
* Force a total time, stretch out sphere deduction within that time
* Make it more readable
2018-08-15 13:38:15 -04:00
mazmazz
59f71e4c48
Make camera further if on-foot and destroying the Egg Capsule
2018-08-15 12:29:06 -04:00
mazmazz
52e451aad5
Counter fix
2018-08-15 12:22:46 -04:00
mazmazz
02aed5b019
Merge branch 'nights-onfootcapsulefix' into nights-fastercapsule
2018-08-15 12:09:46 -04:00
mazmazz
1107571744
Checkpoint: Force Egg Capsule time at 60 tics
2018-08-15 00:59:29 -04:00
mazmazz
7cdce4324b
Attempt 1: Guesstimate sphere pop rate and use that as the Capsule handling duration
2018-08-15 00:32:48 -04:00
mazmazz
56d8f47aaa
Nights capsule faster attract timing
2018-08-14 19:48:18 -04:00
mazmazz
9faace9e5d
capsule->extravalue2 tic timer
2018-08-14 19:21:32 -04:00
mazmazz
0862aece9f
Ideya fixes when a player has more than one Ideya
...
# Conflicts:
# src/p_inter.c
2018-08-14 17:21:49 -04:00
mazmazz
e3facccb9d
Ideya fixes when a player has more than one Ideya
2018-08-14 17:13:23 -04:00
mazmazz
61c84be704
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
c3703cfc24
Comments
2018-08-14 14:57:58 -04:00
mazmazz
1921cc485e
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
efdf684770
Fix Capsule Entrance exec firing repeatedly
2018-08-14 12:48:00 -04:00
mazmazz
3f312ce114
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
8c57218027
Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop
...
* Use MT_EGGCAPSULE extravalue2 for tic timer
2018-08-14 11:41:10 -04:00
mazmazz
1cb68a615e
Make LE Ring triggers accept spheres for NiGHTS levels
2018-08-14 11:10:10 -04:00
mazmazz
62a6fe845d
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
d53582596f
Preproc comment out Y_SetLinkBonus because unused
2018-08-14 10:20:56 -04:00
mazmazz
841c31a6ba
Attach fade_t thinker to proper control sector upon savegame load
2018-08-13 22:17:58 -04:00
mazmazz
004cbe6a3d
Whitespace
2018-08-13 22:10:16 -04:00
mazmazz
ca84e7265e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof
2018-08-13 14:47:57 -04:00
mazmazz
d8c565407c
MaxBonusLives level header option for # of lives in score tally
2018-08-13 14:17:38 -04:00
mazmazz
f1fc205b31
Deduct marescore when player hits ground
...
* ~~For speedrunning~~: Land on the Drone, keep your points!
2018-08-13 11:12:53 -04:00
mazmazz
6585ca3df3
Make Drone visual elements react to height change
2018-08-13 09:50:50 -04:00
mazmazz
1bc5976534
Correct hitboxradius value; proper sparkle->z when moving x/y
2018-08-13 04:49:32 -04:00
mazmazz
c3e0267029
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
296d527993
Merge nightsplus-laplogic
2018-08-12 21:20:14 -04:00
mazmazz
d3001db9dc
Merge from nights-score and use Lap Bonus instead of Link Bonus
...
* One BONUSTYPE = NIGHTS option instead of several
* Use NiGHTS Bonus for special stages, not Link Bonus
2018-08-12 20:56:57 -04:00
mazmazz
54343bc05f
Change special stage bonus to NiGHTS in-level score, per MB
2018-08-12 20:36:53 -04:00
mazmazz
89f57cb111
Have just one NiGHTS bonus option: NIGHTS and LINK together
2018-08-12 20:25:35 -04:00
mazmazz
fcd6b16646
Make lap bonus more valuable
2018-08-12 20:08:40 -04:00
mazmazz
30fa526f6f
Merge branch 'nightsplus-laplogic' into nights-score-lap
2018-08-12 19:59:58 -04:00
mazmazz
0c8e2ffd78
Totalmarescore typo
2018-08-12 19:59:41 -04:00
mazmazz
ec8d264029
totalmarescore player variable for NiGHTS scoring
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:59:34 -04:00
mazmazz
5938a57970
totalmarelap and totalmarebonuslap player variables
2018-08-12 19:57:33 -04:00
mazmazz
fe904b0eb2
NiGHTS lap score bonus
2018-08-12 19:48:45 -04:00
mazmazz
0c0a403bb3
Merge branch 'nightsplus-laplogic' into nights-score-lap
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:39:31 -04:00
mazmazz
feadcbfc94
BONUSTYPE typo; bonus alignment
2018-08-12 19:32:11 -04:00
mazmazz
372fc540bc
Totalmarescore typo
2018-08-12 19:26:18 -04:00
