Sync leviathans gameplay #2106

tornac1234 · 2024-01-10T19:46:19Z

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 · 2024-01-10T19:46:27Z

Would require some tests :)

tornac1234 · 2024-01-18T21:45:08Z

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)

NitroxPatcher/Patches/Dynamic/Creature_ChooseBestAction_Patch.cs

Jannify · 2024-01-11T02:16:31Z

NitroxPatcher/Patches/Dynamic/AttackCyclops_UpdateAggression_Patch.cs

+        }
+
+        // Has a remote player inside
+        return targetObject.GetComponentInChildren<RemotePlayerIdentifier>(true);


Is there a more performant way to check if a remote player is inside a cyclops? Like checking subroot id and if it's a cyclops? Traversing the complete cyclops seems kinda heavy depending on the algorithm. If it deep-first-search maybe we should implement a breadth-first-search, but that should be benchmarked beforehand.

Two cases here:

Remote player is in Cyclops' root

Remote player is FAR in the hierarchy, parented to the driver seat

Current issue: remote player is never unparented from the driver seat even after leaving it (???) so this would need a fix in another PR I guess

Possible solutions (that would come in the same PR mentionned above):

have a MB (either MultiplayerCyclops or a new one) store in a list all players (local and remote) which are currently in the cyclops, and use this list instead of the components search

One loop in the first children layer, and one in the driver seat layer

If it's only the two cases could we either check only all direct children of the cyclops and from the driver seat down?

Jannify · 2024-01-11T02:17:16Z

NitroxPatcher/Patches/Dynamic/AttackCyclops_UpdateAggression_Patch.cs

+            float aggressiveToNoise = __instance.aggressiveToNoise.Value;
+
+            Resolve<IPacketSender>().Send(new AttackCyclopsTargetChanged(creatureId, targetId, aggressiveToNoise));
+            ErrorMessage.AddMessage($"[SEND] {__instance.gameObject.name} attacks {__instance.currentTarget.name}");


Pinning debug message so it's not forgotten.

NitroxClient/GameLogic/AI.cs

NitroxClient/GameLogic/BulletManager.cs

NitroxPatcher/Patches/Dynamic/AttackCyclops_OnCollisionEnter_Patch.cs

NitroxPatcher/Patches/Dynamic/SeamothTorpedoWhirlpool_Register_Patch.cs

NitroxPatcher/Patches/Dynamic/StasisSphere_OnHit_Patch.cs

NitroxPatcher/Patches/Dynamic/StasisSphere_Shoot_Patch.cs

NitroxPatcher/Patches/Dynamic/Vehicle_TorpedoShot_Patch.cs

tornac1234 · 2024-02-15T10:51:41Z

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

dartasen · 2024-02-17T18:20:53Z

NitroxServer/Communication/Packets/Processors/SeaDragonAttackTargetProcessor.cs

+
+namespace NitroxServer.Communication.Packets.Processors;
+
+public class SeaDragonAttackTargetProcessor : TransmitIfCanSeePacketProcessor<SeaDragonAttackTarget>


Can be simplified using primary constructors

public class SeaDragonAttackTargetProcessor( PlayerManager playerManager, EntityRegistry entityRegistry ) : TransmitIfCanSeePacketProcessor<SeaDragonSwatAttack>(playerManager, entityRegistry)

I don't put comments on the others processors but same idea (SeaDragonSwatAttackProcessor, SeaDragonGrabExosuitProcessor, RangedAttackLastTargetUpdateProcessor, ...)

dartasen · 2024-02-17T18:23:03Z

NitroxServer/Communication/Packets/Processors/AggressiveWhenSeeTargetChangedProcessor.cs

+using NitroxServer.GameLogic;
+using NitroxServer.GameLogic.Entities;
+
+namespace NitroxServer.Communication.Packets.Processors;


Maybe we could regroup the different processors related to creature sync under a same folder ?
Thoughts on it ?

We have many files that should better be moved inside theme named folders. I would say we move this project wide refactor after V1.8

dartasen · 2024-02-17T18:23:43Z

NitroxPatcher/Patches/Dynamic/SeaDrargon_ReleaseExosuit_Patch.cs

+/// <summary>
+/// Enables exosuits's position sync when they're released from sea dragons
+/// </summary>
+public sealed partial class SeaDrargon_ReleaseExosuit_Patch : NitroxPatch, IDynamicPatch


small typo Dragon

NitroxClient/GameLogic/RemotePlayer.cs

dartasen · 2024-02-17T18:31:53Z

NitroxPatcher/Patches/Dynamic/RangedAttackLastTarget_StartCasting_Patch.cs

