diff --git a/Assets/Rock T1.png b/Assets/Rock T1.png new file mode 100644 index 0000000..e484ab6 Binary files /dev/null and b/Assets/Rock T1.png differ diff --git a/Assets/Rock T1.png.import b/Assets/Rock T1.png.import new file mode 100644 index 0000000..6d1ab8c --- /dev/null +++ b/Assets/Rock T1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Rock T1.png-92a72d5e03b07b1292bf4a36c7061e28.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Rock T1.png" +dest_files=[ "res://.import/Rock T1.png-92a72d5e03b07b1292bf4a36c7061e28.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Assets/Rock T2.png b/Assets/Rock T2.png new file mode 100644 index 0000000..a739607 Binary files /dev/null and b/Assets/Rock T2.png differ diff --git a/Assets/Rock T2.png.import b/Assets/Rock T2.png.import new file mode 100644 index 0000000..ea66a95 --- /dev/null +++ b/Assets/Rock T2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Rock T2.png-b286d35720049655d70d5752eae22960.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Rock T2.png" +dest_files=[ "res://.import/Rock T2.png-b286d35720049655d70d5752eae22960.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Assets/RubicCube.png b/Assets/RubicCube.png new file mode 100644 index 0000000..4a27fc7 Binary files /dev/null and b/Assets/RubicCube.png differ diff --git a/Assets/RubicCube.png.import b/Assets/RubicCube.png.import new file mode 100644 index 0000000..0d663d3 --- /dev/null +++ b/Assets/RubicCube.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/RubicCube.png-9186de3ac7e6096124ec148c9051d54a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/RubicCube.png" +dest_files=[ "res://.import/RubicCube.png-9186de3ac7e6096124ec148c9051d54a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Scene/FastTrail.tscn b/Scene/FastTrail.tscn index 3d038e6..55a07be 100644 --- a/Scene/FastTrail.tscn +++ b/Scene/FastTrail.tscn @@ -3,6 +3,7 @@ [ext_resource path="res://Assets/PAINT1.png" type="Texture" id=1] [ext_resource path="res://Scripts/FastTrail.gd" type="Script" id=2] [ext_resource path="res://Assets/BigPlaceholder.png" type="Texture" id=3] +[ext_resource path="res://Sounds/PaintJamSpeedUp.wav" type="AudioStream" id=3] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 88.8117, 26.2111 ) @@ -31,3 +32,5 @@ scale = Vector2( 1, 1.2 ) texture = ExtResource( 3 ) mode = 3 range_item_cull_mask = 64 +[node name="AudioPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 3 ) diff --git a/Scene/GameMap.tscn b/Scene/GameMap.tscn index 57b8e78..9dd28db 100644 --- a/Scene/GameMap.tscn +++ b/Scene/GameMap.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Assets/Tiling/Tileset.tres" type="TileSet" id=1] [ext_resource path="res://Scene/Player.tscn" type="PackedScene" id=2] @@ -6,6 +6,8 @@ [ext_resource path="res://Scene/EndGameWindow.tscn" type="PackedScene" id=4] [ext_resource path="res://Scene/GameManager.tscn" type="PackedScene" id=5] [ext_resource path="res://Sounds/PaintJamMainTheme.wav" type="AudioStream" id=6] +[ext_resource path="res://Scene/Rocher1.tscn" type="PackedScene" id=7] +[ext_resource path="res://Scene/Rocher2.tscn" type="PackedScene" id=8] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 991.884, 66.2394 ) @@ -25,7 +27,7 @@ tile_set = ExtResource( 1 ) cell_size = Vector2( 32, 32 ) cell_quadrant_size = 32 format = 1 -tile_data = PoolIntArray( 0, 11, 0, 1, 13, 0, 2, 13, 0, 3, 13, 0, 4, 13, 0, 5, 13, 0, 6, 13, 0, 7, 13, 0, 8, 13, 0, 9, 13, 0, 10, 13, 0, 11, 13, 0, 12, 13, 0, 13, 13, 0, 14, 13, 0, 15, 13, 0, 16, 13, 0, 17, 13, 0, 18, 13, 0, 19, 13, 0, 20, 13, 0, 21, 13, 0, 22, 13, 0, 23, 13, 0, 24, 13, 0, 25, 13, 0, 26, 13, 0, 27, 13, 0, 28, 13, 0, 29, 13, 0, 30, 13, 0, 31, 13, 0, 32, 13, 0, 33, 13, 0, 34, 13, 0, 35, 13, 0, 36, 13, 0, 37, 13, 0, 38, 13, 0, 39, 13, 0, 40, 13, 0, 41, 13, 0, 42, 13, 0, 43, 13, 0, 44, 13, 0, 45, 13, 0, 46, 13, 0, 47, 13, 0, 48, 13, 0, 49, 13, 0, 50, 13, 0, 51, 13, 0, 52, 13, 0, 53, 13, 0, 54, 13, 0, 55, 13, 0, 56, 13, 0, 57, 13, 0, 58, 13, 0, 59, 12, 0, 65536, 7, 0, 65537, 4, 0, 65538, 4, 0, 65539, 4, 1, 65540, 4, 65536, 65541, 4, 0, 65542, 4, 0, 65543, 4, 65536, 65544, 4, 0, 65545, 4, 0, 65546, 4, 0, 65547, 4, 0, 65548, 4, 0, 65549, 4, 1, 65550, 4, 1, 65551, 4, 0, 65552, 4, 65536, 65553, 4, 65536, 65554, 4, 0, 65555, 4, 0, 65556, 4, 0, 65557, 4, 65537, 65558, 4, 65537, 65559, 4, 0, 65560, 4, 1, 65561, 4, 1, 65562, 4, 0, 65563, 4, 0, 65564, 4, 0, 65565, 4, 1, 65566, 4, 65537, 65567, 4, 65537, 65568, 4, 65537, 65569, 4, 0, 65570, 4, 65536, 65571, 4, 0, 65572, 4, 0, 65573, 4, 0, 65574, 4, 0, 65575, 4, 0, 65576, 4, 0, 65577, 4, 0, 65578, 4, 0, 65579, 4, 0, 65580, 4, 0, 65581, 4, 0, 65582, 4, 0, 65583, 4, 0, 65584, 4, 0, 65585, 4, 1, 65586, 4, 65536, 65587, 4, 1, 65588, 4, 65537, 65589, 4, 65537, 65590, 4, 0, 65591, 4, 65537, 65592, 4, 0, 65593, 4, 0, 65594, 4, 0, 65595, 10, 0, 131072, 7, 0, 131073, 4, 0, 131074, 4, 65536, 131075, 4, 0, 131076, 4, 65537, 131077, 4, 65537, 131078, 4, 0, 131079, 4, 0, 131080, 4, 1, 131081, 4, 1, 131082, 4, 0, 131083, 4, 0, 131084, 4, 0, 131085, 4, 65536, 131086, 4, 0, 131087, 4, 0, 131088, 4, 65537, 131089, 4, 65537, 131090, 4, 0, 131091, 4, 0, 131092, 4, 0, 131093, 4, 0, 131094, 4, 0, 131095, 4, 0, 131096, 4, 0, 131097, 4, 1, 131098, 4, 1, 131099, 4, 1, 131100, 4, 65536, 131101, 4, 1, 131102, 4, 0, 131103, 4, 0, 131104, 4, 1, 131105, 4, 0, 131106, 4, 0, 131107, 4, 1, 131108, 4, 1, 131109, 4, 1, 131110, 4, 1, 131111, 4, 1, 131112, 4, 0, 131113, 4, 65537, 131114, 4, 65537, 131115, 4, 65537, 131116, 4, 65537, 131117, 4, 0, 131118, 4, 65536, 131119, 4, 65537, 131120, 4, 0, 131121, 4, 0, 131122, 4, 0, 131123, 4, 0, 131124, 4, 1, 131125, 4, 0, 131126, 4, 0, 131127, 4, 0, 131128, 4, 0, 131129, 4, 0, 131130, 4, 65537, 131131, 10, 0, 196608, 6, 0, 196609, 14, 0, 196610, 14, 0, 196611, 14, 0, 196612, 14, 0, 196613, 14, 0, 196614, 14, 0, 196615, 14, 0, 196616, 14, 0, 196617, 14, 0, 196618, 14, 0, 196619, 14, 0, 196620, 14, 0, 196621, 14, 0, 196622, 14, 0, 196623, 14, 0, 196624, 14, 0, 196625, 14, 0, 196626, 14, 0, 196627, 14, 0, 196628, 14, 0, 196629, 14, 0, 196630, 14, 0, 196631, 14, 0, 196632, 14, 0, 196633, 14, 0, 196634, 14, 0, 196635, 14, 0, 196636, 14, 0, 196637, 14, 0, 196638, 14, 0, 196639, 14, 0, 196640, 14, 0, 196641, 14, 0, 196642, 14, 0, 196643, 14, 0, 196644, 14, 0, 196645, 14, 0, 196646, 14, 0, 196647, 14, 0, 196648, 14, 0, 196649, 14, 0, 196650, 14, 0, 196651, 14, 0, 196652, 14, 0, 196653, 14, 0, 196654, 14, 0, 196655, 14, 0, 196656, 14, 0, 196657, 14, 0, 196658, 14, 0, 196659, 14, 0, 196660, 14, 0, 196661, 14, 0, 196662, 14, 0, 196663, 14, 0, 196664, 14, 0, 196665, 14, 0, 196666, 14, 0, 196667, 9, 0, 262144, 5, 0, 262159, 0, 131079, 262203, 8, 0, 327680, 5, 0, 327739, 8, 0, 393216, 5, 0, 393268, 2, 2, 393275, 8, 0, 458752, 5, 0, 458796, 3, 65536, 458803, 2, 2, 458804, 2, 2, 458805, 2, 2, 458811, 8, 0, 524288, 5, 0, 524292, 0, 131079, 524329, 3, 65538, 524330, 3, 65538, 524332, 3, 65538, 524333, 3, 65538, 524338, 2, 2, 524339, 2, 2, 524340, 2, 2, 524341, 3, 65537, 524342, 2, 2, 524347, 8, 0, 589824, 5, 0, 589840, 0, 131079, 589852, 3, 65538, 589868, 3, 65536, 589874, 2, 2, 589875, 3, 65539, 589876, 2, 2, 589877, 3, 65539, 589878, 2, 2, 589883, 8, 0, 655360, 5, 0, 655373, 0, 131078, 655388, 0, 131078, 655389, 0, 131078, 655410, 2, 2, 655411, 3, 65537, 655412, 2, 2, 655413, 2, 2, 655414, 2, 2, 655419, 8, 0, 720896, 5, 0, 720946, 2, 2, 720947, 2, 2, 720948, 2, 2, 720949, 2, 2, 720950, 2, 2, 720955, 8, 0, 786432, 5, 0, 786450, 0, 131079, 786482, 2, 2, 786483, 0, 131078, 786484, 0, 131079, 786485, 0, 131078, 786486, 2, 2, 786491, 8, 0, 851968, 5, 0, 852018, 2, 2, 852019, 3, 0, 852020, 0, 131079, 852021, 3, 0, 852022, 2, 2, 852027, 8, 0, 917504, 5, 0, 917509, 0, 131078, 917555, 2, 2, 917556, 2, 2, 917557, 2, 2, 917563, 8, 0, 983040, 5, 0, 983074, 3, 65538, 983075, 3, 65538, 983076, 3, 65538, 983086, 2, 6, 983099, 8, 0, 1048576, 5, 0, 1048590, 2, 5, 1048593, 0, 131078, 1048597, 3, 65538, 1048598, 3, 65536, 1048599, 3, 65536, 1048600, 3, 65536, 1048612, 3, 65536, 1048613, 3, 65538, 1048621, 2, 5, 1048622, 2, 7, 1048623, 2, 6, 1048635, 8, 0, 1114112, 5, 0, 1114148, 3, 65536, 1114149, 3, 65538, 1114150, 3, 65538, 1114151, 3, 65538, 1114152, 3, 65538, 1114153, 3, 65538, 1114154, 3, 65538, 1114155, 3, 65538, 1114156, 3, 65538, 1114171, 8, 0, 1179648, 5, 0, 1179682, 3, 65538, 1179683, 3, 65538, 1179684, 3, 65538, 1179692, 3, 65538, 1179707, 8, 0, 1245184, 5, 0, 1245215, 3, 65536, 1245216, 3, 65538, 1245217, 3, 65538, 1245226, 3, 65536, 1245243, 8, 0, 1310720, 5, 0, 1310728, 2, 7, 1310738, 3, 65539, 1310751, 3, 65538, 1310762, 3, 65536, 1310764, 3, 65536, 1310765, 3, 65536, 1310779, 8, 0, 1376256, 5, 0, 1376287, 3, 65538, 1376299, 3, 65536, 1376301, 3, 65539, 1376302, 3, 65539, 1376315, 8, 0, 1441792, 5, 0, 1441819, 0, 131078, 1441822, 3, 65538, 1441824, 0, 131078, 1441835, 3, 65536, 1441851, 8, 0, 1507328, 5, 0, 1507337, 0, 131079, 1507346, 3, 65539, 1507355, 0, 131078, 1507358, 3, 65538, 1507372, 3, 65536, 1507387, 8, 0, 1572864, 5, 0, 1572878, 2, 5, 1572882, 3, 65539, 1572887, 3, 65536, 1572890, 0, 131078, 1572894, 3, 65538, 1572904, 3, 65536, 1572905, 3, 65539, 1572906, 3, 65539, 1572914, 2, 5, 1572923, 8, 0, 1638400, 5, 0, 1638418, 3, 65539, 1638424, 3, 65536, 1638426, 0, 131078, 1638430, 3, 65538, 1638439, 3, 65536, 1638450, 2, 7, 1638459, 8, 0, 1703936, 5, 0, 1703953, 3, 65539, 1703960, 3, 65536, 1703966, 3, 65538, 1703995, 8, 0, 1769472, 5, 0, 1769486, 0, 131078, 1769489, 3, 65539, 1769492, 0, 131078, 1769497, 3, 65536, 1769503, 3, 65538, 1769504, 3, 65538, 1769531, 8, 0, 1835008, 5, 0, 1835015, 2, 7, 1835025, 3, 65539, 1835034, 3, 65536, 1835041, 3, 65538, 1835047, 3, 65539, 1835048, 3, 65539, 1835067, 8, 0, 1900544, 5, 0, 1900571, 3, 65536, 1900578, 3, 65538, 1900579, 3, 65538, 1900580, 3, 65538, 1900581, 3, 65538, 1900582, 3, 65538, 1900583, 0, 131078, 1900584, 3, 65539, 1900585, 0, 131078, 1900586, 0, 131078, 1900587, 0, 131078, 1900603, 8, 0, 1966080, 5, 0, 1966108, 3, 65536, 1966139, 8, 0, 2031616, 5, 0, 2031633, 3, 65539, 2031666, 3, 65539, 2031675, 8, 0, 2097152, 5, 0, 2097211, 8, 0, 2162688, 5, 0, 2162747, 8, 0 ) +tile_data = PoolIntArray( 0, 11, 0, 1, 13, 0, 2, 13, 0, 3, 13, 0, 4, 13, 0, 5, 13, 0, 6, 13, 0, 7, 13, 0, 8, 13, 0, 9, 13, 0, 10, 13, 0, 11, 13, 0, 12, 13, 0, 13, 13, 0, 14, 13, 0, 15, 13, 0, 16, 13, 0, 17, 13, 0, 18, 13, 0, 19, 13, 0, 20, 13, 0, 21, 13, 0, 22, 13, 0, 23, 13, 0, 24, 13, 0, 25, 13, 0, 26, 13, 0, 27, 13, 0, 28, 13, 0, 29, 13, 0, 30, 13, 0, 31, 13, 0, 32, 13, 0, 33, 13, 0, 34, 13, 0, 35, 13, 0, 36, 13, 0, 37, 13, 0, 38, 13, 0, 39, 13, 0, 40, 13, 0, 41, 13, 0, 42, 13, 0, 43, 13, 0, 44, 13, 0, 45, 13, 0, 46, 13, 0, 47, 13, 0, 48, 13, 0, 49, 13, 0, 50, 13, 0, 51, 13, 0, 52, 13, 0, 53, 13, 0, 54, 13, 0, 55, 13, 0, 56, 13, 0, 57, 13, 0, 58, 13, 0, 59, 12, 0, 65536, 7, 0, 65537, 4, 0, 65538, 4, 0, 65539, 4, 1, 65540, 4, 65536, 65541, 4, 0, 65542, 4, 0, 65543, 4, 65536, 65544, 4, 0, 65545, 4, 0, 65546, 4, 0, 65547, 4, 0, 65548, 4, 0, 65549, 4, 1, 65550, 4, 1, 65551, 4, 0, 65552, 4, 65536, 65553, 4, 65536, 65554, 4, 0, 65555, 4, 0, 65556, 4, 0, 65557, 4, 65537, 65558, 4, 65537, 65559, 4, 0, 65560, 4, 1, 65561, 4, 1, 65562, 4, 0, 65563, 4, 0, 65564, 4, 0, 65565, 4, 1, 65566, 4, 65537, 65567, 4, 65537, 65568, 4, 65537, 65569, 4, 0, 65570, 4, 65536, 65571, 4, 0, 65572, 4, 0, 65573, 4, 0, 65574, 4, 0, 65575, 4, 0, 65576, 4, 0, 65577, 4, 0, 65578, 4, 0, 65579, 4, 0, 65580, 4, 0, 65581, 4, 0, 65582, 4, 0, 65583, 4, 0, 65584, 4, 0, 65585, 4, 1, 65586, 4, 65536, 65587, 4, 1, 65588, 4, 65537, 65589, 4, 65537, 65590, 4, 0, 65591, 4, 65537, 65592, 4, 0, 65593, 4, 0, 65594, 4, 0, 65595, 10, 0, 131072, 7, 0, 131073, 4, 0, 131074, 4, 65536, 131075, 4, 0, 131076, 4, 65537, 131077, 4, 65537, 131078, 4, 0, 131079, 4, 0, 131080, 4, 1, 131081, 4, 1, 131082, 4, 0, 131083, 4, 0, 131084, 4, 0, 131085, 4, 65536, 131086, 4, 0, 131087, 4, 0, 131088, 4, 65537, 131089, 4, 65537, 131090, 4, 0, 131091, 4, 0, 131092, 4, 0, 131093, 4, 0, 131094, 4, 0, 131095, 4, 0, 131096, 4, 0, 131097, 4, 1, 131098, 4, 1, 131099, 4, 1, 131100, 4, 65536, 131101, 4, 1, 131102, 4, 0, 131103, 4, 0, 131104, 4, 1, 131105, 4, 0, 131106, 4, 0, 131107, 4, 1, 131108, 4, 1, 131109, 4, 1, 131110, 4, 1, 131111, 4, 1, 131112, 4, 0, 131113, 4, 65537, 131114, 4, 65537, 131115, 4, 65537, 131116, 4, 65537, 131117, 4, 0, 131118, 4, 65536, 131119, 4, 65537, 131120, 4, 0, 131121, 4, 0, 131122, 4, 0, 131123, 4, 0, 131124, 4, 1, 131125, 4, 0, 131126, 4, 0, 131127, 4, 0, 131128, 4, 0, 131129, 4, 0, 131130, 4, 65537, 131131, 10, 0, 196608, 6, 0, 196609, 14, 0, 196610, 14, 0, 196611, 14, 0, 196612, 14, 0, 196613, 14, 0, 196614, 14, 0, 196615, 14, 0, 196616, 14, 0, 196617, 14, 0, 196618, 14, 0, 196619, 14, 0, 196620, 14, 0, 196621, 14, 0, 196622, 14, 0, 196623, 14, 0, 196624, 14, 0, 196625, 14, 0, 196626, 14, 0, 196627, 14, 0, 196628, 14, 0, 196629, 14, 0, 196630, 14, 0, 196631, 14, 0, 196632, 14, 0, 196633, 14, 0, 196634, 14, 0, 196635, 14, 0, 196636, 14, 0, 196637, 14, 0, 196638, 14, 0, 196639, 14, 0, 196640, 14, 0, 196641, 14, 0, 196642, 14, 0, 196643, 14, 0, 196644, 14, 0, 196645, 14, 0, 196646, 14, 0, 196647, 14, 0, 196648, 14, 0, 196649, 14, 0, 196650, 14, 0, 196651, 14, 0, 196652, 14, 0, 196653, 14, 0, 196654, 14, 0, 196655, 14, 0, 196656, 14, 0, 196657, 14, 0, 196658, 14, 0, 196659, 14, 0, 196660, 14, 0, 196661, 14, 0, 196662, 14, 0, 196663, 14, 0, 196664, 14, 0, 196665, 14, 0, 196666, 14, 0, 196667, 9, 0, 262144, 5, 0, 262159, 0, 131079, 262203, 8, 0, 327680, 5, 0, 327739, 8, 0, 393216, 5, 0, 393268, 2, 2, 393275, 8, 0, 458752, 5, 0, 458796, 3, 65536, 458803, 2, 2, 458804, 2, 2, 458805, 2, 2, 458811, 8, 0, 524288, 5, 0, 524292, 0, 131079, 524329, 3, 65538, 524330, 3, 65538, 524332, 3, 65538, 524333, 3, 65538, 524338, 2, 2, 524339, 2, 2, 524340, 2, 2, 524341, 3, 65537, 524342, 2, 2, 524347, 8, 0, 589824, 5, 0, 589840, 0, 131079, 589852, 3, 65538, 589868, 3, 65536, 589874, 2, 2, 589875, 3, 65539, 589876, 2, 2, 589877, 3, 65539, 589878, 2, 2, 589883, 8, 0, 655360, 5, 0, 655373, 0, 131078, 655388, 0, 131078, 655389, 0, 131078, 655410, 2, 2, 655411, 3, 65537, 655412, 2, 2, 655413, 2, 2, 655414, 2, 2, 655419, 8, 0, 720896, 5, 0, 720946, 2, 2, 720947, 2, 2, 720948, 2, 2, 720949, 2, 2, 720950, 2, 2, 720955, 8, 0, 786432, 5, 0, 786450, 0, 131079, 786482, 2, 2, 786483, 0, 131078, 786484, 0, 131079, 786485, 0, 131078, 786486, 2, 2, 786491, 8, 0, 851968, 5, 0, 852018, 2, 2, 852019, 3, 0, 852020, 0, 131079, 852021, 3, 0, 852022, 2, 2, 852027, 8, 0, 917504, 5, 0, 917509, 0, 131078, 917555, 2, 2, 917556, 2, 2, 917557, 2, 2, 917563, 8, 0, 983040, 5, 0, 983074, 3, 65538, 983075, 3, 65538, 983076, 3, 65538, 983086, 2, 6, 983099, 8, 0, 1048576, 5, 0, 1048590, 2, 5, 1048593, 0, 131078, 1048597, 3, 65538, 1048598, 3, 65536, 1048599, 3, 65536, 1048600, 3, 65536, 1048612, 3, 65536, 1048613, 3, 65538, 1048621, 2, 5, 1048622, 2, 7, 1048623, 2, 6, 1048635, 8, 0, 1114112, 5, 0, 1114148, 3, 65536, 1114149, 3, 65538, 1114150, 3, 65538, 1114151, 3, 65538, 1114152, 3, 65538, 1114153, 3, 65538, 1114154, 3, 65538, 1114155, 3, 65538, 1114156, 3, 65538, 1114171, 8, 0, 1179648, 5, 0, 1179682, 3, 65538, 1179683, 3, 65538, 1179684, 3, 65538, 1179692, 3, 65538, 1179707, 8, 0, 1245184, 5, 0, 1245215, 3, 65536, 1245216, 3, 65538, 1245217, 3, 65538, 1245226, 3, 65536, 1245243, 8, 0, 1310720, 5, 0, 1310728, 2, 7, 1310738, 3, 65539, 1310751, 3, 65538, 1310762, 3, 65536, 1310764, 3, 65536, 1310765, 3, 65536, 1310779, 8, 0, 1376256, 5, 0, 1376287, 3, 65538, 1376299, 3, 65536, 1376301, 3, 65539, 1376302, 3, 65539, 1376315, 8, 0, 1441792, 5, 0, 1441819, 0, 131078, 1441822, 3, 65538, 1441824, 0, 131078, 1441835, 3, 65536, 1441851, 8, 0, 1507328, 5, 0, 1507337, 0, 131079, 1507346, 3, 65539, 1507355, 0, 131078, 1507358, 3, 65538, 1507372, 3, 65536, 1507387, 8, 0, 1572864, 5, 0, 1572878, 2, 5, 1572882, 3, 65539, 1572887, 3, 65536, 1572890, 0, 131078, 1572894, 3, 65538, 1572904, 3, 65536, 1572905, 3, 65539, 1572906, 3, 65539, 1572914, 2, 5, 1572923, 8, 0, 1638400, 5, 0, 1638405, -1610612736, 0, 1638418, 3, 65539, 1638424, 3, 65536, 1638426, 0, 131078, 1638430, 3, 65538, 1638439, 3, 65536, 1638450, 2, 7, 1638459, 8, 0, 1703936, 5, 0, 1703953, 3, 65539, 1703960, 3, 65536, 1703966, 3, 65538, 1703995, 8, 0, 1769472, 5, 0, 1769486, 0, 131078, 1769489, 3, 65539, 1769492, 0, 131078, 1769497, 3, 65536, 1769503, 3, 65538, 1769504, 3, 65538, 1769531, 8, 0, 1835008, 5, 0, 1835015, 2, 7, 1835025, 3, 65539, 1835034, 3, 65536, 1835041, 3, 65538, 1835047, 3, 65539, 1835048, 3, 65539, 1835067, 8, 0, 1900544, 5, 0, 1900571, 3, 65536, 1900578, 3, 65538, 1900579, 3, 65538, 1900580, 3, 65538, 1900581, 3, 65538, 1900582, 3, 65538, 1900583, 0, 131078, 1900584, 3, 65539, 1900585, 0, 131078, 1900586, 0, 131078, 1900587, 0, 131078, 1900603, 8, 0, 1966080, 5, 0, 1966108, 3, 65536, 1966139, 8, 0, 2031616, 5, 0, 2031633, 3, 65539, 2031666, 3, 65539, 2031675, 8, 0, 2097152, 5, 0, 2097211, 8, 0, 2162688, 5, 0, 2162747, 8, 0 ) [node name="UpperWall" type="StaticBody2D" parent="Walls"] visible = false @@ -125,3 +127,23 @@ position = Vector2( 1730.27, 580.843 ) [node name="MainTheme" type="AudioStreamPlayer" parent="."] stream = ExtResource( 6 ) autoplay = true + +[node name="Rocher1" parent="." instance=ExtResource( 7 )] +position = Vector2( 770.728, 558.353 ) +scale = Vector2( 2.26869, 2.16 ) + +[node name="Rocher2" parent="." instance=ExtResource( 8 )] +position = Vector2( 1225.16, 669.584 ) +scale = Vector2( 2.08, 1.88 ) + +[node name="Rocher4" parent="." instance=ExtResource( 8 )] +position = Vector2( 626.307, 196.895 ) +scale = Vector2( 2.08, 1.88 ) + +[node name="Rocher3" parent="." instance=ExtResource( 7 )] +position = Vector2( 177.354, 817.737 ) +scale = Vector2( 2.04, 1.92 ) + +[node name="Rocher5" parent="." instance=ExtResource( 7 )] +position = Vector2( 1713.04, 875.64 ) +scale = Vector2( 2.04, 1.92 ) diff --git a/Scene/Player.tscn b/Scene/Player.tscn index aa1432f..a660daa 100644 --- a/Scene/Player.tscn +++ b/Scene/Player.tscn @@ -310,5 +310,5 @@ scale = Vector2( 1.1136, 1.2906 ) z_index = -1 texture = ExtResource( 5 ) -[node name="PickupPlayer" type="AudioStreamPlayer" parent="."] +[node name="AudioPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource( 4 ) diff --git a/Scene/Rocher1.tscn b/Scene/Rocher1.tscn new file mode 100644 index 0000000..60cd73e --- /dev/null +++ b/Scene/Rocher1.tscn @@ -0,0 +1,14 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Assets/Rock T1.png" type="Texture" id=1] + +[node name="Rocher1" type="StaticBody2D"] + +[node name="Sprite" type="Sprite" parent="."] +z_index = 20 +texture = ExtResource( 1 ) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] +position = Vector2( 0.387421, 0 ) +z_index = 20 +polygon = PoolVector2Array( -7.63457, -11.7133, 4.8037, -11.9173, 8.88182, -9.67429, 11.7365, -5.39226, 12.5521, -0.702423, 15.8146, 2.15226, 16.0185, 9.08506, 12.3482, 11.5319, 6.43495, 12.5515, 3.98808, 11.1241, 1.54121, 12.1437, -9.87753, 12.5515, -13.9556, 9.49288, -14.9752, 1.74445, -14.3635, -3.3532, -10.8971, -9.26647 ) diff --git a/Scene/Rocher2.tscn b/Scene/Rocher2.tscn new file mode 100644 index 0000000..c5289c4 --- /dev/null +++ b/Scene/Rocher2.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Assets/Rock T2.png" type="Texture" id=1] + +[node name="Rocher2" type="StaticBody2D"] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] +polygon = PoolVector2Array( -2.78302, -31.5943, 3.65785, -23.6813, 9.73068, -22.5771, 12.8591, -16.5043, 13.9633, -6.56691, 12.4911, -1.41421, 8.62654, 4.10654, 13.5952, 12.7557, 15.2514, 20.1167, 11.939, 26.5576, 7.15434, 28.0298, -0.574722, 29.134, -9.40793, 29.318, -13.4565, 27.2937, -15.1127, 22.6931, -16.5849, 12.7557, -13.8245, 7.05095, -14.9287, 3.92252, -14.3766, -0.862129, -11.2482, -8.59119, -7.93572, -18.1605, -5.5434, -26.0736, -4.99133, -29.9381 ) diff --git a/Scene/SlowTrail.tscn b/Scene/SlowTrail.tscn index bdba376..22bbf7c 100644 --- a/Scene/SlowTrail.tscn +++ b/Scene/SlowTrail.tscn @@ -3,6 +3,7 @@ [ext_resource path="res://Assets/PAINT1.png" type="Texture" id=1] [ext_resource path="res://Scripts/SlowTrail.gd" type="Script" id=2] [ext_resource path="res://Assets/BigPlaceholder.png" type="Texture" id=3] +[ext_resource path="res://Sounds/PaintJamSlowDown.wav" type="AudioStream" id=3] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 88.8117, 26.2111 ) @@ -30,3 +31,5 @@ scale = Vector2( 1, 1.2 ) texture = ExtResource( 3 ) mode = 3 range_item_cull_mask = 512 +[node name="AudioPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 3 ) diff --git a/Scripts/FastTrail.gd b/Scripts/FastTrail.gd index d4ea5e4..8cbc996 100644 --- a/Scripts/FastTrail.gd +++ b/Scripts/FastTrail.gd @@ -1,5 +1,7 @@ extends Node +onready var audioPlayer = $AudioPlayer + var fastFactor var lifetime = 5 var elapsed = 0 @@ -11,6 +13,7 @@ onready var mask = $Mask func slow_player(victim): if victim.is_in_group("Player"): players.append(victim) + audioPlayer.play() func unslow_player(victim): players.remove(players.find(victim)) diff --git a/Scripts/Player.gd b/Scripts/Player.gd index bf63c65..062c34a 100644 --- a/Scripts/Player.gd +++ b/Scripts/Player.gd @@ -48,12 +48,14 @@ var inputs = ["ui_up", "ui_right", "ui_down", "ui_left"] onready var animationPlayer = $AnimationPlayer onready var animationTree = $AnimationTree onready var animationState = animationTree.get("parameters/playback") -onready var pickupPlayer = $PickupPlayer +onready var audioPlayer = $AudioPlayer onready var sprite = $Sprite onready var coll = $CollisionShape2D onready var conf = $ConfusionStars onready var pati = $Patins +var streams = [] + var healthBar = null func _ready(): @@ -67,8 +69,12 @@ func _ready(): elif self.name == "Player2": healthBar = get_tree().get_nodes_in_group("healthbar")[1] healthBar.maxHealthUpdated(MAX_LIFE) + streams.append(load("res://Sounds/PaintJamPickupSound.wav")) + streams.append(load("res://Sounds/PaintJamPaintAction.wav")) func launch_slow(): + audioPlayer.stream = streams[1] + audioPlayer.play() if slow_cooldown_elapsed < slow_cooldown: return curLife -= 3 @@ -88,6 +94,8 @@ func launch_slow(): world.add_child(inst) func launch_fast(): + audioPlayer.stream = streams[1] + audioPlayer.play() if fast_cooldown_elapsed < fast_cooldown: return curLife -= 3 @@ -217,6 +225,7 @@ func updatePaintEffects(delta): coroutines = updated + [] func addCoroutine(routine): - pickupPlayer.play() + audioPlayer.stream = streams[0] + audioPlayer.play() curLife = MAX_LIFE if (curLife + PICKUP_BONUS > MAX_LIFE) else curLife + PICKUP_BONUS coroutines.append(routine) diff --git a/Scripts/SlowTrail.gd b/Scripts/SlowTrail.gd index 568229a..30c8a19 100644 --- a/Scripts/SlowTrail.gd +++ b/Scripts/SlowTrail.gd @@ -1,5 +1,7 @@ extends Node +onready var audioPlayer = $AudioPlayer + var slowFactor var lifetime = 5 var elapsed = 0 @@ -11,6 +13,7 @@ onready var mask = $Mask func slow_player(victim): if victim.is_in_group("Player"): players.append(victim) + audioPlayer.play() func unslow_player(victim): players.remove(players.find(victim))