feat: bunch of cards and some styling stuff

the-dev-bin · Jul 28, 2024 · a53ce3f · a53ce3f
1 parent cd257e7
commit a53ce3f
Showing 13 changed files with 123 additions and 32 deletions.
diff --git a/godot/ingredients/resources/cube_block.tres b/godot/ingredients/resources/cube_block.tres
@@ -0,0 +1,19 @@
+[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://8p82vshqls3p"]
+
+[ext_resource type="Script" path="res://ingredient_actions/actions/defend_action.gd" id="1_ow2ti"]
+[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_6un3w"]
+
+[sub_resource type="Resource" id="Resource_vvcgy"]
+script = ExtResource("1_ow2ti")
+defense_value = 10
+
+[resource]
+script = ExtResource("2_6un3w")
+ingredient_name = "Cube Block"
+image = "res://assets/CubeBlock.svg"
+action = SubResource("Resource_vvcgy")
+color = Color(0.781871, 0.0319325, 0.340096, 1)
+base_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(0, 2), Vector2(1, 0), Vector2(1, 1), Vector2(1, 2), Vector2(2, 0), Vector2(2, 1), Vector2(2, 2)])
+right_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(0, 2), Vector2(-1, 0), Vector2(-1, 1), Vector2(-1, 2), Vector2(-2, 0), Vector2(-2, 1), Vector2(-2, 2)])
+flipped_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(0, -2), Vector2(-1, 0), Vector2(-1, -1), Vector2(-1, -2), Vector2(-2, 0), Vector2(-2, -1), Vector2(-2, -2)])
+left_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(0, -2), Vector2(1, 0), Vector2(1, -1), Vector2(1, -2), Vector2(2, 0), Vector2(2, -1), Vector2(2, -2)])
diff --git a/godot/ingredients/resources/disconnected_block.tres b/godot/ingredients/resources/disconnected_block.tres
@@ -0,0 +1,20 @@
+[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://curs4gmtnp140"]
+
+[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_p7vqq"]
+[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_7vwyi"]
+
+[sub_resource type="Resource" id="Resource_y52xg"]
+script = ExtResource("1_p7vqq")
+attack_range = Array[int]([2, 3])
+target = 0
+
+[resource]
+script = ExtResource("2_7vwyi")
+ingredient_name = "Disconnected Block"
+image = "res://assets/DisconnectHookBlock.svg"
+action = SubResource("Resource_y52xg")
+color = Color(0.781871, 0.0319325, 0.340096, 1)
+base_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(1, 2), Vector2(2, 2)])
+right_structure = Array[Vector2]([Vector2(0, 0), Vector2(-1, 0), Vector2(-2, 1), Vector2(-2, 2)])
+flipped_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(-1, -2), Vector2(-2, -2)])
+left_structure = Array[Vector2]([Vector2(0, 0), Vector2(1, 0), Vector2(2, -1), Vector2(2, -2)])
diff --git a/godot/ingredients/resources/hook_block.tres b/godot/ingredients/resources/hook_block.tres
@@ -0,0 +1,20 @@
+[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://crywtu8cg1y53"]
+
+[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_4378i"]
+[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_6i7m1"]
+
+[sub_resource type="Resource" id="Resource_y52xg"]
+script = ExtResource("1_4378i")
+attack_range = Array[int]([2, 3])
+target = 0
+
+[resource]
+script = ExtResource("2_6i7m1")
+ingredient_name = "L Block"
+image = "res://assets/HookBlock.svg"
+action = SubResource("Resource_y52xg")
+color = Color(0.781871, 0.0319325, 0.340096, 1)
+base_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(0, 2), Vector2(1, 2), Vector2(2, 2)])
+right_structure = Array[Vector2]([Vector2(0, 0), Vector2(-1, 0), Vector2(-2, 0), Vector2(-2, 1), Vector2(-2, 2)])
+flipped_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(0, -2), Vector2(-1, -2), Vector2(-2, -2)])
+left_structure = Array[Vector2]([Vector2(0, 0), Vector2(1, 0), Vector2(2, 0), Vector2(2, -1), Vector2(2, -2)])
diff --git a/godot/ingredients/resources/l_block.tres b/godot/ingredients/resources/l_block.tres
@@ -1,18 +1,17 @@
 [gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://cyhd24hu3rkmq"]
 
-[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_4wwl0"]
 [ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="1_vl3xs"]
+[ext_resource type="Script" path="res://ingredient_actions/actions/defend_action.gd" id="1_xmaqc"]
 
-[sub_resource type="Resource" id="Resource_y52xg"]
-script = ExtResource("1_4wwl0")
-attack_range = Array[int]([1, 2])
-target = 0
+[sub_resource type="Resource" id="Resource_tha6s"]
+script = ExtResource("1_xmaqc")
+defense_value = 4
 
 [resource]
 script = ExtResource("1_vl3xs")
 ingredient_name = "L Block"
 image = "res://assets/LBlock.svg"
-action = SubResource("Resource_y52xg")
+action = SubResource("Resource_tha6s")
 color = Color(0.996078, 0.423529, 0.564706, 1)
 base_structure = Array[Vector2]([Vector2(0, 0), Vector2(1, 0), Vector2(1, 1)])
 right_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(-1, 1)])

