Characters/Character.gd

@@ -11,20 +11,10 @@ var map_position : Vector2 = Vector2.ZERO
 onready var target_position : Vector2 = position
 var moving : bool = false
 
-var cards = [] setget ,get_cards
-
-func get_cards():
-	for child in get_children():
-		if "Card" in child.name:
-			cards.append(child)
-	
-	return cards
-
 
 func level_change(new_level):
 	# when leveing up restore health
 	health = base_max_health * pow(level, 1.5)
-	level = new_level
 
 
 func _physics_process(delta):
@@ -37,13 +27,11 @@ func _physics_process(delta):
 	#TODO: Replace with tween magic
 	position += (target_position - position)/2.5
 
-
 func take_damage(damage):
 	health -= damage
 	if health <= 0:
 		die()
 
-
 func die():
 	#Animation here
 	queue_free()

UI/Card.gd

@@ -5,7 +5,7 @@ signal return_dice(dice_number)
 signal do_movement(movement_range)
 signal do_damage(damage, damage_range)
 signal do_effect(effect, effect_range)
-signal card_removed()
+signal card_removed(card_self)
 
 export (Resource) var card_info = preload("res://Assets/CardDB/Default.tres")
 
@@ -138,6 +138,6 @@ func run_card():
 	input_dice = []
 	
 	#card is used, disappear
-	emit_signal("card_removed")
+	emit_signal("card_removed", self)
 	queue_free()
 

UI/CardContainer.gd

@@ -1,32 +1,106 @@
 extends Control
 
-const card_view_scene = preload("res://UI/CardView.tscn")
+signal return_dice(dice_number)
+signal do_movement(movement_range)
+signal do_damage(damage, damage_range)
+signal do_effect(effect, effect_range)
 
-var character : Character = Character.new() setget update_cards_shown
+const card = preload("res://UI/Card.tscn")
-var card_views = []
+const card_db_string = "res://Assets/CardDB/%s.tres"
 
 
-func update_cards_shown(new_character = null):
+var selected : bool = false
+var hovering_card = null
 
-	# allow the update card shown function to work with and without setget
+var current_cards = []
-	if new_character != null:
-		character = new_character
 
-	# remove the old cards
+var currently_holding_dice = null
-	for card_view in card_views:
-		yield(card_view.card_view_remove(false), "completed")
-	card_views = []
-	
-	# add cards the new cards from the character
-	for card in character.cards:
-		var new_card_view = card_view_scene.instance()
-		new_card_view.card = card
-		$Margin/HBox.add_child(new_card_view)
-		card_views.append(new_card_view)
-		new_card_view.connect("card_view_removed", self, "remove_from_card_views")
 
 
-func remove_from_card_views(card_view):
+func emit_return_dice(dice_number):
-	var to_remove : int = card_views.find(card_view)
+	emit_signal("return_dice", dice_number)
-	if to_remove != -1:
+func emit_do_movement(movement_range):
-		card_views.remove(to_remove)
+	emit_signal("do_movement", movement_range)
+func emit_do_damage(damage, damage_range):
+	emit_signal("do_damage", damage, damage_range)
+func emit_do_effect(effect, effect_range):
+	emit_signal("do_effect", effect, effect_range)
+
+
+func set_currently_holding_dice(dice_number : int):
+	currently_holding_dice = dice_number
+
+
+func remove_card(card):
+	var card_index = current_cards.find(card)
+	current_cards.remove(card_index)
+
+
+func _physics_process(delta):
+	
+	# no keyboard input if not selected  
+	if not selected:
+		hovering_card = null
+		return
+	
+	# if selected card is null, add a value
+	if not hovering_card:
+		hovering_card = 0
+	
+	# move the selection forward or backward the list depending on input
+	if (Input.is_action_just_pressed("ui_down") or 
+		Input.is_action_just_pressed("ui_right")):
+			
+			current_cards[hovering_card].hovering_dice = null
+			
+			hovering_card += 1
+			if hovering_card >= len(current_cards):
+				hovering_card = 0
+	
+	if (Input.is_action_just_pressed("ui_up") or
+		Input.is_action_just_pressed("ui_left")):
+			
+			current_cards[hovering_card].hovering_dice = null
+			
+			hovering_card -= 1
+			if hovering_card < 0:
+				hovering_card = len(current_cards) -1
+	
+	# show the dice over the card if hovering
+	current_cards[hovering_card].hovering_dice = currently_holding_dice
+	
+	#if the enter key is pressed, input the dice into the card
+	if Input.is_action_just_pressed("ui_accept"):
+		current_cards[hovering_card].hovering_dice = null
+		current_cards[hovering_card].dice_inputted(currently_holding_dice)
+		hovering_card = 0
+		selected = false
+
+
+func draw_card(specific_card : String = ""):
+	# make a new card instance and add it to the grid container
+	var new_card = card.instance()
+	
+	# check if a specific card data exists
+	var card_data_check = File.new()
+	var card_data_exists : bool = card_data_check.file_exists(card_db_string % specific_card)
+	
+	# if a specifc card choosen, make new card that type
+	if card_data_exists:
+		new_card.card_info = load(card_db_string % specific_card)
+	else: #no card choosen, pick default
+		new_card.card_info = load(card_db_string % "Default")
+	
+	$Margin/HBox.add_child(new_card)
+	
+	# connect new_card.x signal to self.x 
+	new_card.connect("return_dice", self, "emit_return_dice")
+	new_card.connect("do_movement", self, "emit_do_movement")
+	new_card.connect("do_damage", self, "emit_do_damage")
+	new_card.connect("do_effect", self, "emit_do_effect")
+	
+	# connect the signal remove card signal
+	new_card.connect("card_removed", self, "remove_card")
+	
+	# add the current card to the list of card
+	current_cards.append(new_card)

