Merge branch 'level-design' of https://git.disroot.org/etbh/Cleanomancer

hotswap between sounds
Touch ups (and fixing the "downstairs" in lv 4 that was set to visible
2021-04-27 00:17:44 +02:00 · 2021-04-27 00:11:43 +02:00 · 2021-04-26 23:08:53 +02:00 · 2021-04-26 22:57:52 +02:00
16 changed files with 220 additions and 28 deletions
--- a/Levels/Level_07.tscn
+++ b/Levels/Level_07.tscn
@ -1,8 +1,11 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=7 format=2]

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Levels/Level_7.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Music/soundtrack_drums_2.mp3" type="AudioStream" id=4]
+[ext_resource path="res://Music/soundtrack_lead_2.mp3" type="AudioStream" id=5]
+[ext_resource path="res://Music/soundtrack_bass_3.mp3" type="AudioStream" id=6]

 [node name="Node2D" type="Node2D"]

@ -15,31 +18,49 @@ stairs_x = 8
 stairs_y = 9

 [node name="Floor" parent="Floor" index="0"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 262152, 1, 0, 262153, 1, 0, 262154, 1, 0, 327688, 1, 0, 327689, 1, 0, 327690, 1, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393221, 1, 0, 393222, 1, 0, 393223, 1, 0, 393224, 1, 0, 393225, 1, 0, 393226, 1, 0, 458757, 1, 0, 458758, 1, 0, 458759, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 1, 0, 524293, 1, 0, 524294, 1, 0, 524295, 1, 0, 524296, 1, 0, 524297, 1, 0, 524298, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589832, 1, 0, 589833, 1, 0, 589834, 1, 0, 655365, 1, 0, 655366, 1, 0, 655367, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0 )

 [node name="Walls" parent="Floor" index="1"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 196616, 4, 0, 196617, 5, 0, 196618, 6, 0, 262151, 2, 0, 327685, 4, 0, 327686, 6, 0, 327687, 2, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393220, 3, 0, 458756, 2, 0, 524292, 2, 0, 589828, 3, 0, 655364, 2, 0, 720900, 2, 0 )

 [node name="Walls2" parent="Floor" index="2"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 327687, 5, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0 )

+[node name="WallStickers" parent="Floor" index="3"]
+tile_data = PoolIntArray( 327685, 63, 0, 327687, 67, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0 )
+
 [node name="Props" parent="Floor" index="4"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393221, 7, 0, 393223, 8, 0, 393226, 21, 0, 458762, 20, 0, 589834, 8, 0, 655367, 21, 0, 720903, 20, 0 )

 [node name="Waste" parent="Floor" index="5"]
-tile_data = PoolIntArray( 327688, 14, 0, 393225, 12, 0, 458758, 12, 0, 458760, 11, 0, 524293, 10, 0, 524295, 14, 0, 524297, 14, 0, 589832, 9, 0, 655369, 10, 0 )
+tile_data = PoolIntArray( 327688, 37, 0, 393225, 35, 0, 458758, 35, 0, 458760, 36, 0, 524293, 33, 0, 524295, 32, 0, 524297, 37, 0, 589832, 31, 0, 655369, 34, 0 )

 [node name="Player" parent="Floor" index="6"]
+modulate = Color( 0.847059, 0.866667, 0.972549, 1 )
 position = Vector2( 360, 840 )
 rest = 0.15
 reservoir = 6

 [node name="Stairs" parent="Floor" index="7"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 position = Vector2( 600, 720 )

+[node name="Drum" parent="Floor" index="8"]
+stream = ExtResource( 4 )
+
+[node name="Bass" parent="Floor" index="9"]
+stream = ExtResource( 6 )
+
 [node name="Reservoir" parent="Floor" index="10"]
 frame = 6

+[node name="Lead" parent="Floor" index="11"]
+stream = ExtResource( 5 )
+
 [node name="Controls" parent="Floor" index="12"]
 texture = ExtResource( 1 )
 turbo = true
--- a/Levels/Level_1.tscn
+++ b/Levels/Level_1.tscn
@ -1,8 +1,7 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=4 format=2]

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
-[ext_resource path="res://Music/Alien/drums_friction_v1.mp3" type="AudioStream" id=3]
 [ext_resource path="res://Levels/Level_2.tscn" type="PackedScene" id=4]

 [node name="Node2D2" type="Node2D"]