+
+    public static void Prefix(RangedAttackLastTarget __instance)
+    {
+        if (!Resolve<AI>().IsCreatureWhitelisted(__instance.creature) ||


This if is really hard to read.It should be splitted imo. The game won't go slower for few more IL lines generated

dartasen · 2024-02-17T18:32:02Z

NitroxPatcher/Patches/Dynamic/RangedAttackLastTarget_StartCharging_Patch.cs

+
+    public static void Prefix(RangedAttackLastTarget __instance)
+    {
+        if (!Resolve<AI>().IsCreatureWhitelisted(__instance.creature) ||


…th inventory not storing torpedos

… creature type whitelist

Jannify · 2024-04-05T19:22:42Z

NitroxClient/Communication/Packets/Processors/SeaDragonAttackTargetProcessor.cs

+            // TODO: Adapt this code when #1780 is merged
+            Utils.PlayEnvSound(seaDragonMeleeAttack.attackSound, collider.transform.position, 20f);


#1780 is now merged :D

Jannify · 2024-04-18T11:05:51Z

NitroxClient/GameLogic/AI.cs

+        lastTarget.SetTargetInternal(targetObject);
+        lastTarget.targetLocked = locked;
+
+        if (aggressiveWhenSeeTarget.sightedSound != null && !aggressiveWhenSeeTarget.sightedSound.GetIsPlaying())


Comparing MB against null

Jannify · 2024-09-19T11:19:38Z

NitroxClient/GameLogic/BulletManager.cs

+            torpedo.tr.rotation = rotation;
+            torpedo.OnHit(default);
+            torpedo.Deactivate();
+        }


Is not heaving the component an expected case? Or should it be logged?

Jannify · 2024-09-19T11:33:27Z

NitroxClient/GameLogic/BulletManager.cs

+        }
+
+        // It should be set to inactive automatically in Bullet.Awake
+        GameObject playerSphereClone = GameObject.Instantiate(stasisSpherePrefab);


Would it maybe make sense to name the game object accordingly with the playerid in it?

Jannify · 2024-10-22T15:44:06Z

NitroxServer/Communication/Packets/Processors/AggressiveWhenSeeTargetChangedProcessor.cs

+using NitroxServer.GameLogic;
+using NitroxServer.GameLogic.Entities;
+
+namespace NitroxServer.Communication.Packets.Processors;


We have many files that should better be moved inside theme named folders. I would say we move this project wide refactor after V1.8

Jannify · 2024-10-23T22:02:46Z

NitroxPatcher/Patches/Dynamic/RangedAttackLastTarget_StartCharging_Patch.cs

+namespace NitroxPatcher.Patches.Dynamic;
+
+/// <summary>
+/// Prevents non simulating players from running locally <see cref="RangedAttackLastTarget.StartCasting"/>.


Suggested change

/// Prevents non simulating players from running locally <see cref="RangedAttackLastTarget.StartCasting"/>.

/// Prevents non simulating players from running locally <see cref="RangedAttackLastTarget.StartCharging"/>.

Jannify · 2024-10-23T22:54:43Z

NitroxPatcher/Patches/Dynamic/SeaDragon_GrabExosuit_Patch.cs

+            remotelyControlled.enabled = false;
+        }
+
+        if (__instance.TryGetNitroxId(out NitroxId seaDragonId) && exosuit.TryGetNitroxId(out NitroxId targetId))


Should we check if the player has a lock on the SeaDragon?

Jannify · 2024-10-24T21:16:53Z

NitroxPatcher/Patches/Dynamic/SeaDragonAggressiveTowardsSharks_GetAggressionTarget_Patch.cs

+        // In this method, players are priority targets. This will also account for the local player case
+        IEcoTarget ecoTarget = EcoRegionManager.main.FindNearestTarget(RemotePlayer.PLAYER_ECO_TARGET_TYPE, __instance.transform.position, __instance.isTargetValidFilter, __instance.maxSearchRings);
+        if (ecoTarget != null && __instance.IsTargetValid(ecoTarget.GetGameObject()))
+        {
+            __result = ecoTarget.GetGameObject();
+            return false;
+        }
+
+        // To redirect the call to base.GetAggressionTarget(), we ensure the if is skipped in the original method
+        float timeLastPlayerAttack = __instance.timeLastPlayerAttack;
+        __instance.timeLastPlayerAttack = Time.time;
+
+        __result = __instance.GetAggressionTarget();
+
+        __instance.timeLastPlayerAttack = timeLastPlayerAttack;
+        return false;


Will this now also target the local player? I don't know if the local player is included in RemotePlayer.PLAYER_ECO_TARGET_TYPE so maybe this comment is pointless.

Jannify · 2024-10-24T21:21:14Z

NitroxPatcher/Patches/Dynamic/SeaDragonMeleeAttack_OnTouchFront_Patch.cs

+     * BroadcastSeaDragonAttackRemotePlayer(this, target);            <---- INSERTED LINE
+     * if (component4 != null)


This seems a little to early, no? Broadcasting before all checks are done if the exosuit can even be grabed

Jannify · 2024-10-24T21:24:00Z

NitroxPatcher/Patches/Dynamic/SeaDragonMeleeAttack_SwatAttack_Patch.cs

+        return new CodeMatcher(instructions).End()
+                                            .InsertAndAdvance([
+                                                new CodeInstruction(OpCodes.Ldarg_0),
+                                                new CodeInstruction(OpCodes.Ldarg_1),
+                                                new CodeInstruction(OpCodes.Ldarg_2),
+                                                new CodeInstruction(OpCodes.Call, Reflect.Method(() => BroadcastSwatAttack(default, default, default)))
+                                            ])
+                                            .InstructionEnumeration();
+    }


