src/base-environments/youth_room/scenes/draven.tscn

@@ -496,6 +496,7 @@ custom_minimum_size = Vector2(0, 700)
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 2
+mouse_filter = 2
 horizontal_scroll_mode = 0
 vertical_scroll_mode = 3
 

src/base-environments/youth_room/scenes/voice_training.tscn

@@ -664,6 +664,7 @@ script = ExtResource("1_543ki")
 scene_id = 2
 story_array = PackedStringArray("My secret comic stash. I remember playing Clue-Men with the boys.", "I had a voice for every character in that comic. But more often than not I played him: Agent Q.", "Going under the radar, putting in precise work to save the world.", "Not having to deal with being a girl.", "Boys were so much easier. They like cars, bikes, guns and agents.", "They don\'t talk behind your back. They don\'t think everything is about relationships.", "Girls don\'t get that. I knew they talked behind my back about me only “pretending” to like boy stuff, so I’d get laid ", "… I mean, maybe they were right?", "Like I won\'t deny I was probably the first girl in my class to see a dick.", "But like - that’s what the boys do, right?", "At least it has gotten better after me and Jojo became friends.", "I still remember how that happend. I did a voice acting workshop in art class.", "Being allowed to share my technique in front of everyone was just :D", "I mean next to nobody put in any effort. But Jojo did.", "When our Mr Funny then decided to ape her attempts instead of just minding his own, I pretty much exploded.", "After this, we suddenly were besties. And my class finally started to just leave me be. ", "Maybe because I for once was friends with another girl. Maybe because I scared them. Maybe both.")
 paragraph_lengths = PackedInt32Array(1, 2, 5, 7, 9, 10, 13, 14, 16)
+progress = 17.0
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
 layout_mode = 2
