From ec1202f71116270b6f076d2180ca0c4501a3e819 Mon Sep 17 00:00:00 2001 From: Amanda Boegysanto Date: Fri, 19 Sep 2025 12:31:16 +0200 Subject: [PATCH] map_changes --- Amanda/Sprite assets/boy_c.png.import | 13 +- Amanda/Sprite assets/dudes_c.png.import | 13 +- Amanda/Sprite assets/gong.png.import | 13 +- Amanda/Sprite assets/guy_c.png.import | 13 +- Amanda/Sprite assets/lady_c.png.import | 13 +- Amanda/backup_map/.DS_Store | Bin 0 -> 6148 bytes ...{Oktoberfest.tscn => Oktoberfest_new.tscn} | 2 +- .../{chinese_ny.tscn => chinese_ny_new.tscn} | 2 +- .../Holz Dark Seamless.jpg.import | 13 +- Amanda/medieval_tavern_props_pack/props.tscn | 2 +- .../textures/Holz Dark Seamless.jpg.import | 13 +- .../textures/planks.png.import | 13 +- .../textures/tex_bar_counter.png.import | 13 +- .../textures/tex_barrel.png.import | 13 +- .../textures/tex_bucket_wood.png.import | 13 +- .../textures/tex_candle_plate.png.import | 13 +- .../textures/tex_chair_wood.png.import | 13 +- .../textures/tex_fireplace_2.png.import | 13 +- .../textures/tex_lamp_wood.png.import | 13 +- .../textures/tex_sack.png.import | 13 +- .../textures/tex_shelf_wood.png.import | 13 +- .../textures/tex_table_wood.png.import | 13 +- .../textures/tex_table_wood_round.png.import | 13 +- .../textures/tex_torch_2.png.import | 13 +- .../satara_night_no_lamps_2k.exr.import | 13 +- Florian/.DS_Store | Bin 8196 -> 8196 bytes Florian/Map/Oktoberfest.tscn | 38 +- Florian/Map/Oktoberfest_new.tscn | 1833 ++++++++++++++ Florian/Map/chinese_ny.tscn | 5 +- Florian/Map/chinese_ny_new.tscn | 2170 +++++++++++++++++ Florian/Textures/bush.jpg.import | 13 +- 31 files changed, 4181 insertions(+), 157 deletions(-) create mode 100644 Amanda/backup_map/.DS_Store rename Amanda/backup_map/{Oktoberfest.tscn => Oktoberfest_new.tscn} (99%) rename Amanda/backup_map/{chinese_ny.tscn => chinese_ny_new.tscn} (99%) create mode 100644 Florian/Map/Oktoberfest_new.tscn create mode 100644 Florian/Map/chinese_ny_new.tscn diff --git a/Amanda/Sprite assets/boy_c.png.import b/Amanda/Sprite assets/boy_c.png.import index 88883cd..429d54b 100644 --- a/Amanda/Sprite assets/boy_c.png.import +++ b/Amanda/Sprite assets/boy_c.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://dsb36yt01ism8" -path="res://.godot/imported/boy_c.png-f0c76c292502631bcce9bf421ab4f3d3.ctex" +path.s3tc="res://.godot/imported/boy_c.png-f0c76c292502631bcce9bf421ab4f3d3.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Amanda/Sprite assets/boy_c.png" -dest_files=["res://.godot/imported/boy_c.png-f0c76c292502631bcce9bf421ab4f3d3.ctex"] +dest_files=["res://.godot/imported/boy_c.png-f0c76c292502631bcce9bf421ab4f3d3.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 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/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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 diff --git a/Amanda/Sprite assets/dudes_c.png.import b/Amanda/Sprite assets/dudes_c.png.import index 532b583..32dd26e 100644 --- a/Amanda/Sprite assets/dudes_c.png.import +++ b/Amanda/Sprite assets/dudes_c.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://c2bjckk42lmdv" -path="res://.godot/imported/dudes_c.png-e91ff8c9a01ecfe0fe20a81ce920f6a0.ctex" +path.s3tc="res://.godot/imported/dudes_c.png-e91ff8c9a01ecfe0fe20a81ce920f6a0.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Amanda/Sprite assets/dudes_c.png" -dest_files=["res://.godot/imported/dudes_c.png-e91ff8c9a01ecfe0fe20a81ce920f6a0.ctex"] +dest_files=["res://.godot/imported/dudes_c.png-e91ff8c9a01ecfe0fe20a81ce920f6a0.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 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/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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 diff --git a/Amanda/Sprite assets/gong.png.import b/Amanda/Sprite assets/gong.png.import index c918092..373fe08 100644 --- a/Amanda/Sprite assets/gong.png.import +++ b/Amanda/Sprite assets/gong.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://clpk1kyxxomeu" -path="res://.godot/imported/gong.png-6970b7493a8e0553cb587855a4548fc6.ctex" +path.s3tc="res://.godot/imported/gong.png-6970b7493a8e0553cb587855a4548fc6.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Amanda/Sprite assets/gong.png" -dest_files=["res://.godot/imported/gong.png-6970b7493a8e0553cb587855a4548fc6.ctex"] +dest_files=["res://.godot/imported/gong.png-6970b7493a8e0553cb587855a4548fc6.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 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/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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 diff --git a/Amanda/Sprite assets/guy_c.png.import b/Amanda/Sprite assets/guy_c.png.import index fbf50c1..54e1478 100644 --- a/Amanda/Sprite assets/guy_c.png.import +++ b/Amanda/Sprite assets/guy_c.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://cvhuqx1h287yl" -path="res://.godot/imported/guy_c.png-337dadac388c4098758f49ec657b4bf0.ctex" +path.s3tc="res://.godot/imported/guy_c.png-337dadac388c4098758f49ec657b4bf0.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Amanda/Sprite assets/guy_c.png" -dest_files=["res://.godot/imported/guy_c.png-337dadac388c4098758f49ec657b4bf0.ctex"] +dest_files=["res://.godot/imported/guy_c.png-337dadac388c4098758f49ec657b4bf0.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 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/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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 diff --git a/Amanda/Sprite assets/lady_c.png.import b/Amanda/Sprite assets/lady_c.png.import index d282716..e0ed321 100644 --- a/Amanda/Sprite assets/lady_c.png.import +++ b/Amanda/Sprite assets/lady_c.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://d3k2udk0eh7qe" -path="res://.godot/imported/lady_c.png-7332f9621cbe05ee18347ddeb2a5d809.ctex" +path.s3tc="res://.godot/imported/lady_c.png-7332f9621cbe05ee18347ddeb2a5d809.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Amanda/Sprite assets/lady_c.png" -dest_files=["res://.godot/imported/lady_c.png-7332f9621cbe05ee18347ddeb2a5d809.ctex"] +dest_files=["res://.godot/imported/lady_c.png-7332f9621cbe05ee18347ddeb2a5d809.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 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/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,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 diff --git a/Amanda/backup_map/.DS_Store b/Amanda/backup_map/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c56bb7302b0a395b0fbae4d253f09822768d1533 GIT binary patch literal 6148 zcmeHK!Ait15PhS2Sn#r-2QNbW02lm&x>V4Upa+j?yA{Qyg>@J4)<5zS_01%TUCZK0 zL}ws*(`05cdC(*SKqkxSAus|kWK$GXdPIkNr#6!DCQ&R#g-2AlLXGF1K)-QFbKgdZ zJKQtt&-v>vDm-C~1$R}VKAkmXF>4BXC|yTv<5v@E!2b85Fy4}DO)+Qm8V9(=2`+Jt z8|2*;WN&4K9h~8T*)%BVJEy1SyD+}jW%{xbN3(Tt2AlzBz!~_z4DilY8E!@N-WhNP zoPiGp^n3_xidn)oq8%OVtOOtqIBY^)AIItw5@re8h@7EFbR|YtNhO9vcaDc-mnCc? zMt4XmJ|wODUc88{&iKL1Az4K4odIW{%YfFtl#$;5$NXh_i+nTj&KYn9{wf19$S?8< zcbD$gFZ