From 5a4bb1277e7780ab5f875a7a1346035b1b751167 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 6 Sep 2022 18:46:49 +0200 Subject: [PATCH] Move them under a new spider subfolder. --- .../{ => spider}/arachnid/Arachnid.tscn | 20 +++++++++--------- .../entities/{ => spider}/arachnid/Legs.tscn | 8 +++---- .../{ => spider}/arachnid/abdomen.tres | 0 .../entities/{ => spider}/arachnid/fang1.tres | 0 .../entities/{ => spider}/arachnid/fang2.tres | 0 .../entities/{ => spider}/arachnid/head.tres | 0 .../{ => spider}/arachnid/leg_thorax.tres | 0 .../{ => spider}/arachnid/lower_leg.tres | 0 .../arachnid/spider_base_chitin.tres | 0 .../arachnid/spider_base_chitin_albedo.png | Bin .../spider_base_chitin_albedo.png.import | 6 +++--- .../{ => spider}/arachnid/thorax.tres | 0 .../{ => spider}/arachnid/upper_leg.tres | 0 .../entities/{ => spider}/tarantula/Legs.tscn | 8 +++---- .../{ => spider}/tarantula/Tarantula.tscn | 20 +++++++++--------- .../{ => spider}/tarantula/abdomen.tres | 0 .../{ => spider}/tarantula/fang1.tres | 0 .../{ => spider}/tarantula/fang2.tres | 0 .../entities/{ => spider}/tarantula/head.tres | 0 .../{ => spider}/tarantula/leg_thorax.tres | 0 .../{ => spider}/tarantula/lower_leg.tres | 0 .../tarantula/spider_base_chitin.tres | 0 .../tarantula/spider_base_chitin_albedo.png | Bin .../spider_base_chitin_albedo.png.import | 6 +++--- .../{ => spider}/tarantula/thorax.tres | 0 .../{ => spider}/tarantula/upper_leg.tres | 0 26 files changed, 34 insertions(+), 34 deletions(-) rename game/models/entities/{ => spider}/arachnid/Arachnid.tscn (85%) rename game/models/entities/{ => spider}/arachnid/Legs.tscn (68%) rename game/models/entities/{ => spider}/arachnid/abdomen.tres (100%) rename game/models/entities/{ => spider}/arachnid/fang1.tres (100%) rename game/models/entities/{ => spider}/arachnid/fang2.tres (100%) rename game/models/entities/{ => spider}/arachnid/head.tres (100%) rename game/models/entities/{ => spider}/arachnid/leg_thorax.tres (100%) rename game/models/entities/{ => spider}/arachnid/lower_leg.tres (100%) rename game/models/entities/{ => spider}/arachnid/spider_base_chitin.tres (100%) rename game/models/entities/{ => spider}/arachnid/spider_base_chitin_albedo.png (100%) rename game/models/entities/{ => spider}/arachnid/spider_base_chitin_albedo.png.import (65%) rename game/models/entities/{ => spider}/arachnid/thorax.tres (100%) rename game/models/entities/{ => spider}/arachnid/upper_leg.tres (100%) rename game/models/entities/{ => spider}/tarantula/Legs.tscn (68%) rename game/models/entities/{ => spider}/tarantula/Tarantula.tscn (85%) rename game/models/entities/{ => spider}/tarantula/abdomen.tres (100%) rename game/models/entities/{ => spider}/tarantula/fang1.tres (100%) rename game/models/entities/{ => spider}/tarantula/fang2.tres (100%) rename game/models/entities/{ => spider}/tarantula/head.tres (100%) rename game/models/entities/{ => spider}/tarantula/leg_thorax.tres (100%) rename game/models/entities/{ => spider}/tarantula/lower_leg.tres (100%) rename game/models/entities/{ => spider}/tarantula/spider_base_chitin.tres (100%) rename game/models/entities/{ => spider}/tarantula/spider_base_chitin_albedo.png (100%) rename game/models/entities/{ => spider}/tarantula/spider_base_chitin_albedo.png.import (64%) rename game/models/entities/{ => spider}/tarantula/thorax.tres (100%) rename game/models/entities/{ => spider}/tarantula/upper_leg.tres (100%) diff --git a/game/models/entities/arachnid/Arachnid.tscn b/game/models/entities/spider/arachnid/Arachnid.tscn similarity index 85% rename from game/models/entities/arachnid/Arachnid.tscn rename to game/models/entities/spider/arachnid/Arachnid.tscn index a459c821..3b5e65fd 100644 --- a/game/models/entities/arachnid/Arachnid.tscn +++ b/game/models/entities/spider/arachnid/Arachnid.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=17 format=2] -[ext_resource path="res://models/entities/arachnid/lower_leg.tres" type="MeshDataResource" id=1] -[ext_resource path="res://models/entities/arachnid/spider_base_chitin_albedo.png" type="Texture" id=2] -[ext_resource path="res://models/entities/arachnid/upper_leg.tres" type="MeshDataResource" id=3] +[ext_resource path="res://models/entities/spider/arachnid/lower_leg.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/spider/arachnid/spider_base_chitin_albedo.png" type="Texture" id=2] +[ext_resource path="res://models/entities/spider/arachnid/upper_leg.tres" type="MeshDataResource" id=3] [ext_resource path="res://worlds/test_world/environments/default_env.tres" type="Environment3D" id=4] [ext_resource path="res://textures/world/grass/grass_albedo.png" type="Texture" id=5] -[ext_resource path="res://models/entities/arachnid/fang2.tres" type="MeshDataResource" id=6] -[ext_resource path="res://models/entities/arachnid/fang1.tres" type="MeshDataResource" id=7] -[ext_resource path="res://models/entities/arachnid/head.tres" type="MeshDataResource" id=8] -[ext_resource path="res://models/entities/arachnid/thorax.tres" type="MeshDataResource" id=9] -[ext_resource path="res://models/entities/arachnid/abdomen.tres" type="MeshDataResource" id=10] -[ext_resource path="res://models/entities/arachnid/leg_thorax.tres" type="MeshDataResource" id=11] -[ext_resource path="res://models/entities/arachnid/Legs.tscn" type="PackedScene" id=12] +[ext_resource path="res://models/entities/spider/arachnid/fang2.tres" type="MeshDataResource" id=6] +[ext_resource path="res://models/entities/spider/arachnid/fang1.tres" type="MeshDataResource" id=7] +[ext_resource path="res://models/entities/spider/arachnid/head.tres" type="MeshDataResource" id=8] +[ext_resource path="res://models/entities/spider/arachnid/thorax.tres" type="MeshDataResource" id=9] +[ext_resource path="res://models/entities/spider/arachnid/abdomen.tres" type="MeshDataResource" id=10] +[ext_resource path="res://models/entities/spider/arachnid/leg_thorax.tres" type="MeshDataResource" id=11] +[ext_resource path="res://models/entities/spider/arachnid/Legs.tscn" type="PackedScene" id=12] [sub_resource type="SpatialMaterial" id=1] flags_vertex_lighting = true diff --git a/game/models/entities/arachnid/Legs.tscn b/game/models/entities/spider/arachnid/Legs.tscn similarity index 68% rename from game/models/entities/arachnid/Legs.tscn rename to game/models/entities/spider/arachnid/Legs.tscn index 7721e072..c5ed71ea 100644 --- a/game/models/entities/arachnid/Legs.tscn +++ b/game/models/entities/spider/arachnid/Legs.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://models/entities/arachnid/spider_base_chitin_albedo.png" type="Texture" id=1] -[ext_resource path="res://models/entities/arachnid/lower_leg.tres" type="MeshDataResource" id=2] -[ext_resource path="res://models/entities/arachnid/upper_leg.tres" type="MeshDataResource" id=3] -[ext_resource path="res://models/entities/arachnid/leg_thorax.tres" type="MeshDataResource" id=4] +[ext_resource path="res://models/entities/spider/arachnid/spider_base_chitin_albedo.png" type="Texture" id=1] +[ext_resource path="res://models/entities/spider/arachnid/lower_leg.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/spider/arachnid/upper_leg.tres" type="MeshDataResource" id=3] +[ext_resource path="res://models/entities/spider/arachnid/leg_thorax.tres" type="MeshDataResource" id=4] [sub_resource type="SpatialMaterial" id=1] flags_vertex_lighting = true diff --git a/game/models/entities/arachnid/abdomen.tres b/game/models/entities/spider/arachnid/abdomen.tres similarity index 100% rename from game/models/entities/arachnid/abdomen.tres rename to game/models/entities/spider/arachnid/abdomen.tres diff --git a/game/models/entities/arachnid/fang1.tres b/game/models/entities/spider/arachnid/fang1.tres similarity index 100% rename from game/models/entities/arachnid/fang1.tres rename to game/models/entities/spider/arachnid/fang1.tres diff --git a/game/models/entities/arachnid/fang2.tres b/game/models/entities/spider/arachnid/fang2.tres similarity index 100% rename from game/models/entities/arachnid/fang2.tres rename to game/models/entities/spider/arachnid/fang2.tres diff --git a/game/models/entities/arachnid/head.tres b/game/models/entities/spider/arachnid/head.tres similarity index 100% rename from game/models/entities/arachnid/head.tres rename to game/models/entities/spider/arachnid/head.tres diff --git a/game/models/entities/arachnid/leg_thorax.tres b/game/models/entities/spider/arachnid/leg_thorax.tres similarity index 100% rename from game/models/entities/arachnid/leg_thorax.tres rename to game/models/entities/spider/arachnid/leg_thorax.tres diff --git a/game/models/entities/arachnid/lower_leg.tres b/game/models/entities/spider/arachnid/lower_leg.tres similarity index 100% rename from game/models/entities/arachnid/lower_leg.tres rename to game/models/entities/spider/arachnid/lower_leg.tres diff --git a/game/models/entities/arachnid/spider_base_chitin.tres b/game/models/entities/spider/arachnid/spider_base_chitin.tres similarity index 100% rename from game/models/entities/arachnid/spider_base_chitin.tres rename to game/models/entities/spider/arachnid/spider_base_chitin.tres diff --git a/game/models/entities/arachnid/spider_base_chitin_albedo.png b/game/models/entities/spider/arachnid/spider_base_chitin_albedo.png similarity index 100% rename from game/models/entities/arachnid/spider_base_chitin_albedo.png rename to game/models/entities/spider/arachnid/spider_base_chitin_albedo.png diff --git a/game/models/entities/arachnid/spider_base_chitin_albedo.png.import b/game/models/entities/spider/arachnid/spider_base_chitin_albedo.png.import similarity index 65% rename from game/models/entities/arachnid/spider_base_chitin_albedo.png.import rename to game/models/entities/spider/arachnid/spider_base_chitin_albedo.png.import index e281d7dc..726d43bb 100644 --- a/game/models/entities/arachnid/spider_base_chitin_albedo.png.import +++ b/game/models/entities/spider/arachnid/spider_base_chitin_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spider_base_chitin_albedo.png-75d36bbc278f2c3fb5ce95a40e079542.stex" +path="res://.import/spider_base_chitin_albedo.png-5463c3df644ce3bf72c19063e4896dd8.stex" metadata={ "vram_texture": false } [deps] -source_file="res://models/entities/arachnid/spider_base_chitin_albedo.png" -dest_files=[ "res://.import/spider_base_chitin_albedo.png-75d36bbc278f2c3fb5ce95a40e079542.stex" ] +source_file="res://models/entities/spider/arachnid/spider_base_chitin_albedo.png" +dest_files=[ "res://.import/spider_base_chitin_albedo.png-5463c3df644ce3bf72c19063e4896dd8.stex" ] [params] diff --git a/game/models/entities/arachnid/thorax.tres b/game/models/entities/spider/arachnid/thorax.tres similarity index 100% rename from game/models/entities/arachnid/thorax.tres rename to game/models/entities/spider/arachnid/thorax.tres diff --git a/game/models/entities/arachnid/upper_leg.tres b/game/models/entities/spider/arachnid/upper_leg.tres similarity index 100% rename from game/models/entities/arachnid/upper_leg.tres rename to game/models/entities/spider/arachnid/upper_leg.tres diff --git a/game/models/entities/tarantula/Legs.tscn b/game/models/entities/spider/tarantula/Legs.tscn similarity index 68% rename from game/models/entities/tarantula/Legs.tscn rename to game/models/entities/spider/tarantula/Legs.tscn index 0a686e9d..9b1c29bc 100644 --- a/game/models/entities/tarantula/Legs.tscn +++ b/game/models/entities/spider/tarantula/Legs.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://models/entities/tarantula/spider_base_chitin_albedo.png" type="Texture" id=1] -[ext_resource path="res://models/entities/tarantula/lower_leg.tres" type="MeshDataResource" id=2] -[ext_resource path="res://models/entities/tarantula/upper_leg.tres" type="MeshDataResource" id=3] -[ext_resource path="res://models/entities/tarantula/leg_thorax.tres" type="MeshDataResource" id=4] +[ext_resource path="res://models/entities/spider/tarantula/spider_base_chitin_albedo.png" type="Texture" id=1] +[ext_resource path="res://models/entities/spider/tarantula/lower_leg.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/spider/tarantula/upper_leg.tres" type="MeshDataResource" id=3] +[ext_resource path="res://models/entities/spider/tarantula/leg_thorax.tres" type="MeshDataResource" id=4] [sub_resource type="SpatialMaterial" id=1] flags_vertex_lighting = true diff --git a/game/models/entities/tarantula/Tarantula.tscn b/game/models/entities/spider/tarantula/Tarantula.tscn similarity index 85% rename from game/models/entities/tarantula/Tarantula.tscn rename to game/models/entities/spider/tarantula/Tarantula.tscn index 79cc60ac..7db4d882 100644 --- a/game/models/entities/tarantula/Tarantula.tscn +++ b/game/models/entities/spider/tarantula/Tarantula.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=17 format=2] -[ext_resource path="res://models/entities/tarantula/lower_leg.tres" type="MeshDataResource" id=1] -[ext_resource path="res://models/entities/tarantula/spider_base_chitin_albedo.png" type="Texture" id=2] -[ext_resource path="res://models/entities/tarantula/upper_leg.tres" type="MeshDataResource" id=3] +[ext_resource path="res://models/entities/spider/tarantula/lower_leg.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/spider/tarantula/spider_base_chitin_albedo.png" type="Texture" id=2] +[ext_resource path="res://models/entities/spider/tarantula/upper_leg.tres" type="MeshDataResource" id=3] [ext_resource path="res://worlds/test_world/environments/default_env.tres" type="Environment3D" id=4] [ext_resource path="res://textures/world/grass/grass_albedo.png" type="Texture" id=5] -[ext_resource path="res://models/entities/tarantula/fang2.tres" type="MeshDataResource" id=6] -[ext_resource path="res://models/entities/tarantula/fang1.tres" type="MeshDataResource" id=7] -[ext_resource path="res://models/entities/tarantula/head.tres" type="MeshDataResource" id=8] -[ext_resource path="res://models/entities/tarantula/thorax.tres" type="MeshDataResource" id=9] -[ext_resource path="res://models/entities/tarantula/abdomen.tres" type="MeshDataResource" id=10] -[ext_resource path="res://models/entities/tarantula/leg_thorax.tres" type="MeshDataResource" id=11] -[ext_resource path="res://models/entities/tarantula/Legs.tscn" type="PackedScene" id=12] +[ext_resource path="res://models/entities/spider/tarantula/fang2.tres" type="MeshDataResource" id=6] +[ext_resource path="res://models/entities/spider/tarantula/fang1.tres" type="MeshDataResource" id=7] +[ext_resource path="res://models/entities/spider/tarantula/head.tres" type="MeshDataResource" id=8] +[ext_resource path="res://models/entities/spider/tarantula/thorax.tres" type="MeshDataResource" id=9] +[ext_resource path="res://models/entities/spider/tarantula/abdomen.tres" type="MeshDataResource" id=10] +[ext_resource path="res://models/entities/spider/tarantula/leg_thorax.tres" type="MeshDataResource" id=11] +[ext_resource path="res://models/entities/spider/tarantula/Legs.tscn" type="PackedScene" id=12] [sub_resource type="SpatialMaterial" id=1] flags_vertex_lighting = true diff --git a/game/models/entities/tarantula/abdomen.tres b/game/models/entities/spider/tarantula/abdomen.tres similarity index 100% rename from game/models/entities/tarantula/abdomen.tres rename to game/models/entities/spider/tarantula/abdomen.tres diff --git a/game/models/entities/tarantula/fang1.tres b/game/models/entities/spider/tarantula/fang1.tres similarity index 100% rename from game/models/entities/tarantula/fang1.tres rename to game/models/entities/spider/tarantula/fang1.tres diff --git a/game/models/entities/tarantula/fang2.tres b/game/models/entities/spider/tarantula/fang2.tres similarity index 100% rename from game/models/entities/tarantula/fang2.tres rename to game/models/entities/spider/tarantula/fang2.tres diff --git a/game/models/entities/tarantula/head.tres b/game/models/entities/spider/tarantula/head.tres similarity index 100% rename from game/models/entities/tarantula/head.tres rename to game/models/entities/spider/tarantula/head.tres diff --git a/game/models/entities/tarantula/leg_thorax.tres b/game/models/entities/spider/tarantula/leg_thorax.tres similarity index 100% rename from game/models/entities/tarantula/leg_thorax.tres rename to game/models/entities/spider/tarantula/leg_thorax.tres diff --git a/game/models/entities/tarantula/lower_leg.tres b/game/models/entities/spider/tarantula/lower_leg.tres similarity index 100% rename from game/models/entities/tarantula/lower_leg.tres rename to game/models/entities/spider/tarantula/lower_leg.tres diff --git a/game/models/entities/tarantula/spider_base_chitin.tres b/game/models/entities/spider/tarantula/spider_base_chitin.tres similarity index 100% rename from game/models/entities/tarantula/spider_base_chitin.tres rename to game/models/entities/spider/tarantula/spider_base_chitin.tres diff --git a/game/models/entities/tarantula/spider_base_chitin_albedo.png b/game/models/entities/spider/tarantula/spider_base_chitin_albedo.png similarity index 100% rename from game/models/entities/tarantula/spider_base_chitin_albedo.png rename to game/models/entities/spider/tarantula/spider_base_chitin_albedo.png diff --git a/game/models/entities/tarantula/spider_base_chitin_albedo.png.import b/game/models/entities/spider/tarantula/spider_base_chitin_albedo.png.import similarity index 64% rename from game/models/entities/tarantula/spider_base_chitin_albedo.png.import rename to game/models/entities/spider/tarantula/spider_base_chitin_albedo.png.import index 2925e993..afc51b4c 100644 --- a/game/models/entities/tarantula/spider_base_chitin_albedo.png.import +++ b/game/models/entities/spider/tarantula/spider_base_chitin_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spider_base_chitin_albedo.png-ae6b6463391c788d819b03235f820a74.stex" +path="res://.import/spider_base_chitin_albedo.png-7cc1944be3c8faab73403d1e40126d7a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://models/entities/tarantula/spider_base_chitin_albedo.png" -dest_files=[ "res://.import/spider_base_chitin_albedo.png-ae6b6463391c788d819b03235f820a74.stex" ] +source_file="res://models/entities/spider/tarantula/spider_base_chitin_albedo.png" +dest_files=[ "res://.import/spider_base_chitin_albedo.png-7cc1944be3c8faab73403d1e40126d7a.stex" ] [params] diff --git a/game/models/entities/tarantula/thorax.tres b/game/models/entities/spider/tarantula/thorax.tres similarity index 100% rename from game/models/entities/tarantula/thorax.tres rename to game/models/entities/spider/tarantula/thorax.tres diff --git a/game/models/entities/tarantula/upper_leg.tres b/game/models/entities/spider/tarantula/upper_leg.tres similarity index 100% rename from game/models/entities/tarantula/upper_leg.tres rename to game/models/entities/spider/tarantula/upper_leg.tres