diff --git a/godot/ingredients/resources/t_block.tres b/godot/ingredients/resources/t_block.tres
@@ -5,7 +5,7 @@
 
 [sub_resource type="Resource" id="Resource_y52xg"]
 script = ExtResource("1_43irh")
-attack_range = Array[int]([2, 3])
+attack_range = Array[int]([3, 6])
 target = 0
 
 [resource]

diff --git a/godot/loot_tables/resources/base_table.tres b/godot/loot_tables/resources/base_table.tres
@@ -1,9 +1,13 @@
-[gd_resource type="Resource" script_class="LootTable" load_steps=8 format=3 uid="uid://b181mahpm5jwp"]
+[gd_resource type="Resource" script_class="LootTable" load_steps=15 format=3 uid="uid://b181mahpm5jwp"]
 
 [ext_resource type="Script" path="res://loot_tables/LootTableEntry.gd" id="1_5p5ur"]
 [ext_resource type="Script" path="res://loot_tables/loot_table.gd" id="1_pcdo4"]
 [ext_resource type="Resource" uid="uid://bahbxo6wc30m4" path="res://ingredients/resources/godot_single.tres" id="2_0u5as"]
 [ext_resource type="Resource" uid="uid://cyhd24hu3rkmq" path="res://ingredients/resources/l_block.tres" id="3_g1scy"]
+[ext_resource type="Resource" uid="uid://8p82vshqls3p" path="res://ingredients/resources/cube_block.tres" id="4_53rnb"]
+[ext_resource type="Resource" uid="uid://curs4gmtnp140" path="res://ingredients/resources/disconnected_block.tres" id="5_pwyps"]
+[ext_resource type="Resource" uid="uid://crywtu8cg1y53" path="res://ingredients/resources/hook_block.tres" id="6_xjkps"]
+[ext_resource type="Resource" uid="uid://dnfyhrn54p1s" path="res://ingredients/resources/t_block.tres" id="7_8ewyt"]
 
 [sub_resource type="Resource" id="Resource_rwm6v"]
 script = ExtResource("1_5p5ur")
@@ -17,10 +21,25 @@ likelihood = 1
 
 [sub_resource type="Resource" id="Resource_p8m23"]
 script = ExtResource("1_5p5ur")
-ingredient = ExtResource("2_0u5as")
+ingredient = ExtResource("4_53rnb")
+likelihood = 1
+
+[sub_resource type="Resource" id="Resource_o5qag"]
+script = ExtResource("1_5p5ur")
+ingredient = ExtResource("5_pwyps")
+likelihood = 1
+
+[sub_resource type="Resource" id="Resource_d2rgo"]
+script = ExtResource("1_5p5ur")
+ingredient = ExtResource("6_xjkps")
+likelihood = 1
+
+[sub_resource type="Resource" id="Resource_jsure"]
+script = ExtResource("1_5p5ur")
+ingredient = ExtResource("7_8ewyt")
 likelihood = 1
 
 [resource]
 script = ExtResource("1_pcdo4")
