CommonParrot/Blobby
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Balanced ducking and small animated hitbox fix

Browse Source
This commit is contained in:
Jakob Feldmann 2022-07-31 23:47:52 +02:00
parent 13bbe50fbf
commit f31ee4330a
2 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Actors/Blobby/Blobby.gd
View File

@ -85,10 +85,6 @@ func calculate_duck_velocity(
( (
( (
acceleration_force[state].x acceleration_force[state].x
+ (
init_acceleration_force[init_boost_type]
* int(init_boost)
)
) )
* direction.x * direction.x
), ),

52
src/Actors/Blobby/Blobby.tscn
View File

@ -157,7 +157,7 @@ states/falling/position = Vector2( 1097, 241 )
states/idleTurn/node = SubResource( 84 ) states/idleTurn/node = SubResource( 84 )
states/idleTurn/position = Vector2( 228.329, -183.991 ) states/idleTurn/position = Vector2( 228.329, -183.991 )
states/idling/node = SubResource( 21 ) states/idling/node = SubResource( 21 )
states/idling/position = Vector2( 215.329, 27 ) states/idling/position = Vector2( 216.329, 27 )
states/jumpToFall/node = SubResource( 63 ) states/jumpToFall/node = SubResource( 63 )
states/jumpToFall/position = Vector2( 680, 416.088 ) states/jumpToFall/position = Vector2( 680, 416.088 )
states/jumping/node = SubResource( 22 ) states/jumping/node = SubResource( 22 )
@ -176,7 +176,7 @@ states/wallsliding/node = SubResource( 64 )
states/wallsliding/position = Vector2( 574, 612.088 ) states/wallsliding/position = Vector2( 574, 612.088 )
transitions = [ "idling", "walking", SubResource( 25 ), "walking", "idling", SubResource( 26 ), "idling", "jumping", SubResource( 31 ), "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", "falling", SubResource( 78 ), "wallsliding", "idling", SubResource( 79 ), "wallsliding", "wallslideToJump", SubResource( 81 ), "wallslideToJump", "jumping", SubResource( 82 ), "idling", "idleTurn", SubResource( 85 ), "ducking", "duckTurn", SubResource( 87 ), "duckTurn", "ducking", SubResource( 88 ), "running", "runToJump", SubResource( 90 ), "runToJump", "jumping", SubResource( 91 ), "walking", "idleTurn", SubResource( 92 ), "idleTurn", "walking", SubResource( 93 ), "jumping", "wallsliding", SubResource( 94 ) ] transitions = [ "idling", "walking", SubResource( 25 ), "walking", "idling", SubResource( 26 ), "idling", "jumping", SubResource( 31 ), "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", "falling", SubResource( 78 ), "wallsliding", "idling", SubResource( 79 ), "wallsliding", "wallslideToJump", SubResource( 81 ), "wallslideToJump", "jumping", SubResource( 82 ), "idling", "idleTurn", SubResource( 85 ), "ducking", "duckTurn", SubResource( 87 ), "duckTurn", "ducking", SubResource( 88 ), "running", "runToJump", SubResource( 90 ), "runToJump", "jumping", SubResource( 91 ), "walking", "idleTurn", SubResource( 92 ), "idleTurn", "walking", SubResource( 93 ), "jumping", "wallsliding", SubResource( 94 ) ]
start_node = "idling" start_node = "idling"
graph_offset = Vector2( -93.671, 99.009 ) graph_offset = Vector2( -88.671, 262.009 )
[sub_resource type="AnimationNodeStateMachinePlayback" id=48] [sub_resource type="AnimationNodeStateMachinePlayback" id=48]
@ -270,7 +270,7 @@ tracks/6/keys = {
"values": [ Vector2( 12.0551, 5 ) ] "values": [ Vector2( 12.0551, 5 ) ]
} }
tracks/7/type = "value" tracks/7/type = "value"
tracks/7/path = NodePath("../WallRaycasts/RightWallRaycast:position") tracks/7/path = NodePath("../BlobbySkin:position")
tracks/7/interp = 1 tracks/7/interp = 1
tracks/7/loop_wrap = true tracks/7/loop_wrap = true
tracks/7/imported = false tracks/7/imported = false
@ -279,10 +279,10 @@ tracks/7/keys = {
"times": PoolRealArray( 0 ), "times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PoolRealArray( 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 0.96875, -7.28125 ) ] "values": [ Vector2( 0, 0 ) ]
} }
tracks/8/type = "value" tracks/8/type = "value"
tracks/8/path = NodePath("../WallRaycasts/LeftWallRaycast:position") tracks/8/path = NodePath("../BlobbyBody:shape")
tracks/8/interp = 1 tracks/8/interp = 1
tracks/8/loop_wrap = true tracks/8/loop_wrap = true
tracks/8/imported = false tracks/8/imported = false
@ -291,10 +291,10 @@ tracks/8/keys = {
"times": PoolRealArray( 0 ), "times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PoolRealArray( 1 ),
"update": 0, "update": 0,
"values": [ Vector2( -1.03125, -7.28125 ) ] "values": [ SubResource( 1 ) ]
} }
tracks/9/type = "value" tracks/9/type = "value"
tracks/9/path = NodePath("../BlobbySkin:position") tracks/9/path = NodePath("../BlobbyBody:shape:extents")
tracks/9/interp = 1 tracks/9/interp = 1
tracks/9/loop_wrap = true tracks/9/loop_wrap = true
tracks/9/imported = false tracks/9/imported = false
@ -303,10 +303,10 @@ tracks/9/keys = {
"times": PoolRealArray( 0 ), "times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PoolRealArray( 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 0, 0 ) ] "values": [ Vector2( 12.971, 8.99662 ) ]
} }
tracks/10/type = "value" tracks/10/type = "value"
tracks/10/path = NodePath("../BlobbyBody:shape") tracks/10/path = NodePath("../BlobbySkin/CollisionPolygon2D:shape:extents")
tracks/10/interp = 1 tracks/10/interp = 1
tracks/10/loop_wrap = true tracks/10/loop_wrap = true
tracks/10/imported = false tracks/10/imported = false
@ -315,10 +315,10 @@ tracks/10/keys = {
"times": PoolRealArray( 0 ), "times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PoolRealArray( 1 ),
"update": 0, "update": 0,
"values": [ SubResource( 1 ) ] "values": [ Vector2( 14.9127, 5.98593 ) ]
} }
tracks/11/type = "value" tracks/11/type = "value"
tracks/11/path = NodePath("../BlobbyBody:shape:extents") tracks/11/path = NodePath("../BlobbySkin/CollisionPolygon2D:scale")
tracks/11/interp = 1 tracks/11/interp = 1
tracks/11/loop_wrap = true tracks/11/loop_wrap = true
tracks/11/imported = false tracks/11/imported = false
@ -327,10 +327,10 @@ tracks/11/keys = {
"times": PoolRealArray( 0 ), "times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PoolRealArray( 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 12.971, 8.99662 ) ] "values": [ Vector2( 1.03, 1.04 ) ]
} }
tracks/12/type = "value" tracks/12/type = "value"
tracks/12/path = NodePath("../BlobbySkin/CollisionPolygon2D:shape:extents") tracks/12/path = NodePath(".:offset")
tracks/12/interp = 1 tracks/12/interp = 1
tracks/12/loop_wrap = true tracks/12/loop_wrap = true
tracks/12/imported = false tracks/12/imported = false
@ -339,30 +339,6 @@ tracks/12/keys = {
"times": PoolRealArray( 0 ), "times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PoolRealArray( 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 14.9127, 5.98593 ) ]
}
tracks/13/type = "value"
tracks/13/path = NodePath("../BlobbySkin/CollisionPolygon2D:scale")
tracks/13/interp = 1
tracks/13/loop_wrap = true
tracks/13/imported = false
tracks/13/enabled = true
tracks/13/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ Vector2( 1.03, 1.04 ) ]
}
tracks/14/type = "value"
tracks/14/path = NodePath(".:offset")
tracks/14/interp = 1
tracks/14/loop_wrap = true
tracks/14/imported = false
tracks/14/enabled = true
tracks/14/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ Vector2( 1, 0 ) ] "values": [ Vector2( 1, 0 ) ]
} }
@ -2179,7 +2155,6 @@ valign = 1
position = Vector2( 0, -1 ) position = Vector2( 0, -1 )
[node name="LeftWallRaycast" type="Node2D" parent="WallRaycasts"] [node name="LeftWallRaycast" type="Node2D" parent="WallRaycasts"]
position = Vector2( -1.03125, -7.28125 )
[node name="Left_Wallcast1" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"] [node name="Left_Wallcast1" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"]
position = Vector2( -11.9763, -5 ) position = Vector2( -11.9763, -5 )
@ -2196,7 +2171,6 @@ cast_to = Vector2( -1, 0 )
collision_mask = 56 collision_mask = 56
[node name="RightWallRaycast" type="Node2D" parent="WallRaycasts"] [node name="RightWallRaycast" type="Node2D" parent="WallRaycasts"]
position = Vector2( 0.96875, -7.28125 )
[node name="Right_Wallcast1" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"] [node name="Right_Wallcast1" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"]
position = Vector2( 12.0551, -5 ) position = Vector2( 12.0551, -5 )