Are you sure this works? won't this add the instructions after the ret?

tornac1234 mentioned this pull request Jan 10, 2024

Add basic sync for PvP #2107

Open

2 tasks

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 force-pushed the sync-leviathans branch from 1fcd2d9 to 3762c2c Compare January 17, 2024 19:55

tornac1234 changed the title ~~Sync leviathans~~ Sync leviathans gameplay Jan 18, 2024

Jannify requested changes Feb 7, 2024

View reviewed changes

dartasen reviewed Feb 17, 2024

View reviewed changes

tornac1234 force-pushed the sync-leviathans branch from c0598d1 to 862ae97 Compare February 19, 2024 01:11

tornac1234 added 5 commits February 23, 2024 00:02

Sync leviathans (beginning)

b2ec8bd

Sync stasis rifles and torpedos (precise and desync-proof). Fix seamo…

15157d6

…th inventory not storing torpedos

Fix fishes (and leviathans) movement

6d7bc63

Some refactoring, replacement of prefix by transpiler, added a synced…

e853fc1

… creature type whitelist

Sync Sea Dragons

bad5975

tornac1234 force-pushed the sync-leviathans branch from 862ae97 to bad5975 Compare February 22, 2024 23:08

Sync Sea Treaders

c6f169c

Measurity added this to the 1.8 milestone Aug 9, 2024

Jannify requested changes Oct 24, 2024

View reviewed changes

This was referenced Oct 29, 2024

Improve player info UI just above the players heads #2158

Open

Movements overhaul #2189

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync leviathans gameplay #2106

Sync leviathans gameplay #2106

tornac1234 commented Jan 10, 2024 •

edited

Loading

tornac1234 commented Jan 10, 2024

tornac1234 commented Jan 18, 2024 •

edited

Loading

Jannify Jan 11, 2024

tornac1234 Feb 11, 2024 •

edited

Loading

Jannify Apr 5, 2024

Jannify Jan 11, 2024

tornac1234 commented Feb 15, 2024

dartasen Feb 17, 2024

dartasen Feb 17, 2024

Jannify Oct 22, 2024

dartasen Feb 17, 2024

dartasen Feb 17, 2024

dartasen Feb 17, 2024

Jannify Apr 5, 2024

Jannify Apr 18, 2024

Jannify Sep 19, 2024

Jannify Sep 19, 2024

Jannify Oct 22, 2024

Jannify Oct 23, 2024

Jannify Oct 23, 2024

Jannify Oct 24, 2024

Jannify Oct 24, 2024

Jannify Oct 24, 2024


		namespace NitroxServer.Communication.Packets.Processors;

		public class SeaDragonAttackTargetProcessor : TransmitIfCanSeePacketProcessor<SeaDragonAttackTarget>

		// TODO: Adapt this code when #1780 is merged
		Utils.PlayEnvSound(seaDragonMeleeAttack.attackSound, collider.transform.position, 20f);

	/// Prevents non simulating players from running locally <see cref="RangedAttackLastTarget.StartCasting"/>.
	/// Prevents non simulating players from running locally <see cref="RangedAttackLastTarget.StartCharging"/>.

		* BroadcastSeaDragonAttackRemotePlayer(this, target); <---- INSERTED LINE
		* if (component4 != null)

Sync leviathans gameplay #2106

Are you sure you want to change the base?

Sync leviathans gameplay #2106

Conversation

tornac1234 commented Jan 10, 2024 • edited Loading

tornac1234 commented Jan 10, 2024

tornac1234 commented Jan 18, 2024 • edited Loading

Choose a reason for hiding this comment

tornac1234 Feb 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tornac1234 commented Feb 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tornac1234 commented Jan 10, 2024 •

edited

Loading

tornac1234 commented Jan 18, 2024 •

edited

Loading

tornac1234 Feb 11, 2024 •

edited

Loading