diff --git a/LICENSE b/LICENSE index 68a49da..e515d0b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,7 @@ -This is free and unencumbered software released into the public domain. +Copyright (c) 2025 Harmony Honey Monroe -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/export/butler_push.bat b/export/butler_push.bat index 06a4995..3b10da0 100644 --- a/export/butler_push.bat +++ b/export/butler_push.bat @@ -1,6 +1,6 @@ -butler push win hhoneysoftware/rota:win -butler push linux hhoneysoftware/rota:linux -butler push mac hhoneysoftware/rota:mac -butler push web hhoneysoftware/rota:web -butler push android hhoneysoftware/rota:android +butler push win harmonymonroe/rota:win +butler push linux harmonymonroe/rota:linux +butler push mac harmonymonroe/rota:mac +butler push web harmonymonroe/rota:web +butler push android harmonymonroe/rota:android pause diff --git a/media/audio/music/ost5.mp3 b/media/audio/music/ost5.mp3 new file mode 100644 index 0000000..7cd9f1b Binary files /dev/null and b/media/audio/music/ost5.mp3 differ diff --git a/media/audio/music/ost5.mp3.import b/media/audio/music/ost5.mp3.import new file mode 100644 index 0000000..90ea2e4 --- /dev/null +++ b/media/audio/music/ost5.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/ost5.mp3-8a410e27a4dd1ce657a4b843180f824c.mp3str" + +[deps] + +source_file="res://media/audio/music/ost5.mp3" +dest_files=[ "res://.import/ost5.mp3-8a410e27a4dd1ce657a4b843180f824c.mp3str" ] + +[params] + +loop=false +loop_offset=0 diff --git a/media/audio/music/ost6.mp3 b/media/audio/music/ost6.mp3 new file mode 100644 index 0000000..c8638a8 Binary files /dev/null and b/media/audio/music/ost6.mp3 differ diff --git a/media/audio/music/ost6.mp3.import b/media/audio/music/ost6.mp3.import new file mode 100644 index 0000000..7e95ae6 --- /dev/null +++ b/media/audio/music/ost6.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/ost6.mp3-a69612ac29493fe5fcdc0b2994486269.mp3str" + +[deps] + +source_file="res://media/audio/music/ost6.mp3" +dest_files=[ "res://.import/ost6.mp3-a69612ac29493fe5fcdc0b2994486269.mp3str" ] + +[params] + +loop=false +loop_offset=0 diff --git a/project.godot b/project.godot index b4c1e42..2a1fec4 100644 --- a/project.godot +++ b/project.godot @@ -152,8 +152,8 @@ _global_script_class_icons={ [application] -config/name="ROTA" -config/description="ROTA by Harmony Honey Monroe +config/name="ROTA: Bend Gravity" +config/description="ROTA: Bend Gravity by Harmony Monroe harmonymonroe.com" run/main_scene="res://src/menu/Splash.tscn" config/use_custom_user_dir=true @@ -185,7 +185,6 @@ Steam="*res://addons/steam_api/steam.gd" window/size/width=1280 window/size/height=720 -window/size/fullscreen=true window/size/test_width=1920 window/size/test_height=1080 window/stretch/mode="2d" diff --git a/src/actor/Player.gd b/src/actor/Player.gd index 20e1649..064002e 100644 --- a/src/actor/Player.gd +++ b/src/actor/Player.gd @@ -522,6 +522,23 @@ func physics_frame(): func _process(delta): if Engine.editor_hint: return + # squash squish and stretch + sprites.scale = squish_from.linear_interpolate(Vector2.ONE, squish_ease.count(delta)) + + # blink anim + if blink_clock < blink_time: + blink_clock += delta + else: + var be = blink_ease.count(delta) + spr_eyes.scale.y = lerp(1.0, 0.1, be) + if be == 1.0: + blink_ease.show = false + elif be == 0.0: + blink_ease.show = true + blink_clock = 0.0 + blink_time = rand_range(blink_range.x, blink_range.y) + + # death animation if is_dead: sprites.position += rot(velocity) * delta sprites.rotate(deg2rad(240) * -dir_x * delta) @@ -529,12 +546,13 @@ func _process(delta): if dead_clock < dead_time: dead_clock += delta - if dead_clock > dead_time: + if dead_clock >= dead_time: Cutscene.is_playing = false Shared.reset() return + # grow and shrink in and out of scene if spr_easy.is_less or !spr_easy.show: var sec = spr_easy.count(delta, spr_easy.show and !Wipe.is_intro) var dp = to_local(door_exit.global_position) if is_instance_valid(door_exit) else rot(Vector2(0, -25)) @@ -603,22 +621,6 @@ func _process(delta): var r = lerp_angle(turn_from, turn_to, s) sprites.rotation = r emit_signal("turn_angle", r) - - # squash squish and stretch - sprites.scale = squish_from.linear_interpolate(Vector2.ONE, squish_ease.count(delta)) - - # blink anim - if blink_clock < blink_time: - blink_clock += delta - else: - var be = blink_ease.count(delta) - spr_eyes.scale.y = lerp(1.0, 0.1, be) - if be == 1.0: - blink_ease.show = false - elif be == 0.0: - blink_ease.show = true - blink_clock = 0.0 - blink_time = rand_range(blink_range.x, blink_range.y) ### Set Get diff --git a/src/autoload/Audio.tscn b/src/autoload/Audio.tscn index c8572ed..4629bff 100644 --- a/src/autoload/Audio.tscn +++ b/src/autoload/Audio.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=2] +[gd_scene load_steps=37 format=2] [ext_resource path="res://src/autoload/Audio.gd" type="Script" id=1] [ext_resource path="res://media/audio/sfx/coin1.wav" type="AudioStream" id=2] @@ -34,11 +34,14 @@ [ext_resource path="res://media/audio/sfx/zap0.wav" type="AudioStream" id=32] [ext_resource path="res://media/audio/music/arcade2.mp3" type="AudioStream" id=33] [ext_resource path="res://media/audio/sfx/oneup1.wav" type="AudioStream" id=34] +[ext_resource path="res://media/audio/music/ost6.mp3" type="AudioStream" id=35] +[ext_resource path="res://media/audio/music/ost5.mp3" type="AudioStream" id=36] [node name="Audio" type="Node"] pause_mode = 2 script = ExtResource( 1 ) -ost = [ ExtResource( 21 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 23 ) ] +ost = [ ExtResource( 21 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 36 ), ExtResource( 35 ) ] +wait_range = Vector2( 2, 5 ) [node name="Music" type="Node" parent="."] diff --git a/src/autoload/touch_screen.gd b/src/autoload/touch_screen.gd index c9a52d6..630ac64 100644 --- a/src/autoload/touch_screen.gd +++ b/src/autoload/touch_screen.gd @@ -22,6 +22,12 @@ func _ready(): yield(Shared, "scene_changed") visible = Shared.is_touch or ((OS.has_touchscreen_ui_hint() and OS.get_name() == "HTML5") or OS.get_name() == "Android") +func _input(event): + if event is InputEventScreenTouch or event is InputEventScreenDrag: + visible = true + elif event is InputEventKey or event is InputEventJoypadButton or event is InputEventJoypadMotion: + visible = Shared.is_touch + func show_keys(arg_arrows := true, arg_c := true, arg_x := true, arg_pause := false, arg_passby := false): right.visible = arg_arrows keys[0].visible = arg_c @@ -29,10 +35,6 @@ func show_keys(arg_arrows := true, arg_c := true, arg_x := true, arg_pause := fa top.visible = arg_pause func set_game(arg := false): - var i = "" if arg else "ui_" - set_actions(i + "up", i + "down", i + "left", i + "right") - buttons[0].action = "grab" if arg else "ui_cancel" - buttons[1].action = "jump" if arg else "ui_accept" for h in game_hide: h.visible = !arg @@ -49,11 +51,6 @@ func set_game(arg := false): for f in buttons: f.passby_press = arg -func set_actions(_up, _down, _left, _right): - for i in 4: - btns[i].action = [_right, _down, _left, _up][i] - btns[i].passby_press = !("ui_" in _up) - func margin(x := 20, y := 20): control.margin_left = x control.margin_right = -x diff --git a/src/autoload/touch_screen.tscn b/src/autoload/touch_screen.tscn index f4e405e..7a1c1b5 100644 --- a/src/autoload/touch_screen.tscn +++ b/src/autoload/touch_screen.tscn @@ -82,6 +82,7 @@ margin_bottom = 150.0 [node name="0" type="TouchScreenButton" parent="Control/HBoxLeft/DPad/Buttons"] shape = SubResource( 13 ) shape_centered = false +passby_press = true action = "ui_right" script = ExtResource( 3 ) radius = 500.0 @@ -90,6 +91,7 @@ poly_path = NodePath("Polygon2D") poly_radius = 140.0 poly_points = 7 poly_deadzone = 10.0 +secondary_action = "right" [node name="Polygon2D" type="Polygon2D" parent="Control/HBoxLeft/DPad/Buttons/0"] modulate = Color( 1, 1, 1, 0.5 ) @@ -102,6 +104,7 @@ idle_color = Color( 1, 1, 1, 0.501961 ) [node name="1" type="TouchScreenButton" parent="Control/HBoxLeft/DPad/Buttons"] shape = SubResource( 14 ) shape_centered = false +passby_press = true action = "ui_down" script = ExtResource( 3 ) angle = 90.0 @@ -111,6 +114,7 @@ poly_path = NodePath("Polygon2D") poly_radius = 140.0 poly_points = 7 poly_deadzone = 10.0 +secondary_action = "down" [node name="Polygon2D" type="Polygon2D" parent="Control/HBoxLeft/DPad/Buttons/1"] modulate = Color( 1, 1, 1, 0.5 ) @@ -123,6 +127,7 @@ idle_color = Color( 1, 1, 1, 0.501961 ) [node name="2" type="TouchScreenButton" parent="Control/HBoxLeft/DPad/Buttons"] shape = SubResource( 15 ) shape_centered = false +passby_press = true action = "ui_left" script = ExtResource( 3 ) angle = 180.0 @@ -132,6 +137,7 @@ poly_path = NodePath("Polygon2D") poly_radius = 140.0 poly_points = 7 poly_deadzone = 10.0 +secondary_action = "left" [node name="Polygon2D" type="Polygon2D" parent="Control/HBoxLeft/DPad/Buttons/2"] modulate = Color( 1, 1, 1, 0.5 ) @@ -144,6 +150,7 @@ idle_color = Color( 1, 1, 1, 0.501961 ) [node name="3" type="TouchScreenButton" parent="Control/HBoxLeft/DPad/Buttons"] shape = SubResource( 16 ) shape_centered = false +passby_press = true action = "ui_up" script = ExtResource( 3 ) angle = 270.0 @@ -153,6 +160,7 @@ poly_path = NodePath("Polygon2D") poly_radius = 140.0 poly_points = 7 poly_deadzone = 10.0 +secondary_action = "up" [node name="Polygon2D" type="Polygon2D" parent="Control/HBoxLeft/DPad/Buttons/3"] modulate = Color( 1, 1, 1, 0.5 ) @@ -187,6 +195,7 @@ physics_interpolation_mode = 1 modulate = Color( 1, 1, 1, 0.156863 ) shape = SubResource( 3 ) shape_centered = false +passby_press = true action = "ui_cancel" visibility_mode = 1 script = ExtResource( 4 ) @@ -195,6 +204,7 @@ __meta__ = { } color_path = NodePath("../Poly") idle_color = Color( 1, 1, 1, 0.156863 ) +secondary_action = "grab" [node name="Poly" type="Polygon2D" parent="Control/HBoxRight/C/Control"] modulate = Color( 1, 1, 1, 0.156863 ) @@ -238,6 +248,7 @@ margin_bottom = 75.0 modulate = Color( 1, 1, 1, 0.156863 ) shape = SubResource( 4 ) shape_centered = false +passby_press = true action = "ui_accept" visibility_mode = 1 script = ExtResource( 4 ) @@ -246,6 +257,7 @@ __meta__ = { } color_path = NodePath("../Poly") idle_color = Color( 1, 1, 1, 0.156863 ) +secondary_action = "jump" [node name="Poly" type="Polygon2D" parent="Control/HBoxRight/X/Control"] modulate = Color( 1, 1, 1, 0.156863 ) @@ -295,6 +307,7 @@ physics_interpolation_mode = 1 modulate = Color( 1, 1, 1, 0.156863 ) shape = SubResource( 3 ) shape_centered = false +passby_press = true action = "zoom" visibility_mode = 1 script = ExtResource( 4 ) @@ -345,6 +358,7 @@ margin_bottom = 75.0 modulate = Color( 1, 1, 1, 0.156863 ) shape = SubResource( 5 ) shape_centered = false +passby_press = true action = "ui_pause" visibility_mode = 1 script = ExtResource( 4 ) diff --git a/src/map/worlds/1/6.tscn b/src/map/worlds/1/6.tscn index d7befc7..a7dcb3c 100644 --- a/src/map/worlds/1/6.tscn +++ b/src/map/worlds/1/6.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://src/detail/Rocks.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/door/DoorLittle.tscn" type="PackedScene" id=2] @@ -14,6 +14,7 @@ [ext_resource path="res://src/detail/Candle.tscn" type="PackedScene" id=12] [ext_resource path="res://src/detail/Bench.tscn" type="PackedScene" id=13] [ext_resource path="res://src/detail/Lamppost.tscn" type="PackedScene" id=14] +[ext_resource path="res://src/detail/SignZoom.tscn" type="PackedScene" id=15] [node name="Node2D" type="Node2D"] @@ -139,3 +140,7 @@ rotation = -3.14159 [node name="Lamppost" parent="Details" instance=ExtResource( 14 )] position = Vector2( 1000, 400 ) rotation = 1.57079 + +[node name="SignZoom" parent="Details" instance=ExtResource( 15 )] +position = Vector2( 110, 590 ) +rotation = -2.26893 diff --git a/src/menu/MenuTitle.tscn b/src/menu/MenuTitle.tscn index 166ea04..4c40b3a 100644 --- a/src/menu/MenuTitle.tscn +++ b/src/menu/MenuTitle.tscn @@ -613,7 +613,7 @@ margin_bottom = -15.0 size_flags_horizontal = 4 size_flags_vertical = 5 custom_fonts/font = ExtResource( 21 ) -text = "Patch 7" +text = "2025.08.18" align = 1 valign = 2 @@ -627,9 +627,9 @@ custom_constants/separation = 0 alignment = 1 [node name="Prefix" type="Label" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 24.0 +margin_top = 14.0 margin_right = 512.0 -margin_bottom = 55.0 +margin_bottom = 45.0 custom_fonts/font = SubResource( 6 ) text = " a game by" valign = 1 @@ -653,9 +653,9 @@ __meta__ = { } [node name="Control" type="Control" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 55.0 +margin_top = 45.0 margin_right = 512.0 -margin_bottom = 205.0 +margin_bottom = 195.0 rect_min_size = Vector2( 0, 150 ) [node name="TextureRect" type="TextureRect" parent="Canvas/CenterContainer/Control/Credits/List/Control"] @@ -667,24 +667,24 @@ expand = true stretch_mode = 6 [node name="Suffix" type="Label" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 205.0 +margin_top = 195.0 margin_right = 512.0 -margin_bottom = 236.0 +margin_bottom = 226.0 custom_fonts/font = SubResource( 6 ) text = "harmonymonroe.com " align = 2 valign = 1 [node name="Spacer" type="Control" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 236.0 +margin_top = 226.0 margin_right = 512.0 -margin_bottom = 256.0 -rect_min_size = Vector2( 0, 20 ) +margin_bottom = 244.0 +rect_min_size = Vector2( 0, 18 ) [node name="Prefix2" type="Label" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 256.0 +margin_top = 244.0 margin_right = 512.0 -margin_bottom = 287.0 +margin_bottom = 275.0 custom_fonts/font = SubResource( 6 ) text = " made with" valign = 1 @@ -693,9 +693,9 @@ __meta__ = { } [node name="TextureRect2" type="TextureRect" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 287.0 +margin_top = 275.0 margin_right = 512.0 -margin_bottom = 437.0 +margin_bottom = 425.0 rect_min_size = Vector2( 0, 150 ) texture = ExtResource( 23 ) expand = true @@ -717,24 +717,24 @@ __meta__ = { } [node name="Suffix2" type="Label" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 437.0 +margin_top = 425.0 margin_right = 512.0 -margin_bottom = 468.0 +margin_bottom = 456.0 custom_fonts/font = SubResource( 6 ) text = "godotengine.org " align = 2 valign = 1 [node name="Spacer2" type="Control" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 468.0 +margin_top = 456.0 margin_right = 512.0 -margin_bottom = 498.0 -rect_min_size = Vector2( 0, 30 ) +margin_bottom = 474.0 +rect_min_size = Vector2( 0, 18 ) [node name="HBoxContainer" type="HBoxContainer" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 498.0 +margin_top = 474.0 margin_right = 512.0 -margin_bottom = 548.0 +margin_bottom = 524.0 custom_constants/separation = 10 alignment = 1 @@ -771,29 +771,29 @@ texture = ExtResource( 27 ) expand = true [node name="Spacer3" type="Control" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 548.0 +margin_top = 524.0 margin_right = 512.0 -margin_bottom = 558.0 +margin_bottom = 534.0 rect_min_size = Vector2( 0, 10 ) [node name="HFlowContainer" type="HFlowContainer" parent="Canvas/CenterContainer/Control/Credits/List"] -margin_top = 558.0 +margin_top = 534.0 margin_right = 512.0 -margin_bottom = 659.0 +margin_bottom = 670.0 [node name="Label4" type="Label" parent="Canvas/CenterContainer/Control/Credits/List/HFlowContainer"] -margin_left = 23.0 -margin_right = 271.0 +margin_left = 18.0 +margin_right = 284.0 margin_bottom = 31.0 size_flags_horizontal = 6 custom_fonts/font = SubResource( 6 ) -text = "Harmony Honey" +text = "Harmony Monroe" align = 1 valign = 1 [node name="Label8" type="Label" parent="Canvas/CenterContainer/Control/Credits/List/HFlowContainer"] -margin_left = 321.0 -margin_right = 489.0 +margin_left = 325.0 +margin_right = 493.0 margin_bottom = 31.0 size_flags_horizontal = 6 custom_fonts/font = SubResource( 6 ) @@ -845,6 +845,28 @@ text = "Cassidy Blaede" align = 1 valign = 1 +[node name="Label10" type="Label" parent="Canvas/CenterContainer/Control/Credits/List/HFlowContainer"] +margin_left = 22.0 +margin_top = 105.0 +margin_right = 245.0 +margin_bottom = 136.0 +size_flags_horizontal = 6 +custom_fonts/font = SubResource( 6 ) +text = "Will Thompson" +align = 1 +valign = 1 + +[node name="Label11" type="Label" parent="Canvas/CenterContainer/Control/Credits/List/HFlowContainer"] +margin_left = 294.0 +margin_top = 105.0 +margin_right = 489.0 +margin_bottom = 136.0 +size_flags_horizontal = 6 +custom_fonts/font = SubResource( 6 ) +text = "Micah Ilbery" +align = 1 +valign = 1 + [node name="Back" type="ColorRect" parent="Canvas/CenterContainer/Control"] visible = false anchor_right = 1.0 diff --git a/src/menu/button_modulate.gd b/src/menu/button_modulate.gd index 44c7161..40726ca 100644 --- a/src/menu/button_modulate.gd +++ b/src/menu/button_modulate.gd @@ -8,11 +8,12 @@ onready var color_node : CanvasItem = get_node_or_null(color_path) export var press_color := Color(1,0,1, 1.0) export var idle_color := Color(1,1,1, 0.5) +export var secondary_action := "" func _ready(): if is_instance_valid(button): - button.connect("pressed", self, "interact") - button.connect("released", self, "interact") + button.connect("pressed", self, "press") + button.connect("released", self, "release") if is_instance_valid(color_node): color_node.modulate = idle_color @@ -20,3 +21,13 @@ func _ready(): func interact(): if is_instance_valid(button) and is_instance_valid(color_node): color_node.modulate = press_color if button.is_pressed() else idle_color + +func press(): + interact() + if secondary_action != "": + Input.action_press(secondary_action) + +func release(): + interact() + if secondary_action != "": + Input.action_release(secondary_action) diff --git a/src/menu/options/MenuOptions.gd b/src/menu/options/MenuOptions.gd index e35bf9b..e0492fd 100644 --- a/src/menu/options/MenuOptions.gd +++ b/src/menu/options/MenuOptions.gd @@ -12,8 +12,6 @@ func fill_items(): i.visible = Shared.light_enabled > 0 if i.is_in_group("shadow") and i.visible: i.visible = Shared.shadow_enabled > 0 - if i.is_in_group("touch"): - i.visible = TouchScreen.visible .fill_items() diff --git a/src/menu/options/MenuOptions.tscn b/src/menu/options/MenuOptions.tscn index 802e65d..a60f1fd 100644 --- a/src/menu/options/MenuOptions.tscn +++ b/src/menu/options/MenuOptions.tscn @@ -256,6 +256,7 @@ script = ExtResource( 24 ) __meta__ = { "_edit_use_anchors_": false } +list = PoolStringArray( "TOGGLE", "ALWAYS" ) is_refill = true var_name = "is_touch" @@ -274,11 +275,11 @@ anchor_bottom = 1.0 margin_left = 25.0 size_flags_vertical = 6 custom_fonts/font = ExtResource( 2 ) -text = "< OFF >" +text = "< TOGGLE >" align = 2 valign = 1 -[node name="X" type="Control" parent="Control/Menu/List" groups=["touch"]] +[node name="X" type="Control" parent="Control/Menu/List"] margin_top = 510.0 margin_right = 640.0 margin_bottom = 580.0 @@ -311,7 +312,7 @@ text = "< 2 >" align = 2 valign = 1 -[node name="Y" type="Control" parent="Control/Menu/List" groups=["touch"]] +[node name="Y" type="Control" parent="Control/Menu/List"] margin_top = 580.0 margin_right = 640.0 margin_bottom = 650.0 diff --git a/src/menu/round_button.gd b/src/menu/round_button.gd index 0aa7cbf..d379992 100644 --- a/src/menu/round_button.gd +++ b/src/menu/round_button.gd @@ -15,6 +15,8 @@ export var poly_points := 5 setget set_poly_points export var poly_deadzone := 3.0 setget set_poly_deadzone export var poly_dead_points := 5 setget set_poly_dead_points +export var secondary_action := "" + func set_radius(arg := radius): radius = arg act() @@ -58,6 +60,16 @@ func set_poly_dead_points(arg := poly_dead_points): func _ready(): act() poly_act() + connect("pressed", self, "press") + connect("released", self, "release") + +func press(): + if secondary_action != "": + Input.action_press(secondary_action) + +func release(): + if secondary_action != "": + Input.action_release(secondary_action) func act(): shape = ConvexPolygonShape2D.new()