From 0a7950e17a01b63f136c61a3f7c472b5eb121b7c Mon Sep 17 00:00:00 2001 From: Rendo Date: Sat, 12 Jul 2025 07:05:36 +0500 Subject: [PATCH] Almanach :+1: --- assets/sprites/field.png | Bin 0 -> 8256 bytes assets/sprites/field.png.import | 34 +++++++++++++++ resources/plants/Aloe.tres | 15 +------ scenes/entities/Zombies/bucket_zombie.tscn | 18 -------- scenes/entities/Zombies/cone_zombie.tscn | 12 ------ scenes/entities/Zombies/hobo.tscn | 42 ++++++++----------- scenes/gui/almanach.tscn | 22 ++++++---- scenes/gui/choose_your_seeds.tscn | 3 +- scripts/gui/choose_your_seeds/Previewport.cs | 7 ++-- 9 files changed, 74 insertions(+), 79 deletions(-) create mode 100644 assets/sprites/field.png create mode 100644 assets/sprites/field.png.import diff --git a/assets/sprites/field.png b/assets/sprites/field.png new file mode 100644 index 0000000000000000000000000000000000000000..83a8e0bd5d8ddb9ecfa0a815ea15b8fcb0ca977a GIT binary patch literal 8256 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 P2{>YEWMNo=x)t$1St`q2 literal 0 HcmV?d00001 diff --git a/assets/sprites/field.png.import b/assets/sprites/field.png.import new file mode 100644 index 0000000..9245ce8 --- /dev/null +++ b/assets/sprites/field.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ksxucobpgv7n" +path="res://.godot/imported/field.png-8fc12d6ddb4478900fc9b327337caa43.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/field.png" +dest_files=["res://.godot/imported/field.png-8fc12d6ddb4478900fc9b327337caa43.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/plants/Aloe.tres b/resources/plants/Aloe.tres index 55f342e..08652d7 100644 --- a/resources/plants/Aloe.tres +++ b/resources/plants/Aloe.tres @@ -1,20 +1,8 @@ -[gd_resource type="Resource" script_class="PlantResource" load_steps=9 format=3 uid="uid://bf7vjtufjc8kt"] +[gd_resource type="Resource" script_class="PlantResource" load_steps=4 format=3 uid="uid://bf7vjtufjc8kt"] [ext_resource type="Texture2D" uid="uid://d4btl7vqi4v0q" path="res://assets/sprites/plants/aloe.tres" id="1_t4137"] [ext_resource type="Script" uid="uid://cyenlko1knygw" path="res://scripts/resources/PlantResource.cs" id="1_vw2kg"] [ext_resource type="PackedScene" uid="uid://bw1w8jp0yeypy" path="res://scenes/entities/plants/aloe.tscn" id="2_6a4ia"] -[ext_resource type="Texture2D" uid="uid://c35dr3hiy66k0" path="res://assets/sprites/gui/ChooseYourSeeds/PremiumFrameField.tres" id="3_2s3af"] -[ext_resource type="Texture2D" uid="uid://31jc2e7dijas" path="res://assets/sprites/gui/PremiumPlantCard.tres" id="3_vfv8g"] -[ext_resource type="Script" uid="uid://3m7xks3xq3hl" path="res://scripts/gui/seedpackets/CustomSeedpacketFrame.cs" id="4_d5nqg"] - -[sub_resource type="LabelSettings" id="LabelSettings_2s3af"] - -[sub_resource type="Resource" id="Resource_5me4i"] -script = ExtResource("4_d5nqg") -frame = ExtResource("3_vfv8g") -font = SubResource("LabelSettings_2s3af") -almanachField = ExtResource("3_2s3af") -metadata/_custom_type_script = "uid://3m7xks3xq3hl" [resource] script = ExtResource("1_vw2kg") @@ -25,5 +13,4 @@ Scene = ExtResource("2_6a4ia") ReloadTime = 15.0 ReloadProgress = 0.0 Preview = ExtResource("1_t4137") -customFrame = SubResource("Resource_5me4i") Layer = 1 diff --git a/scenes/entities/Zombies/bucket_zombie.tscn b/scenes/entities/Zombies/bucket_zombie.tscn index 2974f19..753de64 100644 --- a/scenes/entities/Zombies/bucket_zombie.tscn +++ b/scenes/entities/Zombies/bucket_zombie.tscn @@ -65,7 +65,6 @@ scale = Vector2(0.999835, 0.999835) [node name="LeftUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="2"] use_parent_material = false -scale = Vector2(0.999834, 0.999834) [node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"] scale = Vector2(0.999834, 0.999834) @@ -75,7 +74,6 @@ scale = Vector2(0.999831, 0.999831) [node name="Body" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="3"] use_parent_material = false -scale = Vector2(0.999829, 0.999829) [node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] use_parent_material = false @@ -93,21 +91,9 @@ skew = -0.000141144 [node name="Head" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="3"] scale = Vector2(0.999827, 0.999827) -[node name="Right_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="0"] -position = Vector2(-16, -8) -scale = Vector2(1, 1) - -[node name="Left_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="1"] -position = Vector2(-4, -9) -scale = Vector2(1, 1) - [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] position = Vector2(-3.001, 2.9983) rotation = 0.00791286 -scale = Vector2(0.999827, 0.999827) - -[node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="1"] -scale = Vector2(0.999827, 0.999827) [node name="Hat" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="4"] position = Vector2(-6, -8) @@ -117,16 +103,12 @@ position = Vector2(0.994479, -10.0058) texture = ExtResource("3_0nlp0") degradationStages = Array[Texture]([ExtResource("3_0nlp0"), ExtResource("4_xx7fu"), ExtResource("5_v1iwd")]) -[node name="LeftUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="4"] -scale = Vector2(0.999829, 0.999829) - [node name="Left_Lower_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" index="0"] rotation = 0.0766625 scale = Vector2(1, 1) [node name="Left_Hand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm" index="0"] show_behind_parent = false -position = Vector2(-0.99983, 12.9978) rotation = -0.0338341 scale = Vector2(0.999658, 0.999658) diff --git a/scenes/entities/Zombies/cone_zombie.tscn b/scenes/entities/Zombies/cone_zombie.tscn index 44b1ead..605f830 100644 --- a/scenes/entities/Zombies/cone_zombie.tscn +++ b/scenes/entities/Zombies/cone_zombie.tscn @@ -67,9 +67,6 @@ scale = Vector2(0.999825, 0.999825) [node name="RightLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="1"] scale = Vector2(0.999825, 0.999825) -[node name="RightHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" index="0"] -scale = Vector2(0.999829, 0.999829) - [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="2"] rotation = -0.109484 skew = -9.78708e-05 @@ -77,14 +74,6 @@ skew = -9.78708e-05 [node name="Head" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="3"] scale = Vector2(0.999829, 0.999829) -[node name="Right_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="0"] -position = Vector2(-16, -8) -scale = Vector2(1, 1) - -[node name="Left_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="1"] -position = Vector2(-4, -9) -scale = Vector2(1, 1) - [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] position = Vector2(-2.73308, 2.35578) rotation = -0.0509399 @@ -128,7 +117,6 @@ rotation = -0.0477755 scale = Vector2(0.999998, 0.999998) [node name="Left_Hand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm" index="0"] -position = Vector2(-0.99983, 12.9978) rotation = -0.135402 scale = Vector2(0.999661, 0.999661) diff --git a/scenes/entities/Zombies/hobo.tscn b/scenes/entities/Zombies/hobo.tscn index 283cf4c..5b74f13 100644 --- a/scenes/entities/Zombies/hobo.tscn +++ b/scenes/entities/Zombies/hobo.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=62 format=3 uid="uid://bgqmwsb6ynm81"] +[gd_scene load_steps=61 format=3 uid="uid://bgqmwsb6ynm81"] [ext_resource type="PackedScene" uid="uid://co11v3w8hbwgf" path="res://scenes/entities/Zombies/zombie.tscn" id="1_fnu7s"] [ext_resource type="Shader" uid="uid://d0eo5uuj222c4" path="res://assets/shaders/CG_color_blender.gdshader" id="2_6qr4h"] -[ext_resource type="Script" uid="uid://bcc7skl7ts6sh" path="res://scripts/systems/effects/Effect.cs" id="2_b583s"] [ext_resource type="Resource" uid="uid://dsg1vjx76ifgu" path="res://resources/effects/GarlicEffect.tres" id="3_b583s"] [ext_resource type="Script" uid="uid://dt5uj25u0g6y3" path="res://scripts/particles/FallParticle.cs" id="3_tu6af"] [ext_resource type="Script" uid="uid://c5v2og85t7s6j" path="res://scripts/zombies/behaviours/HoboBehaviour.cs" id="4_5selg"] @@ -755,7 +754,7 @@ mult_value = 1.0 [node name="Hobo" node_paths=PackedStringArray("_armor") instance=ExtResource("1_fnu7s")] _armor = NodePath("CanArmor") MaxHP = 130.0 -_effectImmunities = Array[ExtResource("2_b583s")]([ExtResource("3_b583s")]) +_effectImmunities = [ExtResource("3_b583s")] [node name="CanvasGroup" parent="." index="0"] material = SubResource("ShaderMaterial_w8pya") @@ -767,16 +766,16 @@ scale = Vector2(0.999902, 0.999902) texture = SubResource("AtlasTexture_txjqc") [node name="RightUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="1"] -scale = Vector2(0.999826, 0.999826) +scale = Vector2(0.999827, 0.999827) [node name="Right_Upper_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" index="0"] texture = SubResource("AtlasTexture_b583s") [node name="RightLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" index="1"] -scale = Vector2(0.999831, 0.999831) +scale = Vector2(0.99983, 0.99983) [node name="RightFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" index="0"] -scale = Vector2(0.999824, 0.999824) +scale = Vector2(0.999826, 0.999826) [node name="Right_Foot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg/RightFoot" index="0"] texture = SubResource("AtlasTexture_uoit3") @@ -785,34 +784,34 @@ texture = SubResource("AtlasTexture_uoit3") texture = SubResource("AtlasTexture_vn3j1") [node name="LeftUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="2"] -scale = Vector2(0.999825, 0.999825) +scale = Vector2(0.99983, 0.99983) [node name="Left_Upper_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="0"] texture = SubResource("AtlasTexture_yb81c") [node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"] -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.999828, 0.999828) [node name="Left_Lower_Leg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="0"] texture = SubResource("AtlasTexture_nlwsb") [node name="LeftFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="1"] -scale = Vector2(0.999818, 0.999818) +scale = Vector2(0.999819, 0.999819) [node name="Left_Foot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg/LeftFoot" index="0"] texture = SubResource("AtlasTexture_8y6c0") [node name="Body" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="3"] -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.999827, 0.999827) [node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.999828, 0.999828) [node name="Right_Upper_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="0"] texture = SubResource("AtlasTexture_nc6p3") [node name="RightLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="1"] -scale = Vector2(0.999817, 0.999817) +scale = Vector2(0.999813, 0.999813) [node name="RightHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" index="0"] scale = Vector2(0.999828, 0.999828) @@ -827,7 +826,8 @@ texture = SubResource("AtlasTexture_op0h6") texture = SubResource("AtlasTexture_0s5wm") [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="2"] -rotation = 0.0277344 +position = Vector2(-9, -21) +rotation = 0.0584823 scale = Vector2(1e-05, 1e-05) [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Tie" index="0"] @@ -869,23 +869,18 @@ scale = Vector2(0.999827, 0.999827) texture = SubResource("AtlasTexture_pjhfy") [node name="Right_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="0"] -position = Vector2(-16, -8) -scale = Vector2(1, 1) - -[node name="Left_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="1"] -position = Vector2(-4, -9.00001) -scale = Vector2(1, 1) +position = Vector2(-16, -7.99999) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] position = Vector2(-3, 3) -rotation = -0.0451082 +rotation = -0.0951176 scale = Vector2(0.999827, 0.999827) texture = SubResource("AtlasTexture_7cvmi") offset = Vector2(-14, -2) [node name="Trashcan_lid" type="Sprite2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="3"] z_index = -1 -position = Vector2(-0.00229692, -17.0131) +position = Vector2(-0.00229764, -17.0131) scale = Vector2(0.999828, 0.999828) texture = SubResource("AtlasTexture_n380g") offset = Vector2(-0.5, -0.5) @@ -913,7 +908,7 @@ scale = Vector2(0.999827, 0.999827) texture = SubResource("AtlasTexture_tebih") [node name="Left_Lower_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" index="0"] -rotation = 0.0250187 +rotation = 0.0527558 scale = Vector2(0.999999, 0.999999) texture = SubResource("AtlasTexture_auxav") @@ -923,7 +918,7 @@ scale = Vector2(0.999652, 0.999652) texture = SubResource("AtlasTexture_dntsa") [node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"] -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.99983, 0.99983) [node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"] scale = Vector2(0.999822, 0.999822) @@ -944,7 +939,6 @@ advance_expression_base_node = NodePath("../Behaviour") [node name="Mover" parent="." index="4"] _speed = SubResource("Resource_4248q") -_speedControlMult = 0.0 [node name="HitPlayer" parent="." index="6"] playlist = Array[AudioStream]([ExtResource("8_4248q"), ExtResource("9_tu6af")]) diff --git a/scenes/gui/almanach.tscn b/scenes/gui/almanach.tscn index fac81f3..83d1d50 100644 --- a/scenes/gui/almanach.tscn +++ b/scenes/gui/almanach.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://bvpt0q4j6nx18"] +[gd_scene load_steps=11 format=3 uid="uid://bvpt0q4j6nx18"] [ext_resource type="Texture2D" uid="uid://dr8a0rx42o3qy" path="res://assets/sprites/gui/ChooseYourSeeds/PlantFrame.tres" id="1_1hnxi"] [ext_resource type="Script" uid="uid://bs1qywtqijyd2" path="res://scenes/gui/almanach.gd" id="1_oy57w"] @@ -6,6 +6,7 @@ [ext_resource type="Script" uid="uid://covbig00p22di" path="res://scripts/gui/choose_your_seeds/Previewport.cs" id="2_ru62c"] [ext_resource type="Texture2D" uid="uid://dycdvvgmgmfu6" path="res://assets/sprites/gui/ChooseYourSeeds/FrameField.tres" id="3_oy57w"] [ext_resource type="Script" uid="uid://c36bj8u7jghc7" path="res://scripts/audio/ChannelPlayer.cs" id="6_7vo1l"] +[ext_resource type="Texture2D" uid="uid://ksxucobpgv7n" path="res://assets/sprites/field.png" id="6_vvhxq"] [ext_resource type="AudioStream" uid="uid://bdx83fokp6kha" path="res://assets/audio/sfx/buttonclick.mp3" id="7_vvhxq"] [sub_resource type="ViewportTexture" id="ViewportTexture_ru62c"] @@ -21,10 +22,11 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 tab_alignment = 1 -current_tab = 0 +current_tab = 1 script = ExtResource("1_oy57w") [node name="plants" type="HBoxContainer" parent="."] +visible = false layout_mode = 2 metadata/_tab_index = 0 @@ -54,12 +56,13 @@ size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("1_1hnxi") -[node name="Previewport" type="SubViewport" parent="plants/Infobox/FrameAndTitle/VboxContainer/Frame" node_paths=PackedStringArray("title", "description")] +[node name="Previewport" type="SubViewport" parent="plants/Infobox/FrameAndTitle/VboxContainer/Frame" node_paths=PackedStringArray("title", "description", "_frameField")] canvas_item_default_texture_filter = 0 size = Vector2i(65, 65) script = ExtResource("2_ru62c") title = NodePath("../../../Label") description = NodePath("../../../../Description/ScrollContainer/RichTextLabel") +_frameField = NodePath("FrameField") [node name="FrameField" type="Sprite2D" parent="plants/Infobox/FrameAndTitle/VboxContainer/Frame/Previewport"] texture = ExtResource("3_oy57w") @@ -106,7 +109,6 @@ theme_override_colors/font_selected_color = Color(0, 0, 0, 1) bbcode_enabled = true [node name="zombies" type="HBoxContainer" parent="."] -visible = false layout_mode = 2 metadata/_tab_index = 1 @@ -137,15 +139,21 @@ size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("1_1hnxi") -[node name="Previewport" type="SubViewport" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame" node_paths=PackedStringArray("title", "description")] +[node name="Previewport" type="SubViewport" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame" node_paths=PackedStringArray("title", "description", "_frameField")] canvas_item_default_texture_filter = 0 size = Vector2i(130, 130) script = ExtResource("2_ru62c") title = NodePath("../../../Label") description = NodePath("../../../../Description/ScrollContainer/RichTextLabel") +_frameField = NodePath("CanvasLayer/Field") -[node name="FrameField" type="Sprite2D" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame/Previewport"] -texture = ExtResource("3_oy57w") +[node name="CanvasLayer" type="CanvasLayer" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame/Previewport"] +layer = -10 +follow_viewport_enabled = true + +[node name="Field" type="Sprite2D" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame/Previewport/CanvasLayer"] +position = Vector2(0, 30) +texture = ExtResource("6_vvhxq") [node name="Camera2D" type="Camera2D" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame/Previewport"] position = Vector2(0, -45) diff --git a/scenes/gui/choose_your_seeds.tscn b/scenes/gui/choose_your_seeds.tscn index 58e95d8..dac1715 100644 --- a/scenes/gui/choose_your_seeds.tscn +++ b/scenes/gui/choose_your_seeds.tscn @@ -175,12 +175,13 @@ layout_mode = 2 layout_mode = 2 texture = ExtResource("2_so2bw") -[node name="Previewport" type="SubViewport" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/Frame" node_paths=PackedStringArray("title", "description")] +[node name="Previewport" type="SubViewport" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/Frame" node_paths=PackedStringArray("title", "description", "_frameField")] canvas_item_default_texture_filter = 0 size = Vector2i(65, 65) script = ExtResource("3_fmc0y") title = NodePath("../../PanelContainer/ScrollContainer/VBoxContainer/Title") description = NodePath("../../PanelContainer/ScrollContainer/VBoxContainer/Description") +_frameField = NodePath("FrameField") [node name="FrameField" type="Sprite2D" parent="Panel/MarginContainer/VBoxContainer/HBoxContainer/Frame/Previewport"] texture = ExtResource("3_rn5vx") diff --git a/scripts/gui/choose_your_seeds/Previewport.cs b/scripts/gui/choose_your_seeds/Previewport.cs index 71a1709..b153a49 100644 --- a/scripts/gui/choose_your_seeds/Previewport.cs +++ b/scripts/gui/choose_your_seeds/Previewport.cs @@ -11,11 +11,12 @@ public partial class Previewport : SubViewport [Export] private Label title; [Export] private RichTextLabel description; + [Export] private Sprite2D _frameField; public override void _Ready() { GetParent().GetViewport().GuiFocusChanged += OnFocusChanged; - start_Field = GetNode("FrameField").Texture; + start_Field = _frameField.Texture; } public void OnFocusChanged(Control node) @@ -36,10 +37,10 @@ public partial class Previewport : SubViewport } if (resource.customFrame != null && resource.customFrame.almanachField != null) { - GetNode("FrameField").Texture = resource.customFrame.almanachField; + _frameField.Texture = resource.customFrame.almanachField; } else - GetNode("FrameField").Texture = start_Field; + _frameField.Texture = start_Field; current_display = resource.Scene.Instantiate(); title.Text = Tr(resource.name_key); description.Text = Tr(resource.description_key);