diff --git a/.gitignore b/.gitignore index 7765de2..613493f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ addons/ .obsidian/ +todo.md \ No newline at end of file diff --git a/assets/item_icons/x.png b/assets/item_icons/x.png deleted file mode 100644 index 3659830..0000000 Binary files a/assets/item_icons/x.png and /dev/null differ diff --git a/assets/item_icons/x.png.import b/assets/item_icons/x.png.import deleted file mode 100644 index 9bea815..0000000 --- a/assets/item_icons/x.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bk51v1m1wfhex" -path="res://.godot/imported/x.png-3ec7665c51167d707c62ab68705ebe01.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/item_icons/x.png" -dest_files=["res://.godot/imported/x.png-3ec7665c51167d707c62ab68705ebe01.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/assets/maze_assets_very_temp/Apparatus.png b/assets/maze_assets_very_temp/Apparatus.png deleted file mode 100644 index b0931bc..0000000 Binary files a/assets/maze_assets_very_temp/Apparatus.png and /dev/null differ diff --git a/assets/maze_assets_very_temp/Apparatus.png.import b/assets/maze_assets_very_temp/Apparatus.png.import deleted file mode 100644 index a67ce0c..0000000 --- a/assets/maze_assets_very_temp/Apparatus.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d302b6tly3nlg" -path="res://.godot/imported/Apparatus.png-f9b503bb50b0124c6d6ec56d99f778e5.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/maze_assets_very_temp/Apparatus.png" -dest_files=["res://.godot/imported/Apparatus.png-f9b503bb50b0124c6d6ec56d99f778e5.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/assets/maze_assets_very_temp/Grid.png b/assets/maze_assets_very_temp/Grid.png deleted file mode 100644 index 31886cf..0000000 Binary files a/assets/maze_assets_very_temp/Grid.png and /dev/null differ diff --git a/assets/maze_assets_very_temp/Grid.png.import b/assets/maze_assets_very_temp/Grid.png.import deleted file mode 100644 index a314d1d..0000000 --- a/assets/maze_assets_very_temp/Grid.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://do7bbh25fyxkk" -path="res://.godot/imported/Grid.png-ad2a2c41ec4c4fc757ca16ddd2ccf88c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/maze_assets_very_temp/Grid.png" -dest_files=["res://.godot/imported/Grid.png-ad2a2c41ec4c4fc757ca16ddd2ccf88c.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/assets/maze_assets_very_temp/MazeCharacter.png b/assets/maze_assets_very_temp/MazeCharacter.png deleted file mode 100644 index a73fd87..0000000 Binary files a/assets/maze_assets_very_temp/MazeCharacter.png and /dev/null differ diff --git a/assets/maze_assets_very_temp/MazeCharacter.png.import b/assets/maze_assets_very_temp/MazeCharacter.png.import deleted file mode 100644 index cad9026..0000000 --- a/assets/maze_assets_very_temp/MazeCharacter.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://df17dmyxpjmrb" -path="res://.godot/imported/MazeCharacter.png-1adff022473e8a0c9b50c7125d4e9d74.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/maze_assets_very_temp/MazeCharacter.png" -dest_files=["res://.godot/imported/MazeCharacter.png-1adff022473e8a0c9b50c7125d4e9d74.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/assets/maze_assets_very_temp/OutsideCharacter.png b/assets/maze_assets_very_temp/OutsideCharacter.png deleted file mode 100644 index 368a587..0000000 Binary files a/assets/maze_assets_very_temp/OutsideCharacter.png and /dev/null differ diff --git a/assets/maze_assets_very_temp/OutsideCharacter.png.import b/assets/maze_assets_very_temp/OutsideCharacter.png.import deleted file mode 100644 index 3bad444..0000000 --- a/assets/maze_assets_very_temp/OutsideCharacter.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d316msy0elqvi" -path="res://.godot/imported/OutsideCharacter.png-b14b58cfbf9b1e85f3e2ae1f4605a240.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/maze_assets_very_temp/OutsideCharacter.png" -dest_files=["res://.godot/imported/OutsideCharacter.png-b14b58cfbf9b1e85f3e2ae1f4605a240.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/assets/maze_assets_very_temp/PIECE.png b/assets/maze_assets_very_temp/PIECE.png deleted file mode 100644 index 6abbe7c..0000000 Binary files a/assets/maze_assets_very_temp/PIECE.png and /dev/null differ diff --git a/assets/maze_assets_very_temp/PIECE.png.import b/assets/maze_assets_very_temp/PIECE.png.import deleted file mode 100644 index 781b608..0000000 --- a/assets/maze_assets_very_temp/PIECE.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://hxb0etclpd4v" -path="res://.godot/imported/PIECE.png-0c51bb86246e0dfac67c8c365092f7f1.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/maze_assets_very_temp/PIECE.png" -dest_files=["res://.godot/imported/PIECE.png-0c51bb86246e0dfac67c8c365092f7f1.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/assets/maze_assets_very_temp/Wall.png b/assets/maze_assets_very_temp/Wall.png deleted file mode 100644 index d3f3ce3..0000000 Binary files a/assets/maze_assets_very_temp/Wall.png and /dev/null differ diff --git a/assets/maze_assets_very_temp/Wall.png.import b/assets/maze_assets_very_temp/Wall.png.import deleted file mode 100644 index 6ab979e..0000000 --- a/assets/maze_assets_very_temp/Wall.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cn1dvcdverrmh" -path="res://.godot/imported/Wall.png-11c6891435809f4bbf36dfde0c97af57.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/maze_assets_very_temp/Wall.png" -dest_files=["res://.godot/imported/Wall.png-11c6891435809f4bbf36dfde0c97af57.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/assets/menu_arrow.png b/assets/menu_arrow.png deleted file mode 100644 index 4542eac..0000000 Binary files a/assets/menu_arrow.png and /dev/null differ diff --git a/assets/menu_arrow.png.import b/assets/menu_arrow.png.import deleted file mode 100644 index 2dd3f5c..0000000 --- a/assets/menu_arrow.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bbi13ou2tmyip" -path="res://.godot/imported/menu_arrow.png-2e32d3585e0043243fe1bb1337347455.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/menu_arrow.png" -dest_files=["res://.godot/imported/menu_arrow.png-2e32d3585e0043243fe1bb1337347455.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/src/boots/boots.gd b/src/boots/boots.gd index fa7a0cc..2532ddc 100644 --- a/src/boots/boots.gd +++ b/src/boots/boots.gd @@ -1,36 +1,57 @@ extends Node2D -var move_code: Array[String] = ["down","down","down","down","down"] -var recent_moves: Array[String] = ["","","","",""] +var winning_move_code: Array[String] = ["down","down","down","down","down","right"] +var teleport_move_code: Array[String] = ["down","up","down","up"] +var recent_moves: Array[String] = ["","","","","",""] # Called when the node enters the scene tree for the first time. +signal teleport_entered() func _ready() -> void: print("BOOTS ON!!!") connect_to_player() + connect_to_main() func connect_to_player() -> void: var player := get_parent() player.moved.connect(player_moved) +func connect_to_main() -> void: + var main := get_parent().get_parent() + self.teleport_entered.connect(main.on_teleport_entered) + func player_moved(dir: Vector2) -> void: match dir: Vector2(0,1): push_move("down") + $DownSound.play() pass Vector2(0,-1): push_move("up") + $UpSound.play() pass Vector2(1,0): push_move("right") + $RightSound.play() pass Vector2(-1,0): push_move("left") + $LeftSound.play() pass + check_move_codes() - if recent_moves == move_code: +func check_move_codes(): + if recent_moves == winning_move_code: code_entered() + if recent_moves.slice(1,-1) == teleport_move_code: +<<<<<<< HEAD + teleport_entered.emit() +======= + teleport_requested.emit() +>>>>>>> 19aa049 (Teleportation And Preparing for next levels) + pass + pass func push_move(dir_string: String) -> void: recent_moves.pop_front() diff --git a/src/boots/boots.tscn b/src/boots/boots.tscn index f9fcf8b..b52f95a 100644 --- a/src/boots/boots.tscn +++ b/src/boots/boots.tscn @@ -4,3 +4,15 @@ [node name="Boots" type="Node2D"] script = ExtResource("1_1p87s") + +[node name="UpSound" type="AudioStreamPlayer2D" parent="."] +position = Vector2(0, -99) + +[node name="DownSound" type="AudioStreamPlayer2D" parent="."] +position = Vector2(0, 99) + +[node name="LeftSound" type="AudioStreamPlayer2D" parent="."] +position = Vector2(-99, 0) + +[node name="RightSound" type="AudioStreamPlayer2D" parent="."] +position = Vector2(99, 0) diff --git a/src/items/item_res.gd b/src/items/item.gd similarity index 90% rename from src/items/item_res.gd rename to src/items/item.gd index 1c7d70e..15a4501 100644 --- a/src/items/item_res.gd +++ b/src/items/item.gd @@ -11,4 +11,4 @@ func given_to_player(): in_inventory = true func removed_from_player(): - in_inventory = false \ No newline at end of file + in_inventory = false diff --git a/src/items/item_db.gd b/src/items/item_db.gd index 8e84233..5dfd793 100644 --- a/src/items/item_db.gd +++ b/src/items/item_db.gd @@ -4,38 +4,38 @@ extends Node #currently auto-loaded, although I think we could get away with it being a static script, as it dosen't have any instanced values we need to maintain, const ITEMS = { - "test0":{ - "title": "TEST ITEM", - "icon":"sword.png", - "description":"You shouldn't have this item.", - "unique":true, - }, - "test1":{ - "title":"TEST ITEM 2", - "icon":"pendant.png", - "description":"You (also) shouldn't have this item.", - "unique":true, - } + "test0":{ + "title": "TEST ITEM", + "icon":"sword.png", + "description":"You shouldn't have this item.", + "unique":true, + }, + "test1":{ + "title":"TEST ITEM 2", + "icon":"pendant.png", + "description":"You (also) shouldn't have this item.", + "unique":true, + } } # item constructor func give_item(id:String) -> void: - var new_item:Item = Item.new() - new_item.id = id - new_item.title = ITEMS[id]["title"] - var icon_name = ITEMS[id]["icon"] - new_item.icon = load("res://assets/item_icons/" + icon_name) - new_item.description = ITEMS[id]["description"] + var new_item:Item = Item.new() + new_item.id = id + new_item.title = ITEMS[id]["title"] + var icon_name = ITEMS[id]["icon"] + new_item.icon = load("res://assets/item_icons/" + icon_name) + new_item.description = ITEMS[id]["description"] - # add resource to player inventory - var current_scene = _get_current_scene() - var player:Player = current_scene.get_node("Player") - #if player.has_item(new_item) == false or new_item["unique"] == false: - player.inventory.append(new_item) - print('player now has item: ', new_item) + # add resource to player inventory + var current_scene = _get_current_scene() + var player:Player = current_scene.get_node("Player") + #if player.has_item(new_item) == false or new_item["unique"] == false: + player.inventory.append(new_item) + print('player now has item: ', new_item.title) func _get_current_scene(): - return get_tree().get_root().get_children()[-1] + return get_tree().get_root().get_children()[-1] diff --git a/src/items/test_item.tres b/src/items/test_item.tres deleted file mode 100644 index 4e0fa23..0000000 --- a/src/items/test_item.tres +++ /dev/null @@ -1,9 +0,0 @@ -[gd_resource type="Resource" script_class="Item" load_steps=2 format=3 uid="uid://c5ru2507ecm8f"] - -[ext_resource type="Script" path="res://src/items/item.gd" id="1_b1mog"] - -[resource] -script = ExtResource("1_b1mog") -id = 0 -ui_name = "" -description = "" diff --git a/src/main/main.gd b/src/main/main.gd index 54d4068..ac69036 100644 --- a/src/main/main.gd +++ b/src/main/main.gd @@ -3,28 +3,15 @@ extends Node2D @onready var menuLayer = $MenuLayer @onready var player:Player = $Player @onready var current_map:Node2D = $Map -var in_cutscene := false -var maps:Array = [preload('res://src/maps/map-1.tscn'),preload('res://src/maps/map-2.tscn'),preload('res://src/maps/map-3.tscn')] -var map_room_id_dict: Dictionary = { #Not perfect but works for time constraint - 1 : preload('res://src/maps/map-1.tscn'), - 2: preload('res://src/maps/map-2.tscn'), - 3: preload('res://src/maps/map-3.tscn') -} - -var shuffled_maps:Array = [] - -var current_map_id +var current_map_id = 1 func _ready() -> void: - #ui.text_rendered.connect(_start_cutscene) - #ui.text_removed.connect(_end_cutscene) - player.walked_into_stairs.connect(next_map) - pass + player.walked_into_stairs.connect(change_map) -func next_map(given_room_id: int) -> void: - var next_map_id :int = given_room_id - var nextMap:Node2D = map_room_id_dict[next_map_id].instantiate() +func change_map(next_map_id: int) -> void: + var next_map_path :String = "res://src/maps/map-%s.tscn" % str(next_map_id) + var nextMap:Map = load(next_map_path).instantiate() #load new map current_map.queue_free() add_child(nextMap) @@ -33,37 +20,42 @@ func next_map(given_room_id: int) -> void: #move the player to the spawn point var playerSpawnMarker:Marker2D = nextMap.get_node('PlayerSpawn') player.position = playerSpawnMarker.position - pass - -func swap_map() -> void: - #reshuffle rooms if we've visted them all - if shuffled_maps.size() == 0: - shuffled_maps = Array(range(maps.size())) - shuffled_maps.shuffle() - #pick new room from remaining choices - var next_map_id :int = shuffled_maps.pop_front() - var nextMap:Node2D = maps[next_map_id].instantiate() - #load new map +func on_teleport_entered() -> void: + var next_map_id :int = current_map_id + 2 + match current_map_id: + 77: + print("can't teleport") + return + 11: + next_map_id = 2 + 10: + next_map_id = 1 + _: + next_map_id = current_map_id + 2 + + var next_map_path :String = "res://src/maps/map-%s.tscn" % str(next_map_id) + var nextMap:Map = load(next_map_path).instantiate() + + #Check if you'd go to an empty tile + var potential_tile_position = nextMap.get_node("TileMap").local_to_map(player.position) + var potential_tile = nextMap.get_node("TileMap").get_cell_tile_data(0, potential_tile_position) + + if potential_tile != null: + print("can't teleport") +<<<<<<< HEAD + return +======= +>>>>>>> 4d938ce (Teleportation And Preparing for next levels) + + # go to new map current_map.queue_free() add_child(nextMap) current_map = nextMap - - #move the player to the spawn point - var playerSpawnMarker:Marker2D = nextMap.get_node('PlayerSpawn') - player.position = playerSpawnMarker.position + current_map_id = next_map_id func _toggle_menu(inventory) -> void: menuLayer.visible = true menuLayer._load_items(inventory) pass -#unused, will remove later -#func _start_cutscene() -> void: - #in_cutscene = true - #player.is_actionable = false - -#func _end_cutscene() -> void: - #in_cutscene = false - #await get_tree().create_timer(0.01).timeout # 10ms buffer hack to prevent input collision from text advancing and player input, could also solve by checking UI input in player _input event? - #player.is_actionable = true diff --git a/src/main/main.tscn b/src/main/main.tscn index 3b9aa8d..9834acc 100644 --- a/src/main/main.tscn +++ b/src/main/main.tscn @@ -20,6 +20,7 @@ position = Vector2(80, 48) [node name="Map" parent="." instance=ExtResource("3_w444g")] [node name="HUD" type="Control" parent="."] +z_index = 10 layout_mode = 3 anchors_preset = 0 offset_right = 256.0 diff --git a/src/main/menu_layer.gd b/src/main/menu_layer.gd index c7670cc..cc91ca0 100644 --- a/src/main/menu_layer.gd +++ b/src/main/menu_layer.gd @@ -18,11 +18,12 @@ var player_inventory :Array = [] var item_grid_bounds:= Vector2i(0,0) func equip_item(): + if itemGrid.get_child_count() == 0: + return var current_item_index = cursor_pos.x + (cursor_pos.y * item_grid_bounds.x) - print("pulled child: ",current_item_index) var current_item = itemGrid.get_child(current_item_index) player.equipped_item = current_item - equippedIcon.texture = load("res://assets/item_icons/" +ItemDb.ITEMS[current_item.id]['icon']) + equippedIcon.texture = load("res://assets/item_icons/%s" % ItemDb.ITEMS[current_item.id]['icon']) func get_input_vector(event: InputEvent) -> Vector2: @@ -78,23 +79,17 @@ func _load_items(new_inventory:Array) -> void: if player_inventory.size() == 0: return - prints("sizes",itemGrid.get_child_count(),player_inventory.size()) for item in player_inventory: var new_item_icon :TextureRect= item_icon_scene.instantiate() # we just store the id of the item in the icon, not the entire resource new_item_icon.id = item.id - new_item_icon.texture = load("res://assets/item_icons/" +ItemDb.ITEMS[item.id]['icon']) + new_item_icon.texture = load("res://assets/item_icons/%s" %ItemDb.ITEMS[item.id]['icon']) itemGrid.add_child(new_item_icon) # math to find row and col count based on number of children - for child in itemGrid.get_children(): - print(child.id) - print(itemGrid.get_children()) - print(itemGrid.get_child_count()) item_grid_bounds.x = min(itemGrid.get_child_count(),itemGrid.columns) item_grid_bounds.y = ceili(float(itemGrid.get_child_count())/float(itemGrid.columns)) - print(item_grid_bounds) _update_labels(itemGrid.get_child(0).id) diff --git a/src/maps/map-0.tscn b/src/maps/map-0.tscn new file mode 100644 index 0000000..b08352c --- /dev/null +++ b/src/maps/map-0.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=6 format=3 uid="uid://22clf0thbdqv"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_k21k7"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_7hcry"] +[ext_resource type="PackedScene" uid="uid://cojb8qcua33fo" path="res://src/scene-tiles/chest/chest.tscn" id="3_srxud"] +[ext_resource type="Resource" uid="uid://dlw5a1hy61hj8" path="res://src/dialogue/main.dialogue" id="4_q2eeb"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="5_lbiou"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_k21k7") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_7hcry") +format = 2 +layer_0/name = "walls" +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524291, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 196621, 262145, 18, 262157, 262145, 18, 327693, 262145, 18, 393229, 262145, 18, 393228, 262145, 18, 327692, 262145, 18, 262156, 262145, 18, 393227, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65549, 262145, 18, 131085, 262145, 18, 65537, 262145, 18, 131073, 262145, 18, 196609, 262145, 18, 262145, 262145, 18, 327681, 262145, 18, 393217, 262145, 18, 458753, 262145, 18, 458754, 262145, 18, 458755, 262145, 18, 393219, 262145, 18, 327683, 262145, 18, 262147, 262145, 18, 196611, 262145, 18, 131075, 262145, 18, 131074, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 196610, 262145, 18, 262146, 262145, 18, 327682, 262145, 18, 393218, 262145, 18) +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 48) + +[node name="Chest" parent="." instance=ExtResource("3_srxud")] +position = Vector2(160, 96) +dialog_resource = ExtResource("4_q2eeb") + +[node name="stairs" parent="." instance=ExtResource("5_lbiou")] +position = Vector2(112, 48) diff --git a/src/maps/map-1.tscn b/src/maps/map-1.tscn index 7459311..4d744d5 100644 --- a/src/maps/map-1.tscn +++ b/src/maps/map-1.tscn @@ -1,10 +1,8 @@ -[gd_scene load_steps=6 format=3 uid="uid://deqm4to4ptnq0"] +[gd_scene load_steps=4 format=3 uid="uid://deqm4to4ptnq0"] [ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="1_vosps"] [ext_resource type="Script" path="res://src/maps/map.gd" id="1_web8r"] [ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_8x2ye"] -[ext_resource type="PackedScene" uid="uid://cojb8qcua33fo" path="res://src/scene-tiles/chest/chest.tscn" id="4_hq2kf"] -[ext_resource type="Resource" uid="uid://dlw5a1hy61hj8" path="res://src/dialogue/main.dialogue" id="5_gjl3f"] [node name="Map" type="Node2D"] script = ExtResource("1_web8r") @@ -13,7 +11,7 @@ script = ExtResource("1_web8r") tile_set = ExtResource("1_vosps") format = 2 layer_0/name = "walls" -layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524291, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 196621, 262145, 18, 262157, 262145, 18, 327693, 262145, 18, 393229, 262145, 18, 393228, 262145, 18, 327692, 262145, 18, 262156, 262145, 18, 393227, 262145, 18, 458762, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65549, 262145, 18, 131085, 262145, 18, 65537, 262145, 18, 131073, 262145, 18, 196609, 262145, 18, 262145, 262145, 18, 327681, 262145, 18, 393217, 262145, 18, 458753, 262145, 18, 458754, 262145, 18, 458755, 262145, 18, 393219, 262145, 18, 327683, 262145, 18, 262147, 262145, 18, 196611, 262145, 18, 131075, 262145, 18, 131074, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 196610, 262145, 18, 262146, 262145, 18, 327682, 262145, 18, 393218, 262145, 18) +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524291, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 393229, 262145, 18, 393228, 262145, 18, 393227, 262145, 18, 458762, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 131073, 262145, 18, 196609, 262145, 18, 262145, 262145, 18, 327681, 262145, 18, 393217, 262145, 18, 458753, 262145, 18, 458754, 262145, 18, 458755, 262145, 18, 393219, 262145, 18, 327683, 262145, 18, 262147, 262145, 18, 196611, 262145, 18, 131075, 262145, 18, 131074, 262145, 18, 196610, 262145, 18, 262146, 262145, 18, 327682, 262145, 18, 393218, 262145, 18, 65537, 196609, 18, 65538, 196609, 18, 65539, 196609, 18, 65549, 196609, 18, 65550, 196609, 18) layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) [node name="PlayerSpawn" type="Marker2D" parent="."] @@ -21,8 +19,7 @@ position = Vector2(80, 48) [node name="stairs" parent="." instance=ExtResource("3_8x2ye")] position = Vector2(160, 96) +<<<<<<< HEAD +======= toward_room_id = 2 - -[node name="Chest" parent="." instance=ExtResource("4_hq2kf")] -position = Vector2(112, 64) -dialog_resource = ExtResource("5_gjl3f") +>>>>>>> 19a3cf7 (Map puzzles Now in!) diff --git a/src/maps/map-10.tscn b/src/maps/map-10.tscn new file mode 100644 index 0000000..2ccc5ed --- /dev/null +++ b/src/maps/map-10.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=3 uid="uid://behqbmue4bheh"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_0dl14"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_f1sjl"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_l62f8"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_0dl14") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_f1sjl") +format = 2 +layer_0/name = "walls" +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 196621, 262145, 18, 262157, 262145, 18, 327693, 262145, 18, 393229, 262145, 18, 458762, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65549, 262145, 18, 131085, 262145, 18, 65537, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 65540, 262145, 18, 65541, 262145, 18, 65542, 262145, 18, 65543, 262145, 18, 65544, 262145, 18, 65545, 262145, 18, 65546, 262145, 18, 65547, 262145, 18, 65548, 262145, 18, 524291, 1245185, 2) +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 64) + +[node name="stairs" parent="." instance=ExtResource("3_l62f8")] +position = Vector2(160, 96) +toward_room_id = 11 diff --git a/src/maps/map-11.tscn b/src/maps/map-11.tscn new file mode 100644 index 0000000..b3d5e87 --- /dev/null +++ b/src/maps/map-11.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=3 uid="uid://tbdug0eavdeu"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_0dl14"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_f1sjl"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_l62f8"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_0dl14") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_f1sjl") +format = 2 +layer_0/name = "walls" +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524302, 1245185, 2, 524291, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 393218, 262145, 18, 327682, 262145, 18, 262146, 262145, 18, 196610, 262145, 18, 131074, 262145, 18, 393221, 262145, 18, 196613, 262145, 18, 131077, 262145, 18, 393224, 262145, 18, 327688, 262145, 18, 262152, 262145, 18, 196616, 262145, 18, 131080, 262145, 18, 393227, 262145, 18, 196619, 262145, 18, 131083, 262145, 18, 262155, 196609, 18, 327691, 196609, 18) +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 64) + +[node name="stairs" parent="." instance=ExtResource("3_l62f8")] +position = Vector2(192, 48) +toward_room_id = 1 diff --git a/src/maps/map-2.tscn b/src/maps/map-2.tscn index 96ad0c4..a46ebf8 100644 --- a/src/maps/map-2.tscn +++ b/src/maps/map-2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://cwxdotd7hh5tb"] +[gd_scene load_steps=4 format=3 uid="uid://bapnj7ekqfb0t"] [ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="1_2mk3g"] [ext_resource type="Script" path="res://src/maps/map.gd" id="1_wfc8d"] @@ -6,18 +6,17 @@ [node name="Map" type="Node2D"] script = ExtResource("1_wfc8d") -room_id = 2 [node name="TileMap" type="TileMap" parent="."] tile_set = ExtResource("1_2mk3g") format = 2 layer_0/name = "walls" -layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 196621, 262145, 18, 262157, 262145, 18, 327693, 262145, 18, 393229, 262145, 18, 393228, 262145, 18, 327692, 262145, 18, 262156, 262145, 18, 393227, 262145, 18, 458762, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65549, 262145, 18, 131085, 262145, 18, 131073, 262145, 18, 65537, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 65540, 262145, 18, 65541, 262145, 18, 65542, 262145, 18, 65543, 262145, 18, 65544, 262145, 18, 65545, 262145, 18, 65546, 262145, 18, 65547, 262145, 18, 65548, 262145, 18, 131084, 262145, 18, 131083, 262145, 18, 131082, 262145, 18, 131081, 262145, 18, 131080, 262145, 18, 131079, 262145, 18, 131078, 262145, 18, 131077, 262145, 18, 131076, 262145, 18, 131075, 262145, 18, 131074, 262145, 18, 327690, 196609, 18, 262153, 196609, 18, 196616, 196609, 18, 524291, 1245185, 2) +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524291, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458762, 262145, 18, 458761, 262145, 18, 65550, 262145, 18, 131073, 262145, 18, 65537, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 65540, 262145, 18, 65541, 262145, 18, 65542, 262145, 18, 131075, 262145, 18, 131074, 262145, 18, 262157, 262145, 18, 196621, 262145, 18, 196620, 262145, 18, 131084, 262145, 18, 131083, 262145, 18, 327688, 262145, 18, 393224, 262145, 18, 393223, 262145, 18, 327687, 262145, 18, 327686, 262145, 18, 262150, 262145, 18, 196614, 262145, 18, 196613, 262145, 18, 196612, 262145, 18, 262148, 262145, 18, 262147, 262145, 18, 393218, 262145, 18, 393219, 262145, 18, 393220, 262145, 18, 327685, 262145, 18, 393225, 262145, 18, 393226, 262145, 18, 393227, 262145, 18, 393229, 262145, 18, 65543, 262145, 18, 65544, 262145, 18, 65545, 262145, 18, 65546, 262145, 18, 327693, 262145, 18, 131080, 262145, 18, 131079, 262145, 18, 196615, 262145, 18, 262151, 262145, 18, 524300, 1245185, 2, 393228, 262145, 18) layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) [node name="PlayerSpawn" type="Marker2D" parent="."] -position = Vector2(80, 64) +position = Vector2(144, 48) [node name="stairs" parent="." instance=ExtResource("3_wvxh7")] -position = Vector2(160, 96) +position = Vector2(192, 80) toward_room_id = 3 diff --git a/src/maps/map-3.tscn b/src/maps/map-3.tscn index 8ca8799..d68246d 100644 --- a/src/maps/map-3.tscn +++ b/src/maps/map-3.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://bapnj7ekqfb0t"] +[gd_scene load_steps=4 format=3 uid="uid://cwxdotd7hh5tb"] [ext_resource type="Script" path="res://src/maps/map.gd" id="1_kwl2f"] [ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="1_xfyi1"] @@ -6,18 +6,21 @@ [node name="Map" type="Node2D"] script = ExtResource("1_kwl2f") -room_id = 3 [node name="TileMap" type="TileMap" parent="."] tile_set = ExtResource("1_xfyi1") format = 2 layer_0/name = "walls" -layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524291, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458762, 262145, 18, 458761, 262145, 18, 65550, 262145, 18, 131073, 262145, 18, 65537, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 65540, 262145, 18, 65541, 262145, 18, 65542, 262145, 18, 131075, 262145, 18, 131074, 262145, 18, 262157, 262145, 18, 196621, 262145, 18, 196620, 262145, 18, 131084, 262145, 18, 131083, 262145, 18, 327688, 262145, 18, 393224, 262145, 18, 393223, 262145, 18, 327687, 262145, 18, 327686, 262145, 18, 262150, 262145, 18, 196614, 262145, 18, 196613, 262145, 18, 196612, 262145, 18, 262148, 262145, 18, 262147, 262145, 18, 393218, 262145, 18, 393219, 262145, 18, 393220, 262145, 18, 327685, 262145, 18, 393225, 262145, 18, 393226, 262145, 18, 393227, 262145, 18, 393229, 262145, 18, 65543, 262145, 18, 65544, 262145, 18, 65545, 262145, 18, 65546, 262145, 18, 327693, 262145, 18, 131080, 262145, 18, 131079, 262145, 18, 196615, 262145, 18, 262151, 262145, 18, 131082, 3, 262144, 524300, 1245185, 2, 393228, 262145, 18) +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 196621, 262145, 18, 262157, 262145, 18, 327693, 262145, 18, 393229, 262145, 18, 393228, 262145, 18, 327692, 262145, 18, 262156, 262145, 18, 393227, 262145, 18, 458762, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65549, 262145, 18, 131085, 262145, 18, 131073, 262145, 18, 65537, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 65540, 262145, 18, 65541, 262145, 18, 65542, 262145, 18, 65543, 262145, 18, 65544, 262145, 18, 65545, 262145, 18, 65546, 262145, 18, 65547, 262145, 18, 65548, 262145, 18, 131084, 262145, 18, 131083, 262145, 18, 131082, 262145, 18, 131081, 262145, 18, 131080, 262145, 18, 131079, 262145, 18, 131078, 262145, 18, 131077, 262145, 18, 131076, 262145, 18, 131075, 262145, 18, 131074, 262145, 18, 524291, 1245185, 2, 327690, 262145, 18, 262153, 262145, 18, 196616, 262145, 18) layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) [node name="PlayerSpawn" type="Marker2D" parent="."] -position = Vector2(144, 48) +position = Vector2(80, 64) [node name="stairs" parent="." instance=ExtResource("3_vucpd")] -position = Vector2(192, 80) -toward_room_id = 1 +position = Vector2(160, 96) +toward_room_id = 4 + +[node name="stairs2" parent="." instance=ExtResource("3_vucpd")] +position = Vector2(192, 48) +toward_room_id = 77 diff --git a/src/maps/map-4.tscn b/src/maps/map-4.tscn index 55e1f6a..9bd6d65 100644 --- a/src/maps/map-4.tscn +++ b/src/maps/map-4.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://22clf0thbdqv"] +[gd_scene load_steps=4 format=3 uid="uid://22clf0thbdqv"] [ext_resource type="Script" path="res://src/maps/map.gd" id="1_qwjcs"] [ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_1bcx7"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_w7jut"] [node name="Map" type="Node2D"] script = ExtResource("1_qwjcs") @@ -10,8 +11,12 @@ script = ExtResource("1_qwjcs") tile_set = ExtResource("2_1bcx7") format = 2 layer_0/name = "walls" -layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524291, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 196621, 262145, 18, 262157, 262145, 18, 327693, 262145, 18, 393229, 262145, 18, 393228, 262145, 18, 327692, 262145, 18, 262156, 262145, 18, 393227, 262145, 18, 458762, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65549, 262145, 18, 131085, 262145, 18, 65537, 262145, 18, 131073, 262145, 18, 196609, 262145, 18, 262145, 262145, 18, 327681, 262145, 18, 393217, 262145, 18, 458753, 262145, 18, 458754, 262145, 18, 458755, 262145, 18, 393219, 262145, 18, 327683, 262145, 18, 262147, 262145, 18, 196611, 262145, 18, 131075, 262145, 18, 131074, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 196610, 262145, 18, 262146, 262145, 18, 327682, 262145, 18, 393218, 262145, 18, 196615, 3, 262144, 393226, 3, 196608) +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524291, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65537, 262145, 18, 131073, 262145, 18, 196609, 262145, 18, 262145, 262145, 18, 327681, 262145, 18, 393217, 262145, 18, 458753, 262145, 18) layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) [node name="PlayerSpawn" type="Marker2D" parent="."] position = Vector2(80, 48) + +[node name="stairs" parent="." instance=ExtResource("3_w7jut")] +position = Vector2(192, 64) +toward_room_id = 5 diff --git a/src/maps/map-5.tscn b/src/maps/map-5.tscn new file mode 100644 index 0000000..0d0681b --- /dev/null +++ b/src/maps/map-5.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=5 format=3 uid="uid://cy6ft3gis6xo1"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_1iq0s"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_bw06a"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_oj5pp"] +[ext_resource type="PackedScene" uid="uid://cojb8qcua33fo" path="res://src/scene-tiles/chest/chest.tscn" id="4_wwsf8"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_1iq0s") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_bw06a") +format = 2 +layer_0/name = "walls" +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 196621, 262145, 18, 262157, 262145, 18, 327693, 262145, 18, 393229, 262145, 18, 393228, 262145, 18, 327692, 262145, 18, 458762, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65549, 262145, 18, 131085, 262145, 18, 131073, 262145, 18, 65537, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 65540, 262145, 18, 65541, 262145, 18, 65542, 262145, 18, 65543, 262145, 18, 65544, 262145, 18, 65545, 262145, 18, 65546, 262145, 18, 65547, 262145, 18, 65548, 262145, 18, 131074, 262145, 18, 524291, 1245185, 2, 458754, 262145, 18, 393218, 262145, 18, 327682, 262145, 18, 262146, 262145, 18, 196610, 262145, 18, 196609, 262145, 18, 262145, 262145, 18, 327681, 262145, 18, 393217, 262145, 18, 458753, 262145, 18, 131075, 262145, 18, 131076, 262145, 18, 196614, 262145, 18, 262147, 262145, 18, 262148, 262145, 18, 196611, 262145, 18, 196615, 262145, 18, 196616, 262145, 18, 262153, 262145, 18, 327690, 262145, 18, 327691, 262145, 18, 196612, 196609, 18, 196613, 196609, 18, 131077, 196609, 18, 131078, 196609, 18, 131079, 196609, 18, 131080, 196609, 18, 131081, 196609, 18, 196617, 196609, 18, 327689, 262145, 18) +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 64) + +[node name="stairs" parent="." instance=ExtResource("3_oj5pp")] +position = Vector2(112, 96) +toward_room_id = 6 + +[node name="Chest" parent="." instance=ExtResource("4_wwsf8")] +position = Vector2(176, 48) diff --git a/src/maps/map-6.tscn b/src/maps/map-6.tscn new file mode 100644 index 0000000..467020e --- /dev/null +++ b/src/maps/map-6.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=4 format=3 uid="uid://32pkjn8ivcow"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_8dqx8"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_iwcel"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_qk1jn"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_8dqx8") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_iwcel") +format = 2 +layer_0/name = "walls" +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 65540, 262145, 18, 65541, 262145, 18, 65542, 262145, 18, 131078, 262145, 18, 131077, 262145, 18, 131076, 262145, 18, 524291, 1245185, 2, 196615, 262145, 18, 196616, 262145, 18, 131079, 262145, 18, 65544, 262145, 18, 65543, 262145, 18, 131080, 262145, 18, 196617, 262145, 18, 65545, 262145, 18, 131081, 262145, 18, 131082, 262145, 18, 196618, 262145, 18, 65546, 262145, 18, 458766, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 393229, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393228, 262145, 18, 327693, 262145, 18, 458755, 262145, 18, 458756, 262145, 18, 393219, 262145, 18, 65547, 262145, 18, 65548, 262145, 18, 65549, 262145, 18, 65550, 262145, 18, 131086, 262145, 18, 196622, 262145, 18, 262158, 262145, 18, 458754, 196609, 18, 393218, 196609, 18, 327682, 196609, 18, 327681, 196609, 18, 393217, 196609, 18, 458753, 196609, 18, 131075, 196609, 18, 65539, 196609, 18, 65538, 196609, 18, 65537, 196609, 18, 131073, 196609, 18, 131074, 196609, 18) +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 64) + +[node name="stairs" parent="." instance=ExtResource("3_qk1jn")] +position = Vector2(112, 112) +toward_room_id = 7 + +[node name="stairs2" parent="." instance=ExtResource("3_qk1jn")] +position = Vector2(192, 48) +toward_room_id = 8 diff --git a/src/maps/map-7.tscn b/src/maps/map-7.tscn new file mode 100644 index 0000000..c35aed7 --- /dev/null +++ b/src/maps/map-7.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=3 uid="uid://qmrwu7f2fpg6"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_4rl4u"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_hcug5"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_3nspj"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_4rl4u") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_hcug5") +format = 2 +layer_0/name = "walls" +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 131073, 262145, 18, 65537, 262145, 18, 65538, 262145, 18, 65539, 262145, 18, 65540, 262145, 18, 131074, 262145, 18, 524291, 1245185, 2, 196609, 262145, 18, 196610, 262145, 18, 262146, 262145, 18, 262145, 262145, 18, 131075, 262145, 18, 196611, 262145, 18, 14, 1245185, 0, 13, 1245185, 0, 65550, 262145, 18, 131086, 262145, 18, 196622, 262145, 18, 393230, 262145, 18, 458766, 262145, 18, 458765, 262145, 18, 393228, 262145, 18, 393229, 262145, 18, 196621, 262145, 18, 131085, 262145, 18, 131084, 262145, 18, 131083, 262145, 18, 196618, 262145, 18, 458757, 262145, 18, 458758, 262145, 18, 458756, 196609, 18, 458755, 196609, 18, 458754, 196609, 18, 458753, 196609, 18, 327693, 196609, 18, 327694, 196609, 18, 262158, 196609, 18, 262157, 196609, 18) +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 64) + +[node name="stairs" parent="." instance=ExtResource("3_3nspj")] +position = Vector2(192, 48) +toward_room_id = 3 diff --git a/src/maps/map-77.tscn b/src/maps/map-77.tscn new file mode 100644 index 0000000..12ace6b --- /dev/null +++ b/src/maps/map-77.tscn @@ -0,0 +1,24 @@ +[gd_scene load_steps=4 format=3 uid="uid://bhhcjxrvxxawg"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_f3vvj"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_l7q50"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_les7w"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_f3vvj") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_l7q50") +format = 2 +layer_0/name = "walls" +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 64) + +[node name="stairs" parent="." instance=ExtResource("3_les7w")] +position = Vector2(192, 64) +toward_room_id = 1 +[node name="stairs2" parent="." instance=ExtResource("3_les7w")] +position = Vector2(192, 48) +toward_room_id = 6 diff --git a/src/maps/map-8.tscn b/src/maps/map-8.tscn new file mode 100644 index 0000000..d6cce5d --- /dev/null +++ b/src/maps/map-8.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=3 uid="uid://bodeim6hge5e7"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_xna0b"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_s8tme"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_cycrh"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_xna0b") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_s8tme") +format = 2 +layer_0/name = "walls" +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 458766, 262145, 18, 458765, 262145, 18, 458764, 262145, 18, 458763, 262145, 18, 393230, 262145, 18, 327694, 262145, 18, 262158, 262145, 18, 196622, 262145, 18, 196621, 262145, 18, 262157, 262145, 18, 327693, 262145, 18, 393229, 262145, 18, 393228, 262145, 18, 327692, 262145, 18, 262156, 262145, 18, 393227, 262145, 18, 458762, 262145, 18, 458761, 262145, 18, 131086, 262145, 18, 65550, 262145, 18, 65549, 262145, 18, 131085, 262145, 18, 131073, 262145, 18, 65537, 262145, 18, 65538, 262145, 18, 65548, 262145, 18, 131084, 262145, 18, 131082, 262145, 18, 131081, 262145, 18, 131080, 262145, 18, 131079, 262145, 18, 131078, 262145, 18, 131077, 262145, 18, 131076, 262145, 18, 131074, 262145, 18, 524291, 1245185, 2, 393217, 262145, 18, 393218, 262145, 18, 393219, 262145, 18, 393220, 262145, 18, 393221, 262145, 18, 393222, 262145, 18, 458758, 262145, 18, 458757, 262145, 18, 458756, 262145, 18, 458755, 262145, 18, 458754, 262145, 18, 458753, 262145, 18, 327687, 262145, 18, 262152, 262145, 18, 196617, 262145, 18, 131075, 196609, 18, 65539, 196609, 18, 65540, 196609, 18, 65541, 196609, 18, 65542, 196609, 18, 65543, 196609, 18, 65544, 196609, 18, 65545, 196609, 18, 65546, 196609, 18, 65547, 196609, 18, 131083, 196609, 18) +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 64) + +[node name="stairs" parent="." instance=ExtResource("3_cycrh")] +position = Vector2(96, 80) +toward_room_id = 10 diff --git a/src/maps/map-9.tscn b/src/maps/map-9.tscn new file mode 100644 index 0000000..2dd65db --- /dev/null +++ b/src/maps/map-9.tscn @@ -0,0 +1,30 @@ +[gd_scene load_steps=4 format=3 uid="uid://b4qe43ry8jtg"] + +[ext_resource type="Script" path="res://src/maps/map.gd" id="1_ojfbm"] +[ext_resource type="TileSet" uid="uid://dmwbt07hsdtyl" path="res://src/resources/map_tileset.tres" id="2_tet7f"] +[ext_resource type="PackedScene" uid="uid://cmdlpc0uddsm2" path="res://src/scene-tiles/stairs/stairs.tscn" id="3_n0dp0"] + +[node name="Map" type="Node2D"] +script = ExtResource("1_ojfbm") + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource("2_tet7f") +format = 2 +layer_0/name = "walls" +layer_0/tile_data = PackedInt32Array(0, 1179649, 0, 1, 1245185, 0, 2, 1245185, 0, 3, 1245185, 0, 4, 1245185, 0, 5, 1245185, 0, 6, 1245185, 0, 7, 1245185, 0, 8, 1245185, 0, 9, 1245185, 0, 10, 1245185, 0, 65536, 1179649, 1, 131072, 1179649, 1, 196608, 1179649, 1, 262144, 1179649, 1, 327680, 1179649, 1, 393216, 1179649, 1, 458752, 1179649, 1, 524288, 1179649, 2, 11, 1245185, 0, 12, 1245185, 0, 13, 1245185, 0, 14, 1245185, 0, 15, 1310721, 0, 65551, 1310721, 1, 131087, 1310721, 1, 196623, 1310721, 1, 262159, 1310721, 1, 327695, 1310721, 1, 393231, 1310721, 1, 458767, 1310721, 1, 524303, 1310721, 2, 524289, 1245185, 2, 524290, 1245185, 2, 524292, 1245185, 2, 524293, 1245185, 2, 524294, 1245185, 2, 524295, 1245185, 2, 524296, 1245185, 2, 524297, 1245185, 2, 524298, 1245185, 2, 524299, 1245185, 2, 524300, 1245185, 2, 524301, 1245185, 2, 524302, 1245185, 2, 524291, 1245185, 2, 196616, 262145, 18, 262152, 262145, 18, 327688, 262145, 18, 196611, 262145, 18, 262147, 262145, 18, 327683, 262145, 18, 393224, 196609, 18, 393219, 196609, 18, 131080, 196609, 18, 131075, 196609, 18) +layer_1/tile_data = PackedInt32Array(196615, 3, 65536, 393226, 3, 131072) + +[node name="PlayerSpawn" type="Marker2D" parent="."] +position = Vector2(80, 64) + +[node name="stairs" parent="." instance=ExtResource("3_n0dp0")] +position = Vector2(197, 27) +toward_room_id = 1 + +[node name="stairs2" parent="." instance=ExtResource("3_n0dp0")] +position = Vector2(197, 62) +toward_room_id = 3 + +[node name="stairs3" parent="." instance=ExtResource("3_n0dp0")] +position = Vector2(198, 108) +toward_room_id = 6 diff --git a/src/maps/map.gd b/src/maps/map.gd index 52bbc82..c041711 100644 --- a/src/maps/map.gd +++ b/src/maps/map.gd @@ -2,7 +2,7 @@ class_name Map extends Node2D # we need to add a collision shape to the tilemap for the player raycast to be able to detect it, otherwise it'll be considered null. - +var id:int @onready var tilemap:TileMap = $TileMap func _ready() -> void: diff --git a/src/menu/item_ui.tscn b/src/menu/item_ui.tscn index 72db49b..44f250b 100644 --- a/src/menu/item_ui.tscn +++ b/src/menu/item_ui.tscn @@ -1,8 +1,6 @@ -[gd_scene load_steps=3 format=3 uid="uid://dhi5ko8td6k8x"] +[gd_scene load_steps=2 format=3 uid="uid://dhi5ko8td6k8x"] -[ext_resource type="Texture2D" uid="uid://bk51v1m1wfhex" path="res://assets/item_icons/x.png" id="1_poc1b"] [ext_resource type="Script" path="res://src/menu/item_ui.gd" id="2_02iya"] [node name="TextureRect" type="TextureRect"] -texture = ExtResource("1_poc1b") script = ExtResource("2_02iya") diff --git a/src/player/player.gd b/src/player/player.gd index 74257de..ea43132 100644 --- a/src/player/player.gd +++ b/src/player/player.gd @@ -66,7 +66,7 @@ func check_next_tile(tile: Object) -> void: if tile == null: return if tile.is_in_group('stairs'): - walked_into_stairs.emit(tile.toward_room_id) + walked_into_stairs.emit(tile.next_room_id) func _interact() -> void: raycast.force_raycast_update() diff --git a/src/player/player.tscn b/src/player/player.tscn index 6c7d3be..c9aa73c 100644 --- a/src/player/player.tscn +++ b/src/player/player.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=4 format=3 uid="uid://bp6oyjqvoyffq"] +[gd_scene load_steps=5 format=3 uid="uid://bp6oyjqvoyffq"] [ext_resource type="Texture2D" uid="uid://b3w5cmqr6fbcw" path="res://assets/monochrome-transparent_packed.png" id="1_bwexj"] [ext_resource type="Script" path="res://src/player/player.gd" id="1_fqi5k"] +[ext_resource type="PackedScene" uid="uid://dtgyaic6xsu0h" path="res://src/boots/boots.tscn" id="3_6ip46"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_v5s8d"] size = Vector2(16, 16) @@ -22,3 +23,5 @@ region_rect = Rect2(432, 0, 16, 16) [node name="RayCast2D" type="RayCast2D" parent="."] position = Vector2(8, 8) target_position = Vector2(0, 16) + +[node name="Boots" parent="." instance=ExtResource("3_6ip46")] diff --git a/src/scene-tiles/stairs/stairs.gd b/src/scene-tiles/stairs/stairs.gd index 4ea5add..e38d74a 100644 --- a/src/scene-tiles/stairs/stairs.gd +++ b/src/scene-tiles/stairs/stairs.gd @@ -1,6 +1,6 @@ extends Area2D -@export var toward_room_id: int = 0 +@export var next_room_id: int = 0 # Called when the node enters the scene tree for the first time. func _ready() -> void: diff --git a/todo.md b/todo.md index 92ff736..ea01a5d 100644 --- a/todo.md +++ b/todo.md @@ -18,8 +18,9 @@ # todo: -- use grid nodes -- change db to use names instead of numbers -- render items to the game when the menu loads -- fix input issues with canvas layer -- update currently equipped one \ No newline at end of file +- clean things up +- update contribution instructions +- work on settings menu: + - control mapping? + - resolution scale, integer or fit + - \ No newline at end of file