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

Jewelry addition #74033

Merged
merged 44 commits into from
May 26, 2024
Merged

Conversation

aapocalypseAArisen
Copy link
Contributor

Summary

Content "New jewelry added"

Purpose of change

The range of jewelry currently in the game is vast and varied. However, there are some categories of accessories not touched upon. I wanted to add to those unexplored categories. Perhaps being the first of further additions in this new addition of cosmetics.

Describe the solution

Added new cosmetics. Gold and silver lip ring stud and loops. Gold and silver nose ring stud and loops. Gold, silver and plastic anklets. Gold and silver toe rings.

Describe alternatives you've considered

Simply leaving these categories of cosmetics untouched.

Testing

Booted a new world with no error message. Checked and confirmed item disassembly was working as intended. Wore the jewelry with normal clothes to confirm that there were no conflicts with other clothing. Checked the item descriptions to make sure the values were as desired. Teleported to a nearby city and killed zombies to confirm that the new additions were actively in the loot pools.

Additional context

My reasoning for each of the loot pool groups:

Anklets-
Jewelry.json - self explanatory.
Clothing.json - accesories_personal_womens_child Metal anklets in female child spawn group with the assumption that it will filter into the adult female spawn group.
Location_commercial.json - Pawn_valuable for metal anklets, Pawn for non metal anklets. Seems self explanatory. People will sell any bit of gold or silver for cash.
domestic.json - SUS_junk_drawer_artsy and SUS_junk_drawer_messy for non metal anklets. They're likely pieces that a creative person would make. And personally, I can confirm I have bracelets and other minor cosmetics in my messy junk drawer IRL.
stashes.json - bugout_memento for the metal anklets. Seems appropriate, valuable gold and silver items scooped into a bag of closely held possessions.
jewelry_gems.json - jewelry_accessories for the metal anklets. This loot pool seemed like the general loot pool for common jewelry.
NC_CITY_COP.json - NC_CITY_COP_misc For the metal anklets. I believe I recognized this loot pool as the contraband room loot pool. So this seems appropriate. Petty thieves pilfering small bits of gold and silver then getting caught.

Lip rings:
jewlery.json - Self explanatory.
clothing.json. - accesories_personal_womens for it to spawn on adult women.
locations_commercial.json - pawn_valuable Same reason as anklets.
domestic.json - SUS_junk_drawer_messy For having small cosmetics scattered around old drawers. Personally, I have old metal bracelets I've not worn in years in my drawers.

Nose rings:
Jewlery.json - Self explanatory.
clothing.json - accesories_personal_womens Same reason as above.
locations_commercial.json - pawn_valuable Same reason as above.
domestic.json - SUS_junk_drawer_messy Same reason as above.

Toe rings:
Jewlery.json - Self explanatory.
clothing.json - accesories_personal_womens_child Because it seemed like appropriate cosmetics for female children wear. Also with the understanding that it will filter into adult women loot pool.
locations_commercial.json - pawn_valuable Same reason as above.
domestic.json - SUS_junk_drawer_messy Same reason as above.

Added in all jewelry into jewelry.json
Added deconstruct recipe to new jewelry.
Added metal anklets to female child spawn group. Assuming it also filters into the adult female spawn group.
Added metal anklets to valuable pawn. Non metal to normal pawn.
Added non metal anklets to domestic spaces.
Put metal anklets into memorabilia bug out bag.
Added metal anklets in the category of other general metal jewelry.
Added metal anklets to contraband.
Removed line errors.
Removed line error.
Removed line error.
Removed line error
Added lip rings to women specific loot pool.
Accounted for gold vs silver.
Added lip rings to valuable pawn spawns.
Added lip rings to messy drawers.
Added nose rings to messy drawers.
Added nose rings to valuable pawn spawns.
Added nose rings to women specific accessory spawns.
Added toe rings to female child accessories which will filter into adult female accessories.
Added toe rings to valuable pawn loot pool.
Added toe rings to messy drawer spawns.
Fix line division error causing hard crash.
Fixed line error causing hard crash.
Fixed line error causing crash.
Fixed missing " in several lines.
Removed presumed unnecessary plural naming.
Fixed missing , .
Removed extra commas.
Remove mouth coverage on lip rings, presumably causing errors.
Adjusted anklet values.
Adds cotton to anklet materials.
Remove disassembly requirements from bat and flower charm anklets.
Removed the extra word charm from plastic anklets.
Changed gold nose ring stud symbol from o to . .
Removed head coverage specification from lip ring.
@aapocalypseAArisen aapocalypseAArisen marked this pull request as draft May 24, 2024 05:26
@aapocalypseAArisen aapocalypseAArisen marked this pull request as ready for review May 24, 2024 05:32
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Spawn Creatures, items, vehicles, locations appearing on map Items: Armor / Clothing Armor and clothing labels May 24, 2024
data/json/items/armor/jewelry.json Outdated Show resolved Hide resolved
data/json/items/armor/jewelry.json Outdated Show resolved Hide resolved
data/json/recipes/recipe_deconstruction.json Outdated Show resolved Hide resolved
data/json/recipes/recipe_deconstruction.json Outdated Show resolved Hide resolved
data/json/recipes/recipe_deconstruction.json Outdated Show resolved Hide resolved
data/json/recipes/recipe_deconstruction.json Outdated Show resolved Hide resolved
data/json/recipes/recipe_deconstruction.json Outdated Show resolved Hide resolved
aapocalypseAArisen and others added 7 commits May 24, 2024 01:57
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels May 24, 2024
@aapocalypseAArisen
Copy link
Contributor Author

All checks passed. Looks like it is ready to fire. Unless someone else has any additional observations.

@Maleclypse Maleclypse merged commit 07ea5c9 into CleverRaven:master May 26, 2024
24 checks passed
@aapocalypseAArisen aapocalypseAArisen deleted the Jewelry-addition branch May 28, 2024 01:19
@aapocalypseAArisen
Copy link
Contributor Author

Here is confirmation of my request with the discord name Eight Spades.

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 Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants