mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-06-22 22:54:33 +01:00
Ghom
0b0c5ea91e
## About The Pull Request Extends the part of the crafting unit test that ensures consistency between the total mats of the components of a recipe (or rather, the result of said recipe) and a generic instance of the same type as its result, previously only implemented on food recipes. ## Why It's Good For The Game This ensures a degree of consistency with the material composition of various objects in the game. I couldn't do it in the original PR as that one was too big already and it took months to get it merged, and have the relative bugs fixed. Currently a WIP as I slowly deal with the unit test reports. ## Changelog 🆑 refactor: Follow-up to the crafting/material refactor from months ago. All objects crafted with stacks now inherit their mat composition (not necessarily the effects and color) by default, while previously only a few things like chair, sinks and toilets did. Report any object looking or behaving weirdly as a result. fix: The material composition of ammo boxes is no longer a 1/10 of what it's supposed to be. It was a shitty hack to make it harder to recycle empty ammo boxes. Instead, they lose materials as they're emptied now. /🆑
111 lines
2.8 KiB
Plaintext
111 lines
2.8 KiB
Plaintext
|
|
/*
|
|
* Recipe datum
|
|
*/
|
|
/datum/stack_recipe
|
|
/// The title of the recipe
|
|
var/title = "ERROR"
|
|
/// What atom the recipe makes, typepath
|
|
var/atom/result_type
|
|
/// Generated base64 image. Used only if result has color
|
|
var/result_image
|
|
/// Amount of stack required to make
|
|
var/req_amount = 1
|
|
/// Amount of resulting atoms made
|
|
var/res_amount = 1
|
|
/// Max amount of resulting atoms made
|
|
var/max_res_amount = 1
|
|
/// How long it takes to make
|
|
var/time = 0
|
|
/// Bitflag of additional placement checks required to place. (STACK_CHECK_CARDINALS|STACK_CHECK_ADJACENT|STACK_CHECK_TRAM_FORBIDDEN|STACK_CHECK_TRAM_EXCLUSIVE)
|
|
var/placement_checks = NONE
|
|
/// What trait, if any, boosts the construction speed of this item
|
|
var/trait_booster
|
|
/// How much the trait above, if supplied, boosts the construct speed of this item
|
|
var/trait_modifier = 1
|
|
/// Category for general crafting menu
|
|
var/category
|
|
/// The amount of material to remove from the recipe's result
|
|
var/list/removed_mats
|
|
|
|
///crafting_flags var to hold bool values
|
|
var/crafting_flags = CRAFT_CHECK_DENSITY
|
|
|
|
/datum/stack_recipe/New(
|
|
title,
|
|
result_type,
|
|
req_amount = 1,
|
|
res_amount = 1,
|
|
max_res_amount = 1,
|
|
time = 0 SECONDS,
|
|
crafting_flags = CRAFT_CHECK_DENSITY,
|
|
placement_checks = NONE,
|
|
trait_booster,
|
|
trait_modifier = 1,
|
|
category,
|
|
list/removed_mats,
|
|
)
|
|
|
|
src.title = title
|
|
src.result_type = result_type
|
|
src.req_amount = req_amount
|
|
src.res_amount = res_amount
|
|
src.max_res_amount = max_res_amount
|
|
src.time = time
|
|
src.crafting_flags = crafting_flags
|
|
src.placement_checks = placement_checks
|
|
src.trait_booster = trait_booster
|
|
src.trait_modifier = trait_modifier
|
|
src.category = src.category || category || CAT_MISC
|
|
|
|
src.removed_mats = removed_mats
|
|
|
|
// We create base64 image only if item have color. Otherwise use icon_ref for TGUI
|
|
var/obj/item/result = result_type
|
|
var/paint = result::color
|
|
if(!isnull(paint) && paint != COLOR_WHITE)
|
|
var/icon/result_icon = icon(result::icon, result::icon_state, SOUTH, 1)
|
|
result_icon.Scale(32, 32)
|
|
result_icon.Blend(paint, ICON_MULTIPLY)
|
|
src.result_image = "[icon2base64(result_icon)]"
|
|
|
|
/datum/stack_recipe/radial
|
|
/// Optional info to be shown on the radial option for this item
|
|
var/desc
|
|
|
|
/datum/stack_recipe/radial/New(
|
|
title,
|
|
result_type,
|
|
req_amount = 1,
|
|
res_amount = 1,
|
|
max_res_amount = 1,
|
|
time = 0 SECONDS,
|
|
crafting_flags = CRAFT_CHECK_DENSITY,
|
|
placement_checks = NONE,
|
|
trait_booster,
|
|
trait_modifier = 1,
|
|
category,
|
|
desc,
|
|
required_noun,
|
|
)
|
|
if(category)
|
|
src.category = category
|
|
if(desc)
|
|
src.desc = desc
|
|
if(required_noun)
|
|
src.desc += span_boldnotice("[desc ? " - ":""]Requires: [req_amount] [required_noun]\s.")
|
|
|
|
return ..()
|
|
|
|
|
|
/*
|
|
* Recipe list datum
|
|
*/
|
|
/datum/stack_recipe_list
|
|
var/title = "ERROR"
|
|
var/list/recipes
|
|
|
|
/datum/stack_recipe_list/New(title, recipes)
|
|
src.title = title
|
|
src.recipes = recipes
|