Skip to content

Commit 6e6a378

Browse files
fix: improved options design consistency
1 parent f390e6a commit 6e6a378

File tree

8 files changed

+21
-43
lines changed

8 files changed

+21
-43
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_resource type="StyleBoxFlat" format=3 uid="uid://d0g32yp6tstbf"]
22

33
[resource]
4-
bg_color = Color(0.25098, 0.184314, 0.105882, 0.705882)
5-
corner_radius_bottom_right = 20
6-
corner_radius_bottom_left = 20
4+
bg_color = Color(0.25098, 0.184314, 0.105882, 0.890196)
5+
corner_radius_bottom_right = 10
6+
corner_radius_bottom_left = 10

assets/ui/checked.png

431 Bytes
Loading

assets/ui/unchecked.png

767 Bytes
Loading

packed_scene/user_interface/BackgroundParticles.tscn

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=4 format=3 uid="uid://c27uxtvl3hvnf"]
1+
[gd_scene load_steps=5 format=3 uid="uid://c27uxtvl3hvnf"]
22

33
[ext_resource type="Texture2D" uid="uid://cu6leqp2sdeof" path="res://assets/scenes_2d/tile_body.png" id="1_3pr5c"]
44

@@ -9,15 +9,22 @@ particles_anim_h_frames = 1
99
particles_anim_v_frames = 1
1010
particles_anim_loop = false
1111

12+
[sub_resource type="Curve" id="Curve_3pr5c"]
13+
_data = [Vector2(0.165323, 0.368124), 0.0, 0.0, 0, 0, Vector2(0.409274, 0.578749), 0.0, 0.0, 0, 0, Vector2(0.667339, 0.833459), 0.0, 0.0, 0, 0, Vector2(0.957661, 0.147702), 0.0, 0.0, 0, 0]
14+
point_count = 4
15+
1216
[sub_resource type="Gradient" id="Gradient_lk1wc"]
17+
offsets = PackedFloat32Array(0, 0.395745, 0.721277, 1)
18+
colors = PackedColorArray(0, 0, 0, 1, 0.280851, 0.280851, 0.280851, 1, 0.661702, 0.661702, 0.661702, 1, 1, 1, 1, 1)
1319

1420
[node name="CPUParticles2D" type="CPUParticles2D"]
1521
material = SubResource("CanvasItemMaterial_lnl8v")
1622
amount = 150
1723
texture = ExtResource("1_3pr5c")
1824
lifetime = 20.0
19-
preprocess = 3.0
25+
preprocess = 15.0
2026
speed_scale = 0.23
27+
explosiveness = 0.1
2128
randomness = 0.14
2229
direction = Vector2(0.5, 0.5)
2330
spread = 90.0
@@ -28,10 +35,13 @@ linear_accel_min = 2.0
2835
linear_accel_max = 5.0
2936
radial_accel_min = 1.5
3037
radial_accel_max = 2.35
38+
angle_min = 0.1
39+
angle_max = 0.3
3140
scale_amount_min = 0.01
41+
scale_amount_curve = SubResource("Curve_3pr5c")
3242
color = Color(0.384314, 0.745098, 0.364706, 1)
3343
color_ramp = SubResource("Gradient_lk1wc")
3444
hue_variation_min = 0.04
35-
hue_variation_max = 0.15
45+
hue_variation_max = 0.3
3646
anim_speed_min = 8.0
3747
anim_speed_max = 15.0

packed_scene/user_interface/CreditsScreen.tscn

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=12 format=3 uid="uid://cdvls8h7b4v2p"]
1+
[gd_scene load_steps=9 format=3 uid="uid://cdvls8h7b4v2p"]
22

33
[ext_resource type="Script" uid="uid://dpwsouj2eyd02" path="res://scripts/user_interface/credits_screen.gd" id="1_lf1g6"]
44
[ext_resource type="Theme" uid="uid://d018ofb37nf7u" path="res://assets/resources/themes/default.tres" id="2_836sh"]
@@ -7,16 +7,6 @@
77
[ext_resource type="Texture2D" uid="uid://cv1wuwhbps7yu" path="res://assets/game/social/instagram.png" id="4_kher8"]
88
[ext_resource type="Texture2D" uid="uid://jopy2aap5hw" path="res://assets/ui/x_icon.png" id="5_82hi4"]
99
[ext_resource type="Texture2D" uid="uid://dvhjuww0sc1lc" path="res://assets/game/social/itch.png" id="6_3s6s5"]
10-
[ext_resource type="Texture2D" uid="uid://cu6leqp2sdeof" path="res://assets/scenes_2d/tile_body.png" id="8_xfc5w"]
11-
12-
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2v6x3"]
13-
blend_mode = 1
14-
particles_animation = true
15-
particles_anim_h_frames = 1
16-
particles_anim_v_frames = 1
17-
particles_anim_loop = false
18-
19-
[sub_resource type="Gradient" id="Gradient_0dj6i"]
2010

