ADD: polish more (including finale level musics.

main
bog 2023-10-01 18:18:05 +02:00
parent c3a678513f
commit 9d41ad2f97
24 changed files with 96 additions and 26 deletions

BIN
assets/bomb.ase Normal file

Binary file not shown.

BIN
assets/bomb.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 537 B

BIN
assets/commands.ase Normal file

Binary file not shown.

BIN
assets/commands.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 921 B

BIN
assets/door.ase Normal file

Binary file not shown.

BIN
assets/door.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 571 B

View File

@ -24,6 +24,7 @@ func process_idle(_delta):
func process_open(delta):
if m_open_timer >= m_open_time:
Music.play_sfx('door')
queue_free()
else:
var t = min(1.0, m_open_timer / m_open_time)

BIN
src/Door/door.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 571 B

View File

@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://d30oryxv0w7pf"]
[ext_resource type="Script" path="res://Door/door.gd" id="1_62c16"]
[ext_resource type="Texture2D" uid="uid://blr8qcmuqs5vl" path="res://icon.svg" id="1_urwyt"]
[ext_resource type="Texture2D" uid="uid://bv4ceafnro3u4" path="res://Door/door.png" id="2_pv44r"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_2o8ax"]
size = Vector2(74, 20)
@ -10,9 +10,8 @@ size = Vector2(74, 20)
script = ExtResource("1_62c16")
[node name="Sprite2D" type="Sprite2D" parent="."]
modulate = Color(1, 0, 1, 1)
scale = Vector2(0.5, 0.25)
texture = ExtResource("1_urwyt")
modulate = Color(0, 0.698039, 0.811765, 1)
texture = ExtResource("2_pv44r")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("RectangleShape2D_2o8ax")

Binary file not shown.

After

Width:  |  Height:  |  Size: 921 B

View File

@ -6,7 +6,7 @@ func _ready():
pass
func _process(_delta):
pass
$Sprite2D.play("default")
func _on_body_entered(body):
if body in get_tree().get_nodes_in_group('bombs'):

View File

@ -1,7 +1,36 @@
[gd_scene load_steps=4 format=3 uid="uid://c5f7m5oi32kr5"]
[gd_scene load_steps=8 format=3 uid="uid://c5f7m5oi32kr5"]
[ext_resource type="Script" path="res://DoorCommand/door_command.gd" id="1_l2uva"]
[ext_resource type="Texture2D" uid="uid://blr8qcmuqs5vl" path="res://icon.svg" id="1_uchk3"]
[ext_resource type="Texture2D" uid="uid://67a60syoky0d" path="res://DoorCommand/commands.png" id="2_yjk6e"]
[sub_resource type="AtlasTexture" id="AtlasTexture_2ck6n"]
atlas = ExtResource("2_yjk6e")
region = Rect2(0, 0, 32, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_q4vbp"]
atlas = ExtResource("2_yjk6e")
region = Rect2(32, 0, 32, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_8kd0w"]
atlas = ExtResource("2_yjk6e")
region = Rect2(64, 0, 32, 64)
[sub_resource type="SpriteFrames" id="SpriteFrames_815y6"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_2ck6n")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_q4vbp")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_8kd0w")
}],
"loop": true,
"name": &"default",
"speed": 5.0
}]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_6j0py"]
size = Vector2(36, 60)
@ -11,14 +40,12 @@ collision_layer = 2
collision_mask = 2
script = ExtResource("1_l2uva")
[node name="Sprite2D" type="Sprite2D" parent="."]
modulate = Color(0.329412, 0.329412, 0.329412, 1)
[node name="Sprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(-0.5, -8.5)
scale = Vector2(0.179688, 0.382812)
texture = ExtResource("1_uchk3")
sprite_frames = SubResource("SpriteFrames_815y6")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(3, -10)
position = Vector2(-1, -8)
shape = SubResource("RectangleShape2D_6j0py")
[connection signal="body_entered" from="." to="." method="_on_body_entered"]

View File

@ -157,7 +157,7 @@ title = "Jumping"
text = "You can jump with the [space] key"
[node name="MsgArea3" parent="." instance=ExtResource("3_7vths")]
position = Vector2(671, 1601)
position = Vector2(671, 1611)
title = "We won't let you go"
text = "Guards will kill you, unless you kill them before. Press left mouse button to shoot at them"
@ -227,16 +227,16 @@ shape = SubResource("RectangleShape2D_8v3w3")
position = Vector2(672, 2432)
[node name="CheckPointArea3" parent="." instance=ExtResource("7_jpeg0")]
position = Vector2(678, 4572)
position = Vector2(672, 4505)
[node name="CheckPointArea5" parent="." instance=ExtResource("7_jpeg0")]
position = Vector2(1487, 4764)
[node name="CheckPointArea4" parent="." instance=ExtResource("7_jpeg0")]
position = Vector2(1488, 5461)
position = Vector2(1488, 5427)
[node name="CheckPointArea2" parent="." instance=ExtResource("7_jpeg0")]
position = Vector2(672, 1576)
position = Vector2(668, 1534)
[node name="CheckPointArea6" parent="." instance=ExtResource("7_jpeg0")]
position = Vector2(681, 919)
@ -250,7 +250,7 @@ position = Vector2(21.5, 0)
metadata/_edit_lock_ = true
[node name="MusicArea2" parent="." instance=ExtResource("8_ag3pa")]
position = Vector2(655, 1505)
position = Vector2(646, 1596)
music = "speed_is_the_key"
[node name="CollisionShape2D" parent="MusicArea2" index="0"]
@ -259,7 +259,7 @@ debug_color = Color(0.627451, 0.823529, 0.270588, 0.419608)
metadata/_edit_lock_ = true
[node name="MusicArea3" parent="." instance=ExtResource("8_ag3pa")]
position = Vector2(654, 4466)
position = Vector2(739, 4558)
music = "fight_or_die"
[node name="CollisionShape2D" parent="MusicArea3" index="0"]
@ -267,6 +267,15 @@ position = Vector2(21.5, 0)
debug_color = Color(0.627451, 0.823529, 0.270588, 0.419608)
metadata/_edit_lock_ = true
[node name="MusicArea4" parent="." instance=ExtResource("8_ag3pa")]
position = Vector2(1441, 5484)
music = "final"
[node name="CollisionShape2D" parent="MusicArea4" index="0"]
position = Vector2(42, -4)
debug_color = Color(0.627451, 0.823529, 0.270588, 0.419608)
metadata/_edit_lock_ = true
[node name="CanvasTime" type="CanvasLayer" parent="."]
visible = false
@ -306,3 +315,4 @@ ID = 6
[editable path="MusicArea"]
[editable path="MusicArea2"]
[editable path="MusicArea3"]
[editable path="MusicArea4"]

BIN
src/Molotov/bomb.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 537 B

View File

@ -17,6 +17,7 @@ func _process(_delta):
func throw_at(pos: Vector2, dir: Vector2, dist: float):
self.position = pos
$Sprite2D.play("default")
m_origin = pos
m_dir = dir
m_state = self._moving
@ -35,5 +36,6 @@ func _explode(_delta):
func _moving(delta):
self.velocity = m_dir * m_speed
$Sprite2D.rotation = m_dir.angle() - PI/2
move_and_collide(self.velocity * delta)

View File

@ -1,7 +1,29 @@
[gd_scene load_steps=5 format=3 uid="uid://b212rruvxhwqe"]
[gd_scene load_steps=8 format=3 uid="uid://b212rruvxhwqe"]
[ext_resource type="Texture2D" uid="uid://blr8qcmuqs5vl" path="res://icon.svg" id="1_ga5l4"]
[ext_resource type="Script" path="res://Molotov/molotov.gd" id="1_uepii"]
[ext_resource type="Texture2D" uid="uid://bnbcfg3q24fbv" path="res://Molotov/bomb.png" id="2_eeyjr"]
[sub_resource type="AtlasTexture" id="AtlasTexture_o0v0u"]
atlas = ExtResource("2_eeyjr")
region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_uo8u2"]
atlas = ExtResource("2_eeyjr")
region = Rect2(32, 0, 32, 32)
[sub_resource type="SpriteFrames" id="SpriteFrames_oij13"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_o0v0u")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_uo8u2")
}],
"loop": true,
"name": &"default",
"speed": 5.0
}]
[sub_resource type="CircleShape2D" id="CircleShape2D_oq4si"]
radius = 14.0
@ -14,10 +36,11 @@ collision_layer = 2
collision_mask = 0
script = ExtResource("1_uepii")
[node name="Sprite2D" type="Sprite2D" parent="."]
[node name="Sprite2D" type="AnimatedSprite2D" parent="."]
modulate = Color(0.956863, 0.956863, 0, 1)
scale = Vector2(0.25, 0.25)
texture = ExtResource("1_ga5l4")
sprite_frames = SubResource("SpriteFrames_oij13")
frame = 1
frame_progress = 0.169838
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_oq4si")

