Sync fire extinguishers FX #1884
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tornac1234
force-pushed
the
sync-fire-extinguishers
branch
from
cebc7b6
to
386f080
Compare
|
Needs rebase since #1878 is merged |
|
I'll probably look a bit more into it concerning the fire extinguisher's rotation |
tornac1234
force-pushed
the
sync-fire-extinguishers
branch
2 times, most recently
from
d3c1491
to
a88dff2
Compare
tornac1234
force-pushed
the
sync-fire-extinguishers
branch
from
a88dff2
to
92b1b00
Compare
…ffect rotation according to where the player is really aiming
… extinguisher's target detection
Jannify
requested changes
Sep 20, 2023
| using NitroxModel.DataStructures.Util; | ||
| using NitroxModel.Helper; | ||
| using NitroxModel.Packets; | ||
| using System; |
| public static bool Prefix(FireExtinguisher __instance) | ||
| { | ||
| // Only for remote players' fire extinguishers | ||
| if (__instance.transform.TryGetComponentInAscendance(12, out RemotePlayerIdentifier identifier)) |
There was a problem hiding this comment.
Is there a reason one is 12 and the other 2?
| using NitroxClient.Unity.Helper; | ||
| using NitroxModel.DataStructures; | ||
| using NitroxModel.Helper; | ||
| using System.Reflection; |
| @@ -0,0 +1,17 @@ | |||
| using NitroxModel.DataStructures; | |||
| using System; | |||
| using NitroxClient.GameLogic.PlayerLogic; | ||
| using NitroxModel.DataStructures; | ||
| using NitroxModel.Packets; | ||
| using System.Collections.Generic; |
Comment on lines
+73
to
+86
| // Equivalent of UpdateTarget but with references to the remote player | ||
| fireExtinguisher.fireTarget = null; | ||
| Vector3 vector = default; | ||
| GameObject gameObject = null; | ||
|
|
||
| TraceRemotePlayerTargetPosition(identifier.transform.position, playerRotation, identifier.gameObject, 8f, ref gameObject, ref vector, true); | ||
| if (gameObject) | ||
| { | ||
| Fire componentInHierarchy = UWE.Utils.GetComponentInHierarchy<Fire>(gameObject); | ||
| if (componentInHierarchy) | ||
| { | ||
| fireExtinguisher.fireTarget = componentInHierarchy; | ||
| } | ||
| } |
There was a problem hiding this comment.
Is this needed for vfx and sound?
|
Will wait for a movement fix PR to be merged before continuing this one |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only issue is player rotation. On the local player, we are able to turn around as much as we want and spray the fire extinguisher everywhere. But remote players don't have this rotation thing. They can only rotate to the lower side (a little angle is possible only). So we'll always see the extinguisher facing downwards.
EDIT: The fix is to only rotate the FX
And this branch is built on #1878https://youtu.be/LyenVi8g9fk
To be reviewed and looked at after #2012