diff --git a/client/enemy/slime/Slime.tscn b/client/enemy/slime/Slime.tscn index 3ea54c3..985873c 100644 --- a/client/enemy/slime/Slime.tscn +++ b/client/enemy/slime/Slime.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=14 format=3 uid="uid://cb2t7bvvf3gwh"] -[ext_resource type="PackedScene" uid="uid://b358op5h1y83m" path="res://assets/slime/Slime.blend" id="1_1h1hj"] +[ext_resource type="PackedScene" uid="uid://b358op5h1y83m" path="res://assets/enemies/slime/Slime.blend" id="1_1h1hj"] [ext_resource type="Script" path="res://enemy/Enemy.gd" id="1_r5888"] [ext_resource type="PackedScene" uid="uid://2bbycjulf00g" path="res://player/health/HealthComponent.tscn" id="2_fsqxc"] [ext_resource type="PackedScene" uid="uid://x102pryt2s5a" path="res://player/movement/MovementComponent.tscn" id="3_2phqx"] diff --git a/client/item/soul/Soul.tscn b/client/item/soul/Soul.tscn index b987fc4..946bdb8 100644 --- a/client/item/soul/Soul.tscn +++ b/client/item/soul/Soul.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=14 format=3 uid="uid://dl4vcp04t8iyr"] [ext_resource type="Texture2D" uid="uid://cdoxs0s8xh1b3" path="res://particle/FadeOut.tres" id="1_dd0n2"] -[ext_resource type="Texture2D" uid="uid://c3wx3cgn8x62m" path="res://assets/particles/particles-single.png" id="1_hhudy"] +[ext_resource type="Texture2D" uid="uid://c3wx3cgn8x62m" path="res://assets/effects/particles/particles-single.png" id="1_hhudy"] [ext_resource type="Script" path="res://item/soul/Soul.gd" id="1_mm7cb"] [ext_resource type="Texture2D" uid="uid://cfkwtmj6tc3wa" path="res://item/soul/color_ramp.tres" id="3_ibw0j"] [ext_resource type="AudioStream" uid="uid://l6d76tn8ys5n" path="res://assets/audio/effects/Games-Video-Event-Collect-Item.wav" id="5_cxtbb"] diff --git a/client/player/Player.tscn b/client/player/Player.tscn index 7eb1efc..d83fb89 100644 --- a/client/player/Player.tscn +++ b/client/player/Player.tscn @@ -1,22 +1,22 @@ [gd_scene load_steps=33 format=3 uid="uid://2lcnu3dy54lx"] [ext_resource type="Script" path="res://player/Player.gd" id="1_8gebs"] -[ext_resource type="PackedScene" uid="uid://c8j7t4yg7anb0" path="res://assets/female/Female.blend" id="2_8nah6"] +[ext_resource type="PackedScene" uid="uid://c8j7t4yg7anb0" path="res://assets/character/female/Female.blend" id="2_8nah6"] [ext_resource type="PackedScene" uid="uid://2bbycjulf00g" path="res://player/health/HealthComponent.tscn" id="2_np5ag"] [ext_resource type="Resource" uid="uid://yaq8ui3f6fwa" path="res://skill/slash/slash.tres" id="2_x58e1"] [ext_resource type="Resource" uid="uid://ba1filjaldakv" path="res://skill/spin/spin.tres" id="3_l76ly"] -[ext_resource type="PackedScene" uid="uid://cgqbkj8wbcatv" path="res://assets/hair/PonyTail.blend" id="3_umw6q"] -[ext_resource type="Skin" uid="uid://bbqyiue1vj37f" path="res://assets/hoodie/Hoodie_Skin.tres" id="4_b1tg1"] -[ext_resource type="ArrayMesh" uid="uid://dbmluwi2atit" path="res://assets/hoodie/Hoodie_Mesh.res" id="5_mkrgn"] +[ext_resource type="PackedScene" uid="uid://cgqbkj8wbcatv" path="res://assets/character/hairstyles/ponytail/PonyTail.blend" id="3_umw6q"] +[ext_resource type="Skin" uid="uid://bbqyiue1vj37f" path="res://assets/character/clothes/hoodie/Hoodie_Skin.tres" id="4_b1tg1"] +[ext_resource type="ArrayMesh" uid="uid://dbmluwi2atit" path="res://assets/character/clothes/hoodie/Hoodie_Mesh.res" id="5_mkrgn"] [ext_resource type="Resource" uid="uid://cnusbw23jf672" path="res://skill/dash/dash.tres" id="5_pnues"] [ext_resource type="PackedScene" uid="uid://6jpnl6c4fdvo" path="res://player/hud/HUDComponent.tscn" id="7_fwgtd"] -[ext_resource type="PackedScene" uid="uid://qecdmrg6mbws" path="res://assets/swords/heirloom/Heirloom.blend" id="7_u8433"] +[ext_resource type="PackedScene" uid="uid://qecdmrg6mbws" path="res://assets/weapons/swords/heirloom/Heirloom.blend" id="7_u8433"] [ext_resource type="PackedScene" uid="uid://x102pryt2s5a" path="res://player/movement/MovementComponent.tscn" id="8_25qd0"] [ext_resource type="PackedScene" uid="uid://urt8b7grv0qq" path="res://player/chat/ChatComponent.tscn" id="8_pmnom"] [ext_resource type="PackedScene" uid="uid://clnfp813k7lep" path="res://player/footsteps/FootstepsComponent.tscn" id="8_xklbo"] [ext_resource type="PackedScene" uid="uid://d0onbq0ad1ap4" path="res://player/rotation/RotationComponent.tscn" id="9_agxqu"] [ext_resource type="PackedScene" uid="uid://bivxnxwi863o0" path="res://player/animation/AnimationComponent.tscn" id="10_bcaeg"] -[ext_resource type="AnimationLibrary" uid="uid://d4n0puibh4hyt" path="res://assets/animations/human.blend" id="11_d0e6r"] +[ext_resource type="AnimationLibrary" uid="uid://d4n0puibh4hyt" path="res://assets/character/animations/human.blend" id="11_d0e6r"] [ext_resource type="AudioStream" uid="uid://dlqcgg8v3lvhm" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-00.wav" id="12_h5nrh"] [ext_resource type="AudioStream" uid="uid://bcn7rvvayhnib" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-02.wav" id="14_6dv65"] [ext_resource type="PackedScene" uid="uid://b8xf4ltqyorjv" path="res://player/skills/SkillsComponent.tscn" id="14_6idcf"] diff --git a/client/world/grass/Grass.tscn b/client/world/grass/Grass.tscn index 191dbf2..620e2fa 100644 --- a/client/world/grass/Grass.tscn +++ b/client/world/grass/Grass.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://hvc8oecqweko"] [ext_resource type="Material" uid="uid://bdsblfaxbipaa" path="res://world/grass/GrassMaterial.tres" id="1_xchh7"] -[ext_resource type="MultiMesh" uid="uid://dog5aq5n2q025" path="res://assets/grass/grass.multimesh" id="2_cpr6g"] +[ext_resource type="MultiMesh" uid="uid://dog5aq5n2q025" path="res://assets/world/grass/grass.multimesh" id="2_cpr6g"] [node name="Grass" type="MultiMeshInstance3D"] layers = 2 diff --git a/client/world/house/House.tscn b/client/world/house/House.tscn index db723ee..6433bd2 100644 --- a/client/world/house/House.tscn +++ b/client/world/house/House.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://djilgnhedvmtm"] -[ext_resource type="PackedScene" uid="uid://b0w38xjifulq6" path="res://assets/house/House.blend" id="1_0ihm4"] +[ext_resource type="PackedScene" uid="uid://b0w38xjifulq6" path="res://assets/world/house/House.blend" id="1_0ihm4"] [sub_resource type="BoxShape3D" id="BoxShape3D_egbsr"] size = Vector3(5, 3.5, 5) diff --git a/client/world/trees/Callistemon.tscn b/client/world/trees/Callistemon.tscn index eff63c6..c2dddaa 100644 --- a/client/world/trees/Callistemon.tscn +++ b/client/world/trees/Callistemon.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://tr0tn0pkr1ea"] -[ext_resource type="PackedScene" uid="uid://8rgrrx6wbdvf" path="res://assets/tree/Callistemon.blend" id="1_ngx2x"] +[ext_resource type="PackedScene" uid="uid://8rgrrx6wbdvf" path="res://assets/world/tree/Callistemon.blend" id="1_ngx2x"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_6f3jh"] height = 1.5 diff --git a/client/world/trees/Sapling.tscn b/client/world/trees/Sapling.tscn index 49a5974..3fd0aab 100644 --- a/client/world/trees/Sapling.tscn +++ b/client/world/trees/Sapling.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://cuuwwdce1u8n8"] -[ext_resource type="PackedScene" uid="uid://ctsrv1aeqj0h" path="res://assets/tree/Sapling.blend" id="1_lb0yq"] +[ext_resource type="PackedScene" uid="uid://ctsrv1aeqj0h" path="res://assets/world/tree/Sapling.blend" id="1_lb0yq"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_qu7ax"] height = 1.5