Merge remote-tracking branch 'refs/remotes/origin/main'

assets/3d/Tiles047_1K-JPG/Tiles047.png.import

@@ -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

assets/3d/Tiles047_1K-JPG/Tiles047_1K-JPG.mtlx

@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<materialx version="1.39" fileprefix="./">
-  <open_pbr_surface xpos="6.159420" type="surfaceshader" ypos="-1.879310" name="Tiles047_1K_JPG_OpenPbrSurface">
-    <input type="color3" nodename="Tiles047_1K_JPG_Color" name="base_color" />
-    <input type="vector3" nodename="NormalMap" name="geometry_normal" />
-    <input type="float" nodename="Tiles047_1K_JPG_Roughness" name="specular_roughness" />
-  </open_pbr_surface>
-  <surfacematerial xpos="8.695652" type="material" ypos="0.000000" name="Tiles047_1K_JPG">
-    <input type="surfaceshader" nodename="Tiles047_1K_JPG_OpenPbrSurface" name="surfaceshader" />
-    <input type="displacementshader" nodename="displacement" name="displacementshader" />
-  </surfacematerial>
-  <tiledimage xpos="3.623188" type="color3" ypos="-3.103448" name="Tiles047_1K_JPG_Color">
-    <input value="Tiles047_1K-JPG_Color.jpg" type="filename" colorspace="srgb_texture" name="file" />
-    <input value="1.0, 1.0" type="vector2" name="uvtiling" />
-  </tiledimage>
-  <tiledimage xpos="3.623188" type="float" ypos="5.163793" name="Tiles047_1K_JPG_Displacement">
-    <input value="Tiles047_1K-JPG_Displacement.jpg" type="filename" name="file" />
-    <input value="1.0, 1.0" type="vector2" name="uvtiling" />
-  </tiledimage>
-  <displacement xpos="6.159420" type="displacementshader" ypos="1.879310" name="displacement">
-    <input type="float" nodename="Tiles047_1K_JPG_Displacement" name="displacement" />
-    <input value="1.0" type="float" name="scale" />
-  </displacement>
-  <tiledimage xpos="1.086957" type="vector3" ypos="0.879310" name="Tiles047_1K_JPG_NormalGL">
-    <input value="Tiles047_1K-JPG_NormalGL.jpg" type="filename" name="file" />
-    <input value="1.0, 1.0" type="vector2" name="uvtiling" />
-  </tiledimage>
-  <normalmap xpos="3.623188" type="vector3" ypos="3.586207" name="NormalMap">
-    <input type="vector3" nodename="Tiles047_1K_JPG_NormalGL" name="in" />
-    <input value="1.0" type="float" name="scale" />
-  </normalmap>
-  <tiledimage xpos="3.623188" type="float" ypos="-0.413793" name="Tiles047_1K_JPG_Roughness">
-    <input value="Tiles047_1K-JPG_Roughness.jpg" type="filename" name="file" />
-    <input value="1.0, 1.0" type="vector2" name="uvtiling" />
-  </tiledimage>
-</materialx>

player.gd

@@ -144,6 +144,8 @@ func _on_continue_button_pressed():
 
 
 func _on_shop_shop_exit() -> void:
+	$Upgrades.update()
+	$SpecialUpgrades.update()
 	is_active = true
 	$Shop.visible = false
 	stage_counter += 1

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

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