diff --git a/assets/card_base/batu.png b/assets/card_base/batu.png index 7899aa9..8d1dc40 100644 --- a/assets/card_base/batu.png +++ b/assets/card_base/batu.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3ebc26aaf3c87de9ce48e9a4f9e22db8944b9c304f9dbda9cf21c3636f013e9 -size 24379 +oid sha256:3073496f2b5cb651d0d6d03351a6f8392a23924d01472ab5d175ef150667e17e +size 25869 diff --git a/assets/card_base/gunting.png b/assets/card_base/gunting.png index 553ae4d..c069201 100644 --- a/assets/card_base/gunting.png +++ b/assets/card_base/gunting.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5679d2d3e778ec2d3142eaf0f5603b3a144e87f7f26e1e2d78974462db69f75 -size 33308 +oid sha256:4d14202c9b5043bdf561e8b9e6e899b0d964eed347f5d7fdb71cb5f6286a1561 +size 24283 diff --git a/assets/card_base/kertas.png b/assets/card_base/kertas.png index 6507ea0..c49b7e1 100644 --- a/assets/card_base/kertas.png +++ b/assets/card_base/kertas.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aa28478cb7241ff59fe191f1aca345eccd60d8a9cb8f9c1058874b3fc0606ff -size 17766 +oid sha256:52a0024d95f80cda1eea5a8dcdf7cd9f2204f73409ce8ae4999f75dfd402f3a3 +size 20378 diff --git a/ui/card_template/monster_card.gd b/ui/card_template/monster_card.gd index 4e72542..8c1ca87 100644 --- a/ui/card_template/monster_card.gd +++ b/ui/card_template/monster_card.gd @@ -21,7 +21,7 @@ func show_monster(monster: MatchMonster): return name_label.text = monster.card.id - health_label.text = "HP %d" % [monster.health] + health_label.text = "HP %d/%d" % [monster.health, monster.card.base_health] icon_texture_rect.texture = monster.card.icon paper_damage.text = str(monster.card.paper) diff --git a/ui/card_template/monster_card.tscn b/ui/card_template/monster_card.tscn index 04522b1..d373404 100644 --- a/ui/card_template/monster_card.tscn +++ b/ui/card_template/monster_card.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=15 format=3 uid="uid://bhrelvt51cbp2"] +[gd_scene load_steps=14 format=3 uid="uid://bhrelvt51cbp2"] -[ext_resource type="Texture2D" uid="uid://cqladcrximh6" path="res://assets/card_base/Screenshot 2025-01-25 211435.png" id="1_nvo50"] [ext_resource type="Script" path="res://ui/card_template/monster_card.gd" id="1_xddej"] [ext_resource type="Texture2D" uid="uid://l2nxxhh0pvh8" path="res://assets/card_base/Frame.png" id="2_lhxdu"] [ext_resource type="Texture2D" uid="uid://crgrple0uik7x" path="res://assets/card_base/Stroke.png" id="4_kkcc6"] @@ -33,15 +32,9 @@ name_label = NodePath("MarginContainer/MonsterNameLabel") health_label = NodePath("MarginContainer/HealthLabel") energy_pip_container = NodePath("MarginContainer/EnergyStarsContainer") icon_texture_rect = NodePath("MarginContainer/TextureRect2/IconTextureRect") -paper_damage = NodePath("MarginContainer/Paper/PaperDamage") -scissors_damage = NodePath("MarginContainer/Scissors/ScissorsDamage") -rock_damage = NodePath("MarginContainer/Rock/RockDamage") - -[node name="Screenshot2025-01-25211435" type="Sprite2D" parent="."] -visible = false -position = Vector2(355, 157) -scale = Vector2(0.625, 0.625) -texture = ExtResource("1_nvo50") +paper_damage = NodePath("MarginContainer/HBoxContainer/Rock2/PaperLabel") +scissors_damage = NodePath("MarginContainer/HBoxContainer/Rock3/ScissorsLabel") +rock_damage = NodePath("MarginContainer/HBoxContainer/Rock/RockLabel") [node name="Frame" type="TextureRect" parent="."] layout_mode = 1 @@ -121,12 +114,13 @@ stretch_mode = 5 [node name="EnergyStarsContainer" type="HBoxContainer" parent="MarginContainer"] unique_name_in_owner = true layout_mode = 0 -offset_left = 141.0 -offset_top = 55.0 -offset_right = 200.0 -offset_bottom = 70.0 +offset_left = 100.0 +offset_top = 54.0 +offset_right = 197.0 +offset_bottom = 69.0 +alignment = 2 -[node name="TextureRect3" type="TextureRect" parent="MarginContainer/EnergyStarsContainer"] +[node name="TextureRect" type="TextureRect" parent="MarginContainer/EnergyStarsContainer"] layout_mode = 2 texture = ExtResource("8_ophhb") expand_mode = 3 @@ -138,7 +132,19 @@ texture = ExtResource("8_ophhb") expand_mode = 3 stretch_mode = 5 -[node name="TextureRect" type="TextureRect" parent="MarginContainer/EnergyStarsContainer"] +[node name="TextureRect3" type="TextureRect" parent="MarginContainer/EnergyStarsContainer"] +layout_mode = 2 +texture = ExtResource("8_ophhb") +expand_mode = 3 +stretch_mode = 5 + +[node name="TextureRect4" type="TextureRect" parent="MarginContainer/EnergyStarsContainer"] +layout_mode = 2 +texture = ExtResource("8_ophhb") +expand_mode = 3 +stretch_mode = 5 + +[node name="TextureRect5" type="TextureRect" parent="MarginContainer/EnergyStarsContainer"] layout_mode = 2 texture = ExtResource("8_ophhb") expand_mode = 3 @@ -156,7 +162,7 @@ offset_bottom = 80.0 grow_horizontal = 2 theme = ExtResource("9_6x2vq") theme_override_font_sizes/font_size = 16 -text = "HP 80" +text = "HP 80/100" vertical_alignment = 1 [node name="MonsterNameLabel" type="Label" parent="MarginContainer"] @@ -185,6 +191,7 @@ expand_mode = 1 stretch_mode = 5 [node name="Label" type="Label" parent="MarginContainer/CardNumber"] +visible = false layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -205,77 +212,110 @@ text = "#01" horizontal_alignment = 1 vertical_alignment = 1 -[node name="Paper" type="TextureRect" parent="MarginContainer"] -layout_mode = 0 -offset_left = 109.0 -offset_top = 183.0 -offset_right = 222.0 -offset_bottom = 356.0 -texture = ExtResource("14_gm7k7") -expand_mode = 1 -stretch_mode = 5 - -[node name="PaperDamage" type="Label" parent="MarginContainer/Paper"] -unique_name_in_owner = true +[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"] layout_mode = 1 -anchors_preset = 10 -anchor_right = 1.0 -offset_left = 48.0 -offset_top = 32.0 -offset_right = -32.0 -offset_bottom = 73.0 +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +offset_left = -100.0 +offset_top = -102.143 +offset_right = 100.0 +offset_bottom = -7.1427 +grow_horizontal = 2 +grow_vertical = 0 +alignment = 1 + +[node name="Rock" type="Control" parent="MarginContainer/HBoxContainer"] +custom_minimum_size = Vector2(64, 0) +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="RockLabel" type="Label" parent="MarginContainer/HBoxContainer/Rock"] +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -32.0 +offset_right = 32.0 +offset_bottom = 26.0 grow_horizontal = 2 theme = ExtResource("9_6x2vq") -theme_override_font_sizes/font_size = 20 -text = "10" -vertical_alignment = 1 +theme_override_font_sizes/font_size = 24 +text = "100" +horizontal_alignment = 1 +vertical_alignment = 2 -[node name="Scissors" type="TextureRect" parent="MarginContainer"] -layout_mode = 0 -offset_left = 43.0 -offset_top = 182.0 -offset_right = 156.0 -offset_bottom = 355.0 -texture = ExtResource("13_ifoc6") -expand_mode = 1 -stretch_mode = 5 - -[node name="ScissorsDamage" type="Label" parent="MarginContainer/Scissors"] -unique_name_in_owner = true -layout_mode = 1 -anchors_preset = 10 +[node name="Rock" type="TextureRect" parent="MarginContainer/HBoxContainer/Rock"] +layout_mode = 2 anchor_right = 1.0 -offset_left = 48.0 -offset_top = 32.0 -offset_right = -32.0 -offset_bottom = 73.0 +anchor_bottom = 1.0 +offset_top = 30.0 grow_horizontal = 2 -theme = ExtResource("9_6x2vq") -theme_override_font_sizes/font_size = 20 -text = "10" -vertical_alignment = 1 - -[node name="Rock" type="TextureRect" parent="MarginContainer"] -layout_mode = 0 -offset_left = -23.0 -offset_top = 181.0 -offset_right = 90.0 -offset_bottom = 354.0 +grow_vertical = 2 texture = ExtResource("12_a4kkh") expand_mode = 1 stretch_mode = 5 -[node name="RockDamage" type="Label" parent="MarginContainer/Rock"] -unique_name_in_owner = true +[node name="Rock2" type="Control" parent="MarginContainer/HBoxContainer"] +custom_minimum_size = Vector2(64, 0) +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="PaperLabel" type="Label" parent="MarginContainer/HBoxContainer/Rock2"] layout_mode = 1 -anchors_preset = 10 -anchor_right = 1.0 -offset_left = 48.0 -offset_top = 32.0 -offset_right = -32.0 -offset_bottom = 73.0 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -32.0 +offset_right = 32.0 +offset_bottom = 26.0 grow_horizontal = 2 theme = ExtResource("9_6x2vq") -theme_override_font_sizes/font_size = 20 +theme_override_font_sizes/font_size = 24 text = "10" -vertical_alignment = 1 +horizontal_alignment = 1 +vertical_alignment = 2 + +[node name="Paper" type="TextureRect" parent="MarginContainer/HBoxContainer/Rock2"] +layout_mode = 2 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = 30.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("14_gm7k7") +expand_mode = 1 +stretch_mode = 5 + +[node name="Rock3" type="Control" parent="MarginContainer/HBoxContainer"] +custom_minimum_size = Vector2(64, 0) +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="ScissorsLabel" type="Label" parent="MarginContainer/HBoxContainer/Rock3"] +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -32.0 +offset_right = 32.0 +offset_bottom = 26.0 +grow_horizontal = 2 +theme = ExtResource("9_6x2vq") +theme_override_font_sizes/font_size = 24 +text = "10" +horizontal_alignment = 1 +vertical_alignment = 2 + +[node name="Scissors" type="TextureRect" parent="MarginContainer/HBoxContainer/Rock3"] +layout_mode = 2 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = 30.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("13_ifoc6") +expand_mode = 1 +stretch_mode = 5