diff --git a/assets/sprites/etagere.png b/assets/sprites/etagere.png new file mode 100755 index 0000000..64a7bc2 Binary files /dev/null and b/assets/sprites/etagere.png differ diff --git a/assets/sprites/etagere.png.import b/assets/sprites/etagere.png.import new file mode 100644 index 0000000..681d1b7 --- /dev/null +++ b/assets/sprites/etagere.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bd7x4n7nxdi4d" +path="res://.godot/imported/etagere.png-d6787c709e1a0f552478997fd5bc75ef.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/etagere.png" +dest_files=["res://.godot/imported/etagere.png-d6787c709e1a0f552478997fd5bc75ef.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/sprites/etagere_side.png b/assets/sprites/etagere_side.png new file mode 100755 index 0000000..0b1306a Binary files /dev/null and b/assets/sprites/etagere_side.png differ diff --git a/assets/sprites/etagere_side.png.import b/assets/sprites/etagere_side.png.import new file mode 100644 index 0000000..be86b55 --- /dev/null +++ b/assets/sprites/etagere_side.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c64p3d7gi6mwm" +path="res://.godot/imported/etagere_side.png-ff2abe948b42b656ce1d957de384ae00.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/etagere_side.png" +dest_files=["res://.godot/imported/etagere_side.png-ff2abe948b42b656ce1d957de384ae00.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/tilesets/atelier-tilesets.png b/assets/tilesets/atelier-tilesets.png new file mode 100755 index 0000000..5ec3e45 Binary files /dev/null and b/assets/tilesets/atelier-tilesets.png differ diff --git a/assets/tilesets/atelier-tilesets.png.import b/assets/tilesets/atelier-tilesets.png.import new file mode 100644 index 0000000..3e0a175 --- /dev/null +++ b/assets/tilesets/atelier-tilesets.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4pvp7nc4ny8c" +path="res://.godot/imported/atelier-tilesets.png-8e6d2d4fc1f2b5c93ca657898230e932.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/tilesets/atelier-tilesets.png" +dest_files=["res://.godot/imported/atelier-tilesets.png-8e6d2d4fc1f2b5c93ca657898230e932.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/levels/entrepot/entrepot.tscn b/levels/entrepot/entrepot.tscn index 1fd7ce2..a427aa5 100644 --- a/levels/entrepot/entrepot.tscn +++ b/levels/entrepot/entrepot.tscn @@ -11,6 +11,7 @@ [ext_resource type="PackedScene" uid="uid://c52luh50w8hi2" path="res://levels/unlock_zone.tscn" id="8_dm063"] [ext_resource type="PackedScene" uid="uid://fftu7ne6spjy" path="res://levels/entrepot/etagere.tscn" id="9_sju6u"] [ext_resource type="PackedScene" uid="uid://do61r73dbypfd" path="res://levels/journal.tscn" id="10_b870l"] +[ext_resource type="PackedScene" uid="uid://cnoxfjk01qhjj" path="res://levels/entrepot/etagere_side.tscn" id="11_2edww"] [ext_resource type="PackedScene" uid="uid://ceijd4gd1rxos" path="res://levels/entrepot/door.tscn" id="11_squor"] [ext_resource type="PackedScene" uid="uid://b1peufx15gr0v" path="res://levels/loading_zone.tscn" id="13_2edww"] @@ -117,7 +118,7 @@ texture_region_size = Vector2i(32, 32) 4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -16, -16, -16, -16, 16, -8, 16) 4:1/0/terrains_peering_bit/top_left_corner = 0 4:2/0 = 0 -4:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-12, -4, 12, -4, 12, 12, -12, 12) +4:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-12, -16, 12, -16, 12, 12, -12, 12) 2:0/0 = 0 2:0/0/terrain_set = 0 2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) @@ -161,7 +162,7 @@ position = Vector2(-118, 137) [node name="Vrac7" parent="." unique_id=829712169 instance=ExtResource("3_jr8qv")] z_index = 500 -position = Vector2(56, 379) +position = Vector2(97, 245) [node name="Map" type="Node" parent="." unique_id=306161900] @@ -194,34 +195,73 @@ tile_map_data = PackedByteArray("AAAFAAQAAAAEAAIAAAAZAAQAAAAEAAIAAAAbAAQAAAAEAAI tile_set = SubResource("TileSet_jr8qv") [node name="Other" type="TileMapLayer" parent="Map" unique_id=985720640] +tile_map_data = PackedByteArray("AAAQABwAAAAEAAIAAAASABwAAAAEAAIAAAAUABwAAAAEAAIAAAAWABwAAAAEAAIAAAAYABwAAAAEAAIAAAAaABwAAAAEAAIAAAAcABwAAAAEAAIAAAAeABwAAAAEAAIAAAASAB4AAAAEAAIAAAAQAB4AAAAEAAIAAAAYAB4AAAAEAAIAAAA=") tile_set = SubResource("TileSet_jr8qv") -[node name="Engrenage" parent="Map" unique_id=46489013 instance=ExtResource("7_1p1pm")] -position = Vector2(167, 263) +[node name="Etageres" type="Node" parent="Map" unique_id=1557456418] + +[node name="Etagere" parent="Map/Etageres" unique_id=2130339636 instance=ExtResource("9_sju6u")] +position = Vector2(448, 278) + +[node name="Etagere4" parent="Map/Etageres" unique_id=634752017 instance=ExtResource("9_sju6u")] +position = Vector2(294, 371) + +[node name="Etagere2" parent="Map/Etageres" unique_id=1943291775 instance=ExtResource("9_sju6u")] +z_index = 4 +position = Vector2(175, 118) + +[node name="Etagere3" parent="Map/Etageres" unique_id=565472517 instance=ExtResource("9_sju6u")] +z_index = 4 +position = Vector2(318, 119) + +[node name="EtagereSide" parent="Map/Etageres" unique_id=1220106226 instance=ExtResource("11_2edww")] +position = Vector2(374, 354) + +[node name="EtagereSide2" parent="Map/Etageres" unique_id=218887748 instance=ExtResource("11_2edww")] +z_index = 6 +position = Vector2(30, 211) + +[node name="EtagereSide3" parent="Map/Etageres" unique_id=904564979 instance=ExtResource("11_2edww")] +z_index = 6 +position = Vector2(30, 300) + +[node name="EtagereSide4" parent="Map/Etageres" unique_id=344487406 instance=ExtResource("11_2edww")] +z_index = 1 +position = Vector2(30, 611) + +[node name="Etagere5" parent="Map/Etageres" unique_id=466280721 instance=ExtResource("9_sju6u")] +z_index = 6 +position = Vector2(52, 378) + +[node name="Etagere6" parent="Map/Etageres" unique_id=373335979 instance=ExtResource("9_sju6u")] +z_index = 6 +position = Vector2(448, 539) + +[node name="Etagere7" parent="Map/Etageres" unique_id=1276472907 instance=ExtResource("9_sju6u")] +z_index = 6 +position = Vector2(349, 537) + +[node name="Etagere8" parent="Map/Etageres" unique_id=1382502295 instance=ExtResource("9_sju6u")] +z_index = 6 +position = Vector2(250, 537) + +[node name="Etagere9" parent="Map/Etageres" unique_id=836648891 instance=ExtResource("9_sju6u")] +position = Vector2(58, 558) [node name="HiddenEngrenage" parent="Map" unique_id=1691516870 instance=ExtResource("7_1p1pm")] visible = false position = Vector2(455, 328) [node name="PushableBox" parent="Map" unique_id=418482729 instance=ExtResource("7_dm063")] -position = Vector2(392, 420) +position = Vector2(264, 422) [node name="UnlockZone" parent="Map" unique_id=448954065 instance=ExtResource("8_dm063")] position = Vector2(458, 376) scale = Vector2(5, 6.5) node_to_reveal = NodePath("../HiddenEngrenage") -[node name="Etagere" parent="Map" unique_id=2130339636 instance=ExtResource("9_sju6u")] -position = Vector2(408, 277) - -[node name="Etagere2" parent="Map" unique_id=1943291775 instance=ExtResource("9_sju6u")] -position = Vector2(184, 83) - -[node name="Etagere3" parent="Map" unique_id=565472517 instance=ExtResource("9_sju6u")] -position = Vector2(312, 85) - [node name="Journal" parent="Map" unique_id=2014306468 instance=ExtResource("10_b870l")] -position = Vector2(456, 199) +position = Vector2(456, 583) [node name="Player" parent="." unique_id=628518902 instance=ExtResource("2_n70cd")] z_index = 1 @@ -232,6 +272,6 @@ z_index = 10 position = Vector2(264, 632) [node name="LoadingZone" parent="." unique_id=2123510357 instance=ExtResource("13_2edww")] -z_index = 4096 -position = Vector2(263, 652) -scale = Vector2(2, 1.2) +z_index = 100 +position = Vector2(264, 649) +scale = Vector2(2, 1.5) diff --git a/levels/entrepot/etagere.tscn b/levels/entrepot/etagere.tscn index 32598f6..03b173b 100644 --- a/levels/entrepot/etagere.tscn +++ b/levels/entrepot/etagere.tscn @@ -1,15 +1,16 @@ [gd_scene format=3 uid="uid://fftu7ne6spjy"] -[ext_resource type="Texture2D" uid="uid://b4v24viojafdc" path="res://assets/tilesets/etagere.png" id="1_pfmsg"] +[ext_resource type="Texture2D" uid="uid://bd7x4n7nxdi4d" path="res://assets/sprites/etagere.png" id="1_pfmsg"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_u2a1m"] -size = Vector2(59, 61) +size = Vector2(92.5, 42.5) [node name="Etagere" type="StaticBody2D" unique_id=2130339636] [node name="Sprite2D" type="Sprite2D" parent="." unique_id=1345709968] +position = Vector2(-1, -32) texture = ExtResource("1_pfmsg") [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=39604345] -position = Vector2(-0.5, 0.5) +position = Vector2(-1.25, 8.25) shape = SubResource("RectangleShape2D_u2a1m") diff --git a/levels/entrepot/etagere_side.tscn b/levels/entrepot/etagere_side.tscn new file mode 100644 index 0000000..bad644f --- /dev/null +++ b/levels/entrepot/etagere_side.tscn @@ -0,0 +1,16 @@ +[gd_scene format=3 uid="uid://cnoxfjk01qhjj"] + +[ext_resource type="Texture2D" uid="uid://c64p3d7gi6mwm" path="res://assets/sprites/etagere_side.png" id="1_hc71k"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_u2a1m"] +size = Vector2(49.25, 69.125) + +[node name="Etagere" type="StaticBody2D" unique_id=2130339636] + +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1345709968] +position = Vector2(-1, -32) +texture = ExtResource("1_hc71k") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=39604345] +position = Vector2(-1, 11.4375) +shape = SubResource("RectangleShape2D_u2a1m")