diff --git a/metroidvania/Events.gd b/metroidvania/Events.gd new file mode 100644 index 0000000..3ea9377 --- /dev/null +++ b/metroidvania/Events.gd @@ -0,0 +1,4 @@ +extends Node + +# warning-ignore-all:unused_signal +signal add_screenshake(amount, duration) diff --git a/metroidvania/Scenes/Objects/Hurtbox.gd b/metroidvania/Scenes/Objects/Hurtbox.gd index eea6909..08fed60 100644 --- a/metroidvania/Scenes/Objects/Hurtbox.gd +++ b/metroidvania/Scenes/Objects/Hurtbox.gd @@ -2,4 +2,5 @@ extends Area2D # Receives damage +# warning-ignore-all:unused_signal signal hit(damage) diff --git a/metroidvania/Scenes/Player/PlayerStats.gd b/metroidvania/Scenes/Player/PlayerStats.gd index abd6917..b9f0417 100644 --- a/metroidvania/Scenes/Player/PlayerStats.gd +++ b/metroidvania/Scenes/Player/PlayerStats.gd @@ -7,6 +7,9 @@ var health = max_health setget set_health signal player_died func set_health(value): + if value < health: + Events.emit_signal("add_screenshake", 0.5, 0.5) + health = clamp(value, 0, max_health) if health == 0: diff --git a/metroidvania/Scenes/UI/UI.tscn b/metroidvania/Scenes/UI/UI.tscn new file mode 100644 index 0000000..f1c2650 --- /dev/null +++ b/metroidvania/Scenes/UI/UI.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Assets/UI/HealthMeterEmpty.png" type="Texture" id=1] + +[node name="UI" type="CanvasLayer"] + +[node name="TextureRect" type="TextureRect" parent="."] +margin_left = 32.0 +margin_top = 24.0 +margin_right = 72.0 +margin_bottom = 64.0 +texture = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/metroidvania/Scenes/World/Camera.gd b/metroidvania/Scenes/World/Camera.gd new file mode 100644 index 0000000..f71eb7d --- /dev/null +++ b/metroidvania/Scenes/World/Camera.gd @@ -0,0 +1,23 @@ +extends Camera2D + +var shake = 0 + +onready var timer = $Timer + +func _ready(): + Events.connect("add_screenshake", self, "_on_Events_add_screenshake") + +func _process(delta): + offset_h = rand_range(-shake, shake) + offset_v = rand_range(-shake, shake) + +func screenshake(amount, duration): + shake = amount + timer.wait_time = duration + timer.start() + +func _on_Timer_timeout(): + shake = 0 + +func _on_Events_add_screenshake(amount, duration): + screenshake(amount, duration) diff --git a/metroidvania/Scenes/World/Camera.tscn b/metroidvania/Scenes/World/Camera.tscn new file mode 100644 index 0000000..5672107 --- /dev/null +++ b/metroidvania/Scenes/World/Camera.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Scenes/World/Camera.gd" type="Script" id=1] + +[node name="Camera" type="Camera2D"] +current = true +smoothing_enabled = true +script = ExtResource( 1 ) + +[node name="Timer" type="Timer" parent="."] +[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/metroidvania/Scenes/World/World.tscn b/metroidvania/Scenes/World/World.tscn index 14a01ac..fd128eb 100644 --- a/metroidvania/Scenes/World/World.tscn +++ b/metroidvania/Scenes/World/World.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://Scenes/World/TileMap.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] [node name="World" type="Node"] script = ExtResource( 3 ) @@ -12,13 +14,11 @@ script = ExtResource( 3 ) [node name="Player" parent="." instance=ExtResource( 2 )] position = Vector2( 9, 96 ) -[node name="CameraFollow" parent="Player" index="4"] +[node name="CameraFollow" parent="Player" index="5"] remote_path = NodePath("../../Camera") -[node name="Camera" type="Camera2D" parent="."] +[node name="Camera" parent="." instance=ExtResource( 6 )] position = Vector2( 9, 88 ) -current = true -smoothing_enabled = true [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 ) @@ -35,4 +35,6 @@ position = Vector2( 160, 208 ) [node name="WalkingEnemy3" parent="." instance=ExtResource( 5 )] position = Vector2( 448, 80 ) +[node name="UI" parent="." instance=ExtResource( 7 )] + [editable path="Player"] diff --git a/metroidvania/project.godot b/metroidvania/project.godot index dc7374e..b44db1b 100644 --- a/metroidvania/project.godot +++ b/metroidvania/project.godot @@ -28,6 +28,7 @@ config/icon="res://icon.png" Utils="*res://Utils.gd" ResourceLoader="*res://ResourceLoader.gd" +Events="*res://Events.gd" [display]