2111
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_gagcj"]
2212

@@ -41,27 +31,6 @@ grow_vertical = 2
4131
size_flags_vertical = 3
4232
color = Color(0.07, 0.0510533, 0.0294, 1)
4333

44-
[node name="CPUParticles2D" type="CPUParticles2D" parent="ColorRect"]
45-
material = SubResource("CanvasItemMaterial_2v6x3")
46-
position = Vector2(480, 640)
47-
amount = 150
48-
lifetime = 20.0
49-
preprocess = 3.0
50-
speed_scale = 0.23
51-
randomness = 0.14
52-
texture = ExtResource("8_xfc5w")
53-
spread = 180.0
54-
gravity = Vector2(0, 0)
55-
initial_velocity_min = 150.0
56-
initial_velocity_max = 400.0
57-
linear_accel_min = 2.0
58-
linear_accel_max = 5.0
59-
scale_amount_min = 0.1
60-
color = Color(0.384314, 0.745098, 0.364706, 1)
61-
color_ramp = SubResource("Gradient_0dj6i")
62-
anim_speed_min = 8.0
63-
anim_speed_max = 15.0
64-
6534
[node name="MarginContainer" type="MarginContainer" parent="ColorRect"]
6635
unique_name_in_owner = true
6736
layout_mode = 1
@@ -138,9 +107,9 @@ offset_left = -45.0
138107
offset_bottom = 45.0
139108
grow_horizontal = 0
140109
focus_mode = 0
141-
theme_override_colors/icon_normal_color = Color(0.972549, 0.196078, 0.196078, 1)
142-
theme_override_colors/icon_pressed_color = Color(0.972549, 0.196078, 0.196078, 1)
143110
theme_override_colors/icon_hover_color = Color(0.972549, 0.196078, 0.196078, 1)
111+
theme_override_colors/icon_pressed_color = Color(0.972549, 0.196078, 0.196078, 1)
112+
theme_override_colors/icon_normal_color = Color(0.972549, 0.196078, 0.196078, 1)
144113
icon = ExtResource("5_82hi4")
145114
flat = true
146115
icon_alignment = 1

packed_scene/user_interface/Options.tscn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ flat = true
128128
[node name="LinkButton" type="LinkButton" parent="MarginContainer/BoxContainer/Options"]
129129
unique_name_in_owner = true
130130
layout_mode = 2
131+
size_flags_horizontal = 4
131132
size_flags_vertical = 10
132133
theme_override_colors/font_color = Color(0.333333, 0.333333, 0.333333, 1)
133134
theme_override_colors/font_pressed_color = Color(0.25098, 0.184314, 0.105882, 1)

project.godot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config_version=5
1212

1313
config/name="Sum Zero"
1414
config/description="A mobile puzzle game where players use math-based sliders to bring all tiles on a grid down to zero. Combining strategy, logic, and arithmetic, each level presents a unique challenge to solve."
15-
config/version="1.1.2"
15+
config/version="1.1.3"
1616
run/main_scene="res://packed_scene/scene_2d/Main.tscn"
1717
config/features=PackedStringArray("4.4", "Forward Plus")
1818
boot_splash/bg_color=Color(0.643137, 0.709804, 0.639216, 0.776471)

scripts/user_interface/options.gd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ class_name Options extends Control
33
const CREDITS = "res://packed_scene/user_interface/CreditsScreen.tscn"
44
var _player_options: PlayerOptions
55

6-
# @onready var panel: AnimatedPanel = %Panel
76
@onready var music_btn: Button = %MusicBtn
87
@onready var sfx_btn: Button = %SfxBtn
98
@onready var tutorial_btn: Button = %TutorialBtn
@@ -56,7 +55,6 @@ func _on_state_change(new_state: Constants.GameState) -> void:
5655

5756
func _exit_options() -> void:
5857
SaveManager.save_player_data()
59-
# await panel.close()
6058
GameManager.change_state(Constants.GameState.MAIN_MENU)
6159
queue_free.call_deferred()
6260

0 commit comments

Comments
 (0)