From 67901058aed6b2cf1c771365689b2c051277d8ae Mon Sep 17 00:00:00 2001 From: Burzah <116982774+Burzah@users.noreply.github.com> Date: Fri, 1 Sep 2023 15:18:37 -0700 Subject: [PATCH] Unum! The card game. (#22152) * UNUM! * distributing unum * merch vendor * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * color * dmi update --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- .../objects/items/weapons/gift_wrappaper.dm | 1 + code/modules/arcade/prize_datums.dm | 6 ++++ .../preference/loadout/loadout_general.dm | 4 +++ code/modules/economy/merch_items.dm | 7 ++++ code/modules/games/unum.dm | 33 ++++++++++++++++++ code/modules/mining/machine_vending.dm | 1 + icons/obj/playing_cards.dmi | Bin 6460 -> 8109 bytes paradise.dme | 1 + 8 files changed, 53 insertions(+) create mode 100644 code/modules/games/unum.dm diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index dfa2bd32f54..45c788385bc 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -91,6 +91,7 @@ /obj/random/figure, /obj/item/deck/cards, /obj/item/deck/cards/tiny, + /obj/item/deck/unum, /obj/item/toy/minimeteor, /obj/item/toy/redbutton, /obj/item/toy/figure/owl, diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index 89ee8029fa1..65a7002534c 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -141,6 +141,12 @@ GLOBAL_DATUM_INIT(global_prizes, /datum/prizes, new()) typepath = /obj/item/clothing/gloves/ring/shadow cost = 40 +/datum/prize_item/unum + name = "Deck of UNUM! Cards" + desc = "Everyone's favorite card game!" + typepath = /obj/item/deck/unum + cost = 45 + /datum/prize_item/double_tiny_cards name = "Double Deck of Tiny Cards" desc = "Anyone fancy a tiny game of 108-card Pickup?" diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index d2f07321089..16f1ed8eef0 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -118,6 +118,10 @@ display_name = "Deck of tarot cards" path = /obj/item/deck/tarot +/datum/gear/unum + display_name = "Deck of UNUM! cards" + path = /obj/item/deck/unum + /datum/gear/headphones display_name = "Headphones" path = /obj/item/clothing/ears/headphones diff --git a/code/modules/economy/merch_items.dm b/code/modules/economy/merch_items.dm index 2ea99175cfa..7273cd9cb1f 100644 --- a/code/modules/economy/merch_items.dm +++ b/code/modules/economy/merch_items.dm @@ -68,6 +68,13 @@ cost = 200 category = MERCH_CAT_TOY +/datum/merch_item/unum + name = "UNUM!" + desc = "Everyone's favorite card game!" + typepath = /obj/item/deck/unum + cost = 200 + category = MERCH_CAT_TOY + /datum/merch_item/katana name = "Replica Katana" desc = "Woefully underpowered in D20." diff --git a/code/modules/games/unum.dm b/code/modules/games/unum.dm new file mode 100644 index 00000000000..5f4da0aa17a --- /dev/null +++ b/code/modules/games/unum.dm @@ -0,0 +1,33 @@ +/// A deck of unum cards. Classic. +/obj/item/deck/unum + name = "\improper UNUM! deck" + desc = "A deck of UNUM! cards. House rules to argue over not included." + icon_state = "deck_unum_full" + card_style = "unum" + +/obj/item/deck/unum/build_deck() + for(var/color in list("Red", "Yellow", "Green", "Blue")) + cards += new /datum/playingcard("[color] 0", "sc_[color] 0_[card_style]", "singlecard_down_[card_style]") + for(var/k in 0 to 1) + cards += new /datum/playingcard("[color] skip", "sc_[color] skip_[card_style]", "singlecard_down_[card_style]") + cards += new /datum/playingcard("[color] reverse", "sc_[color] reverse_[card_style]", "singlecard_down_[card_style]") + cards += new /datum/playingcard("[color] draw 2", "sc_[color] draw 2_[card_style]", "singlecard_down_[card_style]") + for(var/i in 1 to 9) + cards += new /datum/playingcard("[color] [i]", "sc_[color] [i]_[card_style]", "singlecard_down_[card_style]") + for(var/k in 0 to 3) + cards += new /datum/playingcard("Wildcard", "sc_Wildcard_[card_style]", "singlecard_down_[card_style]") + cards += new /datum/playingcard("Draw 4", "sc_Draw 4_[card_style]", "singlecard_down_[card_style]") + +/obj/item/deck/unum/update_icon_state() + if(!length(cards)) + icon_state = "deck_[card_style]_empty" + return + var/percent = round((length(cards) / deck_total) * 100) + switch(percent) + if(0 to 20) + icon_state = "deck_[deck_style ? "[deck_style]_" : ""][card_style]_low" + if(21 to 50) + icon_state = "deck_[deck_style ? "[deck_style]_" : ""][card_style]_half" + else + icon_state = "deck_[deck_style ? "[deck_style]_" : ""][card_style]_full" + diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 3a92de585ac..c3f070d0b91 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -343,6 +343,7 @@ EQUIPMENT("Dnd set", /obj/item/storage/box/characters, 500), EQUIPMENT("Dice set", /obj/item/storage/box/dice, 250), EQUIPMENT("Cards", /obj/item/deck/cards, 150), + EQUIPMENT("UNUM!", /obj/item/deck/unum, 200), EQUIPMENT("Guitar", /obj/item/instrument/guitar, 750), EQUIPMENT("Synthesizer", /obj/item/instrument/piano_synth, 1500), EQUIPMENT("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 468e6af9d007abd364a2f979234b1dccfca3471e..1ff9f3409e50b24c59f8d05366b0d9633da6de99 100644 GIT binary patch literal 8109 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 P=G?@4OZ@);uz^uX literal 6460 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 diff --git a/paradise.dme b/paradise.dme index 2a32d10c181..5e55095651a 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1736,6 +1736,7 @@ #include "code\modules\games\52card.dm" #include "code\modules\games\cards.dm" #include "code\modules\games\tarot.dm" +#include "code\modules\games\unum.dm" #include "code\modules\hallucinations\hallucinations.dm" #include "code\modules\hallucinations\effects\common.dm" #include "code\modules\hallucinations\effects\major.dm"