From 1a3323bda369f0f6c837da61087afdfc4dd76dd0 Mon Sep 17 00:00:00 2001 From: Peter Kish Date: Sun, 5 Mar 2023 10:48:24 +0100 Subject: [PATCH] Updating the scene files with Godot 4.0 --- addons/gloot/editor/choice_filter.tscn | 1 + addons/gloot/editor/choice_filter_test.tscn | 4 ++-- examples/inventory_grid_ex_transfer.tscn | 12 ++++++------ examples/inventory_grid_transfer.tscn | 2 +- examples/inventory_stacked_transfer.tscn | 10 +++++----- examples/inventory_transfer.tscn | 2 +- tests/ctrl_tests/test_ctrl_inventory.tscn | 2 +- tests/ctrl_tests/test_ctrl_inventory_grid.tscn | 3 ++- tests/ctrl_tests/test_ctrl_inventory_grid_ex.tscn | 3 +-- tests/ctrl_tests/test_ctrl_inventory_stacked.tscn | 2 +- tests/ctrl_tests/test_ctrl_item_slot.tscn | 5 ++++- tests/gloot_test.tscn | 2 +- 12 files changed, 26 insertions(+), 22 deletions(-) diff --git a/addons/gloot/editor/choice_filter.tscn b/addons/gloot/editor/choice_filter.tscn index c99d9981..fd08d6d8 100644 --- a/addons/gloot/editor/choice_filter.tscn +++ b/addons/gloot/editor/choice_filter.tscn @@ -21,6 +21,7 @@ text = "Filter:" [node name="LineEdit" type="LineEdit" parent="HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 +clear_button_enabled = true [node name="ItemList" type="ItemList" parent="."] layout_mode = 2 diff --git a/addons/gloot/editor/choice_filter_test.tscn b/addons/gloot/editor/choice_filter_test.tscn index 88c519a1..7cac3c7d 100644 --- a/addons/gloot/editor/choice_filter_test.tscn +++ b/addons/gloot/editor/choice_filter_test.tscn @@ -15,7 +15,7 @@ layout_mode = 0 anchors_preset = 0 anchor_right = 0.0 anchor_bottom = 0.0 -grow_horizontal = 2 -grow_vertical = 2 +offset_right = 217.0 +offset_bottom = 267.0 pick_text = "Pick" values = Array[String](["foo", "bar", "baz"]) diff --git a/examples/inventory_grid_ex_transfer.tscn b/examples/inventory_grid_ex_transfer.tscn index 47e5811f..b07bf693 100644 --- a/examples/inventory_grid_ex_transfer.tscn +++ b/examples/inventory_grid_ex_transfer.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=19 format=3 uid="uid://dkfn8qojbtud4"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_grid.tres" id="1"] +[ext_resource type="Resource" uid="uid://ddrmqwl3guset" path="res://tests/data/item_definitions_grid.tres" id="1"] [ext_resource type="Script" path="res://addons/gloot/inventory_grid.gd" id="2"] [ext_resource type="Script" path="res://addons/gloot/ctrl_inventory_grid_ex.gd" id="3"] [ext_resource type="Script" path="res://examples/inventory_grid_transfer.gd" id="4"] @@ -152,18 +152,18 @@ script = ExtResource("2") size = Vector2(5, 5) item_protoset = ExtResource("1") -[node name="L_item_2x2" type="Node" parent="InventoryGridLeft"] +[node name="L_item_2x2_2" type="Node" parent="InventoryGridLeft"] script = ExtResource("8") protoset = ExtResource("1") prototype_id = "item_2x2" -properties = { -"grid_position": Vector2(0, 2) -} -[node name="L_item_2x2_2" type="Node" parent="InventoryGridLeft"] +[node name="item_2x2" type="Node" parent="InventoryGridLeft"] script = ExtResource("8") protoset = ExtResource("1") prototype_id = "item_2x2" +properties = { +"grid_position": Vector2(0, 2) +} [node name="InventoryGridRight" type="Node" parent="."] script = ExtResource("2") diff --git a/examples/inventory_grid_transfer.tscn b/examples/inventory_grid_transfer.tscn index e90b1f09..c57575b1 100644 --- a/examples/inventory_grid_transfer.tscn +++ b/examples/inventory_grid_transfer.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://jopigw4xplp4"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_grid.tres" id="1"] +[ext_resource type="Resource" uid="uid://ddrmqwl3guset" path="res://tests/data/item_definitions_grid.tres" id="1"] [ext_resource type="Script" path="res://addons/gloot/inventory_grid.gd" id="2"] [ext_resource type="Script" path="res://addons/gloot/ctrl_inventory_grid.gd" id="3"] [ext_resource type="Script" path="res://examples/inventory_grid_transfer.gd" id="4"] diff --git a/examples/inventory_stacked_transfer.tscn b/examples/inventory_stacked_transfer.tscn index cb3951e6..034d839e 100644 --- a/examples/inventory_stacked_transfer.tscn +++ b/examples/inventory_stacked_transfer.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://addons/gloot/ctrl_inventory_stacked.gd" id="1"] [ext_resource type="Script" path="res://addons/gloot/inventory_stacked.gd" id="2"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_stack.tres" id="3"] +[ext_resource type="Resource" uid="uid://c1fip2r65xx12" path="res://tests/data/item_definitions_stack.tres" id="3"] [ext_resource type="Script" path="res://examples/inventory_stacked_transfer.gd" id="4"] [ext_resource type="Texture2D" uid="uid://bju6hohmp15ua" path="res://images/item_key.png" id="5"] [ext_resource type="Script" path="res://addons/gloot/ctrl_item_slot.gd" id="6"] @@ -107,8 +107,8 @@ protoset = ExtResource("3") prototype_id = "stackable_item" [node name="limited_stackable_item" type="Node" parent="InventoryStackedLeft"] -script = ExtResource( 8 ) -protoset = ExtResource( 3 ) +script = ExtResource("8") +protoset = ExtResource("3") prototype_id = "limited_stackable_item" properties = { "stack_size": 3.0 @@ -135,8 +135,8 @@ protoset = ExtResource("3") prototype_id = "stackable_item" [node name="limited_stackable_item" type="Node" parent="InventoryStackedRight"] -script = ExtResource( 8 ) -protoset = ExtResource( 3 ) +script = ExtResource("8") +protoset = ExtResource("3") prototype_id = "limited_stackable_item" properties = { "stack_size": 4.0 diff --git a/examples/inventory_transfer.tscn b/examples/inventory_transfer.tscn index 11c5df59..d49889c7 100644 --- a/examples/inventory_transfer.tscn +++ b/examples/inventory_transfer.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://addons/gloot/ctrl_inventory.gd" id="1"] [ext_resource type="Script" path="res://addons/gloot/inventory.gd" id="2"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_basic.tres" id="3"] +[ext_resource type="Resource" uid="uid://nnxjxxu47mtj" path="res://tests/data/item_definitions_basic.tres" id="3"] [ext_resource type="Script" path="res://examples/inventory_transfer.gd" id="4"] [ext_resource type="Texture2D" uid="uid://bju6hohmp15ua" path="res://images/item_key.png" id="5"] [ext_resource type="Script" path="res://addons/gloot/ctrl_item_slot.gd" id="6"] diff --git a/tests/ctrl_tests/test_ctrl_inventory.tscn b/tests/ctrl_tests/test_ctrl_inventory.tscn index 3771d6ad..1b34a71d 100644 --- a/tests/ctrl_tests/test_ctrl_inventory.tscn +++ b/tests/ctrl_tests/test_ctrl_inventory.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://dnmcyf6p4gtgp"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_basic.tres" id="1"] +[ext_resource type="Resource" uid="uid://nnxjxxu47mtj" path="res://tests/data/item_definitions_basic.tres" id="1"] [ext_resource type="Script" path="res://addons/gloot/inventory.gd" id="2"] [ext_resource type="Script" path="res://addons/gloot/ctrl_inventory.gd" id="3"] [ext_resource type="Texture2D" uid="uid://bju6hohmp15ua" path="res://images/item_key.png" id="4"] diff --git a/tests/ctrl_tests/test_ctrl_inventory_grid.tscn b/tests/ctrl_tests/test_ctrl_inventory_grid.tscn index c2060bdf..9e17ba9b 100644 --- a/tests/ctrl_tests/test_ctrl_inventory_grid.tscn +++ b/tests/ctrl_tests/test_ctrl_inventory_grid.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=3 uid="uid://i33jyh87gocu"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_grid.tres" id="1"] +[ext_resource type="Resource" uid="uid://ddrmqwl3guset" path="res://tests/data/item_definitions_grid.tres" id="1"] [ext_resource type="Script" path="res://addons/gloot/ctrl_inventory_grid.gd" id="2"] [ext_resource type="Script" path="res://addons/gloot/inventory_grid.gd" id="3"] [ext_resource type="Texture2D" uid="uid://b2hkcwwq10cut" path="res://icon.png" id="4"] @@ -15,6 +15,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="CtrlInventoryGrid" type="Container" parent="."] +custom_minimum_size = Vector2(160, 160) layout_mode = 0 offset_right = 160.0 offset_bottom = 160.0 diff --git a/tests/ctrl_tests/test_ctrl_inventory_grid_ex.tscn b/tests/ctrl_tests/test_ctrl_inventory_grid_ex.tscn index a3fe72db..f86d76d0 100644 --- a/tests/ctrl_tests/test_ctrl_inventory_grid_ex.tscn +++ b/tests/ctrl_tests/test_ctrl_inventory_grid_ex.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=13 format=3 uid="uid://c6qdqm1i436gg"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_grid.tres" id="1"] +[ext_resource type="Resource" uid="uid://ddrmqwl3guset" path="res://tests/data/item_definitions_grid.tres" id="1"] [ext_resource type="Script" path="res://addons/gloot/ctrl_inventory_grid_ex.gd" id="2"] [ext_resource type="Script" path="res://addons/gloot/inventory_grid.gd" id="3"] [ext_resource type="Texture2D" uid="uid://b2hkcwwq10cut" path="res://icon.png" id="4"] @@ -62,7 +62,6 @@ item_protoset = ExtResource("1") script = ExtResource("5") protoset = ExtResource("1") prototype_id = "item_2x2" -properties = {} [node name="item_1x1" type="Node" parent="InventoryGrid"] script = ExtResource("5") diff --git a/tests/ctrl_tests/test_ctrl_inventory_stacked.tscn b/tests/ctrl_tests/test_ctrl_inventory_stacked.tscn index 283afc28..cb021a12 100644 --- a/tests/ctrl_tests/test_ctrl_inventory_stacked.tscn +++ b/tests/ctrl_tests/test_ctrl_inventory_stacked.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://addons/gloot/inventory_stacked.gd" id="1"] [ext_resource type="Script" path="res://addons/gloot/ctrl_inventory_stacked.gd" id="2"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_stack.tres" id="3"] +[ext_resource type="Resource" uid="uid://c1fip2r65xx12" path="res://tests/data/item_definitions_stack.tres" id="3"] [ext_resource type="Texture2D" uid="uid://bju6hohmp15ua" path="res://images/item_key.png" id="4"] [ext_resource type="Script" path="res://addons/gloot/inventory_item.gd" id="5"] diff --git a/tests/ctrl_tests/test_ctrl_item_slot.tscn b/tests/ctrl_tests/test_ctrl_item_slot.tscn index 290bcf56..ae563789 100644 --- a/tests/ctrl_tests/test_ctrl_item_slot.tscn +++ b/tests/ctrl_tests/test_ctrl_item_slot.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://cfad61445qg3a"] -[ext_resource type="Resource" path="res://tests/data/item_definitions_basic.tres" id="1"] +[ext_resource type="Resource" uid="uid://nnxjxxu47mtj" path="res://tests/data/item_definitions_basic.tres" id="1"] [ext_resource type="Script" path="res://addons/gloot/inventory.gd" id="2"] [ext_resource type="Script" path="res://addons/gloot/ctrl_item_slot.gd" id="3"] [ext_resource type="Script" path="res://addons/gloot/item_slot.gd" id="4"] @@ -12,8 +12,11 @@ layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="CtrlItemSlot" type="HBoxContainer" parent="."] +layout_mode = 0 offset_right = 4.0 offset_bottom = 14.0 script = ExtResource("3") diff --git a/tests/gloot_test.tscn b/tests/gloot_test.tscn index bd288abc..5ca16020 100644 --- a/tests/gloot_test.tscn +++ b/tests/gloot_test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=8 format=3 uid="uid://6ij3qlnr0qr3"] [ext_resource type="Script" path="res://tests/item_definitions_test.gd" id="2"] [ext_resource type="Script" path="res://tests/inventory_stacked_tests.gd" id="3"]