diff --git a/Image Sources/doublelasers.xcf b/Image Sources/doublelasers.xcf new file mode 100644 index 0000000..3764f8d Binary files /dev/null and b/Image Sources/doublelasers.xcf differ diff --git a/Laser.tscn b/Laser.tscn index 9c824c2..ae98311 100644 --- a/Laser.tscn +++ b/Laser.tscn @@ -47,10 +47,11 @@ __meta__ = { [node name="AnimatedSprite" type="AnimatedSprite" parent="." index="1"] +modulate = Color( 0, 0.71875, 1, 1 ) position = Vector2( -1.90735e-06, 0 ) scale = Vector2( 0.1, 0.2 ) frames = SubResource( 2 ) animation = "default" -_sections_unfolded = [ "Transform" ] +_sections_unfolded = [ "Material", "Transform", "Visibility" ] diff --git a/MainMenu.tscn b/MainMenu.tscn index c4d7c90..312bed9 100644 --- a/MainMenu.tscn +++ b/MainMenu.tscn @@ -139,6 +139,8 @@ size_flags_vertical = 1 color = Color( 0, 0, 0, 0 ) _sections_unfolded = [ "Visibility" ] +[node name="Settings" type="Node2D" parent="." index="7"] + [connection signal="pressed" from="StartEndlessMode" to="." method="_on_Button_pressed"] [connection signal="pressed" from="Multiplayer" to="." method="_on_Multiplayer_pressed"] diff --git a/UpgradeMenu.tscn b/UpgradeMenu.tscn index 39dd8b6..2aef888 100644 --- a/UpgradeMenu.tscn +++ b/UpgradeMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://UpgradeMenu.gd" type="Script" id=1] [ext_resource path="res://art/upgrade_menu/shootingspeed1.png" type="Texture" id=2] @@ -12,6 +12,7 @@ [ext_resource path="res://art/upgrade_menu/shipspeed4.png" type="Texture" id=10] [ext_resource path="res://art/upgrade_menu/shipspeed5.png" type="Texture" id=11] [ext_resource path="res://art/ColorSelect.png" type="Texture" id=12] +[ext_resource path="res://art/upgrade_menu/doublelasers.png" type="Texture" id=13] [sub_resource type="Theme" id=1] @@ -35,6 +36,15 @@ animations = [ { } ] _sections_unfolded = [ "Resource" ] +[sub_resource type="SpriteFrames" id=4] + +animations = [ { +"frames": [ ExtResource( 13 ) ], +"loop": true, +"name": "default", +"speed": 5.0 +} ] + [node name="UpgradeMenu" type="Node"] pause_mode = 2 @@ -404,16 +414,29 @@ align = 1 [node name="DoubleLaserUpgrade" type="Node2D" parent="." index="6"] -[node name="Button" type="Button" parent="DoubleLaserUpgrade" index="0"] +position = Vector2( -150, -10 ) +__meta__ = { +"_edit_group_": true +} + +[node name="Icon" type="AnimatedSprite" parent="DoubleLaserUpgrade" index="0"] + +position = Vector2( 959, 151.811 ) +scale = Vector2( 0.154596, 0.154596 ) +frames = SubResource( 4 ) +animation = "default" +_sections_unfolded = [ "Visibility" ] + +[node name="Button" type="Button" parent="DoubleLaserUpgrade" index="1"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 860.0 -margin_top = 80.0 -margin_right = 1000.0 -margin_bottom = 180.0 +margin_left = 846.0 +margin_top = 66.0 +margin_right = 1066.0 +margin_bottom = 231.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -425,15 +448,9 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -text = "Double Lasers!" -flat = false +flat = true align = 1 -[node name="Icon" type="AnimatedSprite" parent="DoubleLaserUpgrade" index="1"] - -visible = false -animation = "default" - [connection signal="pressed" from="Resume" to="." method="_on_Button_pressed"] [connection signal="pressed" from="Refund" to="." method="_on_Refund_pressed"] diff --git a/art/upgrade_menu/doublelasers.png b/art/upgrade_menu/doublelasers.png new file mode 100644 index 0000000..f89630c Binary files /dev/null and b/art/upgrade_menu/doublelasers.png differ