Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync leviathans gameplay #2106

Merged
merged 13 commits into from
Jan 5, 2025
Merged

Sync leviathans gameplay #2106

merged 13 commits into from
Jan 5, 2025

Conversation

tornac1234
Copy link
Collaborator

@tornac1234 tornac1234 commented Jan 10, 2024 •
edited
Loading

Creature sync:

  • Sync Reaper Leviathans
  • Sync Sea Dragons
  • Sync Sea Treaders

Creature behaviours:

  • Sync leviathans attacking cyclops
  • Sync leviathans attacking a player or vehicle (seamoth or exosuit)

Weapon sync:

  • Sync statis rifle
  • Sync torpedos (better than current implementation)

Other related issues:

  • Fix player vitals not showing a creative player's name
  • Fix seamoth not spawning module inventory
  • Adds an InfectedMixin and a LiveMixin on remote players to ensure they're potential targets

TODO when everything is done:
- [ ] Ensure crash fishes can target other players POSTPONED to another PR (will be short but required both this one and #2101 )

@tornac1234
Copy link
Collaborator Author

Would require some tests :)

@tornac1234 tornac1234 mentioned this pull request Jan 10, 2024
Merged
2 tasks
@tornac1234 tornac1234 added Area: player Related to player character actions Area: AI Related to state machines (as used by the fish) labels Jan 10, 2024
@tornac1234 tornac1234 changed the title Sync leviathans Sync leviathans gameplay Jan 18, 2024
@tornac1234
Copy link
Collaborator Author

tornac1234 commented Jan 18, 2024 •
edited
Loading

