twille/Godot_Multiplayer_game
Archived
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

wip

Browse Source
This commit is contained in:
twille
2021-01-30 09:44:49 +01:00
parent d84fdd4d00
commit 151903278c
18 changed files with 188 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Client/Scenes/Matchmaking/Client/Network_connection.gd
View File

@ -1,6 +1,6 @@
extends Node
const SERVER_IP = "willipink.eu"
const SERVER_IP = "127.0.0.1"
const SERVER_PORT = 14600
onready var _start_button = get_node("Start_button")
@ -17,8 +17,9 @@ func initialize_connection():
_start_button.text = "Connecting..."
func connect_to_server():
var peer = NetworkedMultiplayerENet.new()
peer.create_client(SERVER_IP, SERVER_PORT)
get_tree().connect("connected_to_server", self, "_connected_to_server")
var peer = WebSocketClient.new()
peer.connect_to_url("ws://" + SERVER_IP + ":" + str(SERVER_PORT), PoolStringArray(), true)
get_tree().set_network_peer(peer)
func _connected_ok():

11
Client/Scenes/Matchmaking/Game/Game_manager.gd
View File

@ -2,6 +2,8 @@ extends Spatial
var _current_player_index
var _color_codes = []
var _turn_number
var _round_counter = 0
@ -171,3 +173,12 @@ func _input(event):
func _on_Close_pressed():
$Menu_panel.visible = false
func _on_Blocker_power_up_pressed():
#TODO:
# select 3 hexes, which will be blocked (make invisible?)
pass # Replace with function body.
func _on_Reuse_Power_up_pressed():
# TODO: you can click on hexes, which are already filled
pass # Replace with function body.

82
Client/Scenes/Matchmaking/Game/Game_manager.tscn
View File

@ -66,10 +66,10 @@ __meta__ = {
}
[node name="Player_info" type="Control" parent="GUI"]
margin_left = 1650.14
margin_top = 68.4775
margin_right = 1910.14
margin_bottom = 283.477
anchor_left = 1.0
anchor_right = 1.0
margin_left = -260.0
margin_bottom = 215.0
__meta__ = {
"_edit_use_anchors_": false
}
@ -98,7 +98,7 @@ valign = 1
[node name="Player_list" type="VBoxContainer" parent="GUI/Player_info/VBoxContainer"]
margin_top = 18.0
margin_right = 260.0
margin_bottom = 214.0
margin_bottom = 215.0
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
@ -186,11 +186,12 @@ __meta__ = {
}
[node name="Bottom_left_panel" type="Control" parent="GUI"]
anchor_top = 0.924074
anchor_right = 0.233333
anchor_top = 1.0
anchor_bottom = 1.0
margin_top = -79.9999
margin_right = 420.0
__meta__ = {
"_edit_use_anchors_": true
"_edit_use_anchors_": false
}
[node name="VBoxContainer" type="VBoxContainer" parent="GUI/Bottom_left_panel"]
@ -215,14 +216,14 @@ __meta__ = {
}
[node name="HBoxContainer" type="HBoxContainer" parent="GUI/Bottom_left_panel/VBoxContainer"]
margin_right = 447.0
margin_bottom = 82.0
margin_right = 420.0
margin_bottom = 79.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="Turn_label" type="Label" parent="GUI/Bottom_left_panel/VBoxContainer/HBoxContainer"]
margin_right = 221.0
margin_bottom = 82.0
margin_right = 208.0
margin_bottom = 79.0
size_flags_horizontal = 3
size_flags_vertical = 7
text = "Turn:"
@ -230,14 +231,63 @@ align = 2
valign = 1
[node name="Turn_indicator" type="Label" parent="GUI/Bottom_left_panel/VBoxContainer/HBoxContainer"]
margin_left = 225.0
margin_right = 447.0
margin_bottom = 82.0
margin_left = 212.0
margin_right = 420.0
margin_bottom = 79.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "1"
valign = 1
[node name="Bottom_right_panel2" type="Control" parent="GUI"]
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = -420.0
margin_top = -79.9999
__meta__ = {
"_edit_use_anchors_": false
}
[node name="VBoxContainer" type="VBoxContainer" parent="GUI/Bottom_right_panel2"]
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}
[node name="HBoxContainer" type="HBoxContainer" parent="GUI/Bottom_right_panel2/VBoxContainer"]
margin_right = 420.0
margin_bottom = 79.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="Blocker_power_up" type="Button" parent="GUI/Bottom_right_panel2/VBoxContainer/HBoxContainer"]
margin_right = 208.0
margin_bottom = 79.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "Blocker"
[node name="Reuse_Power_up" type="Button" parent="GUI/Bottom_right_panel2/VBoxContainer/HBoxContainer"]
margin_left = 212.0
margin_right = 420.0
margin_bottom = 79.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "Reuse Hexes"
[node name="Power_up_3" type="Button" parent="GUI/Bottom_right_panel2/VBoxContainer/HBoxContainer"]
visible = false
margin_left = 282.0
margin_right = 420.0
margin_bottom = 79.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="Menu_panel" type="Control" parent="."]
visible = false
anchor_left = 0.5
@ -299,5 +349,7 @@ script = ExtResource( 4 )
[connection signal="tree_exited" from="." to="." method="_on_Game_manager_tree_exited"]
[connection signal="pressed" from="End_game_panel/Back_to_lobby_button" to="." method="_on_Back_to_lobby_button_pressed"]
[connection signal="pressed" from="GUI/Bottom_left_panel/VBoxContainer/Next_turn_button" to="." method="_on_Next_turn_button_pressed"]
[connection signal="pressed" from="GUI/Bottom_right_panel2/VBoxContainer/HBoxContainer/Blocker_power_up" to="." method="_on_Blocker_power_up_pressed"]
[connection signal="pressed" from="GUI/Bottom_right_panel2/VBoxContainer/HBoxContainer/Reuse_Power_up" to="." method="_on_Reuse_Power_up_pressed"]
[connection signal="pressed" from="Menu_panel/Surrender_button" to="." method="_on_Surrender_button_pressed"]
[connection signal="pressed" from="Menu_panel/Close" to="." method="_on_Close_pressed"]