BIN
src/Music/door.wav Normal file

Binary file not shown.

BIN
src/Music/final.ogg Normal file

Binary file not shown.

BIN
src/Music/shot.wav Normal file

Binary file not shown.

View File

@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://MusicArea/music_area.gd" id="1_60yhl"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_c834i"]
size = Vector2(383, 20)
size = Vector2(732, 28)
[node name="MusicArea" type="Area2D"]
script = ExtResource("1_60yhl")

View File

@ -43,6 +43,9 @@ func _physics_process(dt):
$Actor/Sprite2D.play("Idle")
if $Actor.is_normal() or $Actor.is_jump():
$Actor.velocity = delta * $Actor.m_speed
if delta.length_squared() > 0:
$Actor.velocity = delta * $Actor.m_speed
else:
$Actor.velocity = Vector2(0, 0)
$Actor.move_and_slide()

View File

@ -93,6 +93,7 @@ func is_outside(actor):
func throw_bomb(from: Vector2, dir: Vector2, dist: float):
Music.play_sfx('shot')
var bomb = preload("res://Molotov/molotov.tscn").instantiate()
bomb.on_explode.connect(_on_bomb_explode)
bomb.throw_at(from, dir, dist)

View File

@ -8,7 +8,7 @@ custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="../../Export/aze/hello.zip"
export_path="../../Export/ld54_bog_test0.zip"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false

View File

@ -20,6 +20,10 @@ config/icon="res://icon.svg"
CheckPoint="*res://Checkpoint/CheckPoint.gd"
Music="*res://Music/music.gd"
[display]
window/stretch/mode="viewport"
[input]
player_up={