Skip to content

Commit f18f4de

Browse files
committed
minor refactoring & clean up
1 parent 1dc602b commit f18f4de

File tree

13 files changed

+385
-405
lines changed

13 files changed

+385
-405
lines changed

project.godot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ config_version=4
1111
[application]
1212

1313
config/name="HexChess"
14-
run/main_scene="res://menu.tscn"
14+
run/main_scene="res://scenes/menu.tscn"
1515
config/icon="res://icons/icon.png"
1616

1717
[autoload]
File renamed without changes.
File renamed without changes.

map.tscn renamed to scenes/board.tscn

Lines changed: 112 additions & 115 deletions
Large diffs are not rendered by default.

menu.tscn renamed to scenes/menu.tscn

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
[gd_scene load_steps=17 format=2]
22

3-
[ext_resource path="res://scr/Menu.gd" type="Script" id=1]
4-
[ext_resource path="res://fonts/Russo_One.ttf" type="DynamicFontData" id=2]
5-
[ext_resource path="res://menu_buttons.tres" type="StyleBox" id=3]
6-
[ext_resource path="res://scr/Lobby.gd" type="Script" id=4]
7-
[ext_resource path="res://fonts/NixieOne.ttf" type="DynamicFontData" id=5]
8-
[ext_resource path="res://icons/back.png" type="Texture" id=6]
3+
[ext_resource path="res://fonts/NixieOne.ttf" type="DynamicFontData" id=1]
4+
[ext_resource path="res://icons/back.png" type="Texture" id=2]
5+
[ext_resource path="res://fonts/Russo_One.ttf" type="DynamicFontData" id=3]
6+
[ext_resource path="res://res/menu_buttons.tres" type="StyleBox" id=4]
7+
[ext_resource path="res://scr/Lobby.gd" type="Script" id=5]
8+
[ext_resource path="res://scr/Menu.gd" type="Script" id=6]
99

1010
[sub_resource type="Theme" id=13]
1111

1212
[sub_resource type="DynamicFont" id=1]
1313
size = 25
14-
font_data = ExtResource( 2 )
14+
font_data = ExtResource( 3 )
1515

1616
[sub_resource type="DynamicFont" id=5]
17-
font_data = ExtResource( 5 )
17+
font_data = ExtResource( 1 )
1818

1919
[sub_resource type="DynamicFont" id=6]
20-
font_data = ExtResource( 5 )
20+
font_data = ExtResource( 1 )
2121

2222
[sub_resource type="DynamicFont" id=2]
23-
font_data = ExtResource( 5 )
23+
font_data = ExtResource( 1 )
2424

2525
[sub_resource type="DynamicFont" id=3]
26-
font_data = ExtResource( 5 )
26+
font_data = ExtResource( 1 )
2727

2828
[sub_resource type="DynamicFont" id=4]
29-
font_data = ExtResource( 5 )
29+
font_data = ExtResource( 1 )
3030

3131
[sub_resource type="DynamicFont" id=16]
32-
font_data = ExtResource( 5 )
32+
font_data = ExtResource( 1 )
3333

3434
[sub_resource type="ButtonGroup" id=14]
3535
resource_name = "RadioButtons"
3636

3737
[sub_resource type="DynamicFont" id=15]
38-
font_data = ExtResource( 5 )
38+
font_data = ExtResource( 1 )
3939

4040
[node name="Control" type="Control"]
4141
anchor_top = 0.5
4242
anchor_bottom = 0.5
4343
margin_top = -300.0
4444
margin_right = 1024.0
4545
margin_bottom = 300.0
46-
script = ExtResource( 1 )
46+
script = ExtResource( 6 )
4747

4848
[node name="ColorRect" type="ColorRect" parent="."]
4949
margin_top = -1.0
@@ -58,11 +58,11 @@ margin_bottom = 40.0
5858
size_flags_horizontal = 2
5959
size_flags_vertical = 2
6060
theme = SubResource( 13 )
61-
custom_styles/hover = ExtResource( 3 )
62-
custom_styles/pressed = ExtResource( 3 )
63-
custom_styles/focus = ExtResource( 3 )
64-
custom_styles/disabled = ExtResource( 3 )
65-
custom_styles/normal = ExtResource( 3 )
61+
custom_styles/hover = ExtResource( 4 )
62+
custom_styles/pressed = ExtResource( 4 )
63+
custom_styles/focus = ExtResource( 4 )
64+
custom_styles/disabled = ExtResource( 4 )
65+
custom_styles/normal = ExtResource( 4 )
6666

6767
[node name="BackToMenu" type="TextureRect" parent="ColorRect/BackPanel"]
6868
anchor_left = 0.5
@@ -76,12 +76,12 @@ margin_bottom = 121.0
7676
grow_vertical = 2
7777
rect_scale = Vector2( 0.3, 0.3 )
7878
hint_tooltip = "Back to Menu"
79-
texture = ExtResource( 6 )
79+
texture = ExtResource( 2 )
8080

8181
[node name="Menu" type="Control" parent="."]
8282
margin_right = 40.0
8383
margin_bottom = 40.0
84-
script = ExtResource( 4 )
84+
script = ExtResource( 5 )
8585