UI/CardView.gd

@@ -1,8 +1,6 @@
 tool
 extends Control
 
-signal card_view_removed(card_view)
-
 const TYPE_COLORS = [
 	Color("#db4758"), # DAMAGE
 	Color("#3cc361"), # UTILITY
@@ -17,11 +15,15 @@ var input_dice_views = []
 var card : Card = Card.new() setget update_cardview
 
 
+func _ready():
+	update_cardview()
+	connect_signals()
+
+
 func update_cardview(new_card = null):
 	
 	# allow the update card function to work with and without setget
-	if new_card != null and new_card != card:
+	if new_card != null:
-		disconnect_signals()
 		card = new_card
 		connect_signals()
 	
@@ -34,11 +36,6 @@ func update_cardview(new_card = null):
 	$"%Name".text = card.card_info.name
 	$"%Description".text = card.card_info.description
 	
-	# remove the old input dice views
-	for i in input_dice_views:
-		i.queue_free()
-	input_dice_views = []
-	
 	# add the correct number of input dice views
 	for i in card.card_info.number_of_dice:
 		add_input_dice_view()
@@ -76,9 +73,7 @@ func add_input_dice_view():
 
 
 # this is run once the card emits card_removed
-func card_view_run(do_emit_signal : bool = true):
+func card_view_run():
-	# emit card_view_removed signal
-	if do_emit_signal: emit_signal("card_view_removed", self)
 	
 	# play the disappearing input dice animation
 	for i in input_dice_views:
@@ -92,10 +87,7 @@ func card_view_run(do_emit_signal : bool = true):
 	queue_free()
 
 
-func card_view_remove(do_emit_signal : bool = true):
+func card_view_remove():
-	# emit card_view_removed signal
-	if do_emit_signal: emit_signal("card_view_removed", self)
-
 	# play the remove animation
 	$AnimationPlayer.play("Drop Off")
 	yield($AnimationPlayer, "animation_finished")
@@ -104,12 +96,5 @@ func card_view_remove(do_emit_signal : bool = true):
 	queue_free()
 
 
-func disconnect_signals():
-	if card.get_signal_connection_list("card_removed") == []:
-		return
-	
-	card.disconnect("card_removed", self, "card_view_run")
-
-
 func connect_signals():
 	card.connect("card_removed", self, "card_view_run")