diff --git a/metroidvania/Levels/Door.gd b/metroidvania/Levels/Door.gd new file mode 100644 index 0000000..2d47211 --- /dev/null +++ b/metroidvania/Levels/Door.gd @@ -0,0 +1,13 @@ +extends Area2D + +export(Resource) var connection = null +export(String, FILE, "*.tscn") var new_level_path = "" + +var active = true + + +func _on_Door_body_entered(player): + print("hit door") + if active: + player.emit_signal("his_door", self) + active = false diff --git a/metroidvania/Levels/Door.tscn b/metroidvania/Levels/Door.tscn new file mode 100644 index 0000000..09becbb --- /dev/null +++ b/metroidvania/Levels/Door.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://Assets/World/Door.png" type="Texture" id=1] +[ext_resource path="res://Levels/Door.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 8, 16 ) + +[node name="Door" type="Area2D" groups=[ +"Door", +]] +collision_layer = 0 +script = ExtResource( 2 ) + +[node name="Collider" type="CollisionShape2D" parent="."] +shape = SubResource( 1 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( -6, 0 ) +texture = ExtResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_Door_body_entered"] diff --git a/metroidvania/Levels/Level.gd b/metroidvania/Levels/Level.gd new file mode 100644 index 0000000..cc065ce --- /dev/null +++ b/metroidvania/Levels/Level.gd @@ -0,0 +1,8 @@ +extends Node2D + +const WORLD = preload("res://Scenes/World/World.gd") + +func _ready(): + var parent = get_parent() + if parent is WORLD: + parent.currentLevel = self diff --git a/metroidvania/Levels/Level.tscn b/metroidvania/Levels/Level.tscn new file mode 100644 index 0000000..d21fe7a --- /dev/null +++ b/metroidvania/Levels/Level.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Levels/Level.gd" type="Script" id=1] +[ext_resource path="res://Scenes/TileMap.tscn" type="PackedScene" id=2] + +[node name="Level" type="Node2D"] +script = ExtResource( 1 ) + +[node name="TileMap" parent="." instance=ExtResource( 2 )] diff --git a/metroidvania/Levels/Level_00.tscn b/metroidvania/Levels/Level_00.tscn new file mode 100644 index 0000000..57eff73 --- /dev/null +++ b/metroidvania/Levels/Level_00.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Levels/Level.tscn" type="PackedScene" id=1] +[ext_resource path="res://Levels/Door.tscn" type="PackedScene" id=2] + +[node name="Level_00" instance=ExtResource( 1 )] + +[node name="TileMap" parent="." index="0"] +tile_data = PoolIntArray( 0, 0, 4, 1, 0, 196609, 2, 0, 196609, 3, 0, 196609, 4, 0, 196609, 5, 0, 196609, 6, 0, 196609, 7, 0, 196609, 8, 0, 196609, 9, 0, 196609, 10, 0, 196609, 11, 0, 196609, 12, 0, 196609, 13, 0, 196609, 14, 0, 196609, 15, 0, 196609, 16, 0, 196609, 17, 0, 196609, 18, 0, 196609, 19, 0, 7, 65536, 0, 65539, 65555, 0, 65539, 131072, 0, 65539, 131091, 0, 65539, 196608, 0, 65539, 196627, 0, 65539, 262144, 0, 65539, 262163, 0, 65539, 327680, 0, 65539, 327699, 0, 65539, 393216, 0, 65539, 393235, 0, 65539, 458752, 0, 65539, 458771, 0, 131075, 524288, 0, 65539, 589824, 0, 65539, 655360, 0, 196612, 655361, 0, 196609, 655362, 0, 196609, 655363, 0, 196609, 655364, 0, 196609, 655365, 0, 196609, 655366, 0, 196609, 655367, 0, 196609, 655368, 0, 196609, 655369, 0, 196609, 655370, 0, 196609, 655371, 0, 196609, 655372, 0, 196609, 655373, 0, 196609, 655374, 0, 196609, 655375, 0, 196609, 655376, 0, 196609, 655377, 0, 196609, 655378, 0, 196609, 655379, 0, 196610 ) + +[node name="Door" parent="." index="1" instance=ExtResource( 2 )] +position = Vector2( 320, 144 ) diff --git a/metroidvania/Scenes/Player/Player.gd b/metroidvania/Scenes/Player/Player.gd index 0b19c8f..fed6736 100644 --- a/metroidvania/Scenes/Player/Player.gd +++ b/metroidvania/Scenes/Player/Player.gd @@ -41,6 +41,8 @@ onready var fireBulletTimer = $FireBulletTimer onready var blinkAnimator = $BlinkAnimator onready var powerupDetector = $PowerupDetector +signal hit_door(door) + func set_invincible(value): invincible = value diff --git a/metroidvania/Scenes/World/TileMap.tscn b/metroidvania/Scenes/TileMap.tscn similarity index 100% rename from metroidvania/Scenes/World/TileMap.tscn rename to metroidvania/Scenes/TileMap.tscn diff --git a/metroidvania/Scenes/World/World.gd b/metroidvania/Scenes/World/World.gd index 219bc17..0deb898 100644 --- a/metroidvania/Scenes/World/World.gd +++ b/metroidvania/Scenes/World/World.gd @@ -1,11 +1,6 @@ extends Node +onready var currentLevel = $Level_00 -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - - -# Called when the node enters the scene tree for the first time. func _ready(): VisualServer.set_default_clear_color(Color.black) diff --git a/metroidvania/Scenes/World/World.tscn b/metroidvania/Scenes/World/World.tscn index c3cd9bf..d6bec89 100644 --- a/metroidvania/Scenes/World/World.tscn +++ b/metroidvania/Scenes/World/World.tscn @@ -1,17 +1,10 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=6 format=2] -[ext_resource path="res://Scenes/World/TileMap.tscn" type="PackedScene" id=1] +[ext_resource path="res://Levels/Level_00.tscn" type="PackedScene" id=1] [ext_resource path="res://Scenes/Player/Player.tscn" type="PackedScene" id=2] [ext_resource path="res://Scenes/World/World.gd" type="Script" id=3] -[ext_resource path="res://Scenes/World/MovingPlatform.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scenes/Enemies/WalkingEnemy.tscn" type="PackedScene" id=5] [ext_resource path="res://Scenes/World/Camera.tscn" type="PackedScene" id=6] [ext_resource path="res://Scenes/UI/UI.tscn" type="PackedScene" id=7] -[ext_resource path="res://Scenes/Enemies/FlyingEnemy.tscn" type="PackedScene" id=8] -[ext_resource path="res://Scenes/Enemies/PlantEnemy.tscn" type="PackedScene" id=9] -[ext_resource path="res://Scenes/Enemies/CrawlingEnemy.tscn" type="PackedScene" id=10] -[ext_resource path="res://Scenes/Objects/Brick.tscn" type="PackedScene" id=11] -[ext_resource path="res://Scenes/Player/MissilesPowerup.tscn" type="PackedScene" id=12] [node name="World" type="Node"] script = ExtResource( 3 ) @@ -25,50 +18,9 @@ remote_path = NodePath("../../Camera") [node name="Camera" parent="." instance=ExtResource( 6 )] position = Vector2( 9, 88 ) -[node name="TileMap" parent="." instance=ExtResource( 1 )] -tile_data = PoolIntArray( 18, 0, 0, 19, 0, 5, 20, 0, 196609, 21, 0, 196609, 22, 0, 196609, 23, 0, 196609, 24, 0, 196609, 25, 0, 196609, 26, 0, 196609, 27, 0, 196609, 28, 0, 196609, 29, 0, 196609, 30, 0, 196609, 31, 0, 196609, 32, 0, 196609, 33, 0, 196609, 34, 0, 196609, 35, 0, 196609, 36, 0, 196609, 37, 0, 196609, 38, 0, 196609, 39, 0, 196609, 40, 0, 7, 65536, 0, 4, 65537, 0, 196609, 65538, 0, 196609, 65539, 0, 196609, 65540, 0, 196609, 65541, 0, 6, 65542, 0, 5, 65543, 0, 196609, 65544, 0, 196609, 65545, 0, 196609, 65546, 0, 6, 65547, 0, 2, 65554, 0, 65536, 65555, 0, 65538, 65576, 0, 65539, 196607, 0, 4, 131072, 0, 196615, 131077, 0, 131072, 131078, 0, 131074, 131082, 0, 65536, 131083, 0, 131077, 131084, 0, 1, 131085, 0, 5, 131086, 0, 196609, 131087, 0, 196609, 131088, 0, 196609, 131089, 0, 196609, 131090, 0, 196614, 131091, 0, 131074, 131112, 0, 65539, 262143, 0, 65539, 196618, 0, 131072, 196619, 0, 131073, 196620, 0, 131073, 196621, 0, 131074, 196648, 0, 65539, 327679, 0, 65539, 262184, 0, 65539, 393215, 0, 65539, 327705, 1, 3, 327706, 1, 4, 327707, 0, 1, 327708, 0, 1, 327709, 0, 1, 327710, 0, 1, 327711, 536870913, 4, 327712, 536870913, 3, 327720, 0, 65539, 458751, 0, 65539, 393238, 1, 0, 393239, 0, 1, 393240, 0, 1, 393241, 1, 5, 393242, 536870912, 65537, 393243, 536870912, 65537, 393244, 536870912, 65537, 393245, 536870912, 65537, 393246, 536870912, 65537, 393247, 536870912, 65537, 393248, 536870913, 5, 393249, 536870912, 1, 393250, 536870912, 1, 393251, 536870913, 0, 393256, 0, 65539, 524287, 0, 65539, 458762, 1, 3, 458763, 1, 4, 458764, 0, 1, 458765, 0, 2, 458773, 1, 0, 458774, 1, 1, 458775, 536870912, 65537, 458776, 536870912, 65537, 458777, 536870912, 65537, 458778, 536870912, 65537, 458779, 536870912, 65537, 458780, 536870912, 65537, 458781, 536870912, 65537, 458782, 536870912, 65537, 458783, 536870912, 65537, 458784, 536870912, 65537, 458785, 536870912, 65537, 458786, 536870912, 65537, 458787, 536870913, 1, 458788, 536870913, 0, 458792, 0, 65539, 589823, 0, 65539, 524294, 1, 0, 524295, 0, 1, 524296, 0, 1, 524297, 0, 1, 524298, 0, 131078, 524299, 0, 65537, 524300, 0, 65537, 524301, 0, 131077, 524302, 0, 1, 524303, 0, 1, 524304, 0, 1, 524305, 0, 1, 524306, 0, 1, 524307, 0, 1, 524308, 0, 2, 524309, 1, 2, 524310, 536870912, 131073, 524311, 536870912, 131073, 524312, 536870912, 131073, 524313, 536870912, 131073, 524314, 536870912, 131073, 524315, 536870912, 131073, 524316, 536870912, 131073, 524317, 536870912, 131073, 524318, 536870912, 131073, 524319, 536870912, 131073, 524320, 536870912, 131073, 524321, 536870912, 131073, 524322, 536870912, 131073, 524323, 536870912, 131073, 524324, 536870913, 2, 524325, 0, 196609, 524326, 0, 196609, 524327, 0, 196609, 524328, 0, 196615, 655359, 0, 131076, 589824, 0, 2, 589829, 1, 0, 589830, 1, 1, 589831, 0, 65537, 589832, 0, 65537, 589833, 0, 65537, 589834, 0, 65537, 589835, 0, 65537, 589836, 0, 65537, 589837, 0, 65537, 589838, 0, 65537, 589839, 0, 65537, 589840, 0, 65537, 589841, 0, 65537, 589842, 0, 65537, 589843, 0, 65537, 589844, 0, 65538, 720895, 0, 65536, 655360, 0, 131077, 655361, 0, 1, 655362, 0, 1, 655363, 0, 1, 655364, 0, 1, 655365, 1, 1, 655366, 0, 65537, 655367, 0, 65537, 655368, 0, 65541, 655369, 0, 131073, 655370, 0, 131073, 655371, 0, 131073, 655372, 0, 65542, 655373, 0, 65537, 655374, 0, 65537, 655375, 0, 65537, 655376, 0, 65537, 655377, 0, 65541, 655378, 0, 131073, 655379, 0, 131073, 655380, 0, 131074, 786431, 0, 131072, 720896, 0, 65542, 720897, 0, 65537, 720898, 0, 65537, 720899, 0, 65537, 720900, 0, 65537, 720901, 0, 65537, 720902, 0, 65537, 720903, 0, 65541, 720904, 0, 131074, 720908, 0, 131072, 720909, 0, 65542, 720910, 0, 65537, 720911, 0, 65537, 720912, 0, 65541, 720913, 0, 131074, 786432, 0, 65536, 786433, 0, 65537, 786434, 0, 65537, 786435, 0, 65537, 786436, 0, 65537, 786437, 0, 65537, 786438, 0, 65537, 786439, 0, 65538, 786445, 0, 65536, 786446, 0, 65541, 786447, 0, 131073, 786448, 0, 131074, 851968, 0, 131072, 851969, 0, 65542, 851970, 0, 65537, 851971, 0, 65537, 851972, 0, 65541, 851973, 0, 131073, 851974, 0, 131073, 851975, 0, 196613, 851976, 0, 196609, 851977, 0, 196609, 851978, 0, 196609, 851979, 0, 196609, 851980, 0, 196609, 851981, 0, 196614, 851982, 0, 131074, 917505, 0, 131072, 917506, 0, 131073, 917507, 0, 131073, 917508, 0, 131074 ) - -[node name="MovingPlatform" parent="TileMap" instance=ExtResource( 4 )] -position = Vector2( 64, 128 ) - -[node name="WalkingEnemy2" parent="." instance=ExtResource( 5 )] -position = Vector2( 160, 208 ) - -[node name="WalkingEnemy3" parent="." instance=ExtResource( 5 )] -position = Vector2( 448, 80 ) - [node name="UI" parent="." instance=ExtResource( 7 )] -[node name="FlyingEnemy" parent="." instance=ExtResource( 8 )] -position = Vector2( 224, 88 ) - -[node name="PlantEnemy" parent="." instance=ExtResource( 9 )] -position = Vector2( 136, 128 ) - -[node name="PlantEnemy2" parent="." instance=ExtResource( 9 )] -position = Vector2( 402.842, 16 ) -rotation = 3.14159 - -[node name="CrawlingEnemy" parent="." instance=ExtResource( 10 )] -position = Vector2( 72, 160 ) - -[node name="Brick" parent="." instance=ExtResource( 11 )] -position = Vector2( 111, 96 ) - -[node name="Brick2" parent="." instance=ExtResource( 11 )] -position = Vector2( 111, 112 ) - -[node name="Brick3" parent="." instance=ExtResource( 11 )] -position = Vector2( 111, 80 ) - -[node name="Brick4" parent="." instance=ExtResource( 11 )] -position = Vector2( 111, 64 ) - -[node name="Brick5" parent="." instance=ExtResource( 11 )] -position = Vector2( 111, 48 ) - -[node name="MissilesPowerup" parent="." instance=ExtResource( 12 )] -position = Vector2( 64, 42 ) +[node name="Level_00" parent="." instance=ExtResource( 1 )] [editable path="Player"] [editable path="Player/Hurtbox"]