diff --git a/assets/Mega.png b/assets/Mega.png index cdce15d..b02e0d6 100644 Binary files a/assets/Mega.png and b/assets/Mega.png differ diff --git a/src/Levels/Level.tscn b/src/Levels/Level.tscn index 1499bf2..a15a733 100644 --- a/src/Levels/Level.tscn +++ b/src/Levels/Level.tscn @@ -29,7 +29,7 @@ extents = Vector2( 80, 2.5 ) extents = Vector2( 66.5, 80 ) [sub_resource type="RectangleShape2D" id=6] -extents = Vector2( 8, 55 ) +extents = Vector2( 8, 53 ) [node name="Level" type="Node2D"] script = ExtResource( 10 ) @@ -94,7 +94,7 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 16, 16 ) show_collision = true format = 1 -tile_data = PoolIntArray( -65536, 0, 196613, 65528, 0, 0, 0, 0, 196613, 79, 0, 196613, 65536, 0, 196613, 65615, 0, 196613, 196603, 0, 0, 131072, 0, 196613, 131151, 0, 196613, 196608, 0, 196613, 196687, 0, 196613, 262144, 0, 196613, 262172, 0, 196613, 262173, 0, 196613, 262174, 0, 196613, 262175, 0, 196613, 262176, 0, 196613, 262177, 0, 196613, 262223, 0, 196613, 327680, 0, 196613, 327759, 0, 196613, 393216, 0, 196613, 393260, 0, 196613, 393261, 0, 196613, 393295, 0, 196613, 458752, 0, 196613, 458792, 0, 196613, 458793, 0, 196613, 458794, 0, 196613, 458795, 0, 196613, 458796, 0, 196613, 458797, 0, 196613, 458831, 0, 196613, 524288, 0, 196613, 524307, 0, 196613, 524308, 0, 196613, 524327, 0, 196613, 524328, 0, 196613, 524329, 0, 196613, 524330, 0, 196613, 524334, 0, 196613, 524367, 0, 196613, 589824, 0, 196613, 589843, 0, 196613, 589844, 0, 196613, 589863, 0, 196613, 589864, 0, 196613, 589870, 0, 196613, 589903, 0, 196613, 655360, 0, 196613, 655361, 0, 2, 655362, 0, 2, 655363, 0, 2, 655364, 0, 2, 655365, 0, 2, 655366, 0, 2, 655367, 0, 2, 655368, 0, 2, 655369, 0, 2, 655370, 0, 2, 655371, 0, 2, 655372, 0, 2, 655373, 0, 2, 655374, 0, 2, 655375, 0, 2, 655376, 0, 2, 655377, 0, 2, 655378, 0, 2, 655379, 0, 196613, 655380, 0, 196613, 655381, 0, 196613, 655382, 0, 196613, 655383, 0, 196613, 655384, 0, 196613, 655385, 0, 196613, 655386, 0, 196613, 655387, 0, 196613, 655388, 0, 196613, 655389, 0, 196613, 655390, 0, 196613, 655391, 0, 196613, 655392, 0, 196613, 655393, 0, 196613, 655394, 0, 196613, 655395, 0, 196613, 655396, 0, 196613, 655397, 0, 196613, 655398, 0, 196613, 655399, 0, 196613, 655400, 0, 196613, 655406, 0, 196613, 655407, 0, 196613, 655408, 0, 196613, 655409, 0, 196613, 655410, 0, 196613, 655411, 0, 196613, 655412, 0, 196613, 655413, 0, 196613, 655414, 0, 196613, 655415, 0, 196613, 655416, 0, 196613, 655417, 0, 196613, 655418, 0, 196613, 655419, 0, 196613, 655420, 0, 196613, 655421, 0, 196613, 655422, 0, 196613, 655423, 0, 196613, 655424, 0, 196613, 655425, 0, 196613, 655426, 0, 196613, 655427, 0, 196613, 655428, 0, 196613, 655439, 0, 196613, 720896, 0, 196613, 720897, 0, 65538, 720898, 0, 65538, 720899, 0, 65538, 720900, 0, 65538, 720901, 0, 65538, 720902, 0, 65538, 720903, 0, 65538, 720904, 0, 65538, 720905, 0, 65538, 720906, 0, 65538, 720907, 0, 65538, 720908, 0, 65538, 720909, 0, 65538, 720910, 0, 65538, 720911, 0, 65538, 720912, 0, 65538, 720913, 0, 65538, 720914, 0, 65538, 720915, 0, 196613, 720916, 0, 196613, 720917, 0, 196613, 720918, 0, 196613, 720919, 0, 196613, 720920, 0, 196613, 720921, 0, 196613, 720930, 0, 196613, 720959, 0, 0, 720961, 0, 196613, 720962, 0, 196613, 720963, 0, 196613, 720964, 0, 196613, 720965, 0, 196613, 720975, 0, 196613, 786432, 0, 196613, 786466, 0, 196613, 786495, 0, 0, 786511, 0, 196613, 851968, 0, 196613, 852002, 0, 196613, 852031, 0, 0, 852047, 0, 196613, 917504, 0, 196613, 917530, 0, 262148, 917531, 0, 262149, 917532, 0, 262150, 917533, 0, 196613, 917534, 0, 196613, 917535, 0, 196613, 917536, 0, 196613, 917537, 0, 196613, 917538, 0, 196613, 917583, 0, 196613, 983040, 0, 196613, 983066, 0, 262148, 983067, 0, 262149, 983068, 0, 262150, 983119, 0, 196613, 1048576, 0, 196613, 1048602, 0, 262148, 1048603, 0, 262149, 1048604, 0, 262150, 1048655, 0, 196613, 1114112, 0, 196613, 1114138, 0, 262148, 1114139, 0, 262149, 1114140, 0, 262150, 1114167, 0, 196613, 1114168, 0, 196613, 1114169, 0, 196613, 1114170, 0, 196613, 1114171, 0, 196613, 1114191, 0, 196613, 1179648, 0, 196613, 1179674, 0, 262148, 1179675, 0, 262149, 1179676, 0, 262150, 1179701, 0, 196613, 1179702, 0, 196613, 1179703, 0, 196613, 1179707, 0, 196613, 1179708, 0, 196613, 1179709, 0, 196613, 1179727, 0, 196613, 1245184, 0, 196613, 1245210, 0, 262148, 1245211, 0, 262149, 1245212, 0, 262150, 1245236, 0, 196613, 1245237, 0, 196613, 1245245, 0, 196613, 1245246, 0, 196613, 1245247, 0, 196613, 1245263, 0, 196613, 1310720, 0, 196613, 1310746, 0, 262148, 1310747, 0, 262149, 1310748, 0, 262150, 1310771, 0, 196613, 1310772, 0, 196613, 1310783, 0, 196613, 1310784, 0, 196613, 1310799, 0, 196613, 1376256, 0, 196613, 1376257, 0, 196613, 1376258, 0, 196613, 1376259, 0, 196613, 1376260, 0, 196613, 1376261, 0, 196613, 1376262, 0, 196613, 1376263, 0, 196613, 1376264, 0, 196613, 1376265, 0, 196613, 1376266, 0, 196613, 1376267, 0, 196613, 1376268, 0, 196613, 1376269, 0, 196613, 1376270, 0, 196613, 1376271, 0, 196613, 1376272, 0, 196613, 1376273, 0, 196613, 1376274, 0, 196613, 1376275, 0, 196613, 1376276, 0, 196613, 1376277, 0, 196613, 1376278, 0, 196613, 1376279, 0, 196613, 1376280, 0, 196613, 1376281, 0, 196613, 1376282, 0, 196613, 1376283, 0, 196613, 1376284, 0, 196613, 1376285, 0, 196613, 1376286, 0, 196613, 1376287, 0, 196613, 1376288, 0, 196613, 1376289, 0, 196613, 1376290, 0, 196613, 1376291, 0, 196613, 1376292, 0, 196613, 1376293, 0, 196613, 1376294, 0, 196613, 1376295, 0, 196613, 1376296, 0, 196613, 1376297, 0, 196613, 1376298, 0, 196613, 1376299, 0, 196613, 1376300, 0, 196613, 1376301, 0, 196613, 1376302, 0, 196613, 1376303, 0, 196613, 1376304, 0, 196613, 1376305, 0, 196613, 1376306, 0, 196613, 1376307, 0, 196613, 1376308, 0, 196613, 1376309, 0, 196613, 1376310, 0, 196613, 1376311, 0, 196613, 1376312, 0, 196613, 1376313, 0, 196613, 1376314, 0, 196613, 1376315, 0, 196613, 1376316, 0, 196613, 1376317, 0, 196613, 1376318, 0, 196613, 1376319, 0, 196613, 1376320, 0, 196613, 1376321, 0, 196613, 1376322, 0, 196613, 1376323, 0, 196613, 1376324, 0, 196613, 1376325, 0, 131080, 1376326, 0, 131081, 1376327, 0, 131080, 1376328, 0, 131081, 1376329, 0, 131080, 1376330, 0, 131081, 1376331, 0, 131080, 1376332, 0, 131081, 1376333, 0, 131081, 1376334, 0, 131080, 1376335, 0, 196613, 1441792, 0, 196613, 1441793, 0, 196613, 1441794, 0, 196613, 1441795, 0, 196613, 1441796, 0, 196613, 1441797, 0, 196613, 1441798, 0, 196613, 1441799, 0, 196613, 1441800, 0, 196613, 1441801, 0, 196613, 1441802, 0, 196613, 1441803, 0, 196613, 1441804, 0, 196613, 1441805, 0, 196613, 1441806, 0, 196613, 1441807, 0, 196613, 1441808, 0, 196613, 1441809, 0, 196613, 1441810, 0, 196613, 1441811, 0, 196613, 1441812, 0, 196613, 1441813, 0, 196613, 1441814, 0, 196613, 1441815, 0, 196613, 1441816, 0, 196613, 1441817, 0, 196613, 1441818, 0, 196613, 1441819, 0, 196613, 1441820, 0, 196613, 1441821, 0, 196613, 1441822, 0, 196613, 1441823, 0, 196613, 1441824, 0, 196613, 1441825, 0, 196613, 1441826, 0, 196613, 1441827, 0, 196613, 1441828, 0, 196613, 1441829, 0, 196613, 1441830, 0, 196613, 1441831, 0, 196613, 1441832, 0, 196613, 1441833, 0, 196613, 1441834, 0, 196613, 1441835, 0, 196613, 1441836, 0, 196613, 1441837, 0, 196613, 1441838, 0, 196613, 1441839, 0, 196613, 1441840, 0, 196613, 1441841, 0, 196613, 1441842, 0, 196613, 1441843, 0, 196613, 1441844, 0, 196613, 1441845, 0, 196613, 1441846, 0, 196613, 1441847, 0, 196613, 1441848, 0, 196613, 1441849, 0, 196613, 1441850, 0, 196613, 1441851, 0, 196613, 1441852, 0, 196613, 1441853, 0, 196613, 1441854, 0, 196613, 1441855, 0, 196613, 1441856, 0, 196613, 1441857, 0, 196613, 1441858, 0, 196613, 1441859, 0, 196613, 1441860, 0, 196613, 1441861, 0, 196613, 1441862, 0, 196613, 1441863, 0, 196613, 1441864, 0, 196613, 1441865, 0, 196613, 1441866, 0, 196613, 1441867, 0, 196613, 1441868, 0, 196613, 1441869, 0, 196613, 1441870, 0, 196613, 1441871, 0, 196613 ) +tile_data = PoolIntArray( -65536, 0, 196613, 65528, 0, 0, 0, 0, 196613, 79, 0, 196613, 65536, 0, 196613, 65615, 0, 196613, 196603, 0, 0, 131072, 0, 196613, 131151, 0, 196613, 196608, 0, 196613, 196687, 0, 196613, 262144, 0, 196613, 262172, 0, 196613, 262173, 0, 196613, 262174, 0, 196613, 262175, 0, 196613, 262176, 0, 196613, 262177, 0, 196613, 262223, 0, 196613, 327680, 0, 196613, 327759, 0, 196613, 393216, 0, 196613, 393260, 0, 196613, 393261, 0, 196613, 393295, 0, 196613, 458752, 0, 196613, 458792, 0, 196613, 458793, 0, 196613, 458794, 0, 196613, 458795, 0, 196613, 458796, 0, 196613, 458797, 0, 196613, 458831, 0, 196613, 524288, 0, 196613, 524307, 0, 196613, 524308, 0, 196613, 524327, 0, 196613, 524328, 0, 196613, 524329, 0, 196613, 524330, 0, 196613, 524334, 0, 196613, 524367, 0, 196613, 589824, 0, 196613, 589843, 0, 196613, 589844, 0, 196613, 589863, 0, 196613, 589864, 0, 196613, 589870, 0, 196613, 589903, 0, 196613, 655360, 0, 196613, 655361, 0, 2, 655362, 0, 2, 655363, 0, 2, 655364, 0, 2, 655365, 0, 2, 655366, 0, 2, 655367, 0, 2, 655368, 0, 2, 655369, 0, 2, 655370, 0, 2, 655371, 0, 2, 655372, 0, 2, 655373, 0, 2, 655374, 0, 2, 655375, 0, 2, 655376, 0, 2, 655377, 0, 2, 655378, 0, 2, 655379, 0, 196613, 655380, 0, 196613, 655381, 0, 196613, 655382, 0, 196613, 655383, 0, 196613, 655384, 0, 196613, 655385, 0, 196613, 655386, 0, 196613, 655387, 0, 196613, 655388, 0, 196613, 655389, 0, 196613, 655390, 0, 196613, 655391, 0, 196613, 655392, 0, 196613, 655393, 0, 196613, 655394, 0, 196613, 655395, 0, 196613, 655396, 0, 196613, 655397, 0, 196613, 655398, 0, 196613, 655399, 0, 196613, 655400, 0, 196613, 655406, 0, 196613, 655407, 0, 196613, 655408, 0, 196613, 655409, 0, 196613, 655410, 0, 196613, 655411, 0, 196613, 655412, 0, 196613, 655413, 0, 196613, 655414, 0, 196613, 655415, 0, 196613, 655416, 0, 196613, 655417, 0, 196613, 655418, 0, 196613, 655419, 0, 196613, 655420, 0, 196613, 655421, 0, 196613, 655422, 0, 196613, 655423, 0, 196613, 655424, 0, 196613, 655425, 0, 196613, 655426, 0, 196613, 655427, 0, 196613, 655428, 0, 196613, 655439, 0, 196613, 720896, 0, 196613, 720897, 0, 65538, 720898, 0, 65538, 720899, 0, 65538, 720900, 0, 65538, 720901, 0, 65538, 720902, 0, 65538, 720903, 0, 65538, 720904, 0, 65538, 720905, 0, 65538, 720906, 0, 65538, 720907, 0, 65538, 720908, 0, 65538, 720909, 0, 65538, 720910, 0, 65538, 720911, 0, 65538, 720912, 0, 65538, 720913, 0, 65538, 720914, 0, 65538, 720915, 0, 196613, 720916, 0, 196613, 720917, 0, 196613, 720918, 0, 196613, 720930, 0, 196613, 720959, 0, 0, 720961, 0, 196613, 720962, 0, 196613, 720963, 0, 196613, 720964, 0, 196613, 720965, 0, 196613, 720975, 0, 196613, 786432, 0, 196613, 786466, 0, 196613, 786495, 0, 0, 786511, 0, 196613, 851968, 0, 196613, 852002, 0, 196613, 852031, 0, 0, 852047, 0, 196613, 917504, 0, 196613, 917530, 0, 196613, 917531, 0, 196613, 917532, 0, 196613, 917533, 0, 196613, 917534, 0, 196613, 917535, 0, 196613, 917536, 0, 196613, 917537, 0, 196613, 917538, 0, 196613, 917583, 0, 196613, 983040, 0, 196613, 983066, 0, 262148, 983067, 0, 262149, 983068, 0, 262150, 983119, 0, 196613, 1048576, 0, 196613, 1048602, 0, 262148, 1048603, 0, 262149, 1048604, 0, 262150, 1048655, 0, 196613, 1114112, 0, 196613, 1114138, 0, 262148, 1114139, 0, 262149, 1114140, 0, 262150, 1114167, 0, 196613, 1114168, 0, 196613, 1114169, 0, 196613, 1114170, 0, 196613, 1114171, 0, 196613, 1114191, 0, 196613, 1179648, 0, 196613, 1179674, 0, 262148, 1179675, 0, 262149, 1179676, 0, 262150, 1179701, 0, 196613, 1179702, 0, 196613, 1179703, 0, 196613, 1179707, 0, 196613, 1179708, 0, 196613, 1179709, 0, 196613, 1179727, 0, 196613, 1245184, 0, 196613, 1245210, 0, 262148, 1245211, 0, 262149, 1245212, 0, 262150, 1245236, 0, 196613, 1245237, 0, 196613, 1245245, 0, 196613, 1245246, 0, 196613, 1245247, 0, 196613, 1245263, 0, 196613, 1310720, 0, 196613, 1310746, 0, 262148, 1310747, 0, 262149, 1310748, 0, 262150, 1310771, 0, 196613, 1310772, 0, 196613, 1310783, 0, 196613, 1310784, 0, 196613, 1310799, 0, 196613, 1376256, 0, 196613, 1376257, 0, 196613, 1376258, 0, 196613, 1376259, 0, 196613, 1376260, 0, 196613, 1376261, 0, 196613, 1376262, 0, 196613, 1376263, 0, 196613, 1376264, 0, 196613, 1376265, 0, 196613, 1376266, 0, 196613, 1376267, 0, 196613, 1376268, 0, 196613, 1376269, 0, 196613, 1376270, 0, 196613, 1376271, 0, 196613, 1376272, 0, 196613, 1376273, 0, 196613, 1376274, 0, 196613, 1376275, 0, 196613, 1376276, 0, 196613, 1376277, 0, 196613, 1376278, 0, 196613, 1376279, 0, 196613, 1376280, 0, 196613, 1376281, 0, 196613, 1376282, 0, 196613, 1376283, 0, 196613, 1376284, 0, 196613, 1376285, 0, 196613, 1376286, 0, 196613, 1376287, 0, 196613, 1376288, 0, 196613, 1376289, 0, 196613, 1376290, 0, 196613, 1376291, 0, 196613, 1376292, 0, 196613, 1376293, 0, 196613, 1376294, 0, 196613, 1376295, 0, 196613, 1376296, 0, 196613, 1376297, 0, 196613, 1376298, 0, 196613, 1376299, 0, 196613, 1376300, 0, 196613, 1376301, 0, 196613, 1376302, 0, 196613, 1376303, 0, 196613, 1376304, 0, 196613, 1376305, 0, 196613, 1376306, 0, 196613, 1376307, 0, 196613, 1376308, 0, 196613, 1376309, 0, 196613, 1376310, 0, 196613, 1376311, 0, 196613, 1376312, 0, 196613, 1376313, 0, 196613, 1376314, 0, 196613, 1376315, 0, 196613, 1376316, 0, 196613, 1376317, 0, 196613, 1376318, 0, 196613, 1376319, 0, 196613, 1376320, 0, 196613, 1376321, 0, 196613, 1376322, 0, 196613, 1376323, 0, 196613, 1376324, 0, 196613, 1376325, 0, 131080, 1376326, 0, 131081, 1376327, 0, 131080, 1376328, 0, 131081, 1376329, 0, 131080, 1376330, 0, 131081, 1376331, 0, 131080, 1376332, 0, 131081, 1376333, 0, 131081, 1376334, 0, 131080, 1376335, 0, 196613, 1441792, 0, 196613, 1441793, 0, 196613, 1441794, 0, 196613, 1441795, 0, 196613, 1441796, 0, 196613, 1441797, 0, 196613, 1441798, 0, 196613, 1441799, 0, 196613, 1441800, 0, 196613, 1441801, 0, 196613, 1441802, 0, 196613, 1441803, 0, 196613, 1441804, 0, 196613, 1441805, 0, 196613, 1441806, 0, 196613, 1441807, 0, 196613, 1441808, 0, 196613, 1441809, 0, 196613, 1441810, 0, 196613, 1441811, 0, 196613, 1441812, 0, 196613, 1441813, 0, 196613, 1441814, 0, 196613, 1441815, 0, 196613, 1441816, 0, 196613, 1441817, 0, 196613, 1441818, 0, 196613, 1441819, 0, 196613, 1441820, 0, 196613, 1441821, 0, 196613, 1441822, 0, 196613, 1441823, 0, 196613, 1441824, 0, 196613, 1441825, 0, 196613, 1441826, 0, 196613, 1441827, 0, 196613, 1441828, 0, 196613, 1441829, 0, 196613, 1441830, 0, 196613, 1441831, 0, 196613, 1441832, 0, 196613, 1441833, 0, 196613, 1441834, 0, 196613, 1441835, 0, 196613, 1441836, 0, 196613, 1441837, 0, 196613, 1441838, 0, 196613, 1441839, 0, 196613, 1441840, 0, 196613, 1441841, 0, 196613, 1441842, 0, 196613, 1441843, 0, 196613, 1441844, 0, 196613, 1441845, 0, 196613, 1441846, 0, 196613, 1441847, 0, 196613, 1441848, 0, 196613, 1441849, 0, 196613, 1441850, 0, 196613, 1441851, 0, 196613, 1441852, 0, 196613, 1441853, 0, 196613, 1441854, 0, 196613, 1441855, 0, 196613, 1441856, 0, 196613, 1441857, 0, 196613, 1441858, 0, 196613, 1441859, 0, 196613, 1441860, 0, 196613, 1441861, 0, 196613, 1441862, 0, 196613, 1441863, 0, 196613, 1441864, 0, 196613, 1441865, 0, 196613, 1441866, 0, 196613, 1441867, 0, 196613, 1441868, 0, 196613, 1441869, 0, 196613, 1441870, 0, 196613, 1441871, 0, 196613 ) __meta__ = { "_edit_lock_": true } @@ -104,7 +104,7 @@ z_index = 1 tile_set = ExtResource( 2 ) cell_size = Vector2( 16, 16 ) format = 1 -tile_data = PoolIntArray( -131044, 0, 262152, -65508, 0, 262152, 28, 0, 262152, 44, 0, 262145, 45, 0, 262146, 46, 0, 262146, 47, 0, 262147, 65564, 0, 262152, 65581, 0, 327685, 65582, 0, 327686, 65583, 0, 327687, 131100, 0, 262152, 131118, 0, 327688, 196636, 0, 262152, 196654, 0, 327688, 262190, 0, 327688, 327726, 0, 327688, 393262, 0, 327688, 458798, 0, 327690, 589827, 0, 262148, 589828, 0, 262149, 589829, 0, 262149, 589830, 0, 262149, 589831, 0, 262151, 1310765, 0, 262144, 1310766, 0, 262144, 1310767, 0, 262144, 1310768, 0, 262144, 1310769, 0, 262144, 1310770, 0, 262144 ) +tile_data = PoolIntArray( -131044, 0, 262152, -65508, 0, 262152, 28, 0, 262152, 44, 0, 262145, 45, 0, 262146, 46, 0, 262146, 47, 0, 262147, 65564, 0, 262152, 65581, 0, 327685, 65582, 0, 327686, 65583, 0, 327687, 131100, 0, 262152, 131118, 0, 327688, 196636, 0, 262152, 196654, 0, 327688, 262190, 0, 327688, 327726, 0, 327688, 393262, 0, 327688, 458798, 0, 327690, 589827, 0, 262148, 589828, 0, 262149, 589829, 0, 262149, 589830, 0, 262149, 589831, 0, 262151, 917530, 0, 262148, 917531, 0, 262149, 917532, 0, 262151, 1310765, 0, 262144, 1310766, 0, 262144, 1310767, 0, 262144, 1310768, 0, 262144, 1310769, 0, 262144, 1310770, 0, 262144 ) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource( 6 ) @@ -180,5 +180,5 @@ collision_mask = 0 [node name="LadderShape" type="CollisionShape2D" parent="Ladder"] modulate = Color( 0.360784, 0.0901961, 0.0901961, 1 ) -position = Vector2( 441, 281 ) +position = Vector2( 441, 283 ) shape = SubResource( 6 ) diff --git a/src/movement_component.gd b/src/movement_component.gd index ae92a0a..c02b49e 100644 --- a/src/movement_component.gd +++ b/src/movement_component.gd @@ -77,3 +77,6 @@ func wants_roll() -> bool: func wants_climb() -> bool: return false + +func get_climb_shape_location() -> Vector2: + return Vector2(-1,-1) diff --git a/src/playerD/Player.tscn b/src/playerD/Player.tscn index d94fa9a..e8c4090 100644 --- a/src/playerD/Player.tscn +++ b/src/playerD/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=128 format=2] +[gd_scene load_steps=126 format=2] [ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1] [ext_resource path="res://src/playerD/movement_component.gd" type="Script" id=2] @@ -23,31 +23,31 @@ load_path = "res://.import/Mega.png-93dfe0790902b932f7b46f7b23c5d4e7.stex" [sub_resource type="AtlasTexture" id=91] atlas = SubResource( 90 ) -region = Rect2( 1440, 960, 240, 160 ) +region = Rect2( 1680, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=92] atlas = SubResource( 90 ) -region = Rect2( 1680, 960, 240, 160 ) +region = Rect2( 1920, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=93] atlas = SubResource( 90 ) -region = Rect2( 1920, 960, 240, 160 ) +region = Rect2( 2160, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=94] atlas = SubResource( 90 ) -region = Rect2( 2160, 960, 240, 160 ) +region = Rect2( 2400, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=95] atlas = SubResource( 90 ) -region = Rect2( 2400, 960, 240, 160 ) +region = Rect2( 0, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=96] atlas = SubResource( 90 ) -region = Rect2( 0, 1120, 240, 160 ) +region = Rect2( 240, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=97] atlas = SubResource( 90 ) -region = Rect2( 240, 1120, 240, 160 ) +region = Rect2( 1440, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=98] atlas = SubResource( 90 ) @@ -55,31 +55,31 @@ region = Rect2( 480, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=99] atlas = SubResource( 90 ) -region = Rect2( 720, 1120, 240, 160 ) +region = Rect2( 480, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=100] atlas = SubResource( 90 ) -region = Rect2( 960, 1120, 240, 160 ) +region = Rect2( 720, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=101] atlas = SubResource( 90 ) -region = Rect2( 480, 160, 240, 160 ) +region = Rect2( 960, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=102] atlas = SubResource( 90 ) -region = Rect2( 720, 160, 240, 160 ) +region = Rect2( 1200, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=103] atlas = SubResource( 90 ) -region = Rect2( 960, 160, 240, 160 ) +region = Rect2( 1440, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=104] atlas = SubResource( 90 ) -region = Rect2( 1200, 160, 240, 160 ) +region = Rect2( 240, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=105] atlas = SubResource( 90 ) -region = Rect2( 1440, 160, 240, 160 ) +region = Rect2( 480, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=106] atlas = SubResource( 90 ) @@ -119,43 +119,43 @@ region = Rect2( 0, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=115] atlas = SubResource( 90 ) -region = Rect2( 240, 1600, 240, 160 ) +region = Rect2( 960, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=116] atlas = SubResource( 90 ) -region = Rect2( 480, 1600, 240, 160 ) +region = Rect2( 1200, 960, 240, 160 ) [sub_resource type="AtlasTexture" id=117] atlas = SubResource( 90 ) -region = Rect2( 960, 960, 240, 160 ) +region = Rect2( 1200, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=118] atlas = SubResource( 90 ) -region = Rect2( 1200, 960, 240, 160 ) +region = Rect2( 0, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=119] atlas = SubResource( 90 ) -region = Rect2( 1200, 0, 240, 160 ) +region = Rect2( 1440, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=120] atlas = SubResource( 90 ) -region = Rect2( 0, 0, 240, 160 ) +region = Rect2( 1680, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=121] atlas = SubResource( 90 ) -region = Rect2( 1440, 0, 240, 160 ) +region = Rect2( 1920, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=122] atlas = SubResource( 90 ) -region = Rect2( 1680, 0, 240, 160 ) +region = Rect2( 2160, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=123] atlas = SubResource( 90 ) -region = Rect2( 1920, 0, 240, 160 ) +region = Rect2( 240, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=124] atlas = SubResource( 90 ) -region = Rect2( 2160, 0, 240, 160 ) +region = Rect2( 480, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=125] atlas = SubResource( 90 ) @@ -163,187 +163,187 @@ region = Rect2( 720, 1600, 240, 160 ) [sub_resource type="AtlasTexture" id=126] atlas = SubResource( 90 ) -region = Rect2( 960, 1600, 240, 160 ) +region = Rect2( 240, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=127] atlas = SubResource( 90 ) -region = Rect2( 1200, 1600, 240, 160 ) +region = Rect2( 1680, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=128] atlas = SubResource( 90 ) -region = Rect2( 240, 160, 240, 160 ) +region = Rect2( 1920, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=129] atlas = SubResource( 90 ) -region = Rect2( 1680, 160, 240, 160 ) +region = Rect2( 2160, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=130] atlas = SubResource( 90 ) -region = Rect2( 1920, 160, 240, 160 ) +region = Rect2( 2400, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=131] atlas = SubResource( 90 ) -region = Rect2( 2160, 160, 240, 160 ) +region = Rect2( 0, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=132] atlas = SubResource( 90 ) -region = Rect2( 2400, 160, 240, 160 ) +region = Rect2( 240, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=133] atlas = SubResource( 90 ) -region = Rect2( 0, 320, 240, 160 ) +region = Rect2( 480, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=134] atlas = SubResource( 90 ) -region = Rect2( 240, 320, 240, 160 ) +region = Rect2( 720, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=135] atlas = SubResource( 90 ) -region = Rect2( 480, 320, 240, 160 ) +region = Rect2( 960, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=136] atlas = SubResource( 90 ) -region = Rect2( 720, 320, 240, 160 ) +region = Rect2( 1200, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=137] atlas = SubResource( 90 ) -region = Rect2( 960, 320, 240, 160 ) +region = Rect2( 1680, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=138] atlas = SubResource( 90 ) -region = Rect2( 1200, 320, 240, 160 ) +region = Rect2( 1920, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=139] atlas = SubResource( 90 ) -region = Rect2( 1680, 640, 240, 160 ) +region = Rect2( 2160, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=140] atlas = SubResource( 90 ) -region = Rect2( 1920, 640, 240, 160 ) +region = Rect2( 2400, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=141] atlas = SubResource( 90 ) -region = Rect2( 2160, 640, 240, 160 ) +region = Rect2( 0, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=142] atlas = SubResource( 90 ) -region = Rect2( 2400, 640, 240, 160 ) +region = Rect2( 240, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=143] atlas = SubResource( 90 ) -region = Rect2( 0, 800, 240, 160 ) +region = Rect2( 480, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=144] atlas = SubResource( 90 ) -region = Rect2( 240, 800, 240, 160 ) +region = Rect2( 720, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=145] atlas = SubResource( 90 ) -region = Rect2( 480, 800, 240, 160 ) +region = Rect2( 960, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=146] atlas = SubResource( 90 ) -region = Rect2( 720, 800, 240, 160 ) +region = Rect2( 1200, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=147] atlas = SubResource( 90 ) -region = Rect2( 960, 800, 240, 160 ) +region = Rect2( 1440, 800, 240, 160 ) [sub_resource type="AtlasTexture" id=148] atlas = SubResource( 90 ) -region = Rect2( 1200, 800, 240, 160 ) +region = Rect2( 1920, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=149] atlas = SubResource( 90 ) -region = Rect2( 1440, 800, 240, 160 ) +region = Rect2( 2160, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=150] atlas = SubResource( 90 ) -region = Rect2( 1920, 320, 240, 160 ) +region = Rect2( 2400, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=151] atlas = SubResource( 90 ) -region = Rect2( 2160, 320, 240, 160 ) +region = Rect2( 0, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=152] atlas = SubResource( 90 ) -region = Rect2( 2400, 320, 240, 160 ) +region = Rect2( 240, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=153] atlas = SubResource( 90 ) -region = Rect2( 0, 480, 240, 160 ) +region = Rect2( 480, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=154] atlas = SubResource( 90 ) -region = Rect2( 240, 480, 240, 160 ) +region = Rect2( 720, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=155] atlas = SubResource( 90 ) -region = Rect2( 480, 480, 240, 160 ) +region = Rect2( 960, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=156] atlas = SubResource( 90 ) -region = Rect2( 720, 480, 240, 160 ) +region = Rect2( 1200, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=157] atlas = SubResource( 90 ) -region = Rect2( 960, 480, 240, 160 ) +region = Rect2( 1440, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=158] atlas = SubResource( 90 ) -region = Rect2( 1200, 480, 240, 160 ) +region = Rect2( 1920, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=159] atlas = SubResource( 90 ) -region = Rect2( 1440, 480, 240, 160 ) +region = Rect2( 2160, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=160] atlas = SubResource( 90 ) -region = Rect2( 1920, 480, 240, 160 ) +region = Rect2( 2400, 480, 240, 160 ) [sub_resource type="AtlasTexture" id=161] atlas = SubResource( 90 ) -region = Rect2( 2160, 480, 240, 160 ) +region = Rect2( 0, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=162] atlas = SubResource( 90 ) -region = Rect2( 2400, 480, 240, 160 ) +region = Rect2( 240, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=163] atlas = SubResource( 90 ) -region = Rect2( 0, 640, 240, 160 ) +region = Rect2( 480, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=164] atlas = SubResource( 90 ) -region = Rect2( 240, 640, 240, 160 ) +region = Rect2( 720, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=165] atlas = SubResource( 90 ) -region = Rect2( 480, 640, 240, 160 ) +region = Rect2( 960, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=166] atlas = SubResource( 90 ) -region = Rect2( 720, 640, 240, 160 ) +region = Rect2( 1200, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=167] atlas = SubResource( 90 ) -region = Rect2( 960, 640, 240, 160 ) +region = Rect2( 1440, 640, 240, 160 ) [sub_resource type="AtlasTexture" id=168] atlas = SubResource( 90 ) -region = Rect2( 1200, 640, 240, 160 ) +region = Rect2( 2400, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=169] atlas = SubResource( 90 ) -region = Rect2( 1440, 640, 240, 160 ) +region = Rect2( 0, 160, 240, 160 ) [sub_resource type="AtlasTexture" id=170] atlas = SubResource( 90 ) -region = Rect2( 2400, 0, 240, 160 ) +region = Rect2( 720, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=171] atlas = SubResource( 90 ) -region = Rect2( 0, 160, 240, 160 ) +region = Rect2( 960, 1120, 240, 160 ) [sub_resource type="AtlasTexture" id=172] atlas = SubResource( 90 ) @@ -419,119 +419,121 @@ region = Rect2( 0, 1440, 240, 160 ) [sub_resource type="AtlasTexture" id=190] atlas = SubResource( 90 ) -region = Rect2( 240, 1440, 240, 160 ) +region = Rect2( 240, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=191] atlas = SubResource( 90 ) -region = Rect2( 480, 1440, 240, 160 ) +region = Rect2( 480, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=192] atlas = SubResource( 90 ) -region = Rect2( 240, 0, 240, 160 ) +region = Rect2( 720, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=193] atlas = SubResource( 90 ) -region = Rect2( 480, 0, 240, 160 ) +region = Rect2( 960, 0, 240, 160 ) [sub_resource type="AtlasTexture" id=194] atlas = SubResource( 90 ) -region = Rect2( 720, 0, 240, 160 ) +region = Rect2( 1680, 320, 240, 160 ) [sub_resource type="AtlasTexture" id=195] atlas = SubResource( 90 ) -region = Rect2( 960, 0, 240, 160 ) - -[sub_resource type="AtlasTexture" id=196] -atlas = SubResource( 90 ) -region = Rect2( 1680, 320, 240, 160 ) - -[sub_resource type="AtlasTexture" id=197] -atlas = SubResource( 90 ) region = Rect2( 1680, 480, 240, 160 ) -[sub_resource type="SpriteFrames" id=198] +[sub_resource type="SpriteFrames" id=196] animations = [ { -"frames": [ SubResource( 91 ), SubResource( 92 ), SubResource( 93 ), SubResource( 94 ), SubResource( 95 ), SubResource( 96 ), SubResource( 97 ), SubResource( 98 ), SubResource( 99 ), SubResource( 100 ) ], +"frames": [ SubResource( 91 ), SubResource( 92 ), SubResource( 93 ), SubResource( 94 ), SubResource( 95 ), SubResource( 96 ) ], "loop": true, "name": "climb", "speed": 10.0 }, { -"frames": [ SubResource( 101 ), SubResource( 102 ), SubResource( 103 ), SubResource( 103 ), SubResource( 104 ), SubResource( 105 ) ], +"frames": [ SubResource( 97 ) ], +"loop": false, +"name": "climb_step", +"speed": 10.0 +}, { +"frames": [ SubResource( 98 ) ], +"loop": false, +"name": "climb_upstep", +"speed": 10.0 +}, { +"frames": [ SubResource( 99 ), SubResource( 99 ), SubResource( 99 ), SubResource( 100 ), SubResource( 101 ), SubResource( 102 ), SubResource( 103 ), SubResource( 103 ), SubResource( 103 ) ], "loop": false, "name": "dash", "speed": 10.0 }, { -"frames": [ SubResource( 106 ), SubResource( 107 ), SubResource( 108 ), SubResource( 109 ), SubResource( 110 ), SubResource( 111 ), SubResource( 112 ), SubResource( 113 ), SubResource( 114 ), SubResource( 115 ), SubResource( 114 ), SubResource( 116 ) ], +"frames": [ SubResource( 104 ), SubResource( 105 ), SubResource( 106 ), SubResource( 107 ), SubResource( 108 ), SubResource( 109 ), SubResource( 110 ), SubResource( 111 ), SubResource( 112 ), SubResource( 113 ), SubResource( 112 ), SubResource( 114 ) ], "loop": false, "name": "die", "speed": 10.0 }, { -"frames": [ SubResource( 117 ), SubResource( 118 ) ], +"frames": [ SubResource( 115 ), SubResource( 116 ) ], "loop": true, "name": "hurt", "speed": 4.0 }, { -"frames": [ SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ), SubResource( 122 ), SubResource( 123 ), SubResource( 124 ) ], +"frames": [ SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 118 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ), SubResource( 122 ) ], "loop": true, "name": "idle", "speed": 10.0 }, { -"frames": [ SubResource( 125 ), SubResource( 126 ), SubResource( 127 ) ], +"frames": [ SubResource( 123 ), SubResource( 124 ), SubResource( 125 ) ], "loop": true, "name": "idle_shield", "speed": 10.0 }, { -"frames": [ SubResource( 128 ) ], -"loop": false, +"frames": [ SubResource( 126 ) ], +"loop": true, "name": "idle_shoot", "speed": 10.0 }, { -"frames": [ SubResource( 129 ), SubResource( 130 ), SubResource( 131 ), SubResource( 132 ), SubResource( 130 ), SubResource( 133 ), SubResource( 134 ), SubResource( 135 ) ], +"frames": [ SubResource( 127 ), SubResource( 128 ), SubResource( 129 ), SubResource( 130 ), SubResource( 128 ), SubResource( 131 ), SubResource( 132 ), SubResource( 133 ) ], "loop": false, "name": "jump", "speed": 10.0 }, { -"frames": [ SubResource( 136 ), SubResource( 136 ), SubResource( 136 ), SubResource( 136 ), SubResource( 136 ), SubResource( 136 ), SubResource( 137 ), SubResource( 138 ) ], +"frames": [ SubResource( 134 ), SubResource( 134 ), SubResource( 134 ), SubResource( 134 ), SubResource( 134 ), SubResource( 134 ), SubResource( 135 ), SubResource( 136 ) ], "loop": false, "name": "jump_shoot", "speed": 10.0 }, { -"frames": [ SubResource( 139 ), SubResource( 140 ), SubResource( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ), SubResource( 146 ), SubResource( 147 ), SubResource( 148 ), SubResource( 149 ) ], +"frames": [ SubResource( 137 ), SubResource( 138 ), SubResource( 139 ), SubResource( 140 ), SubResource( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ), SubResource( 146 ), SubResource( 147 ) ], "loop": false, "name": "roll", "speed": 10.0 }, { -"frames": [ SubResource( 150 ), SubResource( 151 ), SubResource( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ), SubResource( 156 ), SubResource( 157 ), SubResource( 158 ), SubResource( 159 ) ], +"frames": [ SubResource( 148 ), SubResource( 149 ), SubResource( 150 ), SubResource( 151 ), SubResource( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ), SubResource( 156 ), SubResource( 157 ) ], "loop": true, "name": "run", "speed": 10.0 }, { -"frames": [ SubResource( 160 ), SubResource( 161 ), SubResource( 162 ), SubResource( 163 ), SubResource( 164 ), SubResource( 165 ), SubResource( 166 ), SubResource( 167 ), SubResource( 168 ), SubResource( 169 ) ], +"frames": [ SubResource( 158 ), SubResource( 159 ), SubResource( 160 ), SubResource( 161 ), SubResource( 162 ), SubResource( 163 ), SubResource( 164 ), SubResource( 165 ), SubResource( 166 ), SubResource( 167 ) ], "loop": true, "name": "run_shoot", "speed": 10.0 }, { -"frames": [ SubResource( 170 ), SubResource( 171 ), SubResource( 128 ) ], +"frames": [ SubResource( 168 ), SubResource( 169 ), SubResource( 126 ) ], "loop": false, "name": "shoot", "speed": 10.0 }, { -"frames": [ SubResource( 172 ), SubResource( 173 ), SubResource( 174 ), SubResource( 174 ), SubResource( 175 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 178 ), SubResource( 179 ), SubResource( 180 ), SubResource( 181 ), SubResource( 182 ), SubResource( 183 ), SubResource( 184 ), SubResource( 185 ), SubResource( 186 ), SubResource( 187 ), SubResource( 188 ), SubResource( 189 ), SubResource( 190 ), SubResource( 191 ) ], +"frames": [ SubResource( 170 ), SubResource( 171 ), SubResource( 172 ), SubResource( 172 ), SubResource( 173 ), SubResource( 174 ), SubResource( 175 ), SubResource( 176 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 179 ), SubResource( 180 ), SubResource( 181 ), SubResource( 182 ), SubResource( 183 ), SubResource( 184 ), SubResource( 185 ), SubResource( 186 ), SubResource( 187 ), SubResource( 188 ), SubResource( 189 ) ], "loop": true, "name": "slash", "speed": 10.0 }, { -"frames": [ SubResource( 120 ), SubResource( 192 ), SubResource( 193 ), SubResource( 194 ), SubResource( 195 ) ], +"frames": [ SubResource( 118 ), SubResource( 190 ), SubResource( 191 ), SubResource( 192 ), SubResource( 193 ) ], "loop": false, "name": "stand", "speed": 10.0 }, { -"frames": [ SubResource( 196 ) ], +"frames": [ SubResource( 194 ) ], "loop": false, "name": "step", "speed": 10.0 }, { -"frames": [ SubResource( 197 ) ], +"frames": [ SubResource( 195 ) ], "loop": false, "name": "step_shoot", "speed": 10.0 @@ -547,7 +549,7 @@ player_number = 1 [node name="AnimatedSprite" parent="." index="0"] position = Vector2( -1, -51 ) -frames = SubResource( 198 ) +frames = SubResource( 196 ) animation = "idle_shoot" frame = 0 flip_h = false @@ -648,8 +650,7 @@ animation_sequence = [ "die" ] [node name="climb" type="Node" parent="movement_state_machine" index="9"] script = ExtResource( 17 ) debug_state = true -move_speed = 0.0 -animation_sequence = [ "climb" ] +animation_sequence = [ "climb_step", "climb", "climb_upstep" ] idle_node = NodePath("../idle") [node name="Hurtbox_Component" parent="." index="4"] diff --git a/src/playerD/movement_component.gd b/src/playerD/movement_component.gd index d3073a7..613acc5 100644 --- a/src/playerD/movement_component.gd +++ b/src/playerD/movement_component.gd @@ -22,6 +22,13 @@ export (NodePath) var interactable_node onready var interactable_receiver_node: Interactable_Receiver = get_node(interactable_node) onready var ladder_detection:RayCast2D = $"../Ladder_Detection" +var ladder_collision: RayCast2D + +func _ready(): + ladder_collision = ladder_detection + # Guess there isn't a hit from inside in 3.5 + # Remember to make raycast as tall as needed for the player + #ladder_collision.hit_from_inside = true func process_physics(delta): PlayerInfo.player_position = owner.global_position @@ -73,11 +80,39 @@ func wants_roll() -> bool: func wants_climb() -> bool: if ladder_detection.is_colliding() and Input.is_action_pressed("ui_up"): - print("betcha wanna climb though!") + #print("betcha wanna climb though!") return true else: return false +func get_climb_shape_location() -> Vector2: + if ladder_detection.is_colliding(): + var point: Vector2 = ladder_collision.get_collision_point() + var shape_id = ladder_collision.get_collider_shape() + var object = ladder_collision.get_collider() + + # This works but doesn't get the shapes location. +# if object is Area2D: +# print("You got an area bro!" , object.global_position) + + + # This appears to get the shapes location! + var area = Physics2DServer.area_get_transform(object) + var areashape = Physics2DServer.area_get_shape_transform(object, shape_id) + + + var y_dir = Input.get_axis("ui_up" , "ui_down") +#var target = get_collider() # A CollisionObject2D. +#var shape_id = get_collider_shape() # The shape index in the collider. +#var owner_id = target.shape_find_owner(shape_id) # The owner ID in the collider. +#var shape = target.shape_owner_get_owner(owner_id) + + #UiManager.debug_text = str(round(point.x)) + ' ' + str(round(point.y)) #( "Mod(" + str(sign(_move_speed_modifier)) + ") Dir(" + str(move_direction) + ") Vel(" + str(sign(current_x_velocity)) + ") Mov(" + str(sign(move_component.desired_movement_vector.x)) + + + return Vector2(areashape.origin.x, y_dir) + else: + return Vector2(-1,-1) + ## Other needed variables # desired_movement_vector: Vector2 - Used to store desired movement depending on the state # current_movement_state:String - The name of the current State diff --git a/src/playerD/states/climb.gd b/src/playerD/states/climb.gd index 3f8d891..ef1aa33 100644 --- a/src/playerD/states/climb.gd +++ b/src/playerD/states/climb.gd @@ -11,8 +11,8 @@ func _ready(): climbing_modifier= StateModifier.new() #add_child(modifier) #modifier.init_ref() - climbing_modifier.ready( "landing", "jump" , climbing_modifier.TYPE.EXIT_ANIMATION) - climbing_modifier.starting_frame = 6 +# climbing_modifier.ready( "landing", "jump" , climbing_modifier.TYPE.EXIT_ANIMATION) +# climbing_modifier.starting_frame = 6 #print("ready! MOD") @@ -24,7 +24,22 @@ func process_physics(delta: float) -> State: # First allow horizontal movement. #move_actor_as_desired(delta) - + # Make wure we still want to climb + var ladder_location = move_component.get_climb_shape_location() + if ladder_location != Vector2(-1,-1): + UiManager.debug_text = str(ladder_location) + '\n' + str(ladder_location - parent.global_position) #+ '\n' + str(parent.global_position.distance_to(ladder_location)) + # An attempt to snap to the ladder location + if parent.global_position.x != round(ladder_location.x): + parent.global_translate(Vector2(round((ladder_location.x - parent.global_position.x)),(ladder_location.y * move_speed) * delta)) + if ladder_location.y != 0: + animations.play() + else: + # Make sure we hopped the step index + if animation_index > 0: + animations.stop() + else: + return idle_state + #parent.move_local_x() #Flip the character before tha actual move maybe. if move_component.get_movement_direction() != 0.0: parent.transform.x.x = move_component.get_movement_direction() diff --git a/src/state_animated_actor.gd b/src/state_animated_actor.gd index ffa68fb..e08ebbe 100644 --- a/src/state_animated_actor.gd +++ b/src/state_animated_actor.gd @@ -453,7 +453,7 @@ func move_actor_as_desired(delta: float, x_move_direction_override: float = 0): var sim_move_speed = (MIN_SPEED + (sign(_move_speed_modifier) * -1 * move_component.momentum.x)) # if move_component.momentum.x != 0: - if true: + if false: UiManager.debug_text = ( "Mod(" + str(sign(_move_speed_modifier)) + ") Dir(" + str(move_direction) + ") Vel(" + str(sign(current_x_velocity)) + ") Mov(" + str(sign(move_component.desired_movement_vector.x)) + ")\nNS:" + str(round(sim_move_speed)) + #" Z:" + str(sign(_move_speed_modifier) * -1 * move_component.momentum.x) + "\nS:" + str(round(_move_speed + _move_speed_modifier)) + ",M" + str(round(move_component.momentum.x)) +