diff --git a/Main.tscn b/Main.tscn index baee89c..bfd08ca 100644 --- a/Main.tscn +++ b/Main.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/classes/camera_guide.gd" type="Script" id=1] [ext_resource path="res://src/Camera2D.gd" type="Script" id=2] -[ext_resource path="res://src/levels/CloneBox.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/levels/TestBox.tscn" type="PackedScene" id=3] [ext_resource path="res://src/ui/scene_transition.tscn" type="PackedScene" id=4] [ext_resource path="res://src/ui/HUD.tscn" type="PackedScene" id=5] [ext_resource path="res://src/Main.gd" type="Script" id=7] diff --git a/src/actors/players/playerE/states/move.tres b/src/actors/players/playerE/states/move.tres index 83c1033..a498f35 100644 --- a/src/actors/players/playerE/states/move.tres +++ b/src/actors/players/playerE/states/move.tres @@ -10,8 +10,8 @@ debug_state = false timeout_seconds = 0.0 name = "move" horizontal_speed = 90.0 -horizontal_acceleration = 10.0 -horizontal_speed_offset = -90.0 +horizontal_acceleration = 180.0 +horizontal_speed_offset = -80.0 horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "run" ] diff --git a/src/levels/TestBox.tscn b/src/levels/TestBox.tscn index e547104..4e4e148 100644 --- a/src/levels/TestBox.tscn +++ b/src/levels/TestBox.tscn @@ -52,7 +52,7 @@ music_track = ExtResource( 5 ) [node name="TileMap Collision" parent="." index="1"] tile_set = ExtResource( 2 ) -tile_data = PoolIntArray( 0, 4, 65536, 19, 4, 65536, 65536, 4, 65536, 65555, 4, 65536, 131072, 4, 65536, 131091, 4, 65536, 196608, 4, 65536, 196620, 2, 0, 196621, 2, 1, 196622, 2, 2, 196627, 4, 65536, 262144, 4, 0, 262156, 2, 65536, 262157, 2, 65537, 262158, 2, 65538, 262163, 4, 0, 327680, 4, 65536, 327699, 4, 65536, 327723, 0, 3, 327724, 0, 2, 327725, 0, 3, 327726, 0, 3, 327727, 0, 2, 327728, 0, 3, 327729, 0, 3, 327730, 0, 2, 327731, 0, 3, 393216, 4, 65536, 393237, 4, 0, 393257, 1, 65536, 393258, 1, 65537, 393259, 0, 65538, 393260, 0, 65537, 393261, 0, 65538, 393262, 0, 65538, 393263, 0, 65537, 393264, 0, 65538, 393265, 0, 65538, 393266, 0, 65537, 393267, 0, 65538, 458752, 4, 65536, 458773, 4, 0, 458790, 1, 1, 458791, 1, 65536, 458792, 1, 65537, 458793, 1, 131072, 458794, 1, 131073, 458795, 0, 196611, 458796, 0, 196610, 458797, 0, 196611, 458798, 0, 196611, 458799, 0, 196610, 458800, 0, 196611, 458801, 0, 196611, 458802, 0, 196610, 458803, 0, 196611, 589823, 0, 1, 524288, 4, 131072, 524289, 0, 3, 524290, 0, 1, 524291, 0, 2, 524292, 0, 3, 524293, 0, 1, 524294, 0, 2, 524295, 0, 3, 524296, 0, 1, 524297, 0, 2, 524298, 0, 3, 524299, 0, 1, 524300, 0, 2, 524301, 0, 3, 524302, 0, 1, 524303, 0, 2, 524304, 0, 3, 524305, 0, 1, 524306, 0, 2, 524308, 0, 1, 524309, 4, 0, 524310, 0, 3, 524311, 0, 4, 524315, 3, 0, 524316, 3, 1, 524317, 3, 2, 524318, 3, 3, 524319, 3, 1, 524320, 3, 2, 524321, 3, 3, 524322, 3, 1, 524323, 3, 2, 524324, 3, 3, 524325, 1, 65536, 524326, 1, 65537, 524327, 1, 131072, 524328, 1, 131073, 524329, 0, 131074, 524330, 0, 131075, 524331, 0, 196610, 524332, 0, 196610, 524333, 0, 196610, 524334, 0, 196610, 524335, 0, 196610, 524336, 0, 196610, 524337, 0, 196610, 524338, 0, 196610, 524339, 0, 196610, 655359, 0, 65537, 589824, 0, 65538, 589825, 0, 65539, 589826, 0, 65537, 589827, 0, 65538, 589828, 0, 65539, 589829, 0, 65537, 589830, 0, 65538, 589831, 0, 65539, 589832, 0, 65537, 589833, 0, 65538, 589834, 0, 65539, 589835, 0, 65537, 589836, 0, 65538, 589837, 0, 65539, 589838, 0, 65537, 589839, 0, 65538, 589840, 0, 65539, 589841, 0, 65537, 589842, 0, 65538, 589843, 0, 65539, 589844, 0, 65537, 589845, 0, 65538, 589846, 0, 65539, 589847, 0, 65540, 589851, 3, 65536, 589852, 3, 65537, 589853, 3, 65538, 589854, 3, 65539, 589855, 3, 65537, 589856, 3, 65538, 589857, 3, 65539, 589858, 3, 65537, 589859, 3, 65538, 589860, 3, 65539, 589861, 1, 131072, 589862, 1, 131073, 589863, 0, 131073, 589864, 0, 131074, 589865, 0, 196610, 589866, 0, 196610, 589867, 0, 196610, 589868, 0, 196610, 589869, 0, 196610, 589870, 0, 196610, 589871, 0, 196610, 589872, 0, 196610, 589873, 0, 196610, 589874, 0, 196610, 589875, 0, 196610, 720895, 0, 131073, 655360, 0, 131074, 655361, 0, 131075, 655362, 0, 131073, 655363, 0, 131074, 655364, 0, 131075, 655365, 0, 131073, 655366, 0, 131074, 655367, 0, 131075, 655368, 0, 131073, 655369, 0, 131074, 655370, 0, 131075, 655371, 0, 131073, 655372, 0, 131074, 655373, 0, 131075, 655374, 0, 131073, 655375, 0, 131074, 655376, 0, 131075, 655377, 0, 131073, 655378, 0, 131074, 655379, 0, 131075, 655380, 0, 131073, 655381, 0, 131074, 655382, 0, 131075, 655383, 0, 131076, 655387, 3, 131072, 655388, 3, 131073, 655389, 3, 131074, 655390, 3, 131075, 655391, 3, 131073, 655392, 3, 131074, 655393, 3, 131075, 655394, 3, 131073, 655395, 3, 131074, 655396, 3, 131075, 655397, 0, 131074, 655398, 0, 131075, 655399, 0, 131073, 655400, 0, 196610, 655401, 0, 196610, 655402, 0, 196610, 655403, 0, 196610, 655404, 0, 196610, 655405, 0, 196610, 655406, 0, 196610, 655407, 0, 196610, 655408, 0, 196610, 655409, 0, 196610, 655410, 0, 196610, 655411, 0, 196610, 786431, 0, 196609, 720896, 0, 196610, 720897, 0, 196611, 720898, 0, 196609, 720899, 0, 196610, 720900, 0, 196611, 720901, 0, 196609, 720902, 0, 196610, 720903, 0, 196611, 720904, 0, 196609, 720905, 0, 196610, 720906, 0, 196611, 720907, 0, 196609, 720908, 0, 196610, 720909, 0, 196611, 720910, 0, 196609, 720911, 0, 196610, 720912, 0, 196611, 720913, 0, 196609, 720914, 0, 196610, 720915, 0, 196611, 720916, 0, 196609, 720917, 0, 196610, 720918, 0, 196611, 720919, 0, 196612, 720923, 3, 196608, 720924, 3, 196609, 720925, 3, 196609, 720926, 3, 196609, 720927, 3, 196609, 720928, 3, 196609, 720929, 3, 196609, 720930, 3, 196609, 720931, 3, 196609, 720932, 3, 196609, 720933, 0, 196609, 720934, 0, 196610, 720935, 0, 196610, 720936, 0, 196611, 720937, 0, 196610, 720938, 0, 196610, 720939, 0, 196610, 720940, 0, 196610, 720941, 0, 196610, 720942, 0, 196610, 720943, 0, 196610, 720944, 0, 196610, 720945, 0, 196610, 720946, 0, 196610, 720947, 0, 196610, 851967, 0, 262145, 786432, 0, 262146, 786433, 0, 262147, 786434, 0, 262145, 786435, 0, 262146, 786436, 0, 262147, 786437, 0, 262145, 786438, 0, 262146, 786439, 0, 262147, 786440, 0, 262145, 786441, 0, 262146, 786442, 0, 262147, 786443, 0, 262145, 786444, 0, 262146, 786445, 0, 262147, 786446, 0, 262145, 786447, 0, 262146, 786448, 0, 262147, 786449, 0, 262145, 786450, 0, 262146, 786451, 0, 262147, 786452, 0, 262145, 786453, 0, 262146, 786454, 0, 262147, 786455, 0, 262148 ) +tile_data = PoolIntArray( -327617, 4, 65536, -262081, 4, 65536, -196545, 4, 65536, -131009, 4, 65536, -65473, 4, 65536, 0, 4, 65536, 19, 4, 65536, 63, 4, 65536, 65536, 4, 65536, 65555, 4, 65536, 65599, 4, 65536, 131072, 4, 65536, 131091, 4, 65536, 131128, 2, 0, 131129, 2, 1, 131130, 2, 2, 131135, 4, 65536, 196608, 4, 65536, 196620, 2, 0, 196621, 2, 1, 196622, 2, 2, 196627, 4, 65536, 196664, 2, 65536, 196665, 2, 65537, 196666, 2, 65538, 196671, 4, 0, 262144, 4, 0, 262156, 2, 65536, 262157, 2, 65537, 262158, 2, 65538, 262163, 4, 0, 262207, 4, 65536, 327680, 4, 65536, 327699, 4, 65536, 327723, 0, 3, 327724, 0, 2, 327725, 0, 3, 327726, 0, 3, 327727, 0, 2, 327728, 0, 3, 327729, 0, 3, 327730, 0, 2, 327731, 0, 3, 327732, 0, 4, 327745, 4, 0, 393216, 4, 65536, 393237, 4, 0, 393257, 1, 65536, 393258, 1, 65537, 393259, 0, 65538, 393260, 0, 65537, 393261, 0, 65538, 393262, 0, 65538, 393263, 0, 65537, 393264, 0, 65538, 393265, 0, 65538, 393266, 0, 65537, 393267, 0, 65538, 393268, 0, 65540, 393281, 4, 0, 458752, 4, 65536, 458773, 4, 0, 458790, 1, 1, 458791, 1, 65536, 458792, 1, 65537, 458793, 1, 131072, 458794, 1, 131073, 458795, 0, 196611, 458796, 0, 196610, 458797, 0, 196611, 458798, 0, 196611, 458799, 0, 196610, 458800, 0, 196611, 458801, 0, 196611, 458802, 0, 196610, 458803, 0, 196611, 458804, 0, 131076, 458807, 0, 0, 458808, 0, 2, 458809, 0, 3, 458810, 0, 1, 458811, 0, 2, 458812, 0, 3, 458813, 0, 1, 458814, 0, 2, 458815, 0, 2, 458816, 0, 1, 458817, 4, 0, 458818, 0, 3, 458819, 0, 4, 589823, 0, 1, 524288, 4, 131072, 524289, 0, 3, 524290, 0, 1, 524291, 0, 2, 524292, 0, 3, 524293, 0, 1, 524294, 0, 2, 524295, 0, 3, 524296, 0, 1, 524297, 0, 2, 524298, 0, 3, 524299, 0, 1, 524300, 0, 2, 524301, 0, 3, 524302, 0, 1, 524303, 0, 2, 524304, 0, 3, 524305, 0, 1, 524306, 0, 2, 524308, 0, 1, 524309, 4, 0, 524310, 0, 3, 524311, 0, 4, 524315, 3, 0, 524316, 3, 1, 524317, 3, 2, 524318, 3, 3, 524319, 3, 1, 524320, 3, 2, 524321, 3, 3, 524322, 3, 1, 524323, 3, 2, 524324, 3, 3, 524325, 1, 65536, 524326, 1, 65537, 524327, 1, 131072, 524328, 1, 131073, 524329, 0, 131074, 524330, 0, 131075, 524331, 0, 196610, 524332, 0, 196610, 524333, 0, 196610, 524334, 0, 196610, 524335, 0, 196610, 524336, 0, 196610, 524337, 0, 196610, 524338, 0, 196610, 524339, 0, 196610, 524340, 0, 196612, 524343, 0, 65536, 524344, 0, 65538, 524345, 0, 65539, 524346, 0, 65537, 524347, 0, 65538, 524348, 0, 65539, 524349, 0, 65537, 524350, 0, 65538, 524351, 0, 65539, 524352, 0, 65537, 524353, 0, 65538, 524354, 0, 65539, 524355, 0, 65540, 655359, 0, 65537, 589824, 0, 65538, 589825, 0, 65539, 589826, 0, 65537, 589827, 0, 65538, 589828, 0, 65539, 589829, 0, 65537, 589830, 0, 65538, 589831, 0, 65539, 589832, 0, 65537, 589833, 0, 65538, 589834, 0, 65539, 589835, 0, 65537, 589836, 0, 65538, 589837, 0, 65539, 589838, 0, 65537, 589839, 0, 65538, 589840, 0, 65539, 589841, 0, 65537, 589842, 0, 65538, 589843, 0, 65539, 589844, 0, 65537, 589845, 0, 65538, 589846, 0, 65539, 589847, 0, 65540, 589851, 3, 65536, 589852, 3, 65537, 589853, 3, 65538, 589854, 3, 65539, 589855, 3, 65537, 589856, 3, 65538, 589857, 3, 65539, 589858, 3, 65537, 589859, 3, 65538, 589860, 3, 65539, 589861, 1, 131072, 589862, 1, 131073, 589863, 0, 131073, 589864, 0, 131074, 589865, 0, 196610, 589866, 0, 196610, 589867, 0, 196610, 589868, 0, 196610, 589869, 0, 196610, 589870, 0, 196610, 589871, 0, 196610, 589872, 0, 196610, 589873, 0, 196610, 589874, 0, 196610, 589875, 0, 196610, 589876, 0, 131076, 589879, 0, 131072, 589880, 0, 131074, 589881, 0, 131075, 589882, 0, 131073, 589883, 0, 131074, 589884, 0, 131075, 589885, 0, 131073, 589886, 0, 131074, 589887, 0, 131075, 589888, 0, 131073, 589889, 0, 131074, 589890, 0, 131075, 589891, 0, 131076, 720895, 0, 131073, 655360, 0, 131074, 655361, 0, 131075, 655362, 0, 131073, 655363, 0, 131074, 655364, 0, 131075, 655365, 0, 131073, 655366, 0, 131074, 655367, 0, 131075, 655368, 0, 131073, 655369, 0, 131074, 655370, 0, 131075, 655371, 0, 131073, 655372, 0, 131074, 655373, 0, 131075, 655374, 0, 131073, 655375, 0, 131074, 655376, 0, 131075, 655377, 0, 131073, 655378, 0, 131074, 655379, 0, 131075, 655380, 0, 131073, 655381, 0, 131074, 655382, 0, 131075, 655383, 0, 131076, 655387, 3, 131072, 655388, 3, 131073, 655389, 3, 131074, 655390, 3, 131075, 655391, 3, 131073, 655392, 3, 131074, 655393, 3, 131075, 655394, 3, 131073, 655395, 3, 131074, 655396, 3, 131075, 655397, 0, 131074, 655398, 0, 131075, 655399, 0, 131073, 655400, 0, 196610, 655401, 0, 196610, 655402, 0, 196610, 655403, 0, 196610, 655404, 0, 196610, 655405, 0, 196610, 655406, 0, 196610, 655407, 0, 196610, 655408, 0, 196610, 655409, 0, 196610, 655410, 0, 196610, 655411, 0, 196610, 655412, 0, 196612, 655415, 0, 196608, 655416, 0, 196610, 655417, 0, 196611, 655418, 0, 196609, 655419, 0, 196610, 655420, 0, 196611, 655421, 0, 196609, 655422, 0, 196610, 655423, 0, 196611, 655424, 0, 196609, 655425, 0, 196610, 655426, 0, 196611, 655427, 0, 196612, 786431, 0, 196609, 720896, 0, 196610, 720897, 0, 196611, 720898, 0, 196609, 720899, 0, 196610, 720900, 0, 196611, 720901, 0, 196609, 720902, 0, 196610, 720903, 0, 196611, 720904, 0, 196609, 720905, 0, 196610, 720906, 0, 196611, 720907, 0, 196609, 720908, 0, 196610, 720909, 0, 196611, 720910, 0, 196609, 720911, 0, 196610, 720912, 0, 196611, 720913, 0, 196609, 720914, 0, 196610, 720915, 0, 196611, 720916, 0, 196609, 720917, 0, 196610, 720918, 0, 196611, 720919, 0, 196612, 720923, 3, 196608, 720924, 3, 196609, 720925, 3, 196609, 720926, 3, 196609, 720927, 3, 196609, 720928, 3, 196609, 720929, 3, 196609, 720930, 3, 196609, 720931, 3, 196609, 720932, 3, 196609, 720933, 0, 196609, 720934, 0, 196610, 720935, 0, 196610, 720936, 0, 196611, 720937, 0, 196610, 720938, 0, 196610, 720939, 0, 196610, 720940, 0, 196610, 720941, 0, 196610, 720942, 0, 196610, 720943, 0, 196610, 720944, 0, 196610, 720945, 0, 196610, 720946, 0, 196610, 720947, 0, 196610, 720948, 0, 262148, 720951, 0, 262144, 720952, 0, 262146, 720953, 0, 262147, 720954, 0, 262145, 720955, 0, 262146, 720956, 0, 262147, 720957, 0, 262145, 720958, 0, 262146, 720959, 0, 262147, 720960, 0, 262145, 720961, 0, 262146, 720962, 0, 262147, 720963, 0, 262148, 851967, 0, 262145, 786432, 0, 262146, 786433, 0, 262147, 786434, 0, 262145, 786435, 0, 262146, 786436, 0, 262147, 786437, 0, 262145, 786438, 0, 262146, 786439, 0, 262147, 786440, 0, 262145, 786441, 0, 262146, 786442, 0, 262147, 786443, 0, 262145, 786444, 0, 262146, 786445, 0, 262147, 786446, 0, 262145, 786447, 0, 262146, 786448, 0, 262147, 786449, 0, 262145, 786450, 0, 262146, 786451, 0, 262147, 786452, 0, 262145, 786453, 0, 262146, 786454, 0, 262147, 786455, 0, 262148 ) [node name="TileMap Foreground" parent="." index="2"] tile_set = ExtResource( 2 ) @@ -79,12 +79,12 @@ position = Vector2( 271, 94 ) shape = SubResource( 1 ) [node name="LevelTransition" parent="." index="5" instance=ExtResource( 4 )] +position = Vector2( 1032, 112 ) _destination_level_name = "CloneBox" _destination_position_name = "EnterLeft" [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"] modulate = Color( 1, 0, 1, 1 ) -position = Vector2( 325, 121 ) shape = SubResource( 2 ) [node name="Ladder" type="Area2D" parent="." index="6"] @@ -108,7 +108,7 @@ __meta__ = { } [node name="EnterRight" type="Position2D" parent="." index="7"] -position = Vector2( 325, 127 ) +position = Vector2( 1032, 112 ) [node name="CameraBounds" type="TileMap" parent="." index="8"] tile_set = SubResource( 4 ) @@ -117,7 +117,7 @@ show_collision = true collision_layer = 256 collision_mask = 0 format = 1 -tile_data = PoolIntArray( -65536, 0, 0, -65521, 0, 0, -65514, 0, 0, -65507, 0, 0, 65535, 0, 0, 524287, 0, 0, 589824, 0, 0, 589838, 0, 0, 589845, 0, 0, 589851, 0, 0 ) +tile_data = PoolIntArray( -65536, 0, 0, -65521, 0, 0, -65514, 0, 0, -65507, 0, 0, -65500, 0, 0, -65489, 0, 0, -65486, 0, 0, 65535, 0, 0, 51, 0, 0, 524287, 0, 0, 524339, 0, 0, 589824, 0, 0, 589838, 0, 0, 589845, 0, 0, 589851, 0, 0, 589860, 0, 0, 589868, 0, 0, 589874, 0, 0 ) [node name="ItemPickup" parent="." index="9" instance=ExtResource( 7 )] position = Vector2( 203, 48 )