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

feat: frog free progress ui, anim_tree fix

Browse Source
This commit is contained in:
Jakob Feldmann 2023-08-14 22:23:42 +02:00
parent 3abef2dc74
commit fdea374ee2
1 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
[ext_resource path="res://assets/effects/jump-point.png" type="Texture" id=8]
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 12.9698, 8.9748 )
extents = Vector2( 11.9219, 10.0313 )
[sub_resource type="StreamTexture" id=62]
load_path = "res://.import/blobby-spritesheet.png-205c8efc79bec685345a637ed2dcfc9b.stex"
@ -240,8 +240,6 @@ priority = 2
switch_mode = 2
auto_advance = true
[sub_resource type="AnimationNodeStateMachineTransition" id=171]
[sub_resource type="AnimationNodeStateMachineTransition" id=172]
switch_mode = 2
auto_advance = true
@ -262,7 +260,6 @@ switch_mode = 2
auto_advance = true
[sub_resource type="AnimationNodeStateMachineTransition" id=178]
priority = 0
[sub_resource type="AnimationNodeStateMachineTransition" id=137]
@ -276,6 +273,8 @@ priority = 0
[sub_resource type="AnimationNodeStateMachineTransition" id=196]
[sub_resource type="AnimationNodeStateMachineTransition" id=203]
[sub_resource type="AnimationNodeStateMachine" id=47]
states/duckTurn/node = SubResource( 126 )
states/duckTurn/position = Vector2( 1795.54, 241 )
@ -290,27 +289,27 @@ states/idling/position = Vector2( 1375.63, -53.9546 )
states/jumpToFall/node = SubResource( 119 )
states/jumpToFall/position = Vector2( 1981.07, 404.104 )
states/jumping/node = SubResource( 125 )
states/jumping/position = Vector2( 1375.54, 117.961 )
states/jumping/position = Vector2( 1368.79, 122.723 )
states/runToJump/node = SubResource( 146 )
states/runToJump/position = Vector2( 2194.36, 651.238 )
states/runToJump/position = Vector2( 2119.34, 577.905 )
states/running/node = SubResource( 122 )
states/running/position = Vector2( 2273.2, -53.7278 )
states/running/position = Vector2( 2268.44, -53.9541 )
states/turnToRun/node = SubResource( 130 )
states/turnToRun/position = Vector2( 1795.54, -308.991 )
states/walking/node = SubResource( 133 )
states/walking/position = Vector2( 1795.54, -54 )
states/wallslideToJump/node = SubResource( 136 )
states/wallslideToJump/position = Vector2( 1374.76, 343.009 )
states/wallslideToJump/position = Vector2( 1362.38, 336.342 )
states/wallsliding/node = SubResource( 96 )
states/wallsliding/position = Vector2( 1795.54, 493.009 )
transitions = [ "falling", "wallsliding", SubResource( 138 ), "wallsliding", "idling", SubResource( 139 ), "wallsliding", "wallslideToJump", SubResource( 140 ), "wallslideToJump", "jumping", SubResource( 141 ), "idling", "jumping", SubResource( 147 ), "runToJump", "jumping", SubResource( 148 ), "ducking", "jumping", SubResource( 149 ), "jumping", "jumpToFall", SubResource( 150 ), "jumpToFall", "falling", SubResource( 151 ), "ducking", "duckTurn", SubResource( 152 ), "duckTurn", "ducking", SubResource( 153 ), "falling", "ducking", SubResource( 154 ), "ducking", "falling", SubResource( 155 ), "ducking", "walking", SubResource( 156 ), "walking", "ducking", SubResource( 157 ), "idling", "ducking", SubResource( 158 ), "ducking", "idling", SubResource( 159 ), "ducking", "running", SubResource( 160 ), "running", "ducking", SubResource( 161 ), "running", "falling", SubResource( 162 ), "falling", "running", SubResource( 163 ), "walking", "falling", SubResource( 164 ), "falling", "walking", SubResource( 165 ), "falling", "idling", SubResource( 166 ), "idling", "walking", SubResource( 167 ), "walking", "idling", SubResource( 168 ), "walking", "turnToRun", SubResource( 169 ), "turnToRun", "walking", SubResource( 170 ), "running", "turnToRun", SubResource( 171 ), "turnToRun", "running", SubResource( 172 ), "idling", "idleTurn", SubResource( 173 ), "walking", "idleTurn", SubResource( 174 ), "idleTurn", "walking", SubResource( 175 ), "idling", "turnToRun", SubResource( 176 ), "turnToRun", "idling", SubResource( 177 ), "running", "runToJump", SubResource( 178 ), "wallsliding", "falling", SubResource( 137 ), "jumping", "wallsliding", SubResource( 189 ), "jumping", "idling", SubResource( 193 ), "jumping", "walking", SubResource( 194 ), "runToJump", "wallsliding", SubResource( 195 ), "jumpToFall", "idling", SubResource( 196 ) ]
transitions = [ "falling", "wallsliding", SubResource( 138 ), "wallsliding", "idling", SubResource( 139 ), "wallsliding", "wallslideToJump", SubResource( 140 ), "wallslideToJump", "jumping", SubResource( 141 ), "idling", "jumping", SubResource( 147 ), "runToJump", "jumping", SubResource( 148 ), "ducking", "jumping", SubResource( 149 ), "jumping", "jumpToFall", SubResource( 150 ), "jumpToFall", "falling", SubResource( 151 ), "ducking", "duckTurn", SubResource( 152 ), "duckTurn", "ducking", SubResource( 153 ), "falling", "ducking", SubResource( 154 ), "ducking", "falling", SubResource( 155 ), "ducking", "walking", SubResource( 156 ), "walking", "ducking", SubResource( 157 ), "idling", "ducking", SubResource( 158 ), "ducking", "idling", SubResource( 159 ), "ducking", "running", SubResource( 160 ), "running", "ducking", SubResource( 161 ), "running", "falling", SubResource( 162 ), "falling", "running", SubResource( 163 ), "walking", "falling", SubResource( 164 ), "falling", "walking", SubResource( 165 ), "falling", "idling", SubResource( 166 ), "idling", "walking", SubResource( 167 ), "walking", "idling", SubResource( 168 ), "walking", "turnToRun", SubResource( 169 ), "turnToRun", "walking", SubResource( 170 ), "turnToRun", "running", SubResource( 172 ), "idling", "idleTurn", SubResource( 173 ), "walking", "idleTurn", SubResource( 174 ), "idleTurn", "walking", SubResource( 175 ), "idling", "turnToRun", SubResource( 176 ), "turnToRun", "idling", SubResource( 177 ), "running", "runToJump", SubResource( 178 ), "wallsliding", "falling", SubResource( 137 ), "jumping", "wallsliding", SubResource( 189 ), "jumping", "idling", SubResource( 193 ), "jumping", "walking", SubResource( 194 ), "runToJump", "wallsliding", SubResource( 195 ), "jumpToFall", "idling", SubResource( 196 ), "running", "turnToRun", SubResource( 203 ) ]
start_node = "idling"
graph_offset = Vector2( 1157.54, -22.431 )
graph_offset = Vector2( 958.54, -77.431 )
[sub_resource type="AnimationNodeStateMachinePlayback" id=48]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 12, 8.99662 )
extents = Vector2( 12, 9.981 )
[sub_resource type="Animation" id=17]
length = 0.001
@ -1107,6 +1106,20 @@ tracks/1/keys = {
"update": 0,
"values": [ Vector2( 0, 0 ) ]
}
tracks/2/type = "method"
tracks/2/path = NodePath("../DyingSound")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"values": [ {
"args": [ 0.0 ],
"method": "play"
} ]
}
[sub_resource type="Animation" id=192]
resource_name = "expandingDisolve"
@ -3329,10 +3342,10 @@ tracks/10/loop_wrap = true
tracks/10/imported = false
tracks/10/enabled = true
tracks/10/keys = {
"times": PoolRealArray( 0, 0.25, 0.5 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ Vector2( 1, 1 ), Vector2( 1, 1 ), Vector2( 1, 1 ) ]
"values": [ Vector2( 1, 1 ) ]
}
[sub_resource type="Animation" id=99]
@ -4197,12 +4210,15 @@ text = "Ihre Werbung"
align = 1
valign = 1
[node name="Listener2D" type="Listener2D" parent="."]
current = true
[node name="BlobbySkin" type="Area2D" parent="." groups=["player"]]
process_priority = -1
collision_mask = 254
[node name="CollisionPolygon2D" type="CollisionShape2D" parent="BlobbySkin"]
position = Vector2( 1, -8.975 )
position = Vector2( 0.0469954, -10.0308 )
scale = Vector2( 1.03, 1.04 )
shape = SubResource( 2 )
@ -4218,10 +4234,9 @@ visible = false
material = ExtResource( 2 )
position = Vector2( 0, -16 )
texture = SubResource( 62 )
offset = Vector2( 1, 0 )
hframes = 6
vframes = 6
frame = 8
frame = 12
__meta__ = {
"_editor_description_": "YXNlcHJpdGVfd2l6YXJkX2NvbmZpZwpwbGF5ZXJ8PUJsb2JieVNwcml0ZS9CbG9iYnltYXRpb25QbGF5ZXIKc291cmNlfD1yZXM6Ly9hc3NldHMvYmxvYmJ5L2Jsb2JieS1zcHJpdGVzaGVldHQuYXNlcHJpdGUKbGF5ZXJ8PUJsb2JieQpvcF9leHB8PUZhbHNlCm9fZm9sZGVyfD0Kb19uYW1lfD0Kb25seV92aXNpYmxlfD1GYWxzZQpvX2V4X3B8PQo="
}
@ -4239,7 +4254,7 @@ parameters/idling/blend_position = 1.0
parameters/jumpToFall/blend_position = 1.0
parameters/jumping/blend_position = 1.0
parameters/runToJump/blend_position = 1.0
parameters/running/blend_position = 1.0
parameters/running/blend_position = 1.00101
parameters/turnToRun/blend_position = 1.0
parameters/walking/blend_position = 1.0
parameters/wallslideToJump/blend_position = 1.0
@ -4326,7 +4341,7 @@ position = Vector2( 0, -9 )
scale = Vector2( 0.48, 0.48 )
[node name="BlobbyBody" type="CollisionShape2D" parent="." groups=["player"]]
position = Vector2( 1, -8.975 )
position = Vector2( -0.0184917, -10.0133 )
shape = SubResource( 1 )
[node name="WallRaycasts" type="Node2D" parent="."]
@ -4335,7 +4350,7 @@ position = Vector2( 0, -1 )
[node name="LeftWallRaycast" type="Node2D" parent="WallRaycasts"]
[node name="Left_Wallcast1" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"]
position = Vector2( -12, -10.686 )
position = Vector2( -12, -9.013 )
enabled = true
cast_to = Vector2( -2, 0 )
collision_mask = 40
@ -4349,13 +4364,13 @@ collision_mask = 40
[node name="RightWallRaycast" type="Node2D" parent="WallRaycasts"]
[node name="Right_Wallcast1" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"]
position = Vector2( 14, -10.686 )
position = Vector2( 12.0573, -9.0133 )
enabled = true
cast_to = Vector2( 2, 0 )
collision_mask = 40
[node name="Right_Wallcast2" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"]
position = Vector2( 14, -1.942 )
position = Vector2( 12.0573, -1.94163 )
enabled = true
cast_to = Vector2( 2, 0 )
collision_mask = 40