diff --git a/DungeonShooting_Godot/project.godot b/DungeonShooting_Godot/project.godot index 2cdff19..c5ef034 100644 --- a/DungeonShooting_Godot/project.godot +++ b/DungeonShooting_Godot/project.godot @@ -11,7 +11,7 @@ [application] config/name="DungeonShooting" -run/main_scene="res://scene/test/TestNavigation2.tscn" +run/main_scene="res://scene/Main.tscn" config/icon="res://icon.png" [autoload] diff --git a/DungeonShooting_Godot/resource/map/dungeon_test.tmx b/DungeonShooting_Godot/resource/map/dungeon_test.tmx index fb1ba2f..8d2cbc4 100644 --- a/DungeonShooting_Godot/resource/map/dungeon_test.tmx +++ b/DungeonShooting_Godot/resource/map/dungeon_test.tmx @@ -4,89 +4,45 @@ - - -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129 - - 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,39,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,14,51,12,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,41,51,51, 51,51,52,118,119,119,119,119,119,119,119,119,119,119,119,119,119,120,50,51,52,19,19,19,19,19,19,19,19,19,19,19,19,19,19,118,120,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,44,35,35,35,35,35,35,35,35,35,35,36,0,0,34,35,46,51,44,35,36,0,0,34,35,35,35,35,35,35,35,35,35,35,35,46,51,51, -51,51,12,99,99,99,99,99,99,99,99,99,99,100,0,0,98,99,99,99,99,99,100,0,0,98,99,99,99,99,99,99,99,99,99,99,99,14,51,51, -51,51,52,19,19,19,19,19,19,19,19,19,19,20,0,0,18,19,19,19,19,19,20,0,0,18,19,19,19,19,19,19,19,19,19,19,19,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,44,35,35,36,0,0,34,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,36,0,0,34,35,35,46,51,51, -51,51,12,99,99,100,0,0,98,99,99,99,99,99,99,99,99,99,41,51,39,99,99,99,99,99,99,99,99,99,99,100,0,0,98,99,99,14,51,51, -51,51,52,19,19,20,0,0,117,118,118,118,118,118,118,118,118,119,50,51,52,19,19,19,19,19,19,19,19,19,19,20,0,0,18,19,19,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,98,99,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,19,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,35,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, -51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,44,35,35,35,35,35,35,35,35,35,35,36,129,129,34,35,46,51,44,35,36,129,129,34,35,35,35,35,35,35,35,35,35,35,35,46,51,51, +51,51,12,99,99,99,99,99,99,99,99,99,99,100,129,129,98,99,99,99,99,99,100,129,129,98,99,99,99,99,99,99,99,99,99,99,99,14,51,51, +51,51,52,19,19,19,19,19,19,19,19,19,19,20,129,129,18,19,19,19,19,19,20,129,129,18,19,19,19,19,19,19,19,19,19,19,19,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,44,35,35,36,129,129,34,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,36,129,129,34,35,35,46,51,51, +51,51,12,99,99,100,129,129,98,99,99,99,99,99,99,99,99,99,41,51,39,99,99,99,99,99,99,99,99,99,99,100,129,129,98,99,99,14,51,51, +51,51,52,19,19,20,129,129,117,118,118,118,118,118,118,118,118,119,50,51,52,19,19,19,19,19,19,19,19,19,19,20,129,129,18,19,19,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,98,99,100,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,18,19,20,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,34,35,36,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, +51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, 51,51,44,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,46,51,44,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,46,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51