base cards done

code/modules/games/cas.dm

@@ -2,12 +2,8 @@
 // This is a parody of Cards Against Humanity (https://en.wikipedia.org/wiki/Cards_Against_Humanity)
 // which is licensed under CC BY-NC-SA 2.0, the full text of which can be found at the following URL:
 // https://creativecommons.org/licenses/by-nc-sa/2.0/legalcode
-// Original code by Zuhayr, Polaris Station, ported with modifications
-/datum/playingcard
-	var/name = "playing card"
-	var/card_icon = "card_back"
-	var/suit
-	var/number
+// Original code by Zuhayr, Polaris Station, ported with modifications 
+// April 2022: modified by sarcoph for hyperstation
 
 /obj/item/toy/cards/deck/cas
 	name = "\improper CAS deck (white)"
@@ -19,7 +15,6 @@
 	var/blanks = 25
 	var/decksize = 150
 	var/card_text_file = "strings/cas_white.txt"
-	var/list/allcards = list()
 
 /obj/item/toy/cards/deck/cas/black
 	name = "\improper CAS deck (black)"
@@ -32,9 +27,12 @@
 	card_text_file = "strings/cas_black.txt"
 
 /obj/item/toy/cards/deck/cas/populate_deck()
-	var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt"))
-	allcards = cards_against_space[card_face]
-	var/list/possiblecards = allcards.Copy()
+	var/static/list/cards_against_space = list(
+		"cas_white" = world.file2list("strings/cas_white.txt"),
+		"cas_black" = world.file2list("strings/cas_black.txt")
+	)
+	cards = cards_against_space[card_face]
+	var/list/possiblecards = cards.Copy()
 	if(possiblecards.len < decksize) // sanity check
 		decksize = (possiblecards.len - 1)
 	var/list/randomcards = list()
@@ -42,117 +40,75 @@
 		randomcards += pick_n_take(possiblecards)
 	for(var/x in 1 to randomcards.len)
 		var/cardtext = randomcards[x]
-		var/datum/playingcard/P
-		P = new()
-		P.name = "[cardtext]"
-		P.card_icon = "[src.card_face]"
-		cards += P
+		cards += list(list(
+			"name" = cardtext,
+			"icon_state" = src.card_face,
+			"rotation" = null,
+			"face_up" = null
+		))
 	if(!blanks)
+		cards = shuffle(cards) 
 		return
 	for(var/x in 1 to blanks)
-		var/datum/playingcard/P
-		P = new()
-		P.name = "Blank Card"
-		P.card_icon = "cas_white"
-		cards += P
-	// shuffle_inplace(cards) // distribute blank cards throughout deck
+		cards += list(list(
+			"name" = "Blank Card",
+			"icon_state" = "cas_white",
+			"rotation" = null,
+			"face_up" = null
+		))
+	cards = shuffle(cards) // distribute blank cards throughout deck
 
-// /obj/item/toy/cards/deck/cas/draw_card(mob/user)
-// 	if(user.lying)
-// 		return
-// 	if(cards.len == 0)
-// 		to_chat(user, "<span class='warning'>There are no more cards to draw!</span>")
-// 		return
-// 	var/obj/item/toy/cards/singlecard/cas/H = new/obj/item/toy/cards/singlecard/cas(user.loc)
-// 	var/datum/playingcard/choice = cards[1]
-// 	if (choice.name == "Blank Card")
-// 		H.blank = 1
-// 	H.name = choice.name
-// 	H.buffertext = choice.name
-// 	H.icon_state = choice.card_icon
-// 	H.card_face = choice.card_icon
-// 	H.parentdeck = src
-// 	src.cards -= choice
-// 	H.pickup(user)
-// 	user.put_in_hands(H)
-// 	user.visible_message("[user] draws a card from the deck.", "<span class='notice'>You draw a card from the deck.</span>")
-// 	update_icon()
+/obj/item/toy/cards/deck/cas/DrawOneCard(list/card_indices)
+	var/obj/item/toy/cards/singlecard/cas/S = new/obj/item/toy/cards/singlecard/cas(usr.loc)
+	var/_card = cards[card_indices[1]]
+	if(_card["name"] == "Blank Card")
+		S.blank = TRUE
+	S.name = _card["name"]
+	S.icon_state = _card["icon_state"]
+	S.parentdeck = src
+	cards -= list(_card)
+	update_icon()
+	return S
 
