Skip to content

Commit

Permalink
Adds cremation and urns (CleverRaven#59671)
Browse files Browse the repository at this point in the history
* Draft

* Adds boiling quality to urns

* Porcelain

* JSON style check fixes

* Engravable clay, simplified material, renamed to corpse ash

* Bones and flesh burn to corpse ash

* Bug fixes, memorial, memorial_mansion item_groups

* More bug fixes, clay and porcelain now engravable

* Increase urn size to accommodate big boned peoples

* Revert tailor's kit, sewing kit, and bone needle's unintended ability to repair clay

* Linted!

* Adds dog tags, newspaper for memorial, service medals, flower bouquet

* Increases the variety of materials that yield corpse ash

* Bug fix

* More fixes

* Double spacing

* Density adjustments

* Adds leaded glass material, more material adjustments

* Change crystal urn to crystal instead of lead

* 4 parts veggy, 1 part glass

* Eggs and cured meat no longer give corpse ash

* 120 lb (10th percentile for women) to 250 lb (90th percentile for men)

* Change to withered bouquet

* Syntax error

* Spawn rate adjustments

* Graves can contain cremated remains

* Comma!

* Cremain graves probability reduced to 15%

* Lint

* Mansion memorial rate uptick

* Another bump in mansion memorial rates
  • Loading branch information
Merikona authored and alef committed Aug 5, 2022
1 parent 6156df5 commit 97bda06
Show file tree
Hide file tree
Showing 12 changed files with 401 additions and 15 deletions.
6 changes: 6 additions & 0 deletions data/json/itemgroups/Locations_MapExtras/mansion.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
}
]
},
{
"id": "grave_contents",
"type": "item_group",
"subtype": "distribution",
"entries": [ { "group": "everyday_corpse", "prob": 85 }, { "group": "grave_cremains", "prob": 15 } ]
},
{
"id": "everyday_corpse",
"type": "item_group",
Expand Down
6 changes: 4 additions & 2 deletions data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@
{ "item": "baking_book", "prob": 80 },
{ "item": "fermenting_book", "prob": 8 },
{ "item": "distilling_cookbook", "prob": 3 },
{ "item": "cookbook_bloodforgood", "prob": 2 }
{ "item": "cookbook_bloodforgood", "prob": 2 },
{ "group": "memorial", "prob": 10 }
]
},
{
Expand Down Expand Up @@ -569,7 +570,8 @@
{ "item": "vacuum_sealing", "prob": 15 },
{ "item": "baking_book", "prob": 190 },
{ "item": "book_pneumatics", "prob": 8 },
{ "item": "cookbook_bloodforgood", "prob": 50 }
{ "item": "cookbook_bloodforgood", "prob": 50 },
{ "group": "memorial_mansion", "prob": 10 }
]
},
{
Expand Down
152 changes: 151 additions & 1 deletion data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,155 @@
[ "hairbrush", 5 ]
]
},
{
"type": "item_group",
"id": "memorial",
"subtype": "collection",
"entries": [
{ "item": "corpse_ash", "prob": 100, "charges-min": 1905, "charges-max": 3969, "container-item": "porcelain_urn" },
{ "item": "photo_album", "prob": 75 },
{ "item": "bouquet", "prob": 50 },
{ "item": "candle", "prob": 50, "charges-min": 1, "charges-max": 6 },
{
"distribution": [
{ "group": "religious_books", "prob": 20 },
{ "item": "bead_necklace", "prob": 20 },
{ "item": "bead_bracelet", "prob": 20 },
{ "item": "holy_symbol", "prob": 20 },
{ "item": "candlestick", "prob": 20 }
]
},
{
"distribution": [
{
"collection": [
{ "item": "american_flag", "prob": 70 },
{ "item": "beret", "prob": 33 },
{ "item": "service_medal", "prob": 50 },
{ "item": "dog_tag", "prob": 100 }
],
"prob": 10
},
{
"collection": [
{ "item": "ceramic_mug", "prob": 50 },
{ "group": "beer", "prob": 50 },
{ "group": "liquor_and_spirits", "prob": 20 },
{ "group": "wines_worthy", "prob": 10 },
{ "item": "cigar", "prob": 20 },
{ "item": "hat_ball", "prob": 20 },
{ "group": "jewelry_accessories", "prob": 50 },
{ "group": "clothing_glasses", "prob": 50 },
{ "item": "foodperson_mask", "prob": 1, "charges": [ 0, 500 ] }
],
"prob": 70
},
{
"collection": [
{ "item": "teddy", "prob": 50 },
{ "item": "hat_ball", "prob": 20 },
{ "item": "baseball", "prob": 20 },
{ "item": "roller_shoes_off", "prob": 10 },
{ "item": "gold_medal", "prob": 20 },
{ "item": "silver_medal", "prob": 20 },
{ "item": "bronze_medal", "prob": 20 },
{ "item": "story_book", "prob": 50 },
{ "item": "hairpin", "prob": 20 },
{ "item": "barrette", "prob": 20 },
{ "item": "newspaper_memorial", "prob": 20 }
],
"prob": 5
},
{
"collection": [
{ "item": "dog_whistle", "prob": 50 },
{ "item": "dog_whistle_wood", "prob": 25 },
{ "item": "leather_harness_dog", "prob": 50 },
{ "item": "dogfood_dry", "prob": 50 },
{ "item": "bone", "prob": 50 },
{ "item": "dog_tag_dog", "prob": 100 }
],
"prob": 15
}
]
}
]
},
{
"type": "item_group",
"id": "memorial_mansion",
"subtype": "collection",
"entries": [
{ "item": "corpse_ash", "prob": 100, "charges-min": 1905, "charges-max": 3969, "container-item": "crystal_urn" },
{ "item": "photo_album", "prob": 80 },
{ "item": "bouquet", "prob": 80 },
{ "item": "candlestick", "prob": 50, "charges-min": 1, "charges-max": 6 },
{ "group": "liquor_and_spirits", "prob": 60 },
{ "group": "wines_worthy", "prob": 50 },
{ "item": "cigar", "prob": 50 },
{ "group": "jewelry_accessories", "prob": 50 }
]
},
{
"type": "item_group",
"id": "grave_cremains",
"subtype": "collection",
"entries": [
{ "item": "corpse_ash", "prob": 100, "charges-min": 1905, "charges-max": 3969, "container-item": "porcelain_urn" },
{ "item": "bouquet", "prob": 100 },
{
"distribution": [
{ "group": "religious_books", "prob": 25 },
{ "item": "bead_necklace", "prob": 25 },
{ "item": "bead_bracelet", "prob": 25 },
{ "item": "holy_symbol", "prob": 25 }
]
},
{
"distribution": [
{
"collection": [
{ "item": "american_flag", "prob": 70 },
{ "item": "beret", "prob": 33 },
{ "item": "service_medal", "prob": 50 },
{ "item": "dog_tag", "prob": 100 }
],
"prob": 20
},
{
"collection": [
{ "item": "ceramic_mug", "prob": 50 },
{ "group": "beer", "prob": 50 },
{ "group": "liquor_and_spirits", "prob": 20 },
{ "group": "wines_worthy", "prob": 10 },
{ "item": "cigar", "prob": 20 },
{ "item": "hat_ball", "prob": 20 },
{ "group": "jewelry_accessories", "prob": 50 },
{ "group": "clothing_glasses", "prob": 50 },
{ "item": "foodperson_mask", "prob": 1, "charges": [ 0, 500 ] }
],
"prob": 70
},
{
"collection": [
{ "item": "teddy", "prob": 50 },
{ "item": "hat_ball", "prob": 20 },
{ "item": "baseball", "prob": 20 },
{ "item": "roller_shoes_off", "prob": 10 },
{ "item": "gold_medal", "prob": 20 },
{ "item": "silver_medal", "prob": 20 },
{ "item": "bronze_medal", "prob": 20 },
{ "item": "story_book", "prob": 50 },
{ "item": "hairpin", "prob": 20 },
{ "item": "barrette", "prob": 20 },
{ "item": "newspaper_memorial", "prob": 20 }
],
"prob": 10
}
]
}
]
},
{
"type": "item_group",
"id": "livingroom",
Expand Down Expand Up @@ -474,7 +623,8 @@
{ "item": "yukata", "prob": 1 },
{ "item": "eclipse_glasses", "prob": 1 },
{ "item": "reading_light", "prob": 9, "charges": [ 0, 50 ] },
{ "item": "balloon", "prob": 5 }
{ "item": "balloon", "prob": 5 },
{ "group": "memorial", "prob": 3 }
]
},
{
Expand Down
14 changes: 14 additions & 0 deletions data/json/items/armor/jewelry.json
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,20 @@
"color": "yellow",
"flags": [ "NO_WEAR_EFFECT" ]
},
{
"id": "service_medal",
"type": "ARMOR",
"name": { "str": "service medal" },
"description": "A medal awarded to military personnel for heroism, wounds suffered in combat, or distinguished service.",
"weight": "50 g",
"volume": "25 ml",
"price": 10000,
"price_postapoc": 25,
"material": [ { "type": "gold", "portion": 1 }, { "type": "bronze", "portion": 4 } ],
"symbol": "[",
"color": "brown",
"flags": [ "NO_WEAR_EFFECT" ]
},
{
"id": "gold_necklace",
"type": "ARMOR",
Expand Down
17 changes: 17 additions & 0 deletions data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -1366,6 +1366,23 @@
"ammo_type": "components",
"count": 100
},
{
"type": "AMMO",
"id": "corpse_ash",
"category": "chems",
"price": 0,
"price_postapoc": 0,
"name": { "str": "corpse ash", "str_pl": "corpse ashes" },
"symbol": "=",
"looks_like": "f_ash",
"color": "light_gray",
"description": "The unburnt remains of a person or animal.",
"material": [ "powder_nonflam" ],
"volume": "104ml",
"weight": "1 g",
"ammo_type": "components",
"count": 100
},
{
"type": "COMESTIBLE",
"id": "ether",
Expand Down
43 changes: 43 additions & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2361,6 +2361,49 @@
"price": 0,
"price_postapoc": 0
},
{
"type": "GENERIC",
"id": "bouquet",
"name": { "str_sp": "withered bouquet" },
"description": "A mixed collection of flowers. Unfortunately, they have all withered with time.",
"//": "Estimated weight is between 1.5-2 lb. When withered, assuming 60% weight loss, gives us around 300 g.",
"weight": "300 g",
"color": "white",
"symbol": ",",
"material": [ { "type": "veggy", "portion": 4 }, { "type": "glass", "portion": 1 } ],
"//1": "A medium sized bouquet is roughly 13\" x 5.5\" x 5.5\", or roughly 6.4 L. When withered, I'm estimating a 30% shrinkage in volume, or 4.5 L.",
"volume": "4500 ml",
"price": 0,
"price_postapoc": 0
},
{
"type": "GENERIC",
"id": "dog_tag",
"name": { "str_sp": "dog tag" },
"description": "An oval disk attached to a chain, worn by military personnel for identification.",
"weight": "5 g",
"color": "light_gray",
"symbol": "[",
"material": [ "steel" ],
"//": "dog tags are roughly 50mm x 28mm x 0.4mm, or 0.56 ml, but that's so small I needed to round up to 1 ml",
"volume": "1 ml",
"price": 0,
"price_postapoc": 0
},
{
"type": "GENERIC",
"id": "dog_tag_dog",
"name": { "str_sp": "dog tag" },
"description": "An identification tag for a pet, engraved with their name and their owner's address and phone number.",
"weight": "1 g",
"color": "green",
"symbol": "[",
"material": [ "plastic" ],
"//": "dog tags are roughly 50mm x 28mm x 0.4mm, or 0.56 ml, but that's so small I needed to round up to 1 ml",
"volume": "1 ml",
"price": 0,
"price_postapoc": 0
},
{
"type": "GENERIC",
"id": "clay_lump",
Expand Down
14 changes: 14 additions & 0 deletions data/json/items/newspaper.json
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,20 @@
"weight": "3 g",
"volume": "1 ml"
},
{
"type": "GENERIC",
"id": "newspaper_memorial",
"category": "books",
"symbol": ",",
"color": "white",
"name": { "str": "newspaper page" },
"description": "A snippet from a newspaper, celebrating the achievements of the one enshrined.",
"price": 0,
"price_postapoc": 0,
"material": [ "paper" ],
"weight": "1 g",
"volume": "1 ml"
},
{
"type": "GENERIC",
"id": "newest_newspaper",
Expand Down
Loading

0 comments on commit 97bda06

Please sign in to comment.