diff --git a/Dunkanoid.tscn b/Dunkanoid.tscn index 031185d..0874307 100644 --- a/Dunkanoid.tscn +++ b/Dunkanoid.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=3 uid="uid://4q0epdnb0x4s"] +[gd_scene load_steps=34 format=3 uid="uid://4q0epdnb0x4s"] [ext_resource type="Script" path="res://Dunkanoid.gd" id="1_kv4if"] [ext_resource type="PackedScene" uid="uid://dndemjw7up2r6" path="res://Paddle/Paddle.tscn" id="2_26c5i"] @@ -21,6 +21,7 @@ [ext_resource type="Texture2D" uid="uid://cg5olju1mcceh" path="res://Pipes/hPipe.png" id="15_n2p48"] [ext_resource type="Texture2D" uid="uid://bh8om6bv1qumy" path="res://Pipes/vPipeEndLow.png" id="16_osyku"] [ext_resource type="Texture2D" uid="uid://n81u6nrroi18" path="res://Pipes/CornerTopLeft.png" id="17_jvxfq"] +[ext_resource type="Script" path="res://HoverButton.gd" id="17_oasph"] [ext_resource type="Texture2D" uid="uid://btiaapyjul68s" path="res://Pipes/CornerTopRight.png" id="18_2ed71"] [ext_resource type="Texture2D" uid="uid://1ar54kb0l0sm" path="res://Pipes/vPipeEndHigh.png" id="19_6cngp"] [ext_resource type="Texture2D" uid="uid://bj28rs6816gn8" path="res://Pipes/hPipeEndLeft.png" id="20_fr68l"] @@ -42,13 +43,13 @@ distance = -432.0 [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_48dqy"] distance = -360.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_j418f"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_p2a4d"] shader = ExtResource("12_ljnes") -shader_parameter/rect_global_position = Vector2(0, 0.210294) +shader_parameter/rect_global_position = Vector2(0, 77) shader_parameter/rect_size = Vector2(448, 25) shader_parameter/ColourTexture = ExtResource("13_u52d1") -[sub_resource type="ShaderMaterial" id="ShaderMaterial_u2pgi"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_vti8i"] shader = ExtResource("12_ljnes") shader_parameter/rect_global_position = Vector2(0, 0) shader_parameter/rect_size = Vector2(89, 25) @@ -322,7 +323,7 @@ theme_type_variation = &"RoundStart" layout_mode = 2 [node name="Title" type="Label" parent="Start/VBoxContainer/PanelContainer/VBoxContainer"] -material = SubResource("ShaderMaterial_j418f") +material = SubResource("ShaderMaterial_p2a4d") layout_mode = 2 theme = ExtResource("8_wcf7g") theme_type_variation = &"Arkanoid" @@ -370,7 +371,7 @@ size_flags_vertical = 3 theme = ExtResource("8_wcf7g") [node name="Label" type="Label" parent="Paused/VBoxContainer"] -material = SubResource("ShaderMaterial_u2pgi") +material = SubResource("ShaderMaterial_vti8i") layout_mode = 2 theme = ExtResource("8_wcf7g") theme_type_variation = &"Arkanoid" @@ -391,6 +392,8 @@ theme = ExtResource("8_wcf7g") layout_mode = 2 theme = ExtResource("8_wcf7g") text = "QUIT" +script = ExtResource("17_oasph") +HoverVariant = "ButtonHover" [node name="HSeparator2" type="HSeparator" parent="Paused/VBoxContainer/HBoxContainer"] layout_mode = 2 diff --git a/Fonts/charmap-oldschool_black.png b/Fonts/charmap-oldschool_black.png new file mode 100644 index 0000000..2ebef56 Binary files /dev/null and b/Fonts/charmap-oldschool_black.png differ diff --git a/Fonts/charmap-oldschool_black.png.import b/Fonts/charmap-oldschool_black.png.import new file mode 100644 index 0000000..59d16cc --- /dev/null +++ b/Fonts/charmap-oldschool_black.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dqy6qsp2k1wny" +path="res://.godot/imported/charmap-oldschool_black.png-4571b7f0533ce5b5ea5a18cefa002434.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Fonts/charmap-oldschool_black.png" +dest_files=["res://.godot/imported/charmap-oldschool_black.png-4571b7f0533ce5b5ea5a18cefa002434.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Fonts/charmap-oldschool_white.png b/Fonts/charmap-oldschool_white.png new file mode 100644 index 0000000..bb1f224 Binary files /dev/null and b/Fonts/charmap-oldschool_white.png differ diff --git a/Fonts/charmap-oldschool_white.png.import b/Fonts/charmap-oldschool_white.png.import new file mode 100644 index 0000000..a3f137f --- /dev/null +++ b/Fonts/charmap-oldschool_white.png.import @@ -0,0 +1,22 @@ +[remap] + +importer="font_data_image" +type="FontFile" +uid="uid://c3gxkerjb3w7q" +path="res://.godot/imported/charmap-oldschool_white.png-cd9b9f6432aed6ae53cee043820de41e.fontdata" + +[deps] + +source_file="res://Fonts/charmap-oldschool_white.png" +dest_files=["res://.godot/imported/charmap-oldschool_white.png-cd9b9f6432aed6ae53cee043820de41e.fontdata"] + +[params] + +character_ranges=PackedStringArray("\' \'-\'~\'") +columns=18 +rows=7 +image_margin=Rect2i(0, 0, 0, 0) +character_margin=Rect2i(0, 0, 0, 0) +fallbacks=[] +compress=true +scaling_mode=0 diff --git a/Fonts/charmap-oldschool_white_glow.png b/Fonts/charmap-oldschool_white_glow.png new file mode 100644 index 0000000..3942b25 Binary files /dev/null and b/Fonts/charmap-oldschool_white_glow.png differ diff --git a/Fonts/charmap-oldschool_white_glow.png.import b/Fonts/charmap-oldschool_white_glow.png.import new file mode 100644 index 0000000..ab53d30 --- /dev/null +++ b/Fonts/charmap-oldschool_white_glow.png.import @@ -0,0 +1,22 @@ +[remap] + +importer="font_data_image" +type="FontFile" +uid="uid://0a8bjrb4tfqn" +path="res://.godot/imported/charmap-oldschool_white_glow.png-587781859170c37f53f9bbfd50aac966.fontdata" + +[deps] + +source_file="res://Fonts/charmap-oldschool_white_glow.png" +dest_files=["res://.godot/imported/charmap-oldschool_white_glow.png-587781859170c37f53f9bbfd50aac966.fontdata"] + +[params] + +character_ranges=PackedStringArray("\' \'-\'~\'") +columns=18 +rows=7 +image_margin=Rect2i(0, 0, 0, 0) +character_margin=Rect2i(0, 0, 0, 0) +fallbacks=[] +compress=true +scaling_mode=0 diff --git a/HoverButton.gd b/HoverButton.gd new file mode 100644 index 0000000..9b34bfd --- /dev/null +++ b/HoverButton.gd @@ -0,0 +1,16 @@ +extends Button + +class_name HoverButton + +@export var NormalVariant : String = "" +@export var HoverVariant : String = "" + +func _ready() -> void: + mouse_entered.connect(_hover_start) + mouse_exited.connect(_hover_end) + +func _hover_start() -> void: + theme_type_variation = HoverVariant + +func _hover_end() -> void: + theme_type_variation = NormalVariant diff --git a/Intro.gd b/Intro.gd index c6ee792..b159257 100644 --- a/Intro.gd +++ b/Intro.gd @@ -13,16 +13,16 @@ var credit : int = 0 func _ready() -> void: # dump_all("res://") - - UpgradeTokensNode.text = "%d" % Global.upgrade_tokens - Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) - EventBus.update_score.connect(_on_update_score) - EventBus.update_highscore.connect(_on_update_highscore) - _on_update_score(Global.score) - _on_update_highscore(Global.highscore) - $VBoxContainer/Play/VBoxContainer/Play.grab_focus() - Music.play_intro() - get_tree().create_timer(5).timeout.connect(_show_credits) + $VBoxContainer/Play/VBoxContainer/Exit.visible = not OS.has_feature("web") + UpgradeTokensNode.text = "%d" % Global.upgrade_tokens + Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) + EventBus.update_score.connect(_on_update_score) + EventBus.update_highscore.connect(_on_update_highscore) + _on_update_score(Global.score) + _on_update_highscore(Global.highscore) + $VBoxContainer/Play/VBoxContainer/Play.grab_focus() + Music.play_intro() + get_tree().create_timer(5).timeout.connect(_show_credits) func _show_credits() -> void: $HBoxContainer/Credits/CreditsRole.modulate = Color(0, 0, 0, 0) diff --git a/Intro.tscn b/Intro.tscn index bc81f4a..ca072a9 100644 --- a/Intro.tscn +++ b/Intro.tscn @@ -4,9 +4,9 @@ [ext_resource type="Theme" uid="uid://cfvww0geatnnk" path="res://MainTheme.tres" id="3_8d2ix"] [ext_resource type="Script" path="res://ArkaLabel.gd" id="3_dqq2b"] [ext_resource type="Shader" path="res://Arkanoid.gdshader" id="3_eo4f3"] -[ext_resource type="Script" path="res://ExitButton.gd" id="4_ty0na"] [ext_resource type="Texture2D" uid="uid://b56kjbt4ub52n" path="res://NoidTex.png" id="4_v8i0c"] [ext_resource type="PackedScene" uid="uid://deyotp28r4uwj" path="res://LoadPanel.tscn" id="5_esv62"] +[ext_resource type="Script" path="res://HoverButton.gd" id="6_dasd2"] [ext_resource type="Script" path="res://Level.gd" id="6_hw2gq"] [ext_resource type="SpriteFrames" uid="uid://c6wwkgmwfpdu7" path="res://Coin/Coin.tres" id="7_2tpc7"] [ext_resource type="Script" path="res://Preview.gd" id="9_x2ejj"] @@ -20,15 +20,15 @@ point_count = 2 [sub_resource type="Gradient" id="Gradient_431mb"] colors = PackedColorArray(0, 0, 0, 0, 1, 1, 1, 1) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_31oge"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_6od3v"] shader = ExtResource("3_eo4f3") -shader_parameter/rect_global_position = Vector2(0.19822, 0.0308824) +shader_parameter/rect_global_position = Vector2(122.5, 27.5) shader_parameter/rect_size = Vector2(150, 25) shader_parameter/ColourTexture = ExtResource("4_v8i0c") -[sub_resource type="ShaderMaterial" id="ShaderMaterial_dghtq"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ipjaf"] shader = ExtResource("3_eo4f3") -shader_parameter/rect_global_position = Vector2(0.161003, 0.0735294) +shader_parameter/rect_global_position = Vector2(99.5, 42) shader_parameter/rect_size = Vector2(242, 25) shader_parameter/ColourTexture = ExtResource("4_v8i0c") @@ -70,7 +70,7 @@ size_flags_horizontal = 3 theme = ExtResource("3_8d2ix") [node name="ArkaLabel" type="Label" parent="VBoxContainer/HBoxContainer"] -material = SubResource("ShaderMaterial_31oge") +material = SubResource("ShaderMaterial_6od3v") layout_mode = 2 theme = ExtResource("3_8d2ix") theme_type_variation = &"Arkanoid" @@ -91,7 +91,7 @@ size_flags_horizontal = 3 theme = ExtResource("3_8d2ix") [node name="Revenge" type="Label" parent="VBoxContainer/HBoxContainer2"] -material = SubResource("ShaderMaterial_dghtq") +material = SubResource("ShaderMaterial_ipjaf") layout_mode = 2 theme = ExtResource("3_8d2ix") theme_type_variation = &"Arkanoid" @@ -124,37 +124,48 @@ layout_mode = 2 theme = ExtResource("3_8d2ix") text = "PLAY" icon_alignment = 1 +script = ExtResource("6_dasd2") +HoverVariant = "ButtonHover" [node name="PlayLevel" type="Button" parent="VBoxContainer/Play/VBoxContainer"] layout_mode = 2 theme = ExtResource("3_8d2ix") text = "PLAY LEVEL" icon_alignment = 1 +script = ExtResource("6_dasd2") +HoverVariant = "ButtonHover" [node name="Upgrades" type="Button" parent="VBoxContainer/Play/VBoxContainer"] layout_mode = 2 theme = ExtResource("3_8d2ix") text = "UPGRADES" icon_alignment = 1 +script = ExtResource("6_dasd2") +HoverVariant = "ButtonHover" [node name="Editor" type="Button" parent="VBoxContainer/Play/VBoxContainer"] layout_mode = 2 theme = ExtResource("3_8d2ix") text = "LEVEL EDITOR" icon_alignment = 1 +script = ExtResource("6_dasd2") +HoverVariant = "ButtonHover" [node name="Settings" type="Button" parent="VBoxContainer/Play/VBoxContainer"] layout_mode = 2 theme = ExtResource("3_8d2ix") text = "SETTINGS" icon_alignment = 1 +script = ExtResource("6_dasd2") +HoverVariant = "ButtonHover" [node name="Exit" type="Button" parent="VBoxContainer/Play/VBoxContainer"] layout_mode = 2 theme = ExtResource("3_8d2ix") text = "EXIT" icon_alignment = 1 -script = ExtResource("4_ty0na") +script = ExtResource("6_dasd2") +HoverVariant = "ButtonHover" [node name="HSeparator2" type="HSeparator" parent="VBoxContainer/Play"] layout_mode = 2 @@ -200,7 +211,7 @@ horizontal_alignment = 1 [node name="CreditsPerson" type="Label" parent="HBoxContainer/Credits"] layout_mode = 2 theme = ExtResource("3_8d2ix") -theme_type_variation = &"LargeLabel" +theme_type_variation = &"GlowLabel" horizontal_alignment = 1 vertical_alignment = 1 diff --git a/LevelEditor.gd b/LevelEditor.gd index 65c0e52..a82e005 100644 --- a/LevelEditor.gd +++ b/LevelEditor.gd @@ -1,6 +1,9 @@ extends Node2D func _ready() -> void: + $VBoxContainer/Left.select_by_name("NOTFOUND") + $VBoxContainer/Right.select_by_name("NOTFOUND") + $VBoxContainer/Background.select_by_name("BlueSlash") Music.pause() func _on_background_item_selected(index: int) -> void: @@ -70,8 +73,8 @@ func load_level_from_object(data : Dictionary) -> void: func _on_new_pressed() -> void: $VBoxContainer/Name.text = "" - $VBoxContainer/Left.select_by_name("DUNKANOID") - $VBoxContainer/Right.select_by_name("DUNKANOID") + $VBoxContainer/Left.select_by_name("NOTFOUND") + $VBoxContainer/Right.select_by_name("NOTFOUND") $VBoxContainer/Background.select_by_name("BlueSlash") $Background.texture = load($VBoxContainer/Background.get_selected_filename()) $VBoxContainer/Tint.text = "FFFFFF" diff --git a/LevelEditor.tscn b/LevelEditor.tscn index 6d9eb01..21d69a0 100644 --- a/LevelEditor.tscn +++ b/LevelEditor.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://bxkneahqum6hb"] +[gd_scene load_steps=13 format=3 uid="uid://bxkneahqum6hb"] [ext_resource type="Script" path="res://LevelEditor.gd" id="1_p7hit"] [ext_resource type="Script" path="res://LevelEditCell.gd" id="2_ayd4g"] @@ -10,6 +10,7 @@ [ext_resource type="Script" path="res://HexOnly.gd" id="8_72pke"] [ext_resource type="PackedScene" uid="uid://deyotp28r4uwj" path="res://LoadPanel.tscn" id="9_joiqc"] [ext_resource type="Script" path="res://ExportPanel.gd" id="9_nmcps"] +[ext_resource type="Script" path="res://HoverButton.gd" id="9_p8h7o"] [ext_resource type="Script" path="res://ImportPanel.gd" id="10_q6s0l"] [node name="LevelEditor" type="Node2D"] @@ -2035,6 +2036,8 @@ size_flags_horizontal = 3 focus_mode = 0 theme = ExtResource("4_usb0o") text = "LOAD" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [node name="Save" type="Button" parent="VBoxContainer/HBoxContainer"] layout_mode = 2 @@ -2042,6 +2045,8 @@ size_flags_horizontal = 3 focus_mode = 0 theme = ExtResource("4_usb0o") text = "SAVE" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer"] layout_mode = 2 @@ -2052,6 +2057,8 @@ size_flags_horizontal = 3 focus_mode = 0 theme = ExtResource("4_usb0o") text = "IMPORT" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [node name="Export" type="Button" parent="VBoxContainer/HBoxContainer3"] layout_mode = 2 @@ -2059,6 +2066,8 @@ size_flags_horizontal = 3 focus_mode = 0 theme = ExtResource("4_usb0o") text = "EXPORT" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] layout_mode = 2 @@ -2069,6 +2078,8 @@ size_flags_horizontal = 3 focus_mode = 0 theme = ExtResource("4_usb0o") text = "NEW" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [node name="Exit" type="Button" parent="VBoxContainer/HBoxContainer2"] layout_mode = 2 @@ -2076,6 +2087,8 @@ size_flags_horizontal = 3 focus_mode = 0 theme = ExtResource("4_usb0o") text = "EXIT" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [node name="LoadPanel" parent="." instance=ExtResource("9_joiqc")] @@ -2103,6 +2116,8 @@ autowrap_mode = 1 layout_mode = 2 theme = ExtResource("4_usb0o") text = "CLOSE" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [node name="ImportPanel" type="PanelContainer" parent="."] visible = false @@ -2131,12 +2146,16 @@ layout_mode = 2 size_flags_horizontal = 3 theme = ExtResource("4_usb0o") text = "IMPORT" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [node name="Cancel" type="Button" parent="ImportPanel/VBoxContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 theme = ExtResource("4_usb0o") text = "CANCEL" +script = ExtResource("9_p8h7o") +HoverVariant = "ButtonHover" [connection signal="item_selected" from="VBoxContainer/Background" to="." method="_on_background_item_selected"] [connection signal="tint_changed" from="VBoxContainer/Tint" to="." method="_on_tint_tint_changed"] diff --git a/LoadPanel.tscn b/LoadPanel.tscn index 6534529..0b235a5 100644 --- a/LoadPanel.tscn +++ b/LoadPanel.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://deyotp28r4uwj"] +[gd_scene load_steps=4 format=3 uid="uid://deyotp28r4uwj"] [ext_resource type="Theme" uid="uid://cfvww0geatnnk" path="res://MainTheme.tres" id="1_v1yul"] [ext_resource type="Script" path="res://LoadPanel.gd" id="2_rj17x"] +[ext_resource type="Script" path="res://HoverButton.gd" id="3_ghwix"] [node name="LoadPanel" type="PanelContainer"] visible = false @@ -32,5 +33,7 @@ size_flags_horizontal = 3 focus_mode = 0 theme = ExtResource("1_v1yul") text = "CANCEL" +script = ExtResource("3_ghwix") +HoverVariant = "ButtonHover" [connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="_on_cancel_pressed"] diff --git a/MainTheme.tres b/MainTheme.tres index f8e18cb..eb98756 100644 --- a/MainTheme.tres +++ b/MainTheme.tres @@ -2,53 +2,16 @@ [ext_resource type="FontFile" uid="uid://dfkm2dibf0c3b" path="res://Fonts/fonts-DSEG_v046/DSEG7-Classic-MINI/DSEG7ClassicMini-Italic.ttf" id="1_17to7"] [ext_resource type="FontFile" uid="uid://bx41ej4o03nbx" path="res://Fonts/arkanoid/Arka_solid.ttf" id="1_s07ae"] -[ext_resource type="FontFile" uid="uid://by778rb8miy2e" path="res://Fonts/Ac437_Trident_9x16.ttf" id="2_7inlg"] -[ext_resource type="FontFile" uid="uid://c7hlot6dsm01s" path="res://Fonts/Ac437_Trident_8x8.ttf" id="4_btndm"] +[ext_resource type="FontFile" uid="uid://c3gxkerjb3w7q" path="res://Fonts/charmap-oldschool_white.png" id="2_04xve"] +[ext_resource type="FontFile" uid="uid://0a8bjrb4tfqn" path="res://Fonts/charmap-oldschool_white_glow.png" id="3_fjg1d"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tyvdl"] -content_margin_left = 3.0 -content_margin_top = 3.0 -content_margin_right = 3.0 -content_margin_bottom = 3.0 -bg_color = Color(0.231373, 0.231373, 0.231373, 1) -corner_radius_top_left = 3 -corner_radius_top_right = 3 -corner_radius_bottom_right = 3 -corner_radius_bottom_left = 3 +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_naqov"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_l4f7v"] -content_margin_left = 3.0 -content_margin_top = 3.0 -content_margin_right = 3.0 -content_margin_bottom = 3.0 -bg_color = Color(0.231373, 0.231373, 0.231373, 1) -corner_radius_top_left = 3 -corner_radius_top_right = 3 -corner_radius_bottom_right = 3 -corner_radius_bottom_left = 3 +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_oj6v2"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ibocc"] -content_margin_left = 3.0 -content_margin_top = 3.0 -content_margin_right = 3.0 -content_margin_bottom = 3.0 -bg_color = Color(0.168627, 0.168627, 0.168627, 1) -draw_center = false -corner_radius_top_left = 3 -corner_radius_top_right = 3 -corner_radius_bottom_right = 3 -corner_radius_bottom_left = 3 +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_1ebxu"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ebwwv"] -content_margin_left = 3.0 -content_margin_top = 3.0 -content_margin_right = 3.0 -content_margin_bottom = 3.0 -bg_color = Color(0.168627, 0.168627, 0.168627, 1) -corner_radius_top_left = 3 -corner_radius_top_right = 3 -corner_radius_bottom_right = 3 -corner_radius_bottom_left = 3 +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_vivnf"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_y3y82"] @@ -125,17 +88,19 @@ Arkanoid/constants/shadow_offset_y = 0 Arkanoid/constants/shadow_outline_size = 6 Arkanoid/font_sizes/font_size = 24 Arkanoid/fonts/font = ExtResource("1_s07ae") -Button/font_sizes/font_size = 20 -Button/fonts/font = ExtResource("2_7inlg") -Button/styles/focus = SubResource("StyleBoxFlat_tyvdl") -Button/styles/hover = SubResource("StyleBoxFlat_l4f7v") -Button/styles/normal = SubResource("StyleBoxFlat_ibocc") -Button/styles/pressed = SubResource("StyleBoxFlat_ebwwv") +Button/fonts/font = ExtResource("2_04xve") +Button/styles/focus = SubResource("StyleBoxEmpty_naqov") +Button/styles/hover = SubResource("StyleBoxEmpty_oj6v2") +Button/styles/normal = SubResource("StyleBoxEmpty_1ebxu") +Button/styles/pressed = SubResource("StyleBoxEmpty_vivnf") +ButtonHover/base_type = &"Button" +ButtonHover/fonts/font = ExtResource("3_fjg1d") +GlowLabel/base_type = &"Label" +GlowLabel/fonts/font = ExtResource("3_fjg1d") HSeparator/styles/separator = SubResource("StyleBoxEmpty_y3y82") InternalFile/base_type = &"Button" InternalFile/colors/font_color = Color(0.670588, 0.458824, 0.52549, 1) -Label/font_sizes/font_size = 20 -Label/fonts/font = ExtResource("2_7inlg") +Label/fonts/font = ExtResource("2_04xve") LargeLabel/base_type = &"Label" LargeLabel/colors/font_outline_color = Color(1, 0, 0, 1) LargeLabel/colors/font_shadow_color = Color(1, 0.388235, 0, 0.431373) @@ -145,7 +110,7 @@ LargeLabel/constants/shadow_offset_y = 0 LargeLabel/constants/shadow_outline_size = 4 LargeLabel/font_sizes/font_size = 20 LineEdit/font_sizes/font_size = 20 -LineEdit/fonts/font = ExtResource("2_7inlg") +LineEdit/fonts/font = ExtResource("2_04xve") LineEdit/styles/focus = SubResource("StyleBoxFlat_knet6") LineEdit/styles/normal = SubResource("StyleBoxFlat_7eghl") LineEdit/styles/read_only = SubResource("StyleBoxFlat_s1ece") @@ -160,19 +125,21 @@ Numbers/constants/shadow_outline_size = 3 Numbers/font_sizes/font_size = 18 Numbers/fonts/font = ExtResource("1_17to7") Numbers/styles/normal = SubResource("StyleBoxFlat_8xhb1") +OptionButton/fonts/font = ExtResource("2_04xve") PanelContainer/styles/panel = SubResource("StyleBoxFlat_sf0ln") +PopupMenu/fonts/font = ExtResource("2_04xve") RoundStart/base_type = &"PanelContainer" RoundStart/styles/panel = SubResource("StyleBoxFlat_mruxx") SmallLabel/base_type = &"Label" SmallLabel/colors/font_color = Color(1, 1, 1, 1) SmallLabel/font_sizes/font_size = 16 -SmallLabel/fonts/font = ExtResource("2_7inlg") +SmallLabel/fonts/font = ExtResource("2_04xve") TextEdit/font_sizes/font_size = 9 -TextEdit/fonts/font = ExtResource("4_btndm") +TextEdit/fonts/font = ExtResource("2_04xve") Upgrade/base_type = &"Label" Upgrade/colors/font_color = Color(0, 0, 0, 1) Upgrade/font_sizes/font_size = 9 -Upgrade/fonts/font = ExtResource("4_btndm") +Upgrade/fonts/font = ExtResource("2_04xve") UpgradeContainer/base_type = &"PanelContainer" UpgradeContainer/styles/panel = SubResource("StyleBoxEmpty_6g8gs") UpgradePanel/base_type = &"VBoxContainer" diff --git a/PermUpgrade/PermUpgrade.tscn b/PermUpgrade/PermUpgrade.tscn index 7b884bb..2279c85 100644 --- a/PermUpgrade/PermUpgrade.tscn +++ b/PermUpgrade/PermUpgrade.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=5 format=3 uid="uid://bdhok2nkoirl0"] +[gd_scene load_steps=6 format=3 uid="uid://bdhok2nkoirl0"] [ext_resource type="Script" path="res://PermUpgrade/PermUpgrade.gd" id="1_g7x2d"] [ext_resource type="Theme" uid="uid://cfvww0geatnnk" path="res://MainTheme.tres" id="2_ie5gk"] [ext_resource type="Texture2D" uid="uid://ct1ksbbjc61lr" path="res://Brick/ShinyBrick.png" id="3_cpl7n"] [ext_resource type="Texture2D" uid="uid://cipjurqgguse7" path="res://Brick/BaseBrick.png" id="4_wqhv2"] +[ext_resource type="Script" path="res://HoverButton.gd" id="5_6ufmw"] [node name="PermUpgrade" type="PanelContainer"] offset_right = 128.0 @@ -81,6 +82,8 @@ stretch_mode = 2 layout_mode = 2 theme = ExtResource("2_ie5gk") text = "10" +script = ExtResource("5_6ufmw") +HoverVariant = "ButtonHover" [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] diff --git a/Upgrades.tscn b/Upgrades.tscn index 89212b3..8bc69b7 100644 --- a/Upgrades.tscn +++ b/Upgrades.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://bfibb6fr6rox7"] +[gd_scene load_steps=12 format=3 uid="uid://bfibb6fr6rox7"] [ext_resource type="Script" path="res://Upgrades.gd" id="1_ouypj"] [ext_resource type="Theme" uid="uid://cfvww0geatnnk" path="res://MainTheme.tres" id="1_rv7oa"] @@ -7,6 +7,7 @@ [ext_resource type="Shader" path="res://Arkanoid.gdshader" id="4_waenw"] [ext_resource type="Texture2D" uid="uid://b56kjbt4ub52n" path="res://NoidTex.png" id="5_y0x1p"] [ext_resource type="Script" path="res://ArkaLabel.gd" id="6_ducwl"] +[ext_resource type="Script" path="res://HoverButton.gd" id="8_frvhv"] [sub_resource type="Curve" id="Curve_nh5xf"] min_value = -200.0 @@ -17,9 +18,9 @@ point_count = 2 [sub_resource type="Gradient" id="Gradient_ucorl"] colors = PackedColorArray(0, 0, 0, 0, 1, 1, 1, 1) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_6weej"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_llrvb"] shader = ExtResource("4_waenw") -shader_parameter/rect_global_position = Vector2(0.012945, 0.0794118) +shader_parameter/rect_global_position = Vector2(8, 25) shader_parameter/rect_size = Vector2(608, 25) shader_parameter/ColourTexture = ExtResource("5_y0x1p") @@ -75,7 +76,7 @@ autoplay = "default" centered = false [node name="ArkaLabel" type="Label" parent="VBoxContainer"] -material = SubResource("ShaderMaterial_6weej") +material = SubResource("ShaderMaterial_llrvb") layout_mode = 2 size_flags_vertical = 6 theme = ExtResource("1_rv7oa") @@ -174,6 +175,8 @@ theme = ExtResource("1_rv7oa") layout_mode = 2 theme = ExtResource("1_rv7oa") text = "EXIT" +script = ExtResource("8_frvhv") +HoverVariant = "ButtonHover" [connection signal="mouse_enter" from="VBoxContainer/ScrollContainer/HBoxContainer/EffectTime" to="." method="_show_description"] [connection signal="mouse_leave" from="VBoxContainer/ScrollContainer/HBoxContainer/EffectTime" to="." method="_hide_description"] diff --git a/project.godot b/project.godot index 22bf1a6..45b96b1 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Dunkanoid" -config/version="0.9.2" +config/version="0.9.3" run/main_scene="res://Intro.tscn" config/features=PackedStringArray("4.2", "Forward Plus") run/max_fps=30