mobile feedback menu

Redux-Team · Apr 9, 2022 · d2695a5 · d2695a5
1 parent fa2cb1c
commit d2695a5
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 60 deletions.
diff --git a/gui/gui.tscn b/gui/gui.tscn
@@ -326,14 +326,14 @@ shader_param/outline_color = Color( 1, 1, 1, 1 )
 
 [sub_resource type="SpriteFrames" id=9]
 animations = [ {
-"frames": [ ExtResource( 51 ) ],
+"frames": [ ExtResource( 38 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 38 ) ],
+"frames": [ ExtResource( 51 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
@@ -346,14 +346,14 @@ shader_param/outline_color = Color( 1, 1, 1, 1 )
 
 [sub_resource type="SpriteFrames" id=11]
 animations = [ {
-"frames": [ ExtResource( 49 ) ],
+"frames": [ ExtResource( 73 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 73 ) ],
+"frames": [ ExtResource( 49 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
@@ -366,14 +366,14 @@ shader_param/outline_color = Color( 1, 1, 1, 1 )
 
 [sub_resource type="SpriteFrames" id=13]
 animations = [ {
-"frames": [ ExtResource( 41 ) ],
+"frames": [ ExtResource( 72 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 72 ) ],
+"frames": [ ExtResource( 41 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
@@ -386,14 +386,14 @@ shader_param/outline_color = Color( 1, 1, 1, 1 )
 
 [sub_resource type="SpriteFrames" id=15]
 animations = [ {
-"frames": [ ExtResource( 86 ) ],
+"frames": [ ExtResource( 54 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 54 ) ],
+"frames": [ ExtResource( 86 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
@@ -406,14 +406,14 @@ shader_param/outline_color = Color( 1, 1, 1, 1 )
 
 [sub_resource type="SpriteFrames" id=17]
 animations = [ {
-"frames": [ ExtResource( 87 ) ],
+"frames": [ ExtResource( 84 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 84 ) ],
+"frames": [ ExtResource( 87 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
@@ -426,14 +426,14 @@ shader_param/outline_color = Color( 1, 1, 1, 1 )
 
 [sub_resource type="SpriteFrames" id=19]
 animations = [ {
-"frames": [ ExtResource( 97 ) ],
+"frames": [ ExtResource( 37 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 37 ) ],
+"frames": [ ExtResource( 97 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
@@ -446,92 +446,92 @@ shader_param/outline_color = Color( 1, 1, 1, 1 )
 
 [sub_resource type="SpriteFrames" id=21]
 animations = [ {
-"frames": [ ExtResource( 58 ) ],
+"frames": [ ExtResource( 69 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 69 ) ],
+"frames": [ ExtResource( 58 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
 [sub_resource type="SpriteFrames" id=22]
 animations = [ {
-"frames": [ ExtResource( 90 ) ],
+"frames": [ ExtResource( 92 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 92 ) ],
+"frames": [ ExtResource( 90 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
 [sub_resource type="SpriteFrames" id=23]
 animations = [ {
-"frames": [ ExtResource( 100 ) ],
+"frames": [ ExtResource( 91 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 91 ) ],
+"frames": [ ExtResource( 100 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
 [sub_resource type="SpriteFrames" id=24]
 animations = [ {
-"frames": [ ExtResource( 90 ) ],
+"frames": [ ExtResource( 92 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 92 ) ],
+"frames": [ ExtResource( 90 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
 [sub_resource type="SpriteFrames" id=25]
 animations = [ {
-"frames": [ ExtResource( 47 ) ],
+"frames": [ ExtResource( 11 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 11 ) ],
+"frames": [ ExtResource( 47 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
 [sub_resource type="SpriteFrames" id=26]
 animations = [ {
-"frames": [ ExtResource( 55 ) ],
+"frames": [ ExtResource( 12 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 12 ) ],
+"frames": [ ExtResource( 55 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 
 [sub_resource type="SpriteFrames" id=27]
 animations = [ {
-"frames": [ ExtResource( 45 ) ],
+"frames": [ ExtResource( 13 ) ],
 "loop": true,
-"name": "off",
+"name": "on",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 13 ) ],
+"frames": [ ExtResource( 45 ) ],
 "loop": true,
-"name": "on",
+"name": "off",
 "speed": 5.0
 } ]
 

diff --git a/src/global/cancel.gd b/src/global/cancel.gd
@@ -0,0 +1,16 @@
+extends Control
+
+
+func _ready():
+	var scalar = max(floor(OS.window_size.x / Singleton.DEFAULT_SIZE.x), 1)
+	rect_scale = Vector2.ONE * scalar
+	margin_left = 80 * scalar
+	visible = false
+
+
+func _process(_delta):
+	visible = $"../FeedbackControl".visible && OS.get_name() == "Android"
+
+
+func _on_Cancel_pressed():
+	visible = false
diff --git a/src/global/feedback.gd b/src/global/feedback.gd
@@ -3,8 +3,8 @@ extends Control
 var req = HTTPRequest.new()
 
 func _ready():
-	add_child(req)
 	visible = false
+	add_child(req)
 
 func _process(_delta):
 	rect_pivot_offset = Vector2(OS.window_size.x / 2, 0)
@@ -112,3 +112,9 @@ func reset_data():
 		check.pressed = false
 	for mood in $Traffic.get_children():
 		mood.pressed = false
+
+
+func _on_Cancel_pressed():
+	visible = false
+	get_tree().paused = Singleton.pause_menu
+	Singleton.feedback = false
diff --git a/src/global/feedback.tscn b/src/global/feedback.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=2]
+[gd_scene load_steps=33 format=2]
 
 [ext_resource path="res://gui/dialog/sign_box.tres" type="StyleBox" id=1]
 [ext_resource path="res://fonts/bylight/bylightv2.tres" type="DynamicFont" id=2]
@@ -9,6 +9,8 @@
 [ext_resource path="res://gui/dialog/nx_luigi_box.tres" type="StyleBox" id=7]
 [ext_resource path="res://gui/dialog/nx_wario_box.tres" type="StyleBox" id=8]
 [ext_resource path="res://src/global/feedback.gd" type="Script" id=9]
+[ext_resource path="res://src/global/cancel.gd" type="Script" id=10]
+[ext_resource path="res://gui/hud/buttons/mobile_buttons.png" type="Texture" id=11]
 
 [sub_resource type="StyleBoxEmpty" id=15]
 
@@ -54,6 +56,14 @@ region = Rect2( 26, 0, 26, 29 )
 atlas = ExtResource( 4 )
 region = Rect2( 52, 0, 26, 29 )
 
+[sub_resource type="AtlasTexture" id=20]
+atlas = ExtResource( 11 )
+region = Rect2( 20, 21, 20, 21 )
+
+[sub_resource type="AtlasTexture" id=21]
+atlas = ExtResource( 11 )
+region = Rect2( 20, 42, 20, 21 )
+
 [node name="Feedback" type="CanvasLayer"]
 layer = 2
 
@@ -64,9 +74,6 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 mouse_filter = 2
 script = ExtResource( 9 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="ColorRect" type="ColorRect" parent="FeedbackControl"]
 anchor_right = 1.0
@@ -344,7 +351,23 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="Cancel" type="Control" parent="."]
+pause_mode = 2
+margin_left = 80.0
+margin_right = 80.0
+mouse_filter = 2
+script = ExtResource( 10 )
+
+[node name="Cancel" type="TouchScreenButton" parent="Cancel"]
+pause_mode = 2
+modulate = Color( 1, 1, 1, 0.501961 )
+scale = Vector2( 2, 2 )
+normal = SubResource( 20 )
+pressed = SubResource( 21 )
+
 [connection signal="pressed" from="FeedbackControl/Submit" to="FeedbackControl" method="_on_Submit_pressed"]
+[connection signal="pressed" from="Cancel/Cancel" to="FeedbackControl" method="_on_Cancel_pressed"]
+[connection signal="pressed" from="Cancel/Cancel" to="Cancel" method="_on_Cancel_pressed"]
 
 [editable path="FeedbackControl/Checkboxes/Gameplay"]
 [editable path="FeedbackControl/Checkboxes/Visual"]

diff --git a/src/global/mobile_controls.gd b/src/global/mobile_controls.gd
@@ -9,6 +9,8 @@ func _ready():
 	var button_scale = min(floor(OS.window_size.x / (120 * scale)), floor(OS.window_size.y / (42 * scale)))
 	$MobileArrows.rect_scale = Vector2.ONE * scale * button_scale
 	$MobileAction.rect_scale = Vector2.ONE * scale * button_scale
+	$Feedback.rect_scale = Vector2.ONE * scale
+	$Feedback.margin_left = 80 * scale
 
 
 func _on_Left_pressed():

diff --git a/src/global/singleton.tscn b/src/global/singleton.tscn
@@ -154,9 +154,6 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 mouse_filter = 2
 script = ExtResource( 9 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="MobileArrows" type="Control" parent="MobileControls"]
 anchor_left = 1.0
@@ -232,6 +229,16 @@ position = Vector2( 20, -42 )
 normal = SubResource( 1 )
 pressed = SubResource( 2 )
 
+[node name="Feedback" type="Control" parent="MobileControls"]
+margin_left = 80.0
+
+[node name="Feedback" type="TouchScreenButton" parent="MobileControls/Feedback"]
+modulate = Color( 1, 1, 1, 0.501961 )
+scale = Vector2( 2, 2 )
+normal = SubResource( 17 )
+pressed = SubResource( 18 )
+action = "feedback"
+
 [node name="SFX" type="Node" parent="."]
 
 [node name="Coin" type="AudioStreamPlayer" parent="SFX"]
@@ -294,3 +301,5 @@ script = ExtResource( 20 )
 [connection signal="released" from="MobileControls/MobileAction/Shift" to="MobileControls" method="_on_Shift_released"]
 [connection signal="pressed" from="MobileControls/MobileAction/P" to="MobileControls" method="_on_P_pressed"]
 [connection signal="released" from="MobileControls/MobileAction/P" to="MobileControls" method="_on_P_released"]
+[connection signal="pressed" from="MobileControls/Feedback/Feedback" to="MobileControls" method="_on_Shift_pressed"]
+[connection signal="released" from="MobileControls/Feedback/Feedback" to="MobileControls" method="_on_Shift_released"]