Adjust Shop For Heal Button

Remove health label to use PlayerPuppet in the scene
Adjust Shop UI because the heal button was too big for the container
Adjust Translation to specify cost and heal amount
Fixed issue where removing note didn't update money label

Author: LifeHckr

Globals/Translations/Translations.csv

@@ -34,7 +34,7 @@ SHOP_REMOVAL,Remove A Note,移除音符
 SHOP_CONFIRM,Confirm Purchase,购买已确认
 SHOP_CANCEL,Cancel,取消操作
 REMOVAL_COST,Removal Fee,删除费用
-SHOP_HEAL, Heal, 愈合
+SHOP_HEAL,Heal 25%: 30g,愈合 25%: 30硬币
 BATTLE_ROOM_BEGIN_BUTTON,Begin Battle [Enter],开始战斗 [Enter]
 BATTLE_ROOM_PERFECT,Perfect,Perfect
 BATTLE_ROOM_GOOD,Good,良好

Scenes/ShopScene/Scripts/ShopScene.cs

@@ -11,9 +11,6 @@ public partial class ShopScene : Control
     [Export]
     private Label _moneyLabel;
 
-    [Export]
-    private Label _currentHealthLabel;
-
     [Export]
     private Button _exitButton;
 
@@ -56,15 +53,19 @@ public partial class ShopScene : Control
     [Export]
     private Label _removalCostLabel;
 
+    [Export]
+    private PlayerPuppet _player;
+
     private ButtonGroup _bGroup;
 
     private readonly int[] _priceByRarity = [100, 90, 80, 70, 60, 50, 9];
     const int NoteCost = 45;
 
     private List<ShopItem> _shopItems = new List<ShopItem>();
 
-    public override void _Ready()
+    public override void _EnterTree()
     {
+        BgAudioPlayer.LiveInstance.ResumeLevelMusic();
         _bGroup = new ButtonGroup();
         Initialize();
         _confirmationButton.Pressed += TryPurchase;
@@ -75,18 +76,12 @@ public override void _Ready()
         _healButton.Pressed += TryHeal;
     }
 
-    public override void _EnterTree()
-    {
-        BgAudioPlayer.LiveInstance.ResumeLevelMusic();
-    }
-
     private void Initialize()
     {
         UpdateMoneyLabel();
-        UpdateCurrentHealthLabel();
         GenerateShopItems();
         PopulatePossessedNotes();
-        HealButtonStatus();
+        UpdateHealButton();
     }
 
     public override void _Input(InputEvent @event)
@@ -115,12 +110,6 @@ private void UpdateMoneyLabel()
         _moneyLabel.Text = StageProducer.PlayerStats.Money.ToString();
     }
 
-    private void UpdateCurrentHealthLabel()
-    {
-        _currentHealthLabel.Text =
-            $"{StageProducer.PlayerStats.CurrentHealth}/{StageProducer.PlayerStats.MaxHealth}";
-    }
-
     private const int RelicOptions = 3;
     private const int NoteOptions = 5;
 
@@ -224,6 +213,7 @@ private void TryPurchase()
         _currentUItem = null;
 
         RefreshShopPrices();
+        UpdateHealButton();
     }
 
     private Control _lastFocused;
@@ -336,45 +326,37 @@ private void RemoveNote()
         StageProducer.PlayerStats.RemoveNote(_toRemove);
         _selectedRemoveButton.QueueFree();
         CloseRemovalPane();
+        UpdateMoneyLabel();
+        UpdateHealButton();
     }
 
-    private bool _hasHealed = false;
+    private bool _hasHealed;
     private const int HealCost = 30;
     private int _healAmount = (StageProducer.PlayerStats.MaxHealth / 4);
 
-    private void HealButtonStatus()
+    private void UpdateHealButton()
     {
-        if (
+        _healButton.Disabled =
             StageProducer.PlayerStats.Money <= HealCost
             || StageProducer.PlayerStats.CurrentHealth == StageProducer.PlayerStats.MaxHealth
-            || _hasHealed
-        )
-        {
-            _healButton.Disabled = true;
-        }
+            || _hasHealed;
     }
 
     private void TryHeal()
     {
-        if (_hasHealed)
+        if (
+            StageProducer.PlayerStats.Money <= HealCost
+            || StageProducer.PlayerStats.CurrentHealth == StageProducer.PlayerStats.MaxHealth
+            || _hasHealed
+        )
         {
             return;
         }
-        HealPlayer();
-    }
-
-    private void HealPlayer()
-    {
-        StageProducer.PlayerStats.CurrentHealth += _healAmount;
-        if (StageProducer.PlayerStats.CurrentHealth > StageProducer.PlayerStats.MaxHealth)
-        {
-            StageProducer.PlayerStats.CurrentHealth = StageProducer.PlayerStats.MaxHealth;
-        }
 
-        StageProducer.PlayerStats.Money -= 30;
-        UpdateCurrentHealthLabel();
+        StageProducer.PlayerStats.Money -= HealCost;
         UpdateMoneyLabel();
+        UpdateHealButton();
         _hasHealed = true;
-        HealButtonStatus();
+        _player.Heal(_healAmount);
     }
 }

