kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2025-10-21 19:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Minimal] Phase registration fix

Browse Source
This commit is contained in:
Alan Alexander Cerna 2021-11-14 15:57:28 +02:00
parent ff70160e40
commit bf88daafe5
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/assets/scripts/pre_processors/uin_pre_processor.gd
View File

@ -30,7 +30,7 @@ func update(clientPhase):
"r_dec": Input.is_action_pressed("rotation_decrease"),
"shoot": Input.is_action_pressed("input_shoot")
}
if clientPhase != null and clientPhase["active"] != null:
if clientPhase != null and clientPhase["active"] != null and clientPhase != "ignore":
if clientPhase["active"]["phase_id"] == 0:
inputState["r_inc"] = false
inputState["r_dec"] = false
@ -61,4 +61,5 @@ func update(clientPhase):
"r_dec": false,
"shoot": false
}
elif clientPhase == "ignore": pass
return inputState

1
source/assets/scripts/server_handlers/global.gd
View File

@ -62,6 +62,7 @@ func phase_update_global():
func start_game(value):
gameStart = value
clientPhase["active"] = "ignore"
pass

29
source/scenes/GUI/network_setup.tscn
View File

@ -21,16 +21,16 @@ use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=4]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=5]
size = 36
use_mipmaps = true
@ -91,8 +91,8 @@ margin_left = -150.0
margin_top = -36.0
margin_right = 150.0
margin_bottom = 36.0
custom_fonts/font = ExtResource( 8 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 8 )
text = "CREATE SERVER"
align = 1
valign = 1
@ -115,8 +115,8 @@ anchor_bottom = 0.5
margin_left = -233.0
margin_top = -36.0
margin_bottom = 36.0
custom_fonts/font = ExtResource( 8 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 8 )
text = "JOIN SERVER"
align = 1
valign = 1
@ -147,8 +147,8 @@ margin_left = -150.0
margin_top = -36.0
margin_right = 150.0
margin_bottom = 36.0
custom_fonts/font = ExtResource( 8 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 8 )
text = "RETURN"
align = 1
valign = 1
@ -178,8 +178,8 @@ margin_left = -225.0
margin_top = -25.0
margin_right = -225.0
margin_bottom = -25.0
custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 1 )
text = "Enter your username"
align = 1
valign = 1
@ -210,10 +210,10 @@ margin_left = -175.0
margin_top = -28.0
margin_right = 175.0
margin_bottom = 28.0
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
custom_fonts/font = SubResource( 4 )
custom_styles/focus = SubResource( 2 )
custom_styles/normal = SubResource( 3 )
custom_fonts/font = SubResource( 4 )
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
align = 1
placeholder_text = "username"
__meta__ = {
@ -234,8 +234,8 @@ margin_bottom = 97.0
[node name="Label" type="Label" parent="multiplayer_configure/popup_screen/panel/confirm"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = SubResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 5 )
text = "CONFIRM"
align = 1
valign = 1
@ -288,8 +288,8 @@ margin_left = -74.5
margin_top = -32.0
margin_right = 74.5
margin_bottom = 32.0
custom_fonts/font = ExtResource( 10 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 10 )
text = "START"
align = 1
valign = 1
@ -307,8 +307,8 @@ margin_left = -319.0
margin_top = -56.0
margin_right = 319.0
margin_bottom = 56.0
custom_fonts/font = SubResource( 6 )
custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 )
custom_fonts/font = SubResource( 6 )
align = 1
valign = 1
__meta__ = {
@ -325,8 +325,8 @@ margin_left = -116.5
margin_top = 60.0
margin_right = 116.5
margin_bottom = 89.0
custom_fonts/font = SubResource( 7 )
custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 )
custom_fonts/font = SubResource( 7 )
text = "WAITING FOR PLAYERS"
align = 1
valign = 1
@ -341,7 +341,6 @@ margin_left = -70.0
margin_top = 20.0
margin_right = -20.0
margin_bottom = 70.0
focus_mode = 0
[node name="spawn_locations" type="Node" parent="."]

16
source/scenes/GUI/singleplayer_setup.tscn
View File

@ -12,16 +12,16 @@ use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=4]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=2]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="DynamicFont" id=5]
size = 36
use_mipmaps = true
@ -61,8 +61,8 @@ margin_left = -225.0
margin_top = -25.0
margin_right = -225.0
margin_bottom = -25.0
custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 1 )
text = "Enter your username"
align = 1
valign = 1
@ -93,10 +93,10 @@ margin_left = -175.0
margin_top = -28.0
margin_right = 175.0
margin_bottom = 28.0
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
custom_fonts/font = SubResource( 4 )
custom_styles/focus = SubResource( 2 )
custom_styles/normal = SubResource( 3 )
custom_fonts/font = SubResource( 4 )
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
align = 1
placeholder_text = "username"
__meta__ = {
@ -117,8 +117,8 @@ margin_bottom = 97.0
[node name="Label" type="Label" parent="popup_screen/panel/confirm"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = SubResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = SubResource( 5 )
text = "CONFIRM"
align = 1
valign = 1