-loot = Array[ExtResource("1_5p5ur")]([SubResource("Resource_rwm6v"), SubResource("Resource_mk8fk"), SubResource("Resource_p8m23")])
+loot = Array[ExtResource("1_5p5ur")]([SubResource("Resource_rwm6v"), SubResource("Resource_mk8fk"), SubResource("Resource_p8m23"), SubResource("Resource_o5qag"), SubResource("Resource_d2rgo"), SubResource("Resource_jsure")])
 money_range = Array[int]([5, 15])
diff --git a/godot/scenes/cauldron/cauldron.gd b/godot/scenes/cauldron/cauldron.gd
@@ -151,6 +151,7 @@ func get_ingredients() -> Array[Ingredient]:
 func clear_board() -> void:
 	pieces_on_board = []
 	var slot_container_children : Array[Node] = slot_container.get_children()
+	pieces_on_board = []
 	for i in slot_container_children.size():
 		var slot: Node = slot_container_children[i]
 		if slot is CauldronSlot:

diff --git a/godot/scenes/component_pouch/component_pouch.tscn b/godot/scenes/component_pouch/component_pouch.tscn
@@ -16,5 +16,5 @@ ingredient_block_scene = ExtResource("2_njvai")
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 3
-theme_override_constants/separation = 32
+theme_override_constants/separation = 97
 alignment = 1
diff --git a/godot/scenes/ingredient_block/ingredient_block.gd b/godot/scenes/ingredient_block/ingredient_block.gd
@@ -23,9 +23,10 @@ func setup(_block_data: Ingredient) -> void:
 	var size_vector: Vector2 = Vector2(max_width * block_size + block_size, max_height * block_size + block_size )
 	# size = size_vector
 	# print(size_vector)
-	# set_deferred('size', size_vector)
+	set_deferred('size', size_vector)
 	# pivot_offset = Vector2(16,16)
 	# set_deferred('size', size_vector)
+	size = size_vector
 	$TextureRect.size = size_vector
 	$TextureRect.texture = ResourceLoader.load(ingredient_resource.image)
 	if on_board:

diff --git a/godot/singletons/State.gd b/godot/singletons/State.gd
@@ -16,7 +16,14 @@ func _init(health: int = 5, max_health: int = 100) -> void:
   player_stats = Stats.new()
   player_stats.current_health = max_health
   player_stats.max_health = max_health
-  player_deck = [load("res://ingredients/resources/godot_single.tres"),load("res://ingredients/resources/t_block.tres")]
+  player_deck = [
+    load("res://ingredients/resources/godot_single.tres"),
+    load("res://ingredients/resources/godot_single.tres"),
+    load("res://ingredients/resources/godot_single.tres"),
+    load("res://ingredients/resources/l_block.tres"),
+    load("res://ingredients/resources/l_block.tres"),
+    load("res://ingredients/resources/l_block.tres"),
+    ]
   map_data = null
   total_nodes_passed = 0
   current_map_node = 0

diff --git a/godot/ui/components/ingredient_card/ingredient_card.gd b/godot/ui/components/ingredient_card/ingredient_card.gd
@@ -2,7 +2,7 @@ class_name IngredientCard
 extends Button
 
 @onready var name_label: Label = %NameLabel
-@onready var block_container: CenterContainer = %BlockContainer
+@onready var block_container: Control = %BlockContainer
 @onready var ability_label: Label = %AbilityLabel
 
 @export var ingredient_block_scene: PackedScene

diff --git a/godot/ui/components/ingredient_card/ingredient_card.tscn b/godot/ui/components/ingredient_card/ingredient_card.tscn
@@ -27,14 +27,19 @@ layout_mode = 2
 text = "Godot"
 horizontal_alignment = 1
 
-[node name="BlockContainer" type="CenterContainer" parent="VBoxContainer"]
-unique_name_in_owner = true
+[node name="BlockContainer2" type="CenterContainer" parent="VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3
 
+[node name="BlockContainer" type="Control" parent="VBoxContainer/BlockContainer2"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(96, 96)
+layout_mode = 2
+
 [node name="AbilityLabel" type="Label" parent="VBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 6
 horizontal_alignment = 1
 vertical_alignment = 1
+autowrap_mode = 2
diff --git a/godot/ui/theme.tres b/godot/ui/theme.tres