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.

Sign up for GitHub

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

Jump to bottom

Loadouts #45

Merged
merged 21 commits into from
May 13, 2024
Merged

Loadouts #45

merged 21 commits into from
May 13, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Mar 25, 2024 •
edited
Loading

Description copied from my Wizard's Den PR
Resolves #32

TODO

  • CVars
  • Server side loadout point validation
  • Make tabContainer less bad
  • Move head clothes to loadouts from lockers
  • Move job starting equipment to loadouts
  • Loadout item preview
  • Fix loadouts duplicating on server restart
  • Make sure everything is localized -- Components and Tags are an odd thing to display to the player in the whitelist and are very unrealistic to make localizations for, so.. not doing that, what do I do?
  • Fix all items going into the bag no matter their size
  • Add min/cur/max points to the bar
  • Use buttons instead of checkboxes
  • "Show Unusable" button to hide things your character currently doesn't match the whitelists for
  • Time whitelist option
  • Species whitelist option
  • Trait whitelist option instead of EntityWhitelist for the sake of localization
  • More loadouts (filler things while waiting for review)
  • - Golden or themed items for Command roles with an undecided amount of playtime on their respective jobs
  • - Goliath cloak for playing a lot of Salvage
  • - Senior items for playing a lot of its respective role
  • - Varying materials of pocket watches for people with varying overall playtime
  • Fix loadout selectors not updating to match current preferences

Media (Click Me!)

I need to rerecord these

2024-01-13_00-42-47.mp4
2024-01-13_00-44-20.mp4

Changelog

🆑

  • add: Added a new character customization tab for selecting items to start your shift with, loadouts!
  • remove: Removed some default job equipment in favor of loadouts
  • remove: Removed several clothing items from Command lockers in favor of loadouts

@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 2-High Needs to be resolved as soon as possible Size: 1-Very Large For especially large issues/PRs Type: Feature Creation of or significant changes to a feature labels Mar 25, 2024
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Mar 25, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT marked this pull request as ready for review March 26, 2024 09:06
@metalgearsloth

This comment was marked as resolved.

Sign in to view
VMSolidus
VMSolidus previously approved these changes Apr 6, 2024
View reviewed changes
Resources/Prototypes/Loadouts/Jobs/cargo.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/Jobs/science.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/Jobs/science.yml Outdated Show resolved Hide resolved
@VMSolidus
Copy link
Member

I love learning how to make reviews "The right way"

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

github-actions bot commented Apr 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 Apr 14, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Apr 14, 2024
Open
75 tasks
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label May 5, 2024
@VMSolidus
Copy link
Member

Yea it was unintentional.

@github-actions github-actions bot added the Status: Needs Review Someone please review this label May 5, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label May 5, 2024
VMSolidus
VMSolidus approved these changes May 5, 2024
View reviewed changes
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

image
Test fails are the audio broadphase fail(which we ignore), and the database check. I naturally assume that means this will have to be force merged by Death or Psprite, or something else that they need to do.

In either case, this looks good to go from my perspective. Great work Death!

@DEATHB4DEFEAT
use autogenerated migrations
9567aa9 
I can't believe I wrote these by hand originally
@DangerRevolution DangerRevolution self-requested a review May 11, 2024 01:23
DangerRevolution
DangerRevolution approved these changes May 11, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Resources/Locale/en-US/loadouts/neck.ftl Show resolved Hide resolved
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

Might be worth keeping drip in lockers, or at least in the dressers for people promoted into positions.

Copy link
Contributor

Choose a reason for hiding this comment

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

Just scrolled down, should be fine as long as we make sure forks know to map the Dressers

Copy link
Member Author

Choose a reason for hiding this comment

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

I hadn't looked at dressers since those are new but ig that's a good place to put things. All head clothing items should be printable in the clothing lathe.

@DangerRevolution DangerRevolution requested a review from a team May 11, 2024 01:31
@DangerRevolution DangerRevolution added Changes: Config Changes any configuration files Holy Shit Priority: 1-Urgent Must be resolved immediately Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels and removed Priority: 2-High Needs to be resolved as soon as possible labels May 11, 2024
FoxxoTrystan
FoxxoTrystan reviewed May 11, 2024
View reviewed changes
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.

Tested it, seem no issue in-game/build.

Personnally there will be more to add in the loadout but as a base, this is nice.

We should also do the Garnement storage to store clothing for lockers instead of just removing it.

Anywho, Tested, Approved

@VMSolidus VMSolidus merged commit 5285573 into Simple-Station:master May 13, 2024
13 checks passed
SimpleStation14 added a commit that referenced this pull request May 13, 2024
@SimpleStation14
Automatic Changelog Update (#45)
e090fa3
dasprino007 pushed a commit to dasprino007/Einstein-Engines that referenced this pull request Jul 20, 2024
@VMSolidus
Merge pull request Simple-Station#45 from VMSolidus/Upstream-Merge-7/…
2228f20 
…11/2024

Upstream Merge 7/11/2024
zelezniciar1 pushed a commit to zelezniciar1/Einstein-Engines that referenced this pull request Oct 30, 2024
@SsalamethVersaach
Re-ports tweaks from PR Simple-Station#43, Simple-Station#45, Simple-…
fe2af75 
…Station#34 (Simple-Station#51)

<!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
<!-- The text between the arrows are comments - they will not be visible
on your PR. -->

## About the PR
<!-- What did you change in this PR? -->
Ported tweaks

## Why / Balance
<!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
Tweaks.

## Technical details
<!-- If this is a code change, summarize at high level how your new code
works. This makes it easier to review. -->
Yaml changes.

## Media
<!-- 
PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
Small fixes/refactors are exempt.
Any media may be used in SS14 progress reports, with clear credit given.

If you're unsure whether your PR will require media, ask a maintainer.
-->

## Requirements
<!-- 
Due to influx of PR's we require to ensure that PR's are following the
correct guidelines.

Please take a moment to read these if its your first time.

Check the boxes below to confirm that you have in fact seen these (put
an X in the brackets, like [X]):
-->
- [X] I have read and I am following the [Pull Request
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
I understand that not doing so may get my pr closed at maintainer’s
discretion
- [X] I have added screenshots/videos to this PR showcasing its changes
ingame, **or** this PR does not require an ingame showcase

## Breaking changes
<!--
List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
-->
None, I hope.

**Changelog**
<!--
Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
-->

<!--
Make sure to take this Changelog template out of the comment block in
order for it to show up. Changelog must have a 🆑 symbol, so the bot
recognizes the changes and adds them to the game's changelog.-->
🆑 TwoDucksOnnaPlane & TheGreenChkrta
- tweak: Added back damage tweaks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoxxoTrystan FoxxoTrystan FoxxoTrystan left review comments

@DangerRevolution DangerRevolution DangerRevolution approved these changes

@VMSolidus VMSolidus VMSolidus approved these changes

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Config Changes any configuration files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files Holy Shit Priority: 1-Urgent Must be resolved immediately Size: 1-Very Large For especially large issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Baystation-Style Loadouts
5 participants
@DEATHB4DEFEAT @metalgearsloth @VMSolidus @FoxxoTrystan @DangerRevolution