29
Client/Scenes/Matchmaking/Game/Map/Hex.gd
View File

@ -11,6 +11,9 @@ var _map
func _ready():
_is_free = true
_map = get_node("/root/Game_manager/Map")
var material = SpatialMaterial.new()
material.albedo_color = Color(1, 0.41, 0.71)
$Cylinder.set_surface_material(0, material)
func set_coordinates(x, y):
_x = x
@ -25,9 +28,31 @@ func _on_Area_input_event(camera, event, click_position, click_normal, shape_idx
get_node("/root/Game_manager/Mouse_controller").right_click_on_hex(self)
func set_color(color_id):
# TODO: make color better?
var material = SpatialMaterial.new()
material.albedo_color = Color(1, 0, 1)
if color_id == 0:
material.albedo_color = Color(0, 0, 0)
if color_id == 1:
material.albedo_color = Color(0, 0, 1)
if color_id == 2:
material.albedo_color = Color(0, 1, 0)
if color_id == 3:
material.albedo_color = Color(0, 1, 1)
if color_id == 4:
material.albedo_color = Color(1, 0, 0)
if color_id == 5:
material.albedo_color = Color(1, 0, 1)
if color_id == 6:
material.albedo_color = Color(1, 1, 0)
if color_id == 7:
material.albedo_color = Color(1, 1, 1)
$Cylinder.set_surface_material(0, material)
func occupy_hex():

2
Client/Scenes/Matchmaking/Game_room/Game_room.gd
View File

@ -39,7 +39,7 @@ func _on_Start_button_pressed():
NetworkingSync._players_ready = []
NetworkingSync.close_game()
if len(NetworkingSync._player_in_same_game_room_list) >= 2:
if len(NetworkingSync._player_in_same_game_room_list) >= 1: #TODO change to 2
for player_id in NetworkingSync._player_in_same_game_room_list:
if player_id[0] != Player.get_player_id():
rpc_id(player_id[0], "start_game")