diff --git a/scenes/quests/story_quests/verso/assets/Wood_Walls.png.import b/scenes/quests/story_quests/verso/assets/Wood_Walls.png.import index 16205cc1f3..68f8d43419 100644 --- a/scenes/quests/story_quests/verso/assets/Wood_Walls.png.import +++ b/scenes/quests/story_quests/verso/assets/Wood_Walls.png.import @@ -2,7 +2,11 @@ importer="texture" type="CompressedTexture2D" +<<<<<<< Updated upstream uid="uid://cvgu3ba5aqd8i" +======= +uid="uid://b8mvwua51wbd4" +>>>>>>> Stashed changes path="res://.godot/imported/Wood_Walls.png-1e9fd772383acd42daf6957b52caa3e1.ctex" metadata={ "vram_texture": false diff --git a/scenes/quests/story_quests/verso/assets/teacher_desk.tscn b/scenes/quests/story_quests/verso/assets/teacher_desk.tscn new file mode 100644 index 0000000000..305aea4ce1 --- /dev/null +++ b/scenes/quests/story_quests/verso/assets/teacher_desk.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=2 format=3 uid="uid://b2gi1i8mpyp6x"] + +[ext_resource type="Texture2D" uid="uid://dqcacyxq3xdcx" path="res://assets/first_party/tiles/Teacher_Desk_Prop.png.png" id="1_h8tng"] + +[node name="StaticBody2D" type="StaticBody2D"] + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_h8tng") + +[node name="CollisionPolygon2D2" type="CollisionPolygon2D" parent="."] +polygon = PackedVector2Array(-66, -5, -50, 1, -33, 4, -9, 7, 3, 0, 9, -28, 4, -56, 2, -68, -2, -82, -25, -86, -41, -88, -56, -88, -63, -82, -67, -66, -67, -41, -70, -22) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] +position = Vector2(4, -159) +polygon = PackedVector2Array(-54, -16, -29, -14, -5, -16, 9, -28, 4, -56, 2, -68, -2, -82, -25, -86, -41, -88, -56, -88, -63, -82, -67, -66, -67, -41, -70, -22)