Changes minigames FX to controls. Jellyfish now resizes themselves using scale property instead of custom_minimum_size to scale FXs with them.

sources/minigames/base/hear_and_find/hear_and_find_minigame.gd

@@ -54,7 +54,7 @@ func _find_stimuli_and_distractions() -> void:
 		# Difficulty 1 
 		# Any previously learned item w/ all letters different
 		for gp in all_GPs:
-				if gp.Grapheme != stimulus.Grapheme and gp.Phoneme != stimulus.Phoneme:
+				if gp.Type == 1 and gp.Grapheme != stimulus.Grapheme and gp.Phoneme != stimulus.Phoneme:
 					stimulus_distractors.append(gp)
 		if GPs:
 			for syllable in all_syllables:
@@ -88,7 +88,7 @@ func _get_current_stimulus() -> Dictionary :
 	return stimuli[current_progression % stimuli.size()]
 
 
-func _play_current_stimulus_phoneme()-> void:
+func _play_current_stimulus_phoneme() -> void:
 	var current_stimulus: = _get_current_stimulus()
 	if not current_stimulus or not current_stimulus.has("Phoneme"):
 		return

sources/minigames/jellyfish/jellyfish.gd

@@ -14,23 +14,26 @@ const animations: = [
 	preload("res://sources/minigames/jellyfish/green_jellyfish_animations.tres"),
 ]
 
-const sizes: = [
-	Vector2(400, 400),
-	Vector2(500, 500),
+const scales: = [
+	Vector2(1.,1.),
+	Vector2(1.25, 1.25)
 ]
 
+const scale_factor : float = 0.2
+
 @export var color: = Colors.Red:
 	set(value):
 		color = value
 		if animated_sprite:
 			animated_sprite.sprite_frames = animations[color]
-		custom_minimum_size = sizes[color] * (1. + randf() * 0.2)
+		scale = scales[color] * (1. + randf() * scale_factor)
+
 
 @onready var animated_sprite: = %AnimatedSprite2D
 @onready var label: = %AutoSizeLabel.get_node("Label")
-@onready var highlight_fx: = $HighlightFX
-@onready var right_fx: = $RightFX
-@onready var wrong_fx: = $WrongFX
+@onready var highlight_fx: = %HighlightFX
+@onready var right_fx: = %RightFX
+@onready var wrong_fx: = %WrongFX
 
 var stimulus: Dictionary :
 	set(value):
@@ -40,7 +43,6 @@ var stimulus: Dictionary :
 				label.text = value.Grapheme
 			else:
 				label.text = ""
-		
 
 
 func _ready() -> void:
@@ -88,6 +90,7 @@ func wrong() -> void:
 
 func _on_gui_input(event: InputEvent) -> void:
 	if event.is_action_pressed("left_click"):
+		print("CLICK")
 		pressed.emit()
 
 

sources/minigames/jellyfish/jellyfish.tscn

@@ -6,24 +6,46 @@
 [ext_resource type="PackedScene" uid="uid://cge0uyn30tcpv" path="res://sources/utils/fx/highlight.tscn" id="3_5uhvd"]
 [ext_resource type="Script" path="res://sources/utils/percent_margin_container.gd" id="3_vllju"]
 [ext_resource type="PackedScene" uid="uid://bgio7muqck2bu" path="res://sources/utils/auto_size_label.tscn" id="4_26xiq"]
-[ext_resource type="SpriteFrames" uid="uid://dkemftb4jdxvs" path="res://sources/minigames/jellyfish/green_jellyfish_animations.tres" id="5_0850m"]
+[ext_resource type="SpriteFrames" uid="uid://dquynn3nx52o" path="res://sources/minigames/jellyfish/red_jellyfish_animations.tres" id="5_gc31w"]
 [ext_resource type="PackedScene" uid="uid://dlmbxcgiv8tpr" path="res://sources/utils/fx/wrong.tscn" id="6_w1tlu"]
 
 [node name="Jellyfish" type="MarginContainer"]
-custom_minimum_size = Vector2(527.703, 527.703)
-offset_right = 200.0
-offset_bottom = 200.0
+custom_minimum_size = Vector2(400, 400)
+offset_right = 400.0
+offset_bottom = 400.0
+scale = Vector2(1.02491, 1.02491)
 script = ExtResource("1_06uwq")
-color = 1
 
-[node name="HighlightFX" parent="." instance=ExtResource("3_5uhvd")]
+[node name="BackFX" type="Control" parent="."]
+custom_minimum_size = Vector2(0, 220)
 layout_mode = 2
+size_flags_vertical = 0
+mouse_filter = 1
+
+[node name="RightFX" parent="BackFX" instance=ExtResource("2_edt4e")]
+unique_name_in_owner = true
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="HighlightFX" parent="BackFX" instance=ExtResource("3_5uhvd")]
+unique_name_in_owner = true
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+grow_horizontal = 2
+grow_vertical = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
 
-[node name="RightFX" parent="." instance=ExtResource("2_edt4e")]
-position = Vector2(284, 142.25)
-
 [node name="SpriteControl" type="Control" parent="." node_paths=PackedStringArray("sprites")]
 layout_mode = 2
 mouse_filter = 2
@@ -32,10 +54,10 @@ sprites = [NodePath("AnimatedSprite2D")]
 
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="SpriteControl"]
 unique_name_in_owner = true
-scale = Vector2(2.42857, 2.42857)
-sprite_frames = ExtResource("5_0850m")
+scale = Vector2(2.15054, 2.15054)
+sprite_frames = ExtResource("5_gc31w")
 animation = &"idle"
-frame_progress = 0.79521
+frame_progress = 0.472967
 centered = false
 
 [node name="PercentMarginContainer" type="Container" parent="."]
@@ -56,8 +78,24 @@ layout_mode = 2
 [node name="Label" parent="PercentMarginContainer/AspectRatioContainer/AutoSizeLabel" index="0"]
 text = ""
 
-[node name="WrongFX" parent="." instance=ExtResource("6_w1tlu")]
-position = Vector2(284, 142.25)
+[node name="FrontFX" type="Control" parent="."]
+custom_minimum_size = Vector2(0, 220)
+layout_mode = 2
+size_flags_vertical = 0
+mouse_filter = 1
+
+[node name="WrongFX" parent="FrontFX" instance=ExtResource("6_w1tlu")]
+unique_name_in_owner = true
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
 
 [connection signal="gui_input" from="." to="." method="_on_gui_input"]
 

sources/utils/fx/right.gd

@@ -1,4 +1,4 @@
-extends Node2D
+extends Control
 
 signal finished()
 

sources/utils/fx/right.tscn

@@ -228,7 +228,9 @@ gravity = Vector3(0, 98, 0)
 scale_curve = SubResource("CurveTexture_mx7tb")
 color_ramp = SubResource("GradientTexture1D_b6rlx")
 
-[node name="RightFX" type="Node2D"]
+[node name="RightFX" type="Control"]
+layout_mode = 3
+anchors_preset = 0
 script = ExtResource("1_83pnv")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]

sources/utils/fx/wrong.gd

@@ -1,4 +1,4 @@
-extends Node2D
+extends Control
 
 signal finished()
 

sources/utils/fx/wrong.tscn

@@ -140,7 +140,9 @@ _data = {
 "wrong": SubResource("Animation_dn23k")
 }
 
-[node name="WrongFX" type="Node2D"]
+[node name="WrongFX" type="Control"]
+layout_mode = 3
+anchors_preset = 0
 script = ExtResource("1_sgjc5")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]