diff --git a/Scenes/BattleScene.gd b/Scenes/BattleScene.gd index a810917..04a8f86 100644 --- a/Scenes/BattleScene.gd +++ b/Scenes/BattleScene.gd @@ -3,3 +3,5 @@ extends Node func _ready(): $"%Battle".character = $Player + $"%CardContainer".character = $Player + $"%DiceContainer".character = $Player diff --git a/Scenes/BattleScene.tscn b/Scenes/BattleScene.tscn index 8b9708b..f614b29 100644 --- a/Scenes/BattleScene.tscn +++ b/Scenes/BattleScene.tscn @@ -1,11 +1,14 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Scenes/Battle.tscn" type="PackedScene" id=1] [ext_resource path="res://Characters/Player.tscn" type="PackedScene" id=2] [ext_resource path="res://Scenes/BattleScene.gd" type="Script" id=3] [ext_resource path="res://UI/CardContainer.tscn" type="PackedScene" id=4] -[ext_resource path="res://UI/DiceView.tscn" type="PackedScene" id=5] +[ext_resource path="res://UI/DiceContainer.tscn" type="PackedScene" id=5] +[ext_resource path="res://UI/Card.gd" type="Script" id=6] +[ext_resource path="res://Assets/CardDB/Broadsword.tres" type="Resource" id=7] [ext_resource path="res://Management/ActiveController.tscn" type="PackedScene" id=8] +[ext_resource path="res://Assets/CardDB/Poisonous apple.tres" type="Resource" id=9] [node name="BattleScene" type="Node"] script = ExtResource( 3 ) @@ -14,14 +17,25 @@ script = ExtResource( 3 ) [node name="Battle" parent="ActiveController" instance=ExtResource( 1 )] -[node name="DiceView" parent="ActiveController" instance=ExtResource( 5 )] -unique_name_in_owner = true -margin_left = 782.0 -margin_top = 375.0 - [node name="CardContainer" parent="ActiveController" instance=ExtResource( 4 )] unique_name_in_owner = true margin_top = 351.0 margin_right = -425.0 +[node name="DiceContainer" parent="ActiveController" instance=ExtResource( 5 )] +unique_name_in_owner = true +margin_left = 782.0 +margin_top = 375.0 + [node name="Player" parent="." instance=ExtResource( 2 )] + +[node name="Card1" type="Node" parent="Player"] +script = ExtResource( 6 ) +card_info = ExtResource( 7 ) + +[node name="Card2" type="Node" parent="Player"] +script = ExtResource( 6 ) + +[node name="Card3" type="Node" parent="Player"] +script = ExtResource( 6 ) +card_info = ExtResource( 9 )