From 0a7e2a045bd1124321198871377811874f8c7cd0 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Sun, 31 Jul 2022 12:19:20 +0200 Subject: [PATCH] Smol idling animation fix --- src/Actors/Blobby/Blobby.tscn | 11 +++++------ src/Levels/TLT Level.tscn | 11 ++++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Actors/Blobby/Blobby.tscn b/src/Actors/Blobby/Blobby.tscn index 5010601..fc4c16d 100644 --- a/src/Actors/Blobby/Blobby.tscn +++ b/src/Actors/Blobby/Blobby.tscn @@ -135,12 +135,12 @@ states/turnToRun/position = Vector2( 685, -219.378 ) states/walking/node = SubResource( 24 ) states/walking/position = Vector2( 685, -54 ) states/wallslideToJump/node = SubResource( 80 ) -states/wallslideToJump/position = Vector2( 226.329, 552.088 ) +states/wallslideToJump/position = Vector2( 227.329, 552.088 ) states/wallsliding/node = SubResource( 64 ) -states/wallsliding/position = Vector2( 685, 685.088 ) +states/wallsliding/position = Vector2( 685, 686.088 ) transitions = [ "idling", "walking", SubResource( 25 ), "walking", "idling", SubResource( 26 ), "idling", "jumping", SubResource( 31 ), "running", "jumping", SubResource( 32 ), "walking", "jumping", SubResource( 33 ), "ducking", "idling", SubResource( 34 ), "idling", "ducking", SubResource( 35 ), "ducking", "running", SubResource( 36 ), "running", "ducking", SubResource( 37 ), "walking", "ducking", SubResource( 38 ), "ducking", "walking", SubResource( 39 ), "falling", "running", SubResource( 40 ), "falling", "ducking", SubResource( 41 ), "falling", "idling", SubResource( 42 ), "falling", "walking", SubResource( 43 ), "ducking", "jumping", SubResource( 44 ), "walking", "falling", SubResource( 50 ), "running", "falling", SubResource( 51 ), "ducking", "falling", SubResource( 52 ), "idling", "turnToRun", SubResource( 55 ), "turnToRun", "running", SubResource( 56 ), "walking", "turnToRun", SubResource( 57 ), "running", "turnToRun", SubResource( 59 ), "turnToRun", "walking", SubResource( 60 ), "turnToRun", "idling", SubResource( 61 ), "jumping", "jumpToFall", SubResource( 65 ), "jumpToFall", "falling", SubResource( 66 ), "falling", "wallsliding", SubResource( 76 ), "wallsliding", "jumping", SubResource( 77 ), "wallsliding", "falling", SubResource( 78 ), "wallsliding", "idling", SubResource( 79 ), "wallsliding", "wallslideToJump", SubResource( 81 ), "wallslideToJump", "jumping", SubResource( 82 ) ] start_node = "idling" -graph_offset = Vector2( -210.671, 120.009 ) +graph_offset = Vector2( -241.671, 220.009 ) [sub_resource type="AnimationNodeStateMachinePlayback" id=48] @@ -249,7 +249,7 @@ tracks/0/loop_wrap = false tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 0.2, 0.4, 0.6, 0.8, 1, 1.2, 1.4, 1.6, 1.8, 2, 2.2, 2.4, 2.6, 2.8, 3, 3.2, 3.4, 3.6, 3.8, 4, 4.2, 4.4, 4.6, 4.8, 5, 5.2, 5.4, 5.6, 5.8, 6, 6.2, 6.4, 6.6, 6.8, 7, 7.2 ), +"times": PoolRealArray( 0, 0.2, 0.4, 0.8, 1, 1.2, 1.4, 1.6, 1.8, 2, 2.2, 2.4, 2.6, 2.8, 3, 3.2, 3.4, 3.6, 3.8, 4, 4.2, 4.4, 4.6, 4.8, 5, 5.2, 5.4, 5.6, 5.8, 6, 6.2, 6.4, 6.6, 6.8, 7, 7.2, 7.4 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 1, "values": [ 5.0, 6.0, 7.0, 6.0, 5.0, 6.0, 7.0, 7.0, 6.0, 5.0, 6.0, 7.0, 7.0, 6.0, 5.0, 6.0, 7.0, 7.0, 6.0, 5.0, 7.0, 8.0, 9.0, 10.0, 9.0, 8.0, 9.0, 10.0, 9.0, 8.0, 8.0, 9.0, 10.0, 6.0, 7.0, 7.0, 6.0 ] @@ -353,7 +353,7 @@ tracks/0/keys = { } [sub_resource type="Animation" id=73] -length = 0.1 +length = 0.3 loop = true tracks/0/type = "value" tracks/0/path = NodePath(".:frame") @@ -414,7 +414,6 @@ __meta__ = { [node name="AnimationTree" type="AnimationTree" parent="BlobbySprite"] tree_root = SubResource( 47 ) anim_player = NodePath("../BlobbymationPlayer") -active = true root_motion_track = NodePath(".:frame") parameters/playback = SubResource( 48 ) diff --git a/src/Levels/TLT Level.tscn b/src/Levels/TLT Level.tscn index 0cf48e9..3132d8d 100644 --- a/src/Levels/TLT Level.tscn +++ b/src/Levels/TLT Level.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://assets/environment/blocks/alienShip1EdgePartTile/alienShip1EdgePartTile.tres" type="Texture" id=1] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/environment/blocks/alienShip1innerPartTile/alienShip1InnerPart.tres" type="Texture" id=3] +[ext_resource path="res://src/Contraptions/Platform/FlyingLaserCutter.tscn" type="PackedScene" id=4] [ext_resource path="res://src/UserInterface/Buttons/UI.tscn" type="PackedScene" id=7] [sub_resource type="ConvexPolygonShape2D" id=1] @@ -64,7 +65,7 @@ __meta__ = { [node name="UserInterface" parent="." instance=ExtResource( 7 )] [node name="Blobby" parent="." instance=ExtResource( 2 )] -position = Vector2( 176, 1096 ) +position = Vector2( 128, 344 ) scale = Vector2( 0.878906, 0.936025 ) [node name="TileMap" type="TileMap" parent="."] @@ -76,6 +77,10 @@ collision_friction = 0.0 collision_layer = 8 collision_mask = 8 format = 1 -tile_data = PoolIntArray( 1638384, -1610612733, 0, 1638385, -1610612733, 0, 1638386, -1610612734, 0, 1703920, -1610612733, 0, 1703921, -1610612733, 0, 1703922, -1610612734, 0, 1638407, -1073741822, 0, 1638408, -1073741821, 0, 1769456, -1610612733, 0, 1769457, -1610612733, 0, 1769480, -1073741821, 0, 1835015, -1073741822, 0, 1835016, -1073741821, 0, 1900545, -1610612733, 0, 1900546, -1610612733, 0, 1900551, -1073741822, 0, 1900552, -1073741821, 0, 1966081, -1610612733, 0, 1966082, -1610612733, 0, 1966083, -1610612734, 0, 1966087, -1073741822, 0, 1966088, -1073741821, 0, 1966089, -1073741821, 0, 2031617, -1610612733, 0, 2031618, -1610612733, 0, 2031619, -1610612734, 0, 2031623, -1073741822, 0, 2031624, -1073741821, 0, 2097153, -1610612733, 0, 2097154, -1610612733, 0, 2097155, -1610612734, 0, 2097159, -1073741822, 0, 2097160, -1073741821, 0, 2162689, -1610612733, 0, 2162690, -1610612733, 0, 2162691, -1610612734, 0, 2162695, -1073741822, 0, 2162696, -1073741821, 0, 2162700, 2, 0, 2228225, -1610612733, 0, 2228226, 1, 0, 2228227, -1610612735, 0, 2228228, -1610612735, 0, 2228229, -1610612735, 0, 2228230, -1610612735, 0, 2228231, -1610612735, 0, 2228232, -1610612735, 0, 2228233, -1610612735, 0, 2228234, -1610612735, 0, 2228235, -1610612735, 0, 2228236, -1610612735, 0, 2228237, -1610612735, 0, 2228238, -1610612735, 0, 2228239, -1610612735, 0, 2228240, -1610612735, 0, 2228241, 1, 0, 2293761, -1610612733, 0, 2293762, 1610612737, 0, 2293763, -1610612735, 0, 2293764, 1610612736, 0, 2293765, 1610612736, 0, 2293766, 1610612736, 0, 2293767, 1610612736, 0, 2293768, 1610612736, 0, 2293769, 1610612736, 0, 2293770, 1610612736, 0, 2293771, 1610612736, 0, 2293772, 1610612736, 0, 2293773, 1610612736, 0, 2293774, 1610612736, 0, 2293775, 1610612736, 0, 2293776, 1, 0, 2293777, 1610612737, 0, 2359297, -1610612733, 0, 2359298, 1, 0, 2359299, -1610612736, 0, 2359301, 2, 0, 2359302, 2, 0, 2359303, 2, 0, 2359304, 2, 0, 2359305, 2, 0, 2359306, 2, 0, 2359307, 2, 0, 2359308, 3, 0, 2359309, 2, 0, 2359310, 2, 0, 2359311, 2, 0, 2359312, -1073741824, 0, 2359313, 1610612737, 0, 2359314, 2, 0, 2359315, 2, 0, 2359316, 2, 0, 2359317, 2, 0, 2359318, 2, 0, 2424833, -1610612733, 0, 2424834, 1, 0, 2424835, -1610612736, 0, 2424836, 3, 0, 2424837, 3, 0, 2424838, 3, 0, 2424839, 3, 0, 2424840, 3, 0, 2424841, 3, 0, 2424842, 3, 0, 2424843, 3, 0, 2424844, 3, 0, 2424845, 3, 0, 2424846, 3, 0, 2424847, 3, 0, 2424848, -1073741824, 0, 2424849, 1610612737, 0, 2424850, 3, 0, 2424851, 3, 0, 2424852, 3, 0, 2424853, 3, 0, 2424854, 3, 0, 2490370, 1, 0, 2490371, -1610612736, 0, 2490372, 3, 0, 2490373, 3, 0, 2490374, 3, 0, 2490375, 3, 0, 2490376, 3, 0, 2490377, 3, 0, 2490378, 3, 0, 2490379, 3, 0, 2490380, 3, 0, 2490381, 3, 0, 2490382, 3, 0, 2490383, 3, 0, 2490384, -1073741824, 0, 2490385, 1610612737, 0, 2490386, 3, 0, 2490387, 3, 0, 2490388, 3, 0, 2490389, -1073741821, 0, 2490390, -1073741821, 0, 2555906, 1, 0, 2555907, -1610612736, 0, 2555908, 3, 0, 2555909, 3, 0, 2555910, 3, 0, 2555911, 3, 0, 2555912, 3, 0, 2555913, 3, 0, 2555914, 3, 0, 2555915, 3, 0, 2555916, 3, 0, 2555917, 3, 0, 2555918, 3, 0, 2555919, 3, 0, 2555920, -1073741824, 0, 2555921, 1610612737, 0, 2555922, 3, 0, 2555923, 3, 0, 2555924, 3, 0, 2621442, 1, 0, 2621443, -1610612736, 0, 2621444, 3, 0, 2621445, 3, 0, 2621446, 3, 0, 2621447, 3, 0, 2621448, 3, 0, 2621449, 3, 0, 2621450, 3, 0, 2621451, 3, 0, 2621452, 3, 0, 2621453, 3, 0, 2621454, 3, 0, 2621455, 3, 0, 2621456, -1073741824, 0, 2621457, 1610612737, 0, 2621459, 3, 0, 2686978, 1, 0, 2686979, -1610612736, 0, 2686992, -1073741824, 0, 2686993, 1610612737, 0, 2752514, 1, 0, 2752515, -1610612736, 0, 2752528, -1073741824, 0, 2752529, 1610612737, 0, 2818050, 1, 0, 2818051, -1610612736, 0, 2818064, -1073741824, 0, 2818065, 1610612737, 0, 2883586, 1, 0, 2883587, -1610612736, 0, 2883600, -1073741824, 0, 2883601, 1610612737, 0, 2949122, 1, 0, 2949123, -1610612736, 0, 2949136, -1073741824, 0, 2949137, 1610612737, 0, 3014658, 1, 0, 3014659, -1610612736, 0, 3014672, -1073741824, 0, 3014673, 1610612737, 0, 3080194, 1610612737, 0, 3080195, -1073741823, 0, 3080196, 0, 0, 3080197, 0, 0, 3080198, 0, 0, 3080199, 0, 0, 3080200, 0, 0, 3080201, 0, 0, 3080202, 0, 0, 3080203, 0, 0, 3080204, 0, 0, 3080205, 0, 0, 3080206, 0, 0, 3080207, 0, 0, 3080208, 1610612737, 0, 3080209, 1, 0, 3145730, -1073741823, 0, 3145731, -1610612735, 0, 3145732, -1073741823, 0, 3145733, -1073741823, 0, 3145734, -1073741823, 0, 3145735, -1073741823, 0, 3145736, -1073741823, 0, 3145737, -1073741823, 0, 3145738, -1073741823, 0, 3145739, -1073741823, 0, 3145740, -1073741823, 0, 3145741, -1073741823, 0, 3145742, -1073741823, 0, 3145743, -1073741823, 0, 3145744, -1610612735, 0, 3145745, 1, 0 ) +tile_data = PoolIntArray( 1, -1610612733, 0, 2, -1610612733, 0, 3, -1610612734, 0, 7, -1073741822, 0, 8, -1073741821, 0, 15, -1610612733, 0, 16, -1610612733, 0, 17, -1610612734, 0, 21, -1073741822, 0, 22, -1073741821, 0, 65537, -1610612733, 0, 65538, -1610612733, 0, 65539, -1610612734, 0, 65543, -1073741822, 0, 65544, -1073741821, 0, 65548, 2, 0, 65551, -1610612733, 0, 65552, -1610612733, 0, 65553, -1610612734, 0, 65557, -1073741822, 0, 65558, -1073741821, 0, 65562, 2, 0, 131073, -1610612733, 0, 131074, 1, 0, 131075, -1610612735, 0, 131076, -1610612735, 0, 131077, -1610612735, 0, 131078, -1610612735, 0, 131079, -1610612735, 0, 131080, -1610612735, 0, 131081, -1610612735, 0, 131082, -1610612735, 0, 131083, -1610612735, 0, 131084, -1610612735, 0, 131085, -1610612735, 0, 131086, -1610612735, 0, 131087, -1610612735, 0, 131088, -1610612735, 0, 131089, -1610612735, 0, 131090, -1610612735, 0, 131091, -1610612735, 0, 131092, -1610612735, 0, 131093, -1610612735, 0, 131094, -1610612735, 0, 131095, -1610612735, 0, 131096, -1610612735, 0, 131097, -1610612735, 0, 131098, -1610612735, 0, 131099, -1610612735, 0, 131100, -1610612735, 0, 131101, -1610612735, 0, 131102, -1610612735, 0, 131103, 1, 0, 196609, -1610612733, 0, 196610, 1610612737, 0, 196611, -1610612735, 0, 196612, 1610612736, 0, 196613, 1610612736, 0, 196614, 1610612736, 0, 196615, 1610612736, 0, 196616, 1610612736, 0, 196617, 1610612736, 0, 196618, 1610612736, 0, 196619, 1610612736, 0, 196620, 1610612736, 0, 196621, 1610612736, 0, 196622, 1610612736, 0, 196623, 1610612736, 0, 196624, 1610612736, 0, 196625, 1610612736, 0, 196626, 1610612736, 0, 196627, 1610612736, 0, 196628, 1610612736, 0, 196629, 1610612736, 0, 196630, 1610612736, 0, 196631, 1610612736, 0, 196632, 1610612736, 0, 196633, 1610612736, 0, 196634, 1610612736, 0, 196635, 1610612736, 0, 196636, 1610612736, 0, 196637, 1610612736, 0, 196638, 1, 0, 196639, 1610612737, 0, 262145, -1610612733, 0, 262146, 1, 0, 262147, -1610612736, 0, 262149, 2, 0, 262150, 2, 0, 262151, 2, 0, 262152, 2, 0, 262153, 2, 0, 262154, 2, 0, 262155, 2, 0, 262156, 3, 0, 262157, 2, 0, 262158, 2, 0, 262159, -1610612733, 0, 262162, 2, 0, 262163, 2, 0, 262164, 2, 0, 262165, 2, 0, 262166, 2, 0, 262167, 2, 0, 262168, 2, 0, 262169, 2, 0, 262170, 3, 0, 262171, 2, 0, 262172, 2, 0, 262173, 2, 0, 262174, -1073741824, 0, 262175, 1610612737, 0, 262176, 2, 0, 262177, 2, 0, 262178, 2, 0, 262179, 2, 0, 262180, 2, 0, 327681, -1610612733, 0, 327682, 1, 0, 327683, -1610612736, 0, 327684, 3, 0, 327685, 3, 0, 327686, 3, 0, 327687, 3, 0, 327688, 3, 0, 327689, 3, 0, 327690, 3, 0, 327691, 3, 0, 327692, 3, 0, 327693, 3, 0, 327694, 3, 0, 327695, -1610612733, 0, 327698, 3, 0, 327699, 3, 0, 327700, 3, 0, 327701, 3, 0, 327702, 3, 0, 327703, 3, 0, 327704, 3, 0, 327705, 3, 0, 327706, 3, 0, 327707, 3, 0, 327708, 3, 0, 327709, 3, 0, 327710, -1073741824, 0, 327711, 1610612737, 0, 327712, 3, 0, 327713, 3, 0, 327714, 3, 0, 327715, 3, 0, 327716, 3, 0, 393218, 1, 0, 393219, -1610612736, 0, 393220, 3, 0, 393221, 3, 0, 393222, 3, 0, 393223, 3, 0, 393224, 3, 0, 393225, 3, 0, 393226, 3, 0, 393227, 3, 0, 393228, 3, 0, 393229, 3, 0, 393230, 3, 0, 393231, 3, 0, 393234, 3, 0, 393235, 3, 0, 393236, 3, 0, 393237, 3, 0, 393238, 3, 0, 393239, 3, 0, 393240, 3, 0, 393241, 3, 0, 393242, 3, 0, 393243, 3, 0, 393244, 3, 0, 393245, 3, 0, 393246, -1073741824, 0, 393247, 1610612737, 0, 393248, 3, 0, 393249, 3, 0, 393250, 3, 0, 393251, -1073741821, 0, 393252, -1073741821, 0, 458754, 1, 0, 458755, -1610612736, 0, 458756, 3, 0, 458757, 3, 0, 458758, 3, 0, 458759, 3, 0, 458760, 3, 0, 458761, 3, 0, 458762, 3, 0, 458763, 3, 0, 458764, 3, 0, 458765, 3, 0, 458766, 3, 0, 458770, 3, 0, 458771, 3, 0, 458772, 3, 0, 458773, 3, 0, 458774, 3, 0, 458775, 3, 0, 458776, 3, 0, 458777, 3, 0, 458778, 3, 0, 458779, 3, 0, 458780, 3, 0, 458781, 3, 0, 458782, -1073741824, 0, 458783, 1610612737, 0, 458784, 3, 0, 458785, 3, 0, 458786, 3, 0, 524290, 1, 0, 524291, -1610612736, 0, 524292, 3, 0, 524293, 3, 0, 524294, 3, 0, 524295, 3, 0, 524296, 3, 0, 524297, 3, 0, 524298, 3, 0, 524299, 3, 0, 524300, 3, 0, 524301, 3, 0, 524302, 3, 0, 524306, 3, 0, 524307, 3, 0, 524308, 3, 0, 524309, 3, 0, 524310, 3, 0, 524311, 3, 0, 524312, 3, 0, 524313, 3, 0, 524314, 3, 0, 524315, 3, 0, 524316, 3, 0, 524317, 3, 0, 524318, -1073741824, 0, 524319, 1610612737, 0, 524321, 3, 0, 589826, 1, 0, 589827, -1610612736, 0, 589854, -1073741824, 0, 589855, 1610612737, 0, 655362, 1, 0, 655363, -1610612736, 0, 655390, -1073741824, 0, 655391, 1610612737, 0, 720898, 1, 0, 720899, -1610612736, 0, 720926, -1073741824, 0, 720927, 1610612737, 0, 786434, 1, 0, 786435, -1610612736, 0, 786462, -1073741824, 0, 786463, 1610612737, 0, 851970, 1, 0, 851971, -1610612736, 0, 851998, -1073741824, 0, 851999, 1610612737, 0, 917506, 1, 0, 917507, -1610612736, 0, 917534, -1073741824, 0, 917535, 1610612737, 0, 983042, 1610612737, 0, 983043, -1073741823, 0, 983044, 0, 0, 983045, 0, 0, 983046, 0, 0, 983047, 0, 0, 983048, 0, 0, 983049, 0, 0, 983050, 0, 0, 983051, 0, 0, 983052, 0, 0, 983053, 0, 0, 983054, 0, 0, 983055, 0, 0, 983056, 0, 0, 983057, 0, 0, 983058, 0, 0, 983059, 0, 0, 983060, 0, 0, 983061, 0, 0, 983062, 0, 0, 983063, 0, 0, 983064, 0, 0, 983065, 0, 0, 983066, 0, 0, 983067, 0, 0, 983068, 0, 0, 983069, 0, 0, 983070, 1610612737, 0, 983071, 1, 0, 1048578, -1073741823, 0, 1048579, -1610612735, 0, 1048580, -1073741823, 0, 1048581, -1073741823, 0, 1048582, -1073741823, 0, 1048583, -1073741823, 0, 1048584, -1073741823, 0, 1048585, -1073741823, 0, 1048586, -1073741823, 0, 1048587, -1073741823, 0, 1048588, -1073741823, 0, 1048589, -1073741823, 0, 1048590, -1073741823, 0, 1048591, -1073741823, 0, 1048592, -1073741823, 0, 1048593, -1610612735, 0, 1048594, -1073741823, 0, 1048595, -1073741823, 0, 1048596, -1073741823, 0, 1048597, -1073741823, 0, 1048598, -1073741823, 0, 1048599, -1073741823, 0, 1048600, -1073741823, 0, 1048601, -1073741823, 0, 1048602, -1073741823, 0, 1048603, -1073741823, 0, 1048604, -1073741823, 0, 1048605, -1073741823, 0, 1048606, -1610612735, 0, 1048607, 1, 0, 1638384, -1610612733, 0, 1638385, -1610612733, 0, 1638386, -1610612734, 0, 1703920, -1610612733, 0, 1703921, -1610612733, 0, 1703922, -1610612734, 0, 1638407, -1073741822, 0, 1638408, -1073741821, 0, 1769456, -1610612733, 0, 1769457, -1610612733, 0, 1769480, -1073741821, 0, 1835015, -1073741822, 0, 1835016, -1073741821, 0, 1900545, -1610612733, 0, 1900546, -1610612733, 0, 1900551, -1073741822, 0, 1900552, -1073741821, 0, 1966081, -1610612733, 0, 1966082, -1610612733, 0, 1966083, -1610612734, 0, 1966087, -1073741822, 0, 1966088, -1073741821, 0, 1966089, -1073741821, 0, 2031617, -1610612733, 0, 2031618, -1610612733, 0, 2031619, -1610612734, 0, 2031623, -1073741822, 0, 2031624, -1073741821, 0 ) [node name="Collectibles" type="Node" parent="."] + +[node name="FlyingLaserCutter" parent="." instance=ExtResource( 4 )] +position = Vector2( 360, 264 ) +rotation = 1.5708