8686
[node name="VBoxContainer" type="VBoxContainer" parent="Menu"]
8787
anchor_left = 0.5
@@ -97,47 +97,47 @@ margin_bottom = 355.0
9797
margin_right = 400.0
9898
margin_bottom = 29.0
9999
custom_fonts/font = SubResource( 1 )
100-
custom_styles/hover = ExtResource( 3 )
101-
custom_styles/pressed = ExtResource( 3 )
102-
custom_styles/focus = ExtResource( 3 )
103-
custom_styles/disabled = ExtResource( 3 )
104-
custom_styles/normal = ExtResource( 3 )
100+
custom_styles/hover = ExtResource( 4 )
101+
custom_styles/pressed = ExtResource( 4 )
102+
custom_styles/focus = ExtResource( 4 )
103+
custom_styles/disabled = ExtResource( 4 )
104+
custom_styles/normal = ExtResource( 4 )
105105
text = "Start local game"
106106

107107
[node name="Host" type="Button" parent="Menu/VBoxContainer"]
108108
margin_top = 33.0
109109
margin_right = 400.0
110110
margin_bottom = 62.0
111111
custom_fonts/font = SubResource( 1 )
112-
custom_styles/hover = ExtResource( 3 )
113-
custom_styles/pressed = ExtResource( 3 )
114-
custom_styles/focus = ExtResource( 3 )
115-
custom_styles/disabled = ExtResource( 3 )
116-
custom_styles/normal = ExtResource( 3 )
112+
custom_styles/hover = ExtResource( 4 )
113+
custom_styles/pressed = ExtResource( 4 )
114+
custom_styles/focus = ExtResource( 4 )
115+
custom_styles/disabled = ExtResource( 4 )
116+
custom_styles/normal = ExtResource( 4 )
117117
text = "Host networked game"
118118

119119
[node name="Join" type="Button" parent="Menu/VBoxContainer"]
120120
margin_top = 66.0
121121
margin_right = 400.0
122122
margin_bottom = 95.0
123123
custom_fonts/font = SubResource( 1 )
124-
custom_styles/hover = ExtResource( 3 )
125-
custom_styles/pressed = ExtResource( 3 )
126-
custom_styles/focus = ExtResource( 3 )
127-
custom_styles/disabled = ExtResource( 3 )
128-
custom_styles/normal = ExtResource( 3 )
124+
custom_styles/hover = ExtResource( 4 )
125+
custom_styles/pressed = ExtResource( 4 )
126+
custom_styles/focus = ExtResource( 4 )
127+
custom_styles/disabled = ExtResource( 4 )
128+
custom_styles/normal = ExtResource( 4 )
129129
text = "Join hosted game"
130130

131131
[node name="Options" type="Button" parent="Menu/VBoxContainer"]
132132
margin_top = 99.0
133133
margin_right = 400.0
134134
margin_bottom = 128.0
135135
custom_fonts/font = SubResource( 1 )
136-
custom_styles/hover = ExtResource( 3 )
137-
custom_styles/pressed = ExtResource( 3 )
138-
custom_styles/focus = ExtResource( 3 )
139-
custom_styles/disabled = ExtResource( 3 )
140-
custom_styles/normal = ExtResource( 3 )
136+
custom_styles/hover = ExtResource( 4 )
137+
custom_styles/pressed = ExtResource( 4 )
138+
custom_styles/focus = ExtResource( 4 )
139+
custom_styles/disabled = ExtResource( 4 )
140+
custom_styles/normal = ExtResource( 4 )
141141
text = "Options"
142142

143143
[node name="LobbyPanel" type="Panel" parent="Menu"]
@@ -152,7 +152,7 @@ margin_right = 602.0
152152
margin_bottom = 432.0
153153
size_flags_horizontal = 2
154154
size_flags_vertical = 2
155-
custom_styles/panel = ExtResource( 3 )
155+
custom_styles/panel = ExtResource( 4 )
156156

157157
[node name="AddressLabel" type="Label" parent="Menu/LobbyPanel"]
158158
margin_left = 10.0
@@ -183,10 +183,10 @@ margin_left = -40.0
183183
margin_top = 18.0
184184
margin_right = -9.0
185185
margin_bottom = 38.0
186-
custom_styles/hover = ExtResource( 3 )
187-
custom_styles/pressed = ExtResource( 3 )
188-
custom_styles/focus = ExtResource( 3 )
189-
custom_styles/normal = ExtResource( 3 )
186+
custom_styles/hover = ExtResource( 4 )
187+
custom_styles/pressed = ExtResource( 4 )
188+
custom_styles/focus = ExtResource( 4 )
189+
custom_styles/normal = ExtResource( 4 )
190190
text = "Ok"
191191

192192
[node name="TextPanel" type="Panel" parent="Menu"]
@@ -201,7 +201,7 @@ margin_right = 602.0
201201
margin_bottom = 466.0
202202
size_flags_horizontal = 2
203203
size_flags_vertical = 2
204-
custom_styles/panel = ExtResource( 3 )
204+
custom_styles/panel = ExtResource( 4 )
205205

206206
[node name="StatusOk" type="Label" parent="Menu/TextPanel"]
207207
anchor_left = 0.5
@@ -266,7 +266,7 @@ margin_right = 250.0
266266
margin_bottom = 225.0
267267
size_flags_horizontal = 2
268268
size_flags_vertical = 2
269-
custom_styles/panel = ExtResource( 3 )
269+
custom_styles/panel = ExtResource( 4 )
270270

271271
[node name="VariantsLabel" type="Label" parent="Options"]
272272
margin_left = 25.0

0 commit comments

Comments
 (0)