There's still the following to be looked into (but most of the code is ready for review):

  • sometimes, move animation are chunky and you can see a small jump (FIXED)
  • when another player gets eaten by a leviathan, they broadcast the related cinematic which is played on other players so a black screen appears as if they got eaten themselves by a leviathan (but they didn't)

Jannify
Jannify requested changes Feb 7, 2024
View reviewed changes
NitroxPatcher/Patches/Dynamic/Creature_ChooseBestAction_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/AttackCyclops_UpdateAggression_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/AttackCyclops_UpdateAggression_Patch.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/AI.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/BulletManager.cs Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/AttackCyclops_OnCollisionEnter_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/SeamothTorpedoWhirlpool_Register_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/StasisSphere_OnHit_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/StasisSphere_Shoot_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/Vehicle_TorpedoShot_Patch.cs Outdated Show resolved Hide resolved
@tornac1234
Copy link
Collaborator Author

The latest Sea Dragons sync code wasn't tested because it's really hard without #2113

@tornac1234 tornac1234 force-pushed the sync-leviathans branch 2 times, most recently from 862ae97 to bad5975 Compare February 22, 2024 23:08
@Measurity Measurity added this to the 1.8 milestone Aug 9, 2024
Jannify
Jannify requested changes Oct 24, 2024
View reviewed changes
NitroxClient/Communication/Packets/Processors/SeaDragonAttackTargetProcessor.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/AI.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/BulletManager.cs Show resolved Hide resolved
NitroxClient/GameLogic/BulletManager.cs Show resolved Hide resolved
NitroxServer/Communication/Packets/Processors/AggressiveWhenSeeTargetChangedProcessor.cs Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/RangedAttackLastTarget_StartCharging_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/SeaDragon_GrabExosuit_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/SeaDragonAggressiveTowardsSharks_GetAggressionTarget_Patch.cs Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/SeaDragonMeleeAttack_OnTouchFront_Patch.cs Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/SeaDragonMeleeAttack_SwatAttack_Patch.cs Show resolved Hide resolved
This was referenced Oct 29, 2024
Open
Merged
@tornac1234 tornac1234 mentioned this pull request Jan 1, 2025
Closed
@tornac1234 tornac1234 linked an issue Jan 1, 2025 that may be closed by this pull request
Negative CurrentStats and Players can't operate vehicles #1923
Closed
Measurity
Measurity reviewed Jan 1, 2025
View reviewed changes
Copy link
Collaborator

@Measurity Measurity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good CW but I need to do in-game testing.

NitroxClient/MonoBehaviours/PlayerDeathBroadcaster.cs Outdated Show resolved Hide resolved
Coding-Hen
Coding-Hen reviewed Jan 1, 2025
View reviewed changes
NitroxClient/Communication/Packets/Processors/CreatureActionProcessor.cs Show resolved Hide resolved
NitroxClient/GameLogic/AI.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/AI.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/AI.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/AI.cs Outdated Show resolved Hide resolved
@dartasen
Copy link
Member

dartasen commented Jan 1, 2025

Did a playtest with Ninja & Tornac :

  • Seems to work well
  • Waiting on a commit to remove debug messages for actions
  • (Optional) Waiting on a commit for cyclops beacon death sync

@tornac1234
Updated transpilers to respect the new norm, fix black screen on remo…
ba5c998 
…te player death, adapted code after SubnauticaNitrox#1780 (sound rework) is merged, improve movement broadcast/receive depending on simulation, add detection of cell unloading through EntityCell.Reset, added player and query debug commands to gather information more easily, fix entity cell switching
@tornac1234
Fix Leviathans having a hard time attacking cyclops, fix player 0 hea…
53d935c 
…lth spawn making them invincible
@tornac1234
Prevent grabbing another player with propulsion cannon, fix teleporta…
02b91c3 
…tion to another player, fix wrong cyclops detection by leviathans (too short), persist leash position of leviathans so they don't derive away from their original spawn position indefinitely, fix leviathans not spawning when they get close to a player who has them in range
@tornac1234
Sync cyclops destruction beacon, removed virtual cyclops logs, shut v…
887ea25 
…irtual cyclops lights, removed debug logs
@dartasen dartasen requested review from Jannify and Coding-Hen January 2, 2025 12:24
Coding-Hen
Coding-Hen approved these changes Jan 2, 2025
View reviewed changes
Copy link
Collaborator

@Coding-Hen Coding-Hen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the one comment looks good to me

NitroxClient/GameLogic/RemotePlayer.cs Show resolved Hide resolved
Jannify
Jannify reviewed Jan 3, 2025
View reviewed changes
Nitrox.Test/Patcher/Patches/PatchesTranspilerTest.cs
Comment on lines +146 to +149
if (logInstructions)
{
Console.WriteLine(transformedIl.ToPrettyString());
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why this is implemented here. If I would want to debug the il-count I would add the PrettyString() / LogInstructions () method inside the desired Transpiler.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's way easier to just add a true/false on the line where you transpiler test is declared (which is the definitely a better place as it is a test and tests are supposed to let you know about the insights), than to modify the transpiler to be able to access the transformed IL before returning it (while in most cases we are returning directly the whole thing)

NitroxClient/Communication/Packets/Processors/SeaDragonAttackTargetProcessor.cs Show resolved Hide resolved
NitroxClient/GameLogic/AI.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/RemotePlayer.cs Show resolved Hide resolved
Jannify
Jannify requested changes Jan 3, 2025
View reviewed changes
Nitrox.Test/Patcher/Patches/Dynamic/CyclopsSonarButton_Update_PatchTest.cs Show resolved Hide resolved
NitroxClient/GameLogic/BulletManager.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/BulletManager.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/BulletManager.cs Outdated Show resolved Hide resolved
NitroxServer/ConsoleCommands/PlayerCommand.cs Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/LargeWorldEntity_UpdateCell_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/CyclopsDestructionEvent_DestroyCyclops_Patch.cs Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/AttackCyclops_UpdateAggression_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/AttackCyclops_UpdateAggression_Patch.cs Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/AttackCyclops_UpdateAggression_Patch.cs Outdated Show resolved Hide resolved
@tornac1234
Small corrections
58f38c4
@tornac1234
Fixes for the new "out of cell entities" system, server now knows exa…
0db50e7 
…ctly which of these every player has, move more stuff to use Player.CanSee
@Jannify Jannify mentioned this pull request Jan 5, 2025
Open
Jannify
Jannify approved these changes Jan 5, 2025
View reviewed changes
Copy link
Member

@Jannify Jannify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM CW

@dartasen dartasen merged commit 9bb3664 into SubnauticaNitrox:master Jan 5, 2025
This was referenced Jan 5, 2025
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dartasen dartasen dartasen approved these changes

@Coding-Hen Coding-Hen Coding-Hen approved these changes

@Measurity Measurity Measurity left review comments

@Jannify Jannify Jannify approved these changes

Assignees
No one assigned
Labels
Area: AI Related to state machines (as used by the fish) Area: player Related to player character actions
Projects
None yet
Milestone
1.8
Development

Successfully merging this pull request may close these issues.

Negative CurrentStats and Players can't operate vehicles
5 participants
@tornac1234 @dartasen @Measurity @Coding-Hen @Jannify