Skip to content

Commit

Permalink
Humanising the pre-cataclysm, photographs PR. (#67328)
Browse files Browse the repository at this point in the history
* Starts adding some pictures.

* adds pictures.

* adds more pictures.

* Cleans up some stuff and adds item group spawns.

* adds more snippets.

* new snippet.

* Adds new snippets.

* adds a new batch of snippets.

* fixes merge errors.

* adds more snippets.

* something.

* adds a single snippet.

* adds the last batch of snippets before making that god flipping PR.

* Update data/json/snippets/photos.json

---------

Co-authored-by: Maleclypse <[email protected]>
  • Loading branch information
DoctorBoomstick and Maleclypse authored Aug 2, 2023
1 parent 954bca5 commit e0bf2b7
Show file tree
Hide file tree
Showing 3 changed files with 173 additions and 0 deletions.
12 changes: 12 additions & 0 deletions data/json/itemgroups/Clothing_Gear/wallets.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
{ "group": "coins", "prob": 80, "count": [ 1, 10 ] },
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand All @@ -55,6 +56,7 @@
{ "group": "coins", "prob": 80, "count": [ 1, 10 ] },
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand All @@ -70,6 +72,7 @@
{ "group": "coins", "prob": 80, "count": [ 1, 10 ] },
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand All @@ -84,6 +87,7 @@
{ "group": "coins", "prob": 80, "count": [ 1, 10 ] },
{ "group": "discount_cards", "prob": 10 },
{ "item": "condom", "prob": 10 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 40 ]
]
},
Expand All @@ -99,6 +103,7 @@
{ "group": "discount_cards", "prob": 60, "count": [ 2, 5 ] },
{ "item": "condom", "prob": 10 },
{ "item": "money_hundred", "prob": 10, "count": [ 1, 5 ] },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 5 ]
]
},
Expand All @@ -115,6 +120,7 @@
{ "group": "coins", "prob": 80, "count": [ 1, 10 ] },
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand All @@ -131,6 +137,7 @@
{ "group": "coins", "prob": 80, "count": [ 1, 10 ] },
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand All @@ -150,6 +157,7 @@
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "labmap", "prob": 30 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand All @@ -169,6 +177,7 @@
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "labmap", "prob": 20 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand All @@ -188,6 +197,7 @@
{ "group": "discount_cards", "prob": 60, "count": [ 2, 5 ] },
{ "item": "condom", "prob": 10 },
{ "item": "labmap", "prob": 20 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 5 ]
]
},
Expand All @@ -204,6 +214,7 @@
{ "group": "coins", "prob": 80, "count": [ 1, 10 ] },
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand All @@ -220,6 +231,7 @@
{ "group": "coins", "prob": 80, "count": [ 1, 10 ] },
{ "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] },
{ "item": "condom", "prob": 10 },
{ "item": "wallet_photo", "prob": 20 },
[ "scorecard", 20 ]
]
},
Expand Down
16 changes: 16 additions & 0 deletions data/json/items/newspaper.json
Original file line number Diff line number Diff line change
Expand Up @@ -558,5 +558,21 @@
"weight": 1
}
]
},
{
"type": "GENERIC",
"id": "wallet_photo",
"category": "books",
"symbol": ",",
"color": "white",
"name": { "str": "photograph" },
"snippet_category": "wallet_photos",
"description": "A small picture of something or somebody important to the owner, designed to be safely tucked into a wallet.",
"weight": "12 mg",
"volume": "1 ml",
"price": 0,
"price_postapoc": 0,
"material": [ "paper" ],
"flags": [ "TRADER_AVOID", "BANK_NOTE_SHAPED" ]
}
]
Loading

0 comments on commit e0bf2b7

Please sign in to comment.