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.

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

Better Lying Down System (From White Dream) #815

Merged

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented Aug 29, 2024

Description

Port of WWhiteDreamProject/wwdpublic#2
And now also WWhiteDreamProject/wwdpublic#8
Because Lying Down System is dependent on the Telescope System.

TODO

  • Reconcile the code with core code, do code cleanup. I'll undraft this when I'm done. Probably not going to be tonight, because I will have to get some sleep soon to get up early for my calculus classes.

Changelog

🆑 Spatison (White Dream)

  • add: Added lying down system / Добавлена система лежания
  • tweak: Lying down now uses do-afters that are visible to other people to indicate what is going on.
  • add: Added telescope system / Добавлена система прицеливания
  • tweak: Now you can aim from Hristov / Теперь можно прицеливаться из Христова

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files labels Aug 29, 2024
@VMSolidus VMSolidus marked this pull request as draft August 29, 2024 01:19
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 30, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 1, 2024
@VMSolidus VMSolidus marked this pull request as ready for review September 1, 2024 22:34
@VMSolidus
Copy link
Member Author

This is ready to go.

@ShatteredSwords
Copy link
Contributor

Have you checked if this affects the traits like lethargy, parkour training, etc and the way they work?

@VMSolidus
Copy link
Member Author

Apparently this isn't ready because it's now dependent on WWhiteDreamProject/wwdpublic#8

@VMSolidus VMSolidus marked this pull request as draft September 1, 2024 22:46
@github-actions github-actions bot added the Changes: YML Changes any yml files label Sep 1, 2024
@VMSolidus VMSolidus marked this pull request as ready for review September 1, 2024 23:05
@VMSolidus
Copy link
Member Author

Have you checked if this affects the traits like lethargy, parkour training, etc and the way they work?

image

Yes, the code used by these traits is still in use by the newly updated LayingDownSystem.

@FoxxoTrystan FoxxoTrystan self-requested a review September 2, 2024 19:38
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Sep 2, 2024
Copy link
Member

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

I just run a dev eviroment, press R...
Gliches happened.

After laying down and doing up when walking my character is back on the laying animation.

Intercations System may need to be looked as i forced someone down but the game still think their up.

image
(By the way in the screenshot im down even tho im up, normal walkspeed and all.)

I checkout, Build and test it 2 times, same results, so il not approve or request changes as well il be gone soon but im leaving a comment here.

@VMSolidus
Copy link
Member Author

I just run a dev eviroment, press R... Gliches happened.

After laying down and doing up when walking my character is back on the laying animation.

Intercations System may need to be looked as i forced someone down but the game still think their up.

image (By the way in the screenshot im down even tho im up, normal walkspeed and all.)

I checkout, Build and test it 2 times, same results, so il not approve or request changes as well il be gone soon but im leaving a comment here.

Thanks a bunch for testing it(I am usually severely behind in testing things). I'll take a look when I get a chance and see about getting the interaction system to play nice with the lying down system

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 8, 2024
Copy link
Contributor

github-actions bot commented Sep 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 10, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 14, 2024
@FoxxoTrystan FoxxoTrystan added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point Type: Port Brings something to here from another codebase labels Sep 17, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 17, 2024
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

Why is telescope a part of this?

Content.Shared/Input/ContentKeyFunctions.cs Outdated Show resolved Hide resolved
Resources/Locale/en-US/escape-menu/ui/options-menu.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/Escape-Menu/options-menu.ftl Outdated Show resolved Hide resolved
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
@VMSolidus VMSolidus merged commit d5f0c55 into Simple-Station:master Sep 19, 2024
11 checks passed
SimpleStation14 added a commit that referenced this pull request Sep 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 3-Medium For medium issues/PRs Status: Needs Review Someone please review this Type: Port Brings something to here from another codebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants