Restructured game.

Game.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=44 format=3 uid="uid://bugqatylloxkl"]
+[gd_scene load_steps=40 format=3 uid="uid://bugqatylloxkl"]
 
 [ext_resource type="Script" path="res://Player.gd" id="1_3lyis"]
 [ext_resource type="Script" path="res://World.gd" id="1_e417k"]
@@ -7,16 +7,12 @@
 [ext_resource type="PackedScene" uid="uid://dk2wv1vem0ubw" path="res://assets/scene_props/RockA.tscn" id="3_owduk"]
 [ext_resource type="PackedScene" uid="uid://dy8vjf760prhq" path="res://assets/characters/Rogue.tscn" id="4_6mbva"]
 [ext_resource type="Texture2D" uid="uid://cq8ypeagpedq" path="res://assets/kenney/ui-pack-rpg-expansion/PNG/cursorSword_bronze.png" id="4_pcyi0"]
-[ext_resource type="PackedScene" uid="uid://da5r82nvypfk4" path="res://objects/PickupItem.tscn" id="4_ttv16"]
 [ext_resource type="Texture2D" uid="uid://c7fu3paj3b4e8" path="res://assets/kenney/ui-pack-rpg-expansion/PNG/cursorSword_silver.png" id="5_24tqj"]
-[ext_resource type="Resource" uid="uid://bn5j38jbwlj1f" path="res://data/items/stick.tres" id="6_1orlx"]
-[ext_resource type="Resource" uid="uid://c1ll2snhgv3m1" path="res://data/items/treelog.tres" id="6_3vb4g"]
 [ext_resource type="Texture2D" uid="uid://drpl0ql1p3pfk" path="res://assets/kenney/ui-pack-rpg-expansion/PNG/cursorSword_gold.png" id="6_uid86"]
-[ext_resource type="Resource" uid="uid://coser1y1y5unl" path="res://data/items/door.tres" id="6_wnxjh"]
 [ext_resource type="Script" path="res://GameUI.gd" id="7_mw21s"]
-[ext_resource type="MeshLibrary" uid="uid://dcpuitbu16j1a" path="res://assets/mesh_library.tres" id="8_gh3i5"]
 [ext_resource type="Theme" uid="uid://dmk7hc81l8gbw" path="res://ui/ui_theme.tres" id="8_qpuke"]
 [ext_resource type="Texture2D" uid="uid://bq3b1hxl5ojh6" path="res://assets/icons/npc_emotes/attention.tres" id="10_6agi3"]
+[ext_resource type="PackedScene" uid="uid://dmagdl5pi6jdj" path="res://world/level.tscn" id="11_m8tt7"]
 [ext_resource type="Script" path="res://ui/inventory_dialog.gd" id="12_8cl6a"]
 [ext_resource type="PackedScene" uid="uid://dp3fi0g53qrt2" path="res://ui/item_slot.tscn" id="12_v6fpp"]
 [ext_resource type="PackedScene" uid="uid://2q8dhf61a7os" path="res://assets/characters/Engineer.tscn" id="13_gxr54"]
@@ -132,36 +128,6 @@ shape = SubResource("SphereShape3D_wrkyq")
 transform = Transform3D(0.836133, 0.124138, 0.534295, -0.548527, 0.189226, 0.81444, 0, -0.974055, 0.226311, 5.06819, 4.51394, 0)
 shadow_enabled = true
 
-[node name="Entities" type="Node3D" parent="World"]
-
-[node name="Item" parent="World/Entities" instance=ExtResource("4_ttv16")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.55623, 0, 0.612282)
-item = ExtResource("6_1orlx")
-
-[node name="Item4" parent="World/Entities" instance=ExtResource("4_ttv16")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.17514, -2.38419e-07, 0.574962)
-item = ExtResource("6_wnxjh")
-
-[node name="Item2" parent="World/Entities" instance=ExtResource("4_ttv16")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.978853, -2.38419e-07, -1.39068)
-
-[node name="Item3" parent="World/Entities" instance=ExtResource("4_ttv16")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.28455, 0, -0.204204)
-item = ExtResource("6_3vb4g")
-
-[node name="GridMap" type="GridMap" parent="World"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0)
-rotation_order = 1
-mesh_library = ExtResource("8_gh3i5")
-cell_size = Vector3(0.5, 0.5, 0.5)
-cell_center_x = false
-cell_center_y = false
-cell_center_z = false
-data = {
-"cells": PackedInt32Array(0, 0, 14, 3, 0, 14, 6, 0, 14, 0, 65533, 14, 3, 65533, 14, 0, 3, 14, 3, 3, 14, 6, 3, 14, 6, 65533, 14, 9, 65533, 14, 6, 65530, 14, 3, 65530, 14, 0, 65530, 14, 65533, 65530, 14, 65533, 65533, 14, 65533, 0, 14, 65533, 3, 14, 65545, 1, 1441801, 65545, 4, 1441801, 65545, 65530, 1441801, 65543, 65528, 9, 65540, 65528, 9, 65537, 65528, 9, 131070, 65528, 9, 131067, 65529, 1441801, 131067, 65532, 1441801, 131067, 65535, 1441801, 131067, 2, 1441801, 131068, 65528, 9, 65544, 5, 9, 65541, 5, 9, 65538, 5, 9, 131071, 5, 9, 131068, 5, 9, 131067, 3, 1441801)
-}
-metadata/_editor_floor_ = Vector3(0, 1, 0)
-
 [node name="Disabled" type="Node3D" parent="World"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1000, -1000, 0)
 
