Fixed a function, fixed the test?, and cards not appearing in the UI.

Saplings-Projects · Jan 5, 2024 · 32d5745 · 32d5745
1 parent 240a837
commit 32d5745
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/Tests/test_pile_ui.gd b/Tests/test_pile_ui.gd
@@ -9,31 +9,35 @@ var _card_scroll: Control = null
 const SCROLL_CONTAINER_INDEX: int = 2
 const GRID_CONTAINER_INDEX: int = 0
 
-
-func before_each():
+func before_all():
  _card_container = _card_container_scene.instantiate()
- _card_scroll = _card_container_scroll_scene.instantiate()
-
  # fill deck with 50 default cards
  _card_container.default_deck.resize(50)
  _card_container.max_hand_size = 10
  _card_container.starting_hand_size = 0
  _card_container.card_draw_time = .05
-
+
+func before_each():
+
  # assign cards names of Card1-Card50
  for card_index: int in _card_container.default_deck.size():
  _card_container.default_deck[card_index] = CardBase.new()
  _card_container.default_deck[card_index].card_title = "Card" + str(card_index + 1)
 
  get_tree().root.add_child(_card_container)
-
- _card_scroll.deck_pile = _card_container.default_deck.duplicate()
+
 
 func after_each():
- queue_free()
-
+
+
+ _card_container.free()
+ _card_scroll.free()
+
 func test_populate():
 
+ _card_scroll = _card_container_scroll_scene.instantiate()
+ _card_scroll.deck_pile = _card_container.default_deck.duplicate()
+
  _card_scroll.populate("DeckPile")
 
  var card_pile = _card_scroll.deck_pile

diff --git a/UI/CardScrollUI.gd b/UI/CardScrollUI.gd
@@ -2,9 +2,9 @@ extends Control
 
 var card_scene: PackedScene = preload("res://Cards/Card.tscn")
 
-var discard_pile: Array[CardBase]
-var draw_pile: Array[CardBase] 
-var deck_pile: Array[CardBase] 
+var discard_pile: Array[CardBase] = CardManager.card_container.discard_pile
+var draw_pile: Array[CardBase] = CardManager.card_container.draw_pile
+var deck_pile: Array[CardBase]  = CardManager.card_container.default_deck
 var cards_to_display: Array[CardBase] = []
 var card_worlds: Array[CardWorld] = []
 var cardworld: CardWorld = null
@@ -16,15 +16,10 @@ const CARDUI_POS: Vector2 = Vector2(4,4)
 const SIZE_OFFSET: Vector2 = Vector2(10,10)
 
 
-func _ready() -> void:
-
- discard_pile = CardManager.card_container.discard_pile
- draw_pile = CardManager.card_container.draw_pile
- deck_pile = CardManager.card_container.default_deck
-
 #deletes the root node CardScrollUI with the on screen button
-func on_button_pressed() -> void:
+func _on_button_pressed() -> void:
  queue_free()
+
 
 #deletes the root node CardScrollUI with the escape key
 func _input(_inputevent: InputEvent) -> void: