Disabled shooting for runner
This commit is contained in:
parent
8399a4065c
commit
d2fbd03e4a
5 changed files with 75 additions and 70 deletions
|
@ -160,8 +160,11 @@ func _physics_process(delta):
|
||||||
if Input.is_action_just_pressed("shoot") and Global.roundInSession and menuScene.visible == false:
|
if Input.is_action_just_pressed("shoot") and Global.roundInSession and menuScene.visible == false:
|
||||||
if menuOpen == false:
|
if menuOpen == false:
|
||||||
if Global.multiplayerCurrent == true:
|
if Global.multiplayerCurrent == true:
|
||||||
rpc("shoot_bullet")
|
if Global.gamemode == "Runner" and Global.iAmSpecial:
|
||||||
shoot_bullet()
|
pass
|
||||||
|
else:
|
||||||
|
rpc("shoot_bullet")
|
||||||
|
shoot_bullet()
|
||||||
else:
|
else:
|
||||||
shoot_bullet()
|
shoot_bullet()
|
||||||
if Input.is_action_just_pressed("console"):
|
if Input.is_action_just_pressed("console"):
|
||||||
|
|
|
@ -143,72 +143,6 @@ rm -rf \"{temp_dir}\""
|
||||||
|
|
||||||
[preset.2]
|
[preset.2]
|
||||||
|
|
||||||
name="Windows Desktop"
|
|
||||||
platform="Windows Desktop"
|
|
||||||
runnable=true
|
|
||||||
dedicated_server=false
|
|
||||||
custom_features=""
|
|
||||||
export_filter="all_resources"
|
|
||||||
include_filter=""
|
|
||||||
exclude_filter=""
|
|
||||||
export_path="export/windows/teddy.exe"
|
|
||||||
encryption_include_filters=""
|
|
||||||
encryption_exclude_filters=""
|
|
||||||
encrypt_pck=false
|
|
||||||
encrypt_directory=false
|
|
||||||
script_encryption_key=""
|
|
||||||
|
|
||||||
[preset.2.options]
|
|
||||||
|
|
||||||
custom_template/debug=""
|
|
||||||
custom_template/release=""
|
|
||||||
debug/export_console_script=1
|
|
||||||
binary_format/embed_pck=false
|
|
||||||
texture_format/bptc=true
|
|
||||||
texture_format/s3tc=true
|
|
||||||
texture_format/etc=false
|
|
||||||
texture_format/etc2=false
|
|
||||||
binary_format/architecture="x86_64"
|
|
||||||
codesign/enable=false
|
|
||||||
codesign/identity_type=0
|
|
||||||
codesign/identity=""
|
|
||||||
codesign/password=""
|
|
||||||
codesign/timestamp=true
|
|
||||||
codesign/timestamp_server_url=""
|
|
||||||
codesign/digest_algorithm=1
|
|
||||||
codesign/description=""
|
|
||||||
codesign/custom_options=PackedStringArray()
|
|
||||||
application/modify_resources=true
|
|
||||||
application/icon=""
|
|
||||||
application/console_wrapper_icon=""
|
|
||||||
application/icon_interpolation=4
|
|
||||||
application/file_version=""
|
|
||||||
application/product_version=""
|
|
||||||
application/company_name=""
|
|
||||||
application/product_name=""
|
|
||||||
application/file_description=""
|
|
||||||
application/copyright=""
|
|
||||||
application/trademarks=""
|
|
||||||
ssh_remote_deploy/enabled=false
|
|
||||||
ssh_remote_deploy/host="user@host_ip"
|
|
||||||
ssh_remote_deploy/port="22"
|
|
||||||
ssh_remote_deploy/extra_args_ssh=""
|
|
||||||
ssh_remote_deploy/extra_args_scp=""
|
|
||||||
ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
|
|
||||||
$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
|
|
||||||
$trigger = New-ScheduledTaskTrigger -Once -At 00:00
|
|
||||||
$settings = New-ScheduledTaskSettingsSet
|
|
||||||
$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
|
|
||||||
Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
|
|
||||||
Start-ScheduledTask -TaskName godot_remote_debug
|
|
||||||
while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
|
|
||||||
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
|
|
||||||
ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
|
|
||||||
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
|
|
||||||
Remove-Item -Recurse -Force '{temp_dir}'"
|
|
||||||
|
|
||||||
[preset.3]
|
|
||||||
|
|
||||||
name="Android"
|
name="Android"
|
||||||
platform="Android"
|
platform="Android"
|
||||||
runnable=true
|
runnable=true
|
||||||
|
@ -224,7 +158,7 @@ encrypt_pck=false
|
||||||
encrypt_directory=false
|
encrypt_directory=false
|
||||||
script_encryption_key=""
|
script_encryption_key=""
|
||||||
|
|
||||||
[preset.3.options]
|
[preset.2.options]
|
||||||
|
|
||||||
custom_template/debug=""
|
custom_template/debug=""
|
||||||
custom_template/release=""
|
custom_template/release=""
|
||||||
|
@ -416,6 +350,72 @@ permissions/write_social_stream=false
|
||||||
permissions/write_sync_settings=false
|
permissions/write_sync_settings=false
|
||||||
permissions/write_user_dictionary=false
|
permissions/write_user_dictionary=false
|
||||||
|
|
||||||
|
[preset.3]
|
||||||
|
|
||||||
|
name="Windows Desktop"
|
||||||
|
platform="Windows Desktop"
|
||||||
|
runnable=true
|
||||||
|
dedicated_server=false
|
||||||
|
custom_features=""
|
||||||
|
export_filter="all_resources"
|
||||||
|
include_filter=""
|
||||||
|
exclude_filter=""
|
||||||
|
export_path="export/windows/teddy.exe"
|
||||||
|
encryption_include_filters=""
|
||||||
|
encryption_exclude_filters=""
|
||||||
|
encrypt_pck=false
|
||||||
|
encrypt_directory=false
|
||||||
|
script_encryption_key=""
|
||||||
|
|
||||||
|
[preset.3.options]
|
||||||
|
|
||||||
|
custom_template/debug=""
|
||||||
|
custom_template/release=""
|
||||||
|
debug/export_console_script=1
|
||||||
|
binary_format/embed_pck=false
|
||||||
|
texture_format/bptc=true
|
||||||
|
texture_format/s3tc=true
|
||||||
|
texture_format/etc=false
|
||||||
|
texture_format/etc2=false
|
||||||
|
binary_format/architecture="x86_64"
|
||||||
|
codesign/enable=false
|
||||||
|
codesign/identity_type=0
|
||||||
|
codesign/identity=""
|
||||||
|
codesign/password=""
|
||||||
|
codesign/timestamp=true
|
||||||
|
codesign/timestamp_server_url=""
|
||||||
|
codesign/digest_algorithm=1
|
||||||
|
codesign/description=""
|
||||||
|
codesign/custom_options=PackedStringArray()
|
||||||
|
application/modify_resources=true
|
||||||
|
application/icon=""
|
||||||
|
application/console_wrapper_icon=""
|
||||||
|
application/icon_interpolation=4
|
||||||
|
application/file_version=""
|
||||||
|
application/product_version=""
|
||||||
|
application/company_name=""
|
||||||
|
application/product_name=""
|
||||||
|
application/file_description=""
|
||||||
|
application/copyright=""
|
||||||
|
application/trademarks=""
|
||||||
|
ssh_remote_deploy/enabled=false
|
||||||
|
ssh_remote_deploy/host="user@host_ip"
|
||||||
|
ssh_remote_deploy/port="22"
|
||||||
|
ssh_remote_deploy/extra_args_ssh=""
|
||||||
|
ssh_remote_deploy/extra_args_scp=""
|
||||||
|
ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
|
||||||
|
$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
|
||||||
|
$trigger = New-ScheduledTaskTrigger -Once -At 00:00
|
||||||
|
$settings = New-ScheduledTaskSettingsSet
|
||||||
|
$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
|
||||||
|
Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
|
||||||
|
Start-ScheduledTask -TaskName godot_remote_debug
|
||||||
|
while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
|
||||||
|
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
|
||||||
|
ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
|
||||||
|
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
|
||||||
|
Remove-Item -Recurse -Force '{temp_dir}'"
|
||||||
|
|
||||||
[preset.4]
|
[preset.4]
|
||||||
|
|
||||||
name="Web"
|
name="Web"
|
||||||
|
|
|
@ -123,7 +123,7 @@ offset_left = 4.0
|
||||||
offset_top = 622.0
|
offset_top = 622.0
|
||||||
offset_right = 94.0
|
offset_right = 94.0
|
||||||
offset_bottom = 648.0
|
offset_bottom = 648.0
|
||||||
text = "Version: 20230512"
|
text = "Version: 20230515"
|
||||||
|
|
||||||
[node name="OurTimeIsNowSolo" type="Sprite2D" parent="."]
|
[node name="OurTimeIsNowSolo" type="Sprite2D" parent="."]
|
||||||
position = Vector2(123, 104)
|
position = Vector2(123, 104)
|
||||||
|
|
|
@ -258,6 +258,7 @@ func restart_round():
|
||||||
Global.specialDead = false
|
Global.specialDead = false
|
||||||
Global.iAmDeadAndInnocent = false
|
Global.iAmDeadAndInnocent = false
|
||||||
Global.roundInSession = true
|
Global.roundInSession = true
|
||||||
|
Global.multiplayerCurrent = true
|
||||||
|
|
||||||
### TUTORIAL STUFF ###
|
### TUTORIAL STUFF ###
|
||||||
|
|
||||||
|
|
|
@ -117,6 +117,7 @@ func reset_variables_hard():
|
||||||
AIHit = false
|
AIHit = false
|
||||||
iAmDeadAndInnocent = false
|
iAmDeadAndInnocent = false
|
||||||
addedMenuScene = false
|
addedMenuScene = false
|
||||||
|
playerDisable = false
|
||||||
|
|
||||||
func save_data():
|
func save_data():
|
||||||
SettingsFile.save_data()
|
SettingsFile.save_data()
|
||||||
|
|
Loading…
Reference in a new issue