5c6e87c · godot-witchy_world_demo

Changed files (5) +93 -10

game/maps/map_witch_island/map_witch_island.scn +0 -0

(no content changes — binary or rename)

game/player/player_core_local_input.gd +2 -1

…	…	@@ -17,7 +17,8 @@ var previousInputDirection : Vector3 = Vector3.ZERO
17	17	var mouseMovementChanged : bool = false
18	18
19	19	func _ready():
20		Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
	20	# UI is displayed first
	21	# Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
21	22	clippedCamera.add_exception(get_parent())
22	23
23	24	func _process(_delta):

game/player/player_core_local_input_special.gd +21 -6

…	…	@@ -2,23 +2,38 @@ extends Node
2	2
3	3	var bDebugPaused : bool = false
4	4	var mouseModeBackup
	5	var UINode = null
5	6
6	7	func _ready():
7	8	bDebugPaused = false
8	9	get_tree().paused = false
9	10	mouseModeBackup = Input.get_mouse_mode()
10	11
11		func _input(_event):
12		if Input.is_action_just_pressed("ui_cancel"):
13		# Open UI (for now)
14		get_tree().get_current_scene().get_node("UI").get_node("Menu_Main").ui.show()
15		# get_tree().quit()
16		if Input.is_action_just_pressed("toggleMouse"):
	12	func HandleMouseToggle():
17	13	if Input.get_mouse_mode() != Input.MOUSE_MODE_VISIBLE:
18	14	mouseModeBackup = Input.get_mouse_mode()
19	15	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
20	16	else:
21	17	Input.set_mouse_mode(mouseModeBackup)
	18
	19	func CheckAndUpdateUINode():
	20	if(UINode == null):
	21	UINode = get_tree().get_current_scene().find_node("Menu_Main")
	22
	23	func _input(_event):
	24	if Input.is_action_just_pressed("ui_cancel"):
	25	# Toggle UI
	26	CheckAndUpdateUINode()
	27	if(UINode._getIsMenuShowing() ):
	28	UINode.hideUI()
	29	else:
	30	UINode.resetUI()
	31	UINode.showUI()
	32	# HandleMouseToggle()
	33	# get_tree().quit()
	34	if Input.is_action_just_pressed("toggleMouse"):
	35	# HandleMouseToggle()
	36	return
22	37	if Input.is_action_just_pressed("toggle_slowmo"):
23	38	if Engine.get_time_scale() < 1.0:
24	39	Engine.set_time_scale(1.0)

menu/main/menu_main.gd +70 -3

…	…	@@ -19,6 +19,10 @@ onready var settings_action_apply = settings_actions.get_node(@"Apply")
19	19	onready var settings_action_cancel = settings_actions.get_node(@"Cancel")
20	20
21	21	onready var multiplayer_menu = ui.get_node(@"Multiplayer")
	22	onready var multiplayer_LabelGWStatus = multiplayer_menu.get_node(@"HyperGatewayStatus").get_node(@"LabelGWStatus")
	23	onready var multiplayer_StartGW = multiplayer_menu.get_node(@"Gateway").get_node(@"Start")
	24	onready var multiplayer_StopGW = multiplayer_menu.get_node(@"Gateway").get_node(@"Stop")
	25	onready var multiplayer_PortInput = multiplayer_menu.get_node(@"HyperGatewayPort").get_node(@"LineEdit")
22	26
23	27	onready var gi_menu = settings_menu.get_node(@"GI")
24	28	onready var gi_high = gi_menu.get_node(@"High")
…	…	@@ -36,15 +40,40 @@ onready var bloom_high = bloom_menu.get_node(@"High")
36	40	onready var bloom_low = bloom_menu.get_node(@"Low")
37	41	onready var bloom_disabled = bloom_menu.get_node(@"Disabled")
38	42
	43	var hyperGatewayNode = null
	44	var hyperGatewayURL : String = ""
	45	var hyperGatewayPID : int = 0
	46	var hyperGatewayPort : int = 0
	47
	48	var hyperGWPortInputBackup : String = ""
	49
39	50	func _ready():
40		get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_2D, SceneTree.STRETCH_ASPECT_KEEP, Vector2(1920, 1080))
	51	get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_2D, SceneTree.STRETCH_ASPECT_KEEP, Vector2(1440, 810))
	52	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
	53
	54	func _getIsMenuShowing() -> bool:
	55	return ui.visible
41	56
42	57	func _on_quit_pressed():
43	58	get_tree().quit()
	59
	60	func hideUI():
	61	Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
	62	ui.hide()
	63
	64	func showUI():
	65	# resetUI()
	66	ui.show()
	67	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
	68
	69	func resetUI():
	70	settings_menu.hide()
	71	multiplayer_menu.hide()
	72	main.show()
44	73
45	74	func _on_Resume_pressed():
46	75	# Hide UI (for now)
47		ui.hide()
	76	hideUI()
48	77
49	78	func _on_Quit_pressed():
50	79	get_tree().quit()
…	…	@@ -77,10 +106,30 @@ func _on_Settings_pressed():
77	106	bloom_low.pressed = true
78	107	elif Settings.bloom_quality == Settings.BloomQuality.DISABLED:
79	108	bloom_disabled.pressed = true
80
	109
	110	func _UpdateHyperGatewayInfo():
	111	multiplayer_StartGW.disabled = true
	112	multiplayer_StopGW.disabled = true
	113
	114	if(hyperGatewayNode != null):
	115	if(hyperGatewayNode is HyperGateway):
	116	hyperGatewayPID = hyperGatewayNode.getGatewayPID()
	117	hyperGatewayPort = hyperGatewayNode.getGatewayPort()
	118
	119	if( hyperGatewayNode.getIsGatewayRunning() ):
	120	multiplayer_StopGW.disabled = false
	121	multiplayer_LabelGWStatus.text = "Running (PID " + str(hyperGatewayPID) + ") on Port " + str(hyperGatewayPort)
	122	else:
	123	multiplayer_StartGW.disabled = false
	124	multiplayer_LabelGWStatus.text = "Not Running"
81	125
82	126	func _on_Multiplayer_pressed():
83	127	main.hide()
	128	# Check for HyperGateway Node
	129	if(hyperGatewayNode == null):
	130	hyperGatewayNode = get_tree().get_current_scene().find_node("HyperGateway")
	131	_UpdateHyperGatewayInfo()
	132
84	133	multiplayer_menu.show()
85	134
86	135	func _on_Apply_pressed():
…	…	@@ -130,3 +179,21 @@ func _on_Multiplayer_Apply_pressed():
130	179	main.show()
131	180	# play_button.grab_focus()
132	181	multiplayer_menu.hide()
	182
	183
	184	func _on_Start_pressed():
	185	hyperGatewayNode.start()
	186	_UpdateHyperGatewayInfo()
	187
	188
	189	func _on_Stop_pressed():
	190	hyperGatewayNode.stop()
	191	multiplayer_PortInput
	192	_UpdateHyperGatewayInfo()
	193
	194
	195	func _on_HyperGWPort_LineEdit_text_changed(new_text : String):
	196	if(new_text.length() < 1 or new_text.is_valid_integer()):
	197	hyperGWPortInputBackup = new_text
	198	else:
	199	multiplayer_PortInput.text = hyperGWPortInputBackup

menu/main/menu_main.scn +0 -0

(no content changes — binary or rename)

godot-witchy_world_demo commits / 5c6e87c

Changed files (5) +93 -10