From c2cac24849bbfe4bb159badd01e4177238d94ef0 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 13 Dec 2021 23:27:23 +0100 Subject: [PATCH] Moved the new test tiles. --- .../planets}/new_rtileset.tres | 4 ++-- .../planets/tiles}/dirt.png | Bin .../planets/tiles}/dirt.png.import | 6 +++--- .../planets/tiles}/dirt.tres | 8 ++++---- .../planets/tiles}/grass.png | Bin .../planets/tiles}/grass.png.import | 6 +++--- .../planets/tiles}/grass.tres | 8 ++++---- game/test_iso_tileset/TileMap64x32.tscn | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) rename game/{addons/tile_generator => modules/planets}/new_rtileset.tres (88%) rename game/{addons/tile_generator => modules/planets/tiles}/dirt.png (100%) rename game/{addons/tile_generator => modules/planets/tiles}/dirt.png.import (72%) rename game/{addons/tile_generator => modules/planets/tiles}/dirt.tres (76%) rename game/{addons/tile_generator => modules/planets/tiles}/grass.png (100%) rename game/{addons/tile_generator => modules/planets/tiles}/grass.png.import (72%) rename game/{addons/tile_generator => modules/planets/tiles}/grass.tres (76%) diff --git a/game/addons/tile_generator/new_rtileset.tres b/game/modules/planets/new_rtileset.tres similarity index 88% rename from game/addons/tile_generator/new_rtileset.tres rename to game/modules/planets/new_rtileset.tres index ef3cc6e..4a1cf2e 100644 --- a/game/addons/tile_generator/new_rtileset.tres +++ b/game/modules/planets/new_rtileset.tres @@ -1,7 +1,7 @@ [gd_resource type="RTileSet" load_steps=4 format=2] -[ext_resource path="res://addons/tile_generator/dirt.png" type="Texture" id=1] -[ext_resource path="res://addons/tile_generator/grass.png" type="Texture" id=2] +[ext_resource path="res://modules/planets/tiles/dirt.png" type="Texture" id=1] +[ext_resource path="res://modules/planets/tiles/grass.png" type="Texture" id=2] [sub_resource type="FastnoiseNoiseParams" id=1] frequency = 0.02 diff --git a/game/addons/tile_generator/dirt.png b/game/modules/planets/tiles/dirt.png similarity index 100% rename from game/addons/tile_generator/dirt.png rename to game/modules/planets/tiles/dirt.png diff --git a/game/addons/tile_generator/dirt.png.import b/game/modules/planets/tiles/dirt.png.import similarity index 72% rename from game/addons/tile_generator/dirt.png.import rename to game/modules/planets/tiles/dirt.png.import index bc73c41..d8c616e 100644 --- a/game/addons/tile_generator/dirt.png.import +++ b/game/modules/planets/tiles/dirt.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dirt.png-4619a7b524d3617207cc200232d61a8d.stex" +path="res://.import/dirt.png-de9637bedc5efbe61cae1a851309ca54.stex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/tile_generator/dirt.png" -dest_files=[ "res://.import/dirt.png-4619a7b524d3617207cc200232d61a8d.stex" ] +source_file="res://modules/planets/tiles/dirt.png" +dest_files=[ "res://.import/dirt.png-de9637bedc5efbe61cae1a851309ca54.stex" ] [params] diff --git a/game/addons/tile_generator/dirt.tres b/game/modules/planets/tiles/dirt.tres similarity index 76% rename from game/addons/tile_generator/dirt.tres rename to game/modules/planets/tiles/dirt.tres index 79e8e1d..7e24a38 100644 --- a/game/addons/tile_generator/dirt.tres +++ b/game/modules/planets/tiles/dirt.tres @@ -1,11 +1,11 @@ [gd_resource type="Resource" load_steps=3 format=2] -[ext_resource path="res://modules/planets/textures/dirt_albedo.png" type="Texture" id=1] -[ext_resource path="res://addons/tile_generator/smple_tile.gd" type="Script" id=2] +[ext_resource path="res://addons/tile_generator/smple_tile.gd" type="Script" id=1] +[ext_resource path="res://modules/planets/textures/dirt_albedo.png" type="Texture" id=2] [resource] -script = ExtResource( 2 ) -input = ExtResource( 1 ) +script = ExtResource( 1 ) +input = ExtResource( 2 ) output_image_name = "dirt" image_count = 1 image_size_x = 64 diff --git a/game/addons/tile_generator/grass.png b/game/modules/planets/tiles/grass.png similarity index 100% rename from game/addons/tile_generator/grass.png rename to game/modules/planets/tiles/grass.png diff --git a/game/addons/tile_generator/grass.png.import b/game/modules/planets/tiles/grass.png.import similarity index 72% rename from game/addons/tile_generator/grass.png.import rename to game/modules/planets/tiles/grass.png.import index 958dc8d..f4b65b8 100644 --- a/game/addons/tile_generator/grass.png.import +++ b/game/modules/planets/tiles/grass.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass.png-403246ac380304d7e211486fe1219a6a.stex" +path="res://.import/grass.png-e07ce30421471802ecdd4f4979baede3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://addons/tile_generator/grass.png" -dest_files=[ "res://.import/grass.png-403246ac380304d7e211486fe1219a6a.stex" ] +source_file="res://modules/planets/tiles/grass.png" +dest_files=[ "res://.import/grass.png-e07ce30421471802ecdd4f4979baede3.stex" ] [params] diff --git a/game/addons/tile_generator/grass.tres b/game/modules/planets/tiles/grass.tres similarity index 76% rename from game/addons/tile_generator/grass.tres rename to game/modules/planets/tiles/grass.tres index d969232..ea09d18 100644 --- a/game/addons/tile_generator/grass.tres +++ b/game/modules/planets/tiles/grass.tres @@ -1,11 +1,11 @@ [gd_resource type="Resource" load_steps=3 format=2] -[ext_resource path="res://modules/planets/textures/grass_albedo.png" type="Texture" id=1] -[ext_resource path="res://addons/tile_generator/smple_tile.gd" type="Script" id=2] +[ext_resource path="res://addons/tile_generator/smple_tile.gd" type="Script" id=1] +[ext_resource path="res://modules/planets/textures/grass_albedo.png" type="Texture" id=2] [resource] -script = ExtResource( 2 ) -input = ExtResource( 1 ) +script = ExtResource( 1 ) +input = ExtResource( 2 ) output_image_name = "grass" image_count = 1 image_size_x = 64 diff --git a/game/test_iso_tileset/TileMap64x32.tscn b/game/test_iso_tileset/TileMap64x32.tscn index cabd114..1b0ef70 100644 --- a/game/test_iso_tileset/TileMap64x32.tscn +++ b/game/test_iso_tileset/TileMap64x32.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://addons/tile_generator/new_rtileset.tres" type="RTileSet" id=1] +[ext_resource path="res://modules/planets/new_rtileset.tres" type="RTileSet" id=1] [node name="TileMap" type="RTileMap"] mode = 1