martin
/
DashBoomColorClash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI improvements, added control descriptions

main
Martin Felis 2024-01-28 16:07:43 +01:00
parent 0d9d9f856c
commit fcfffe7825
2 changed files with 135 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
project.godot
View File

@ -74,6 +74,7 @@ ui_menu={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194370,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194370,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null)
] ]
} }
move_up_p1={ move_up_p1={
@ -128,7 +129,7 @@ move_down_p2={
} }
move_left_p2={ move_left_p2={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":0,"axis_value":-1.0,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":0,"axis_value":-1.0,"script":null)
] ]
} }
@ -140,8 +141,8 @@ move_right_p2={
} }
dash_p2={ dash_p2={
"deadzone": 0.5, "deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194440,"key_label":0,"unicode":50,"echo":false,"script":null) "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":0,"pressure":0.0,"pressed":true,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194440,"key_label":0,"unicode":50,"echo":false,"script":null)
] ]
} }
bomb_p2={ bomb_p2={
@ -150,10 +151,6 @@ bomb_p2={
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":1,"pressure":0.0,"pressed":true,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
] ]
} }
move={
"deadzone": 0.5,
"events": []
}
[layer_names] [layer_names]

213
scenes/Game.tscn
View File

@ -80,22 +80,6 @@ grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
theme = ExtResource("2_eun58") theme = ExtResource("2_eun58")
[node name="Label" type="Label" parent="GameUI/GameStartupWidgets"]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -149.0
offset_top = -128.0
offset_right = 149.0
grow_horizontal = 2
grow_vertical = 0
theme_override_font_sizes/font_size = 120
text = "Ready?"
horizontal_alignment = 1
[node name="Logo" type="Control" parent="GameUI/GameStartupWidgets"] [node name="Logo" type="Control" parent="GameUI/GameStartupWidgets"]
layout_mode = 1 layout_mode = 1
anchors_preset = 8 anchors_preset = 8
@ -178,73 +162,94 @@ offset_bottom = -17.0
grow_vertical = 0 grow_vertical = 0
text = "Music: Run Amok by Kevin MacLeod | https://incompetech.com/" text = "Music: Run Amok by Kevin MacLeod | https://incompetech.com/"
[node name="GameFinishedWidgets" type="Panel" parent="GameUI"] [node name="KeyboardControls" type="HBoxContainer" parent="GameUI/GameStartupWidgets"]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -354.0
offset_top = -220.0
offset_right = 369.0
offset_bottom = -76.0
grow_horizontal = 2
grow_vertical = 0
[node name="GamepadControlsLabel" type="Label" parent="GameUI/GameStartupWidgets/KeyboardControls"]
layout_mode = 2
text = "Controls Gamepad:
Movement: Analog Stick
Dash: Button A / X
Bomb: Button B / O"
[node name="Player1KeyboardControlsLabel" type="Label" parent="GameUI/GameStartupWidgets/KeyboardControls"]
layout_mode = 2
text = "Player1:
Movement: W A S D
Dash: O
Bomb: P"
[node name="Player2KeyboardControlsLabel" type="Label" parent="GameUI/GameStartupWidgets/KeyboardControls"]
layout_mode = 2
text = "Player2:
Movement: ←↑→↓
Dash: Keypad 2
Bomb: Keypad 3"
[node name="GameLevelSelectWidgets" type="Panel" parent="GameUI"]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
theme = ExtResource("2_eun58")
[node name="VBoxContainer" type="VBoxContainer" parent="GameUI/GameFinishedWidgets"] [node name="Label" type="Label" parent="GameUI/GameLevelSelectWidgets"]
layout_mode = 1 layout_mode = 1
anchors_preset = 8 anchors_preset = 5
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5 anchor_right = 0.5
offset_left = -169.0
offset_top = 76.0
offset_right = 153.0
offset_bottom = 162.0
grow_horizontal = 2
theme_override_font_sizes/font_size = 80
text = "Level Select"
[node name="LevelListContainer" type="HBoxContainer" parent="GameUI/GameLevelSelectWidgets"]
layout_mode = 1
anchors_preset = 14
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5 anchor_bottom = 0.5
offset_left = -240.0 offset_top = -151.0
offset_top = -64.0 offset_bottom = 148.0
offset_right = 240.0
offset_bottom = 64.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
focus_next = NodePath("BasicLevelButton")
[node name="Label" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer"] focus_mode = 2
layout_mode = 2 theme_override_constants/separation = 32
theme_override_font_sizes/font_size = 120
text = "Game Over!"
horizontal_alignment = 1
[node name="WinnerLabel" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer"]
layout_mode = 2
text = "Player 1 wins"
horizontal_alignment = 1
[node name="HBoxContainer" type="HBoxContainer" parent="GameUI/GameFinishedWidgets/VBoxContainer"]
layout_mode = 2
alignment = 1 alignment = 1
[node name="Player1Stats" type="VBoxContainer" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer"] [node name="BasicLevelButton" type="Button" parent="GameUI/GameLevelSelectWidgets/LevelListContainer"]
custom_minimum_size = Vector2(200, 0)
layout_direction = 2
layout_mode = 2 layout_mode = 2
toggle_mode = true
button_group = ExtResource("4_0dlh8")
icon = ExtResource("4_l63m5")
[node name="Label" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer/Player1Stats"] [node name="PlatformLevelButton" type="Button" parent="GameUI/GameLevelSelectWidgets/LevelListContainer"]
layout_mode = 2 layout_mode = 2
text = "Player 1" toggle_mode = true
horizontal_alignment = 1 button_group = ExtResource("4_0dlh8")
icon = ExtResource("4_0en0p")
[node name="Points" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer/Player1Stats"] [node name="PlatformLevelButton2" type="Button" parent="GameUI/GameLevelSelectWidgets/LevelListContainer"]
layout_mode = 2 layout_mode = 2
text = "0" toggle_mode = true
horizontal_alignment = 1 button_group = ExtResource("4_0dlh8")
icon = ExtResource("7_8su71")
[node name="Player2Stats" type="VBoxContainer" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer"]
custom_minimum_size = Vector2(200, 0)
layout_direction = 2
layout_mode = 2
[node name="Label" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer/Player2Stats"]
layout_mode = 2
text = "Player 2"
horizontal_alignment = 1
[node name="Points" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer/Player2Stats"]
layout_mode = 2
text = "0"
horizontal_alignment = 1
[node name="GameRunningWidgets" type="Panel" parent="GameUI"] [node name="GameRunningWidgets" type="Panel" parent="GameUI"]
visible = false visible = false
@ -329,7 +334,7 @@ theme_override_font_sizes/font_size = 40
text = "00:30:00" text = "00:30:00"
horizontal_alignment = 1 horizontal_alignment = 1
[node name="GameLevelSelectWidgets" type="Panel" parent="GameUI"] [node name="GameFinishedWidgets" type="Panel" parent="GameUI"]
visible = false visible = false
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
@ -337,34 +342,78 @@ anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
theme = ExtResource("2_eun58")
[node name="LevelListContainer" type="HBoxContainer" parent="GameUI/GameLevelSelectWidgets"] [node name="VBoxContainer" type="VBoxContainer" parent="GameUI/GameFinishedWidgets"]
layout_mode = 1 layout_mode = 1
anchors_preset = 14 anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
anchor_right = 1.0 anchor_right = 0.5
anchor_bottom = 0.5 anchor_bottom = 0.5
offset_left = -240.0
offset_top = -64.0
offset_right = 240.0
offset_bottom = 64.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
focus_next = NodePath("BasicLevelButton")
focus_mode = 2 [node name="Label" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer"]
theme_override_constants/separation = 32 layout_mode = 2
theme_override_font_sizes/font_size = 120
text = "Game Over!"
horizontal_alignment = 1
[node name="WinnerLabel" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer"]
layout_mode = 2
text = "Player 1 wins"
horizontal_alignment = 1
[node name="HBoxContainer" type="HBoxContainer" parent="GameUI/GameFinishedWidgets/VBoxContainer"]
layout_mode = 2
alignment = 1 alignment = 1
[node name="BasicLevelButton" type="Button" parent="GameUI/GameLevelSelectWidgets/LevelListContainer"] [node name="Player1Stats" type="VBoxContainer" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer"]
custom_minimum_size = Vector2(200, 0)
layout_direction = 2
layout_mode = 2 layout_mode = 2
toggle_mode = true
button_group = ExtResource("4_0dlh8")
icon = ExtResource("4_l63m5")
[node name="PlatformLevelButton" type="Button" parent="GameUI/GameLevelSelectWidgets/LevelListContainer"] [node name="Label" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer/Player1Stats"]
layout_mode = 2 layout_mode = 2
toggle_mode = true text = "Player 1"
button_group = ExtResource("4_0dlh8") horizontal_alignment = 1
icon = ExtResource("4_0en0p")
[node name="PlatformLevelButton2" type="Button" parent="GameUI/GameLevelSelectWidgets/LevelListContainer"] [node name="Points" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer/Player1Stats"]
layout_mode = 2 layout_mode = 2
toggle_mode = true text = "0"
button_group = ExtResource("4_0dlh8") horizontal_alignment = 1
icon = ExtResource("7_8su71")
[node name="Player2Stats" type="VBoxContainer" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer"]
custom_minimum_size = Vector2(200, 0)
layout_direction = 2
layout_mode = 2
[node name="Label" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer/Player2Stats"]
layout_mode = 2
text = "Player 2"
horizontal_alignment = 1
[node name="Points" type="Label" parent="GameUI/GameFinishedWidgets/VBoxContainer/HBoxContainer/Player2Stats"]
layout_mode = 2
text = "0"
horizontal_alignment = 1
[node name="Label" type="Label" parent="GameUI/GameFinishedWidgets"]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -217.0
offset_top = -54.0
offset_right = 228.0
offset_bottom = -21.0
grow_horizontal = 2
grow_vertical = 0
text = "Press Escape/Options/Start to continue"