From 80ab55c58f07aca40f437cdeca8d798a06eb09e3 Mon Sep 17 00:00:00 2001 From: Shadowfire Date: Tue, 3 Mar 2020 23:34:10 +0100 Subject: [PATCH] confetti work made confetti last longer made some rewards on slot machine spawn confetti planning on making wheel of fortune have an option to enable confetti on roll --- code/game/machinery/casino_ch.dm | 19 +++++++++++++++++-- code/game/objects/effects/effect_system_ch.dm | 5 +++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/casino_ch.dm b/code/game/machinery/casino_ch.dm index 65d744abcf..261d5b4880 100644 --- a/code/game/machinery/casino_ch.dm +++ b/code/game/machinery/casino_ch.dm @@ -82,6 +82,9 @@ var/symbol2 = null var/symbol3 = null + var/datum/effect/effect/system/confetti_spread + var/confetti_strength = 8 + /obj/machinery/slot_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) var/handled = 0 @@ -155,7 +158,8 @@ var/output //Output variable to send out in chat after the large if statement. var/winnings = 0 //How much money will be given if any. var/platinumwin = 0 // If you win the platinum chip or not - var/delaytime = 5 SECONDS // Put this somewhere else I'm just proving a point >:C + var/celebrate = 0 + var/delaytime = 5 SECONDS spawn(delaytime) @@ -188,14 +192,17 @@ if (symbol1 == "seven" && symbol2 == "seven" && symbol3 == "seven") output = "Three sevens! The slot machine deposits a 500 credit chip!" winnings = 500 + celebrate = 1 if (symbol1 == "diamond" && symbol2 == "diamond" && symbol3 == "diamond") output = "Three diamonds! The slot machine deposits a 1000 credit chip!" winnings = 1000 + celebrate = 1 if (symbol1 == "platinum coin" && symbol2 == "platinum coin" && symbol3 == "platinum coin") output = "Three platinum coins! The slot machine deposits a platinum chip!" platinumwin = TRUE; + celebrate = 1 icon_state = initial(icon_state) // Set it back to the original iconstate. @@ -217,7 +224,15 @@ spawn_casinochips(winnings, src.loc) icon_state = "slotmachine" - busy = FALSE //Set busy to false, we're done here fam. + if(celebrate) // Happy celebrations! + src.confetti_spread = new /datum/effect/effect/system/confetti_spread() + src.confetti_spread.attach(src) //If somehow people start dragging slot machine + spawn(0) + for(var/i = 1 to confetti_strength) + src.confetti_spread.start() + sleep(10) + + busy = FALSE /obj/structure/wheel_of_fortune diff --git a/code/game/objects/effects/effect_system_ch.dm b/code/game/objects/effects/effect_system_ch.dm index 08e80a19d5..b6f4e1921f 100644 --- a/code/game/objects/effects/effect_system_ch.dm +++ b/code/game/objects/effects/effect_system_ch.dm @@ -8,11 +8,11 @@ name = "confetti" icon = 'icons/effects/effects_ch.dmi' icon_state = "confetti" - opacity = 1 + opacity = 0 anchored = 0.0 mouse_opacity = 0 var/amount = 6.0 - var/time_to_live = 100 + var/time_to_live = 500 /obj/effect/effect/confetti/New() ..() @@ -20,6 +20,7 @@ spawn (time_to_live) if(!QDELETED(src)) qdel(src) + //make confetti on ground cleanable decal to spawn /datum/effect/effect/system/confetti_spread var/total_confetti = 0 // To stop it being spammed and lagging!