diff --git a/Main.tscn b/Main.tscn index b2a6f06..c203524 100644 --- a/Main.tscn +++ b/Main.tscn @@ -475,3 +475,4 @@ script = ExtResource( 10 ) [node name="BgmSound" type="AudioStreamPlayer2D" parent="."] stream = ExtResource( 5 ) volume_db = -10.0 +[connection signal="popup_hide" from="HUD/BookDialog" to="HUD/BookDialog/ScrollContainer" method="_on_BookDialog_popup_hide"] diff --git a/src/levels/Level1.tscn b/src/levels/Level1.tscn index 0c69316..b1a490e 100644 --- a/src/levels/Level1.tscn +++ b/src/levels/Level1.tscn @@ -87,43 +87,54 @@ position = Vector2( 114.1, 432 ) [node name="Monster" parent="Items" instance=ExtResource( 6 )] position = Vector2( 112, 144 ) +frame = 1 [node name="Monster2" parent="Items" instance=ExtResource( 6 )] position = Vector2( 144, 144 ) animation = "redSlime" +frame = 1 [node name="Monster4" parent="Items" instance=ExtResource( 6 )] position = Vector2( 336, 432 ) animation = "bat" +frame = 1 [node name="Monster9" parent="Items" instance=ExtResource( 6 )] position = Vector2( 240, 304 ) animation = "bat" +frame = 1 [node name="Monster10" parent="Items" instance=ExtResource( 6 )] position = Vector2( 272, 304 ) animation = "bluePriest" +frame = 1 [node name="Monster11" parent="Items" instance=ExtResource( 6 )] position = Vector2( 304, 304 ) animation = "bat" +frame = 1 [node name="Monster7" parent="Items" instance=ExtResource( 6 )] position = Vector2( 80, 240 ) animation = "skeleton" +frame = 1 [node name="Monster8" parent="Items" instance=ExtResource( 6 )] position = Vector2( 80, 336 ) animation = "skeletonSoilder" +frame = 1 [node name="Monster5" parent="Items" instance=ExtResource( 6 )] position = Vector2( 306.1, 464 ) +frame = 1 [node name="Monster6" parent="Items" instance=ExtResource( 6 )] position = Vector2( 368, 464 ) +frame = 1 [node name="Monster3" parent="Items" instance=ExtResource( 6 )] position = Vector2( 176, 144 ) +frame = 1 [node name="Stairs" parent="Items" instance=ExtResource( 3 )] position = Vector2( 48, 144 ) diff --git a/src/levels/Level3.tscn b/src/levels/Level3.tscn index 638b7e5..e06242f 100644 --- a/src/levels/Level3.tscn +++ b/src/levels/Level3.tscn @@ -92,32 +92,26 @@ position = Vector2( 368, 464 ) [node name="MonsterSprite" parent="Items" instance=ExtResource( 16 )] position = Vector2( 240, 272 ) -frame = 1 [node name="MonsterSprite2" parent="Items" instance=ExtResource( 16 )] position = Vector2( 112, 272 ) animation = "bat" -frame = 1 [node name="MonsterSprite6" parent="Items" instance=ExtResource( 16 )] position = Vector2( 336, 176 ) animation = "bat" -frame = 1 [node name="MonsterSprite3" parent="Items" instance=ExtResource( 16 )] position = Vector2( 48, 208 ) animation = "bluePriest" -frame = 1 [node name="MonsterSprite5" parent="Items" instance=ExtResource( 16 )] position = Vector2( 336, 368 ) animation = "bluePriest" -frame = 1 [node name="MonsterSprite4" parent="Items" instance=ExtResource( 16 )] position = Vector2( 48, 336 ) animation = "skeleton" -frame = 1 [node name="YellowDoor5" parent="Items" instance=ExtResource( 8 )] position = Vector2( 304, 464 ) diff --git a/src/levels/Level4.tscn b/src/levels/Level4.tscn index 16bbf50..bdfe7e3 100644 --- a/src/levels/Level4.tscn +++ b/src/levels/Level4.tscn @@ -111,6 +111,7 @@ frame = 1 [node name="MonsterSprite11" parent="Items" instance=ExtResource( 6 )] position = Vector2( 144, 400 ) animation = "bat" +frame = 1 [node name="MonsterSprite2" parent="Items" instance=ExtResource( 6 )] position = Vector2( 48, 336 ) diff --git a/src/levels/Level5.tscn b/src/levels/Level5.tscn index 7b84028..941a353 100644 --- a/src/levels/Level5.tscn +++ b/src/levels/Level5.tscn @@ -90,11 +90,9 @@ position = Vector2( 272, 400 ) [node name="MonsterSprite" parent="Items" instance=ExtResource( 12 )] position = Vector2( 272, 176 ) -frame = 1 [node name="MonsterSprite5" parent="Items" instance=ExtResource( 12 )] position = Vector2( 210.1, 368 ) -frame = 1 [node name="MonsterSprite6" parent="Items" instance=ExtResource( 12 )] position = Vector2( 240, 304 ) @@ -114,26 +112,21 @@ animation = "bluePriest" [node name="MonsterSprite9" parent="Items" instance=ExtResource( 12 )] position = Vector2( 80, 336 ) animation = "skeletonSoilder" -frame = 1 [node name="MonsterSprite2" parent="Items" instance=ExtResource( 12 )] position = Vector2( 301.9, 176 ) -frame = 1 [node name="MonsterSprite3" parent="Items" instance=ExtResource( 12 )] position = Vector2( 368, 176 ) animation = "redSlime" -frame = 1 [node name="MonsterSprite11" parent="Items" instance=ExtResource( 12 )] position = Vector2( 144, 144 ) animation = "redSlime" -frame = 1 [node name="MonsterSprite4" parent="Items" instance=ExtResource( 12 )] position = Vector2( 368, 336 ) animation = "redSlime" -frame = 1 [node name="Player" parent="." instance=ExtResource( 4 )] position = Vector2( 80, 464 ) diff --git a/src/levels/Level6.tscn b/src/levels/Level6.tscn new file mode 100644 index 0000000..220638d --- /dev/null +++ b/src/levels/Level6.tscn @@ -0,0 +1,150 @@ +[gd_scene load_steps=12 format=2] + +[ext_resource path="res://src/level/LevelInstance.gd" type="Script" id=1] +[ext_resource path="res://src/navigation/NavigationTileMap.gd" type="Script" id=2] +[ext_resource path="res://src/navigation/NavigationTileset.tres" type="TileSet" id=3] +[ext_resource path="res://src/door/YellowDoor.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stairs/StairsDown.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stairs/StairsUp.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/player/Player.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/props/YellowKey.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/monster/Monster.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/props/RedDrug.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/props/BlueGemstone.tscn" type="PackedScene" id=11] + +[node name="Level6" type="Node2D"] +script = ExtResource( 1 ) + +[node name="NavigationTileMap" type="TileMap" parent="."] +tile_set = ExtResource( 3 ) +cell_size = Vector2( 32, 32 ) +cell_quadrant_size = 1 +format = 1 +tile_data = PoolIntArray( 196608, 1, 0, 196609, 1, 0, 196610, 1, 0, 196611, 1, 0, 196612, 1, 0, 196613, 1, 0, 196614, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196618, 1, 0, 196619, 1, 0, 196620, 1, 0, 262144, 1, 0, 262145, 2, 0, 262146, 1, 0, 262147, 2, 0, 262148, 2, 0, 262149, 1, 0, 262150, 2, 0, 262151, 2, 0, 262152, 2, 0, 262153, 2, 0, 262154, 2, 0, 262155, 2, 0, 262156, 1, 0, 327680, 1, 0, 327681, 2, 0, 327682, 1, 0, 327683, 2, 0, 327684, 2, 0, 327685, 1, 0, 327686, 2, 0, 327687, 1, 0, 327688, 1, 0, 327689, 1, 0, 327690, 1, 0, 327691, 2, 0, 327692, 1, 0, 393216, 1, 0, 393217, 2, 0, 393218, 1, 0, 393219, 1, 0, 393220, 2, 0, 393221, 1, 0, 393222, 2, 0, 393223, 1, 0, 393224, 2, 0, 393225, 2, 0, 393226, 2, 0, 393227, 2, 0, 393228, 1, 0, 458752, 1, 0, 458753, 2, 0, 458754, 2, 0, 458755, 2, 0, 458756, 2, 0, 458757, 2, 0, 458758, 2, 0, 458759, 1, 0, 458760, 2, 0, 458761, 2, 0, 458762, 2, 0, 458763, 2, 0, 458764, 1, 0, 524288, 1, 0, 524289, 2, 0, 524290, 1, 0, 524291, 1, 0, 524292, 1, 0, 524293, 1, 0, 524294, 2, 0, 524295, 1, 0, 524296, 1, 0, 524297, 1, 0, 524298, 1, 0, 524299, 1, 0, 524300, 1, 0, 589824, 1, 0, 589825, 2, 0, 589826, 2, 0, 589827, 2, 0, 589828, 2, 0, 589829, 2, 0, 589830, 2, 0, 589831, 2, 0, 589832, 2, 0, 589833, 2, 0, 589834, 2, 0, 589835, 2, 0, 589836, 1, 0, 655360, 1, 0, 655361, 1, 0, 655362, 1, 0, 655363, 1, 0, 655364, 1, 0, 655365, 1, 0, 655366, 2, 0, 655367, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 655371, 2, 0, 655372, 1, 0, 720896, 1, 0, 720897, 2, 0, 720898, 2, 0, 720899, 2, 0, 720900, 2, 0, 720901, 1, 0, 720902, 2, 0, 720903, 2, 0, 720904, 2, 0, 720905, 2, 0, 720906, 2, 0, 720907, 2, 0, 720908, 1, 0, 786432, 1, 0, 786433, 2, 0, 786434, 2, 0, 786435, 2, 0, 786436, 2, 0, 786437, 1, 0, 786438, 2, 0, 786439, 1, 0, 786440, 1, 0, 786441, 2, 0, 786442, 1, 0, 786443, 2, 0, 786444, 1, 0, 851968, 1, 0, 851969, 2, 0, 851970, 1, 0, 851971, 1, 0, 851972, 1, 0, 851973, 1, 0, 851974, 2, 0, 851975, 1, 0, 851976, 2, 0, 851977, 2, 0, 851978, 1, 0, 851979, 2, 0, 851980, 1, 0, 917504, 1, 0, 917505, 2, 0, 917506, 2, 0, 917507, 2, 0, 917508, 2, 0, 917509, 2, 0, 917510, 2, 0, 917511, 1, 0, 917512, 2, 0, 917513, 2, 0, 917514, 1, 0, 917515, 2, 0, 917516, 1, 0, 983040, 1, 0, 983041, 1, 0, 983042, 1, 0, 983043, 1, 0, 983044, 1, 0, 983045, 1, 0, 983046, 1, 0, 983047, 1, 0, 983048, 1, 0, 983049, 1, 0, 983050, 1, 0, 983051, 1, 0, 983052, 1, 0 ) +script = ExtResource( 2 ) +changed_cells = { + +} + +[node name="Items" type="Node2D" parent="."] + +[node name="YellowDoor" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 48, 432 ) + +[node name="YellowDoor2" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 336, 368 ) + +[node name="YellowDoor3" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 272, 368 ) + +[node name="YellowDoor4" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 240, 368 ) + +[node name="YellowDoor5" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 176, 240 ) + +[node name="YellowDoor8" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 368, 176 ) + +[node name="YellowDoor6" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 112, 240 ) + +[node name="YellowDoor7" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 80, 240 ) + +[node name="StairsDown" parent="Items" instance=ExtResource( 5 )] +position = Vector2( 48, 144 ) + +[node name="StairsUp" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 368, 464 ) + +[node name="YellowKey" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 208, 304 ) + +[node name="YellowKey2" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 112, 144 ) + +[node name="YellowKey3" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 112, 176 ) + +[node name="YellowKey4" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 144, 176 ) + +[node name="YellowKey6" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 304, 144 ) + +[node name="YellowKey5" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 144, 144 ) + +[node name="MonsterSprite" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 144, 208 ) +animation = "redSlime" + +[node name="MonsterSprite10" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 304, 400 ) +animation = "redSlime" + +[node name="MonsterSprite11" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 368, 400 ) +animation = "redSlime" + +[node name="MonsterSprite12" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 368, 240 ) +animation = "bat" + +[node name="MonsterSprite13" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 336, 208 ) +animation = "skeleton" + +[node name="MonsterSprite2" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 144, 304 ) +animation = "bluePriest" + +[node name="MonsterSprite15" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 240, 144 ) +animation = "bluePriest" + +[node name="MonsterSprite4" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 48, 368 ) +animation = "bluePriest" + +[node name="MonsterSprite5" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 80, 400 ) +animation = "bat" + +[node name="MonsterSprite6" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 82.1, 464 ) + +[node name="MonsterSprite14" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 336, 144 ) + +[node name="MonsterSprite7" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 176, 464 ) +animation = "skeleton" + +[node name="MonsterSprite8" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 272, 304 ) +animation = "skeleton" + +[node name="MonsterSprite9" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 304, 304 ) +animation = "skeletonSoilder" + +[node name="MonsterSprite3" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 112, 304 ) +animation = "redSlime" + +[node name="PlayerProps4" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 306.1, 464 ) + +[node name="PlayerProps5" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 274.1, 464 ) + +[node name="PlayerProps6" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 272, 208 ) + +[node name="BlueGemstone" parent="Items" instance=ExtResource( 11 )] +position = Vector2( 144, 400 ) + +[node name="Player" parent="." instance=ExtResource( 7 )] +position = Vector2( 48, 176 ) diff --git a/src/levels/Level7.tscn b/src/levels/Level7.tscn new file mode 100644 index 0000000..7fd85d7 --- /dev/null +++ b/src/levels/Level7.tscn @@ -0,0 +1,175 @@ +[gd_scene load_steps=14 format=2] + +[ext_resource path="res://src/level/LevelInstance.gd" type="Script" id=1] +[ext_resource path="res://src/navigation/NavigationTileMap.gd" type="Script" id=2] +[ext_resource path="res://src/navigation/NavigationTileset.tres" type="TileSet" id=3] +[ext_resource path="res://src/stairs/StairsDown.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stairs/StairsUp.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/player/Player.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/door/BlueDoor.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/door/YellowDoor.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/monster/Monster.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/props/YellowKey.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/props/BlueDrug.tscn" type="PackedScene" id=11] +[ext_resource path="res://src/props/RedDrug.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/props/RedGemstone.tscn" type="PackedScene" id=13] + +[node name="Level7" type="Node2D"] +script = ExtResource( 1 ) + +[node name="NavigationTileMap" type="TileMap" parent="."] +tile_set = ExtResource( 3 ) +cell_size = Vector2( 32, 32 ) +cell_quadrant_size = 1 +format = 1 +tile_data = PoolIntArray( 196608, 1, 0, 196609, 1, 0, 196610, 1, 0, 196611, 1, 0, 196612, 1, 0, 196613, 1, 0, 196614, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196618, 1, 0, 196619, 1, 0, 196620, 1, 0, 262144, 1, 0, 262145, 2, 0, 262146, 1, 0, 262147, 2, 0, 262148, 1, 0, 262149, 2, 0, 262150, 2, 0, 262151, 2, 0, 262152, 1, 0, 262153, 2, 0, 262154, 1, 0, 262155, 2, 0, 262156, 1, 0, 327680, 1, 0, 327681, 2, 0, 327682, 1, 0, 327683, 2, 0, 327684, 1, 0, 327685, 2, 0, 327686, 2, 0, 327687, 2, 0, 327688, 1, 0, 327689, 2, 0, 327690, 1, 0, 327691, 2, 0, 327692, 1, 0, 393216, 1, 0, 393217, 2, 0, 393218, 1, 0, 393219, 2, 0, 393220, 1, 0, 393221, 2, 0, 393222, 1, 0, 393223, 2, 0, 393224, 1, 0, 393225, 2, 0, 393226, 1, 0, 393227, 2, 0, 393228, 1, 0, 458752, 1, 0, 458753, 2, 0, 458754, 1, 0, 458755, 2, 0, 458756, 1, 0, 458757, 2, 0, 458758, 1, 0, 458759, 2, 0, 458760, 1, 0, 458761, 2, 0, 458762, 1, 0, 458763, 2, 0, 458764, 1, 0, 524288, 1, 0, 524289, 2, 0, 524290, 1, 0, 524291, 2, 0, 524292, 1, 0, 524293, 2, 0, 524294, 1, 0, 524295, 2, 0, 524296, 1, 0, 524297, 2, 0, 524298, 1, 0, 524299, 2, 0, 524300, 1, 0, 589824, 1, 0, 589825, 2, 0, 589826, 2, 0, 589827, 2, 0, 589828, 2, 0, 589829, 2, 0, 589830, 2, 0, 589831, 2, 0, 589832, 2, 0, 589833, 2, 0, 589834, 2, 0, 589835, 2, 0, 589836, 1, 0, 655360, 1, 0, 655361, 2, 0, 655362, 1, 0, 655363, 2, 0, 655364, 1, 0, 655365, 2, 0, 655366, 1, 0, 655367, 2, 0, 655368, 1, 0, 655369, 2, 0, 655370, 1, 0, 655371, 2, 0, 655372, 1, 0, 720896, 1, 0, 720897, 2, 0, 720898, 1, 0, 720899, 2, 0, 720900, 1, 0, 720901, 2, 0, 720902, 1, 0, 720903, 2, 0, 720904, 1, 0, 720905, 2, 0, 720906, 1, 0, 720907, 2, 0, 720908, 1, 0, 786432, 1, 0, 786433, 2, 0, 786434, 1, 0, 786435, 2, 0, 786436, 1, 0, 786437, 2, 0, 786438, 1, 0, 786439, 2, 0, 786440, 1, 0, 786441, 2, 0, 786442, 1, 0, 786443, 2, 0, 786444, 1, 0, 851968, 1, 0, 851969, 2, 0, 851970, 1, 0, 851971, 2, 0, 851972, 1, 0, 851973, 2, 0, 851974, 1, 0, 851975, 2, 0, 851976, 1, 0, 851977, 2, 0, 851978, 1, 0, 851979, 2, 0, 851980, 1, 0, 917504, 1, 0, 917505, 2, 0, 917506, 2, 0, 917507, 2, 0, 917508, 1, 0, 917509, 2, 0, 917510, 1, 0, 917511, 2, 0, 917512, 1, 0, 917513, 2, 0, 917514, 1, 0, 917515, 2, 0, 917516, 1, 0, 983040, 1, 0, 983041, 1, 0, 983042, 1, 0, 983043, 1, 0, 983044, 1, 0, 983045, 1, 0, 983046, 1, 0, 983047, 1, 0, 983048, 1, 0, 983049, 1, 0, 983050, 1, 0, 983051, 1, 0, 983052, 1, 0 ) +script = ExtResource( 2 ) +changed_cells = { + +} + +[node name="Items" type="Node2D" parent="."] + +[node name="StairsDown" parent="Items" instance=ExtResource( 4 )] +position = Vector2( 368, 464 ) + +[node name="StairsUp" parent="Items" instance=ExtResource( 5 )] +position = Vector2( 48, 144 ) + +[node name="YellowDoor" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 368, 336 ) + +[node name="YellowDoor2" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 368, 272 ) + +[node name="YellowDoor3" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 240, 272 ) + +[node name="YellowDoor4" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 240, 336 ) + +[node name="YellowDoor5" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 176, 336 ) + +[node name="YellowDoor6" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 112, 336 ) + +[node name="YellowDoor7" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 112, 272 ) + +[node name="YellowDoor8" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 48, 272 ) + +[node name="YellowDoor9" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 48, 336 ) + +[node name="BlueDoor" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 176, 272 ) + +[node name="MonsterSprite" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 304, 272 ) +animation = "skeleton" +frame = 0 + +[node name="MonsterSprite3" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 176, 208 ) +animation = "redSlime" +frame = 0 + +[node name="MonsterSprite10" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 80, 464 ) +animation = "redSlime" +frame = 0 + +[node name="MonsterSprite15" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 368, 176 ) +animation = "redSlime" +frame = 0 + +[node name="MonsterSprite11" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 112, 432 ) + +[node name="MonsterSprite14" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 368, 144 ) +frame = 0 + +[node name="MonsterSprite16" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 368, 208 ) + +[node name="MonsterSprite12" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 48, 432 ) + +[node name="MonsterSprite5" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 176, 405.1 ) +animation = "bat" +frame = 0 + +[node name="MonsterSprite13" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 112, 208 ) +animation = "bat" +frame = 0 + +[node name="MonsterSprite6" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 240, 400 ) +animation = "redSlime" +frame = 0 + +[node name="MonsterSprite7" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 240, 432 ) +animation = "bluePriest" +frame = 0 + +[node name="MonsterSprite8" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 144, 304 ) +animation = "bluePriest" +frame = 0 + +[node name="MonsterSprite2" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 304, 336 ) +animation = "skeletonSoilder" +frame = 0 + +[node name="MonsterSprite9" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 80, 304 ) +animation = "skeletonSoilder" +frame = 0 + +[node name="MonsterSprite4" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 240, 208 ) +animation = "skeletonSoilder" +frame = 0 + +[node name="YellowKey" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 176, 464 ) + +[node name="YellowKey3" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 304, 464 ) + +[node name="YellowKey4" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 304, 432 ) + +[node name="YellowKey5" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 304, 144 ) + +[node name="YellowKey6" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 304, 176 ) + +[node name="YellowKey2" parent="Items" instance=ExtResource( 10 )] + +[node name="PlayerProps5" parent="Items" instance=ExtResource( 11 )] +position = Vector2( 240, 464 ) + +[node name="PlayerProps4" parent="Items" instance=ExtResource( 12 )] +position = Vector2( 304, 208 ) + +[node name="PlayerProps7" parent="Items" instance=ExtResource( 12 )] +position = Vector2( 112, 176 ) + +[node name="PlayerProps6" parent="Items" instance=ExtResource( 11 )] +position = Vector2( 304, 400 ) + +[node name="RedGemstone" parent="Items" instance=ExtResource( 13 )] +position = Vector2( 112, 144 ) + +[node name="Player" parent="." instance=ExtResource( 6 )] +position = Vector2( 368, 432 ) diff --git a/src/levels/Level8.tscn b/src/levels/Level8.tscn new file mode 100644 index 0000000..8b676cd --- /dev/null +++ b/src/levels/Level8.tscn @@ -0,0 +1,189 @@ +[gd_scene load_steps=17 format=2] + +[ext_resource path="res://src/level/LevelInstance.gd" type="Script" id=1] +[ext_resource path="res://src/navigation/NavigationTileMap.gd" type="Script" id=2] +[ext_resource path="res://src/navigation/NavigationTileset.tres" type="TileSet" id=3] +[ext_resource path="res://src/player/Player.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stairs/StairsDown.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stairs/StairsUp.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/door/YellowDoor.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/door/BlueDoor.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/props/YellowKey.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/props/RedKey.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/props/BlueKey.tscn" type="PackedScene" id=11] +[ext_resource path="res://src/props/RedDrug.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/props/BlueGemstone.tscn" type="PackedScene" id=13] +[ext_resource path="res://src/props/RedGemstone.tscn" type="PackedScene" id=14] +[ext_resource path="res://src/props/BlueDrug.tscn" type="PackedScene" id=15] +[ext_resource path="res://src/monster/Monster.tscn" type="PackedScene" id=16] + +[node name="Level8" type="Node2D"] +script = ExtResource( 1 ) + +[node name="NavigationTileMap" type="TileMap" parent="."] +tile_set = ExtResource( 3 ) +cell_size = Vector2( 32, 32 ) +cell_quadrant_size = 1 +format = 1 +tile_data = PoolIntArray( 196608, 1, 0, 196609, 1, 0, 196610, 1, 0, 196611, 1, 0, 196612, 1, 0, 196613, 1, 0, 196614, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196618, 1, 0, 196619, 1, 0, 196620, 1, 0, 262144, 1, 0, 262145, 2, 0, 262146, 2, 0, 262147, 2, 0, 262148, 2, 0, 262149, 2, 0, 262150, 2, 0, 262151, 2, 0, 262152, 1, 0, 262153, 2, 0, 262154, 2, 0, 262155, 2, 0, 262156, 1, 0, 327680, 1, 0, 327681, 2, 0, 327682, 2, 0, 327683, 1, 0, 327684, 1, 0, 327685, 2, 0, 327686, 2, 0, 327687, 2, 0, 327688, 1, 0, 327689, 2, 0, 327690, 2, 0, 327691, 2, 0, 327692, 1, 0, 393216, 1, 0, 393217, 2, 0, 393218, 1, 0, 393219, 1, 0, 393220, 1, 0, 393221, 1, 0, 393222, 2, 0, 393223, 1, 0, 393224, 1, 0, 393225, 2, 0, 393226, 2, 0, 393227, 2, 0, 393228, 1, 0, 458752, 1, 0, 458753, 2, 0, 458754, 1, 0, 458755, 2, 0, 458756, 2, 0, 458757, 2, 0, 458758, 2, 0, 458759, 2, 0, 458760, 1, 0, 458761, 1, 0, 458762, 2, 0, 458763, 1, 0, 458764, 1, 0, 524288, 1, 0, 524289, 2, 0, 524290, 1, 0, 524291, 1, 0, 524292, 1, 0, 524293, 1, 0, 524294, 1, 0, 524295, 2, 0, 524296, 1, 0, 524297, 2, 0, 524298, 2, 0, 524299, 2, 0, 524300, 1, 0, 589824, 1, 0, 589825, 2, 0, 589826, 2, 0, 589827, 2, 0, 589828, 2, 0, 589829, 2, 0, 589830, 1, 0, 589831, 2, 0, 589832, 1, 0, 589833, 2, 0, 589834, 2, 0, 589835, 2, 0, 589836, 1, 0, 655360, 1, 0, 655361, 1, 0, 655362, 1, 0, 655363, 1, 0, 655364, 1, 0, 655365, 2, 0, 655366, 1, 0, 655367, 2, 0, 655368, 1, 0, 655369, 1, 0, 655370, 2, 0, 655371, 1, 0, 655372, 1, 0, 720896, 1, 0, 720897, 2, 0, 720898, 2, 0, 720899, 2, 0, 720900, 2, 0, 720901, 2, 0, 720902, 2, 0, 720903, 2, 0, 720904, 2, 0, 720905, 2, 0, 720906, 2, 0, 720907, 2, 0, 720908, 1, 0, 786432, 1, 0, 786433, 2, 0, 786434, 1, 0, 786435, 1, 0, 786436, 1, 0, 786437, 1, 0, 786438, 1, 0, 786439, 1, 0, 786440, 1, 0, 786441, 1, 0, 786442, 1, 0, 786443, 2, 0, 786444, 1, 0, 851968, 1, 0, 851969, 2, 0, 851970, 2, 0, 851971, 1, 0, 851972, 2, 0, 851973, 2, 0, 851974, 1, 0, 851975, 2, 0, 851976, 2, 0, 851977, 1, 0, 851978, 2, 0, 851979, 2, 0, 851980, 1, 0, 917504, 1, 0, 917505, 2, 0, 917506, 2, 0, 917507, 2, 0, 917508, 2, 0, 917509, 2, 0, 917510, 1, 0, 917511, 2, 0, 917512, 2, 0, 917513, 2, 0, 917514, 2, 0, 917515, 2, 0, 917516, 1, 0, 983040, 1, 0, 983041, 1, 0, 983042, 1, 0, 983043, 1, 0, 983044, 1, 0, 983045, 1, 0, 983046, 1, 0, 983047, 1, 0, 983048, 1, 0, 983049, 1, 0, 983050, 1, 0, 983051, 1, 0, 983052, 1, 0 ) +script = ExtResource( 2 ) +changed_cells = { + +} + +[node name="Items" type="Node2D" parent="."] + +[node name="StairsDown" parent="Items" instance=ExtResource( 5 )] +position = Vector2( 48, 144 ) + +[node name="StairsUp" parent="Items" instance=ExtResource( 6 )] +position = Vector2( 208, 144 ) + +[node name="YellowDoor" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 112, 144 ) + +[node name="YellowDoor3" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 48, 208 ) + +[node name="YellowDoor2" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 144, 144 ) + +[node name="YellowDoor4" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 208, 208 ) + +[node name="YellowDoor5" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 176, 336 ) + +[node name="YellowDoor6" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 48, 400 ) + +[node name="YellowDoor7" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 304, 464 ) + +[node name="YellowDoor8" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 368, 400 ) + +[node name="YellowDoor9" parent="Items" instance=ExtResource( 7 )] +position = Vector2( 336, 336 ) + +[node name="BlueDoor" parent="Items" instance=ExtResource( 8 )] +position = Vector2( 112, 464 ) + +[node name="YellowKey" parent="Items" instance=ExtResource( 9 )] + +[node name="YellowKey8" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 240, 464 ) + +[node name="YellowKey3" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 112, 240 ) + +[node name="YellowKey4" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 144, 240 ) + +[node name="YellowKey5" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 176, 240 ) + +[node name="YellowKey6" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 304, 144 ) + +[node name="YellowKey7" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 368, 144 ) + +[node name="YellowKey2" parent="Items" instance=ExtResource( 9 )] +position = Vector2( 144, 464 ) + +[node name="PlayerProps3" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 336, 176 ) + +[node name="PlayerProps4" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 336, 176 ) + +[node name="PlayerProps5" parent="Items" instance=ExtResource( 10 )] +position = Vector2( 336, 176 ) + +[node name="PlayerProps2" parent="Items" instance=ExtResource( 11 )] +position = Vector2( 240, 432 ) + +[node name="PlayerProps6" parent="Items" instance=ExtResource( 12 )] +position = Vector2( 272, 432 ) + +[node name="RedGemstone" parent="Items" instance=ExtResource( 14 )] +position = Vector2( 144, 432 ) + +[node name="BlueGemstone" parent="Items" instance=ExtResource( 13 )] +position = Vector2( 176, 464 ) + +[node name="PlayerProps7" parent="Items" instance=ExtResource( 12 )] +position = Vector2( 48, 272 ) + +[node name="PlayerProps9" parent="Items" instance=ExtResource( 15 )] +position = Vector2( 304, 208 ) + +[node name="PlayerProps8" parent="Items" instance=ExtResource( 12 )] +position = Vector2( 368, 208 ) + +[node name="MonsterSprite" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 240, 176 ) + +[node name="MonsterSprite2" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 304, 272 ) +animation = "yellowGuard" + +[node name="MonsterSprite4" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 272, 368 ) +animation = "bluePriest" + +[node name="MonsterSprite15" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 240, 272 ) +animation = "bluePriest" + +[node name="MonsterSprite5" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 240, 336 ) +animation = "bat" +frame = 0 + +[node name="MonsterSprite7" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 144, 368 ) +animation = "bat" + +[node name="MonsterSprite12" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 80, 464 ) +animation = "bat" + +[node name="MonsterSprite8" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 144, 304 ) +animation = "redSlime" + +[node name="MonsterSprite10" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 80, 304 ) +animation = "redSlime" +frame = 0 + +[node name="MonsterSprite9" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 112, 304 ) +frame = 0 + +[node name="MonsterSprite11" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 48, 432 ) +frame = 0 + +[node name="MonsterSprite6" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 208, 368 ) +animation = "skeleton" + +[node name="MonsterSprite13" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 368, 432 ) +animation = "skeleton" +frame = 0 + +[node name="MonsterSprite14" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 336, 464 ) +animation = "skeletonSoilder" +frame = 0 + +[node name="MonsterSprite3" parent="Items" instance=ExtResource( 16 )] +position = Vector2( 368, 272 ) +animation = "yellowGuard" + +[node name="Player" parent="." instance=ExtResource( 4 )] +position = Vector2( 48, 176 ) diff --git a/src/monster/Monster.tscn b/src/monster/Monster.tscn index fddbee3..ce57b13 100644 --- a/src/monster/Monster.tscn +++ b/src/monster/Monster.tscn @@ -10,7 +10,7 @@ [ext_resource path="res://src/monster/monster_spriteframes.tres" type="SpriteFrames" id=8] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 16, 16 ) +extents = Vector2( 8, 8 ) [sub_resource type="SpriteFrames" id=2] animations = [ { diff --git a/src/monster/MonsterBook.gd b/src/monster/MonsterBook.gd index eb3b062..4a4235f 100644 --- a/src/monster/MonsterBook.gd +++ b/src/monster/MonsterBook.gd @@ -52,3 +52,4 @@ func show(): item.get_node("Content/MonsterMoney/MoneyValue").text = monster_info.money as String container.add_child(item) dialog.popup() + dialog.get_node("ScrollContainer").set_process_input(true) diff --git a/src/monster/monster_spriteframes.tres b/src/monster/monster_spriteframes.tres index d2a6cf8..5000c42 100644 --- a/src/monster/monster_spriteframes.tres +++ b/src/monster/monster_spriteframes.tres @@ -1,111 +1,123 @@ -[gd_resource type="SpriteFrames" load_steps=16 format=2] +[gd_resource type="SpriteFrames" load_steps=20 format=2] [ext_resource path="res://assets/images/enemys.png" type="Texture" id=1] -[sub_resource type="AtlasTexture" id=7] -flags = 4 +[sub_resource type="AtlasTexture" id=1] atlas = ExtResource( 1 ) region = Rect2( 0, 256, 32, 32 ) -[sub_resource type="AtlasTexture" id=8] -flags = 4 +[sub_resource type="AtlasTexture" id=2] atlas = ExtResource( 1 ) region = Rect2( 32, 256, 32, 32 ) +[sub_resource type="AtlasTexture" id=3] +atlas = ExtResource( 1 ) +region = Rect2( 0, 128, 32, 32 ) + +[sub_resource type="AtlasTexture" id=4] +atlas = ExtResource( 1 ) +region = Rect2( 32, 128, 32, 32 ) + +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 1 ) +region = Rect2( 0, 640, 32, 32 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 1 ) +region = Rect2( 32, 640, 32, 32 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 1 ) +region = Rect2( 0, 320, 32, 32 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 1 ) +region = Rect2( 32, 320, 32, 32 ) + [sub_resource type="AtlasTexture" id=9] -flags = 4 atlas = ExtResource( 1 ) region = Rect2( 0, 288, 32, 32 ) [sub_resource type="AtlasTexture" id=10] -flags = 4 atlas = ExtResource( 1 ) region = Rect2( 32, 288, 32, 32 ) -[sub_resource type="AtlasTexture" id=1] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 0, 32, 32, 32 ) - -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 32, 32, 32, 32 ) - -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 0, 0, 32, 32 ) - -[sub_resource type="AtlasTexture" id=4] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 32, 0, 32, 32 ) - [sub_resource type="AtlasTexture" id=11] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 0, 512, 32, 32 ) - -[sub_resource type="AtlasTexture" id=12] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 32, 512, 32, 32 ) - -[sub_resource type="AtlasTexture" id=5] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 0, 128, 32, 32 ) - -[sub_resource type="AtlasTexture" id=6] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 32, 128, 32, 32 ) - -[sub_resource type="AtlasTexture" id=13] -flags = 4 atlas = ExtResource( 1 ) region = Rect2( 0, 672, 32, 32 ) -[sub_resource type="AtlasTexture" id=14] -flags = 4 +[sub_resource type="AtlasTexture" id=12] atlas = ExtResource( 1 ) region = Rect2( 32, 672, 32, 32 ) +[sub_resource type="AtlasTexture" id=13] +atlas = ExtResource( 1 ) +region = Rect2( 0, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=14] +atlas = ExtResource( 1 ) +region = Rect2( 32, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=15] +atlas = ExtResource( 1 ) +region = Rect2( 0, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=16] +atlas = ExtResource( 1 ) +region = Rect2( 32, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=17] +atlas = ExtResource( 1 ) +region = Rect2( 0, 512, 32, 32 ) + +[sub_resource type="AtlasTexture" id=18] +atlas = ExtResource( 1 ) +region = Rect2( 32, 512, 32, 32 ) + [resource] animations = [ { -"frames": [ SubResource( 7 ), SubResource( 8 ) ], +"frames": [ SubResource( 1 ), SubResource( 2 ) ], "loop": true, "name": "skeleton", "speed": 5.0 }, { +"frames": [ SubResource( 3 ), SubResource( 4 ) ], +"loop": true, +"name": "bat", +"speed": 5.0 +}, { +"frames": [ SubResource( 5 ), SubResource( 6 ) ], +"loop": true, +"name": "yellowGuard", +"speed": 5.0 +}, { +"frames": [ SubResource( 7 ), SubResource( 8 ) ], +"loop": true, +"name": "skeletonCaptain", +"speed": 5.0 +}, { "frames": [ SubResource( 9 ), SubResource( 10 ) ], "loop": true, "name": "skeletonSoilder", "speed": 5.0 }, { -"frames": [ SubResource( 1 ), SubResource( 2 ) ], -"loop": true, -"name": "redSlime", -"speed": 5.0 -}, { -"frames": [ SubResource( 3 ), SubResource( 4 ) ], -"loop": true, -"name": "greenSlime", -"speed": 5.0 -}, { "frames": [ SubResource( 11 ), SubResource( 12 ) ], "loop": true, -"name": "bluePriest", -"speed": 5.0 -}, { -"frames": [ SubResource( 5 ), SubResource( 6 ) ], -"loop": true, -"name": "bat", +"name": "blueGuard", "speed": 5.0 }, { "frames": [ SubResource( 13 ), SubResource( 14 ) ], "loop": true, -"name": "blueGuard", +"name": "redSlime", +"speed": 5.0 +}, { +"frames": [ SubResource( 15 ), SubResource( 16 ) ], +"loop": true, +"name": "greenSlime", +"speed": 5.0 +}, { +"frames": [ SubResource( 17 ), SubResource( 18 ) ], +"loop": true, +"name": "bluePriest", "speed": 5.0 } ] diff --git a/src/navigation/NavigationTileMap.gd b/src/navigation/NavigationTileMap.gd index 61a7a59..32f1eda 100644 --- a/src/navigation/NavigationTileMap.gd +++ b/src/navigation/NavigationTileMap.gd @@ -65,7 +65,6 @@ func set_cell(x: int, y: int, tile: int, flip_x: bool = false, flip_y: bool = false, transpose: bool = false, autotile_coord: Vector2 = Vector2( 0, 0 )): if not Engine.editor_hint: self.changed_cells[Vector2(x,y)] = tile - print(x,",",y,"-",tile) return .set_cell(x,y,tile,flip_x,flip_y,transpose,autotile_coord) # 拦截记录运行时修改的cell diff --git a/src/npc/ThiefNpc.tscn b/src/npc/ThiefNpc.tscn index 746a607..767b0ea 100644 --- a/src/npc/ThiefNpc.tscn +++ b/src/npc/ThiefNpc.tscn @@ -6,32 +6,26 @@ extents = Vector2( 16, 16 ) [sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 0, 0, 32, 32 ) - -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 32, 0, 32, 32 ) - -[sub_resource type="AtlasTexture" id=4] -flags = 4 atlas = ExtResource( 1 ) region = Rect2( 0, 64, 32, 32 ) -[sub_resource type="AtlasTexture" id=5] -flags = 4 +[sub_resource type="AtlasTexture" id=3] atlas = ExtResource( 1 ) region = Rect2( 32, 64, 32, 32 ) +[sub_resource type="AtlasTexture" id=4] +atlas = ExtResource( 1 ) +region = Rect2( 0, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 1 ) +region = Rect2( 32, 0, 32, 32 ) + [sub_resource type="AtlasTexture" id=6] -flags = 4 atlas = ExtResource( 1 ) region = Rect2( 0, 32, 32, 32 ) [sub_resource type="AtlasTexture" id=7] -flags = 4 atlas = ExtResource( 1 ) region = Rect2( 32, 32, 32, 32 ) @@ -39,12 +33,12 @@ region = Rect2( 32, 32, 32, 32 ) animations = [ { "frames": [ SubResource( 2 ), SubResource( 3 ) ], "loop": true, -"name": "old_man", +"name": "thief", "speed": 5.0 }, { "frames": [ SubResource( 4 ), SubResource( 5 ) ], "loop": true, -"name": "thief", +"name": "old_man", "speed": 5.0 }, { "frames": [ SubResource( 6 ), SubResource( 7 ) ], diff --git a/src/stairs/StairsDown.tscn b/src/stairs/StairsDown.tscn index 0284255..b02a304 100644 --- a/src/stairs/StairsDown.tscn +++ b/src/stairs/StairsDown.tscn @@ -5,7 +5,7 @@ [sub_resource type="RectangleShape2D" id=1] -[node name="Stairs" type="Position2D"] +[node name="StairsDown" type="Position2D"] script = ExtResource( 2 ) stairs_type = 1 diff --git a/src/stairs/StairsUp.tscn b/src/stairs/StairsUp.tscn index 7e3d8ba..ebeb88d 100644 --- a/src/stairs/StairsUp.tscn +++ b/src/stairs/StairsUp.tscn @@ -5,7 +5,7 @@ [sub_resource type="RectangleShape2D" id=1] -[node name="Stairs" type="Position2D"] +[node name="StairsUp" type="Position2D"] script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/src/utils/TouchScrollContainer.gd b/src/utils/TouchScrollContainer.gd index 8230892..7caf9dc 100644 --- a/src/utils/TouchScrollContainer.gd +++ b/src/utils/TouchScrollContainer.gd @@ -4,6 +4,9 @@ var isDrag = false var startPos = 0 var dragDir = 0 +func _ready(): + set_process_input(false) + func _input(event): if event is InputEventMouseButton: if event.button_index != BUTTON_LEFT: @@ -11,13 +14,13 @@ func _input(event): if event.is_pressed(): isDrag = true startPos = event.position.y - print("pressed") if !event.is_pressed(): isDrag = false startPos = 0 - print("not pressed") if event is InputEventMouseMotion and isDrag: var offset = event.position.y - startPos self.scroll_vertical -= offset startPos = event.position.y - print("drag") + +func _on_BookDialog_popup_hide(): + set_process_input(false)