Valcuda/project_teddy
1
0
Fork 0
forked from the_adventures_of_teddy/project_teddy
Code Pull requests Activity

Mainmenu loads when host leaves

Browse source
This commit is contained in:
Paul Black 2023-05-23 13:03:06 -06:00
parent b8e42872f7
commit 017150b4bf
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
characters/teddy/Teddy.gd
View file

@ -79,6 +79,9 @@ func _unhandled_input(event):
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
func _physics_process(delta): func _physics_process(delta):
if Global.kickAllPlayers:
Global.kickAllPlayers = false
rpc("kick_all_players")
if not Global.playerDisable: if not Global.playerDisable:
if is_multiplayer_authority(): if is_multiplayer_authority():
# This variable gets set my the death scene, so we know the player needs to be respawned # This variable gets set my the death scene, so we know the player needs to be respawned
@ -238,3 +241,9 @@ func spawn_cotton():
$CPUParticles3D.emitting = true $CPUParticles3D.emitting = true
await get_tree().create_timer(0.5).timeout await get_tree().create_timer(0.5).timeout
$CPUParticles3D.emitting = false $CPUParticles3D.emitting = false
@rpc("any_peer", "reliable")
func kick_all_players():
Global.playingGame = false
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
get_tree().change_scene_to_file("res://scenes/mainmenu-background.tscn")

2
scripts/global.gd
View file

@ -50,6 +50,7 @@ var addedMenuScene = false # Used for teddy.gd, fixes multiple menu bug
var tutorialCompleted = false # Used in the save file, to know if a play should go to tutorial first var tutorialCompleted = false # Used in the save file, to know if a play should go to tutorial first
var playerDisable = false # Can be used to disable the player var playerDisable = false # Can be used to disable the player
var playerDeathHealth = 100 # Can be changed by death.gd var playerDeathHealth = 100 # Can be changed by death.gd
var kickAllPlayers = false # Can be set to true to kick all players in-game
func _process(delta): func _process(delta):
spawn_locations() spawn_locations()
@ -118,6 +119,7 @@ func reset_variables_hard():
addedMenuScene = false addedMenuScene = false
playerDisable = false playerDisable = false
playerDeathHealth = 100 playerDeathHealth = 100
kickAllPlayers = false
func save_data(): func save_data():
SettingsFile.save_data() SettingsFile.save_data()

1
scripts/mainmenu.gd
View file

@ -110,3 +110,4 @@ func _on_light_button_pressed():
func _on_issues_button_pressed(): func _on_issues_button_pressed():
OS.shell_open("https://git.techwizz-emu.com/the_adventures_of_teddy/public_issues/issues") OS.shell_open("https://git.techwizz-emu.com/the_adventures_of_teddy/public_issues/issues")

8
scripts/sceneChangerConfirm.gd
View file

@ -10,8 +10,12 @@ func _process(delta):
func _on_yes_button_pressed(): func _on_yes_button_pressed():
Networking.peer.close() if Global.goScene == "res://scenes/mainmenu-background.tscn":
Global.playingGame = false if Global.teddyAuthorityID == 1:
Global.kickAllPlayers = true
Global.playingGame = false
await get_tree().create_timer(0.5).timeout
Networking.peer.close()
get_tree().change_scene_to_file(Global.goScene) get_tree().change_scene_to_file(Global.goScene)