From 286d70e19c3687e0de58a090b63afc4dc8761de4 Mon Sep 17 00:00:00 2001 From: Matt Jenkins Date: Sat, 11 May 2024 20:50:46 +0100 Subject: [PATCH] Improved powerups font --- Dunkanoid.gd | 2 +- Dunkanoid.tscn | 10 +++++----- Fonts/5x7.png | Bin 0 -> 1410 bytes Fonts/5x7.png.import | 22 ++++++++++++++++++++++ Fonts/Chunky.png | Bin 0 -> 1651 bytes Fonts/Chunky.png.import | 22 ++++++++++++++++++++++ Intro.tscn | 12 ++++++------ Level.gd | 1 - MainTheme.tres | 7 ++++--- Upgrade/Upgrade.tscn | 20 ++++++++++---------- Upgrades.tscn | 8 ++++---- project.godot | 2 +- 12 files changed, 75 insertions(+), 31 deletions(-) create mode 100644 Fonts/5x7.png create mode 100644 Fonts/5x7.png.import create mode 100644 Fonts/Chunky.png create mode 100644 Fonts/Chunky.png.import diff --git a/Dunkanoid.gd b/Dunkanoid.gd index e721f58..c60c144 100644 --- a/Dunkanoid.gd +++ b/Dunkanoid.gd @@ -81,7 +81,7 @@ var opened: bool = false func _process(delta : float) -> void: if OS.has_feature("editor"): - if Input.is_action_just_pressed("cheat"): + if Input.is_action_pressed("cheat"): fire_bullet() if PaddleNode.is_laser(): diff --git a/Dunkanoid.tscn b/Dunkanoid.tscn index 0874307..f49fbbf 100644 --- a/Dunkanoid.tscn +++ b/Dunkanoid.tscn @@ -43,13 +43,13 @@ distance = -432.0 [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_48dqy"] distance = -360.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_p2a4d"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_mnwco"] shader = ExtResource("12_ljnes") -shader_parameter/rect_global_position = Vector2(0, 77) +shader_parameter/rect_global_position = Vector2(0, 0.226471) shader_parameter/rect_size = Vector2(448, 25) shader_parameter/ColourTexture = ExtResource("13_u52d1") -[sub_resource type="ShaderMaterial" id="ShaderMaterial_vti8i"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_xsw3b"] shader = ExtResource("12_ljnes") shader_parameter/rect_global_position = Vector2(0, 0) shader_parameter/rect_size = Vector2(89, 25) @@ -323,7 +323,7 @@ theme_type_variation = &"RoundStart" layout_mode = 2 [node name="Title" type="Label" parent="Start/VBoxContainer/PanelContainer/VBoxContainer"] -material = SubResource("ShaderMaterial_p2a4d") +material = SubResource("ShaderMaterial_mnwco") layout_mode = 2 theme = ExtResource("8_wcf7g") theme_type_variation = &"Arkanoid" @@ -371,7 +371,7 @@ size_flags_vertical = 3 theme = ExtResource("8_wcf7g") [node name="Label" type="Label" parent="Paused/VBoxContainer"] -material = SubResource("ShaderMaterial_vti8i") +material = SubResource("ShaderMaterial_xsw3b") layout_mode = 2 theme = ExtResource("8_wcf7g") theme_type_variation = &"Arkanoid" diff --git a/Fonts/5x7.png b/Fonts/5x7.png new file mode 100644 index 0000000000000000000000000000000000000000..069e66d8738a84bd5e7c790ab5d63449fe73f935 GIT binary patch literal 1410 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 literal 0 HcmV?d00001 diff --git a/Fonts/Chunky.png.import b/Fonts/Chunky.png.import new file mode 100644 index 0000000..3a83c80 --- /dev/null +++ b/Fonts/Chunky.png.import @@ -0,0 +1,22 @@ +[remap] + +importer="font_data_image" +type="FontFile" +uid="uid://bfue7ekap54wi" +path="res://.godot/imported/Chunky.png-c0832c9d756abcfb8e32384224778b58.fontdata" + +[deps] + +source_file="res://Fonts/Chunky.png" +dest_files=["res://.godot/imported/Chunky.png-c0832c9d756abcfb8e32384224778b58.fontdata"] + +[params] + +character_ranges=PackedStringArray("\' \'-\'}\'") +columns=20 +rows=5 +image_margin=Rect2i(0, 0, 0, 0) +character_margin=Rect2i(0, 0, 0, 0) +fallbacks=[] +compress=true +scaling_mode=0 diff --git a/Intro.tscn b/Intro.tscn index ca072a9..fad7824 100644 --- a/Intro.tscn +++ b/Intro.tscn @@ -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_6od3v"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_6jl2f"] shader = ExtResource("3_eo4f3") -shader_parameter/rect_global_position = Vector2(122.5, 27.5) +shader_parameter/rect_global_position = Vector2(0, 0) shader_parameter/rect_size = Vector2(150, 25) shader_parameter/ColourTexture = ExtResource("4_v8i0c") -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ipjaf"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_1smc2"] shader = ExtResource("3_eo4f3") -shader_parameter/rect_global_position = Vector2(99.5, 42) +shader_parameter/rect_global_position = Vector2(0, 0) 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_6od3v") +material = SubResource("ShaderMaterial_6jl2f") 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_ipjaf") +material = SubResource("ShaderMaterial_1smc2") layout_mode = 2 theme = ExtResource("3_8d2ix") theme_type_variation = &"Arkanoid" diff --git a/Level.gd b/Level.gd index eca0895..d5a8cfe 100644 --- a/Level.gd +++ b/Level.gd @@ -55,7 +55,6 @@ func load_level(level_name : String) -> void: push_warning("Level %s unknown" % level_name) func load_from_file(filename : String) -> void: - print("Loading %s" % filename) var data = JSON.parse_string(FileAccess.get_file_as_string(filename)) if data != null: load_from_data(data) diff --git a/MainTheme.tres b/MainTheme.tres index eb98756..b7cb101 100644 --- a/MainTheme.tres +++ b/MainTheme.tres @@ -1,9 +1,10 @@ -[gd_resource type="Theme" load_steps=18 format=3 uid="uid://cfvww0geatnnk"] +[gd_resource type="Theme" load_steps=19 format=3 uid="uid://cfvww0geatnnk"] [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://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"] +[ext_resource type="FontFile" uid="uid://bfue7ekap54wi" path="res://Fonts/Chunky.png" id="5_dx8ei"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_naqov"] @@ -138,8 +139,8 @@ TextEdit/font_sizes/font_size = 9 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("2_04xve") +Upgrade/font_sizes/font_size = 8 +Upgrade/fonts/font = ExtResource("5_dx8ei") UpgradeContainer/base_type = &"PanelContainer" UpgradeContainer/styles/panel = SubResource("StyleBoxEmpty_6g8gs") UpgradePanel/base_type = &"VBoxContainer" diff --git a/Upgrade/Upgrade.tscn b/Upgrade/Upgrade.tscn index d91dca8..5a21265 100644 --- a/Upgrade/Upgrade.tscn +++ b/Upgrade/Upgrade.tscn @@ -8,7 +8,7 @@ colors = PackedColorArray(1, 1, 0, 1, 1, 1, 0, 0) [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_slgxc"] radius = 6.0 -height = 24.0 +height = 22.0 [node name="Upgrade" type="RigidBody2D"] collision_layer = 0 @@ -25,8 +25,8 @@ emission_shape = 3 emission_rect_extents = Vector2(10, 1) direction = Vector2(0, -1) gravity = Vector2(0, 0) -initial_velocity_min = 5.0 -initial_velocity_max = 5.0 +initial_velocity_min = 2.0 +initial_velocity_max = 2.0 color = Color(1, 1, 0, 1) color_ramp = SubResource("Gradient_ll6dt") hue_variation_min = 1.0 @@ -39,11 +39,11 @@ shape = SubResource("CapsuleShape2D_slgxc") [node name="Shadow" type="Polygon2D" parent="."] position = Vector2(2, 4) color = Color(0, 0, 0, 0.247059) -polygon = PackedVector2Array(-6, -6, 6, -6, 9, -5, 11, -3, 12, 0, 11, 3, 9, 5, 6, 6, -6, 6, -9, 5, -11, 3, -12, 0, -11, -3, -9, -5) +polygon = PackedVector2Array(-5, -6, 5, -6, 8, -5, 10, -3, 11, 0, 10, 3, 8, 5, 5, 6, -5, 6, -8, 5, -10, 3, -11, 0, -10, -3, -8, -5) [node name="Polygon2D" type="Polygon2D" parent="."] color = Color(0, 0.258824, 1, 1) -polygon = PackedVector2Array(-6, -6, 6, -6, 9, -5, 11, -3, 12, 0, 11, 3, 9, 5, 6, 6, -6, 6, -9, 5, -11, 3, -12, 0, -11, -3, -9, -5) +polygon = PackedVector2Array(-5, -6, 5, -6, 8, -5, 10, -3, 11, 0, 10, 3, 8, 5, 5, 6, -5, 6, -8, 5, -10, 3, -11, 0, -10, -3, -8, -5) [node name="Label" type="Label" parent="."] texture_filter = 1 @@ -52,15 +52,15 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -12.0 -offset_top = -7.0 -offset_right = 12.0 -offset_bottom = 10.0 +offset_left = -4.0 +offset_top = -4.0 +offset_right = 4.0 +offset_bottom = 4.0 grow_horizontal = 2 grow_vertical = 2 theme = ExtResource("2_iabep") theme_type_variation = &"Upgrade" -text = "C" +text = "W" horizontal_alignment = 1 vertical_alignment = 1 diff --git a/Upgrades.tscn b/Upgrades.tscn index 8bc69b7..cfcf8e9 100644 --- a/Upgrades.tscn +++ b/Upgrades.tscn @@ -18,10 +18,10 @@ 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_llrvb"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_v7t7t"] shader = ExtResource("4_waenw") -shader_parameter/rect_global_position = Vector2(8, 25) -shader_parameter/rect_size = Vector2(608, 25) +shader_parameter/rect_global_position = Vector2(8, 8) +shader_parameter/rect_size = Vector2(127, 25) shader_parameter/ColourTexture = ExtResource("5_y0x1p") [node name="Upgrades" type="Node2D"] @@ -76,7 +76,7 @@ autoplay = "default" centered = false [node name="ArkaLabel" type="Label" parent="VBoxContainer"] -material = SubResource("ShaderMaterial_llrvb") +material = SubResource("ShaderMaterial_v7t7t") layout_mode = 2 size_flags_vertical = 6 theme = ExtResource("1_rv7oa") diff --git a/project.godot b/project.godot index 45b96b1..e38b49e 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Dunkanoid" -config/version="0.9.3" +config/version="0.9.4" run/main_scene="res://Intro.tscn" config/features=PackedStringArray("4.2", "Forward Plus") run/max_fps=30