From ab809aa5167fb3b403682930c467a02fbd17a79d Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Tue, 9 Sep 2025 12:42:09 -0700 Subject: [PATCH] [MIRROR] Gamble buffs (#11588) Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/datums/supplypacks/recreation.dm | 17 +++ code/modules/economy/casinocash.dm | 142 ++++++++++++++++++ code/modules/economy/vending_machines_vr.dm | 4 + code/modules/games/cards.dm | 58 ++++++- code/modules/games/cards_ch.dm | 3 - code/modules/games/dice.dm | 29 +++- code/modules/mob/living/carbon/human/human.dm | 3 + icons/obj/playing_cards_ch.dmi | Bin 5491 -> 0 bytes vorestation.dme | 12 +- 9 files changed, 257 insertions(+), 11 deletions(-) delete mode 100644 icons/obj/playing_cards_ch.dmi diff --git a/code/datums/supplypacks/recreation.dm b/code/datums/supplypacks/recreation.dm index 46bbdc00f0..1f93f58f20 100644 --- a/code/datums/supplypacks/recreation.dm +++ b/code/datums/supplypacks/recreation.dm @@ -345,3 +345,20 @@ ) cost = 10 containertype = /obj/structure/closet/crate + +/datum/supply_pack/recreation/gambling + name = "Gambling Game Crate" + desc = "A bunch of supplies for gambling games, includes 5000 replica casino chips, a triple size deck of cards and dice bags." + contains = list( + /obj/item/spacecasinocash_fake/c1000, + /obj/item/spacecasinocash_fake/c1000, + /obj/item/spacecasinocash_fake/c1000, + /obj/item/spacecasinocash_fake/c1000, + /obj/item/spacecasinocash_fake/c1000, + /obj/item/deck/cards/triple, + /obj/item/storage/pill_bottle/dice, + /obj/item/storage/pill_bottle/dice_nerd, + /obj/item/storage/dicecup + ) + cost = 30 + containertype = /obj/structure/closet/crate diff --git a/code/modules/economy/casinocash.dm b/code/modules/economy/casinocash.dm index 2fa8d58ae5..5deae4ba38 100644 --- a/code/modules/economy/casinocash.dm +++ b/code/modules/economy/casinocash.dm @@ -205,3 +205,145 @@ comment = "Joker" user.visible_message(span_notice("[user] has thrown \the [src]. It lands on [comment]! "), \ span_notice("You throw \the [src]. It lands on [comment]! ")) + + +//Fake casino chips that can be ordered at any time + +/obj/item/spacecasinocash_fake + name = "broken replica casino chip" + desc = "It's worth nothing in a casino." + gender = PLURAL + icon = 'icons/obj/casino.dmi' + icon_state = "spacecasinocash1" + opacity = 0 + density = 0 + anchored = 0.0 + force = 1.0 + throwforce = 1.0 + throw_speed = 1 + throw_range = 2 + w_class = ITEMSIZE_SMALL + var/access = list() + access = ACCESS_CRATE_CASH + var/worth = 0 + +/obj/item/spacecasinocash_fake/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/spacecasinocash_fake)) + + var/obj/item/spacecasinocash_fake/SC = W + + SC.adjust_worth(src.worth) + if(ishuman(user)) + var/mob/living/carbon/human/h_user = user + + h_user.drop_from_inventory(src) + h_user.drop_from_inventory(SC) + h_user.put_in_hands(SC) + to_chat(user, span_notice("You combine the casino chips to a stack of [SC.worth] replica casino credits.")) + qdel(src) + +/obj/item/spacecasinocash_fake/update_icon() + overlays.Cut() + name = "[worth] replica casino chip\s" + if(worth in list(1000,500,200,100,50,20,10,1)) + icon_state = "spacecasinocash[worth]" + desc = "It's a stack of replica casino chips with a combined value of [worth] imaginary points." + return + var/sum = src.worth + var/num = 0 + for(var/i in list(1000,500,200,100,50,20,10,1)) + while(sum >= i && num < 50) + sum -= i + num++ + var/image/banknote = image('icons/obj/casino.dmi', "spacecasinocash[i]") + var/matrix/M = matrix() + M.Translate(rand(-6, 6), rand(-4, 8)) + M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) + banknote.transform = M + src.overlays += banknote + if(num == 0) // Less than one credit, let's just make it look like 1 for ease + var/image/banknote = image('icons/obj/casino.dmi', "spacecasinocash1") + var/matrix/M = matrix() + M.Translate(rand(-6, 6), rand(-4, 8)) + M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) + banknote.transform = M + src.overlays += banknote + src.desc = "They are worth [worth] replica casino credits." + +/obj/item/spacecasinocash_fake/proc/adjust_worth(var/adjust_worth = 0, var/update = 1) + worth += adjust_worth + if(worth > 0) + if(update) + update_icon() + return worth + else + qdel(src) + return 0 + +/obj/item/spacecasinocash_fake/proc/set_worth(var/new_worth = 0, var/update = 1) + worth = max(0, new_worth) + if(update) + update_icon() + return worth + +/obj/item/spacecasinocash_fake/attack_self(mob/user) + var/amount = tgui_input_number(user, "How much credits worth of chips do you want to take? (0 to [src.worth])", "Take chips", 20, src.worth) + if(!src || QDELETED(src)) + return + amount = round(CLAMP(amount, 0, src.worth)) + + if(!amount) + return + + adjust_worth(-amount) + var/obj/item/spacecasinocash_fake/SC = new (user.loc) + SC.set_worth(amount) + user.put_in_hands(SC) + +/obj/item/spacecasinocash_fake/c1 + name = "1 replica casino chip" + icon_state = "spacecasinocash1" + desc = "It's worth 1 credit." + worth = 1 + +/obj/item/spacecasinocash_fake/c10 + name = "10 replica casino chip" + icon_state = "spacecasinocash10" + desc = "It's worth 10 credits." + worth = 10 + +/obj/item/spacecasinocash_fake/c20 + name = "20 replica casino chip" + icon_state = "spacecasinocash20" + desc = "It's worth 20 credits." + worth = 20 + +/obj/item/spacecasinocash_fake/c50 + name = "50 replica casino chip" + icon_state = "spacecasinocash50" + desc = "It's worth 50 credits." + worth = 50 + +/obj/item/spacecasinocash_fake/c100 + name = "100 replica casino chip" + icon_state = "spacecasinocash100" + desc = "It's worth 100 credits." + worth = 100 + +/obj/item/spacecasinocash_fake/c200 + name = "200 replica casino chip" + icon_state = "spacecasinocash200" + desc = "It's worth 200 credits." + worth = 200 + +/obj/item/spacecasinocash_fake/c500 + name = "500 replica casino chip" + icon_state = "spacecasinocash500" + desc = "It's worth 500 credits." + worth = 500 + +/obj/item/spacecasinocash_fake/c1000 + name = "1000 replica casino chip" + icon_state = "spacecasinocash1000" + desc = "It's worth 1000 credits." + worth = 1000 diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index b607e25ae8..8ce4c30aba 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -1275,9 +1275,11 @@ /obj/item/deck/cah/black = 5, /obj/item/deck/tarot = 5, /obj/item/deck/cards = 5, + /obj/item/deck/cards/triple =5, /obj/item/pack/spaceball = 10, /obj/item/storage/pill_bottle/dice = 5, /obj/item/storage/pill_bottle/dice_nerd = 5, + /obj/item/spacecasinocash_fake/c1000 = 50, /obj/item/melee/umbrella/random = 10, /obj/item/picnic_blankets_carried = 10, /obj/item/deck/schnapsen = 5, @@ -1289,9 +1291,11 @@ /obj/item/deck/cah/black = 100, /obj/item/deck/tarot = 100, /obj/item/deck/cards = 100, + /obj/item/deck/cards/triple = 150, /obj/item/pack/spaceball = 100, /obj/item/storage/pill_bottle/dice = 100, /obj/item/storage/pill_bottle/dice_nerd = 100, + /obj/item/spacecasinocash_fake/c1000 = 100, /obj/item/melee/umbrella/random = 100, /obj/item/picnic_blankets_carried = 100, /obj/item/deck/schnapsen = 100, diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index e1c013dad3..ac2aa2e30c 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -6,6 +6,7 @@ /obj/item/deck w_class = ITEMSIZE_SMALL icon = 'icons/obj/playing_cards.dmi' + description_info = "Alt click to shuffle, Ctrl click to deal, Ctrl+Shift click to deal multiple." var/list/cards = list() var/cooldown = 0 // to prevent spam shuffle @@ -165,6 +166,12 @@ deal_at(usr, M, dcard) +/obj/item/deck/CtrlClick(mob/user) + deal_card() + +/obj/item/deck/CtrlShiftClick(mob/user) + deal_card_multi() + /obj/item/deck/proc/deal_at(mob/user, mob/target, dcard) // Take in the no. of card to be dealt var/obj/item/hand/H = new(get_step(user, user.dir)) var/i @@ -236,6 +243,10 @@ else return +/obj/item/deck/AltClick(mob/user) + if(user.stat || !Adjacent(user)) + return + shuffle(user) /obj/item/deck/MouseDrop(mob/user) // Code from Paper bin, so you can still pick up the deck if((user == usr && (!( user.restrained() ) && (!( user.stat ) && (user.contents.Find(src) || in_range(src, user)))))) @@ -273,6 +284,42 @@ user.put_in_hands(src) return +/obj/item/deck/cards/triple + name = "big deck of cards" + desc = "A simple deck of playing cards with triple the number of cards." + +/obj/item/deck/cards/triple/Initialize(mapload) + . = ..() + var/datum/playingcard/P + for(var/a = 0, a<3, a++) + for(var/suit in list("spades","clubs","diamonds","hearts")) + + var/colour + if(suit == "spades" || suit == "clubs") + colour = "black_" + else + colour = "red_" + + for(var/number in list("ace","two","three","four","five","six","seven","eight","nine","ten")) + P = new() + P.name = "[number] of [suit]" + P.card_icon = "[colour]num" + P.back_icon = "card_back" + cards += P + + for(var/number in list("jack","queen","king")) + P = new() + P.name = "[number] of [suit]" + P.card_icon = "[colour]col" + P.back_icon = "card_back" + cards += P + + for(var/i = 0, i<2, i++) + P = new() + P.name = "joker" + P.card_icon = "joker" + cards += P + /obj/item/pack/ name = "Card Pack" desc = "For those with disposible income." @@ -302,7 +349,8 @@ /obj/item/hand name = "hand of cards" desc = "Some playing cards." - icon = 'icons/obj/playing_cards_ch.dmi' //CHOMPEDIT quickest solution to having custom chomp cards - Jack + description_info = "Alt click to remove a card, Ctrl click to discard cards." + icon = 'icons/obj/playing_cards.dmi' icon_state = "empty" drop_sound = 'sound/items/drop/paper.ogg' pickup_sound = 'sound/items/pickup/paper.ogg' @@ -465,3 +513,11 @@ /obj/item/hand/pickup(mob/user) ..() src.update_icon() + +/obj/item/hand/CtrlClick(mob/user) + if(user.stat || !Adjacent(user)) + return + discard() + +/obj/item/hand/AltClick(mob/user) + Removecard() diff --git a/code/modules/games/cards_ch.dm b/code/modules/games/cards_ch.dm index 383114503c..540dd40e26 100644 --- a/code/modules/games/cards_ch.dm +++ b/code/modules/games/cards_ch.dm @@ -5,19 +5,16 @@ /obj/item/deck/casino w_class = ITEMSIZE_SMALL - icon = 'icons/obj/playing_cards_ch.dmi' cooldown = 0 // to prevent spam shuffle /obj/item/deck/holder/casino //WIP In future do a cool holder name = "card box" desc = "A small leather case to show how classy you are compared to everyone else." - icon = 'icons/obj/playing_cards_ch.dmi' icon_state = "card_holder" /obj/item/deck/cards/casino name = "deck of casino cards" desc = "A deck of playing cards from the golden goose casino, comes without a joker card!" - icon = 'icons/obj/playing_cards_ch.dmi' icon_state = "casino_deck" /obj/item/deck/cards/casino/Initialize(mapload) diff --git a/code/modules/games/dice.dm b/code/modules/games/dice.dm index 7e94bcc4e6..45a6390cf3 100644 --- a/code/modules/games/dice.dm +++ b/code/modules/games/dice.dm @@ -35,7 +35,7 @@ ..() if(cheater) if(!loaded) - var/to_weight = tgui_input_number(user, "What should the [name] be weighted towards?","Set the desired result", 1, 6, 1) + var/to_weight = tgui_input_number(user, "What should the [name] be weighted towards?","Set the desired result", 1, sides, 1) if(isnull(to_weight) || (to_weight < 1) || (to_weight > sides) ) //You must input a number higher than 0 and no greater than the number of sides return 0 else @@ -115,6 +115,33 @@ span_notice("You throw [src]. It lands on a [result]. [comment]"), \ span_notice("You hear [src] landing on a [result]. [comment]")) +/obj/item/dice/verb/set_dice_verb() + set category = "Object" + set name = "Set Face" + set desc = "Turn the dice to a specific face." + set src in view(1) + + var/mob/living/carbon/user = usr + if(!istype(user)) + return + + set_dice(user) + +/obj/item/dice/proc/set_dice(mob/user) + if(user.stat || !Adjacent(user)) + return + var/to_value = tgui_input_number(user, "What face should \the [src] be turned to?","Set die face", 1, sides, 1) + if(!to_value) + return + + result = to_value + icon_state = "[name][result]" + user.visible_message(span_notice("\The [user] turned \the [src] to the face reading [result] manually.")) + +/obj/item/dice/CtrlClick(mob/user) + set_dice(user) + + /* * Dice packs */ diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 12d81a2f88..e9411d3863 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -739,6 +739,9 @@ var/obj/item/I = locate(href_list["lookitem_desc_only"]) if(!I) return + if(istype(I,/obj/item/hand)) + to_chat(usr,span_warning("You can't see the card faces from here.")) + return usr.examinate(I, 1) if (href_list["lookmob"]) diff --git a/icons/obj/playing_cards_ch.dmi b/icons/obj/playing_cards_ch.dmi deleted file mode 100644 index 70ec5e908bd3d037e8192048fdfda3a445e81afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5491 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 diff --git a/vorestation.dme b/vorestation.dme index c18bed1ad7..4765fd4968 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4919,6 +4919,11 @@ #include "interface\interface.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" +#include "interface\fonts\fonts_datum.dm" +#include "interface\fonts\grand_9k.dm" +#include "interface\fonts\pixellari.dm" +#include "interface\fonts\tiny_unicode.dm" +#include "interface\fonts\vcr_osd_mono.dm" #include "maps\common\common_areas.dm" #include "maps\common\common_defines.dm" #include "maps\common\common_shuttles.dm" @@ -4935,11 +4940,6 @@ #include "maps\groundbase\groundbase_telecomm_defs.dm" #include "maps\groundbase\groundbase_wilds.dm" #include "maps\offmap_vr\common_offmaps.dm" -#include "interface\fonts\fonts_datum.dm" -#include "interface\fonts\grand_9k.dm" -#include "interface\fonts\pixellari.dm" -#include "interface\fonts\tiny_unicode.dm" -#include "interface\fonts\vcr_osd_mono.dm" #include "maps\redgate\facility_items.dm" #include "maps\redgate\fantasy_items.dm" #include "maps\redgate\falls\atoll_decals.dm" @@ -5352,10 +5352,10 @@ #include "modular_chomp\maps\common_submaps\tyr\tyr_defines.dm" #include "modular_chomp\maps\overmap\aegis_carrier\aegis_objs.dm" #include "modular_chomp\maps\overmap\om_ships\offmap.dm" +#include "modular_chomp\maps\overmap\sectors\common_overmap.dm" #include "modular_chomp\maps\overmap\sectors\sectors.dm" #include "modular_chomp\maps\overmap\space_pois\space_areas.dm" #include "modular_chomp\maps\overmap\space_pois\space_pois.dm" -#include "modular_chomp\maps\overmap\sectors\common_overmap.dm" #include "modular_chomp\maps\southern_cross\southern_cross_events.dm" #include "modular_chomp\maps\southern_cross\items\encryptionkey_sc.dm" #include "modular_chomp\maps\southern_cross\items\headset_sc.dm"