Scenes/ShopScene/ShopScene.tscn

@@ -55,6 +55,7 @@ offset_bottom = 180.0
 texture = ExtResource("2_dt33i")
 script = ExtResource("3_n34g6")
 
-[node name="ShopUI" parent="." instance=ExtResource("8_2xatg")]
+[node name="ShopUI" parent="." node_paths=PackedStringArray("_player") instance=ExtResource("8_2xatg")]
 offset_right = 640.0
 offset_bottom = 360.0
+_player = NodePath("../PlayerMarker/PlayerPuppet")

Scenes/ShopScene/ShopUI.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=3 uid="uid://bk0js6ji42xrt"]
+[gd_scene load_steps=8 format=3 uid="uid://bk0js6ji42xrt"]
 
 [ext_resource type="Texture2D" uid="uid://djd6iw2g84bba" path="res://Scenes/UI/Assets/UI_CenterFrame.png" id="1_67his"]
 [ext_resource type="Script" uid="uid://dg0xaieus84ns" path="res://Scenes/ShopScene/Scripts/ShopScene.cs" id="1_bmt43"]
@@ -7,9 +7,8 @@
 [ext_resource type="Theme" uid="uid://d37e3tpsbxwak" path="res://Scenes/UI/Assets/GeneralTheme.tres" id="4_3vktw"]
 [ext_resource type="Script" uid="uid://cahjluc6v7ked" path="res://Scenes/UI/TitleScreen/Scripts/SceneChange.cs" id="5_w0f8r"]
 [ext_resource type="Texture2D" uid="uid://dyt1cvag13aik" path="res://SharedAssets/Money.png" id="6_tf865"]
-[ext_resource type="Texture2D" uid="uid://dtaf4wcsur721" path="res://SharedAssets/Heart.png" id="8_r34tc"]
 
-[node name="ShopUI" type="Control" node_paths=PackedStringArray("_moneyLabel", "_currentHealthLabel", "_exitButton", "_removalButton", "_healButton", "_noteGrid", "_relicGrid", "_confirmationPopup", "_confirmationButton", "_denyButton", "_descriptionLabel", "_removalPanel", "_possessionGrid", "_removalAcceptButton", "_cancelRemoveButton", "_removalCostLabel")]
+[node name="ShopUI" type="Control" node_paths=PackedStringArray("_moneyLabel", "_exitButton", "_removalButton", "_healButton", "_noteGrid", "_relicGrid", "_confirmationPopup", "_confirmationButton", "_denyButton", "_descriptionLabel", "_removalPanel", "_possessionGrid", "_removalAcceptButton", "_cancelRemoveButton", "_removalCostLabel")]
 z_index = 2
 layout_mode = 3
 anchors_preset = 15
@@ -19,10 +18,9 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_bmt43")
 _moneyLabel = NodePath("MoneyContainer/MoneyFrame/MarginContainer/HBoxContainer/MoneyLabel")
-_currentHealthLabel = NodePath("HealthContainer/HealthFrame/MarginContainer/HBoxContainer/CurrentHealthLabel")
-_exitButton = NodePath("BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer/Continue")
-_removalButton = NodePath("BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer/Removal")
-_healButton = NodePath("BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer/Heal")
+_exitButton = NodePath("OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer/Continue")
+_removalButton = NodePath("OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer/Removal")
+_healButton = NodePath("OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer/Heal")
 _noteGrid = NodePath("TopPanel/MarginContainer/VBoxContainer/NoteSelection/MarginContainer/NotesBox/CenterContainer/NotesGrid")
 _relicGrid = NodePath("TopPanel/MarginContainer/VBoxContainer/RelicSelection/MarginContainer/RelicsBox/CenterContainer/RelicsGrid")
 _confirmationPopup = NodePath("ConfirmPurchase")
