diff --git a/game/player/Mob.tscn b/game/player/Mob.tscn index c407b76..038069a 100644 --- a/game/player/Mob.tscn +++ b/game/player/Mob.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://ui/nameplates/NamePlate.tscn" type="PackedScene" id=1] -[ext_resource path="res://characters/Character.tscn" type="PackedScene" id=2] +[ext_resource path="res://sprites/characters/Character.tscn" type="PackedScene" id=2] [ext_resource path="res://player/Mob.gd" type="Script" id=3] [sub_resource type="CircleShape2D" id=1] diff --git a/game/player/NetworkedPlayer.tscn b/game/player/NetworkedPlayer.tscn index 81f6386..72d821c 100644 --- a/game/player/NetworkedPlayer.tscn +++ b/game/player/NetworkedPlayer.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://player/NetworkedPlayer.gd" type="Script" id=1] [ext_resource path="res://ui/nameplates/NamePlate.tscn" type="PackedScene" id=2] -[ext_resource path="res://characters/Character.tscn" type="PackedScene" id=3] +[ext_resource path="res://sprites/characters/Character.tscn" type="PackedScene" id=3] [sub_resource type="EntityResourceHealth" id=1] diff --git a/game/characters/Character.tscn b/game/sprites/characters/Character.tscn similarity index 90% rename from game/characters/Character.tscn rename to game/sprites/characters/Character.tscn index a22a48d..9faf401 100644 --- a/game/characters/Character.tscn +++ b/game/sprites/characters/Character.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=10 format=2] [ext_resource path="res://player/CharacterSkeleton2DGD.gd" type="Script" id=1] -[ext_resource path="res://characters/CharacterSideModel.tscn" type="PackedScene" id=2] -[ext_resource path="res://characters/CharacterFrontModel.tscn" type="PackedScene" id=3] +[ext_resource path="res://sprites/characters/CharacterSideModel.tscn" type="PackedScene" id=2] +[ext_resource path="res://sprites/characters/CharacterFrontModel.tscn" type="PackedScene" id=3] [ext_resource path="res://scripts/item_visuals/CharacterAtlas2D.gd" type="Script" id=4] [ext_resource path="res://scripts/item_visuals/CharacterAtlasEntry2D.gd" type="Script" id=5] -[ext_resource path="res://characters/char_t1_outline_split.png" type="Texture" id=6] +[ext_resource path="res://sprites/characters/char_t1_outline_split.png" type="Texture" id=6] [sub_resource type="CharacterAtlasEntry" id=1] script = ExtResource( 5 ) diff --git a/game/characters/CharacterFrontModel.tscn b/game/sprites/characters/CharacterFrontModel.tscn similarity index 99% rename from game/characters/CharacterFrontModel.tscn rename to game/sprites/characters/CharacterFrontModel.tscn index 750f395..d421e9d 100644 --- a/game/characters/CharacterFrontModel.tscn +++ b/game/sprites/characters/CharacterFrontModel.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=12 format=2] -[ext_resource path="res://characters/char_t1_outline_split.png" type="Texture" id=1] +[ext_resource path="res://sprites/characters/char_t1_outline_split.png" type="Texture" id=1] [ext_resource path="res://player/HumanoidCharacterBones2D.gd" type="Script" id=2] [sub_resource type="Animation" id=1] diff --git a/game/characters/CharacterSideModel.tscn b/game/sprites/characters/CharacterSideModel.tscn similarity index 99% rename from game/characters/CharacterSideModel.tscn rename to game/sprites/characters/CharacterSideModel.tscn index ec03e22..5066a96 100644 --- a/game/characters/CharacterSideModel.tscn +++ b/game/sprites/characters/CharacterSideModel.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=12 format=2] -[ext_resource path="res://characters/char_t1_outline_split.png" type="Texture" id=1] +[ext_resource path="res://sprites/characters/char_t1_outline_split.png" type="Texture" id=1] [ext_resource path="res://player/HumanoidCharacterBones2D.gd" type="Script" id=2] [sub_resource type="Animation" id=1] diff --git a/game/characters/CharacterTest1Scene.tscn b/game/sprites/characters/CharacterTest1Scene.tscn similarity index 96% rename from game/characters/CharacterTest1Scene.tscn rename to game/sprites/characters/CharacterTest1Scene.tscn index fe088e1..fdae206 100644 --- a/game/characters/CharacterTest1Scene.tscn +++ b/game/sprites/characters/CharacterTest1Scene.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://characters/char_t1_outline_split.png" type="Texture" id=1] +[ext_resource path="res://sprites/characters/char_t1_outline_split.png" type="Texture" id=1] [node name="CharacterTest1" type="Node2D"] diff --git a/game/characters/char_t1_outline_split - Copy.png b/game/sprites/characters/char_t1_outline_split - Copy.png similarity index 100% rename from game/characters/char_t1_outline_split - Copy.png rename to game/sprites/characters/char_t1_outline_split - Copy.png diff --git a/game/characters/char_t1_outline_split - Copy.png.import b/game/sprites/characters/char_t1_outline_split - Copy.png.import similarity index 65% rename from game/characters/char_t1_outline_split - Copy.png.import rename to game/sprites/characters/char_t1_outline_split - Copy.png.import index 6da1bd0..910a7e8 100644 --- a/game/characters/char_t1_outline_split - Copy.png.import +++ b/game/sprites/characters/char_t1_outline_split - Copy.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/char_t1_outline_split - Copy.png-88d6d74e7874948f07096fd2e5e6ae3a.stex" +path="res://.import/char_t1_outline_split - Copy.png-50958da168a35a94e0ca987e44cc74f4.stex" metadata={ "vram_texture": false } [deps] -source_file="res://characters/char_t1_outline_split - Copy.png" -dest_files=[ "res://.import/char_t1_outline_split - Copy.png-88d6d74e7874948f07096fd2e5e6ae3a.stex" ] +source_file="res://sprites/characters/char_t1_outline_split - Copy.png" +dest_files=[ "res://.import/char_t1_outline_split - Copy.png-50958da168a35a94e0ca987e44cc74f4.stex" ] [params] diff --git a/game/characters/char_t1_outline_split.png b/game/sprites/characters/char_t1_outline_split.png similarity index 100% rename from game/characters/char_t1_outline_split.png rename to game/sprites/characters/char_t1_outline_split.png diff --git a/game/characters/char_t1_outline_split.png.import b/game/sprites/characters/char_t1_outline_split.png.import similarity index 67% rename from game/characters/char_t1_outline_split.png.import rename to game/sprites/characters/char_t1_outline_split.png.import index 56ee596..3aedf67 100644 --- a/game/characters/char_t1_outline_split.png.import +++ b/game/sprites/characters/char_t1_outline_split.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/char_t1_outline_split.png-9c3f609f043903cf305339bc84929b57.stex" +path="res://.import/char_t1_outline_split.png-b1edb1f3cc81fb0dde31807ec03a891c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://characters/char_t1_outline_split.png" -dest_files=[ "res://.import/char_t1_outline_split.png-9c3f609f043903cf305339bc84929b57.stex" ] +source_file="res://sprites/characters/char_t1_outline_split.png" +dest_files=[ "res://.import/char_t1_outline_split.png-b1edb1f3cc81fb0dde31807ec03a891c.stex" ] [params] diff --git a/game/characters/naturalist_characteratlas.tres b/game/sprites/characters/naturalist_characteratlas.tres similarity index 93% rename from game/characters/naturalist_characteratlas.tres rename to game/sprites/characters/naturalist_characteratlas.tres index fd0cbb9..26fb82e 100644 --- a/game/characters/naturalist_characteratlas.tres +++ b/game/sprites/characters/naturalist_characteratlas.tres @@ -1,7 +1,7 @@ [gd_resource type="CharacterAtlas" load_steps=6 format=2] [ext_resource path="res://scripts/item_visuals/CharacterAtlas2D.gd" type="Script" id=1] -[ext_resource path="res://characters/char_t1_outline_split.png" type="Texture" id=2] +[ext_resource path="res://sprites/characters/char_t1_outline_split.png" type="Texture" id=2] [ext_resource path="res://scripts/item_visuals/CharacterAtlasEntry2D.gd" type="Script" id=3] [sub_resource type="CharacterAtlasEntry" id=1] diff --git a/game/sprites/entities/Human/Body_2d_old.tscn b/game/sprites/entities/Human/Body_2d_old.tscn index 8caae3d..39ebb4f 100644 --- a/game/sprites/entities/Human/Body_2d_old.tscn +++ b/game/sprites/entities/Human/Body_2d_old.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://player/Body.gd" type="Script" id=1] -[ext_resource path="res://characters/Character.tscn" type="PackedScene" id=2] +[ext_resource path="res://sprites/characters/Character.tscn" type="PackedScene" id=2] [sub_resource type="CircleShape2D" id=1] radius = 8.0