-// /obj/item/toy/cards/deck/cas/attackby(obj/item/I, mob/living/user, params)
-// 	if(istype(I, /obj/item/toy/cards/singlecard/cas))
-// 		var/obj/item/toy/cards/singlecard/cas/SC = I
-// 		if(!user.temporarilyRemoveItemFromInventory(SC))
-// 			to_chat(user, "<span class='warning'>The card is stuck to your hand, you can't add it to the deck!</span>")
-// 			return
-// 		var/datum/playingcard/RC // replace null datum for the re-added card
-// 		RC = new()
-// 		RC.name = "[SC.name]"
-// 		RC.card_icon = SC.card_face
-// 		cards += RC
-// 		user.visible_message("[user] adds a card to the bottom of the deck.","<span class='notice'>You add the card to the bottom of the deck.</span>")
-// 		qdel(SC)
-// 	update_icon()
+/obj/item/toy/cards/deck/cas/update_icon()
+	if(cards.len < 26)
+		icon_state = "deck_[deckstyle]_low"
 
-// /obj/item/toy/cards/deck/cas/update_icon()
-// 	if(cards.len < 26)
-// 		icon_state = "deck_[deckstyle]_low"
+/obj/item/toy/cards/singlecard/cas
+	name = "CAS card"
+	desc = "A CAS card."
+	icon_state = "cas_white"
+	var/card_face = "cas_white"
+	var/blank = 0
+	var/buffertext = "A funny bit of text."
 
-// /obj/item/toy/cards/singlecard/cas
-// 	name = "CAS card"
-// 	desc = "A CAS card."
-// 	icon_state = "cas_white"
-// 	flipped = 0
-// 	var/card_face = "cas_white"
-// 	var/blank = 0
-// 	var/buffertext = "A funny bit of text."
+/obj/item/toy/cards/singlecard/cas/examine(mob/user)
+	. = ..()
+	if (!face_up)
+		. += "<span class='notice'>The card is face down.</span>"
+	else if (blank)
+		. += "<span class='notice'>The card is blank. Write on it with a pen.</span>"
+	else
+		. += "<span class='notice'>The card reads: [name]</span>"
 
-// /obj/item/toy/cards/singlecard/cas/examine(mob/user)
-// 	. = ..()
-// 	if (flipped)
-// 		. += "<span class='notice'>The card is face down.</span>"
-// 	else if (blank)
-// 		. += "<span class='notice'>The card is blank. Write on it with a pen.</span>"
-// 	else
-// 		. += "<span class='notice'>The card reads: [name]</span>"
-// 	. += "<span class='notice'>Alt-click to flip it.</span>"
+/obj/item/toy/cards/singlecard/cas/update_icon()
+	if(face_up)
+		icon_state = "[card_face]_flipped"
+		name = card["name"]
+	else
+		icon_state = "[card_face]"
 
-// /obj/item/toy/cards/singlecard/cas/Flip()
-// 	set name = "Flip Card"
-// 	set category = "Object"
-// 	set src in range(1)
-// 	if(!ishuman(usr) || !usr.canUseTopic(src, BE_CLOSE))
-// 		return
-// 	if(!flipped)
-// 		name = "CAS card"
-// 	else if(flipped)
-// 		name = buffertext
-// 	flipped = !flipped
-// 	update_icon()
-
-// /obj/item/toy/cards/singlecard/cas/AltClick(mob/living/user)
-// 	. = ..()
-// 	if(!ishuman(user) || !user.canUseTopic(src, BE_CLOSE))
-// 		return
-// 	Flip()
-// 	return TRUE
-
-// /obj/item/toy/cards/singlecard/cas/update_icon()
-// 	if(flipped)
-// 		icon_state = "[card_face]_flipped"
-// 	else
-// 		icon_state = "[card_face]"
-
-// /obj/item/toy/cards/singlecard/cas/attackby(obj/item/I, mob/living/user, params)
-// 	if(istype(I, /obj/item/pen))
-// 		if(!user.is_literate())
-// 			to_chat(user, "<span class='notice'>You scribble illegibly on [src]!</span>")
-// 			return
-// 		if(!blank)
-// 			to_chat(user, "You cannot write on that card.")
-// 			return
-// 		var/cardtext = stripped_input(user, "What do you wish to write on the card?", "Card Writing", "", 50)
-// 		if(!cardtext || !user.canUseTopic(src, BE_CLOSE))
-// 			return
-// 		name = cardtext
-// 		buffertext = cardtext
-// 		blank = 0
+/obj/item/toy/cards/singlecard/cas/attackby(obj/item/I, mob/living/user, params)
+	if(istype(I, /obj/item/pen))
+		if(!user.is_literate())
+			to_chat(user, "<span class='notice'>You scribble illegibly on [src]!</span>")
+			return
+		if(!blank)
+			to_chat(user, "You cannot write on that card.")
+			return
+		var/cardtext = stripped_input(user, "What do you wish to write on the card?", "Card Writing", "", 50)
+		if(!cardtext || !user.canUseTopic(src, BE_CLOSE))
+			return
+		name = cardtext
+		buffertext = cardtext
+		blank = 0