Browse Source

:tada: New music with pentatonic scale

DricomDragon 2 years ago
parent
commit
163f4714f4
2 changed files with 36 additions and 21 deletions
  1. 28 5
      godot/run/levels/world.tscn
  2. 8 16
      godot/run/menu.tscn

+ 28 - 5
godot/run/levels/world.tscn

@@ -28,27 +28,50 @@ modulate = Color(1, 0, 1, 1)
 curve = SubResource("Curve2D_i8apf")
 
 [node name="ProtoStar" parent="Lines/BassLine" instance=ExtResource("1_wa4bn")]
+modulate = Color(0.77, 0.77, 0.77, 1)
 position = Vector2(64, 64)
+speed = 867.0
+note = 3
+octave = -1
 
 [node name="SecondStar" parent="Lines/BassLine" instance=ExtResource("1_wa4bn")]
+modulate = Color(0.878431, 0.878431, 0.878431, 1)
 position = Vector2(167.137, 729.784)
 progress = 4210.26
-note = 3
+speed = 390.0
+note = 7
+octave = -1
+
+[node name="ThirdStar" parent="Lines/BassLine" instance=ExtResource("1_wa4bn")]
+position = Vector2(64, 338.614)
+progress = 4681.96
+speed = 350.0
+note = 8
+octave = -1
 
 [node name="NiceLine" parent="Lines" instance=ExtResource("3_l2vrj")]
 modulate = Color(1, 0, 0, 1)
 curve = SubResource("Curve2D_yypd3")
 
 [node name="ElioStar" parent="Lines/NiceLine" instance=ExtResource("1_wa4bn")]
+modulate = Color(0.768627, 0.768627, 0.768627, 1)
 position = Vector2(1856, 320)
-speed = 400.0
-note = 4
+speed = 361.0
+note = 10
+octave = -1
 
 [node name="MiniStar" parent="Lines/NiceLine" instance=ExtResource("1_wa4bn")]
+modulate = Color(0.878431, 0.878431, 0.878431, 1)
 position = Vector2(1354.86, 64)
 progress = 4210.26
-speed = 400.0
-note = 6
+speed = 340.0
+note = 2
+
+[node name="SunStar" parent="Lines/NiceLine" instance=ExtResource("1_wa4bn")]
+position = Vector2(1856, 128.909)
+progress = 4776.3
+speed = 280.0
+note = 3
 
 [node name="Triggers" type="Node2D" parent="."]
 

+ 8 - 16
godot/run/menu.tscn

@@ -16,7 +16,6 @@ grow_horizontal = 2
 grow_vertical = 2
 
 [node name="Logo" type="TextureRect" parent="."]
-layout_mode = 1
 anchors_preset = -1
 anchor_left = 0.169
 anchor_right = 0.169
@@ -26,7 +25,6 @@ offset_bottom = 180.0
 texture = ExtResource("1_fdf5f")
 
 [node name="Title" type="RichTextLabel" parent="."]
-layout_mode = 1
 anchors_preset = -1
 anchor_left = 0.5
 anchor_right = 0.5
@@ -40,7 +38,6 @@ text = "Star Kiss"
 scroll_active = false
 
 [node name="LevelScroll" type="ScrollContainer" parent="."]
-layout_mode = 1
 anchors_preset = -1
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -51,44 +48,40 @@ offset_bottom = -20.0
 horizontal_scroll_mode = 0
 
 [node name="LevelContainer" type="VBoxContainer" parent="LevelScroll"]
-layout_mode = 2
-offset_right = 416.0
+offset_right = 566.0
 offset_bottom = 320.0
 alignment = 1
 
-[node name="SimpleLevel" parent="LevelScroll/LevelContainer" instance=ExtResource("1_drwug")]
-layout_mode = 2
+[node name="PentaLevel" parent="LevelScroll/LevelContainer" instance=ExtResource("1_drwug")]
 anchors_preset = 0
 anchor_right = 0.0
 anchor_bottom = 0.0
-offset_right = 416.0
+offset_right = 566.0
 offset_bottom = 77.0
 grow_horizontal = 1
 grow_vertical = 1
-text = "Basic test
+text = "Pentatonic experiment
 "
 level = ExtResource("2_x8xps")
 
 [node name="ScaleLevel" parent="LevelScroll/LevelContainer" instance=ExtResource("1_drwug")]
-layout_mode = 2
 anchors_preset = 0
 anchor_right = 0.0
 anchor_bottom = 0.0
 offset_top = 81.0
-offset_right = 416.0
+offset_right = 566.0
 offset_bottom = 158.0
 grow_horizontal = 1
 grow_vertical = 1
-text = "Scale test"
+text = "Major scale"
 level = ExtResource("3_xung6")
 
 [node name="HeartLevel" parent="LevelScroll/LevelContainer" instance=ExtResource("1_drwug")]
-layout_mode = 2
 anchors_preset = 0
 anchor_right = 0.0
 anchor_bottom = 0.0
 offset_top = 162.0
-offset_right = 416.0
+offset_right = 566.0
 offset_bottom = 239.0
 grow_horizontal = 1
 grow_vertical = 1
@@ -96,12 +89,11 @@ text = "Heart music"
 level = ExtResource("4_wmep8")
 
 [node name="DoubleLevel" parent="LevelScroll/LevelContainer" instance=ExtResource("1_drwug")]
-layout_mode = 2
 anchors_preset = 0
 anchor_right = 0.0
 anchor_bottom = 0.0
 offset_top = 243.0
-offset_right = 416.0
+offset_right = 566.0
 offset_bottom = 320.0
 grow_horizontal = 1
 grow_vertical = 1