diff --git a/maps/abyss.tscn b/maps/abyss.tscn index b274aff..779295d 100644 --- a/maps/abyss.tscn +++ b/maps/abyss.tscn @@ -187,6 +187,7 @@ initial_velocity = 16.0 color_initial_ramp = SubResource( 11 ) [node name="HUD" parent="." instance=ExtResource( 2 )] +song_name = "@Moon Trail" [node name="Player" parent="." instance=ExtResource( 8 )] position = Vector2( 16, 48 ) diff --git a/maps/boss/boss1_arena.tscn b/maps/boss/boss1_arena.tscn index 782a4ad..5c8f8ed 100644 --- a/maps/boss/boss1_arena.tscn +++ b/maps/boss/boss1_arena.tscn @@ -20,6 +20,7 @@ script = ExtResource( 7 ) music = ExtResource( 11 ) [node name="HUD" parent="." instance=ExtResource( 6 )] +song_name = "@Klystron" [node name="Sprite" type="Sprite" parent="."] position = Vector2( 128, 96 ) diff --git a/maps/canopy.tscn b/maps/canopy.tscn index 5ff1627..adbc393 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -510,6 +510,7 @@ position = Vector2( 496, 16 ) color = 4 [node name="HUD" parent="." instance=ExtResource( 7 )] +song_name = "@Dusk Park" [node name="ColorRect" type="ColorRect" parent="."] margin_left = 256.0 diff --git a/maps/cave.tscn b/maps/cave.tscn index 8af9ede..ed52cc9 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -45,6 +45,7 @@ __meta__ = { } [node name="HUD" parent="." instance=ExtResource( 4 )] +song_name = "@Smokestack" [node name="Ground" type="TileMap" parent="."] tile_set = ExtResource( 2 ) diff --git a/maps/mountain.tscn b/maps/mountain.tscn index d5fe9a9..eda6116 100644 --- a/maps/mountain.tscn +++ b/maps/mountain.tscn @@ -665,6 +665,7 @@ position = Vector2( 0, 194 ) scale = Vector2( 32, 1 ) [node name="HUD" parent="." instance=ExtResource( 17 )] +song_name = "@Burnt Out" [node name="Exit" parent="." instance=ExtResource( 26 )] position = Vector2( 28, -356 ) diff --git a/maps/rust.tscn b/maps/rust.tscn index 2c91c65..fec2415 100644 --- a/maps/rust.tscn +++ b/maps/rust.tscn @@ -532,6 +532,7 @@ position = Vector2( -96, 96 ) texture = ExtResource( 10 ) [node name="HUD" parent="." instance=ExtResource( 17 )] +song_name = "@Cryokiller" [node name="Exit" parent="." instance=ExtResource( 19 )] position = Vector2( 752, 164 ) diff --git a/maps/station.tscn b/maps/station.tscn new file mode 100644 index 0000000..b59e27e --- /dev/null +++ b/maps/station.tscn @@ -0,0 +1,40 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://maps/map.gd" type="Script" id=1] +[ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2] +[ext_resource path="res://tilesets/t_station.tres" type="TileSet" id=3] +[ext_resource path="res://graphics/backgrounds/night.png" type="Texture" id=4] +[ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=5] + +[node name="Map" type="Node2D" groups=["map"]] +pause_mode = 1 +script = ExtResource( 1 ) + +[node name="Background" type="CanvasLayer" parent="."] +layer = -1 + +[node name="Sprite" type="Sprite" parent="Background"] +position = Vector2( 128, 96 ) +texture = ExtResource( 4 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="BackgroundTiles" type="TileMap" parent="Background"] +tile_set = ExtResource( 3 ) +cell_size = Vector2( 8, 8 ) +format = 1 +tile_data = PoolIntArray( 393235, 0, 2, 393236, 0, 2, 393237, 0, 2, 393238, 0, 2, 393239, 0, 2, 393240, 0, 2, 393241, 0, 2, 393242, 0, 2, 393243, 0, 2, 393244, 0, 2, 393245, 0, 2, 393246, 0, 2, 458771, 0, 2, 458772, 0, 2, 458773, 0, 2, 458774, 0, 2, 458775, 0, 2, 458776, 0, 2, 458777, 0, 2, 458778, 0, 2, 458779, 0, 2, 458780, 0, 2, 458781, 0, 2, 458782, 0, 2, 458783, 0, 2, 524307, 0, 2, 524308, 0, 2, 524309, 0, 2, 524310, 0, 2, 524311, 0, 2, 524312, 0, 2, 524313, 0, 2, 524314, 0, 2, 524315, 0, 2, 524316, 0, 2, 524317, 0, 2, 524318, 0, 2, 524319, 0, 2, 589843, 0, 2, 589844, 0, 2, 589845, 0, 2, 589846, 0, 2, 589847, 0, 2, 589848, 0, 2, 589849, 0, 2, 589850, 0, 2, 589851, 0, 2, 589852, 0, 2, 589853, 0, 2, 589854, 0, 2, 589855, 0, 2, 655379, 0, 2, 655380, 0, 2, 655381, 0, 2, 655382, 0, 2, 655383, 0, 2, 655384, 0, 2, 655385, 0, 2, 655386, 0, 2, 655387, 0, 2, 655388, 0, 2, 655389, 0, 2, 655390, 0, 2, 655391, 0, 2, 720916, 0, 2, 720917, 0, 2, 720918, 0, 2, 720919, 0, 2, 720920, 0, 2, 720921, 0, 2, 720922, 0, 2, 720923, 0, 2, 720924, 0, 2, 720925, 0, 2, 720926, 0, 2, 720927, 0, 2, 786452, 0, 2, 786453, 0, 2, 786454, 0, 2, 786455, 0, 2, 786456, 0, 2, 786457, 0, 2, 786458, 0, 2, 786459, 0, 2, 786460, 0, 2, 786461, 0, 2, 786462, 0, 2, 786463, 0, 2, 851988, 0, 2, 851989, 0, 2, 851990, 0, 2, 851991, 0, 2, 851992, 0, 2, 851993, 0, 2, 851994, 0, 2, 851995, 0, 2, 851996, 0, 2, 851997, 0, 2, 851998, 0, 2, 851999, 0, 2, 917524, 0, 2, 917525, 0, 2, 917526, 0, 2, 917527, 0, 2, 917528, 0, 2, 917529, 0, 2, 917530, 0, 2, 917531, 0, 2, 917532, 0, 2, 917533, 0, 2, 917534, 0, 2, 917535, 0, 2, 983060, 0, 2, 983061, 0, 2, 983062, 0, 2, 983063, 0, 2, 983064, 0, 2, 983065, 0, 2, 983066, 0, 2, 983067, 0, 2, 983068, 0, 2, 983069, 0, 2, 983070, 0, 2, 983071, 0, 2, 1048596, 0, 2, 1048597, 0, 2, 1048598, 0, 2, 1048599, 0, 2, 1048600, 0, 2, 1048601, 0, 2, 1048602, 0, 2, 1048603, 0, 2, 1048604, 0, 2, 1048605, 0, 2, 1048606, 0, 2, 1048607, 0, 2, 1114132, 0, 2, 1114133, 0, 2, 1114134, 0, 2, 1114135, 0, 2, 1114136, 0, 2, 1114137, 0, 2, 1114138, 0, 2, 1114139, 0, 2, 1114140, 0, 2, 1114141, 0, 2, 1114142, 0, 2, 1114143, 0, 2, 1179666, 0, 2, 1179667, 0, 2, 1179668, 0, 2, 1179669, 0, 2, 1179670, 0, 2, 1179671, 0, 2, 1179672, 0, 2, 1179673, 0, 2, 1179674, 0, 2, 1179675, 0, 2, 1179676, 0, 2, 1179677, 0, 2, 1179678, 0, 2, 1179679, 0, 2, 1245202, 0, 2, 1245203, 0, 2, 1245204, 0, 2, 1245205, 0, 2, 1245206, 0, 2, 1245207, 0, 2, 1245208, 0, 2, 1245209, 0, 2, 1245210, 0, 2, 1245211, 0, 2, 1245212, 0, 2, 1245213, 0, 2, 1245214, 0, 2, 1245215, 0, 2, 1310738, 0, 2, 1310739, 0, 2, 1310740, 0, 2, 1310741, 0, 2, 1310742, 0, 2, 1310743, 0, 2, 1310744, 0, 2, 1310745, 0, 2, 1310746, 0, 2, 1310747, 0, 2, 1310748, 0, 2, 1310749, 0, 2, 1310750, 0, 2, 1310751, 0, 2, 1376274, 0, 2, 1376275, 0, 2, 1376276, 0, 2, 1376277, 0, 2, 1376278, 0, 2, 1376279, 0, 2, 1376280, 0, 2, 1376281, 0, 2, 1376282, 0, 2, 1376283, 0, 2, 1376284, 0, 2, 1376285, 0, 2, 1376286, 0, 2, 1376287, 0, 2, 1441801, 0, 0, 1441802, 0, 0, 1441809, 0, 65536, 1441810, 0, 65537, 1441811, 0, 65536, 1441812, 0, 65537, 1441813, 0, 65536, 1441814, 0, 65537, 1441815, 0, 65536, 1441816, 0, 65537, 1441817, 0, 65536, 1441818, 0, 65537, 1441819, 0, 65536, 1441820, 0, 65537, 1441821, 0, 65536, 1441822, 0, 65537, 1441823, 0, 65536, 1507328, 0, 131074, 1507329, 0, 131074, 1507330, 0, 131074, 1507331, 0, 131074, 1507332, 0, 131074, 1507333, 0, 131074, 1507334, 0, 131074, 1507335, 0, 131074, 1507336, 0, 131074, 1507337, 0, 131074, 1507338, 0, 131074, 1507339, 0, 131074, 1507340, 0, 131074, 1507341, 0, 131074, 1507342, 0, 131074, 1507343, 0, 131074, 1507344, 0, 131074, 1507345, 0, 131074, 1507346, 0, 131074, 1507347, 0, 131074, 1507348, 0, 131074, 1507349, 0, 131074, 1507350, 0, 131074, 1507351, 0, 131074, 1507352, 0, 131074, 1507353, 0, 131074, 1507354, 0, 131074, 1507355, 0, 131074, 1507356, 0, 131074, 1507357, 0, 131074, 1507358, 0, 131074, 1507359, 0, 131074 ) + +[node name="Ground" type="TileMap" parent="."] +tile_set = ExtResource( 3 ) +cell_size = Vector2( 8, 8 ) +format = 1 +tile_data = PoolIntArray( 327697, 0, 131072, 327698, 0, 131073, 327699, 0, 131073, 327700, 0, 131073, 327701, 0, 131073, 327702, 0, 131073, 327703, 0, 131073, 327704, 0, 131073, 327705, 0, 131073, 327706, 0, 131073, 327707, 0, 131073, 327708, 0, 131073, 327709, 0, 131073, 327710, 0, 131073, 327711, 0, 131073, 393234, 0, 1, 393235, 0, 1, 393236, 0, 1, 393237, 0, 1, 393238, 0, 1, 393239, 0, 1, 393240, 0, 1, 393241, 0, 1, 393242, 0, 1, 393243, 0, 1, 393244, 0, 1, 393245, 0, 1, 393246, 0, 1, 393247, 0, 1, 458770, 0, 1, 458771, 0, 1, 524306, 0, 1, 524307, 0, 1, 589842, 0, 1, 589843, 0, 1, 655378, 0, 1, 655379, 0, 1, 720914, 0, 1, 720915, 0, 1, 786450, 0, 1, 786451, 0, 1, 851986, 0, 1, 851987, 0, 1, 917522, 0, 1, 917523, 0, 1, 983058, 0, 1, 983059, 0, 1, 1048594, 0, 1, 1048595, 0, 1, 1114130, 0, 1, 1114131, 0, 1, 1376272, 0, 65538, 1376273, 0, 65539, 1376274, 0, 1, 1376275, 0, 1, 1376276, 0, 1, 1376277, 0, 1, 1376278, 0, 1, 1376279, 0, 1, 1376280, 0, 1, 1376281, 0, 1, 1376282, 0, 1, 1376283, 0, 1, 1376284, 0, 1, 1376285, 0, 1, 1376286, 0, 1, 1376287, 0, 1, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 1, 1441809, 0, 1, 1441810, 0, 1, 1441811, 0, 1, 1441812, 0, 1, 1441813, 0, 1, 1441814, 0, 1, 1441815, 0, 1, 1441816, 0, 1, 1441817, 0, 1, 1441818, 0, 1, 1441819, 0, 1, 1441820, 0, 1, 1441821, 0, 1, 1441822, 0, 1, 1441823, 0, 1, 1507328, 0, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1 ) + +[node name="Player" parent="." instance=ExtResource( 2 )] +position = Vector2( 39, 138 ) + +[node name="Barrier" parent="." instance=ExtResource( 5 )] +position = Vector2( 144, 144 ) +scale = Vector2( 1, 24 ) diff --git a/objects/hud/hud.gd b/objects/hud/hud.gd index cbf2734..01f8949 100644 --- a/objects/hud/hud.gd +++ b/objects/hud/hud.gd @@ -13,6 +13,7 @@ onready var lives_counter = $LivesCounter onready var high_counter = $HighCounter onready var time_counter = $TimeCounter +export var song_name = "@Rumble" export (Color) var bonus_color func _ready(): @@ -22,6 +23,8 @@ func _ready(): $LivesHead.visible = true else: $DeathsHead.visible = true + #Change text to song name + $Music.text = song_name func _physics_process(delta): #Gold Counter diff --git a/objects/hud/hud.tscn b/objects/hud/hud.tscn index 51db147..c9fda1f 100644 --- a/objects/hud/hud.tscn +++ b/objects/hud/hud.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://graphics/hud/stars_hud.png" type="Texture" id=1] [ext_resource path="res://graphics/hud/lives_head.png" type="Texture" id=2] @@ -7,12 +7,30 @@ [ext_resource path="res://graphics/hud/gold_counter.png" type="Texture" id=5] [ext_resource path="res://objects/hud/hud.gd" type="Script" id=6] [ext_resource path="res://graphics/hud/key_counter.png" type="Texture" id=7] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=8] +[ext_resource path="res://ui/2ndpuberty_no_dropshadow.tres" type="Theme" id=9] [ext_resource path="res://ui/theme.tres" type="Theme" id=10] [sub_resource type="ShaderMaterial" id=1] [sub_resource type="ShaderMaterial" id=2] +[sub_resource type="Animation" id=3] +resource_name = "show song name" +length = 5.0 +tracks/0/type = "value" +tracks/0/path = NodePath("Music:rect_position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.8, 4.2, 5 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 150, 178 ), Vector2( 57, 178 ), Vector2( 57, 178 ), Vector2( 150, 178 ) ] +} + [node name="HUD" type="CanvasLayer"] layer = 100 script = ExtResource( 6 ) @@ -145,3 +163,17 @@ margin_right = 56.0 margin_bottom = 199.0 theme = ExtResource( 10 ) text = "0:00:00" + +[node name="Music" type="Label" parent="."] +material = ExtResource( 8 ) +margin_left = 150.0 +margin_top = 178.0 +margin_right = 348.0 +margin_bottom = 192.0 +theme = ExtResource( 9 ) +text = "@rumble" +align = 2 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "show song name" +"anims/show song name" = SubResource( 3 ) diff --git a/ui/2ndpuberty..png b/ui/2ndpuberty..png index 2941468..e83773b 100644 Binary files a/ui/2ndpuberty..png and b/ui/2ndpuberty..png differ diff --git a/ui/2ndpuberty_no_dropshadow.png b/ui/2ndpuberty_no_dropshadow.png index d04887e..4a9b44a 100644 Binary files a/ui/2ndpuberty_no_dropshadow.png and b/ui/2ndpuberty_no_dropshadow.png differ