@ -33,9 +32,6 @@ reservoir = 3
 [node name="Stairs" parent="Floor" index="7"]
 position = Vector2( 640, 880 )

-[node name="Drum" parent="Floor" index="8"]
-stream = ExtResource( 3 )
-
 [node name="Reservoir" parent="Floor" index="10"]
 frame = 3

--- a/Levels/Level_2.tscn
+++ b/Levels/Level_2.tscn
@ -2,7 +2,7 @@

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
-[ext_resource path="res://Music/Alien/bass_electric_v1.mp3" type="AudioStream" id=3]
+[ext_resource path="res://Music/soundtrack_drums_2.mp3" type="AudioStream" id=3]
 [ext_resource path="res://Levels/Level_3.tscn" type="PackedScene" id=4]

 [node name="Node2D2" type="Node2D"]
@ -34,7 +34,7 @@ reservoir = 3
 [node name="Stairs" parent="Floor" index="7"]
 position = Vector2( 960, 480 )

-[node name="Bass" parent="Floor" index="9"]
+[node name="Drum" parent="Floor" index="8"]
 stream = ExtResource( 3 )

 [node name="Reservoir" parent="Floor" index="10"]
--- a/Levels/Level_3.tscn
+++ b/Levels/Level_3.tscn
@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Levels/Level_4.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Music/soundtrack_drums_2.mp3" type="AudioStream" id=4]

 [node name="Node2D2" type="Node2D"]

