Compare commits
No commits in common. "signal-reform" and "main" have entirely different histories.
signal-ref
...
main
14 changed files with 103 additions and 154 deletions
4
enemy.gd
4
enemy.gd
|
|
@ -1,5 +1,7 @@
|
|||
extends Area2D
|
||||
|
||||
signal died
|
||||
|
||||
var bullet_scene = preload("res://enemy_bullet.tscn")
|
||||
var start_pos = Vector2.ZERO
|
||||
var speed = 0
|
||||
|
|
@ -39,6 +41,6 @@ func explode():
|
|||
speed = 0
|
||||
$AnimationPlayer.play("explode")
|
||||
set_deferred("monitoring", false)
|
||||
EventBus.enemy_died.emit(5)
|
||||
died.emit(5)
|
||||
await $AnimationPlayer.animation_finished
|
||||
queue_free()
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
extends Node
|
||||
|
||||
@warning_ignore_start("unused_signal") # since otherwise Godot will throw a warning that the signal is unused in current scope
|
||||
|
||||
signal shield_changed(max_value: int, old_value: int, new_value: int)
|
||||
signal player_died()
|
||||
signal enemy_died()
|
||||
|
||||
@warning_ignore_restore("unused_signal") # put any future signals you add between the two ignore annotations
|
||||
|
|
@ -1 +0,0 @@
|
|||
uid://jibpipn2p1c7
|
||||
|
|
@ -2,21 +2,6 @@
|
|||
|
||||
[ext_resource type="Texture2D" uid="uid://h04wm5a27u0" path="res://Mini Pixel Pack 3/Effects/Explosion (16 x 16).png" id="1_q7epf"]
|
||||
|
||||
[sub_resource type="Animation" id="Animation_j4sxf"]
|
||||
length = 0.001
|
||||
tracks/0/type = "value"
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/path = NodePath(".:frame")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/keys = {
|
||||
"times": PackedFloat32Array(0),
|
||||
"transitions": PackedFloat32Array(1),
|
||||
"update": 1,
|
||||
"values": [0]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id="Animation_vxas0"]
|
||||
resource_name = "explosion-one-shot"
|
||||
length = 0.5
|
||||
|
|
@ -34,6 +19,21 @@ tracks/0/keys = {
|
|||
"values": [0, 1, 3, 4, 5]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id="Animation_j4sxf"]
|
||||
length = 0.001
|
||||
tracks/0/type = "value"
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/path = NodePath(".:frame")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/keys = {
|
||||
"times": PackedFloat32Array(0),
|
||||
"transitions": PackedFloat32Array(1),
|
||||
"update": 1,
|
||||
"values": [0]
|
||||
}
|
||||
|
||||
[sub_resource type="AnimationLibrary" id="AnimationLibrary_m5xho"]
|
||||
_data = {
|
||||
&"RESET": SubResource("Animation_j4sxf"),
|
||||
|
|
@ -48,4 +48,4 @@ hframes = 6
|
|||
libraries = {
|
||||
&"": SubResource("AnimationLibrary_m5xho")
|
||||
}
|
||||
autoplay = "RESET"
|
||||
autoplay = "explosion-one-shot"
|
||||
|
|
|
|||
26
main.gd
26
main.gd
|
|
@ -1,17 +1,22 @@
|
|||
extends Node2D
|
||||
|
||||
var enemy = preload("res://enemy.tscn")
|
||||
var score = 0
|
||||
var playing = false
|
||||
|
||||
@onready var start_button = $CanvasLayer/CenterContainer/Start
|
||||
@onready var game_over = $CanvasLayer/CenterContainer/GameOver
|
||||
|
||||
var enemy = preload("res://enemy.tscn")
|
||||
var score = 0
|
||||
|
||||
func _ready():
|
||||
game_over.hide()
|
||||
start_button.show()
|
||||
game_over.hide()
|
||||
# spawn_enemies()
|
||||
|
||||
func new_game():
|
||||
score = 0
|
||||
$CanvasLayer/UI.update_score(score)
|
||||
$Player.start()
|
||||
spawn_enemies()
|
||||
|
||||
func spawn_enemies():
|
||||
for x in range(9):
|
||||
for y in range(3):
|
||||
|
|
@ -19,28 +24,19 @@ func spawn_enemies():
|
|||
var pos = Vector2(x * (16 + 8) + 24, 16 * 4 + y * 16)
|
||||
add_child(e)
|
||||
e.start(pos)
|
||||
EventBus.enemy_died.emit()
|
||||
e.died.connect(_on_enemy_died)
|
||||
|
||||
func _on_enemy_died(value):
|
||||
score += value
|
||||
$CanvasLayer/UI.update_score(score)
|
||||
|
||||
func _on_player_died():
|
||||
print("game over")
|
||||
playing = false
|
||||
get_tree().call_group("enemies", "queue_free")
|
||||
game_over.show()
|
||||
await get_tree().create_timer(2).timeout
|
||||
game_over.hide()
|
||||
start_button.show()
|
||||
|
||||
func new_game():
|
||||
score = 0
|
||||
$CanvasLayer/UI.update_score(score)
|
||||
$Player.start()
|
||||
spawn_enemies()
|
||||
playing = true
|
||||
|
||||
func _on_start_pressed():
|
||||
start_button.hide()
|
||||
new_game()
|
||||
|
|
|
|||
39
main.tscn
39
main.tscn
|
|
@ -1,8 +1,9 @@
|
|||
[gd_scene load_steps=11 format=3 uid="uid://cc2dnhuv4qx7m"]
|
||||
[gd_scene load_steps=13 format=3 uid="uid://cc2dnhuv4qx7m"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://c51huloycn5as" path="res://main.gd" id="1_h2yge"]
|
||||
[ext_resource type="Texture2D" uid="uid://jj8b7vqj3ihx" path="res://Mini Pixel Pack 3/Space_BG (2 frames) (64 x 64).png" id="1_ig7tw"]
|
||||
[ext_resource type="PackedScene" uid="uid://pyuorpwb7lpe" path="res://player.tscn" id="2_0xm2m"]
|
||||
[ext_resource type="Shader" uid="uid://c4jtlpwspb778" path="res://crt.gdshader" id="3_272bh"]
|
||||
[ext_resource type="PackedScene" uid="uid://s6wf3egdqtmh" path="res://ui.tscn" id="4_1bvp3"]
|
||||
[ext_resource type="Texture2D" uid="uid://bonoqs5pisflo" path="res://Mini Pixel Pack 3/UI objects/START (48 x 8).png" id="5_lquwl"]
|
||||
[ext_resource type="Texture2D" uid="uid://bubqwoum50gf8" path="res://Mini Pixel Pack 3/UI objects/GAME_OVER (72 x 8).png" id="6_7mycd"]
|
||||
|
|
@ -47,6 +48,30 @@ _data = {
|
|||
&"scroll": SubResource("Animation_h2yge")
|
||||
}
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_kek77"]
|
||||
shader = ExtResource("3_272bh")
|
||||
shader_parameter/overlay = true
|
||||
shader_parameter/resolution = Vector2(640, 480)
|
||||
shader_parameter/brightness = 1.4
|
||||
shader_parameter/scanlines_opacity = 0.530000025175
|
||||
shader_parameter/scanlines_width = 0.2370000112575
|
||||
shader_parameter/grille_opacity = 0.3
|
||||
shader_parameter/roll = false
|
||||
shader_parameter/roll_speed = 4.0
|
||||
shader_parameter/roll_size = 5.0000002375
|
||||
shader_parameter/roll_variation = 0.90200003958512
|
||||
shader_parameter/distort_intensity = 0.0
|
||||
shader_parameter/aberration = 0.03
|
||||
shader_parameter/noise_opacity = 0.4
|
||||
shader_parameter/noise_speed = 5.0
|
||||
shader_parameter/static_noise_intensity = 0.06
|
||||
shader_parameter/pixelate = true
|
||||
shader_parameter/discolor = true
|
||||
shader_parameter/warp_amount = 0.0
|
||||
shader_parameter/clip_warp = false
|
||||
shader_parameter/vignette_intensity = 0.4
|
||||
shader_parameter/vignette_opacity = 0.1750000083125
|
||||
|
||||
[node name="Main" type="Node2D"]
|
||||
script = ExtResource("1_h2yge")
|
||||
|
||||
|
|
@ -60,7 +85,7 @@ region_enabled = true
|
|||
region_rect = Rect2(0, 0, 240, 320)
|
||||
|
||||
[node name="Player" parent="." instance=ExtResource("2_0xm2m")]
|
||||
position = Vector2(123, 272)
|
||||
position = Vector2(123, 270)
|
||||
|
||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
|
||||
libraries = {
|
||||
|
|
@ -71,8 +96,6 @@ autoplay = "scroll"
|
|||
[node name="CanvasLayer" type="CanvasLayer" parent="."]
|
||||
|
||||
[node name="UI" parent="CanvasLayer" instance=ExtResource("4_1bvp3")]
|
||||
offset_right = 196.0
|
||||
offset_bottom = 36.0
|
||||
|
||||
[node name="CenterContainer" type="CenterContainer" parent="CanvasLayer"]
|
||||
anchors_preset = 15
|
||||
|
|
@ -89,4 +112,12 @@ texture_normal = ExtResource("5_lquwl")
|
|||
layout_mode = 2
|
||||
texture = ExtResource("6_7mycd")
|
||||
|
||||
[node name="Sprite2D" type="Sprite2D" parent="."]
|
||||
material = SubResource("ShaderMaterial_kek77")
|
||||
position = Vector2(120, 161.5)
|
||||
scale = Vector2(1.859375, 5.015625)
|
||||
texture = ExtResource("1_ig7tw")
|
||||
|
||||
[connection signal="died" from="Player" to="." method="_on_player_died"]
|
||||
[connection signal="shield_changed" from="Player" to="CanvasLayer/UI" method="update_shield"]
|
||||
[connection signal="pressed" from="CanvasLayer/CenterContainer/Start" to="." method="_on_start_pressed"]
|
||||
|
|
|
|||
76
player.gd
76
player.gd
|
|
@ -1,24 +1,19 @@
|
|||
extends Area2D
|
||||
|
||||
|
||||
signal died
|
||||
signal shield_changed
|
||||
signal damage_taken
|
||||
# signal shield_damage
|
||||
# signal shield_ui
|
||||
|
||||
@export var speed: int = 150
|
||||
@export var cooldown: float = 0.25
|
||||
@export var bullet_scene : PackedScene
|
||||
@export var max_shield: int = 10
|
||||
var shield: int = max_shield:
|
||||
set = set_shield
|
||||
|
||||
var can_shoot = true
|
||||
var shader_active = false
|
||||
|
||||
@onready var screensize = get_viewport_rect().size
|
||||
@onready var explosion = $Explosion
|
||||
@onready var wait_time = $GunCooldown
|
||||
@onready var ship = $Ship
|
||||
@export var max_shield = 10
|
||||
var shield = max_shield:
|
||||
set = set_shield
|
||||
@export var speed = 150
|
||||
@export var cooldown = 0.25
|
||||
@export var bullet_scene : PackedScene
|
||||
var can_shoot = true
|
||||
|
||||
func _ready():
|
||||
start()
|
||||
|
|
@ -26,10 +21,30 @@ func _ready():
|
|||
func start():
|
||||
set_process(true)
|
||||
$Ship.show()
|
||||
position = Vector2(screensize.x / 2, screensize.y - 64)
|
||||
shield = max_shield
|
||||
position = Vector2(screensize.x / 2, screensize.y - 64)
|
||||
$GunCooldown.wait_time = cooldown
|
||||
|
||||
func set_shield(value):
|
||||
shield = min(max_shield, value)
|
||||
shield_changed.emit(max_shield, shield)
|
||||
if shield <= 0:
|
||||
set_process(false)
|
||||
$Ship.hide()
|
||||
$Explosion.show()
|
||||
$Explosion/AnimationPlayer.play("explosion-one-shot")
|
||||
await $Explosion/AnimationPlayer.animation_finished
|
||||
died.emit()
|
||||
|
||||
func shoot():
|
||||
if not can_shoot:
|
||||
return
|
||||
can_shoot = false
|
||||
$GunCooldown.start()
|
||||
var b = bullet_scene.instantiate()
|
||||
get_tree().root.add_child(b)
|
||||
b.start(position + Vector2(0, -8))
|
||||
|
||||
func _process(delta):
|
||||
var input = Input.get_vector("left", "right", "up", "down")
|
||||
if input.x > 0:
|
||||
|
|
@ -46,34 +61,12 @@ func _process(delta):
|
|||
if Input.is_action_pressed("shoot"):
|
||||
shoot()
|
||||
|
||||
func shoot():
|
||||
if not can_shoot:
|
||||
return
|
||||
can_shoot = false
|
||||
$GunCooldown.start()
|
||||
var b = bullet_scene.instantiate()
|
||||
get_tree().root.add_child(b)
|
||||
b.start(position + Vector2(0, -8))
|
||||
var tween = create_tween().set_parallel(false)
|
||||
tween.tween_property($Ship, "position:y", 1, 0.1)
|
||||
tween.tween_property($Ship, "position:y", 0, 0.05)
|
||||
|
||||
func set_shield(value: int):
|
||||
var old_value: int = shield
|
||||
shield = min(max_shield, value)
|
||||
EventBus.shield_changed.emit(max_shield, old_value, shield)
|
||||
print("Shield set to:", shield)
|
||||
if shield <= 0:
|
||||
set_process(false)
|
||||
$Ship.hide()
|
||||
$Explosion.show()
|
||||
$Explosion/AnimationPlayer.play("explosion-one-shot")
|
||||
await $Explosion/AnimationPlayer.animation_finished
|
||||
EventBus.player_died.emit()
|
||||
|
||||
func _on_gun_cooldown_timeout() -> void:
|
||||
func _on_gun_cooldown_timeout():
|
||||
can_shoot = true
|
||||
|
||||
func _on_gun_cool_down_timeout() -> void:
|
||||
can_shoot = true
|
||||
|
||||
func _on_area_entered(area):
|
||||
if area.is_in_group("enemies"):
|
||||
area.explode()
|
||||
|
|
@ -84,7 +77,6 @@ func _on_area_entered(area):
|
|||
|
||||
|
||||
func _on_damage_taken() -> void:
|
||||
# emit_signal("shield_ui")
|
||||
shader_active = true
|
||||
$Ship.material.set_shader_parameter("toggle", 1.0)
|
||||
await get_tree().create_timer(1).timeout
|
||||
|
|
|
|||
|
|
@ -104,4 +104,4 @@ visible = false
|
|||
|
||||
[connection signal="area_entered" from="." to="." method="_on_area_entered"]
|
||||
[connection signal="damage_taken" from="." to="." method="_on_damage_taken"]
|
||||
[connection signal="timeout" from="GunCooldown" to="." method="_on_gun_cooldown_timeout"]
|
||||
[connection signal="timeout" from="GunCooldown" to="." method="_on_gun_cool_down_timeout"]
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
extends TextureProgressBar
|
||||
|
||||
func _ready():
|
||||
self.value = 0
|
||||
var shield_tween = get_tree().create_tween()
|
||||
shield_tween.tween_property(self, "value", 100, 3).set_trans(Tween.TRANS_LINEAR)
|
||||
|
|
@ -1 +0,0 @@
|
|||
uid://b85ktxeoj4b2n
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
[gd_scene load_steps=4 format=3 uid="uid://c8s7htpdg4v4i"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://d11molrkdjjh5" path="res://bar_background.png" id="1_q0tf5"]
|
||||
[ext_resource type="Texture2D" uid="uid://bsl3pxvxiuoqg" path="res://bar_foreground.png" id="2_5xu4y"]
|
||||
[ext_resource type="Script" uid="uid://b85ktxeoj4b2n" path="res://progress_bar.gd" id="3_5xu4y"]
|
||||
|
||||
[node name="ProgressBar" type="TextureProgressBar"]
|
||||
anchors_preset = 10
|
||||
anchor_right = 1.0
|
||||
offset_bottom = 20.0
|
||||
grow_horizontal = 2
|
||||
nine_patch_stretch = true
|
||||
stretch_margin_left = 8
|
||||
stretch_margin_top = 8
|
||||
stretch_margin_right = 8
|
||||
stretch_margin_bottom = 8
|
||||
texture_under = ExtResource("1_q0tf5")
|
||||
texture_progress = ExtResource("2_5xu4y")
|
||||
script = ExtResource("3_5xu4y")
|
||||
|
|
@ -14,10 +14,6 @@ config/name="shmup01b"
|
|||
config/features=PackedStringArray("4.5", "Forward Plus")
|
||||
config/icon="res://icon.svg"
|
||||
|
||||
[autoload]
|
||||
|
||||
EventBus="*res://event_bus.gd"
|
||||
|
||||
[display]
|
||||
|
||||
window/size/viewport_width=240
|
||||
|
|
|
|||
26
ui.gd
26
ui.gd
|
|
@ -3,32 +3,10 @@ extends MarginContainer
|
|||
@onready var shield_bar = $HBoxContainer/ShieldBar
|
||||
@onready var score_counter = $HBoxContainer/ScoreCounter
|
||||
|
||||
var shader_active = false
|
||||
|
||||
func _ready():
|
||||
# get_node("Player.Ship").node_ready.connect("shield_ui", self, "_on_shield_ui")
|
||||
EventBus.shield_changed.connect(_on_shield_changed)
|
||||
|
||||
func update_score(value):
|
||||
score_counter.display_digits(value)
|
||||
|
||||
|
||||
func _on_shield_changed(max_value: int, old_value: int, new_value: int) -> void:
|
||||
|
||||
func update_shield(max_value, value):
|
||||
shield_bar.max_value = max_value
|
||||
shield_bar.value = new_value
|
||||
var shield_depletion = int(old_value - new_value)
|
||||
print("Shield Depletion:", old_value, "-", new_value, " = ", shield_depletion)
|
||||
var tween = create_tween()
|
||||
tween.tween_property(shield_bar, "value", new_value - shield_depletion, .20).set_trans(Tween.TRANS_LINEAR)
|
||||
_on_shield_ui()
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_shield_ui():
|
||||
shader_active = true
|
||||
shield_bar.material.set_shader_parameter("toggle", 1.0)
|
||||
await get_tree().create_timer(1).timeout
|
||||
shader_active = false
|
||||
shield_bar.material.set_shader_parameter("toggle", 0.0)
|
||||
shield_bar.value = value
|
||||
|
|
|
|||
12
ui.tscn
12
ui.tscn
|
|
@ -1,15 +1,10 @@
|
|||
[gd_scene load_steps=7 format=3 uid="uid://s6wf3egdqtmh"]
|
||||
[gd_scene load_steps=5 format=3 uid="uid://s6wf3egdqtmh"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://d11molrkdjjh5" path="res://bar_background.png" id="1_m6e0p"]
|
||||
[ext_resource type="Script" uid="uid://b544c65halgk4" path="res://ui.gd" id="1_nltto"]
|
||||
[ext_resource type="Texture2D" uid="uid://bsl3pxvxiuoqg" path="res://bar_foreground.png" id="2_27fn8"]
|
||||
[ext_resource type="Shader" uid="uid://dfywtah53il1m" path="res://player_hit.gdshader" id="2_ibotj"]
|
||||
[ext_resource type="PackedScene" uid="uid://5qkcf1cpre32" path="res://score_counter.tscn" id="4_ibotj"]
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_n5ude"]
|
||||
shader = ExtResource("2_ibotj")
|
||||
shader_parameter/toggle = 0.0
|
||||
|
||||
[node name="UI" type="MarginContainer"]
|
||||
anchors_preset = 10
|
||||
anchor_right = 1.0
|
||||
|
|
@ -25,11 +20,8 @@ script = ExtResource("1_nltto")
|
|||
layout_mode = 2
|
||||
|
||||
[node name="ShieldBar" type="TextureProgressBar" parent="HBoxContainer"]
|
||||
material = SubResource("ShaderMaterial_n5ude")
|
||||
custom_minimum_size = Vector2(80, 16)
|
||||
layout_mode = 2
|
||||
step = 0.0
|
||||
value = 100.0
|
||||
nine_patch_stretch = true
|
||||
stretch_margin_left = 3
|
||||
stretch_margin_top = 3
|
||||
|
|
@ -40,5 +32,3 @@ texture_progress = ExtResource("2_27fn8")
|
|||
|
||||
[node name="ScoreCounter" parent="HBoxContainer" instance=ExtResource("4_ibotj")]
|
||||
layout_mode = 2
|
||||
|
||||
[connection signal="value_changed" from="HBoxContainer/ShieldBar" to="." method="_on_shield_bar_value_changed"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue