From 2a0a7f19ffc0e72c106795538702df14e394accc Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 21 Sep 2020 17:01:39 +0200 Subject: [PATCH] Added auto host option and server scene to automatically start server through CLI --- Game.gd | 14 ++++++++++---- Game.tscn | 1 - Server.tscn | 6 ++++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 Server.tscn diff --git a/Game.gd b/Game.gd index fb956ed..191a0bc 100644 --- a/Game.gd +++ b/Game.gd @@ -1,9 +1,10 @@ extends Node export var SERVER_PORT = 9999 setget , get_port -export(String, "172.28.162.191", "172.28.166.24", "127.0.0.1") var SERVER_IP = "172.28.162.191" setget , get_ip +export(String, "172.28.162.191", "172.28.166.24", "127.0.0.1") var SERVER_IP = "172.28.162.191" setget , get_ip export var MAX_PLAYERS = 10 export (String, "MENU", "PLAYING") var GAME_MODE = "MENU" +export var auto_host = false var mouse_sensitivity_multiplier = 1.0 @@ -20,6 +21,10 @@ func _ready(): $MenuContainer/MainMenu/Destination/Port.set_text(str(SERVER_PORT)) load_settings() + + if auto_host: + initialize_server(false) + print("qwueyhgfiuyqwgaadsf") func load_settings(): var load_settings = File.new() @@ -71,9 +76,10 @@ func open_menus(): $MenuContainer.show() func close_menus(): - GAME_MODE = "PLAYING" - Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - $MenuContainer.hide() + if has_node("MenuContainer"): + GAME_MODE = "PLAYING" + Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) + $MenuContainer.hide() func return_to_menu(type): for menu in $MenuContainer.get_children(): diff --git a/Game.tscn b/Game.tscn index a7f7496..c40ffdf 100644 --- a/Game.tscn +++ b/Game.tscn @@ -36,7 +36,6 @@ environment = SubResource( 2 ) [node name="Level" parent="." instance=ExtResource( 3 )] [node name="Players" type="Spatial" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 12.6315, 8.00684, -4.99273 ) [node name="MenuContainer" type="CenterContainer" parent="."] anchor_right = 1.0 diff --git a/Server.tscn b/Server.tscn new file mode 100644 index 0000000..c06ce81 --- /dev/null +++ b/Server.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Game.tscn" type="PackedScene" id=2] + +[node name="Game" instance=ExtResource( 2 )] +auto_host = true