From 8803c46a965b6bfca5f2e701903f2feed361b633 Mon Sep 17 00:00:00 2001 From: DIvan2000 Date: Mon, 9 Dec 2024 13:23:34 +0400 Subject: [PATCH] Finally_jam_version --- UI/construct.gd | 3 + UI/control.tscn | 32 ++++++++++ export_presets.cfg | 146 +++++++++++++++++++++++++++++++++++++++++++++ project.godot | 22 ++++++- world/world.gd | 5 ++ 5 files changed, 205 insertions(+), 3 deletions(-) create mode 100644 UI/construct.gd create mode 100644 UI/control.tscn diff --git a/UI/construct.gd b/UI/construct.gd new file mode 100644 index 0000000..85a5095 --- /dev/null +++ b/UI/construct.gd @@ -0,0 +1,3 @@ +extends Button + +# Called when the node enters the diff --git a/UI/control.tscn b/UI/control.tscn new file mode 100644 index 0000000..1e8913f --- /dev/null +++ b/UI/control.tscn @@ -0,0 +1,32 @@ +[gd_scene load_steps=2 format=3 uid="uid://ceju5kxboqm1r"] + +[ext_resource type="Script" path="res://UI/construct.gd" id="1_g0ew0"] + +[node name="Control" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Construct" type="Button" parent="."] +layout_mode = 0 +offset_right = 8.0 +offset_bottom = 8.0 +text = "Конструкция" +script = ExtResource("1_g0ew0") + +[node name="Destroy" type="Button" parent="."] +layout_mode = 0 +offset_top = 40.0 +offset_right = 92.0 +offset_bottom = 71.0 +text = "Демонтаж" + +[node name="Road" type="Button" parent="."] +layout_mode = 0 +offset_top = 80.0 +offset_right = 66.0 +offset_bottom = 111.0 +text = "Дорога" diff --git a/export_presets.cfg b/export_presets.cfg index e69de29..b083900 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -0,0 +1,146 @@ +[preset.0] + +name="Windows Desktop" +platform="Windows Desktop" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../export/windows/game.exe" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.0.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=0 +binary_format/embed_pck=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="x86_64" +codesign/enable=false +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PackedStringArray() +application/modify_resources=false +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="" +application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true +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.1] + +name="Web" +platform="Web" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../export/web/game.html" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +variant/extensions_support=false +variant/thread_support=false +vram_texture_compression/for_desktop=true +vram_texture_compression/for_mobile=false +html/export_icon=true +html/custom_html_shell="" +html/head_include="" +html/canvas_resize_policy=2 +html/focus_canvas_on_start=true +html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/ensure_cross_origin_isolation_headers=true +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color(0, 0, 0, 1) + +[preset.2] + +name="Linux" +platform="Linux" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../export/linux/game.x86_64" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.2.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="x86_64" +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="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" diff --git a/project.godot b/project.godot index 888fb19..e8b083b 100644 --- a/project.godot +++ b/project.godot @@ -17,10 +17,11 @@ config/icon="res://assets/icon.svg" [display] -window/size/viewport_width=1024 -window/size/viewport_height=1024 +window/size/viewport_width=640 +window/size/viewport_height=480 +window/size/mode=2 window/stretch/mode="canvas_items" -window/stretch/aspect="keep_width" +window/stretch/aspect="keep_height" [dotnet] @@ -57,6 +58,21 @@ zoom_out={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":45,"unicode":45,"location":0,"echo":false,"script":null) ] } +1={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"location":0,"echo":false,"script":null) +] +} +2={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"location":0,"echo":false,"script":null) +] +} +3={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null) +] +} [rendering] diff --git a/world/world.gd b/world/world.gd index 969aa23..d9cb852 100644 --- a/world/world.gd +++ b/world/world.gd @@ -116,3 +116,8 @@ func _process(delta: float) -> void: $Camera2D.zoom+=Vector2.ONE*0.25 if Input.is_action_just_pressed("zoom_out"): $Camera2D.zoom-=Vector2.ONE*0.25 + if Input.is_action_just_pressed("1"): change_instrument(instruments.CONSTRUCT) + if Input.is_action_just_pressed("2"): change_instrument(instruments.DESTROY) + if Input.is_action_just_pressed("3"): change_instrument(instruments.BUILD_ROAD) + +