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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
54d1449
Update jewelry.json
aapocalypseAArisen May 22, 2024
8a78580
Update recipe_deconstruction.json
aapocalypseAArisen May 22, 2024
9bfc2a3
Update clothing.json
aapocalypseAArisen May 22, 2024
55b0d66
Update locations_commercial.json
aapocalypseAArisen May 22, 2024
a3922ee
Update domestic.json
aapocalypseAArisen May 22, 2024
b67f65d
Update stashes.json
aapocalypseAArisen May 22, 2024
1d4308d
Update jewellery_gems.json
aapocalypseAArisen May 22, 2024
d8c37ba
Update NC_CITY_COP.json
aapocalypseAArisen May 22, 2024
0e98437
Update domestic.json
aapocalypseAArisen May 22, 2024
b5242fa
Update domestic.json
aapocalypseAArisen May 22, 2024
56d5ecb
Update domestic.json
aapocalypseAArisen May 22, 2024
946a3cf
Update clothing.json
aapocalypseAArisen May 22, 2024
3bf6e71
Update clothing.json
aapocalypseAArisen May 22, 2024
eb9ede7
Update clothing.json
aapocalypseAArisen May 22, 2024
5764ba2
Update locations_commercial.json
aapocalypseAArisen May 22, 2024
196025b
Update domestic.json
aapocalypseAArisen May 22, 2024
51aab38
Update domestic.json
aapocalypseAArisen May 22, 2024
72aed92
Update locations_commercial.json
aapocalypseAArisen May 23, 2024
b366c84
Update clothing.json
aapocalypseAArisen May 23, 2024
3bd5415
Update clothing.json
aapocalypseAArisen May 23, 2024
a2bc649
Update locations_commercial.json
aapocalypseAArisen May 23, 2024
ffb5d91
Update domestic.json
aapocalypseAArisen May 23, 2024
b90a4dd
Update clothing.json
aapocalypseAArisen May 23, 2024
50efeda
Update domestic.json
aapocalypseAArisen May 23, 2024
15ad713
Update domestic.json
aapocalypseAArisen May 23, 2024
10d7b8b
Merge branch 'CleverRaven:master' into testbranch
aapocalypseAArisen May 23, 2024
bf5a6e6
Update jewelry.json
aapocalypseAArisen May 23, 2024
0383bc0
Update jewelry.json
aapocalypseAArisen May 23, 2024
e808853
Update jewelry.json
aapocalypseAArisen May 24, 2024
f492ef5
Update jewelry.json
aapocalypseAArisen May 24, 2024
6e7be56
Update jewelry.json
aapocalypseAArisen May 24, 2024
d4d42c7
Update jewelry.json
aapocalypseAArisen May 24, 2024
07166d5
Update jewelry.json
aapocalypseAArisen May 24, 2024
6541472
Update recipe_deconstruction.json
aapocalypseAArisen May 24, 2024
4c3a6d6
Update recipe_deconstruction.json
aapocalypseAArisen May 24, 2024
8febb5b
Update jewelry.json
aapocalypseAArisen May 24, 2024
c22a675
Update jewelry.json
aapocalypseAArisen May 24, 2024
4080c82
Update data/json/items/armor/jewelry.json
aapocalypseAArisen May 24, 2024
33f5f8e
Update data/json/items/armor/jewelry.json
aapocalypseAArisen May 24, 2024
7439bb6
Update data/json/recipes/recipe_deconstruction.json
aapocalypseAArisen May 24, 2024
453d68b
Update data/json/recipes/recipe_deconstruction.json
aapocalypseAArisen May 24, 2024
9243128
Update data/json/recipes/recipe_deconstruction.json
aapocalypseAArisen May 24, 2024
01c2445
Update data/json/recipes/recipe_deconstruction.json
aapocalypseAArisen May 24, 2024
33fadb2
Update data/json/recipes/recipe_deconstruction.json
aapocalypseAArisen May 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -4556,7 +4556,15 @@
"items": [
{ "group": "accesories_personal_womens_child", "prob": 380 },
{ "item": "ring_engagement", "prob": 5 },
{ "item": "ring_purity", "prob": 10 }
{ "item": "ring_purity", "prob": 10 },
{ "item": "gold_lip_ring_loop", "prob": 2 },
{ "item": "silver_lip_ring_stud", "prob": 3 },
{ "item": "silver_lip_ring_loop", "prob": 3 },
{ "item": "gold_lip_ring_stud", "prob": 2 },
{ "item": "gold_nose_ring_loop", "prob": 2 },
{ "item": "gold_nose_ring_stud", "prob": 2 },
{ "item": "silver_nose_ring_loop", "prob": 3 },
{ "item": "silver_nose_ring_stud", "prob": 3 }
]
},
{
Expand All @@ -4573,7 +4581,11 @@
{ "item": "platinum_hairpin", "prob": 10 },
{ "item": "barrette", "prob": 60 },
{ "item": "pearl_collar", "prob": 5 },
{ "item": "jade_brooch", "prob": 5 }
{ "item": "jade_brooch", "prob": 5 },
{ "item": "gold_anklet", "prob": 30 },
{ "item": "silver_anklet", "prob": 50 },
{ "item": "gold_toe_ring", "prob": 30 },
{ "item": "silver_toe_ring", "prob": 50 }
]
},
{
Expand Down
4 changes: 3 additions & 1 deletion data/json/itemgroups/Clothing_Gear/jewellery_gems.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@
[ "tieclip", 35 ],
[ "bead_ear", 35 ],
[ "pearl_collar", 30 ],
[ "holy_symbol", 20 ]
[ "holy_symbol", 20 ],
[ "gold_anklet", 20 ],
[ "silver_anklet", 30 ]
]
},
{
Expand Down
15 changes: 15 additions & 0 deletions data/json/itemgroups/Locations_MapExtras/locations_commercial.json
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,18 @@
[ "silver_locket", 1 ],
[ "gold_locket", 1 ],
[ "platinum_locket", 1 ],
[ "gold_anklet", 1 ],
[ "silver_anklet", 2 ],
[ "gold_lip_ring_loop", 1 ],
[ "gold_lip_ring_stud", 1 ],
[ "silver_lip_ring_loop", 2 ],
[ "silver_lip_ring_stud", 2 ],
[ "gold_nose_ring_loop", 1 ],
[ "gold_nose_ring_stud", 1 ],
[ "silver_nose_ring_loop", 2 ],
[ "silver_nose_ring_stud", 2 ],
[ "gold_toe_ring", 1 ],
[ "silver_toe_ring", 2 ],
{ "group": "mags_pawnshop", "prob": 300 }
]
},
Expand Down Expand Up @@ -631,6 +643,9 @@
[ "silver_medal", 2 ],
[ "gold_medal", 1 ],
[ "freeze_dried_meal", 5 ],
[ "bat_anklet", 1 ],
[ "flower_anklet", 1 ],
[ "woven_anklet", 1 ],
{ "group": "tinware", "prob": 10 },
{ "group": "pens", "prob": 10 },
{ "group": "costume_all_clothing", "prob": 10 }
Expand Down
23 changes: 20 additions & 3 deletions data/json/itemgroups/SUS/domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,20 @@
{ "item": "chopsticks", "prob": 2 },
{ "item": "office_holepunch", "prob": 2, "count": [ 1, 3 ] },
{ "item": "nuts_bolts", "prob": 50, "charges": [ 3, 12 ] },
{ "prob": 1, "count": 1, "group": "melatonin_tablet_bottle_plastic_pill_supplement_10" }
{ "prob": 1, "count": 1, "group": "melatonin_tablet_bottle_plastic_pill_supplement_10" },
{ "item": "bat_anklet", "prob": 10 },
{ "item": "flower_anklet", "prob": 10 },
{ "item": "woven_anklet", "prob": 10 },
{ "item": "gold_lip_ring_loop", "prob": 5 },
{ "item": "gold_lip_ring_stud", "prob": 5 },
{ "item": "silver_lip_ring_loop", "prob": 6 },
{ "item": "silver_lip_ring_stud", "prob": 6 },
{ "item": "gold_nose_ring_loop", "prob": 5 },
{ "item": "gold_nose_ring_stud", "prob": 5 },
{ "item": "silver_nose_ring_loop", "prob": 6 },
{ "item": "silver_nose_ring_stud", "prob": 6 },
{ "item": "gold_toe_ring", "prob": 5 },
{ "item": "silver_toe_ring", "prob": 6 }
]
},
{
Expand Down Expand Up @@ -291,7 +304,10 @@
{ "item": "bead_necklace", "count": [ 5, 9 ], "prob": 5 },
{ "item": "old_key", "prob": 5, "count": [ 1, 12 ] },
{ "item": "office_letter_opener", "prob": 5 },
{ "item": "glowstick_dead", "prob": 5 }
{ "item": "glowstick_dead", "prob": 5 },
{ "item": "bat_anklet", "prob": 10 },
{ "item": "flower_anklet", "prob": 10 },
{ "item": "woven_anklet", "prob": 10 }
]
},
{
Expand Down Expand Up @@ -1059,7 +1075,8 @@
{ "group": "bags_unisex", "prob": 20 },
{ "group": "hats_unisex", "prob": 20 },
{ "group": "scarfs_unisex", "prob": 20 },
{ "item": "crutches", "prob": 1 }
{ "item": "crutches", "prob": 1 },
{ "item": "woven_anklet", "prob": 5 }
]
},
{
Expand Down
4 changes: 3 additions & 1 deletion data/json/itemgroups/stashes.json
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,9 @@
[ "spiral_stone", 5 ],
[ "petrified_eye", 5 ],
[ "talking_doll", 40 ],
[ "bondage_mask", 20 ]
[ "bondage_mask", 20 ],
[ "gold_anklet", 25 ],
[ "silver_anklet", 25 ]
]
},
{
Expand Down
Loading
Loading