PR review

# Conflicts:
#	project/assets/tilemap/tilemaps/tilemap_objects.png
#	project/scripts/tilemap/TileMapTileTypes.gd

.gitignore

@@ -1,2 +1,3 @@
 project/.godot
 .idea
+.vscode

project/assets/tilemap/tilemaps/Bush1.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://by0ao1dfpv7g0"
-path="res://.godot/imported/Bush1.png-092355c79998cbca852c55775b03b5a0.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Bush1.png"
-dest_files=["res://.godot/imported/Bush1.png-092355c79998cbca852c55775b03b5a0.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_1.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://c7uxij8vlypf8"
-path="res://.godot/imported/wood_1.png-7a9c8ec126cf3771c98f5c26c56a4409.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_1.png"
-dest_files=["res://.godot/imported/wood_1.png-7a9c8ec126cf3771c98f5c26c56a4409.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_10.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://5w6kxk04q7ve"
-path="res://.godot/imported/wood_10.png-e3ac6877e0f03cc028dd9f9cd9e3bfab.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_10.png"
-dest_files=["res://.godot/imported/wood_10.png-e3ac6877e0f03cc028dd9f9cd9e3bfab.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_11.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bv8etfgdemm23"
-path="res://.godot/imported/wood_11.png-5ed3cb6ef2277f6e93b32fba5cc2c488.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_11.png"
-dest_files=["res://.godot/imported/wood_11.png-5ed3cb6ef2277f6e93b32fba5cc2c488.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_2.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://dtpp0b7c3fngc"
-path="res://.godot/imported/wood_2.png-7a5547986fff3a6f66bee10d3c30262d.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_2.png"
-dest_files=["res://.godot/imported/wood_2.png-7a5547986fff3a6f66bee10d3c30262d.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_3.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://fv3mesfc4n4e"
-path="res://.godot/imported/wood_3.png-c731959197d567c2a5cd4c324d90932b.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_3.png"
-dest_files=["res://.godot/imported/wood_3.png-c731959197d567c2a5cd4c324d90932b.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_4.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://i0c020wbsnu"
-path="res://.godot/imported/wood_4.png-fb4b032a2a853f8104bc18321d15a251.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_4.png"
-dest_files=["res://.godot/imported/wood_4.png-fb4b032a2a853f8104bc18321d15a251.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_5.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cj80dxddktm48"
-path="res://.godot/imported/wood_5.png-ab271761187ec7216377f97839b1598a.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_5.png"
-dest_files=["res://.godot/imported/wood_5.png-ab271761187ec7216377f97839b1598a.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_6.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://i032gptgk3yt"
-path="res://.godot/imported/wood_6.png-2c6765e2e1a643fcbe2ea3a00c715dde.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_6.png"
-dest_files=["res://.godot/imported/wood_6.png-2c6765e2e1a643fcbe2ea3a00c715dde.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_7.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://lcs7ax1a83y4"
-path="res://.godot/imported/wood_7.png-84b3b2691533e742ef571c33808e52fb.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_7.png"
-dest_files=["res://.godot/imported/wood_7.png-84b3b2691533e742ef571c33808e52fb.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_8.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://datjchu6dk52n"
-path="res://.godot/imported/wood_8.png-ffa5dc2d83162634acd0d3712c570faa.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_8.png"
-dest_files=["res://.godot/imported/wood_8.png-ffa5dc2d83162634acd0d3712c570faa.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/Transparent .PNG Files/wood_9.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://crkf13g4x1kac"
-path="res://.godot/imported/wood_9.png-a4dfe5085f49a8419947accdd3cd56c3.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/Transparent .PNG Files/wood_9.png"
-dest_files=["res://.godot/imported/wood_9.png-a4dfe5085f49a8419947accdd3cd56c3.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/campfire-sheet.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://4j0vfs01d25v"
-path="res://.godot/imported/campfire-sheet.png-e6b55f728a0001b35397c4b6fd44449d.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/campfire-sheet.png"
-dest_files=["res://.godot/imported/campfire-sheet.png-e6b55f728a0001b35397c4b6fd44449d.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/combined_tilemap_objects.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cyqmib3kbgajn"
-path="res://.godot/imported/combined_tilemap_objects.png-de480fe84cfe8a19420bd631ba5b99b0.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/combined_tilemap_objects.png"
-dest_files=["res://.godot/imported/combined_tilemap_objects.png-de480fe84cfe8a19420bd631ba5b99b0.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/combined_tilemap_objects2.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b4hb38awkytmm"
-path="res://.godot/imported/combined_tilemap_objects2.png-fc6f99d7e713cb061772f862138779ce.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/combined_tilemap_objects2.png"
-dest_files=["res://.godot/imported/combined_tilemap_objects2.png-fc6f99d7e713cb061772f862138779ce.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/combined_tilemap_objects_with_bush.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b7rmvuio4fliw"
-path="res://.godot/imported/combined_tilemap_objects_with_bush.png-45549ca9a0961cedaeb5a37720f50a16.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/combined_tilemap_objects_with_bush.png"
-dest_files=["res://.godot/imported/combined_tilemap_objects_with_bush.png-45549ca9a0961cedaeb5a37720f50a16.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/sprite-sheet.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b2u4r00fker81"
-path="res://.godot/imported/sprite-sheet.png-89a1547582d3ee30bc4145081d986894.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/sprite-sheet.png"
-dest_files=["res://.godot/imported/sprite-sheet.png-89a1547582d3ee30bc4145081d986894.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/sprite.json

@@ -1 +1 @@
-{"filename":"tilemaps.aseprite","width":320,"frames":[{"duration":0.1}],"height":320,"layers":[{"name":"ground","cels":[{"image":"tilemaps\\tilemap_ground.png","frame":0}]},{"name":"objects","cels":[{"image":"tilemaps\\tilemap_objects.png","frame":0}]},{"name":"temperature","cels":[{"image":"tilemaps\\tilemap_temperature.png","frame":0}]},{"name":"player","cels":[{"image":"tilemaps\\tilemap_player.png","frame":0}]}]}
+{"layers":[{"cels":[{"frame":0,"image":"tilemaps\\tilemap_ground.png"}],"name":"ground"},{"cels":[{"frame":0,"image":"tilemaps\\tilemap_objects.png"}],"name":"objects"},{"cels":[{"frame":0,"image":"tilemaps\\tilemap_temperature.png"}],"name":"temperature"},{"cels":[{"frame":0,"image":"tilemaps\\tilemap_player.png"}],"name":"player"}],"height":320,"filename":"tilemaps.aseprite","width":320,"frames":[{"duration":0.1}]}

project/assets/tilemap/tilemaps/tilemap_chest.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://dw5mo025uy1gt"
-path="res://.godot/imported/tilemap_chest.png-9c96f5b9598daeb4ba36fdd6c88a8d07.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/tilemap_chest.png"
-dest_files=["res://.godot/imported/tilemap_chest.png-9c96f5b9598daeb4ba36fdd6c88a8d07.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/tilemap_dome.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://csuihs28cgrr4"
-path="res://.godot/imported/tilemap_dome.png-5d641b6e95962f5756ea912ee06aa436.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/tilemap_dome.png"
-dest_files=["res://.godot/imported/tilemap_dome.png-5d641b6e95962f5756ea912ee06aa436.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/tilemap_ground.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dy0gpc2vgr3o5"
+uid="uid://diwoxcyj13q7v"
 path="res://.godot/imported/tilemap_ground.png-cb404afe66e487b3999901e2d621baa7.ctex"
 metadata={
 "vram_texture": false
@@ -31,4 +31,4 @@ 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
+detect_3d/compress_to=0

project/assets/tilemap/tilemaps/tilemap_objects.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cvb8hqljk0rv3"
+uid="uid://dkvyu6a2bqans"
 path="res://.godot/imported/tilemap_objects.png-36dc04b2c5c4ea8db297745921fe10e8.ctex"
 metadata={
 "vram_texture": false

project/assets/tilemap/tilemaps/tilemap_objects_with_fire.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://by3aqx7f28wx1"
-path="res://.godot/imported/tilemap_objects_with_fire.png-6ab33ac36182c061b8c5f010d2dd3e0e.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/tilemap_objects_with_fire.png"
-dest_files=["res://.godot/imported/tilemap_objects_with_fire.png-6ab33ac36182c061b8c5f010d2dd3e0e.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/tilemap_objects_with_woods.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://yo7djo6jpwud"
-path="res://.godot/imported/tilemap_objects_with_woods.png-8c99b66eaade82277384925f4f98a020.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/tilemap_objects_with_woods.png"
-dest_files=["res://.godot/imported/tilemap_objects_with_woods.png-8c99b66eaade82277384925f4f98a020.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/assets/tilemap/tilemaps/tilemap_player.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bam5su5j62mof"
+uid="uid://bwkvdumh22cmh"
 path="res://.godot/imported/tilemap_player.png-ea1fa2aedf5bb220961e9080aa573e32.ctex"
 metadata={
 "vram_texture": false

project/assets/tilemap/tilemaps/tilemap_temperature.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://d1sdhqjtrt1ng"
+uid="uid://dtoy4tdohey8t"
 path="res://.godot/imported/tilemap_temperature.png-df4acfda23c8781105475512aa320086.ctex"
 metadata={
 "vram_texture": false

project/assets/tilemap/tilemaps/tilemap_tree.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://dq624730bx1ik"
-path="res://.godot/imported/tilemap_tree.png-5cce85c404bed7ffe07a2666c6ff486b.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/tilemap/tilemaps/tilemap_tree.png"
-dest_files=["res://.godot/imported/tilemap_tree.png-5cce85c404bed7ffe07a2666c6ff486b.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-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/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

project/main-scenes/island.tscn

@@ -14,6 +14,16 @@ script = ExtResource("1_eeg2d")
 [node name="Camera2D" type="Camera2D" parent="."]
 script = ExtResource("2_1vbjl")
 
+[node name="CanvasLayer" type="CanvasLayer" parent="Camera2D"]
+
+[node name="VBoxContainer" type="VBoxContainer" parent="Camera2D/CanvasLayer"]
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="InventoryLabel" type="Label" parent="Camera2D/CanvasLayer/VBoxContainer"]
+layout_mode = 2
+text = "test"
+
 [node name="Tileset" type="Node2D" parent="."]
 script = ExtResource("1_k0rw8")
 
@@ -28,7 +38,7 @@ tile_set = ExtResource("1_vlccq")
 
 [node name="InteractiveObjectsLayer" type="TileMapLayer" parent="Tileset"]
 scale = Vector2(0.979337, 1.0577)
-tile_map_data = PackedByteArray("AAASABYAAQAAAAEAAAAWAAoAAQAAAAEAAAALABkAAQAAAAIAAAATABwAAQAAAAMAAAASAA8AAQAAAAMAAAAQAAUAAQAAAAMAAAAhAAkAAQAAAAMAAAAKABkAAQAAAAQAAABEACIAAQAAAAUAAABsADUAAQAAAAYAAABwAA8AAQAAAAcAAAA=")
+tile_map_data = PackedByteArray("AAASABYAAQAAAAEAAAAWAAoAAQAAAAEAAAALABkAAQAAAAIAAAATABwAAQAAAAMAAAASAA8AAQAAAAMAAAAQAAUAAQAAAAMAAAAhAAkAAQAAAAMAAAAKABkAAQAAAAQAAABEACIAAQAAAAUAAABsADUAAQAAAAYAAABwAA8AAQAAAAcAAAAUAAYAAQADAAEAAAAXAAYAAQADAAAAAAARAAYAAQAEAAAAAAAJAAkAAQADAAEAAAAFAAgAAQADAAEAAAAFAAwAAQADAAEAAAAJAAwAAQADAAEAAAA=")
 tile_set = ExtResource("1_vlccq")
 
 [node name="PlayerLayer" type="TileMapLayer" parent="Tileset"]
@@ -40,21 +50,9 @@ tile_set = ExtResource("1_vlccq")
 
 [node name="PlayerManager" type="Node" parent="."]
 script = ExtResource("4_1xqo1")
-food_damage = null
-temperature_damage = null
-temperature_endure = null
 
 [node name="BehaviorTree" type="Node" parent="PlayerManager"]
 script = ExtResource("6_efs30")
 
 [node name="sl_Root" type="Node" parent="PlayerManager/BehaviorTree"]
 script = ExtResource("7_1jajd")
-
-[node name="CanvasLayer" type="CanvasLayer" parent="PlayerManager"]
-
-[node name="VBoxContainer" type="VBoxContainer" parent="PlayerManager/CanvasLayer"]
-offset_right = 40.0
-offset_bottom = 40.0
-
-[node name="InventoryLabel" type="Label" parent="PlayerManager/CanvasLayer/VBoxContainer"]
-layout_mode = 2

project/scripts/global/Camera.gd

@@ -1,7 +1,7 @@
 class_name Camera
 extends Camera2D
 
-@export var border_acceleration: float = 2000.0
+@export var border_acceleration: float = 0#2000.0
 @export var max_speed: float = 500.0
 @export var inner_border_threshold: float = 60.0
 @export var outer_border_threshold: float = 40.0

project/scripts/items/item.gd

@@ -1,6 +0,0 @@
-class_name Item
-extends Resource
-
-@export var name: String = ""
-@export var max_stack: int = 1
-@export var atlas_coords: Vector2i = Vector2i(-1, -1)

project/scripts/player/PlayerManager.gd

@@ -2,9 +2,11 @@ class_name PlayerManager
 extends Node
 
 @onready var inventory_label = $CanvasLayer/VBoxContainer/InventoryLabel
+
 @export var food_damage: int = 1
 @export var temperature_damage: int = 1
 @export var temperature_endure: int = 50
+@export var view_distance: int = 50
 
 var tilemap_types: TileMapTileTypes = TileMapTileTypes.new()
 #
@@ -33,12 +35,15 @@ func defer_ready() -> void:
 func _process(delta: float) -> void:
     if Input.is_action_just_pressed("key_3"):
         game_manager.camera.go_to_zooming(game_manager.world.tilemap_player.cell_to_local(board_position), 2)
+    if Input.is_action_just_pressed("key_5"):
+        pick_up_item(Vector2i(5, 8))
+        pick_up_item(Vector2i(9, 9))
     if Input.is_action_just_pressed("key_4"):
-		move_to_nearest_tree()
-		move_to_nearest_bush()
-		move_to_chest()
-		move_to_campfire()
-		move_to_boatpart()
+        var nearest: Vector2i = find_nearest_object(game_manager.world.tilemap_types.OBJECT_COLLECTION_TREE)
+        # nearest.x = nearest.x - 1
+        walk_towards(nearest)
+        update_board()
+
 
 # SECTION: board access/mangement
 
@@ -57,14 +62,30 @@ func pick_up_item(tilemap_pos: Vector2i) -> void:
 
     var pick_up_item_type: Vector2i = game_manager.world.tilemap_interactive.tilemap.get_cell_atlas_coords(tilemap_pos)
 
-   # Check if the inventory slot is empty
+    # check if tile will transform into another tile upon pickup
+    var tile_after_pickup_transform = null
+    if tilemap_types.OBJECT_COLLECTION_BERRY_FILLED_BUSH.has(pick_up_item_type):
+        tile_after_pickup_transform = tilemap_types.OBJECT_COLLECTION_BERRY_EMPTY_BUSH[0]
+
+    # check if the inventory slot is empty
     if inventory_slot == tilemap_types.EMPTY:
         inventory_slot = pick_up_item_type
-		game_manager.world.tilemap_interactive.clear_cell(tilemap_pos)  # Clear the tilemap
+        if tile_after_pickup_transform:
+            game_manager.world.tilemap_interactive.set_cell(tilemap_pos, tile_after_pickup_transform)
+        else:
+            game_manager.world.tilemap_interactive.clear_cell(tilemap_pos)
         print("Picked up item: ", pick_up_item_type)
     else:
-		# Inventory is full, swap the item
+        # inventory is full, swap the item
         print("Inventory is full. Swapping item: ", inventory_slot, " with item: ", pick_up_item_type)
+        if tile_after_pickup_transform:
+            game_manager.world.tilemap_interactive.set_cell(tilemap_pos, tile_after_pickup_transform)
+            var drop_location: Vector2i = game_manager.world.find_item_drop_location(tilemap_pos)
+            if drop_location != tilemap_types.EMPTY:
+                game_manager.world.tilemap_interactive.set_cell(drop_location, inventory_slot)
+            else:
+                push_warning("Could not find valid drop position for ", inventory_slot)
+        else:
             game_manager.world.tilemap_interactive.set_cell(tilemap_pos, inventory_slot)
         inventory_slot = pick_up_item_type
 
@@ -72,67 +93,48 @@ func pick_up_item(tilemap_pos: Vector2i) -> void:
 # SECTION: player movement
 
 func walk_towards(position: Vector2i) -> void:
-	walk_along(game_manager.world.find_path(board_position, position))
-	print(game_manager.world.find_path(board_position, position))
+    var path: Array[Vector2i] = game_manager.world.find_path(board_position, position)
+    walk_along(path)
+
 
 func walk_along(path: Array[Vector2i]) -> void:
     if len(path) > 1:
         var next_position: Vector2i = path[1]
         var direction: Vector2i     = find_direction(board_position, next_position)
         move_player(direction)
+    else:
+        push_warning("walk_along path is empty")
 
 
 func move_player(direction: Vector2i) -> void:
     var new_position: Vector2 = board_position + direction
     if game_manager.world.is_walkable(new_position):
         board_position = new_position
-		print("Moved to:", board_position)
-		update_board()
     else:
         push_warning("Player trying to move to non-walkable position, prevented ", new_position)
 
-func move_to_nearest_tree():
-	move_to_nearest_object(game_manager.world.tilemap_types.OBJECT_I_TREE_1, "tree")
 
-func move_to_nearest_bush():
-	move_to_nearest_object(game_manager.world.tilemap_types.OBJECT_I_BERRY_1, "bush")
+func find_nearest_object(object_collection: Array[Vector2i]) -> Vector2i:
+    var object_positions: Array[Vector2i] = []
 
-func move_to_chest():
-	move_to_nearest_object(game_manager.world.tilemap_types.OBJECT_I_CHEST_1, "chest")
-
-func move_to_boatpart():
-	move_to_nearest_object(game_manager.world.tilemap_types.OBJECT_I_BOATPART_1, "boat part")
-
-# func move_to_boat_building_place():
-#     move_to_nearest_object(game_manager.world.tilemap_types.OBJECT_I_BOATPART_BUILDING_PLACE, "boatbuildingplace")
-
-func move_to_campfire():
-	move_to_nearest_object(game_manager.world.tilemap_types.OBJECT_I_CAMPFIRE_1, "campfire")
-
-func move_to_nearest_object(object_type: Vector2i, object_name: String) -> void:
-	# Aktuelle Spielerposition
-	var player_position: Vector2i = board_position
-
-	# Koordinaten aller Objekte des angegebenen Typs suchen
-	var object_positions: Array[Vector2i] = game_manager.world.tilemap_interactive.get_cells_by_type(object_type)
+    for obj in object_collection:
+        object_positions.append_array(game_manager.world.tilemap_interactive.get_cells_by_type(obj))
 
     if object_positions.size() == 0:
-		push_warning("No " + object_name + " found!")
-		return
+        push_warning("No " + str(object_collection) + " found!")
+        return tilemap_types.NO_TILE_FOUND
 
-	# Nächstes Objekt finden
-	var closest_object: Vector2i = object_positions[0]
-	var shortest_distance: float = player_position.distance_to(closest_object)
+    var closest_object: Vector2i = tilemap_types.NO_TILE_FOUND
+    var shortest_distance: float = 99999999
 
     for position in object_positions:
-		var distance: float = player_position.distance_to(position)
-		if distance < shortest_distance:
+        var distance: float = game_manager.world.manhattan_distance(board_position, position)
+        if closest_object == tilemap_types.NO_TILE_FOUND or distance < shortest_distance:
             closest_object = position
             shortest_distance = distance
 
-	# Spieler bewegen
-	print("Moving to nearest " + object_name + " at:", closest_object)
-	walk_towards(closest_object)
+    print("Find nearest " + str(object_collection) + " at:", closest_object)
+    return closest_object
 
 
 func find_direction(pos_a: Vector2i, pos_b: Vector2i) -> Vector2i:
@@ -165,8 +167,6 @@ func tick_handle_food():
         health -= food_damage
 
 
-
-
 func game_tick() -> void:
     behavior_tree.game_tick()
 

project/scripts/tilemap/TileMapLayerAccess.gd

@@ -12,16 +12,6 @@ func setup() -> void:
 func get_cells_by_type(atlas_coords: Vector2i) -> Array[Vector2i]:
 	return tilemap.get_used_cells_by_id(sid, atlas_coords)
 
-func set_cell_custom_data(position: Vector2i, key: String, value: Variant) -> void:
-	var tile_data: TileData = tilemap.get_cell_tile_data(position)
-	if tile_data:
-		tile_data.set_custom_data(key, value)
-
-func get_cell_custom_data(position: Vector2i, key: String, default_value: Variant) -> Variant:
-	var tile_data: TileData = tilemap.get_cell_tile_data(position)
-	if tile_data:
-		return tile_data.get_custom_data(key)
-	return default_value
 
 func get_cells_by_custom_data(field_name: String, custom_data: Variant) -> Array[Vector2i]:
 	var tiles_with_custom_data: Array = []

project/scripts/tilemap/TileMapTileTypes.gd

@@ -2,9 +2,8 @@ class_name TileMapTileTypes
 
 # global values
 const EMPTY: Vector2i = Vector2i(-1, -1)
-
-#Items
-const ITEM_STICK: String = "Stick"
+const NO_TILE_FOUND: Vector2i = Vector2i(-999999, -999999)
+#
 # ground, sid = 0
 const GROUND_GRASS: Vector2i         = Vector2i(0, 0)
 const GROUND_WATER_SHALLOW: Vector2i = Vector2i(1, 0)
@@ -17,15 +16,23 @@ const OBJECT_NI_RANDOM_1: Vector2i = Vector2i(0, 0) # testing only, to be remove
 const OBJECT_NI_RANDOM_2: Vector2i = Vector2i(1, 0) # testing only, to be removed
 const OBJECT_NI_ROCK_1: Vector2i   = Vector2i(2, 0)
 # I = interactive
-const OBJECT_I_TREE_1: Vector2i = Vector2i(0, 1)
-const OBJECT_I_CHEST_1: Vector2i = Vector2i(0, 2)
-const OBJECT_I_BERRY_1: Vector2i = Vector2i(0, 3)
-const OBJECT_I_CAMPFIRE_1: Vector2i = Vector2i(0, 4)
-const OBJECT_I_BOATPART_1: Vector2i = Vector2i(0, 5)
-const OBJECT_I_BOATPART_2: Vector2i = Vector2i(0, 6)
-const OBJECT_I_BOATPART_3: Vector2i = Vector2i(0, 7)
-#const OBJECT_I_BOATPART_BUILDING_PLACE: Vector2i = Vector2i(0, 8)
-
+const OBJECT_I_BOAT_ENGINE: Vector2i   = Vector2i(0, 1)
+const OBJECT_I_FUEL: Vector2i          = Vector2i(1, 1)
+const OBJECT_I_ANCHOR: Vector2i        = Vector2i(2, 1)
+const OBJECT_I_EMPTY_BUSH: Vector2i    = Vector2i(3, 0)
+const OBJECT_I_FILLED_BUSH: Vector2i   = Vector2i(3, 1)
+const OBJECT_I_TREE_1_TOP: Vector2i    = Vector2i(4, 0)
+const OBJECT_I_TREE_1_BOTTOM: Vector2i = Vector2i(4, 1)
+const OBJECT_I_CHEST: Vector2i         = Vector2i(0, 2)
+const OBJECT_I_GEARS: Vector2i         = Vector2i(1, 2)
+const OBJECT_I_MEDIKIT: Vector2i       = Vector2i(2, 2)
+const OBJECT_I_PADDLE: Vector2i        = Vector2i(3, 2)
+const OBJECT_I_GAS_STOVE: Vector2i     = Vector2i(4, 2)
+# collections
+const OBJECT_COLLECTION_TREE: Array[Vector2i]              = [OBJECT_I_TREE_1_TOP, OBJECT_I_TREE_1_BOTTOM]
+const OBJECT_COLLECTION_BERRY_FILLED_BUSH: Array[Vector2i] = [OBJECT_I_FILLED_BUSH]
+const OBJECT_COLLECTION_BERRY_EMPTY_BUSH: Array[Vector2i]  = [OBJECT_I_EMPTY_BUSH]
+#
 # temperature, sid = 2
 const TEMPERATURE_NORMAL: Vector2i = Vector2i(-1, -1)
 const TEMPERATURE_COLD_1: Vector2i = Vector2i(0, 0)

project/scripts/tilemap/World.gd

@@ -8,7 +8,6 @@ var tilemap_player: TileMapLayerAccess          = TileMapLayerAccess.new()
 var tilemap_temperature: TileMapLayerAccess     = TileMapLayerAccess.new()
 #
 var tilemap_types: TileMapTileTypes = TileMapTileTypes.new()
-var interactive_tile_items: Dictionary = {}
 
 
 func _ready() -> void:
@@ -28,7 +27,6 @@ func _ready() -> void:
     tilemap_interactive.setup()
     tilemap_player.setup()
     tilemap_temperature.setup()
-    print_tree_positions()
 
 
 # example usage
@@ -39,17 +37,14 @@ func _ready() -> void:
 # tilemap_ground.set_cell(Vector2i(0, 0), tilemap_types.GROUND_GRASS)
 # print(tilemap_ground.local_to_cell(get_local_mouse_position()))
 
-func print_tree_positions() -> void:
-    var tree_coords = tilemap_types.OBJECT_I_TREE_1  # Die Atlas-Koordinaten des Baums
-    var tree_positions = tilemap_interactive.get_cells_by_type(tree_coords)
+func find_item_drop_location(center_pos: Vector2i) -> Vector2i:
+    for x in range(center_pos.x - 2, center_pos.x + 2):
+        for y in range(center_pos.y - 2, center_pos.y + 2):
+            var check_pos: Vector2i = Vector2i(x, y)
+            if not tilemap_interactive.get_cell(check_pos) and is_walkable(check_pos):
+                return check_pos
+    return Vector2i(-1, -1)
 
-    if tree_positions.size() == 0:
-        print("Keine Bäume gefunden.")
-        return
-
-    print("Gefundene Bäume:")
-    for position in tree_positions:
-        print("- Baum bei:", position)
 
 func is_walkable(position: Vector2i) -> bool:
     var ground_tile_walkable: bool     = tilemap_ground.get_custom_data(position, "walkable", false)