From 7c03964d335f83b959024a9a486d6953806fd5ef Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Sun, 17 Aug 2025 22:41:45 +0200 Subject: [PATCH] changed watering can display to slider --- prefabs/characters/Player2D.tscn | 86 +++++------------------ scripts/CSharp/Common/UI/WateringCanUi.cs | 8 +-- 2 files changed, 20 insertions(+), 74 deletions(-) diff --git a/prefabs/characters/Player2D.tscn b/prefabs/characters/Player2D.tscn index a6732a2..9bf133c 100644 --- a/prefabs/characters/Player2D.tscn +++ b/prefabs/characters/Player2D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=482 format=3 uid="uid://c25udixd5m6l0"] +[gd_scene load_steps=475 format=3 uid="uid://c25udixd5m6l0"] [ext_resource type="Script" uid="uid://b05uyj001ehwi" path="res://scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs" id="1_yd5ep"] [ext_resource type="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/PlayerMovement.cs" id="2_1vqmv"] @@ -273,12 +273,7 @@ [ext_resource type="Texture2D" uid="uid://b37lpqrsjjuc0" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0010.png" id="466_pw1ip"] [ext_resource type="Script" uid="uid://er03dkj8axlr" path="res://scripts/CSharp/Common/UI/WateringCanUi.cs" id="467_j4m0f"] [ext_resource type="Texture2D" uid="uid://oi11ax6tml6j" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0012.png" id="468_08021"] -[ext_resource type="Texture2D" uid="uid://l0k3vh3kdprp" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-1.png" id="468_f6xmn"] -[ext_resource type="Texture2D" uid="uid://t4w7axbof7bq" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-2.png" id="469_nxglm"] -[ext_resource type="Texture2D" uid="uid://di2npqkvvst6x" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-3.png" id="470_8fyd7"] [ext_resource type="Texture2D" uid="uid://dsjj23763pej5" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0014.png" id="470_bmmei"] -[ext_resource type="Texture2D" uid="uid://clti3basli30" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-4.png" id="471_dnm27"] -[ext_resource type="Texture2D" uid="uid://n1v4hgd467wp" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-5.png" id="472_e04c3"] [ext_resource type="Texture2D" uid="uid://blh0t2ofqj2uq" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0016.png" id="472_wdxsr"] [ext_resource type="Texture2D" uid="uid://l5ym7gi82l1b" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-6.png" id="473_g32y8"] [ext_resource type="Texture2D" uid="uid://3t1m2xi4ks75" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0018.png" id="474_tu801"] @@ -472,8 +467,6 @@ [ext_resource type="Texture2D" uid="uid://ds2y033vahyi5" path="res://art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0016.png" id="810_224qh"] [ext_resource type="Texture2D" uid="uid://b0v61all3tsny" path="res://art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0018.png" id="812_sf8kv"] [ext_resource type="Texture2D" uid="uid://cao7vqax8cblo" path="res://art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0020.png" id="814_3uq4g"] -[ext_resource type="Texture2D" uid="uid://3pj2q7wtuion" path="res://art/farm/farming/farmobjekte/hoe.png" id="815_1ia2b"] -[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="816_1a3c1"] [ext_resource type="Script" uid="uid://bcskt5ckh3rqa" path="res://scripts/CSharp/Common/Farming/FarmingControls2D.cs" id="817_6nrw3"] [ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field.tscn" id="818_16w6h"] [ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"] @@ -2112,72 +2105,27 @@ frame = 7 frame_progress = 0.229832 offset = Vector2(0, -450) -[node name="Hoe" type="Sprite2D" parent="CharacterBody2D/visuals"] -visible = false -position = Vector2(-35, -596) -rotation = 0.74351 -scale = Vector2(0.24, 0.24) -texture = ExtResource("815_1ia2b") -region_enabled = true -region_rect = Rect2(980, 179, 374, 1233) - -[node name="WateringCanEmpty" type="Sprite2D" parent="CharacterBody2D/visuals"] -visible = false -position = Vector2(-38, -603) -scale = Vector2(0.5, 0.5) -texture = ExtResource("816_1a3c1") -region_enabled = true -region_rect = Rect2(-1, 1128, 417, 299) - -[node name="WateringCanFull" type="Sprite2D" parent="CharacterBody2D/visuals"] -visible = false -modulate = Color(0.286, 0.16, 1, 1) -position = Vector2(-38, -603) -scale = Vector2(0.5, 0.5) -texture = ExtResource("816_1a3c1") -region_enabled = true -region_rect = Rect2(-1, 1128, 417, 299) - -[node name="WateringCanUI" type="Node2D" parent="CharacterBody2D" node_paths=PackedStringArray("_stages")] +[node name="WateringCanUI" type="Node2D" parent="CharacterBody2D" node_paths=PackedStringArray("_slider")] position = Vector2(0, -929) scale = Vector2(2, 2) script = ExtResource("467_j4m0f") -_stages = [NodePath("6"), NodePath("5"), NodePath("4"), NodePath("3"), NodePath("2"), NodePath("1")] - -[node name="1" type="Sprite2D" parent="CharacterBody2D/WateringCanUI"] -visible = false -position = Vector2(1, 0) -scale = Vector2(1.8, 1.8) -texture = ExtResource("468_f6xmn") +_slider = NodePath("HSlider") -[node name="2" type="Sprite2D" parent="CharacterBody2D/WateringCanUI"] +[node name="HSlider" type="HSlider" parent="CharacterBody2D/WateringCanUI"] visible = false -position = Vector2(2, 2) -scale = Vector2(1.6, 1.6) -texture = ExtResource("469_nxglm") - -[node name="3" type="Sprite2D" parent="CharacterBody2D/WateringCanUI"] -visible = false -position = Vector2(3, 5) -scale = Vector2(1.4, 1.4) -texture = ExtResource("470_8fyd7") - -[node name="4" type="Sprite2D" parent="CharacterBody2D/WateringCanUI"] -visible = false -position = Vector2(3, 7) -scale = Vector2(1.2, 1.2) -texture = ExtResource("471_dnm27") - -[node name="5" type="Sprite2D" parent="CharacterBody2D/WateringCanUI"] -visible = false -position = Vector2(2, 7) -scale = Vector2(1.1, 1.1) -texture = ExtResource("472_e04c3") - -[node name="6" type="Sprite2D" parent="CharacterBody2D/WateringCanUI"] -visible = false -position = Vector2(3, 12) -texture = ExtResource("473_g32y8") +modulate = Color(0.3515, 0.780425, 0.95, 1) +custom_minimum_size = Vector2(150, 50) +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -43.0 +offset_right = 57.0 +offset_bottom = 64.0 +grow_horizontal = 2 +max_value = 1.0 +step = 0.0 +editable = false +scrollable = false [node name="FarmingControls" type="Node2D" parent="." node_paths=PackedStringArray("_movingPlayer", "_wateringParticles")] script = ExtResource("817_6nrw3") diff --git a/scripts/CSharp/Common/UI/WateringCanUi.cs b/scripts/CSharp/Common/UI/WateringCanUi.cs index ae62695..122df0c 100644 --- a/scripts/CSharp/Common/UI/WateringCanUi.cs +++ b/scripts/CSharp/Common/UI/WateringCanUi.cs @@ -5,7 +5,7 @@ namespace Babushka.scripts.CSharp.Common.UI; public partial class WateringCanUi : Node2D { - [Export] private Sprite2D[] _stages; + [Export] private Slider _slider; private const int WATERING_CAN_ID = 1; @@ -35,10 +35,8 @@ public partial class WateringCanUi : Node2D private void UpdateSprites() { - for (int i = 0; i < _stages.Length; i++) - { - _stages[i].Visible = WateringCanState.Active && i < WateringCanState.GetFillState(); - } + _slider.Visible = WateringCanState.Active; + _slider.Value = (float)WateringCanState.GetFillState() / WateringCanState.MAX_FILLSTATE; } } \ No newline at end of file