From f62aedfeabde9a3b06daed777884276eedb489dc Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 11 Feb 2022 23:39:26 +0100 Subject: [PATCH] Rename the imported tree mesh's derived stuff. --- .../{t1.tres => t1scene.tres} | 8 ++++---- .../{t1.tscn => t1scene.tscn} | 0 .../{t2.tres => t2scene.tres} | 0 .../{t2.tscn => t2scene.tscn} | 0 game/modules/planets/test_planet/test_world.tres | 4 ++-- game/test_props/MeshDataInstance2.tres | 2 +- game/test_props/MeshDataInstance2.tscn | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/{t1.tres => t1scene.tres} (83%) rename game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/{t1.tscn => t1scene.tscn} (100%) rename game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/{t2.tres => t2scene.tres} (100%) rename game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/{t2.tscn => t2scene.tscn} (100%) diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres similarity index 83% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres rename to game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres index 8cfc1005..babdb736 100644 --- a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres +++ b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres @@ -1,11 +1,11 @@ [gd_resource type="PropData" load_steps=4 format=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=1] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.gltf" type="MeshDataResource" id=2] +[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.gltf" type="MeshDataResource" id=1] +[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=2] [sub_resource type="PropDataMeshData" id=1] -mesh = ExtResource( 2 ) -texture = ExtResource( 1 ) +mesh = ExtResource( 1 ) +texture = ExtResource( 2 ) [resource] props = [ SubResource( 1 ) ] diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tscn b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tscn similarity index 100% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tscn rename to game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tscn diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2.tres b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres similarity index 100% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2.tres rename to game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2.tscn b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tscn similarity index 100% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2.tscn rename to game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tscn diff --git a/game/modules/planets/test_planet/test_world.tres b/game/modules/planets/test_planet/test_world.tres index 283ab185..4841e747 100644 --- a/game/modules/planets/test_planet/test_world.tres +++ b/game/modules/planets/test_planet/test_world.tres @@ -5,8 +5,8 @@ [ext_resource path="res://world_generator/zones/test_zone.gd" type="Script" id=3] [ext_resource path="res://world_generator/subzones/spawner.gd" type="Script" id=4] [ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=5] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="PropData" id=6] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2.tres" type="PropData" id=7] +[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=6] +[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres" type="PropData" id=7] [ext_resource path="res://modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres" type="EntityData" id=8] [ext_resource path="res://modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres" type="EntityData" id=9] diff --git a/game/test_props/MeshDataInstance2.tres b/game/test_props/MeshDataInstance2.tres index 30e6ff73..b1034702 100644 --- a/game/test_props/MeshDataInstance2.tres +++ b/game/test_props/MeshDataInstance2.tres @@ -2,7 +2,7 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/head.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_head.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="PropData" id=3] +[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=3] [sub_resource type="PropDataMeshData" id=1] mesh = ExtResource( 2 ) diff --git a/game/test_props/MeshDataInstance2.tscn b/game/test_props/MeshDataInstance2.tscn index c723c45b..8368c8c0 100644 --- a/game/test_props/MeshDataInstance2.tscn +++ b/game/test_props/MeshDataInstance2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/head.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_head.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="PropData" id=3] +[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=3] [sub_resource type="Image" id=9] data = {