mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 17:52:36 +00:00
## About The Pull Request
516 requires float layered overlays to be using pixel_w and pixel_z
instead of pixel_x and pixel_y respectively, unless we want
visual/layering errors. This makes sense, as w,z are for visual effects
only. Sadly seems we were not entirely consistent in this, and many
things seem to have been using x,y incorrectly.
This hopefully fixes that, and thus also fixes layering issues. Complete
1:1 compatibility not guaranteed.
I did the lazy way suggested to me by SmArtKar to speed it up (Runtiming
inside apply_overlays), and this is still included in the PR to flash
out possible issues in a TM (Plus I will need someone to grep the
runtimes for me after the TM period to make sure nothing was missed).
After this is done I'll remove all these extra checks.
Lints will probably be failing for a bit, got to wait for [this
update](4b77cd487d)
to them to make it into release. Or just unlint the lines, though that's
probably gonna produce code debt
## Why It's Good For The Game
Fixes this massive 516 mess, hopefully.
closes #90281
## Changelog
🆑
refactor: Changed many of our use cases for pixel_x and pixel_y
correctly into pixel_w and pixel_z, fixing layering issues in the
process.
/🆑
---------
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: SmArtKar <master.of.bagets@gmail.com>
293 lines
11 KiB
Plaintext
293 lines
11 KiB
Plaintext
/**
|
|
* # Custom Atom Component
|
|
*
|
|
* When added to an atom, item ingredients can be put into that.
|
|
* The sprite is updated and reagents are transferred.
|
|
*
|
|
* If the component is added to something that is processed, creating new objects (being cut, for example),
|
|
* the replacement type needs to also have the component. The ingredients will be copied over. Reagents are not
|
|
* copied over since other components already take care of that.
|
|
*/
|
|
/datum/component/customizable_reagent_holder
|
|
can_transfer = TRUE
|
|
///List of item ingredients.
|
|
var/list/obj/item/ingredients
|
|
///Type path of replacement atom.
|
|
var/replacement
|
|
///Type of fill, can be [CUSTOM_INGREDIENT_ICON_NOCHANGE] for example.
|
|
var/fill_type
|
|
///Number of max ingredients.
|
|
var/max_ingredients
|
|
///Overlay used for certain fill types, always shows up on top.
|
|
var/mutable_appearance/top_overlay
|
|
///Type of ingredients to accept, [CUSTOM_INGREDIENT_TYPE_EDIBLE] for example.
|
|
var/ingredient_type
|
|
/// Adds screentips for all items that call on this proc, defaults to "Add"
|
|
var/screentip_verb
|
|
|
|
/datum/component/customizable_reagent_holder/Initialize(
|
|
atom/replacement,
|
|
fill_type,
|
|
ingredient_type = CUSTOM_INGREDIENT_TYPE_EDIBLE,
|
|
max_ingredients = MAX_ATOM_OVERLAYS - 3, // The cap is >= MAX_ATOM_OVERLAYS so we reserve 2 for top /bottom of item + 1 to stay under cap
|
|
list/obj/item/initial_ingredients = null,
|
|
screentip_verb = "Add",
|
|
)
|
|
if(!isatom(parent))
|
|
return COMPONENT_INCOMPATIBLE
|
|
var/atom/atom_parent = parent
|
|
// assume replacement is OK
|
|
if (!atom_parent.reagents && !replacement)
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
atom_parent.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
|
|
|
|
src.replacement = replacement
|
|
src.fill_type = fill_type
|
|
src.max_ingredients = max_ingredients
|
|
src.ingredient_type = ingredient_type
|
|
src.screentip_verb = screentip_verb
|
|
|
|
if (initial_ingredients)
|
|
for (var/_ingredient in initial_ingredients)
|
|
var/obj/item/ingredient = _ingredient
|
|
add_ingredient(ingredient)
|
|
handle_fill(ingredient)
|
|
|
|
|
|
/datum/component/customizable_reagent_holder/Destroy(force)
|
|
QDEL_NULL(top_overlay)
|
|
LAZYCLEARLIST(ingredients)
|
|
return ..()
|
|
|
|
|
|
/datum/component/customizable_reagent_holder/RegisterWithParent()
|
|
. = ..()
|
|
RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(customizable_attack))
|
|
RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
|
|
RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(food_exited))
|
|
RegisterSignal(parent, COMSIG_ATOM_PROCESSED, PROC_REF(on_processed))
|
|
RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
|
|
ADD_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, REF(src))
|
|
|
|
|
|
/datum/component/customizable_reagent_holder/UnregisterFromParent()
|
|
. = ..()
|
|
UnregisterSignal(parent, list(
|
|
COMSIG_ATOM_ATTACKBY,
|
|
COMSIG_ATOM_EXAMINE,
|
|
COMSIG_ATOM_EXITED,
|
|
COMSIG_ATOM_PROCESSED,
|
|
COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM,
|
|
))
|
|
REMOVE_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, REF(src))
|
|
|
|
/datum/component/customizable_reagent_holder/PostTransfer(datum/new_parent)
|
|
if(!isatom(new_parent))
|
|
return COMPONENT_INCOMPATIBLE
|
|
var/atom/atom_parent = new_parent
|
|
if (!atom_parent.reagents)
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
///Handles when the customizable food is examined.
|
|
/datum/component/customizable_reagent_holder/proc/on_examine(atom/A, mob/user, list/examine_list)
|
|
SIGNAL_HANDLER
|
|
|
|
var/atom/atom_parent = parent
|
|
var/list/ingredients_listed = list()
|
|
for(var/obj/item/ingredient as anything in ingredients)
|
|
ingredients_listed += "\a [ingredient.name]"
|
|
|
|
examine_list += "It [LAZYLEN(ingredients) \
|
|
? "contains [english_list(ingredients_listed)] making a [custom_adjective()]-sized [initial(atom_parent.name)]" \
|
|
: "does not contain any ingredients"]."
|
|
|
|
//// Proc that checks if an ingredient is valid or not, returning false if it isnt and true if it is.
|
|
/datum/component/customizable_reagent_holder/proc/valid_ingredient(obj/ingredient)
|
|
if (HAS_TRAIT(ingredient, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER))
|
|
return FALSE
|
|
if(HAS_TRAIT(ingredient, TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT))
|
|
return TRUE
|
|
switch (ingredient_type)
|
|
if (CUSTOM_INGREDIENT_TYPE_EDIBLE)
|
|
return IS_EDIBLE(ingredient)
|
|
if (CUSTOM_INGREDIENT_TYPE_DRYABLE)
|
|
return HAS_TRAIT(ingredient, TRAIT_DRYABLE)
|
|
return TRUE
|
|
|
|
///Handles when the customizable food is attacked by something.
|
|
/datum/component/customizable_reagent_holder/proc/customizable_attack(datum/source, obj/ingredient, mob/attacker, silent = FALSE, force = FALSE)
|
|
SIGNAL_HANDLER
|
|
|
|
if (!valid_ingredient(ingredient))
|
|
if (ingredient.is_drainable()) // For stuff like adding flour from a flour sack into a bowl, we handle the transfer of the reagent elsewhere, but we shouldn't regard it beyond some user feedback.
|
|
attacker.balloon_alert(attacker, "transferring...")
|
|
return
|
|
attacker.balloon_alert(attacker, "doesn't go on that!")
|
|
return
|
|
|
|
if (LAZYLEN(ingredients) >= max_ingredients)
|
|
attacker.balloon_alert(attacker, "too full!")
|
|
return COMPONENT_NO_AFTERATTACK
|
|
|
|
var/atom/atom_parent = parent
|
|
if(!attacker.transferItemToLoc(ingredient, atom_parent))
|
|
return
|
|
if (replacement)
|
|
var/atom/replacement_parent = new replacement(atom_parent.drop_location())
|
|
ingredient.forceMove(replacement_parent)
|
|
replacement = null
|
|
replacement_parent.TakeComponent(src)
|
|
handle_reagents(atom_parent)
|
|
qdel(atom_parent)
|
|
handle_reagents(ingredient)
|
|
add_ingredient(ingredient)
|
|
handle_fill(ingredient)
|
|
|
|
|
|
///Handles the icon update for a new ingredient.
|
|
/datum/component/customizable_reagent_holder/proc/handle_fill(obj/item/ingredient)
|
|
if (fill_type == CUSTOM_INGREDIENT_ICON_NOCHANGE)
|
|
//don't bother doing the icon procs
|
|
return
|
|
var/atom/atom_parent = parent
|
|
var/mutable_appearance/filling = mutable_appearance(atom_parent.icon, "[initial(atom_parent.icon_state)]_filling")
|
|
// get average color
|
|
var/icon/icon = new(ingredient.icon, ingredient.icon_state)
|
|
icon.Scale(1, 1)
|
|
var/fillcol = copytext(icon.GetPixel(1, 1), 1, 8) // remove opacity
|
|
filling.color = fillcol
|
|
|
|
switch(fill_type)
|
|
if(CUSTOM_INGREDIENT_ICON_SCATTER)
|
|
filling.pixel_w = rand(-1,1)
|
|
filling.pixel_z = rand(-1,1)
|
|
if(CUSTOM_INGREDIENT_ICON_STACK)
|
|
filling.pixel_w = rand(-1,1)
|
|
// we're gonna abuse position layering to ensure overlays render right
|
|
filling.pixel_y = -LAZYLEN(ingredients)
|
|
filling.pixel_z = 2 * LAZYLEN(ingredients) - 1 + LAZYLEN(ingredients)
|
|
if(CUSTOM_INGREDIENT_ICON_STACKPLUSTOP)
|
|
filling.pixel_w = rand(-1,1)
|
|
// similar here
|
|
filling.pixel_y = -LAZYLEN(ingredients)
|
|
filling.pixel_z = 2 * LAZYLEN(ingredients) - 1 + LAZYLEN(ingredients)
|
|
if (top_overlay) // delete old top if exists
|
|
atom_parent.cut_overlay(top_overlay)
|
|
top_overlay = mutable_appearance(atom_parent.icon, "[atom_parent.icon_state]_top")
|
|
top_overlay.pixel_y = -(LAZYLEN(ingredients) + 1)
|
|
top_overlay.pixel_z = 2 * LAZYLEN(ingredients) + 3 + LAZYLEN(ingredients) + 1
|
|
atom_parent.add_overlay(filling)
|
|
atom_parent.add_overlay(top_overlay)
|
|
return
|
|
if(CUSTOM_INGREDIENT_ICON_FILL)
|
|
if (top_overlay)
|
|
filling.color = mix_color(filling.color)
|
|
atom_parent.cut_overlay(top_overlay)
|
|
top_overlay = filling
|
|
if(CUSTOM_INGREDIENT_ICON_LINE)
|
|
filling.pixel_w = filling.pixel_z = rand(-8,3)
|
|
atom_parent.add_overlay(filling)
|
|
|
|
|
|
///Takes the reagents from an ingredient.
|
|
/datum/component/customizable_reagent_holder/proc/handle_reagents(obj/item/ingredient)
|
|
var/atom/atom_parent = parent
|
|
if (atom_parent.reagents && ingredient.reagents)
|
|
atom_parent.reagents.maximum_volume += ingredient.reagents.maximum_volume // If we don't do this custom food starts voiding reagents past a certain point.
|
|
ingredient.reagents.trans_to(atom_parent, ingredient.reagents.total_volume)
|
|
return
|
|
|
|
|
|
///Adds a new ingredient and updates the parent's name.
|
|
/datum/component/customizable_reagent_holder/proc/add_ingredient(obj/item/ingredient)
|
|
var/atom/atom_parent = parent
|
|
LAZYADD(ingredients, ingredient)
|
|
if(isitem(atom_parent))
|
|
var/obj/item/item_parent = atom_parent
|
|
if(ingredient.w_class > item_parent.w_class)
|
|
item_parent.update_weight_class(ingredient.w_class)
|
|
atom_parent.name = "[custom_adjective()] [custom_type()] [initial(atom_parent.name)]"
|
|
SEND_SIGNAL(atom_parent, COMSIG_ATOM_CUSTOMIZED, ingredient)
|
|
SEND_SIGNAL(ingredient, COMSIG_ITEM_USED_AS_INGREDIENT, atom_parent)
|
|
|
|
|
|
///Gives an adjective to describe the size of the custom food.
|
|
/datum/component/customizable_reagent_holder/proc/custom_adjective()
|
|
switch(LAZYLEN(ingredients))
|
|
if (0 to 2)
|
|
return "small"
|
|
if (3 to 5)
|
|
return "standard"
|
|
if (6 to 8)
|
|
return "big"
|
|
if (8 to 11)
|
|
return "ridiculous"
|
|
if (12 to INFINITY)
|
|
return "monstrous"
|
|
|
|
|
|
///Gives the type of custom food (based on what the first ingredient was).
|
|
/datum/component/customizable_reagent_holder/proc/custom_type()
|
|
var/custom_type = "empty"
|
|
if (LAZYLEN(ingredients))
|
|
var/obj/item/first_ingredient = ingredients[1]
|
|
if (istype(first_ingredient, /obj/item/food/meat))
|
|
var/obj/item/food/meat/meat = first_ingredient
|
|
if (meat.subjectname)
|
|
custom_type = meat.subjectname
|
|
else if (meat.subjectjob)
|
|
custom_type = meat.subjectjob
|
|
if (custom_type == "empty" && first_ingredient.name)
|
|
custom_type = first_ingredient.name
|
|
return custom_type
|
|
|
|
|
|
///Returns the color of the input mixed with the top_overlay's color.
|
|
/datum/component/customizable_reagent_holder/proc/mix_color(color)
|
|
if(LAZYLEN(ingredients) == 1 || !top_overlay)
|
|
return color
|
|
else
|
|
var/list/rgbcolor = list(0,0,0,0)
|
|
var/customcolor = GetColors(color)
|
|
var/ingcolor = GetColors(top_overlay.color)
|
|
rgbcolor[1] = (customcolor[1]+ingcolor[1])/2
|
|
rgbcolor[2] = (customcolor[2]+ingcolor[2])/2
|
|
rgbcolor[3] = (customcolor[3]+ingcolor[3])/2
|
|
rgbcolor[4] = (customcolor[4]+ingcolor[4])/2
|
|
return rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3], rgbcolor[4])
|
|
|
|
|
|
///Copies over the parent's ingredients to the processing results (such as slices when the parent is cut).
|
|
/datum/component/customizable_reagent_holder/proc/on_processed(datum/source, mob/living/user, obj/item/ingredient, list/atom/results)
|
|
SIGNAL_HANDLER
|
|
|
|
// Reagents are not transferred since that should be handled elsewhere.
|
|
for (var/r in results)
|
|
var/atom/result = r
|
|
result.AddComponent(/datum/component/customizable_reagent_holder, null, fill_type, ingredient_type = ingredient_type, max_ingredients = max_ingredients, initial_ingredients = ingredients)
|
|
|
|
/**
|
|
* Adds context sensitivy directly to the customizable reagent holder file for screentips
|
|
* Arguments:
|
|
* * source - refers to item that will display its screentip
|
|
* * context - refers to, in this case, an item that can be customized with other reagents or ingrideints
|
|
* * held_item - refers to the item in your hand, which is hopefully an ingredient
|
|
* * user - refers to user who will see the screentip when the proper context and tool are there
|
|
*/
|
|
/datum/component/customizable_reagent_holder/proc/on_requesting_context_from_item(datum/source, list/context, obj/item/held_item, mob/user)
|
|
SIGNAL_HANDLER
|
|
|
|
// only accept valid ingredients
|
|
if (isnull(held_item) || !valid_ingredient(held_item))
|
|
return NONE
|
|
|
|
context[SCREENTIP_CONTEXT_LMB] = "[screentip_verb] [held_item]"
|
|
|
|
return CONTEXTUAL_SCREENTIP_SET
|
|
|
|
/// Clear refs if our food "goes away" somehow
|
|
/datum/component/customizable_reagent_holder/proc/food_exited(datum/source, atom/movable/gone)
|
|
SIGNAL_HANDLER
|
|
LAZYREMOVE(ingredients, gone)
|