@ -14,18 +15,26 @@ stairs_x = 10
 stairs_y = 11

 [node name="Floor" parent="Floor" index="0"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 tile_data = PoolIntArray( 262152, 1, 0, 262153, 1, 0, 262154, 1, 0, 327688, 1, 0, 327689, 1, 0, 327690, 1, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393224, 1, 0, 393225, 1, 0, 393226, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 1, 0, 524296, 1, 0, 524297, 1, 0, 524298, 1, 0, 589832, 1, 0, 589833, 1, 0, 589834, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0 )

 [node name="Walls" parent="Floor" index="1"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 tile_data = PoolIntArray( 196616, 4, 0, 196617, 6, 0, 196618, 5, 0, 262151, 2, 0, 327687, 3, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393223, 2, 0, 458759, 2, 0, 524295, 3, 0, 589831, 2, 0, 655367, 2, 0, 720903, 2, 0 )

+[node name="WallStickers" parent="Floor" index="3"]
+modulate = Color( 0, 0, 0, 1 )
+
 [node name="Props" parent="Floor" index="4"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 tile_data = PoolIntArray( 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 458760, 7, 0, 458762, 8, 0 )

 [node name="Waste" parent="Floor" index="5"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 tile_data = PoolIntArray( 262152, 14, 0, 327689, 13, 0, 458761, 12, 0, 524296, 15, 0, 524297, 10, 0 )

 [node name="Player" parent="Floor" index="6"]
+modulate = Color( 0.909804, 0.921569, 0.984314, 1 )
 position = Vector2( 960, 360 )
 rest = 0.15
 reservoir = 6
@ -33,6 +42,9 @@ reservoir = 6
 [node name="Stairs" parent="Floor" index="7"]
 position = Vector2( 760, 880 )

+[node name="Drum" parent="Floor" index="8"]
+stream = ExtResource( 4 )
+
 [node name="Reservoir" parent="Floor" index="10"]
 frame = 6

--- a/Levels/Level_4.tscn
+++ b/Levels/Level_4.tscn
@ -1,8 +1,10 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=6 format=2]

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Levels/Level_5.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Music/soundtrack_drums_2.mp3" type="AudioStream" id=4]
+[ext_resource path="res://Music/soundtrack_bass_2.mp3" type="AudioStream" id=5]

 [node name="Node2D2" type="Node2D"]

@ -14,25 +16,37 @@ stairs_x = 10
 stairs_y = 6

 [node name="Floor" parent="Floor" index="0"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 tile_data = PoolIntArray( 262152, 1, 0, 262153, 1, 0, 262154, 1, 0, 327688, 1, 0, 327689, 1, 0, 327690, 1, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393224, 1, 0, 393225, 1, 0, 393226, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 1, 0, 524296, 1, 0, 524297, 1, 0, 524298, 1, 0, 589832, 1, 0, 589833, 1, 0, 589834, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0 )

 [node name="Walls" parent="Floor" index="1"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 tile_data = PoolIntArray( 196616, 4, 0, 196617, 6, 0, 196618, 5, 0, 262151, 2, 0, 327687, 2, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393223, 3, 0, 458759, 2, 0, 524295, 2, 0, 589831, 3, 0, 655367, 2, 0, 720903, 2, 0 )

 [node name="Props" parent="Floor" index="4"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 tile_data = PoolIntArray( 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 458762, 8, 0 )

 [node name="Waste" parent="Floor" index="5"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 tile_data = PoolIntArray( 262154, 14, 0, 327690, 10, 0, 393226, 13, 0, 524298, 12, 0 )

 [node name="Player" parent="Floor" index="6"]
+modulate = Color( 0.909804, 0.921569, 0.984314, 1 )
 position = Vector2( 680, 920 )
 rest = 0.15
 reservoir = 7

 [node name="Stairs" parent="Floor" index="7"]
+modulate = Color( 0.905882, 0.921569, 0.992157, 1 )
 position = Vector2( 960, 480 )

+[node name="Drum" parent="Floor" index="8"]
+stream = ExtResource( 4 )
+
+[node name="Bass" parent="Floor" index="9"]
+stream = ExtResource( 5 )
+
 [node name="Reservoir" parent="Floor" index="10"]
 frame = 7

--- a/Levels/Level_5.tscn
+++ b/Levels/Level_5.tscn
@ -1,8 +1,11 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=7 format=2]

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Levels/Level_6.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Music/soundtrack_drums_2.mp3" type="AudioStream" id=4]
+[ext_resource path="res://Music/soundtrack_bass_2.mp3" type="AudioStream" id=5]
+[ext_resource path="res://Music/soundtrack_lead_2.mp3" type="AudioStream" id=6]

 [node name="Node2D2" type="Node2D"]

@ -14,27 +17,43 @@ stairs_x = 7
 stairs_y = 8

 [node name="Floor" parent="Floor" index="0"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 262152, 1, 0, 262153, 1, 0, 262154, 1, 0, 327688, 1, 0, 327689, 1, 0, 327690, 1, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393221, 1, 0, 393222, 1, 0, 393223, 1, 0, 393224, 1, 0, 393225, 1, 0, 393226, 1, 0, 458757, 1, 0, 458758, 1, 0, 458759, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 1, 0, 524293, 1, 0, 524294, 1, 0, 524295, 1, 0, 524296, 1, 0, 524297, 1, 0, 524298, 1, 0, 589832, 1, 0, 589833, 1, 0, 589834, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0 )

 [node name="Walls" parent="Floor" index="1"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 196616, 4, 0, 196617, 6, 0, 196618, 5, 0, 327685, 4, 0, 327686, 5, 0, 327687, 5, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393220, 2, 0, 458756, 3, 0, 524292, 2, 0 )

 [node name="Walls2" parent="Floor" index="2"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 262151, 2, 0, 327687, 3, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0 )

 [node name="Props" parent="Floor" index="4"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 589832, 7, 0, 655369, 8, 0, 720906, 7, 0 )

 [node name="Waste" parent="Floor" index="5"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 327688, 11, 0, 393223, 14, 0, 393225, 13, 0, 458761, 10, 0, 524297, 9, 0, 589834, 12, 0 )

 [node name="Player" parent="Floor" index="6"]
+modulate = Color( 0.847059, 0.866667, 0.972549, 1 )
 position = Vector2( 960, 360 )
 rest = 0.15

 [node name="Stairs" parent="Floor" index="7"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 position = Vector2( 520, 640 )

+[node name="Drum" parent="Floor" index="8"]
+stream = ExtResource( 4 )
+
+[node name="Bass" parent="Floor" index="9"]
+stream = ExtResource( 5 )
+
+[node name="Lead" parent="Floor" index="11"]
+stream = ExtResource( 6 )
+
 [node name="Controls" parent="Floor" index="12"]
 texture = ExtResource( 1 )
 turbo = true
--- a/Levels/Level_6.tscn
+++ b/Levels/Level_6.tscn
@ -1,8 +1,11 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=7 format=2]

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Levels/Level_07.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Music/soundtrack_drums_2.mp3" type="AudioStream" id=4]
+[ext_resource path="res://Music/soundtrack_bass_2.mp3" type="AudioStream" id=5]
+[ext_resource path="res://Music/soundtrack_lead_2.mp3" type="AudioStream" id=6]

 [node name="Node2D" type="Node2D"]

@ -15,27 +18,43 @@ stairs_x = 7
 stairs_y = 11

 [node name="Floor" parent="Floor" index="0"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 262152, 1, 0, 262153, 1, 0, 262154, 1, 0, 327685, 1, 0, 327686, 1, 0, 327687, 1, 0, 327688, 1, 0, 327689, 1, 0, 327690, 1, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393221, 1, 0, 393222, 1, 0, 393223, 1, 0, 393224, 1, 0, 393225, 1, 0, 393226, 1, 0, 458757, 1, 0, 458758, 1, 0, 458759, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 1, 0, 524293, 1, 0, 524294, 1, 0, 524295, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 655365, 1, 0, 655366, 1, 0, 655367, 1, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0 )

 [node name="Walls" parent="Floor" index="1"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 196616, 4, 0, 196617, 5, 0, 196618, 6, 0, 262149, 4, 0, 262151, 5, 0, 327684, 2, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393220, 3, 0, 458756, 2, 0, 524292, 2, 0, 589828, 3, 0, 655364, 2, 0, 720900, 2, 0 )

 [node name="Walls2" parent="Floor" index="2"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 262150, 5, 0, 262151, 2, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0 )

 [node name="Props" parent="Floor" index="4"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 262152, 23, 0, 327685, 7, 0, 327688, 22, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 458762, 7, 0 )

 [node name="Waste" parent="Floor" index="5"]
-tile_data = PoolIntArray( 327689, 13, 0, 393222, 12, 0, 458757, 13, 0, 458759, 10, 0, 458760, 11, 0, 524294, 9, 0, 589831, 12, 0 )
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
+tile_data = PoolIntArray( 327689, 34, 0, 393222, 12, 0, 458757, 14, 0, 458759, 26, 0, 458760, 11, 0, 524294, 24, 0, 589831, 44, 0 )

 [node name="Player" parent="Floor" index="6"]
+modulate = Color( 0.847059, 0.866667, 0.972549, 1 )
 position = Vector2( 480, 600 )
 rest = 0.15

 [node name="Stairs" parent="Floor" index="7"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 position = Vector2( 400, 880 )

+[node name="Drum" parent="Floor" index="8"]
+stream = ExtResource( 4 )
+
+[node name="Bass" parent="Floor" index="9"]
+stream = ExtResource( 5 )
+
+[node name="Lead" parent="Floor" index="11"]
+stream = ExtResource( 6 )
+
 [node name="Controls" parent="Floor" index="12"]
 texture = ExtResource( 1 )
 turbo = true
--- a/Levels/Level_7.tscn
+++ b/Levels/Level_7.tscn
@ -1,8 +1,11 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=7 format=2]

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Levels/Level_8.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Music/soundtrack_lead_2.mp3" type="AudioStream" id=4]
+[ext_resource path="res://Music/soundtrack_bass_3.mp3" type="AudioStream" id=5]
+[ext_resource path="res://Music/soundtrack_drums_3.mp3" type="AudioStream" id=6]

 [node name="Node2D" type="Node2D"]

@ -14,22 +17,40 @@ start_y = 7
 stairs_x = 7
 stairs_y = 11

+[node name="Floor" parent="Floor" index="0"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
+
 [node name="Walls" parent="Floor" index="1"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 196613, 4, 0, 196614, 6, 0, 196615, 5, 0, 196616, 6, 0, 196617, 5, 0, 196618, 6, 0, 196619, 5, 0, 262148, 2, 0, 327684, 2, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393220, 3, 0, 458756, 2, 0, 524292, 2, 0, 589828, 3, 0, 655364, 2, 0, 720900, 2, 0 )

+[node name="WallStickers" parent="Floor" index="3"]
+tile_data = PoolIntArray( 196615, 64, 0, 196618, 61, 0, 196619, 65, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 458756, 67, 0 )
+
 [node name="Props" parent="Floor" index="4"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 tile_data = PoolIntArray( 262149, 7, 0, 327688, 16, 0, 327689, 17, 0, 327690, 8, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 524293, 8, 0, 589834, 7, 0, 655368, 18, 0, 655369, 19, 0, 720907, 7, 0 )

 [node name="Waste" parent="Floor" index="5"]
-tile_data = PoolIntArray( 262151, 14, 0, 327686, 15, 0, 393224, 14, 0, 458759, 11, 0, 458761, 10, 0, 524296, 9, 0, 524298, 13, 0, 720903, 12, 0 )
+tile_data = PoolIntArray( 262151, 37, 0, 327686, 34, 0, 393224, 51, 0, 458759, 36, 0, 458761, 50, 0, 524296, 31, 0, 524298, 32, 0, 720903, 35, 0 )

 [node name="Player" parent="Floor" index="6"]
 position = Vector2( 720, 600 )
 rest = 0.15

 [node name="Stairs" parent="Floor" index="7"]
+modulate = Color( 0.721569, 0.752941, 0.94902, 1 )
 position = Vector2( 400, 880 )

+[node name="Drum" parent="Floor" index="8"]
+stream = ExtResource( 6 )
+
+[node name="Bass" parent="Floor" index="9"]
+stream = ExtResource( 5 )
+
+[node name="Lead" parent="Floor" index="11"]
+stream = ExtResource( 4 )
+
 [node name="Controls" parent="Floor" index="12"]
 texture = ExtResource( 1 )
 turbo = true
--- a/Levels/Level_8.tscn
+++ b/Levels/Level_8.tscn
@ -1,7 +1,10 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=6 format=2]

 [ext_resource path="res://Textures/kb-turbo.png" type="Texture" id=1]
 [ext_resource path="res://Scenes/Level.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Music/soundtrack_lead_3.mp3" type="AudioStream" id=3]
+[ext_resource path="res://Music/soundtrack_bass_3.mp3" type="AudioStream" id=4]
+[ext_resource path="res://Music/soundtrack_drums_3.mp3" type="AudioStream" id=5]

 [node name="Node2D" type="Node2D"]

@ -13,28 +16,49 @@ stairs_x = 6
 stairs_y = 6

 [node name="Floor" parent="Floor" index="0"]
+modulate = Color( 0.552941, 0.603922, 0.917647, 1 )
 tile_data = PoolIntArray( 262149, 1, 0, 262150, 1, 0, 262151, 1, 0, 262152, 1, 0, 327685, 1, 0, 327686, 1, 0, 327687, 1, 0, 327688, 1, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393221, 1, 0, 393222, 1, 0, 393223, 1, 0, 393224, 1, 0, 458757, 1, 0, 458758, 1, 0, 458759, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 1, 0, 458763, 1, 0, 524293, 1, 0, 524294, 1, 0, 524295, 1, 0, 524296, 1, 0, 524297, 1, 0, 524298, 1, 0, 524299, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589832, 1, 0, 589833, 1, 0, 589834, 1, 0, 589835, 1, 0 )

 [node name="Walls" parent="Floor" index="1"]
+modulate = Color( 0.552941, 0.603922, 0.917647, 1 )
 tile_data = PoolIntArray( 196613, 4, 0, 196614, 6, 0, 196615, 5, 0, 196616, 6, 0, 262148, 2, 0, 327684, 3, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393220, 3, 0, 458756, 2, 0, 524292, 3, 0, 589828, 2, 0 )

+[node name="Walls2" parent="Floor" index="2"]
+modulate = Color( 0.552941, 0.603922, 0.917647, 1 )
+
+[node name="WallStickers" parent="Floor" index="3"]
+tile_data = PoolIntArray( 196613, 62, 0, 196616, 60, 0, 327684, 66, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 589828, 67, 0 )
+
 [node name="Props" parent="Floor" index="4"]
+modulate = Color( 0.552941, 0.603922, 0.917647, 1 )
 tile_data = PoolIntArray( 327687, 23, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393223, 22, 0, 458757, 8, 0, 589830, 8, 0 )

 [node name="Waste" parent="Floor" index="5"]
-tile_data = PoolIntArray( 327688, 15, 0, 393222, 12, 0, 458758, 10, 0, 458759, 9, 0, 458761, 11, 0, 524296, 13, 0, 524298, 12, 0 )
+tile_data = PoolIntArray( 327688, 50, 0, 393222, 44, 0, 458758, 34, 0, 458759, 49, 0, 458761, 36, 0, 524296, 46, 0, 524298, 47, 0 )

 [node name="Player" parent="Floor" index="6"]
+modulate = Color( 0.666667, 0.701961, 0.937255, 1 )
 position = Vector2( 720, 600 )
 rest = 0.15
 reservoir = 7

 [node name="Stairs" parent="Floor" index="7"]
+visible = true
+modulate = Color( 0.552941, 0.603922, 0.917647, 1 )
 position = Vector2( 480, 480 )

+[node name="Drum" parent="Floor" index="8"]
+stream = ExtResource( 5 )
+
+[node name="Bass" parent="Floor" index="9"]
+stream = ExtResource( 4 )
+
 [node name="Reservoir" parent="Floor" index="10"]
 frame = 7

+[node name="Lead" parent="Floor" index="11"]
+stream = ExtResource( 3 )
+
 [node name="Controls" parent="Floor" index="12"]
 texture = ExtResource( 1 )
 turbo = true
--- a/Scenes/Game.tscn
+++ b/Scenes/Game.tscn
@ -1,7 +1,25 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=4 format=2]

 [ext_resource path="res://Levels/Level_0.tscn" type="PackedScene" id=1]
+[ext_resource path="res://Script/MusicManager.gd" type="Script" id=2]
+[ext_resource path="res://Script/Game.gd" type="Script" id=3]

-[node name="Root" type="Node2D"]
+[node name="Game" type="Node2D"]
+script = ExtResource( 3 )

-[node name="Node2D2" parent="." instance=ExtResource( 1 )]
+[node name="Level" parent="." instance=ExtResource( 1 )]
+
+[node name="MusicManager" type="Node" parent="."]
+script = ExtResource( 2 )
+
+[node name="Drum" type="AudioStreamPlayer" parent="MusicManager"]
+bus = "drum"
+
+[node name="Bass" type="AudioStreamPlayer" parent="MusicManager"]
+bus = "drum"
+
+[node name="Lead" type="AudioStreamPlayer" parent="MusicManager"]
+bus = "drum"
+
+[editable path="Level"]
+[editable path="Level/Floor"]
--- a/Scenes/Level.tscn
+++ b/Scenes/Level.tscn
@ -92,15 +92,14 @@ frames = ExtResource( 32 )

 [node name="Sound" type="AudioStreamPlayer" parent="Stairs" index="1"]
 stream = ExtResource( 9 )
+bus = "sfx"

 [node name="Drum" type="AudioStreamPlayer" parent="." index="8"]
 stream = ExtResource( 4 )
-autoplay = true
 bus = "drum"

 [node name="Bass" type="AudioStreamPlayer" parent="." index="9"]
 stream = ExtResource( 5 )
-autoplay = true
 bus = "drum"

 [node name="Reservoir" type="AnimatedSprite" parent="." index="10"]
@ -110,7 +109,6 @@ frame = 5

 [node name="Lead" type="AudioStreamPlayer" parent="." index="11"]
 stream = ExtResource( 6 )
-autoplay = true
 bus = "drum"

 [node name="Controls" type="Sprite" parent="." index="12"]
--- a/Script/Game.gd
+++ b/Script/Game.gd
@ -0,0 +1,10 @@
+extends Node2D
+
+class_name Game
+
+func _ready():
+	new_level($Level)
+	
+
+func new_level(var level :Node):
+	$MusicManager.new_sounds(level.get_node("Floor/Drum").stream, level.get_node("Floor/Bass").stream, level.get_node("Floor/Lead").stream)
--- a/Script/Level.gd
+++ b/Script/Level.gd
@ -170,7 +170,7 @@ func show_stairs() -> void:
 	_stairs.frame = 0
 	_stairs.visible = true
 	_stairs.play()
-	($Stairs/Sound as AudioStreamPlayer).play()
+	$Stairs/Sound.play()
 	completed = true

 func update_reservoir() -> void:
@ -210,6 +210,9 @@ func end_of_level():
 	downstairs.connect("animation_finished", self, "next_level")
 	
 func next_level():
+	var parent = get_parent()
 	if next_level:
-		get_parent().add_child(next_level.instance())
-	get_parent().remove_child(self)
+		var new = next_level.instance()
+		parent.add_child(new)
+		$"/root/Game".new_level(new)
+	parent.remove_child(self)
--- a/Script/MusicManager.gd
+++ b/Script/MusicManager.gd
@ -0,0 +1,31 @@
+extends Node
+
+
+onready var players = [
+	$Drum as AudioStreamPlayer,
+	$Bass as AudioStreamPlayer,
+	$Lead as AudioStreamPlayer
+]
+
+#var swapping = {
+#	players = [],
+#	streams = []
+#}
+
+func new_sounds(drum, bass, lead):
+	var sounds = [drum, bass, lead]
+	for i in 3:
+		if players[i].stream != sounds[i]:
+			var position = players[i].get_playback_position()
+			players[i].stream = sounds[i]
+			players[i].play(position)
+		if not players[i].playing:
+			players[i].play()
+
+#func _process(delta):
+#
+#	for i in swapping.players.size():
+#		var player := swapping.players[i] as AudioStreamPlayer
+#		var stream := swapping.streams[i] as AudioStream
+#
+#		player.volume_db = player.volume_db - delta * 10
--- a/Sounds/sfx_discovery.mp3.import
+++ b/Sounds/sfx_discovery.mp3.import
@ -11,5 +11,5 @@ dest_files=[ "res://.import/sfx_discovery.mp3-cb4b693e275a1b5cab388f175bd47482.m

 [params]

-loop=true
+loop=false
 loop_offset=0
--- a/project.godot
+++ b/project.godot
@ -9,6 +9,11 @@
 config_version=4

 _global_script_classes=[ {
+"base": "Node2D",
+"class": "Game",
+"language": "GDScript",
+"path": "res://Script/Game.gd"
+}, {
 "base": "TileMap",
 "class": "Level",
 "language": "GDScript",
@ -20,6 +25,7 @@ _global_script_classes=[ {
 "path": "res://Script/Player.gd"
 } ]
 _global_script_class_icons={
+"Game": "",
 "Level": "",
 "Player": ""
 }
Author	SHA1	Message	Date
Manu	057e52b30e	Merge branch 'level-design' of https://git.disroot.org/etbh/Cleanomancer	2021-04-27 00:17:44 +02:00
Manu	af31c010c6	hotswap between sounds	2021-04-27 00:11:43 +02:00
Arthur	389abfea02	Touch ups (and fixing the "downstairs" in lv 4 that was set to visible	2021-04-26 23:08:53 +02:00
Arthur	35f885cc67	Painted and added the evolutive music	2021-04-26 22:57:52 +02:00