@@ -228,6 +194,8 @@ dialogue_resource = ExtResource("15_2n7cr")
 [node name="CollisionShape3D" type="CollisionShape3D" parent="World/Merchant/Actionable"]
 shape = SubResource("SphereShape3D_6nrvr")
 
+[node name="Level" parent="World" instance=ExtResource("11_m8tt7")]
+
 [node name="RootUI" type="CanvasLayer" parent="."]
 script = ExtResource("2_gg3gt")
 

world/level.tscn

@@ -0,0 +1,56 @@
+[gd_scene load_steps=11 format=3 uid="uid://dmagdl5pi6jdj"]
+
+[ext_resource type="MeshLibrary" uid="uid://dcpuitbu16j1a" path="res://assets/mesh_library.tres" id="1_q0eym"]
+[ext_resource type="PackedScene" uid="uid://da5r82nvypfk4" path="res://objects/PickupItem.tscn" id="2_qurr0"]
+[ext_resource type="Resource" uid="uid://bn5j38jbwlj1f" path="res://data/items/stick.tres" id="3_q180r"]
+[ext_resource type="PackedScene" uid="uid://dtd7p4wjaumae" path="res://assets/resources/Stick.tscn" id="4_h3618"]
+[ext_resource type="Resource" uid="uid://egkatj1ci0ga" path="res://data/items/wrench.tres" id="5_tmrcc"]
+[ext_resource type="Resource" uid="uid://coser1y1y5unl" path="res://data/items/door.tres" id="5_twsf3"]
+[ext_resource type="PackedScene" uid="uid://ca2l61b2j3y5b" path="res://assets/tools/Pickaxe.tscn" id="6_fq3ct"]
+[ext_resource type="PackedScene" uid="uid://ysfnsrvgemi6" path="res://assets/resources/WoodPlanks.tscn" id="7_2hyvg"]
+[ext_resource type="Resource" uid="uid://c1ll2snhgv3m1" path="res://data/items/treelog.tres" id="8_pafka"]
+[ext_resource type="PackedScene" uid="uid://bbmt7xom1j84b" path="res://assets/resources/TreeLog.tscn" id="9_51v1q"]
+
+[node name="Level" type="Node3D"]
+
+[node name="GridMap" type="GridMap" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0)
+rotation_order = 1
+mesh_library = ExtResource("1_q0eym")
+cell_size = Vector3(0.5, 0.5, 0.5)
+cell_center_x = false
+cell_center_y = false
+cell_center_z = false
+data = {
+"cells": PackedInt32Array(0, 0, 14, 3, 0, 14, 6, 0, 14, 0, 65533, 14, 3, 65533, 14, 0, 3, 14, 3, 3, 14, 6, 3, 14, 6, 65533, 14, 9, 65533, 14, 6, 65530, 14, 3, 65530, 14, 0, 65530, 14, 65533, 65530, 14, 65533, 65533, 14, 65533, 0, 14, 65533, 3, 14, 65545, 1, 1441801, 65545, 4, 1441801, 65545, 65530, 1441801, 65543, 65528, 9, 65540, 65528, 9, 131067, 65529, 1441801, 131067, 65532, 1441801, 131067, 65535, 1441801, 131067, 2, 1441801, 131068, 65528, 9, 65544, 5, 9, 65538, 5, 9, 131071, 5, 9, 131068, 5, 9, 131067, 3, 1441801, 12, 65533, 14, 12, 0, 14, 12, 65530, 14, 15, 65530, 14, 15, 65527, 14, 15, 65524, 14, 18, 65524, 14, 21, 65524, 14, 21, 65527, 14, 21, 65530, 14, 24, 65530, 14, 24, 65533, 14, 27, 65533, 14, 30, 65533, 14, 33, 65533, 14, 33, 65530, 14, 36, 65530, 14, 36, 65533, 14, 36, 65527, 14, 39, 65527, 14, 39, 65530, 14, 39, 65524, 14, 42, 65524, 14, 39, 65533, 14, 42, 65533, 14, 42, 65530, 14)
+}
+metadata/_editor_floor_ = Vector3(0, 1, 0)
+
+[node name="Objects" type="Node3D" parent="."]
+
+[node name="Item" parent="Objects" instance=ExtResource("2_qurr0")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.55623, 0, 0.612282)
+item = ExtResource("3_q180r")
+
+[node name="_Node3D_153923" parent="Objects/Item" instance=ExtResource("4_h3618")]
+
+[node name="Item5" parent="Objects" instance=ExtResource("2_qurr0")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.24544, 0, -2.75085)
+item = ExtResource("5_tmrcc")
+
+[node name="Item4" parent="Objects" instance=ExtResource("2_qurr0")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.17514, -2.38419e-07, 0.574962)
+item = ExtResource("5_twsf3")
+
+[node name="_Node3D_153924" parent="Objects/Item4" instance=ExtResource("6_fq3ct")]
+
+[node name="Item2" parent="Objects" instance=ExtResource("2_qurr0")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.978853, -2.38419e-07, -1.39068)
+
+[node name="_Node3D_153925" parent="Objects/Item2" instance=ExtResource("7_2hyvg")]
+
+[node name="Item3" parent="Objects" instance=ExtResource("2_qurr0")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.28455, 0, -0.204204)
+item = ExtResource("8_pafka")
+
+[node name="_Node3D_153926" parent="Objects/Item3" instance=ExtResource("9_51v1q")]