@@ -724,12 +725,12 @@ render_target_update_mode = 3
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.21953, 3.52719, 0)
 
 [node name="YouthSpecialMeshesComicBook1" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"]
-transform = Transform3D(-0.09237667, -0.0774974, -0.992704, 0.085104756, 0.9927038, -0.08541691, 0.992081, -0.092374295, -0.08510727, -0.045, -0.111, 0.033)
+transform = Transform3D(-0.09237667, -0.0774974, -0.992704, 0.085104756, 0.99270386, -0.08541691, 0.992081, -0.092374295, -0.08510727, -0.045, -0.111, 0.033)
 mesh = ExtResource("3_ho85h")
 skeleton = NodePath("../..")
 
 [node name="YouthSpecialMeshesComicBook2" type="MeshInstance3D" parent="PanelContainer/StartFrame/TextureRect/SubViewport/Node3D"]
-transform = Transform3D(-0.4210099, 0.12640648, -0.7739451, 0.15260528, 0.78532714, 0.07756861, 0.78067994, -0.08534441, -0.4325408, 0.02, -0.055, -0.02)
+transform = Transform3D(-0.4210099, 0.12640646, -0.7739451, 0.15260528, 0.7853271, 0.07756861, 0.78067994, -0.08534441, -0.4325408, 0.02, -0.055, -0.02)
 mesh = ExtResource("4_kn83e")
 skeleton = NodePath("../..")
 
@@ -776,6 +777,7 @@ custom_minimum_size = Vector2(0, 700)
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 2
+mouse_filter = 2
 horizontal_scroll_mode = 0
 vertical_scroll_mode = 3
 

src/logic-scenes/luna/playables/story_playable.gd

@@ -77,7 +77,8 @@ func _ready() -> void:
 	if skip_control is SkipControl and not Engine.is_editor_hint():
 		skip_control.skip.connect(skip_text)
 
-	# Clunky rebuild...
+	if get_tree().root.get_child(-1) == self:
+		play()
 	story_array = story_array
 	progress = progress
 
@@ -122,14 +123,12 @@ func try_scroll():
 
 func play():
 	print_debug("StoryPlayable.gd: %s.play()" % self.name)
-
+	animation_player.play("RESET")
-	# There's an ugly glitch here.
-	hide()	
-	animation_player.play("RESET")	
 	await animation_player.animation_finished
 	
 	# Show ourselves before playing
-	get_parent().show() # Ensure visible Canvaslayer!
+	get_parent().show() # Canvaslayer!
+	show()
 	
 	scroll_target = 0
 
@@ -143,15 +142,8 @@ func play():
 		_:
 			animation_player.queue("en")
 
-	# Wait and get ready.
-	await get_tree().process_frame
-	show()
-	Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
-	
-	# Don't know how to do this.
-	#%StoryScroll.grab_focus()
-	
 	if name == "draven":
+		await get_tree().process_frame
 		await get_tree().process_frame
 		$AnimationPlayer/Music.play()
 

src/ui/skip_control/skip_control.gd

@@ -35,7 +35,7 @@ var aborted
 var is_auto_proceeding: bool = false:
 	set(value):
 		if is_auto_proceeding and not value:
-			var tween := get_tree().create_tween()
+			var tween = get_tree().create_tween()
 			tween.set_ease(Tween.EASE_IN)
 			tween.set_trans(Tween.TRANS_QUAD)
 			tween.tween_property(progress, "value", 0.0, 0.3)
@@ -54,7 +54,7 @@ var is_auto_proceeding: bool = false:
 			action_prompt.action = "ui_cancel"
 			button.text = "keep reading"
 		is_auto_proceeding = value
-
+		
 		#resets progress bar on button
 		time_pressed = 0
 
@@ -70,7 +70,7 @@ func _process(delta):
 				text_revealed = true
 			else:
 				is_auto_proceeding = true
-
+	
 	elif is_auto_proceeding and text_revealed:
 		time_pressed += delta
 		progress.value = time_pressed / auto_continue_delay
@@ -84,7 +84,7 @@ func _input(event: InputEvent) -> void:
 		if unrevealed:
 			$AnimationPlayer.play("reveal_skip")
 			unrevealed = false
-
+		
 		if event.is_action_pressed("skip"):
 			if not (is_auto_proceeding or aborted):
 				pressed = true
@@ -94,7 +94,7 @@ func _input(event: InputEvent) -> void:
 				$AnimationPlayer.play("vanish_skip")
 				await $AnimationPlayer.animation_finished
 				reset()
-
+				
 			get_viewport().set_input_as_handled()
 		elif event.is_action_released("skip"):
 			if not is_auto_proceeding:
@@ -112,27 +112,12 @@ func _input(event: InputEvent) -> void:
 				aborted = true
 				get_viewport().set_input_as_handled()
 
-
-func _on_skip_button_button_up():
-	if not is_auto_proceeding:
-		pressed = false
-		time_pressed = 0
-		progress.value = 0
-
-
-func _on_skip_button_button_down():
-	if not (is_auto_proceeding):
-		pressed = true
-	if not aborted and is_auto_proceeding:
-		pressed = false
-		time_pressed = 0
-		is_auto_proceeding = false
-		aborted = true
-
-
 func _on_skip_button_toggled(button_pressed):
 	if button_pressed:
 		pressed = true
+	else:
+		pressed = false
+		time_pressed = 0
 
 func start_proceed_countdown():
 	text_revealed = true

src/ui/skip_control/skip_control.tscn

@@ -17,12 +17,12 @@ corner_radius_bottom_left = 5
 expand_margin_top = 5.0
 expand_margin_bottom = 5.0
 
-[sub_resource type="InputEventKey" id="InputEventKey_4wxxu"]
+[sub_resource type="InputEventKey" id="InputEventKey_7em4l"]
 device = -1
 physical_keycode = 88
 unicode = 120
 
-[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_qghsb"]
+[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_hb4jw"]
 device = -1
 button_index = 2
 pressed = true
@@ -296,13 +296,11 @@ stretch_mode = 5
 script = ExtResource("2_ev8gx")
 action = "skip"
 icon = 0
-events = Array[InputEvent]([null, SubResource("InputEventKey_4wxxu"), SubResource("InputEventJoypadButton_qghsb")])
+events = Array[InputEvent]([null, SubResource("InputEventKey_7em4l"), SubResource("InputEventJoypadButton_hb4jw")])
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 libraries = {
 &"": SubResource("AnimationLibrary_f8gbl")
 }
 
-[connection signal="button_down" from="SkipButton" to="." method="_on_skip_button_button_down"]
-[connection signal="button_up" from="SkipButton" to="." method="_on_skip_button_button_up"]
 [connection signal="toggled" from="SkipButton" to="." method="_on_skip_button_toggled"]