From 6f47bf7fb49e70df433730128bb5b55469e32ffe Mon Sep 17 00:00:00 2001 From: Lyssa <75037904+thecatontheceiling@users.noreply.github.com> Date: Thu, 31 Oct 2024 20:49:01 +0400 Subject: [PATCH] Beta branch v2.0.0.2 Fixed a possible softlock where item grabbing started when all alive players have full inventories, while dead players had room in their inventory for more items When entering multiplayer without a connection to Steam, the player will get a message prompt which will return them to the menu once closed Fixed final score showing up incorrectly in singleplayer Fixed the magnifying glass sometimes showing the wrong shell in multiplayer --- EndingManager.gd | 10 +++++----- GlobalVariables.gd | 9 +++++---- MenuManager.gd | 5 +++++ Steam.gd | 1 + TimeScaleManager.gd | 9 +++++++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/EndingManager.gd b/EndingManager.gd index bcab3a1..f841116 100644 --- a/EndingManager.gd +++ b/EndingManager.gd @@ -154,11 +154,11 @@ func FinalScore(): var dots = "................................................................" var text_congratulations = tr("CONGRATULATIONS") % [playername] var text_shotsFired = tr("SHOTS FIRED") + " " + dots; label_array[0].get_child(2).text = str(shots_fired) - if (endless_overwriting): text_shotsFired = tr("ROUNDS BEAT") + " " + dots; label_array[0].get_child(2).text = str(shots_fired) - var text_shellsEjected = tr("SHELLS EJECTED") + " " + dots; label_array[1].get_child(2).text = str(shots_fired) - var text_doorsKicked = tr("DOORS KICKED") + " " + dots; label_array[2].get_child(2).text = str(shots_fired) - var text_cigSmoked = tr("CIGS SMOKED") + " " + dots; label_array[3].get_child(2).text = str(shots_fired) - var text_beerDrank = tr("ML DRANK") + " " + dots; label_array[4].get_child(2).text = str(shots_fired) + if (endless_overwriting): text_shotsFired = tr("ROUNDS BEAT") + " " + dots; label_array[0].get_child(2).text = str(endless_roundsbeat) + var text_shellsEjected = tr("SHELLS EJECTED") + " " + dots; label_array[1].get_child(2).text = str(shells_ejected) + var text_doorsKicked = tr("DOORS KICKED") + " " + dots; label_array[2].get_child(2).text = str(doors_kicked) + var text_cigSmoked = tr("CIGS SMOKED") + " " + dots; label_array[3].get_child(2).text = str(cigarettes_smoked) + var text_beerDrank = tr("ML DRANK") + " " + dots; label_array[4].get_child(2).text = str(ml_of_beer_drank) var text_totalcash = tr("TOTAL CASH") + " " + str(total_cash) + " $" #if (endless_overwriting): text_shotsFired = "rounds beat ........ " + str(endless_roundsbeat) diff --git a/GlobalVariables.gd b/GlobalVariables.gd index 9e0c157..fcde210 100644 --- a/GlobalVariables.gd +++ b/GlobalVariables.gd @@ -1,7 +1,7 @@ extends Node -var currentVersion_nr = "v1.9.906" -var currentVersion_hotfix = 3 +var currentVersion_nr = "v2.0.0" +var currentVersion_hotfix = 2 var using_steam = true var currentVersion = "" @@ -38,9 +38,10 @@ var timeouts_enabled = false #whether or not timeouts are enabled for adrenaline var skipping_intro = false #whether or not to skip the intro var lobby_id_found_in_command_line = 0 #lobby ID for when a player joins through an invite with the game closed var running_short_intro_in_lobby_scene : bool = false #if the user is entering the lobby scene from mp main, or has a command line lobby ID, skip the bootup animation -var command_line_checked = false #whether or not the command line has been checked on running the game. +var command_line_checked = false #whether or not the command line has been checked on running the game var version_to_check : String = "" #full version string that includes major, minor, patch, hotfix -var steam_id_version_checked_array : Array[int] #array of steam IDs that have the version checked. this must match the steam lobby member array IDs. +var steam_id_version_checked_array : Array[int] #array of steam IDs that have the version checked. this must match the steam lobby member array IDs +var returning_to_main_menu_on_popup_close : bool #whether or not closing the popup window will return the user to the main menu func _ready(): if using_steam: currentVersion = currentVersion_nr + versuffix_steam diff --git a/MenuManager.gd b/MenuManager.gd index 8b0e09c..f1613b1 100644 --- a/MenuManager.gd +++ b/MenuManager.gd @@ -205,6 +205,11 @@ func Start(): get_tree().change_scene_to_file("res://scenes/main.tscn") func StartMultiplayer(): + if !GlobalSteam.ONLINE: + GlobalVariables.message_to_forward = tr("MP_UI LOBBY NO CONNECTION") + GlobalVariables.returning_to_main_menu_on_popup_close = true + GlobalVariables.running_short_intro_in_lobby_scene = true + Buttons(false) ResetButtons() for screen in screens: screen.visible = false diff --git a/Steam.gd b/Steam.gd index 70a1e38..c576676 100644 --- a/Steam.gd +++ b/Steam.gd @@ -22,6 +22,7 @@ func _ready(): ONLINE = Steam.loggedOn() STEAM_ID = Steam.getSteamID() STEAM_NAME = Steam.getPersonaName() + if GlobalVariables.mp_debugging: STEAM_ID = 1234 print("online ... ", ONLINE, " ... steam id ... ", STEAM_ID, " ... steam name ... ", STEAM_NAME) func _process(_delta: float) -> void: diff --git a/TimeScaleManager.gd b/TimeScaleManager.gd index 02cbc98..8806824 100644 --- a/TimeScaleManager.gd +++ b/TimeScaleManager.gd @@ -25,3 +25,12 @@ func LerpTimeScale(): c = ease(c, 0.4) var val = lerpf(from, to, c) Engine.time_scale = val + +func _unhandled_input(event): + if GlobalVariables.mp_debugging: + if event.is_action_pressed("-"): + moving = false + if event.is_action_pressed(","): + moving = false + if event.is_action_pressed("."): + moving = false