Skip to content

Commit

Permalink
Fix quick butchery/dissection, missing tool quality
Browse files Browse the repository at this point in the history
* Added overrides to the qualities introduced by
CleverRaven/Cataclysm-DDA#42372 to fix quick
butchery needing a surface, because that is an astoundingly tedious
idea.
* Also reduced surface demands for dissection so that low-level surfaces
work for large creatures, and small creatures don't need any surface.
* This also fixes dismembering them, I'm not even sure what absurdity in
the code is tying dismemberment requirement to one of the other butchery
requirements, but needing a clean fancy tarp to messily hack apart a
body is a terrible idea.
* Added an override to tarps, adding surface qaulity because
CleverRaven/Cataclysm-DDA#42553 forgot them.
* Cleaned out an obsolete item that hasn't been used since back when I
was still a contributor. It was pinging the zero-weight and there was
really no need to update it after literally 3-4 years of it being
dummied out.
* Zero-weight fixes for psuedo-items.
  • Loading branch information
chaosvolt committed Aug 1, 2020
1 parent 1f7622a commit 3454eeb
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 26 deletions.
7 changes: 7 additions & 0 deletions MST_Extra/items/item_overrides.json
Expand Up @@ -176,5 +176,12 @@
"sub": "oil_lamp_on",
"type": "TOOL",
"name": { "str": "ember carrier (lit)", "str_pl": "ember carriers (lit)" }
},
{
"id": "tarp",
"copy-from": "tarp",
"type": "ARMOR",
"name": { "str": "tarpaulin" },
"qualities": [ [ "SURFACE", 3 ] ]
}
]
6 changes: 6 additions & 0 deletions MST_Extra/items/tools.json
Expand Up @@ -115,6 +115,8 @@
"type": "TOOL",
"copy-from": "fake_item",
"name": { "str_sp": "makeshift distillation" },
"weight": "1 g",
"volume": "1 ml",
"description": "This exists only to allow makeshift stills to provide distilling quality.",
"qualities": [ [ "DISTILL", 1 ] ]
},
Expand All @@ -123,6 +125,8 @@
"type": "TOOL",
"copy-from": "fake_item",
"name": { "str_sp": "pulley lifting" },
"weight": "1 g",
"volume": "1 ml",
"description": "This exists only to allow rope and pulley lifters to provide some engineering qualities.",
"qualities": [ [ "LIFT", 1 ], [ "JACK", 1 ] ]
},
Expand Down Expand Up @@ -340,6 +344,8 @@
"name": { "str": "makeshift water purifier" },
"description": "This is a pseudo item.",
"material": [ "wood", "cotton" ],
"weight": "1 g",
"volume": "1 ml",
"symbol": ";",
"color": "light_gray",
"sub": "water_purifier",
Expand Down
26 changes: 0 additions & 26 deletions MST_Extra/obsolete.json
Expand Up @@ -77,32 +77,6 @@
"not_ready_msg": "The milk is still curdling."
}
},
{
"id": "foil_alum",
"type": "GENERIC",
"category": "container",
"name": "aluminum foil wrap",
"//": "Dummied out way back when.",
"description": "A half crumpled sheet of aluminum foil, used for cooking and baking.",
"weight": "5 g",
"volume": 0,
"price": 0,
"to_hit": -2,
"rigid": false,
"material": "aluminum",
"symbol": ",",
"color": "light_gray",
"pocket_data": [
{
"pocket_type": "CONTAINER",
"sealed_data": { "spoil_multiplier": 1.0 },
"max_contains_volume": "2500 ml",
"max_contains_weight": "5 kg",
"moves": 400
}
],
"qualities": [ [ "COOK", 1 ] ]
},
{
"type": "GENERIC",
"id": "cured_hide_small",
Expand Down
24 changes: 24 additions & 0 deletions MST_Extra/recipes/requirements.json
Expand Up @@ -90,5 +90,29 @@
"type": "requirement",
"//": "Materials used for tying smaller items requiring less string, 6 g/15 cm of cordage per unit.",
"components": [ [ [ "string_6", 1 ], [ "cordage_6", 1 ], [ "cordage_6_leather", 1 ], [ "filament", 50, "LIST" ] ] ]
},
{
"id": "butchery_large",
"type": "requirement",
"//": "Overrides quick butchery of large creatures to not need a fancy surface.",
"qualities": [ { "id": "CUT", "level": 1 } ]
},
{
"id": "dissect_large",
"type": "requirement",
"//": "Overrides dissection of large creatures to only need a basic surface.",
"qualities": [ { "id": "SURFACE", "level": 2 } ]
},
{
"id": "butchery_small",
"type": "requirement",
"//": "Overrides quick butchery of small creatures to not need a fancy surface.",
"qualities": [ { "id": "CUT", "level": 1 } ]
},
{
"id": "dissect_small",
"type": "requirement",
"//": "Overrides dissection of small creatures to not need a fancy surface.",
"qualities": [ ]
}
]

0 comments on commit 3454eeb

Please sign in to comment.