From 3dc8c78766f58cfb1546c7ecea78307ea4a7e095 Mon Sep 17 00:00:00 2001
From: LUCASTUCIOUS <peterlucas2804@gmail.com>
Date: Mon, 29 Jul 2024 15:40:26 +0200
Subject: [PATCH] Fix circular dependency

---
 maps/map1.tscn |  4 ++--
 maps/map2.tscn | 26 +++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/maps/map1.tscn b/maps/map1.tscn
index d2d13c1..148dc45 100644
--- a/maps/map1.tscn
+++ b/maps/map1.tscn
@@ -4,7 +4,7 @@
 [ext_resource type="Texture2D" uid="uid://cxharyv0ajr37" path="res://textures/atlas/DioramaEntrance_All_01_SPRT.png" id="2_n7y5f"]
 [ext_resource type="Script" path="res://core/Door.gd" id="3_f6bw5"]
 [ext_resource type="Texture2D" uid="uid://c5bd2ta3esnib" path="res://extracted/4010-A Tiny Sticker Tale review pic 1.jpg" id="3_yh2wy"]
-[ext_resource type="PackedScene" uid="uid://5tfe84u3gyty" path="res://maps/map2.tscn" id="4_2vdcy"]
+[ext_resource type="PackedScene" uid="uid://5tfe84u3gyty" path="res://maps/map2.tscn" id="4_0va10"]
 [ext_resource type="PackedScene" uid="uid://bddcriwo55x8k" path="res://prefab/prefab_woddenbridge.tscn" id="4_okpsn"]
 [ext_resource type="Texture2D" uid="uid://cun14l52f477p" path="res://textures/atlas/Bushes_All_01_SPRT.png" id="5_xmosd"]
 [ext_resource type="PackedScene" uid="uid://domcpxdf6lqpb" path="res://prefab/free_sticker.tscn" id="6_3fkbm"]
@@ -136,7 +136,7 @@ position = Vector2(-0.333333, 457.667)
 texture = SubResource("AtlasTexture_wi524")
 flip_h = true
 script = ExtResource("3_f6bw5")
-NextScene = ExtResource("4_2vdcy")
+NextScene = ExtResource("4_0va10")
 
 [node name="Area2D" type="Area2D" parent="Floors05Sprt/Door3"]
 monitorable = false
diff --git a/maps/map2.tscn b/maps/map2.tscn
index 9b12052..179b2ac 100644
--- a/maps/map2.tscn
+++ b/maps/map2.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=25 format=3 uid="uid://5tfe84u3gyty"]
+[gd_scene load_steps=26 format=3 uid="uid://5tfe84u3gyty"]
 
 [ext_resource type="Texture2D" uid="uid://bnmlngwnibfnj" path="res://extracted/ref_map2.jpg" id="1_cdv75"]
-[ext_resource type="PackedScene" uid="uid://wlqsvbqpcbh" path="res://maps/map1.tscn" id="2_cmc7k"]
 [ext_resource type="Texture2D" uid="uid://cypb81fuw4w44" path="res://textures/atlas/GroundExtensions_All_01_SPRT.png" id="3_54rqc"]
 [ext_resource type="Texture2D" uid="uid://6hc7x8qe6r1c" path="res://maps/map2.tres" id="3_gbt28"]
 [ext_resource type="PackedScene" uid="uid://domcpxdf6lqpb" path="res://prefab/free_sticker.tscn" id="4_2tdya"]
@@ -64,13 +63,18 @@ height = 230.8
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_o3kxg"]
 size = Vector2(201.89, 146.45)
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_ko6cw"]
+atlas = ExtResource("7_pykf8")
+region = Rect2(544, 1728, 416, 288)
+
+[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_4w4g8"]
+radius = 70.23
+height = 341.26
+
 [node name="Map2" type="Node2D"]
 z_as_relative = false
 y_sort_enabled = true
 
-[node name="Map1" parent="." instance=ExtResource("2_cmc7k")]
-visible = false
-
 [node name="Map2" type="Sprite2D" parent="."]
 z_index = -10
 position = Vector2(96, 688)
@@ -200,3 +204,15 @@ Position = Vector2(0, -89.77)
 CollisionShape = SubResource("RectangleShape2D_o3kxg")
 CollisionPosition = Vector2(0, -66.02)
 metadata/tags = ["rock"]
+
+[node name="Rock3" parent="." instance=ExtResource("6_k22qa")]
+position = Vector2(-1008, -1656)
+scale = Vector2(5, 5.195)
+texture = SubResource("AtlasTexture_ko6cw")
+offset = Vector2(-208.35, -260.555)
+StickerShape = SubResource("CapsuleShape2D_io0k5")
+Position = Vector2(0, -89.77)
+CollisionShape = SubResource("CapsuleShape2D_4w4g8")
+CollisionPosition = Vector2(0, -76.04)
+CollisionRotation = 1.6
+metadata/tags = ["rock"]