From 57849c4cf7539b8d8e6fb48c893aec3915c327ef Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Apr 2020 12:34:12 +0200 Subject: [PATCH] Moved cursors out from data. --- game/autoload/CursorManager.tscn | 15 ++++----- game/{data => }/cursors/arrow.png | Bin game/{data => }/cursors/arrow.png.import | 6 ++-- game/{data => }/cursors/arrow16.png | Bin game/{data => }/cursors/arrow16.png.import | 6 ++-- game/{data => }/cursors/arrow32.png | Bin game/{data => }/cursors/arrow32.png.import | 6 ++-- game/{data => }/cursors/arrow8.png | Bin game/{data => }/cursors/arrow8.png.import | 6 ++-- game/{data => }/cursors/attack16.png | Bin game/cursors/attack16.png.import | 34 +++++++++++++++++++++ game/{data => }/cursors/drag_drop.png | Bin game/cursors/drag_drop.png.import | 34 +++++++++++++++++++++ game/{data => }/cursors/forbidden.png | Bin game/cursors/forbidden.png.import | 34 +++++++++++++++++++++ game/{data => }/cursors/ibeam.png | Bin game/{data => }/cursors/ibeam.png.import | 6 ++-- game/{data => }/cursors/loot16.png | Bin game/{data => }/cursors/loot16.png.import | 6 ++-- game/{data => }/cursors/speak.png | Bin game/{data => }/cursors/speak.png.import | 6 ++-- game/data/cursors/attack16.png.import | 34 --------------------- game/data/cursors/drag_drop.png.import | 34 --------------------- game/data/cursors/forbidden.png.import | 34 --------------------- 24 files changed, 131 insertions(+), 130 deletions(-) rename game/{data => }/cursors/arrow.png (100%) rename game/{data => }/cursors/arrow.png.import (71%) rename game/{data => }/cursors/arrow16.png (100%) rename game/{data => }/cursors/arrow16.png.import (71%) rename game/{data => }/cursors/arrow32.png (100%) rename game/{data => }/cursors/arrow32.png.import (71%) rename game/{data => }/cursors/arrow8.png (100%) rename game/{data => }/cursors/arrow8.png.import (71%) rename game/{data => }/cursors/attack16.png (100%) create mode 100644 game/cursors/attack16.png.import rename game/{data => }/cursors/drag_drop.png (100%) create mode 100644 game/cursors/drag_drop.png.import rename game/{data => }/cursors/forbidden.png (100%) create mode 100644 game/cursors/forbidden.png.import rename game/{data => }/cursors/ibeam.png (100%) rename game/{data => }/cursors/ibeam.png.import (71%) rename game/{data => }/cursors/loot16.png (100%) rename game/{data => }/cursors/loot16.png.import (71%) rename game/{data => }/cursors/speak.png (100%) rename game/{data => }/cursors/speak.png.import (71%) delete mode 100644 game/data/cursors/attack16.png.import delete mode 100644 game/data/cursors/drag_drop.png.import delete mode 100644 game/data/cursors/forbidden.png.import diff --git a/game/autoload/CursorManager.tscn b/game/autoload/CursorManager.tscn index ae875936..7f244a9f 100644 --- a/game/autoload/CursorManager.tscn +++ b/game/autoload/CursorManager.tscn @@ -1,13 +1,14 @@ [gd_scene load_steps=9 format=2] [ext_resource path="res://autoload/CursorManager.gd" type="Script" id=1] -[ext_resource path="res://data/cursors/arrow16.png" type="Texture" id=2] -[ext_resource path="res://data/cursors/loot16.png" type="Texture" id=3] -[ext_resource path="res://data/cursors/attack16.png" type="Texture" id=4] -[ext_resource path="res://data/cursors/speak.png" type="Texture" id=5] -[ext_resource path="res://data/cursors/drag_drop.png" type="Texture" id=6] -[ext_resource path="res://data/cursors/forbidden.png" type="Texture" id=7] -[ext_resource path="res://data/cursors/ibeam.png" type="Texture" id=8] +[ext_resource path="res://cursors/arrow16.png" type="Texture" id=2] +[ext_resource path="res://cursors/loot16.png" type="Texture" id=3] +[ext_resource path="res://cursors/attack16.png" type="Texture" id=4] +[ext_resource path="res://cursors/speak.png" type="Texture" id=5] +[ext_resource path="res://cursors/drag_drop.png" type="Texture" id=6] +[ext_resource path="res://cursors/forbidden.png" type="Texture" id=7] +[ext_resource path="res://cursors/ibeam.png" type="Texture" id=8] + [node name="CursorManager" type="Node"] diff --git a/game/data/cursors/arrow.png b/game/cursors/arrow.png similarity index 100% rename from game/data/cursors/arrow.png rename to game/cursors/arrow.png diff --git a/game/data/cursors/arrow.png.import b/game/cursors/arrow.png.import similarity index 71% rename from game/data/cursors/arrow.png.import rename to game/cursors/arrow.png.import index 866c3617..63ee72a3 100644 --- a/game/data/cursors/arrow.png.import +++ b/game/cursors/arrow.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/arrow.png-0e024be6846b021990cf06ddcfe3dbaa.stex" +path="res://.import/arrow.png-8975d88e42d79b69a60ae159f4e1f4b5.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/cursors/arrow.png" -dest_files=[ "res://.import/arrow.png-0e024be6846b021990cf06ddcfe3dbaa.stex" ] +source_file="res://cursors/arrow.png" +dest_files=[ "res://.import/arrow.png-8975d88e42d79b69a60ae159f4e1f4b5.stex" ] [params] diff --git a/game/data/cursors/arrow16.png b/game/cursors/arrow16.png similarity index 100% rename from game/data/cursors/arrow16.png rename to game/cursors/arrow16.png diff --git a/game/data/cursors/arrow16.png.import b/game/cursors/arrow16.png.import similarity index 71% rename from game/data/cursors/arrow16.png.import rename to game/cursors/arrow16.png.import index bb81a94b..e37a0a29 100644 --- a/game/data/cursors/arrow16.png.import +++ b/game/cursors/arrow16.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/arrow16.png-3cc04c454cd16744608672b930ebc21e.stex" +path="res://.import/arrow16.png-baf1bb0bfce3f74c5621ed9d1df2eb9b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/cursors/arrow16.png" -dest_files=[ "res://.import/arrow16.png-3cc04c454cd16744608672b930ebc21e.stex" ] +source_file="res://cursors/arrow16.png" +dest_files=[ "res://.import/arrow16.png-baf1bb0bfce3f74c5621ed9d1df2eb9b.stex" ] [params] diff --git a/game/data/cursors/arrow32.png b/game/cursors/arrow32.png similarity index 100% rename from game/data/cursors/arrow32.png rename to game/cursors/arrow32.png diff --git a/game/data/cursors/arrow32.png.import b/game/cursors/arrow32.png.import similarity index 71% rename from game/data/cursors/arrow32.png.import rename to game/cursors/arrow32.png.import index f5a1d2c3..22993c74 100644 --- a/game/data/cursors/arrow32.png.import +++ b/game/cursors/arrow32.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/arrow32.png-be6fa5cda55ea381f4bb81ac68755fdf.stex" +path="res://.import/arrow32.png-a8397e3d9d049a61672b3e705e50dc8e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/cursors/arrow32.png" -dest_files=[ "res://.import/arrow32.png-be6fa5cda55ea381f4bb81ac68755fdf.stex" ] +source_file="res://cursors/arrow32.png" +dest_files=[ "res://.import/arrow32.png-a8397e3d9d049a61672b3e705e50dc8e.stex" ] [params] diff --git a/game/data/cursors/arrow8.png b/game/cursors/arrow8.png similarity index 100% rename from game/data/cursors/arrow8.png rename to game/cursors/arrow8.png diff --git a/game/data/cursors/arrow8.png.import b/game/cursors/arrow8.png.import similarity index 71% rename from game/data/cursors/arrow8.png.import rename to game/cursors/arrow8.png.import index 1dea28d3..13ade41c 100644 --- a/game/data/cursors/arrow8.png.import +++ b/game/cursors/arrow8.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/arrow8.png-3b29b23d30f562ac61be19a8ca18c059.stex" +path="res://.import/arrow8.png-01663b296f01b225563cadfe6a06ca3b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/cursors/arrow8.png" -dest_files=[ "res://.import/arrow8.png-3b29b23d30f562ac61be19a8ca18c059.stex" ] +source_file="res://cursors/arrow8.png" +dest_files=[ "res://.import/arrow8.png-01663b296f01b225563cadfe6a06ca3b.stex" ] [params] diff --git a/game/data/cursors/attack16.png b/game/cursors/attack16.png similarity index 100% rename from game/data/cursors/attack16.png rename to game/cursors/attack16.png diff --git a/game/cursors/attack16.png.import b/game/cursors/attack16.png.import new file mode 100644 index 00000000..cb1f374d --- /dev/null +++ b/game/cursors/attack16.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/attack16.png-0100f945c7e85d87a58a394beb8c3ac7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://cursors/attack16.png" +dest_files=[ "res://.import/attack16.png-0100f945c7e85d87a58a394beb8c3ac7.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/game/data/cursors/drag_drop.png b/game/cursors/drag_drop.png similarity index 100% rename from game/data/cursors/drag_drop.png rename to game/cursors/drag_drop.png diff --git a/game/cursors/drag_drop.png.import b/game/cursors/drag_drop.png.import new file mode 100644 index 00000000..d96a13ba --- /dev/null +++ b/game/cursors/drag_drop.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/drag_drop.png-58ba6c1076e0e56b172a8f284947b983.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://cursors/drag_drop.png" +dest_files=[ "res://.import/drag_drop.png-58ba6c1076e0e56b172a8f284947b983.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/game/data/cursors/forbidden.png b/game/cursors/forbidden.png similarity index 100% rename from game/data/cursors/forbidden.png rename to game/cursors/forbidden.png diff --git a/game/cursors/forbidden.png.import b/game/cursors/forbidden.png.import new file mode 100644 index 00000000..8955cde2 --- /dev/null +++ b/game/cursors/forbidden.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/forbidden.png-67d5cfbbc30970ad36439934779f2e25.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://cursors/forbidden.png" +dest_files=[ "res://.import/forbidden.png-67d5cfbbc30970ad36439934779f2e25.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/game/data/cursors/ibeam.png b/game/cursors/ibeam.png similarity index 100% rename from game/data/cursors/ibeam.png rename to game/cursors/ibeam.png diff --git a/game/data/cursors/ibeam.png.import b/game/cursors/ibeam.png.import similarity index 71% rename from game/data/cursors/ibeam.png.import rename to game/cursors/ibeam.png.import index 562a700e..6512460e 100644 --- a/game/data/cursors/ibeam.png.import +++ b/game/cursors/ibeam.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/ibeam.png-2c9af42df231350813f1688b4c7338a8.stex" +path="res://.import/ibeam.png-e50b72e1e43b2d2baac009b39086d913.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/cursors/ibeam.png" -dest_files=[ "res://.import/ibeam.png-2c9af42df231350813f1688b4c7338a8.stex" ] +source_file="res://cursors/ibeam.png" +dest_files=[ "res://.import/ibeam.png-e50b72e1e43b2d2baac009b39086d913.stex" ] [params] diff --git a/game/data/cursors/loot16.png b/game/cursors/loot16.png similarity index 100% rename from game/data/cursors/loot16.png rename to game/cursors/loot16.png diff --git a/game/data/cursors/loot16.png.import b/game/cursors/loot16.png.import similarity index 71% rename from game/data/cursors/loot16.png.import rename to game/cursors/loot16.png.import index d0330b17..5a64bd6a 100644 --- a/game/data/cursors/loot16.png.import +++ b/game/cursors/loot16.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/loot16.png-726ee829901668bed967b88a77b79dca.stex" +path="res://.import/loot16.png-79d648584fcb03dcceede3d2ba9034a5.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/cursors/loot16.png" -dest_files=[ "res://.import/loot16.png-726ee829901668bed967b88a77b79dca.stex" ] +source_file="res://cursors/loot16.png" +dest_files=[ "res://.import/loot16.png-79d648584fcb03dcceede3d2ba9034a5.stex" ] [params] diff --git a/game/data/cursors/speak.png b/game/cursors/speak.png similarity index 100% rename from game/data/cursors/speak.png rename to game/cursors/speak.png diff --git a/game/data/cursors/speak.png.import b/game/cursors/speak.png.import similarity index 71% rename from game/data/cursors/speak.png.import rename to game/cursors/speak.png.import index da790b31..9455a62f 100644 --- a/game/data/cursors/speak.png.import +++ b/game/cursors/speak.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/speak.png-4f28d4f817d13bbd186e0ad861f71a83.stex" +path="res://.import/speak.png-3d1d6946ebdb2def63f939fa7c38a224.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/cursors/speak.png" -dest_files=[ "res://.import/speak.png-4f28d4f817d13bbd186e0ad861f71a83.stex" ] +source_file="res://cursors/speak.png" +dest_files=[ "res://.import/speak.png-3d1d6946ebdb2def63f939fa7c38a224.stex" ] [params] diff --git a/game/data/cursors/attack16.png.import b/game/data/cursors/attack16.png.import deleted file mode 100644 index 15c3e51f..00000000 --- a/game/data/cursors/attack16.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/attack16.png-7ed84a4c029e562bb79e6820694ed73a.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://data/cursors/attack16.png" -dest_files=[ "res://.import/attack16.png-7ed84a4c029e562bb79e6820694ed73a.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/game/data/cursors/drag_drop.png.import b/game/data/cursors/drag_drop.png.import deleted file mode 100644 index 4becc9b7..00000000 --- a/game/data/cursors/drag_drop.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/drag_drop.png-7773305bcf75691af78b7c551d7687db.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://data/cursors/drag_drop.png" -dest_files=[ "res://.import/drag_drop.png-7773305bcf75691af78b7c551d7687db.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0 diff --git a/game/data/cursors/forbidden.png.import b/game/data/cursors/forbidden.png.import deleted file mode 100644 index babab487..00000000 --- a/game/data/cursors/forbidden.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/forbidden.png-573414ca70e742cad716effeb28e0873.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://data/cursors/forbidden.png" -dest_files=[ "res://.import/forbidden.png-573414ca70e742cad716effeb28e0873.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=false -svg/scale=1.0