64df10f7be
P_MobjThinker: Separate fuse handling into its own function
2019-12-25 00:36:24 +01:00
6032aa3cd1
P_MobjThinker: Separate MF2_FIRING handling into its own function
2019-12-25 00:18:12 +01:00
5d89e915c6
Continue cutting up P_MobjThinker into multiple functions
2019-12-25 00:14:53 +01:00
3622829504
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
ddccfbd73d
P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions
2019-12-24 21:07:55 +01:00
c61c1e2514
Turn the babysitting deterrent into its own rule.
2019-12-24 16:30:18 -03:00
0aa3c9b0a3
Fixed missing break in offset handling for horizontal springs
2019-12-24 13:01:17 +01:00
13eb71e1ee
Fixed missing break in offset handling for horizontal springs
2019-12-24 12:58:12 +01:00
a57f903933
Move bonus time handling into new function P_SetBonusTime()
2019-12-24 12:52:43 +01:00
ac3a57aaf5
Allow P_SpawnItemRow to spawn different item types in the same row
2019-12-24 12:47:44 +01:00
72a1571937
Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:38:16 +01:00
2dac47a54c
Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:19:13 +01:00
dd01fce1a8
Separate P_SpawnHoopsAndRings into different functions:
...
-Hoops are spawned in P_SpawnHoop
-Item patterns are spawned in P_SpawnItemPattern
-Ring-like items are spawned normally via P_SpawnMapThing
-Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing
2019-12-24 10:50:49 +01:00
89b4a558a8
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
ffd6cf4aca
Replaced functions for spawning premade rows of rings with a function for spawning a generic row of rings (groundwork for UDMF)
2019-12-24 00:10:29 +01:00
50dd0a71db
Turn size and number of items for item circle into function parameters (in preparation for UDMF)
2019-12-23 22:58:58 +01:00
6939da0164
Turned nightsreplace into a macro so we have don't have to keep dragging it along as a function parameter
2019-12-23 21:35:03 +01:00
24f8d4ef51
Made a mapthing-independent version of P_GetMobjSpawnHeight so P_SpawnHoopsAndRings subfunctions can use it instead of duplicating code.
2019-12-23 21:17:12 +01:00
2b3922a8f3
Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore
2019-12-23 20:12:45 +01:00
eab5f8c851
P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions
2019-12-23 19:08:40 +01:00
e382c2e094
P_SpawnMapThing(): Separated the giant post-Lua hook switch-case statement into its own function, and separated some of the larger cases into their own function as well
2019-12-23 18:59:11 +01:00
8ddd078b20
P_MapThingSpawn(): Move early returning/substitution code into their own functions
2019-12-23 17:28:21 +01:00
e90eb9a5e7
Move P_GetMobjtype above first use
2019-12-23 16:54:26 +01:00
6a69aa4ffa
Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function
2019-12-23 16:53:45 +01:00
112b15cca2
Add P_GetMobjtype for finding the mobjtype for a given mapthingnum
2019-12-23 14:45:43 +01:00
21dcbc856c
Split up P_SpawnHoopsAndRings() into subfunctions
2019-12-23 12:42:09 +01:00
efb47b3786
Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight()
2019-12-23 12:07:03 +01:00
97adf3e246
Merge branch 'next' into hoop_refactor
...
# Conflicts:
# src/p_mobj.c
2019-12-22 18:12:58 +01:00
dacd5614f9
Make both NiGHTS hoop types use the same spawning code.
...
As a result, the old generic hoops now use 24 sprites instead of 32.
2019-12-22 17:37:54 +01:00
4ad1727b66
Don't spawn End Level Signs without the GTR_ALLOWEXIT rule
2019-12-19 17:06:07 -03:00
f4bb618f93
Organise rules
2019-12-19 16:12:10 -03:00
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
5daedc70e7
Special Stages/token stuff
2019-12-18 22:46:17 -03:00
7c3cde4564
How did I mess this up?
2019-12-18 15:23:41 -03:00
7768e2c7f9
More spectator tweaks
2019-12-18 15:14:24 -03:00
d3d91726f5
GTR_EMERALDHUNT and GTR_SPAWNENEMIES
2019-12-18 14:57:42 -03:00
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
ea5e0d28ed
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
c6f36fc470
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
4da57653eb
Merge branch 'spawn_z_refactor' into 'next'
...
(UDMF prereq.) Spawn Z refactor
See merge request STJr/SRB2!536
2019-12-16 23:21:07 -05:00
bcfd9fe504
Cleaned up GetMobjSpawnHeight a bit. Ring-likes no longer ignore MF_SPAWNCEILING, because why should they?
2019-12-15 00:22:17 +01:00
c5d8fe4752
Fix oversight on mapthing spawn Z calculation; ONFLOORZ and ONCEILINGZ don't equal to spawning the object at the base plane intersection.
2019-12-12 15:04:48 +01:00
d40359ee02
Hugging now requires being in the same Z position
...
Don't try this at home
2019-12-11 19:13:22 -06:00
d34fd4b755
Epic oversight in upside-down spawn offset.
2019-12-11 15:48:44 +01:00
d2cbdd4fb1
Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now.
2019-12-11 11:10:31 +01:00
584348b91e
Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead.
2019-12-11 10:13:52 +01:00
ca6a7ffbb3
Fix NiGHTS bumpers height.
2019-12-10 18:53:49 +01:00
8466dc5813
Move mobj spawn Z calculating to a separate function.
2019-12-10 18:03:15 +01:00
0bd1399c52
Revert paperprojection, but keep it as a #define in case someone fixes it in a patch.
2019-12-07 10:22:10 +00:00
a3549cc8f2
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
4a26aec031
Actually fix F12 issues
2019-12-07 02:27:48 +08:00
e7574957bc
Hopefully fix F12 issues
2019-12-07 01:52:40 +08:00
3120c99eeb
Fix compiling for MSVC
2019-12-05 12:38:50 -05:00
6928763961
Merge branch 'nullplayerslopelaunch' into 'master'
...
Fix slope launch with NULL player causing SIGSEGV.
See merge request STJr/SRB2Internal!595
2019-12-04 17:07:04 -05:00
01da9f7f16
Merge branch 'tokenultimate' into 'master'
...
Fix tokens not spawning in ultimate mode
See merge request STJr/SRB2Internal!594
2019-12-04 17:06:43 -05:00
7f82d7451d
Fix slope launch with NULL player causing SIGSEGV.
2019-12-04 12:13:27 +00:00
c843f22a24
Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion.
2019-12-03 23:21:36 +00:00
b5738620c1
Fixup compiling errors
2019-12-02 12:12:26 -05:00
0d4158bbd0
Fix the flung Brak not being removed on deathpits.
2019-11-30 10:29:51 +00:00
0d433b9e51
Merge branch 'brakyeet' into 'master'
...
This Black Eggman? ***YEET*** (resolves #399 )
Closes #399
See merge request STJr/SRB2Internal!575
2019-11-30 05:21:55 -05:00
c2bd91af50
Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly.
2019-11-30 10:12:45 +00:00
339907fd5d
This Black Eggman? ***YEET***
...
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
2019-11-29 21:55:25 +00:00
ebcb17d607
Merge branch 'sleepwalkin' into 'master'
...
Sleepwalkin (resolves most of #382 )
Closes #382
See merge request STJr/SRB2Internal!567
2019-11-28 16:08:40 -05:00
2495e58bdb
Merge branch 'campokes' into 'master'
...
Camera pokes (resolves #359 , #363 , and #383 ).
Closes #359 , #363 , and #383
See merge request STJr/SRB2Internal!566
2019-11-28 14:21:18 -05:00
803b22a3e7
Change required for Tails' tails to behave like falling sprite.
2019-11-27 13:54:13 +00:00
ae84246721
Fix camera not being flipped when camera is stopped due to game design hack reasons ( resolves #383 ).
2019-11-27 13:37:03 +00:00
c29540a201
Merge branch 'exit-move-lj' into 'master'
...
No more drowning with exitmove now.
See merge request STJr/SRB2Internal!563
2019-11-27 08:17:22 -05:00
73bb913ec9
Merge branch 'paperprojection' into 'master'
...
Papersprite projection tweak
See merge request STJr/SRB2Internal!535
2019-11-25 16:53:48 -05:00
8adcea56c3
Merge branch 'minusflip' into 'master'
...
Have Minus rotate in mid-air
Closes #326
See merge request STJr/SRB2Internal!532
2019-11-25 16:43:49 -05:00
71e74ca363
Fix a bunch of shit with MP special stages!
...
* Prevent an infinite quantity of Emeralds being spawned when P_GiveEmerald is called while a MP Special Stage is in session (resolves #347 ).
* Fix FuriousFox's ridiculous timer on special stage spawn (mentioned in the comments of the previous issue) by correctly marking spectator players in special stages as finished, and preventing the underflow.
2019-11-25 14:33:15 +00:00
3594623891
Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was!
...
Also, tweak the Minecart segment spawning position, since this was originally placed based on the awkward rendering.
2019-11-24 16:42:13 +00:00
9a7979d841
Have Minus rotate in mid-air
2019-11-24 22:29:26 +08:00
032f53ce07
Prevent drowning after completing the level
2019-11-19 22:44:33 +01:00
2bba25c1e1
As selected by Nev3r, implement option 2: Proximity Bastard for the Sea Egg to resolve #303 .
2019-11-19 15:59:24 +00:00
f3e66f7b58
dist is unused
2019-11-18 15:53:30 -08:00
7dc3484e5d
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
1365ef49b3
Merge branch 'jester-fireball' into 'master'
...
Mario fireball by Jester (resolves #296 )
Closes #296
See merge request STJr/SRB2Internal!487
2019-11-18 15:56:33 -05:00
baaec6f191
Merge branch 'nightstail' into 'master'
...
NiGHTS tail
See merge request STJr/SRB2Internal!482
2019-11-18 15:41:52 -05:00
f786a8dbf6
Important fixes & mine lob speed reduction
2019-11-18 22:57:26 +08:00
64939816fb
Fireball
2019-11-17 21:25:17 -03:00
cf53e255eb
Remove tester console prints
2019-11-18 05:31:26 +08:00
b721c035f8
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
0c98fb746c
Add some NiGHTS animations which default to normal player sprite2s to the existing player->panim set list, which makes Tails' tails appear due to how P_DoTailsOverlay is coded (assuming the skin is Tails, requiring them to have SPR2_NFLY available).
2019-11-17 18:04:02 +00:00
52bd4b05e1
* Make the Egg Capsule only explode for one second, but have the number of explosions (and flickies) multiplied 1.5 times.
...
* If the player is spindashing when the level is exited, they will un-spindash. (Currently you get stuck in charging)
2019-11-15 15:20:36 +00:00
6c6d89ca57
Merge branch 'flickies_not_in_walls' into 'master'
...
Flickies not in walls
See merge request STJr/SRB2Internal!461
2019-11-14 18:07:19 -05:00
b0786f12de
Merge branch 'coop-item-respawn' into 'master'
...
Allow item respawn in co-op again
See merge request STJr/SRB2Internal!466
2019-11-14 18:06:32 -05:00
8f6890025c
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
18dc6013ed
Disable item respawn in NiGHTs levels
2019-11-14 21:21:42 +01:00
ffd9cfebe6
Allow item respawn in co-op again
...
Why was it even disabled anyway.
2019-11-14 16:37:09 +01:00
a3de6d21c4
* Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it.
...
* Expose this via additional upper-16-bits flags of A_FlickySpawn.
* Use this to make Snailers not spawn their flicky inside the wall they're attached to.
* Make the behaviour of Egg Capsules more consistent mechanically regarding the flicky spawning, using the above as one relevant element.
2019-11-13 20:14:08 +00:00
d9558fb724
Merge branch 'atz-hazards' into 'master'
...
Azure Temple Zone hazards, round 2
See merge request STJr/SRB2Internal!437
2019-11-12 18:05:44 -05:00
5729ba3cd2
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
3580977eb3
Merge branch 'elementalgoop' into 'master'
...
THZ goop and Elemental (Resolve #260 , I hope?)
Closes #260
See merge request STJr/SRB2Internal!419
2019-11-11 11:42:19 -05:00
049e599f2e
Merge branch 'spinny-sign' into 'master'
...
Papersprite end signpost
See merge request STJr/SRB2Internal!442
2019-11-11 11:39:56 -05:00
41b95437da
Merge branch 'rvz-cleanup' into 'master'
...
RVZ1 lag reduction
See merge request STJr/SRB2Internal!445
2019-11-11 11:29:53 -05:00
7c7fc35ec5
Merge branch 'deathlaunch' into 'master'
...
Fix players being launched by slopes and pmomz when dying.
See merge request STJr/SRB2Internal!452
2019-11-11 11:22:12 -05:00
2e1e9b13d9
Merge branch 'magicalmovingfire' into 'master'
...
Magical moving fire
Closes #278
See merge request STJr/SRB2Internal!453
2019-11-11 11:18:20 -05:00
8e2cb88576
Lach wanted to do this, but we might have a release candidate before he gets back, so did it myself.
...
Make the wall transfer while spinning PF_SPINNING|PF_THOKKED. This:
* Prevents PF_MULTIABILITY players from using their ability after a wall transfer.
* Has a more specialised case which allows players to roll after having wall-transferred while spinning.
* (side effect) allows modders to apply PF_THOKKED any time for more controllable spinning.
2019-11-09 17:49:26 +00:00
d8b14e54c9
Resolve #278 .
2019-11-08 21:43:39 +00:00
MascaraSnake