diff options
| author | tpart <tpart120@proton.me> | 2024-10-06 21:17:52 +0200 |
|---|---|---|
| committer | tpart <tpart120@proton.me> | 2024-10-10 11:48:35 +0200 |
| commit | 4ee632304449b77689bf075d3dbcd2466210e118 (patch) | |
| tree | 628153bd5eb76692c20e1b29d664bff1a98818f8 /client/map | |
| parent | 26e4226f3ef410e5ec437bc8a1f2e286dcc8cde2 (diff) | |
| download | hurrycurry-4ee632304449b77689bf075d3dbcd2466210e118.tar hurrycurry-4ee632304449b77689bf075d3dbcd2466210e118.tar.bz2 hurrycurry-4ee632304449b77689bf075d3dbcd2466210e118.tar.zst | |
Reorganize map files; Fix location of some theme files
Diffstat (limited to 'client/map')
| -rw-r--r-- | client/map/items/item.gd | 2 | ||||
| -rw-r--r-- | client/map/progress/progress.gd (renamed from client/map/progress.gd) | 0 | ||||
| -rw-r--r-- | client/map/progress/progress.gdshader (renamed from client/map/progress.gdshader) | 0 | ||||
| -rw-r--r-- | client/map/progress/progress.tscn (renamed from client/map/progress.tscn) | 4 | ||||
| -rw-r--r-- | client/map/textures/palette.png (renamed from client/map/palette.png) | bin | 38079 -> 38079 bytes | |||
| -rw-r--r-- | client/map/textures/palette.png.import (renamed from client/map/palette.png.import) | 8 | ||||
| -rw-r--r-- | client/map/tiles/grass_side.res.depren | bin | 1430 -> 0 bytes |
7 files changed, 7 insertions, 7 deletions
diff --git a/client/map/items/item.gd b/client/map/items/item.gd index 80aa4d6d..f7592d87 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -21,7 +21,7 @@ extends Node3D var owned_by: Node3D var base: Node3D = Node3D.new() -var progress_instance: ProgressBar3D = preload("res://map/progress.tscn").instantiate() +var progress_instance: ProgressBar3D = preload("res://map/progress/progress.tscn").instantiate() var take_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate() var put_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate() var ding_sound := AudioStreamPlayer3D.new() diff --git a/client/map/progress.gd b/client/map/progress/progress.gd index fc31408c..fc31408c 100644 --- a/client/map/progress.gd +++ b/client/map/progress/progress.gd diff --git a/client/map/progress.gdshader b/client/map/progress/progress.gdshader index a5ebf575..a5ebf575 100644 --- a/client/map/progress.gdshader +++ b/client/map/progress/progress.gdshader diff --git a/client/map/progress.tscn b/client/map/progress/progress.tscn index 7a0629a1..7f2ec175 100644 --- a/client/map/progress.tscn +++ b/client/map/progress/progress.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://4ewufm6tqhpb"] -[ext_resource type="Shader" path="res://map/progress.gdshader" id="1_6f2a0"] -[ext_resource type="Script" path="res://map/progress.gd" id="2_bb3u3"] +[ext_resource type="Shader" path="res://map/progress/progress.gdshader" id="1_6f2a0"] +[ext_resource type="Script" path="res://map/progress/progress.gd" id="2_bb3u3"] [sub_resource type="QuadMesh" id="QuadMesh_m0itj"] size = Vector2(0.75, 0.1) diff --git a/client/map/palette.png b/client/map/textures/palette.png Binary files differindex e184fe5b..e184fe5b 100644 --- a/client/map/palette.png +++ b/client/map/textures/palette.png diff --git a/client/map/palette.png.import b/client/map/textures/palette.png.import index 92840fcf..97dc821b 100644 --- a/client/map/palette.png.import +++ b/client/map/textures/palette.png.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://dgcs4wkxsxe6a" -path.s3tc="res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex" -path.etc2="res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.etc2.ctex" +path.s3tc="res://.godot/imported/palette.png-7d1d158ba6a12563fba40a96786b0940.s3tc.ctex" +path.etc2="res://.godot/imported/palette.png-7d1d158ba6a12563fba40a96786b0940.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://map/palette.png" -dest_files=["res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex", "res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.etc2.ctex"] +source_file="res://map/textures/palette.png" +dest_files=["res://.godot/imported/palette.png-7d1d158ba6a12563fba40a96786b0940.s3tc.ctex", "res://.godot/imported/palette.png-7d1d158ba6a12563fba40a96786b0940.etc2.ctex"] [params] diff --git a/client/map/tiles/grass_side.res.depren b/client/map/tiles/grass_side.res.depren Binary files differdeleted file mode 100644 index 3116171f..00000000 --- a/client/map/tiles/grass_side.res.depren +++ /dev/null |
