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

NitroxPatcher/Patches/Dynamic/AttackCyclops_UpdateAggression_Patch.cs

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

NitroxServer/Communication/Packets/Processors/SeaDragonAttackTargetProcessor.cs

NitroxServer/Communication/Packets/Processors/AggressiveWhenSeeTargetChangedProcessor.cs

NitroxPatcher/Patches/Dynamic/SeaDrargon_ReleaseExosuit_Patch.cs

NitroxClient/GameLogic/RemotePlayer.cs

NitroxPatcher/Patches/Dynamic/RangedAttackLastTarget_StartCasting_Patch.cs

NitroxPatcher/Patches/Dynamic/RangedAttackLastTarget_StartCharging_Patch.cs

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

NitroxClient/GameLogic/AI.cs

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?

On the local player, the torpedo might have already exploded while the packet is received with latency. i'll add a comment explaining it

NitroxClient/GameLogic/BulletManager.cs

NitroxServer/Communication/Packets/Processors/AggressiveWhenSeeTargetChangedProcessor.cs

NitroxPatcher/Patches/Dynamic/RangedAttackLastTarget_StartCharging_Patch.cs

NitroxPatcher/Patches/Dynamic/SeaDragon_GrabExosuit_Patch.cs

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.

This target type is applied to the local player too in PlayerInitialSyncProcessor.SetPlayerGameObjectId, so yes the local player will still be targetted

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

At this point, all that counts is whether or not component4 is null, which I check in BroadcastSeaDragonAttackRemotePlayer so the broadcast is fine at this place

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?

Yes I am. It does add instructions before the ret.

…th inventory not storing torpedos

… creature type whitelist

… system

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 2 times, most recently from 862ae97 to bad5975 Compare February 22, 2024 23:08

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

tornac1234 added 7 commits November 30, 2024 20:06

Sync leviathans (beginning)

4940cbb

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

26a03f7

…th inventory not storing torpedos

Fix fishes (and leviathans) movement

eac0e11

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

ead43c7

… creature type whitelist

Sync Sea Dragons

93b88bf

Sync Sea Treaders

9ccbfde

Some refactoring, added comments, adapted to the new vehicle movement…

93619cb

… system

tornac1234 force-pushed the sync-leviathans branch from c6f169c to 93619cb Compare November 30, 2024 23:47

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 commented Feb 15, 2024

Jannify Apr 5, 2024

Jannify Sep 19, 2024

tornac1234 Nov 30, 2024

Jannify Oct 24, 2024

tornac1234 Nov 30, 2024

Jannify Oct 24, 2024

tornac1234 Nov 30, 2024

Jannify Oct 24, 2024

tornac1234 Nov 30, 2024

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

		* 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 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

tornac1234 commented Jan 10, 2024 •

edited

Loading

tornac1234 commented Jan 18, 2024 •

edited

Loading