SuperNovaa41/untap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes some small merge issues

Browse Source
This commit is contained in:
ShyProton 2025-04-28 00:58:04 -04:00
parent 04ae9b856b
commit 709859abad
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library.gd
View File

@ -1,6 +1,6 @@
extends Node2D extends Node2D
var _card_class = preload("res://card.gd") var _card_class = preload("res://scenes/card/card.gd")
# Library cards are represented as an array of card IDs. # Library cards are represented as an array of card IDs.
var lib_cards: Array[String] var lib_cards: Array[String]

11
tabletop.gd
View File

@ -109,19 +109,10 @@ func _ready() -> void:
move_child(player, 0) move_child(player, 0)
cache.get_card_data_from_name("1996 World Champion") cache.get_card_data_from_name("1996 World Champion")
<<<<<<< HEAD
var deck = deck_input.new() var deck = deck_input.new()
add_child(deck) add_child(deck)
deck.add_new_deck(cards, "Blood rites") deck.add_new_deck(cards, "Blood rites")
=======
# var deck = deck_input.new(cards)
# add_child(deck)
>>>>>>> card-rework
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.