Skip to content

Commit

Permalink
Merge branch 'CleverRaven:master' into afs-psi-tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Standing-Storm authored Jan 30, 2025
2 parents 2963b13 + 117147f commit fcd3761
Show file tree
Hide file tree
Showing 110 changed files with 1,753 additions and 645 deletions.
4 changes: 4 additions & 0 deletions data/json/itemgroups/Food/food.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
{ "item": "hot_sauce", "prob": 25 },
{ "item": "horseradish", "prob": 15 },
{ "item": "spread_peanutbutter", "prob": 10 },
{ "item": "marshmallow_fluff", "prob": 10 },
{ "item": "honey_bottled", "prob": 35 },
{ "prob": 35, "group": "honey_glassed_jar_glass_sealed_5" },
{ "prob": 15, "group": "oyster_crackers_plastic_bag_vac_8" }
Expand Down Expand Up @@ -591,6 +592,7 @@
{ "item": "sandwich_veggy", "prob": 30 },
{ "prob": 30, "group": "sandwich_t_wrapper_2" },
{ "item": "sandwich_pb", "prob": 1 },
{ "item": "sandwich_pbf", "prob": 1 },
{ "item": "sandwich_pbj", "prob": 1 },
{ "item": "sandwich_pbh", "prob": 1 },
{ "item": "sandwich_pbm", "prob": 1 },
Expand Down Expand Up @@ -634,6 +636,7 @@
{ "item": "sandwich_pbj", "prob": 30 },
{ "item": "sandwich_pbh", "prob": 30 },
{ "item": "sandwich_pbm", "prob": 30 },
{ "item": "sandwich_pbf", "prob": 30 },
{ "prob": 50, "group": "frozen_dinner_box_small_2" },
{ "item": "junk_burrito", "prob": 60 },
{ "item": "dried_salad", "prob": 6 },
Expand Down Expand Up @@ -907,6 +910,7 @@
{ "item": "sandwich_pbj", "prob": 30 },
{ "item": "sandwich_pbh", "prob": 30 },
{ "item": "sandwich_pbm", "prob": 30 },
{ "item": "sandwich_pbf", "prob": 30 },
{ "prob": 8, "group": "pizza_veggy_box_small_4" },
{ "prob": 8, "group": "pizza_cheese_box_small_4" },
{ "prob": 8, "group": "pizza_meat_box_small_4" },
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/SUS/domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@
},
{ "item": "jam_fruit", "prob": 80 },
{ "item": "peanutbutter", "prob": 80 },
{ "item": "marshmallow_fluff", "prob": 80 },
{ "item": "syrup", "prob": 50 },
{
"distribution": [ { "item": "cereal", "prob": 50 }, { "item": "cereal2", "prob": 50 }, { "item": "cereal3", "prob": 50 } ]
Expand Down
1 change: 0 additions & 1 deletion data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,6 @@
{ "item": "textbook_armeast", "prob": 3 },
{ "item": "textbook_mesoam", "prob": 2 },
{ "item": "bronze_book", "prob": 3 },
{ "item": "survnote", "prob": 2 },
{ "item": "book_lockpick", "prob": 2 },
{ "item": "basic_chemistry", "prob": 5 },
{ "item": "fermenting_book", "prob": 8 },
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/food_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,7 @@
{ "prob": 50, "group": "blt_wrapper_2" },
{ "item": "sandwich_pbj", "prob": 50 },
{ "item": "sandwich_pbh", "prob": 20 },
{ "item": "sandwich_pbf", "prob": 20 },
{ "item": "sandwich_pbm", "prob": 10 },
{ "item": "sandwich_pb", "prob": 35 },
{ "item": "fish_sandwich", "prob": 20 },
Expand Down Expand Up @@ -830,6 +831,7 @@
{ "item": "honey_bottled", "prob": 35 },
{ "prob": 35, "group": "honey_glassed_jar_glass_sealed_5" },
{ "item": "peanutbutter", "prob": 60 },
{ "item": "marshmallow_fluff", "prob": 35 },
{ "prob": 40, "group": "pickle_jar_glass_sealed_2" },
{ "item": "coffee_syrup", "prob": 35 },
{ "prob": 45, "group": "coffee_raw_bag_plastic_20" },
Expand Down
8 changes: 8 additions & 0 deletions data/json/items/book/abstract.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
"copy-from": "book_fict_tpl",
"melee_damage": { "bash": 1 }
},
{
"abstract": "book_fict_soft_collection_tpl",
"type": "BOOK",
"copy-from": "book_fict_soft_tpl",
"name": { "str": "paperback novel", "str_pl": "paperbacks" },
"description": "Paperback fiction novel generic collection",
"generic": true
},
{
"abstract": "book_nonf_hard_tpl",
"type": "BOOK",
Expand Down
40 changes: 25 additions & 15 deletions data/json/items/book/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"intelligence": 10,
"time": "26 m",
"chapters": 40,
"generic": true,
"fun": 3
},
{
Expand Down Expand Up @@ -170,6 +171,7 @@
"color": "pink",
"time": "10 m",
"chapters": 4,
"generic": true,
"fun": 1
},
{
Expand All @@ -194,7 +196,7 @@
"type": "BOOK",
"name": { "str": "adventure novel" },
"description": "The stirring tale of a race against time, in search of a lost city located in the heart of the African continent.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"price": "8 USD 50 cent",
"price_postapoc": "50 cent",
"time": "20 m",
Expand All @@ -205,7 +207,7 @@
"type": "BOOK",
"name": { "str": "buddy novel" },
"description": "A gripping tale of two friends struggling to survive on the streets of New York City.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"weight": "244 g",
"volume": "500 ml",
"price": "6 USD 50 cent",
Expand All @@ -215,7 +217,7 @@
"id": "novel_crime",
"type": "BOOK",
"name": { "str": "crime novel" },
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"description": "After their diamond heist goes wrong, the surviving criminals begin to suspect that one of them is a police informant.",
"intelligence": 6,
"time": "20 m",
Expand Down Expand Up @@ -252,7 +254,7 @@
"type": "BOOK",
"name": { "str": "drama novel" },
"description": "A real book for real adults.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"intelligence": 7,
"time": "25 m",
"chapters": 28,
Expand All @@ -263,7 +265,7 @@
"type": "BOOK",
"name": { "str": "erotic novel" },
"description": "A hackneyed fictional narrative concealing low-grade literary smut.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"weight": "200 g",
"volume": "500 ml",
"time": "18 m",
Expand All @@ -274,7 +276,7 @@
"type": "BOOK",
"name": { "str": "experimental novel" },
"description": "A bizarre play about the philosophy of existential absurdity. Or maybe it's about two guys waiting for their friend to show up. It's confusing.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"weight": "142 g",
"volume": "500 ml",
"intelligence": 7,
Expand All @@ -286,7 +288,7 @@
"type": "BOOK",
"name": { "str": "fantasy novel" },
"description": "Basic sword & sorcery.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"weight": "227 g",
"volume": "1 L",
"intelligence": 7,
Expand All @@ -300,7 +302,7 @@
"type": "BOOK",
"name": { "str": "horror novel" },
"description": "Maybe not the best reading material considering the situation.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"weight": "227 g",
"intelligence": 7,
"time": "18 m",
Expand All @@ -312,7 +314,7 @@
"type": "BOOK",
"name": { "str": "mystery novel" },
"description": "A detective investigates an unusual murder in a secluded location.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"intelligence": 7,
"time": "18 m",
"chapters": 28,
Expand All @@ -323,7 +325,7 @@
"type": "BOOK",
"name": { "str": "road novel" },
"description": "A tale about a group of friends who wander the USA in the 1960s against a backdrop of jazz, poetry and drug use.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"weight": "244 g",
"volume": "500 ml",
"time": "20 m",
Expand All @@ -345,7 +347,7 @@
"type": "BOOK",
"name": { "str": "romance novel" },
"description": "Drama and mild smut.",
"copy-from": "book_fict_soft_tpl"
"copy-from": "book_fict_soft_collection_tpl"
},
{
"id": "paperback_romance_circuses",
Expand Down Expand Up @@ -497,7 +499,7 @@
"type": "BOOK",
"name": { "str": "spy novel" },
"description": "A tale of intrigue and espionage among Nazis, no, Commies, no, Iraqis!",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"intelligence": 5,
"time": "18 m",
"chapters": 20,
Expand All @@ -524,7 +526,7 @@
"description": "An exciting seventeenth century tale of how an enslaved Irish doctor and his comrades-in-chains escape and become heroic pirates of the Robin Hood variety.",
"weight": "582 g",
"volume": "750 ml",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"intelligence": 7,
"time": "20 m",
"chapters": 28,
Expand Down Expand Up @@ -582,7 +584,7 @@
"type": "BOOK",
"name": { "str": "war novel" },
"description": "A thrilling narrative of survival in a prisoner of war camp during the Second World War, filled with riveting subplots about rat farming and dysentery.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"weight": "686 g",
"price_postapoc": "50 cent",
"intelligence": 7,
Expand All @@ -604,7 +606,7 @@
"type": "BOOK",
"name": { "str": "western novel" },
"description": "The classic tale of a gunfighting stranger who comes to a small settlement and is hired to help the townsfolk defend themselves from a band of marauding outlaws.",
"copy-from": "book_fict_soft_tpl",
"copy-from": "book_fict_soft_collection_tpl",
"intelligence": 5,
"time": "20 m",
"chapters": 28,
Expand Down Expand Up @@ -680,6 +682,7 @@
"intelligence": 4,
"time": "1 m",
"chapters": 200,
"generic": true,
"fun": -5,
"melee_damage": { "bash": 2 }
},
Expand All @@ -698,6 +701,7 @@
"color": "light_gray",
"time": "10 m",
"chapters": 4,
"generic": true,
"fun": 1,
"flags": [ "INSPIRATIONAL" ]
},
Expand All @@ -717,6 +721,7 @@
"intelligence": 9,
"time": "18 m",
"chapters": 36,
"generic": true,
"fun": 2
},
{
Expand All @@ -735,6 +740,7 @@
"intelligence": 9,
"time": "18 m",
"chapters": 36,
"generic": true,
"fun": 2
},
{
Expand Down Expand Up @@ -825,6 +831,7 @@
"intelligence": 7,
"time": "48 m",
"chapters": 28,
"generic": true,
"fun": 5
},
{
Expand All @@ -843,6 +850,7 @@
"intelligence": 6,
"time": "18 m",
"chapters": 24,
"generic": true,
"fun": 3
},
{
Expand Down Expand Up @@ -978,6 +986,7 @@
"intelligence": 7,
"time": "28 m",
"chapters": 40,
"generic": true,
"fun": 3
},
{
Expand Down Expand Up @@ -1073,6 +1082,7 @@
"intelligence": 7,
"time": "28 m",
"chapters": 40,
"generic": true,
"fun": 4
},
{
Expand Down
24 changes: 24 additions & 0 deletions data/json/items/comestibles/junkfood.json
Original file line number Diff line number Diff line change
Expand Up @@ -1534,5 +1534,29 @@
"calories": 180,
"fun": 3,
"vitamins": [ [ "calcium", 6 ], [ "iron", 4 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
"id": "marshmallow_fluff",
"//": "Based on https://www.target.com/p/marshmallow-fluff-frosting-16oz/-/A-14773337",
"name": { "str_sp": "marshmallow fluff" },
"weight": "11 g",
"color": "white",
"spoils_in": "90 days",
"container": "jar_glass_sealed",
"comestible_type": "DRINK",
"symbol": "~",
"calories": 40,
"description": "Delicious and creamy delight, half of the famous Fluffernutter.",
"price": "2 USD 99 cent",
"price_postapoc": "10 USD",
"material": [ "junk", "egg" ],
"sealed": true,
"volume": "500 ml",
"phase": "liquid",
"charges": 40,
"fun": 10,
"flags": [ "USE_EAT_VERB" ],
"vitamins": [ [ "junk_allergen", 1 ], [ "egg_allergen", 1 ] ]
}
]
26 changes: 26 additions & 0 deletions data/json/items/comestibles/sandwich.json
Original file line number Diff line number Diff line change
Expand Up @@ -556,5 +556,31 @@
[ "veggy_allergen", 1 ],
[ "wheat_allergen", 1 ]
]
},
{
"type": "COMESTIBLE",
"id": "sandwich_pbf",
"name": { "str": "Fluffernutter sandwich", "str_pl": "Fluffernutter sandwiches" },
"weight": "204 g",
"color": "white",
"spoils_in": "1 day 12 hours",
"container": "wrapper",
"comestible_type": "FOOD",
"symbol": "%",
"description": "A delicious peanut butter and marshmallow fluff sandwich. More commonly referred to as a fluffernutter.",
"price": "1 USD 75 cent",
"price_postapoc": "1 USD 75 cent",
"material": [ "nut", "junk", "wheat", "egg" ],
"primary_material": "wheat",
"volume": "250 ml",
"fun": 15,
"vitamins": [
[ "calcium", 6 ],
[ "iron", 18 ],
[ "wheat_allergen", 1 ],
[ "nut_allergen", 1 ],
[ "egg_allergen", 1 ],
[ "junk_allergen", 1 ]
]
}
]
1 change: 1 addition & 0 deletions data/json/items/tool/electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"charges_per_use": 1,
"flags": [ "NO_UNLOAD", "NO_RELOAD", "WATER_BREAK_ACTIVE", "ELECTRONIC" ],
"e_port": "camera",
"etransfer_rate": "20 MB",
"melee_damage": { "bash": 1 },
"variables": { "browsed": "true" }
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,7 @@
"ammo": "gasfilter_m",
"use_action": [ "GASMASK_ACTIVATE" ],
"tick_action": [ "GASMASK" ],
"flags": [ "SLEEP_IGNORE", "VARSIZE", "PADDED" ]
"flags": [ "SKINTIGHT", "NORMAL", "SLEEP_IGNORE", "VARSIZE", "PADDED" ]
},
{
"id": "mask_gas_xl",
Expand Down
11 changes: 11 additions & 0 deletions data/json/recipes/recipe_food.json
Original file line number Diff line number Diff line change
Expand Up @@ -10070,5 +10070,16 @@
[ [ "vinegar", 2 ], [ "lemon", 1 ] ],
[ [ "veggy_any_fresh_uncooked", 2, "LIST" ] ]
]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "sandwich_pbf",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"time": "1 m",
"autolearn": true,
"components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "marshmallow_fluff", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ]
}
]
Loading

0 comments on commit fcd3761

Please sign in to comment.