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

Floof Loadout Update #186

Merged
merged 34 commits into from
Sep 15, 2024
Merged

Conversation

ShatteredSwords
Copy link
Contributor

Description

This PR lowers the cost of many of the Floof loadout items, and smushes all loadouts into one big list so you can't take multiple. I had to choose between the possibility of having a merge conflict that could be solved using find and replace, and having a merge conflict that you would have to manually solve. Anyways, enjoy the duct tape and the bucket of nails. You can't have multiple of a prototype so I had to get creative. This essentially nullifies most of the character item groups from upstream in favor of having our own. The good thing is, less shit you'd have to manually solve in the first place.

Oh and also I added suspenders for whoever requested them. They are purely cosmetic. Feel free to take both if you'd like to.

Please just ping me if this will cause a merge conflict in the future, I could easily solve whatever it is to match upstream with find and replace.


Changelog

🆑

  • add: Suspenders are now in loadouts.
  • tweak: Loadouts items from Floof are a lot cheaper, but you cannot take an extra change of clothes.

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: YML Changes any yml files labels Sep 12, 2024
@Memeji
Copy link
Collaborator

Memeji commented Sep 12, 2024

Going to look over this carefully sometime this weekend.

@Fansana
Copy link
Owner

Fansana commented Sep 13, 2024

Gonna be honest I kinda prefer being able to pick multiple items. For clothing it accessories I think it makes sense that you can only pick one. I haven't had a chance to look at this in detail yet.

@ShatteredSwords
Copy link
Contributor Author

Gonna be honest I kinda prefer being able to pick multiple items. For clothing it accessories I think it makes sense that you can only pick one. I haven't had a chance to look at this in detail yet.

Items have not been touched, it's all clothing. I have yet to add in items and item groups.

@FoxxoTrystan FoxxoTrystan added the Priority: 1-High Needs to be resolved as soon as possible label Sep 14, 2024
@Memeji
Copy link
Collaborator

Memeji commented Sep 14, 2024

To clarify:
-I see a lot of items now cost 0.
-There's the second loadout slot for these items.

@ShatteredSwords
Copy link
Contributor Author

To clarify: -I see a lot of items now cost 0. -There's the second loadout slot for these items.

Yes, this was what loadouts V3 was meant for actually. The cost of things were supposed to go down to 0 or near 0, but you cannot take extras
Not sure what you mean by the second point.

@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Sep 14, 2024
@ShatteredSwords
Copy link
Contributor Author

Created localization for this PR in terms of item groups. I will be working on job loadouts changes later on, but for now, we have the basic loadouts.

@ShatteredSwords
Copy link
Contributor Author

I can confirm that the localization works after testing

@Memeji Memeji merged commit 3458962 into Fansana:master Sep 15, 2024
11 checks passed
Floof-Station-Bot added a commit that referenced this pull request Sep 15, 2024
@ShatteredSwords ShatteredSwords deleted the floof-loadout-update branch September 16, 2024 20:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 1-High Needs to be resolved as soon as possible Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants