Changes to make adding scopes possible #14257
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
Redo vision obstruction
Regalis11
requested changes
Sep 11, 2024
| @@ -425,6 +425,10 @@ void ResetInputIfPrimaryMouse(InputType inputType) | |||
| { | |||
| cam.OffsetAmount = targetOffsetAmount = item.Prefab.OffsetOnSelected * item.OffsetOnSelectedMultiplier; | |||
| } | |||
| else if (HeldItems.FirstOrDefault(item => item.GetComponent<Holdable>()?.Aimable ?? false) is Item item2 && IsKeyDown(InputType.Aim)) | |||
There was a problem hiding this comment.
Pattern matching should be used instead of null coalescing here. The names item and item2 are not very descriptive, and they're quite misleading because they're in this case the same item.
| @@ -425,6 +425,10 @@ void ResetInputIfPrimaryMouse(InputType inputType) | |||
| { | |||
| cam.OffsetAmount = targetOffsetAmount = item.Prefab.OffsetOnSelected * item.OffsetOnSelectedMultiplier; | |||
| } | |||
| else if (HeldItems.FirstOrDefault(item => item.GetComponent<Holdable>()?.Aimable ?? false) is Item item2 && IsKeyDown(InputType.Aim)) | |||
| { | |||
| cam.OffsetAmount = targetOffsetAmount = item2.GetComponent<Holdable>().CameraAimOffset; | |||
There was a problem hiding this comment.
Fetching the Holdable component is done twice
| float scale = (1f - ObstructVisionAmount) * scaleMultiplier; | ||
| Vector2 circleOrigin = new Vector2(visionCircle.Width, visionCircle.Height) / 2f; | ||
| Vector2 coneOrigin = new Vector2(0f, visionCone.Height / 2f); | ||
| Vector2 coneScale = new Vector2(1f / visionCone.Width, scale / visionCone.Height * coneHeightMultiplier) * (losOffset.Length() + circleOrigin.X); |
There was a problem hiding this comment.
This seems to change the behavior of the existing vision circle too. I think this needs some clarification: how and why does it change the vision circle too?
Regalis11
added
Feature request
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.
This PR does two things:
CameraAimOffset.Mod for Testing: Mod.zip
Obstruction Rework Previews
Lighting Disabled
Lighting Disabled w/ Scope
Lighting Enabled
Lighting Enabled w/ Scope
Reworked Light Sprites
Content/Lights/lightcone.png
Content/Lights/visioncircle.png