From ee93c40799ab4557453b977353e640573a1d9f03 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 28 Nov 2015 15:40:20 -0500 Subject: [PATCH] Small Cash Update --- code/game/objects/items/weapons/cash.dm | 51 +++++++++++++++--------- icons/obj/money.dmi | Bin 2230 -> 1903 bytes 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index be8cc69f39f..8cdc276ef6a 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -1,7 +1,10 @@ var/global/list/moneytypes=list( /obj/item/weapon/spacecash/c1000 = 1000, - /obj/item/weapon/spacecash/c500 = 500, // Might get rid of this. + /obj/item/weapon/spacecash/c500 = 500, + /obj/item/weapon/spacecash/c200 = 200, /obj/item/weapon/spacecash/c100 = 100, + /obj/item/weapon/spacecash/c50 = 50, + /obj/item/weapon/spacecash/c20 = 20, /obj/item/weapon/spacecash/c10 = 10, /obj/item/weapon/spacecash = 1, ) @@ -42,19 +45,36 @@ var/global/list/moneytypes=list( /obj/item/weapon/spacecash/update_icon() icon_state = "cash[worth]" // Up to 100 items per stack. - overlays = 0 - var/stacksize=round(amount/25) pixel_x=rand(-7,7) pixel_y=rand(-14,14) - if(stacksize) - // 0 = single - // 1 = 1/4 stack - // 2 = 1/2 stack - // 3 = 3/4 stack - // 4 = full stack - var/image/stack = image(icon,icon_state="cashstack[stacksize]") - stack.color=stack_color - overlays += stack + +/obj/item/weapon/spacecash/proc/collect_from(var/obj/item/weapon/spacecash/cash) + if(cash.worth == src.worth) + var/taking = min(100-src.amount,cash.amount) + cash.amount -= taking + src.amount += taking + if(cash.amount <= 0) + qdel(cash) + return taking + return 0 + +/obj/item/weapon/spacecash/afterattack(atom/A as mob|obj, mob/user as mob) + if(istype(A, /turf) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack)) + var/turf/T = get_turf(A) + var/collected = 0 + for(var/obj/item/weapon/spacecash/cash in T) + if(cash.worth == src.worth) + collected += collect_from(cash) + if(collected) + update_icon() + user << "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash." + else if(istype(A,/obj/item/weapon/spacecash)) + var/obj/item/weapon/spacecash/cash = A + var/collected = src.collect_from(cash) + if(collected) + update_icon() + user << "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash." + /obj/item/weapon/spacecash/proc/get_total() return worth * amount @@ -62,37 +82,30 @@ var/global/list/moneytypes=list( /obj/item/weapon/spacecash/c10 icon_state = "cash10" worth = 10 - stack_color = "#663200" /obj/item/weapon/spacecash/c20 icon_state = "cash10" worth = 20 - stack_color = "#663200" /obj/item/weapon/spacecash/c50 icon_state = "cash10" worth = 50 - stack_color = "#663200" /obj/item/weapon/spacecash/c100 icon_state = "cash100" worth = 100 - stack_color = "#663200" /obj/item/weapon/spacecash/c200 icon_state = "cash200" worth = 200 - stack_color = "#663200" /obj/item/weapon/spacecash/c500 icon_state = "cash500" worth = 500 - stack_color = "#663200" /obj/item/weapon/spacecash/c1000 icon_state = "cash1000" worth = 1000 - stack_color = "#333333" /proc/dispense_cash(var/amount, var/loc) for(var/cashtype in moneytypes) diff --git a/icons/obj/money.dmi b/icons/obj/money.dmi index 7b8a5e0949508eb4e8d654a9820dc1316f117801..5a053c07e058290696e18c097cae9c49fc9aec68 100644 GIT binary patch literal 1903 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 F{{nBGp&$SN