diff --git a/ExternalMaterial/Shelf/Shelf.png b/ExternalMaterial/Shelf/Shelf.png new file mode 100644 index 00000000..cc71b791 --- /dev/null +++ b/ExternalMaterial/Shelf/Shelf.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c48536407935698931310528579cc30e79d58bc9d852b4e76f363fbd08bbfaa4 +size 382 diff --git a/ExternalMaterial/Shelf/Shelf.png.import b/ExternalMaterial/Shelf/Shelf.png.import new file mode 100644 index 00000000..bbc85823 --- /dev/null +++ b/ExternalMaterial/Shelf/Shelf.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://brgym86p3dt2k" +path="res://.godot/imported/Shelf.png-2a0dcac1f1045ae6747d0caf01fcd9af.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ExternalMaterial/Shelf/Shelf.png" +dest_files=["res://.godot/imported/Shelf.png-2a0dcac1f1045ae6747d0caf01fcd9af.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 diff --git a/ExternalMaterial/Shelf/Shelf.pxc b/ExternalMaterial/Shelf/Shelf.pxc new file mode 100644 index 00000000..bdf14dac Binary files /dev/null and b/ExternalMaterial/Shelf/Shelf.pxc differ diff --git a/ExternalMaterial/Shelf/Shelf.pxc1 b/ExternalMaterial/Shelf/Shelf.pxc1 new file mode 100644 index 00000000..cb288520 Binary files /dev/null and b/ExternalMaterial/Shelf/Shelf.pxc1 differ diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index 497ef76d..28b7cc0a 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=88 format=4 uid="uid://6a6tjohypmmb"] +[gd_scene load_steps=89 format=4 uid="uid://6a6tjohypmmb"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"] @@ -45,6 +45,7 @@ [ext_resource type="PackedScene" uid="uid://ey71mxa5ocpn" path="res://Scenes/Items/Shield_Extend_Pickup.tscn" id="37_5j8ks"] [ext_resource type="PackedScene" uid="uid://dfat0erkvb513" path="res://Scenes/Actors/Fairy_New.tscn" id="37_sb7g3"] [ext_resource type="PackedScene" uid="uid://1yxieu8ekvkm" path="res://Scenes/Items/Heart_Extend_Pickup.tscn" id="38_sb7g3"] +[ext_resource type="PackedScene" uid="uid://cqi87wcxymbhx" path="res://Scenes/Props/Shelf.tscn" id="40_sb7g3"] [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_s1vkf") @@ -592,6 +593,9 @@ Target = NodePath("../Elevator3") position = Vector2(-504, 912) Targets = [NodePath("../Elevator2")] +[node name="Shelf" parent="Tilemaps/Actors" instance=ExtResource("40_sb7g3")] +position = Vector2(-227, 156) + [node name="ControlPad8" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")] position = Vector2(-500, 727) Targets = [NodePath("../Elevator2")] diff --git a/Scenes/Props/Shelf.tscn b/Scenes/Props/Shelf.tscn new file mode 100644 index 00000000..56afc32d --- /dev/null +++ b/Scenes/Props/Shelf.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://cqi87wcxymbhx"] + +[ext_resource type="Texture2D" uid="uid://brgym86p3dt2k" path="res://ExternalMaterial/Shelf/Shelf.png" id="1_nt0bt"] + +[node name="Shelf" type="Node2D"] + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_nt0bt")