:tada: Add octave parameter and fix note scale

Simple multiplication is wrong, power must be used instead.

godot/component/entity/star/Sound.gd

@@ -13,5 +13,5 @@ func _on_trigger_area_entered(area):
 	trigger()
 
 
-func _on_star_note_changed(new_note):
-	set_pitch_scale(Music.scale(new_note))
+func _on_star_note_changed(new_note: Music.Note, octave: int):
+	set_pitch_scale(Music.scale_note_octave(new_note, octave))

godot/component/entity/star/Star.gd

@@ -1,16 +1,18 @@
 extends PathFollow2D
 # a moving music player
 
-signal note_changed(new_note: Music.Note)
+
+signal note_changed(new_note: Music.Note, octave: int)
 
 const RAYON = 20
 
 @export var speed: float = 200.0
 @export var note: Music.Note = Music.Note.A
+@export var octave: int = 0
 
 
 func _ready():
-	emit_signal("note_changed", note)
+	emit_signal("note_changed", note, octave)
 
 
 func _physics_process(delta):

godot/levels/simple_scales.tscn

@@ -9,38 +9,53 @@
 [node name="MainLine" parent="." instance=ExtResource("1_bt0a1")]
 
 [node name="Do" parent="MainLine" instance=ExtResource("2_k3r0g")]
-position = Vector2(749.599, 1028.94)
-progress = 3858.41
+position = Vector2(1569.57, 870.556)
+progress = 3500.0
+speed = 400.0
 note = 4
 
 [node name="Re" parent="MainLine" instance=ExtResource("2_k3r0g")]
-position = Vector2(1300.8, 1026.48)
-progress = 3307.21
+position = Vector2(1128.83, 634.442)
+progress = 3000.0
+speed = 400.0
 note = 6
 
 [node name="Mi" parent="MainLine" instance=ExtResource("2_k3r0g")]
-position = Vector2(1852.07, 1024.04)
-progress = 2756.01
+position = Vector2(688.095, 398.337)
+progress = 2500.0
+speed = 400.0
 note = 8
 
 [node name="Fa" parent="MainLine" instance=ExtResource("2_k3r0g")]
-position = Vector2(1856, 476.805)
-progress = 2204.81
+position = Vector2(247.352, 162.224)
+progress = 2000.0
+speed = 400.0
 note = 9
 
 [node name="Sol" parent="MainLine" instance=ExtResource("2_k3r0g")]
-position = Vector2(1717.6, 64)
-progress = 1653.6
+position = Vector2(355.987, 64)
+progress = 1500.0
+speed = 400.0
 note = 11
 
 [node name="La" parent="MainLine" instance=ExtResource("2_k3r0g")]
-position = Vector2(1166.4, 64)
-progress = 1102.4
+position = Vector2(855.99, 64)
+progress = 1000.0
+speed = 400.0
+octave = 1
 
 [node name="Si" parent="MainLine" instance=ExtResource("2_k3r0g")]
-position = Vector2(615.204, 64)
-progress = 551.202
+position = Vector2(1356.01, 64)
+progress = 500.0
+speed = 400.0
 note = 3
+octave = 1
+
+[node name="Do2" parent="MainLine" instance=ExtResource("2_k3r0g")]
+position = Vector2(1856, 64)
+speed = 400.0
+note = 4
+octave = 1
 
 [node name="Trigger" parent="." instance=ExtResource("3_81otn")]
 position = Vector2(960, 544)

godot/utility/Music.gd

@@ -1,12 +1,20 @@
 class_name Music
 # To deal with music theory in the digital world
 
-enum Note {A = 1, Ad, B, C, Cd, D, Dd, E, F, Fd, G, Gd}
+enum Note {A = 0, Ad, B, C, Cd, D, Dd, E, F, Fd, G, Gd}
 
-const NOTE_PITCH_SCALE = 1.05942
+const NOTE_PITCH_SCALE = 1.0594630943592953
 
 
 
-static func scale(note: Note) -> float:
-	return note * NOTE_PITCH_SCALE
+static func scale_note(note: Note) -> float:
+	return pow(NOTE_PITCH_SCALE, float(note))
+
+
+static func scale_octave(octave_offset: int) -> float:
+	return pow(2, octave_offset)
+
+
+static func scale_note_octave(note: Note, octave: int) -> float:
+	return scale_note(note) * scale_octave(octave)