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

Add Weighted Blankets and Blanket Variants/Snippets #74051

Merged
merged 9 commits into from
May 27, 2024

Conversation

TheMurderUnicorn
Copy link
Contributor

@TheMurderUnicorn TheMurderUnicorn commented May 24, 2024

Summary

Content "Add weighted blankets and variants for them and for regular blankets."

Purpose of change

#73365 requested weighted blankets. Since I wanted to add variants for them/learn how to pull snippets into variant descriptions, I decided to add them and the add variants for both the weighted blankets and regular blankets.

Describe the solution

  • Create snippets to be used for blankets. These are:
    • sports teams – Adds town, mascot, and sport names for use with sports themed blankets and possibly other memorabilia in the future.
    • geometric patterns – Adds a handful of shapes for patterned stitching on blankets.
    • flowers – common flowers used in floral patterns for household items like blankets and pillowcases
    • cartoon_blanket – A handful of cartoon characters for use with a cartoon character blanket. These are not exactly ideal for adding to other variants/snippets in the future, so it’s not ideal for other creations.

All of these snippets were added to json/snippets/snippets.json because frankly I had no idea where else to put them and this looked like a general catchall for a few things, if this is wrong let me know so I can move them.

  • Added variants to the basic blanket, they are:

    • A regular blanket, for crafting purposes, so players do not end up crafting patterned blankets or cartoons or whatever.
    • Sports blanket – blanket with name/mascot of a sports team, uses 1 of 15 possible teams. Overall 7-ish % chance to spawn.
    • Sports blanket collectible – same as above but given a number and brief description explaining that its a collectors item (allegedly). 1-ish% chance to spawn
    • Geometric blanket – blanket stitched in various patterns, 7 possible shapes. 38-ish% chance to spawn.
    • Fluffy Blanket – advertised as fluffiest blanket in the world. Moderately fluffy. 7- ish % to spawn
    • Floral Blanket – A blanket with a flower pattern decorating it, pulls from 12 possible flower designs. 38 ish% chance to spawn
    • Cartoon Blanket – Blanket with cartoon character(s), pulls from 8 possible characters, I didn’t want to go overboard with these because they have longer descriptions and I don’t know if there are existing characters we have (other than Boston-chan, which I added to the list) – spawns at 7%ish
  • Made the regular blanket crafting recipe point to the standard variant to prevent players from crafting the pre-cataclysm blankets

  • Added weighted blanket, did what I could, no idea how to calculate volume so just arbitrarily made it larger than the regular blanket for volume. If someone knows how I’m supposed to math that out, tell me, the thickness I’ve found weren’t very helpful and I don’t know how to reflect it’s smaller when folded and etc. Chose not to add a bead item for the filler, they’re mostly made of these tiny little microbeads that would have no use in the game as far as I can tell. So it’s just a blanket. Increased warmth and encumbrance of regular blanket, obviously more weight, wasn’t sure about these aspects of the item, it seems fine to me but second guessing myself and etc.

  • Gave weighted blankets the geometric snippets since that’s the majority of what they look like. I’m sure there are decorative blankets, but literally every one I saw in a cursory search were one color with a geometric pattern of stitching.

  • Added weighted blankets to bedding spawns, at a significantly lower rate than standard blankets. I like them but I don’t think they’re all that common.

I think that’s it.

Describe alternatives you've considered

Well I initially wanted to add a ton more sports teams and a lot more variants, but people said I should keep it limited -_- I know variants and things upset contributors and that some people regard them as bloat but I would have liked to add more blanket variants, like a centennial blanket celebrating police/fire/town/etc centennials, or like... goth blankets that are tarot cards, skulls, etc. But I figured I'd keep myself from going too deep.

Testing

Lots of testing, it was hard for me to work it out, mostly just made sure they generate snippets correctly and that the crafting recipe works for pointing to the variant.

Additional context

This took me a long time and working with snippets and things is new to me. I tested quite a lot to make sure everything is working properly, but it’s possible I have typos somewhere. This was a big project for me, despite seeming small, so if I forgot to add something or whatever please let me know so I can fix it up. Nervous I messed something up x_x

Closes #73365

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Lore Game lore, in-game communication. Also the Lore tab. Items: Armor / Clothing Armor and clothing json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels May 24, 2024
@github-actions github-actions bot added the <Bugfix> This is a fix for a bug (or closes open issue) label May 24, 2024
@TheMurderUnicorn
Copy link
Contributor Author

As a note on the spellcheck, the only mention I considered adding to the dictionary was microbead, which according to google is one word and not hyphenated. But honestly that seems like work for something that will probably never come up again so I'm just not going to do it. I fixed the misspelling of Corgis (previously corgies)

Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A thick, layered blanket with glass microbeads added to increase the weight.
  • Eastport University field hockey team
  • Lewiston Crows baseball team
  • Maxfield Moles rugby team
  • Osborn University Blobfish soccer team
  • Salisbury Brahmin football team
  • Torrington Titans baseball team
  • Waitsfield Centurions rugby team
  • Woodford Corgis basketball team
  • a famous man and woman from an anime, dressed in cowboy outfits. A speech blurb reads "How y'all doin'?"
  • hybiscus
  • the famous Manspider, a quiet, nerdy spider that was bitten by a radioactive human

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@github-actions github-actions bot added Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` labels May 24, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 25, 2024
@dseguin dseguin merged commit 2c68074 into CleverRaven:master May 27, 2024
21 of 27 checks passed
@TheMurderUnicorn TheMurderUnicorn deleted the BlanketStuff branch May 27, 2024 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Lore Game lore, in-game communication. Also the Lore tab. Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Weighted blankets
2 participants