From 746b9813e2179c28b9de556bef32028b56563e69 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sun, 25 Jun 2023 19:25:26 -0400 Subject: [PATCH] added drowning anim --- graphics/player/sg_drown.png | Bin 565 -> 573 bytes objects/player/player.tscn | 75 ++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/graphics/player/sg_drown.png b/graphics/player/sg_drown.png index 2d2aa55dc9b9dd7722c5c27819e883a4bd578f6e..019ace39d9e096941dc59de588157f20006b990d 100644 GIT binary patch delta 442 zcmV;r0Y(0`1ib{1jeo)b01mjc&sr41_%}Kgs()@Xp4t zK&Y6y4E0pC_=|}T8{858ly#=TJS*MB>tcJ(d>y$eH;DTA2_ z<1m;3^INuRybn^}0->yW6SY6nAkFtim9HBM>}GZKTio06fzt;D0t-Gp8+yzx19 zGCR1jal&AXIe&y`27fvTv3R$2)s&&ga||Rp8M4JkQiCupO}!dq&Nnl%I|d6()4aD? zL<#&GS^GqXq!A3Nzs_LH`ED@h!60t&E$?k614WTx>LK7$MvSOFl4gzFI)S1so1SDT z!7%)E{vfnY4eDBn7{u{x-6U4hJC+WsLFO}$yLYgqs=<^J kj?4iqdD6+W-In07*qoM6N<$g0eBqF8}}l delta 434 zcmV;j0ZsnB1hoW^jeo-c01m?e$8V@)0004oNklfpUZ(3`A2P;Q9X_+}#+d z0ylK7p1qw;OP)cVz*N=`PZbo#$9wKzv+VsMU)}6G*fiemb5FDHVDotQHWS%Oi<2`8 zh~T%^%wHIT6=3c~mnt}T;fRG8qezTiGi2;*SrSPtYv&@H-+$Rq>eV|4#-Pn2Lk5`v zOWMeQMQuK0z(@sOcNVl7vGGn6i|BEYCyX*Zi>k+kf6EBD4gBN8Vi=UeN|ZUa-N681 zj5FBsiS9n$Gh|rgItG#h583NSF+oUkQ;&ivEu9Q!XZ6A}?0cDI zEP?+?ai5yUO-`d(%{P%P4%x+;FQBSy79;%2qGwE|@y)?CR- zfiQedeh9YC1Z`}Dg7~~{x4?W@b15r0(MhU2F38}8?<;1Hso_5h&Qk?TDc$GX!Dgv~ cpP6<22KYc?m*MUCGynhq07*qoM6N<$f=T|#X8-^I diff --git a/objects/player/player.tscn b/objects/player/player.tscn index ca537f9..a783797 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=50 format=2] +[gd_scene load_steps=52 format=2] [ext_resource path="res://objects/player/player.gd" type="Script" id=1] [ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=2] @@ -27,6 +27,7 @@ [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=25] [ext_resource path="res://graphics/player/sg_jump_ladder.png" type="Texture" id=26] [ext_resource path="res://graphics/player/sg_edge.png" type="Texture" id=27] +[ext_resource path="res://graphics/player/sg_drown.png" type="Texture" id=28] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 3 ) @@ -257,6 +258,73 @@ tracks/3/keys = { "values": [ 0.0, 90.0, 180.0, 270.0 ] } +[sub_resource type="Animation" id=23] +resource_name = "drown" +length = 10.0 +step = 0.05 +tracks/0/type = "value" +tracks/0/path = NodePath("Graphics/Sprite:hframes") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 8 ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Graphics/Sprite:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 0.05, 0.1, 0.75, 0.8, 0.85, 1.05, 1.11114 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 0, 1, 2, 3, 4, 5, 6, 7 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Graphics/Sprite:position") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.75, 1.15 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 1, -10 ), Vector2( 3, -10 ), Vector2( 1, -10 ), Vector2( 3, -10 ), Vector2( 1, -10 ), Vector2( 3, -10 ), Vector2( 2, -10 ), Vector2( 2, -10 ) ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("Graphics/Sprite:texture") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ ExtResource( 28 ) ] +} +tracks/4/type = "method" +tracks/4/path = NodePath(".") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/keys = { +"times": PoolRealArray( 1.15 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "float_to_top" +} ] +} + [sub_resource type="Animation" id=20] resource_name = "duck" length = 0.001 @@ -933,7 +1001,7 @@ double_jump_force = 124.0 [node name="Sprite" type="Sprite" parent="Graphics"] unique_name_in_owner = true material = SubResource( 1 ) -position = Vector2( 0, -10 ) +position = Vector2( 1, -10 ) texture = ExtResource( 4 ) [node name="ArrowPosition" type="Position2D" parent="Graphics"] @@ -988,10 +1056,12 @@ cast_to = Vector2( 0, 4 ) collision_mask = 5 [node name="BodyShape" type="CollisionShape2D" parent="."] +unique_name_in_owner = true position = Vector2( 0.5, -5 ) shape = SubResource( 2 ) [node name="Hitbox" type="Area2D" parent="." groups=["player_hitbox"]] +unique_name_in_owner = true collision_layer = 11 collision_mask = 32 @@ -1019,6 +1089,7 @@ anims/RESET = SubResource( 5 ) anims/blink = SubResource( 18 ) anims/climb = SubResource( 9 ) anims/double_jump = SubResource( 12 ) +anims/drown = SubResource( 23 ) anims/duck = SubResource( 20 ) anims/edge = SubResource( 22 ) anims/fall = SubResource( 15 )