diff --git a/assets/3d/Tiles047_1K-JPG/Tiles047.png b/assets/3d/Tiles047_1K-JPG/Tiles047.png deleted file mode 100644 index 9b1c650..0000000 --- a/assets/3d/Tiles047_1K-JPG/Tiles047.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48310be4890a1b71796117787c8f49d83dbec3592bb2757cdea56e38ced33721 -size 293452 diff --git a/assets/3d/Tiles047_1K-JPG/Tiles047.png.import b/assets/3d/Tiles047_1K-JPG/Tiles047.png.import deleted file mode 100644 index 23a5e82..0000000 --- a/assets/3d/Tiles047_1K-JPG/Tiles047.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://crdikelu5br6o" -path="res://.godot/imported/Tiles047.png-e735c58b71307d7178c88d8fe6215b21.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/3d/Tiles047_1K-JPG/Tiles047.png" -dest_files=["res://.godot/imported/Tiles047.png-e735c58b71307d7178c88d8fe6215b21.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/assets/3d/Tiles047_1K-JPG/Tiles047_1K-JPG.blend b/assets/3d/Tiles047_1K-JPG/Tiles047_1K-JPG.blend deleted file mode 100644 index 865ca7d..0000000 Binary files a/assets/3d/Tiles047_1K-JPG/Tiles047_1K-JPG.blend and /dev/null differ diff --git a/assets/3d/Tiles047_1K-JPG/Tiles047_1K-JPG.mtlx b/assets/3d/Tiles047_1K-JPG/Tiles047_1K-JPG.mtlx deleted file mode 100644 index 71dd375..0000000 --- a/assets/3d/Tiles047_1K-JPG/Tiles047_1K-JPG.mtlx +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/Images/drink-tea-svgrepo-com.svg b/assets/Images/drink-tea-svgrepo-com.svg index 6106179..0d9b384 100644 --- a/assets/Images/drink-tea-svgrepo-com.svg +++ b/assets/Images/drink-tea-svgrepo-com.svg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fa1a8848cecf49af82749193cd4a4db48016c4a05799abd6315413b15062ef4 -size 694 +oid sha256:8a452fb386beb862f3e3fc7ad15d31f82dff1cd8d3e4e7c3417587400618fb1d +size 1715 diff --git a/assets/Images/pavement/Tiles047_1K-JPG/Tiles047_1K-JPG.blend b/assets/Images/pavement/Tiles047_1K-JPG/Tiles047_1K-JPG.blend deleted file mode 100644 index 865ca7d..0000000 Binary files a/assets/Images/pavement/Tiles047_1K-JPG/Tiles047_1K-JPG.blend and /dev/null differ diff --git a/assets/Images/time-add-svgrepo-com.svg b/assets/Images/time-add-svgrepo-com.svg index 45a3709..f06daf6 100644 --- a/assets/Images/time-add-svgrepo-com.svg +++ b/assets/Images/time-add-svgrepo-com.svg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62f0af01fecc91c2e28f5490499243add7532fd6a6ff9f29643ea54da6b5bd28 -size 563 +oid sha256:ba2552cc8b43c3fff55ce97d6881d4dfdd915095c551df0d8d3f31753bb11f2a +size 1556 diff --git a/player.gd b/player.gd index 91f1c45..58a11ca 100644 --- a/player.gd +++ b/player.gd @@ -143,7 +143,9 @@ func _on_continue_button_pressed(): -func _on_shop_shop_exit() -> void: +func _on_shop_shop_exit() -> void: + $Upgrades.update() + $SpecialUpgrades.update() is_active = true $Shop.visible = false stage_counter += 1 diff --git a/spawn.gd b/spawn.gd index 28921e3..dd95da7 100644 --- a/spawn.gd +++ b/spawn.gd @@ -3,3 +3,8 @@ extends Node3D func _ready() -> void: $Mesh.mesh.size.x = Global.chunk_size $Mesh.mesh.size.y = Global.chunk_size + for tree in get_children(): + if not tree.name.begins_with("Tree"): + continue + + tree.position *= Global.chunk_size / 150 diff --git a/station.gd b/station.gd index b353f11..1379578 100644 --- a/station.gd +++ b/station.gd @@ -1,7 +1,8 @@ extends Node3D func _ready() -> void: - $Mesh.mesh.size.x = Global.chunk_size - $Mesh.mesh.size.y = Global.chunk_size + scale *= Global.chunk_size / 150 + #$Mesh.mesh.size.x = Global.chunk_size + #$Mesh.mesh.size.y = Global.chunk_size #$StationArea/CollisionShape3D.shape.size.x = Global.chunk_size * 0.50 #$StationArea/CollisionShape3D.shape.size.z = Global.chunk_size * 0.50