diff --git a/Scenes/DungeonScene/dungeon_scene.tscn b/Scenes/DungeonScene/dungeon_scene.tscn index 24ce1a0..1c96141 100644 --- a/Scenes/DungeonScene/dungeon_scene.tscn +++ b/Scenes/DungeonScene/dungeon_scene.tscn @@ -661,13 +661,16 @@ sources/0 = SubResource("TileSetAtlasSource_6f4q3") sources/1 = SubResource("TileSetAtlasSource_102mq") [node name="DungeonScene" type="Node2D" unique_id=1981353208] +metadata/_edit_vertical_guides_ = [45.0, 45.0] +metadata/_edit_horizontal_guides_ = [-29.0] [node name="FloorLayer" type="TileMapLayer" parent="." unique_id=2022137133] tile_map_data = PackedByteArray("AAAEAAEAAAAMAAEAAAAEAAAAAAAMAAEAAAAEAP//AAAMAAEAAAAEAP7/AAAMAAEAAAAEAP3/AAAMAAEAAAAEAPz/AAAMAAAAAAADAAEAAAAMAAEAAAADAAAAAAAMAAEAAAADAP//AAAMAAEAAAADAP7/AAAMAAEAAAADAP3/AAAMAAEAAAADAPz/AAAMAAAAAAACAAEAAAAMAAEAAAACAAAAAAAMAAEAAAACAP//AAAMAAEAAAACAP7/AAAMAAEAAAACAP3/AAAMAAEAAAACAPz/AAAMAAEAAAABAAEAAAAMAAEAAAABAAAAAAAMAAEAAAABAP//AAAMAAEAAAABAP7/AAAMAAEAAAABAP3/AAAMAAEAAAABAPz/AAAMAAEAAAAAAAEAAAAMAAEAAAAAAAAAAAAMAAEAAAAAAP//AAAMAAEAAAAAAP7/AAAMAAEAAAAAAP3/AAAMAAEAAAAAAPz/AAAMAAEAAAD//wEAAAAMAAEAAAD//wAAAAAMAAEAAAD/////AAAMAAEAAAD///7/AAAMAAEAAAD///3/AAAMAAEAAAD///z/AAAMAAEAAAD+/wEAAAALAAEAAAD+/wAAAAALAAEAAAD+////AAALAAEAAAD+//7/AAALAAEAAAD+//3/AAALAAEAAAD+//z/AAALAAAAAAAFAAMAAAANAAIAAAAFAAIAAAANAAEAAAAFAAEAAAAMAAEAAAAFAAAAAAAMAAEAAAAFAP//AAAMAAEAAAAFAP7/AAAMAAEAAAAFAP3/AAAMAAEAAAAFAPz/AAAMAAEAAAAEAAMAAAAMAAIAAAAEAAIAAAAMAAEAAAADAAMAAAAMAAIAAAADAAIAAAAMAAEAAAACAAMAAAAMAAIAAAACAAIAAAAMAAEAAAABAAMAAAAMAAIAAAABAAIAAAAMAAEAAAAAAAMAAAAMAAIAAAAAAAIAAAAMAAEAAAD//wMAAAAMAAIAAAD//wIAAAAMAAEAAAD+/wMAAAALAAIAAAD+/wIAAAALAAEAAAACAPv/AAAMAAEAAAACAPr/AAAMAAEAAAACAPn/AAAMAAEAAAACAPj/AAAMAAEAAAACAPf/AAAMAAEAAAACAPb/AAAMAAEAAAACAPX/AAAMAAEAAAABAPv/AAAMAAEAAAABAPr/AAAMAAEAAAABAPn/AAAMAAEAAAABAPj/AAAMAAEAAAABAPf/AAAMAAEAAAABAPb/AAAMAAEAAAABAPX/AAAMAAEAAAAAAPv/AAAMAAEAAAAAAPr/AAAMAAEAAAAAAPn/AAAMAAEAAAAAAPj/AAAMAAEAAAAAAPf/AAAMAAEAAAAAAPb/AAAMAAEAAAAAAPX/AAAMAAEAAAD///v/AAAMAAEAAAD///r/AAAMAAEAAAD///n/AAAMAAEAAAD///j/AAAMAAEAAAD///f/AAALAAEAAAD///b/AAAMAAEAAAD///X/AAAMAAEAAAD7//j/AAANAAIAAAD7//f/AAANAAEAAAD7//b/AAAMAAEAAAD7//X/AAAMAAEAAAD7//T/AAANAAEAAAD7//P/AAANAAAAAAD6//j/AAAMAAIAAAD6//f/AAAMAAEAAAD6//b/AAAMAAEAAAD6//X/AAAMAAEAAAD6//T/AAAMAAEAAAD6//P/AAAMAAEAAAD5//j/AAAMAAIAAAD5//f/AAAMAAEAAAD5//b/AAAMAAEAAAD5//X/AAAMAAEAAAD5//T/AAAMAA0AAAD5//P/AAAMAAEAAAD4//j/AAAMAAIAAAD4//f/AAAMAAEAAAD4//b/AAAMAAEAAAD4//X/AAAMAAEAAAD4//T/AAAMAAEAAAD4//P/AAAMAAEAAAD3//j/AAAMAAIAAAD3//f/AAAMAAEAAAD3//b/AAAMAAEAAAD3//X/AAAMAAEAAAD3//T/AAAMAAEAAAD3//P/AAAMAAAAAAD2//j/AAAMAAIAAAD2//f/AAAMAAEAAAD2//b/AAAMAAEAAAD2//X/AAAMAAEAAAD2//T/AAAMAAEAAAD2//P/AAAMAAAAAAD1//j/AAALAAIAAAD1//f/AAALAAEAAAD1//b/AAALAAEAAAD1//X/AAALAAEAAAD1//T/AAALAAEAAAD1//P/AAALAAAAAAD+//b/AAAMAAEAAAD+//X/AAAMAAAAAAD9//b/AAAMAAEAAAD9//X/AAAMAAAAAAD8//b/AAAMAAEAAAD8//X/AAAMAAAAAAANAPf/AAAMAAIAAAANAPb/AAAMAAEAAAANAPX/AAAMAAEAAAANAPT/AAAMAAEAAAANAPP/AAAMAAAAAAAMAPf/AAAMAAIAAAAMAPb/AAAMAAEAAAAMAPX/AAAMAAEAAAAMAPT/AAAMAAEAAAAMAPP/AAAMAAAAAAALAPf/AAAMAAIAAAALAPb/AAAMAAEAAAALAPX/AAAMAAEAAAALAPT/AAAMAAEAAAALAPP/AAAMAAAAAAAKAPf/AAAMAAEAAAAKAPb/AAAMAAEAAAAKAPX/AAAMAAEAAAAKAPT/AAAMAAEAAAAKAPP/AAAMAAAAAAAJAPf/AAAMAAEAAAAJAPb/AAAMAAEAAAAJAPX/AAAMAAEAAAAJAPT/AAAMAAEAAAAJAPP/AAAMAAAAAAAIAPf/AAAMAAEAAAAIAPb/AAAMAAEAAAAIAPX/AAAMAAEAAAAIAPT/AAAMAAEAAAAIAPP/AAAMAAAAAAAHAPf/AAAMAAIAAAAHAPb/AAAMAAEAAAAHAPX/AAAMAAEAAAAHAPT/AAAMAAEAAAAHAPP/AAAMAAAAAAAGAPf/AAAMAAIAAAAGAPb/AAAMAAEAAAAGAPX/AAAMAAEAAAAGAPT/AAAMAAEAAAAGAPP/AAAMAAAAAAAFAPf/AAAMAAIAAAAFAPb/AAAMAAEAAAAFAPX/AAAMAAEAAAAFAPT/AAAMAAEAAAAFAPP/AAAMAAAAAAAEAPf/AAAMAAIAAAAEAPb/AAAMAAEAAAAEAPX/AAAMAAEAAAAEAPT/AAAMAAEAAAAEAPP/AAAMAAAAAAADAPf/AAAMAAIAAAADAPb/AAAMAAEAAAADAPX/AAAMAAEAAAADAPT/AAAMAAEAAAADAPP/AAAMAAAAAAACAPT/AAAMAAEAAAACAPP/AAAMAAAAAAABAPT/AAAMAAEAAAABAPP/AAAMAAAAAAAAAPT/AAAMAAEAAAAAAPP/AAAMAAAAAAD///T/AAAMAAEAAAD///P/AAAMAAAAAAAOAPf/AAANAAIAAAAOAPb/AAANAAEAAAAOAPX/AAANAAEAAAAOAPT/AAANAAEAAAAOAPP/AAANAAAAAAAKAPn/AAAMAAEAAAAKAPj/AAANAAEAAAAJAPn/AAAMAAEAAAAJAPj/AAAMAAEAAAAIAPn/AAAMAAEAAAAIAPj/AAALAAEAAAAQAAEAAAANAAIAAAAQAAAAAAANAAEAAAAQAP//AAANAAEAAAAQAP7/AAANAAEAAAAQAP3/AAANAAEAAAAQAPz/AAANAAEAAAAQAPv/AAANAAEAAAAQAPr/AAANAAEAAAAQAPn/AAANAAAAAAAPAAEAAAAMAAIAAAAPAAAAAAAMAAEAAAAPAP//AAAMAAEAAAAPAP7/AAAMAAEAAAAPAP3/AAAMAAEAAAAPAPz/AAAMAAEAAAAPAPv/AAAMAAEAAAAPAPr/AAAMAAEAAAAPAPn/AAAMAAAAAAAOAAEAAAAMAAIAAAAOAAAAAAAMAAEAAAAOAP//AAAMAAEAAAAOAP7/AAAMAAEAAAAOAP3/AAAMAAEAAAAOAPz/AAAMAAEAAAAOAPv/AAAMAAEAAAAOAPr/AAAMAAEAAAAOAPn/AAAMAAAAAAANAAEAAAAMAAIAAAANAAAAAAAMAAEAAAANAP//AAAMAAEAAAANAP7/AAAMAAEAAAANAP3/AAAMAAEAAAANAPz/AAAMAAEAAAANAPv/AAAMAAEAAAANAPr/AAAMAAEAAAANAPn/AAAMAAAAAAAMAAEAAAAMAAIAAAAMAAAAAAAMAAEAAAAMAP//AAAMAAEAAAAMAP7/AAAMAAEAAAAMAP3/AAAMAAEAAAAMAPz/AAAMAAEAAAAMAPv/AAAMAAEAAAAMAPr/AAAMAAEAAAAMAPn/AAAMAAAAAAALAAEAAAAMAAIAAAALAAAAAAAMAAEAAAALAP//AAAMAAEAAAALAP7/AAAMAAEAAAALAP3/AAAMAAEAAAALAPz/AAAMAAEAAAALAPv/AAAMAAEAAAALAPr/AAAMAAEAAAALAPn/AAAMAAAAAAAKAAEAAAAMAAIAAAAKAAAAAAAMAAEAAAAKAP//AAAMAAEAAAAKAP7/AAAMAAEAAAAKAP3/AAAMAAEAAAAKAPz/AAAMAAEAAAAKAPv/AAAMAAEAAAAKAPr/AAAMAAEAAAAJAAEAAAAMAAIAAAAJAAAAAAAMAAEAAAAJAP//AAAMAAEAAAAJAP7/AAAMAAEAAAAJAP3/AAAMAAEAAAAJAPz/AAAMAAEAAAAJAPv/AAAMAAEAAAAJAPr/AAAMAAEAAAAIAAEAAAAMAAIAAAAIAAAAAAAMAAEAAAAIAP//AAAMAAEAAAAIAP7/AAAMAAEAAAAIAP3/AAAMAAEAAAAIAPz/AAAMAAEAAAAIAPv/AAAMAAEAAAAIAPr/AAAMAAEAAAAHAAEAAAAMAAIAAAAHAAAAAAAMAAEAAAAHAP//AAAMAAEAAAAHAP7/AAAMAAEAAAAHAP3/AAAMAAEAAAAHAPz/AAAMAAEAAAAHAPv/AAAMAAEAAAAHAPr/AAAMAAEAAAAHAPn/AAAMAAEAAAAGAAEAAAAMAAIAAAAGAAAAAAAMAAEAAAAGAP//AAAMAAEAAAAGAP7/AAAMAAEAAAAGAP3/AAAMAAEAAAAGAPz/AAAMAAEAAAAGAPv/AAAMAAEAAAAGAPr/AAAMAAEAAAAGAPn/AAAMAAEAAAAFAPv/AAAMAAEAAAAFAPr/AAAMAAEAAAAFAPn/AAAMAAEAAAD4//L/AAAMAAEAAAD4//H/AAALAA0AAAD4//D/AAAMAAEAAAD4/+//AAAMAA0AAAD4/+7/AAALAAwAAAD2/+7/AAALAAEAAAD3/+7/AAANAAwAAAD4/+3/AAALAAIAAAD5/+3/AAANAA0AAAD6/+3/AAANAAAAAAD6/+7/AAANAAEAAAD5/+7/AAAMAAEAAAD6/+//AAAMAA0AAAD7/+//AAANAA4AAAD5/+//AAAMAAEAAAD3//D/AAAMAA4AAAD3/+//AAAMAA0AAAD2/+//AAALAA0AAAD2//D/AAALAAIAAAD5//D/AAAMAA0AAAD5//H/AAAMAAEAAAD6//H/AAANAA0AAAD6//D/AAANAAEAAAD6//L/AAAMAA0AAAD5//L/AAAMAAEAAAAKAAYAAAAMAAEAAAAKAAUAAAAMAAEAAAAKAAQAAAANAA4AAAAKAAMAAAANAAEAAAAKAAIAAAANAAEAAAAMAAcAAAANAA4AAAAMAAYAAAANAA0AAAAMAAUAAAANAAwAAAALAAcAAAAMAAIAAAALAAYAAAAMAAEAAAALAAUAAAAMAAAAAAAKAAcAAAAMAA4AAAAJAAcAAAAMAAIAAAAJAAYAAAAMAA0AAAAJAAUAAAAMAAEAAAAIAAcAAAALAAIAAAAIAAYAAAALAAEAAAAIAAUAAAALAA0AAAA=") tile_set = SubResource("TileSet_ilnae") [node name="SceneEntrance" parent="." unique_id=1734357035 instance=ExtResource("1_xuufh")] -position = Vector2(-120, -264) +position = Vector2(45, -32) +collision_mask = 1 next_scene = "res://Scenes/GameScene/game_scene.tscn" player_spawn_pos = Vector2(137, -95) diff --git a/Scenes/GameScene/game_scene.tscn b/Scenes/GameScene/game_scene.tscn index 0dab0e1..4650855 100644 --- a/Scenes/GameScene/game_scene.tscn +++ b/Scenes/GameScene/game_scene.tscn @@ -843,6 +843,7 @@ position = Vector2(-79, -19) [node name="SceneEntrance" parent="." unique_id=1734357035 instance=ExtResource("5_oi8ly")] position = Vector2(137, -107) +collision_mask = 1 [node name="LockedDoor" parent="." unique_id=964088255 instance=ExtResource("6_elpgg")] position = Vector2(137, -107) diff --git a/Scenes/SceneEntrance/scene_entrance.gd b/Scenes/SceneEntrance/scene_entrance.gd index 768ddab..98ce822 100644 --- a/Scenes/SceneEntrance/scene_entrance.gd +++ b/Scenes/SceneEntrance/scene_entrance.gd @@ -14,7 +14,7 @@ func _process(delta: float) -> void: func _on_body_entered(body: Player) -> void: print("body entered!") - $"/root/SceneManager".player_next_scene_spawn_pos = player_spawn_pos + SceneManager.player_next_scene_spawn_pos = player_spawn_pos get_tree().change_scene_to_file.call_deferred(next_scene) pass # Replace with function body. diff --git a/Scenes/TreasureChest/treasure_chest.gd b/Scenes/TreasureChest/treasure_chest.gd index f924a32..f604299 100644 --- a/Scenes/TreasureChest/treasure_chest.gd +++ b/Scenes/TreasureChest/treasure_chest.gd @@ -9,6 +9,7 @@ func _ready() -> void: scroll_number = randi_range(1, 4) if SceneManager.opened_chests.has(name): is_open = true + $AnimatedSprite2D.play("open") func _process(delta: float) -> void: if Input.is_action_just_pressed("Interact") and can_interact: @@ -16,12 +17,9 @@ func _process(delta: float) -> void: $Timer.start() $AudioStreamPlayer.play() $AnimatedSprite2D.play("open") - print("found sprite num: ", scroll_number) scrolls[scroll_number].visible = true is_open = true SceneManager.opened_chests.append(name) - print(SceneManager.opened_chests) func _on_timer_timeout() -> void: - print("removing sprite: ", scroll_number) scrolls[scroll_number].visible = false