random-mirrors
/
buckshotroulette-decomp
mirror of https://github.com/thecatontheceiling/buckshotroulette-decomp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

testing branch update (v1.9.906)

This commit is contained in:
Lyssa 2024-10-30 13:15:32 +04:00 committed by GitHub
parent 16451e675c
commit 878292fe64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GlobalVariables.gd
View File

@ -1,13 +1,15 @@
extends Node extends Node
var currentVersion_nr = "v1.9.903" var currentVersion_nr = "v1.9.906"
var currentVersion_hotfix = 1 var currentVersion_hotfix = 3
var using_steam = true var using_steam = true
var currentVersion = "" var currentVersion = ""
var versuffix_steam = " (STEAM)" var versuffix_steam = " (STEAM)"
var versuffix_itch = " (ITCH.IO)" var versuffix_itch = " (ITCH.IO)"
var discord_link = "https://discord.gg/UdjMNaKkQe"
var using_gl = false var using_gl = false
var controllerEnabled = false var controllerEnabled = false
var music_enabled = true var music_enabled = true
@ -37,6 +39,8 @@ 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 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.
func _ready(): func _ready():
if using_steam: currentVersion = currentVersion_nr + versuffix_steam if using_steam: currentVersion = currentVersion_nr + versuffix_steam
@ -44,7 +48,8 @@ func _ready():
debug_round_index_to_end_game_at = 2 debug_round_index_to_end_game_at = 2
original_volume_linear_interaction = db_to_linear(AudioServer.get_bus_volume_db(3)) original_volume_linear_interaction = db_to_linear(AudioServer.get_bus_volume_db(3))
original_volume_linear_music = db_to_linear(AudioServer.get_bus_volume_db(1)) original_volume_linear_music = db_to_linear(AudioServer.get_bus_volume_db(1))
print("running version: ", currentVersion_nr, " with hotfix: ", str(currentVersion_hotfix)) version_to_check = currentVersion_nr + "." + str(currentVersion_hotfix)
print("running full version name: ", version_to_check)
func _unhandled_input(event): func _unhandled_input(event):
if GlobalVariables.mp_debugging: if GlobalVariables.mp_debugging:
@ -64,8 +69,9 @@ func _unhandled_input(event):
var language_array = ["EN", "EE", "RU", "ES LATAM", "ES", "FR", "IT", "JA", "KO", "PL", "PT", "DE", "TR", "UA", "ZHS", "ZHT"] var language_array = ["EN", "EE", "RU", "ES LATAM", "ES", "FR", "IT", "JA", "KO", "PL", "PT", "DE", "TR", "UA", "ZHS", "ZHT"]
var index = 0 var index = 0
func SwapLanguage(dir : bool): func SwapLanguage(dir : bool):
return
if dir: if dir:
if index == language_array.size() - 1: if index == language_array.size() - 1:
index = 0 index = 0
else: else:
index += 1 index += 1

4
MenuManager.gd
View File

@ -60,7 +60,6 @@ func _ready():
func _process(delta): func _process(delta):
T() T()
CheckCommandLine()
func CheckCommandLine(): func CheckCommandLine():
var arguments = OS.get_cmdline_args() var arguments = OS.get_cmdline_args()
@ -177,6 +176,7 @@ func Show(what : String):
func ReturnToLastScreen(): func ReturnToLastScreen():
print("return to last screen") print("return to last screen")
if currentScreen == "credits": anim_creds.play("RESET")
if (currentScreen) == "sub options": lastScreen = "main" if (currentScreen) == "sub options": lastScreen = "main"
if (currentScreen) == "rebind controls": lastScreen = "sub options" if (currentScreen) == "rebind controls": lastScreen = "sub options"
if (currentScreen == "audio video" or currentScreen == "language" or currentScreen == "controller" or currentScreen == "rebind controls"): optionmanager.SaveSettings() if (currentScreen == "audio video" or currentScreen == "language" or currentScreen == "controller" or currentScreen == "rebind controls"): optionmanager.SaveSettings()
@ -249,7 +249,7 @@ func ToggleMusic():
func ToggleColorblind(): func ToggleColorblind():
optionmanager.ToggleColorblind() optionmanager.ToggleColorblind()
func DiscordLink(): func DiscordLink():
OS.shell_open("https://discord.gg/UdjMNaKkQe") OS.shell_open(GlobalVariables.discord_link)
func RebindControls(): func RebindControls():
Show("rebind controls") Show("rebind controls")
ResetButtons() ResetButtons()

6
OptionsManager.gd
View File

@ -49,7 +49,6 @@ var setting_colorblind = false
var setting_music_enabled = true var setting_music_enabled = true
func _ready(): func _ready():
print("your version %s does not match this %s version" % [900, 400])
LoadSettings() LoadSettings()
if (!receivedFile): if (!receivedFile):
setting_windowed = defaultOption_windowed setting_windowed = defaultOption_windowed
@ -120,8 +119,9 @@ func AdjustSettings_music():
func ApplySettings_music(): func ApplySettings_music():
if (setting_music_enabled): anim_vinyl.speed_scale = 1 if (setting_music_enabled): anim_vinyl.speed_scale = 1
else: anim_vinyl.speed_scale = 0 else: anim_vinyl.speed_scale = 0
AudioServer.set_bus_mute(1, !setting_music_enabled) AudioServer.set_bus_mute(1, !setting_music_enabled) #music
AudioServer.set_bus_mute(2, !setting_music_enabled) AudioServer.set_bus_mute(2, !setting_music_enabled) #music secondary
AudioServer.set_bus_mute(4, !setting_music_enabled) #music resolve
AudioServer.get_property_list() AudioServer.get_property_list()
GlobalVariables.music_enabled = setting_music_enabled GlobalVariables.music_enabled = setting_music_enabled