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
This commit is contained in:
parent
878292fe64
commit
6f47bf7fb4
|
@ -154,11 +154,11 @@ func FinalScore():
|
||||||
var dots = "................................................................"
|
var dots = "................................................................"
|
||||||
var text_congratulations = tr("CONGRATULATIONS") % [playername]
|
var text_congratulations = tr("CONGRATULATIONS") % [playername]
|
||||||
var text_shotsFired = tr("SHOTS FIRED") + " " + dots; label_array[0].get_child(2).text = str(shots_fired)
|
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)
|
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(shots_fired)
|
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(shots_fired)
|
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(shots_fired)
|
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(shots_fired)
|
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) + " $"
|
var text_totalcash = tr("TOTAL CASH") + " " + str(total_cash) + " $"
|
||||||
|
|
||||||
#if (endless_overwriting): text_shotsFired = "rounds beat ........ " + str(endless_roundsbeat)
|
#if (endless_overwriting): text_shotsFired = "rounds beat ........ " + str(endless_roundsbeat)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
extends Node
|
extends Node
|
||||||
|
|
||||||
var currentVersion_nr = "v1.9.906"
|
var currentVersion_nr = "v2.0.0"
|
||||||
var currentVersion_hotfix = 3
|
var currentVersion_hotfix = 2
|
||||||
var using_steam = true
|
var using_steam = true
|
||||||
|
|
||||||
var currentVersion = ""
|
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 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 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 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 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():
|
func _ready():
|
||||||
if using_steam: currentVersion = currentVersion_nr + versuffix_steam
|
if using_steam: currentVersion = currentVersion_nr + versuffix_steam
|
||||||
|
|
|
@ -205,6 +205,11 @@ func Start():
|
||||||
get_tree().change_scene_to_file("res://scenes/main.tscn")
|
get_tree().change_scene_to_file("res://scenes/main.tscn")
|
||||||
|
|
||||||
func StartMultiplayer():
|
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)
|
Buttons(false)
|
||||||
ResetButtons()
|
ResetButtons()
|
||||||
for screen in screens: screen.visible = false
|
for screen in screens: screen.visible = false
|
||||||
|
|
1
Steam.gd
1
Steam.gd
|
@ -22,6 +22,7 @@ func _ready():
|
||||||
ONLINE = Steam.loggedOn()
|
ONLINE = Steam.loggedOn()
|
||||||
STEAM_ID = Steam.getSteamID()
|
STEAM_ID = Steam.getSteamID()
|
||||||
STEAM_NAME = Steam.getPersonaName()
|
STEAM_NAME = Steam.getPersonaName()
|
||||||
|
if GlobalVariables.mp_debugging: STEAM_ID = 1234
|
||||||
print("online ... ", ONLINE, " ... steam id ... ", STEAM_ID, " ... steam name ... ", STEAM_NAME)
|
print("online ... ", ONLINE, " ... steam id ... ", STEAM_ID, " ... steam name ... ", STEAM_NAME)
|
||||||
|
|
||||||
func _process(_delta: float) -> void:
|
func _process(_delta: float) -> void:
|
||||||
|
|
|
@ -25,3 +25,12 @@ func LerpTimeScale():
|
||||||
c = ease(c, 0.4)
|
c = ease(c, 0.4)
|
||||||
var val = lerpf(from, to, c)
|
var val = lerpf(from, to, c)
|
||||||
Engine.time_scale = val
|
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
|
||||||
|
|
Loading…
Reference in New Issue