@@ -37,7 +35,7 @@ _removalCostLabel = NodePath("Removal/Panel/MarginContainer/VBoxContainer/Option
 
 [node name="TopPanel" type="NinePatchRect" parent="."]
 layout_mode = 0
-offset_right = 508.0
+offset_right = 463.0
 offset_bottom = 211.0
 texture = ExtResource("1_67his")
 patch_margin_left = 12
@@ -140,7 +138,7 @@ columns = 6
 [node name="BottomPanel" type="NinePatchRect" parent="."]
 layout_mode = 0
 offset_top = 211.0
-offset_right = 640.0
+offset_right = 463.0
 offset_bottom = 360.0
 texture = ExtResource("1_67his")
 patch_margin_left = 12
@@ -149,10 +147,12 @@ patch_margin_right = 12
 patch_margin_bottom = 12
 
 [node name="DescBox" type="MarginContainer" parent="BottomPanel"]
-layout_mode = 2
-offset_right = 640.0
-offset_bottom = 149.0
-grow_vertical = 0
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 size_flags_vertical = 3
 size_flags_stretch_ratio = 0.4
 theme_override_constants/margin_left = 10
@@ -213,9 +213,18 @@ autowrap_mode = 2
 clip_text = true
 text_overrun_behavior = 1
 
-[node name="OptionsBG" type="NinePatchRect" parent="BottomPanel/DescBox/HBoxContainer"]
+[node name="OptionsBG" type="NinePatchRect" parent="."]
 self_modulate = Color(1, 1, 1, 0.75)
-layout_mode = 2
+layout_mode = 1
+anchors_preset = 3
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -176.0
+offset_top = -179.0
+grow_horizontal = 0
+grow_vertical = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 size_flags_stretch_ratio = 0.39
@@ -225,7 +234,7 @@ patch_margin_top = 6
 patch_margin_right = 6
 patch_margin_bottom = 7
 
-[node name="OptionsMargin" type="MarginContainer" parent="BottomPanel/DescBox/HBoxContainer/OptionsBG"]
+[node name="OptionsMargin" type="MarginContainer" parent="OptionsBG"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -238,44 +247,44 @@ theme_override_constants/margin_top = 4
 theme_override_constants/margin_right = 4
 theme_override_constants/margin_bottom = 4
 
-[node name="OptionsBG" type="NinePatchRect" parent="BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin"]
+[node name="OptionsBG" type="NinePatchRect" parent="OptionsBG/OptionsMargin"]
 layout_mode = 2
 texture = ExtResource("3_r34tc")
 patch_margin_left = 7
 patch_margin_top = 7
 patch_margin_right = 7
 patch_margin_bottom = 7
 
-[node name="MarginContainer" type="MarginContainer" parent="BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin/OptionsBG"]
+[node name="MarginContainer" type="MarginContainer" parent="OptionsBG/OptionsMargin/OptionsBG"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_constants/margin_left = 7
-theme_override_constants/margin_top = 7
+theme_override_constants/margin_top = 0
 theme_override_constants/margin_right = 7
 
-[node name="VBoxContainer" type="VBoxContainer" parent="BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin/OptionsBG/MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="OptionsBG/OptionsMargin/OptionsBG/MarginContainer"]
 layout_mode = 2
 alignment = 1
 
-[node name="Removal" type="Button" parent="BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer"]
+[node name="Removal" type="Button" parent="OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
 theme = ExtResource("4_3vktw")
 text = "SHOP_REMOVAL"
 
-[node name="Heal" type="Button" parent="BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer"]
+[node name="Heal" type="Button" parent="OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
 theme = ExtResource("4_3vktw")
 text = "SHOP_HEAL"
 
-[node name="Continue" type="Button" parent="BottomPanel/DescBox/HBoxContainer/OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer"]
+[node name="Continue" type="Button" parent="OptionsBG/OptionsMargin/OptionsBG/MarginContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
@@ -337,59 +346,6 @@ horizontal_alignment = 2
 vertical_alignment = 1
 clip_text = true
 
-[node name="HealthContainer" type="MarginContainer" parent="."]
-layout_mode = 1
-anchors_preset = 1
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -125.0
-offset_top = 24.0
-offset_bottom = 53.0
-grow_horizontal = 0
-theme_override_constants/margin_left = -1
-theme_override_constants/margin_top = 5
-theme_override_constants/margin_right = 5
-theme_override_constants/margin_bottom = 0
-
-[node name="HealthFrame" type="NinePatchRect" parent="HealthContainer"]
-layout_mode = 2
-texture = ExtResource("2_bmt43")
-patch_margin_left = 7
-patch_margin_top = 7
-patch_margin_right = 7
-patch_margin_bottom = 7
-
-[node name="MarginContainer" type="MarginContainer" parent="HealthContainer/HealthFrame"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_constants/margin_right = 8
-
-[node name="HBoxContainer" type="HBoxContainer" parent="HealthContainer/HealthFrame/MarginContainer"]
-layout_mode = 2
-
-[node name="MarginContainer" type="MarginContainer" parent="HealthContainer/HealthFrame/MarginContainer/HBoxContainer"]
-layout_mode = 2
-theme_override_constants/margin_left = 6
-
-[node name="TextureRect" type="TextureRect" parent="HealthContainer/HealthFrame/MarginContainer/HBoxContainer/MarginContainer"]
-layout_mode = 2
-size_flags_vertical = 4
-texture = ExtResource("8_r34tc")
-
-[node name="CurrentHealthLabel" type="Label" parent="HealthContainer/HealthFrame/MarginContainer/HBoxContainer"]
-custom_minimum_size = Vector2(91, 0)
-layout_mode = 2
-size_flags_horizontal = 10
-size_flags_vertical = 1
-text = "0"
-horizontal_alignment = 2
-vertical_alignment = 1
-clip_text = true
-
 [node name="ConfirmPurchase" type="CenterContainer" parent="."]
 visible = false
 z_index = 3