From e13190bdd2a73fb76654fedc54afe154bc47c10b Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 6 Sep 2022 18:44:35 +0200 Subject: [PATCH] Renamed the spider to arachnid. --- .../Spider.tscn => 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 game/models/entities/arachnid/leg_thorax.tres | 6 ++++++ .../{spider => arachnid}/lower_leg.tres | 0 .../spider_base_chitin.tres | 0 .../spider_base_chitin_albedo.png | Bin .../spider_base_chitin_albedo.png.import | 6 +++--- .../entities/{spider => arachnid}/thorax.tres | 0 .../{spider => arachnid}/upper_leg.tres | 0 game/models/entities/spider/leg_thorax.tres | 6 ------ 14 files changed, 23 insertions(+), 23 deletions(-) rename game/models/entities/{spider/Spider.tscn => arachnid/Arachnid.tscn} (86%) rename game/models/entities/{spider => arachnid}/Legs.tscn (70%) 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%) create mode 100644 game/models/entities/arachnid/leg_thorax.tres 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%) delete mode 100644 game/models/entities/spider/leg_thorax.tres diff --git a/game/models/entities/spider/Spider.tscn b/game/models/entities/arachnid/Arachnid.tscn similarity index 86% rename from game/models/entities/spider/Spider.tscn rename to game/models/entities/arachnid/Arachnid.tscn index e70b2ac6..a459c821 100644 --- a/game/models/entities/spider/Spider.tscn +++ b/game/models/entities/arachnid/Arachnid.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=17 format=2] -[ext_resource path="res://models/entities/spider/lower_leg.tres" type="MeshDataResource" id=1] -[ext_resource path="res://models/entities/spider/spider_base_chitin_albedo.png" type="Texture" id=2] -[ext_resource path="res://models/entities/spider/upper_leg.tres" type="MeshDataResource" id=3] +[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://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/spider/fang2.tres" type="MeshDataResource" id=6] -[ext_resource path="res://models/entities/spider/fang1.tres" type="MeshDataResource" id=7] -[ext_resource path="res://models/entities/spider/head.tres" type="MeshDataResource" id=8] -[ext_resource path="res://models/entities/spider/thorax.tres" type="MeshDataResource" id=9] -[ext_resource path="res://models/entities/spider/abdomen.tres" type="MeshDataResource" id=10] -[ext_resource path="res://models/entities/spider/leg_thorax.tres" type="MeshDataResource" id=11] -[ext_resource path="res://models/entities/spider/Legs.tscn" type="PackedScene" id=12] +[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] [sub_resource type="SpatialMaterial" id=1] flags_vertex_lighting = true diff --git a/game/models/entities/spider/Legs.tscn b/game/models/entities/arachnid/Legs.tscn similarity index 70% rename from game/models/entities/spider/Legs.tscn rename to game/models/entities/arachnid/Legs.tscn index 4480c2db..7721e072 100644 --- a/game/models/entities/spider/Legs.tscn +++ b/game/models/entities/arachnid/Legs.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://models/entities/spider/spider_base_chitin_albedo.png" type="Texture" id=1] -[ext_resource path="res://models/entities/spider/lower_leg.tres" type="MeshDataResource" id=2] -[ext_resource path="res://models/entities/spider/upper_leg.tres" type="MeshDataResource" id=3] -[ext_resource path="res://models/entities/spider/leg_thorax.tres" type="MeshDataResource" id=4] +[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] [sub_resource type="SpatialMaterial" id=1] flags_vertex_lighting = true diff --git a/game/models/entities/spider/abdomen.tres b/game/models/entities/arachnid/abdomen.tres similarity index 100% rename from game/models/entities/spider/abdomen.tres rename to game/models/entities/arachnid/abdomen.tres diff --git a/game/models/entities/spider/fang1.tres b/game/models/entities/arachnid/fang1.tres similarity index 100% rename from game/models/entities/spider/fang1.tres rename to game/models/entities/arachnid/fang1.tres diff --git a/game/models/entities/spider/fang2.tres b/game/models/entities/arachnid/fang2.tres similarity index 100% rename from game/models/entities/spider/fang2.tres rename to game/models/entities/arachnid/fang2.tres diff --git a/game/models/entities/spider/head.tres b/game/models/entities/arachnid/head.tres similarity index 100% rename from game/models/entities/spider/head.tres rename to game/models/entities/arachnid/head.tres diff --git a/game/models/entities/arachnid/leg_thorax.tres b/game/models/entities/arachnid/leg_thorax.tres new file mode 100644 index 00000000..36b3c342 --- /dev/null +++ b/game/models/entities/arachnid/leg_thorax.tres @@ -0,0 +1,6 @@ +[gd_resource type="MeshDataResource" format=2] + +[resource] +array = [ PoolVector3Array( -0.0487997, 0.0194644, 0.04675, -0.0487997, 0.462214, 0.04675, 0.0566003, 0.462214, 0.04675, 0.0566003, 0.0194644, 0.04675, -0.0487997, 0.0194644, -0.04675, -0.0487997, 0.462214, -0.04675, 0.0566003, 0.462214, -0.04675, 0.0566003, 0.0194644, -0.04675, -0.0487997, 0.462214, 0.04675, 0.0566003, 0.462214, 0.04675, 0.0566003, 0.462214, 0.04675, -0.0487997, 0.462214, -0.04675, 0.0566003, 0.462214, -0.04675, 0.0566003, 0.462214, -0.04675 ), PoolVector3Array( 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1 ), null, null, PoolVector2Array( 0.499999, 0.4549, 0.499999, 0.0277779, 0.590799, 0.0277778, 0.5908, 0.4549, 0.5, 0.5451, 0.5, 0.972222, 0.590801, 0.972222, 0.5908, 0.5451, 0.118578, 0.4549, 0.972222, 0.4549, 0.0277778, 0.4549, 0.118578, 0.5451, 0.972222, 0.5451, 0.027778, 0.5451 ), null, null, null, PoolIntArray( 0, 1, 2, 2, 3, 0, 4, 6, 5, 4, 7, 6, 3, 9, 12, 12, 7, 3, 0, 11, 8, 0, 4, 11, 8, 11, 13, 13, 10, 8, 0, 7, 4, 0, 3, 7 ) ] +aabb = AABB( -0.0487997, 0.0194644, 0, 0.1054, 0.44275, 0 ) +seams = PoolIntArray( 2, 6, 2, 3, 6, 7, 4, 5, 0, 1, 5, 6, 1, 2 ) diff --git a/game/models/entities/spider/lower_leg.tres b/game/models/entities/arachnid/lower_leg.tres similarity index 100% rename from game/models/entities/spider/lower_leg.tres rename to game/models/entities/arachnid/lower_leg.tres diff --git a/game/models/entities/spider/spider_base_chitin.tres b/game/models/entities/arachnid/spider_base_chitin.tres similarity index 100% rename from game/models/entities/spider/spider_base_chitin.tres rename to game/models/entities/arachnid/spider_base_chitin.tres diff --git a/game/models/entities/spider/spider_base_chitin_albedo.png b/game/models/entities/arachnid/spider_base_chitin_albedo.png similarity index 100% rename from game/models/entities/spider/spider_base_chitin_albedo.png rename to game/models/entities/arachnid/spider_base_chitin_albedo.png diff --git a/game/models/entities/spider/spider_base_chitin_albedo.png.import b/game/models/entities/arachnid/spider_base_chitin_albedo.png.import similarity index 65% rename from game/models/entities/spider/spider_base_chitin_albedo.png.import rename to game/models/entities/arachnid/spider_base_chitin_albedo.png.import index b7129fca..e281d7dc 100644 --- a/game/models/entities/spider/spider_base_chitin_albedo.png.import +++ b/game/models/entities/arachnid/spider_base_chitin_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spider_base_chitin_albedo.png-a0eaebc9b4a180364bbc2303d91b71d8.stex" +path="res://.import/spider_base_chitin_albedo.png-75d36bbc278f2c3fb5ce95a40e079542.stex" metadata={ "vram_texture": false } [deps] -source_file="res://models/entities/spider/spider_base_chitin_albedo.png" -dest_files=[ "res://.import/spider_base_chitin_albedo.png-a0eaebc9b4a180364bbc2303d91b71d8.stex" ] +source_file="res://models/entities/arachnid/spider_base_chitin_albedo.png" +dest_files=[ "res://.import/spider_base_chitin_albedo.png-75d36bbc278f2c3fb5ce95a40e079542.stex" ] [params] diff --git a/game/models/entities/spider/thorax.tres b/game/models/entities/arachnid/thorax.tres similarity index 100% rename from game/models/entities/spider/thorax.tres rename to game/models/entities/arachnid/thorax.tres diff --git a/game/models/entities/spider/upper_leg.tres b/game/models/entities/arachnid/upper_leg.tres similarity index 100% rename from game/models/entities/spider/upper_leg.tres rename to game/models/entities/arachnid/upper_leg.tres diff --git a/game/models/entities/spider/leg_thorax.tres b/game/models/entities/spider/leg_thorax.tres deleted file mode 100644 index 5088d86b..00000000 --- a/game/models/entities/spider/leg_thorax.tres +++ /dev/null @@ -1,6 +0,0 @@ -[gd_resource type="MeshDataResource" format=2] - -[resource] -array = [ PoolVector3Array( -0.0487997, 0.0194644, 0.04675, -0.0487997, 0.252214, 0.04675, 0.0566003, 0.252214, 0.04675, 0.0566003, 0.0194644, 0.04675, -0.0487997, 0.0194644, -0.04675, -0.0487997, 0.252214, -0.04675, 0.0566003, 0.252214, -0.04675, 0.0566003, 0.0194644, -0.04675, -0.0487997, 0.252214, 0.04675, 0.0566003, 0.252214, 0.04675, 0.0566003, 0.252214, 0.04675, -0.0487997, 0.252214, -0.04675, 0.0566003, 0.252214, -0.04675, 0.0566003, 0.252214, -0.04675 ), PoolVector3Array( 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1 ), null, null, PoolVector2Array( 0.5, 0.422342, 0.5, 0.0357144, 0.644716, 0.0357143, 0.644716, 0.422342, 0.5, 0.577658, 0.5, 0.964286, 0.644716, 0.964286, 0.644716, 0.577658, 0.18043, 0.422342, 0.964286, 0.422342, 0.0357143, 0.422342, 0.18043, 0.577658, 0.964286, 0.577658, 0.0357143, 0.577658 ), null, null, null, PoolIntArray( 0, 1, 2, 2, 3, 0, 4, 6, 5, 4, 7, 6, 3, 9, 12, 12, 7, 3, 0, 11, 8, 0, 4, 11, 8, 11, 13, 13, 10, 8, 0, 7, 4, 0, 3, 7 ) ] -aabb = AABB( -0.0487997, 0.0194644, 0, 0.1054, 0.23275, 0 ) -seams = PoolIntArray( 2, 6, 2, 3, 6, 7, 4, 5, 0, 1, 5, 6, 1, 2 )