cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactor card scaling into an element for general item scaling (#2821)

Browse Source 
* Refactor card scaling into an element for general item scaling (#56102)

The current TCG code had some code for scaling its cards down when they're on the ground and then scaling them back in hand/inventory. This element aims to preserve this functionality and to allow it work for other items.

While the TCG makes the cards smaller on the ground, this element allows for items to be scaled up OR down when on the floor or in inventory.

While this particular element has to do with scaling, I am looking at ways to expand this sort of icon change functionality to icon_state as well, but there are additional issues with blood decals needing to be redrawn and possibly vis_contents.

* Refactor card scaling into an element for general item scaling

Co-authored-by: Koshenko <53068134+Koshenko@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-01-21 14:34:46 +01:00
committed by GitHub
co-authored by Koshenko
parent f98b0f8300
commit cb1835b6be
4 changed files with 107 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/storage/concrete/trading_cards.dm
+2 -19
View File
@@ -12,12 +12,6 @@
. = ..()
set_holdable(list(/obj/item/tcgcard))
/datum/component/storage/concrete/tcg/can_be_inserted(obj/item/I, stop_messages, mob/M)
if(istype(I, /obj/item/tcgcard))
var/obj/item/tcgcard/nu_card = I
nu_card.zoom_out()
return ..()
/datum/component/storage/concrete/tcg/PostTransfer()
. = ..()
handle_empty_deck()
@@ -39,13 +33,6 @@
card_contents = shuffle(card_contents)
/datum/component/storage/concrete/tcg/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress, trigger_on_found)
for(var/item in 1 to things.len)
if(istype(things[item], /obj/item/tcgcard))
var/obj/item/tcgcard/card = things[item]
if(isturf(target))
card.zoom_out()
else
card.zoom_in()
. = ..()
if(!things.len)
qdel(parent)
@@ -53,14 +40,10 @@
/datum/component/storage/concrete/tcg/proc/handle_empty_deck()
var/list/contents = contents()
//You can't have a deck of one card!
if(contents.len <= 1)
if(contents.len == 1)
var/obj/item/tcgcard_deck/deck = parent
var/obj/item/tcgcard/card = contents[1]
card.forceMove(card.drop_location())
remove_from_storage(card, card.drop_location())
card.flipped = deck.flipped
card.update_icon_state()
if(isturf(card.drop_location()))
card.zoom_out()
else
card.zoom_in()
qdel(parent)