From fcd22e44f70708cd20e10abcd86992d75b5d2513 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Mon, 24 Apr 2023 12:04:38 +0200 Subject: [PATCH] feat,fix: better particle anims, jump point particles --- .../blobby-effects-spritesheet.aseprite | Bin 2582 -> 3807 bytes assets/effects/jump point.tres | 15 ++++ assets/effects/jump-point.png | Bin 0 -> 259 bytes assets/effects/jump-point.png.import | 35 ++++++++ assets/effects/jump-point1.png | Bin 0 -> 160 bytes assets/effects/jump-point1.png.import | 35 ++++++++ assets/effects/jump-point2.png | Bin 0 -> 146 bytes assets/effects/jump-point2.png.import | 35 ++++++++ assets/effects/jump-point3.png | Bin 0 -> 153 bytes assets/effects/jump-point3.png.import | 35 ++++++++ assets/effects/run dust left.tres | 18 ++++ .../{running smoke.tres => run dust.tres} | 12 +-- assets/effects/run-dusting-left.png | Bin 0 -> 698 bytes assets/effects/run-dusting-left.png.import | 35 ++++++++ assets/effects/run-dusting-left1.png | Bin 0 -> 186 bytes assets/effects/run-dusting-left1.png.import | 35 ++++++++ assets/effects/run-dusting-left2.png | Bin 0 -> 208 bytes assets/effects/run-dusting-left2.png.import | 35 ++++++++ assets/effects/run-dusting-left3.png | Bin 0 -> 286 bytes assets/effects/run-dusting-left3.png.import | 35 ++++++++ assets/effects/run-dusting-left4.png | Bin 0 -> 268 bytes assets/effects/run-dusting-left4.png.import | 35 ++++++++ assets/effects/run-dusting-left5.png | Bin 0 -> 286 bytes assets/effects/run-dusting-left5.png.import | 35 ++++++++ assets/effects/run-dusting-left6.png | Bin 0 -> 208 bytes assets/effects/run-dusting-left6.png.import | 35 ++++++++ assets/effects/run-dusting-left7.png | Bin 0 -> 186 bytes assets/effects/run-dusting-left7.png.import | 35 ++++++++ assets/effects/run-dusting.png | Bin 0 -> 709 bytes assets/effects/run-dusting.png.import | 35 ++++++++ assets/effects/run-dusting1.png | Bin 206 -> 203 bytes assets/effects/run-dusting2.png | Bin 182 -> 208 bytes assets/effects/run-dusting3.png | Bin 199 -> 276 bytes assets/effects/run-dusting4.png | Bin 213 -> 271 bytes assets/effects/run-dusting5.png | Bin 0 -> 276 bytes assets/effects/run-dusting5.png.import | 35 ++++++++ assets/effects/run-dusting6.png | Bin 0 -> 208 bytes assets/effects/run-dusting6.png.import | 35 ++++++++ assets/effects/run-dusting7.png | Bin 0 -> 203 bytes assets/effects/run-dusting7.png.import | 35 ++++++++ src/Actors/Blobby/Blobby.tscn | 79 +++++++++++++----- src/Actors/Blobby/BlobbyStateMachine.gd | 10 ++- 42 files changed, 666 insertions(+), 28 deletions(-) create mode 100644 assets/effects/jump point.tres create mode 100644 assets/effects/jump-point.png create mode 100644 assets/effects/jump-point.png.import create mode 100644 assets/effects/jump-point1.png create mode 100644 assets/effects/jump-point1.png.import create mode 100644 assets/effects/jump-point2.png create mode 100644 assets/effects/jump-point2.png.import create mode 100644 assets/effects/jump-point3.png create mode 100644 assets/effects/jump-point3.png.import create mode 100644 assets/effects/run dust left.tres rename assets/effects/{running smoke.tres => run dust.tres} (83%) create mode 100644 assets/effects/run-dusting-left.png create mode 100644 assets/effects/run-dusting-left.png.import create mode 100644 assets/effects/run-dusting-left1.png create mode 100644 assets/effects/run-dusting-left1.png.import create mode 100644 assets/effects/run-dusting-left2.png create mode 100644 assets/effects/run-dusting-left2.png.import create mode 100644 assets/effects/run-dusting-left3.png create mode 100644 assets/effects/run-dusting-left3.png.import create mode 100644 assets/effects/run-dusting-left4.png create mode 100644 assets/effects/run-dusting-left4.png.import create mode 100644 assets/effects/run-dusting-left5.png create mode 100644 assets/effects/run-dusting-left5.png.import create mode 100644 assets/effects/run-dusting-left6.png create mode 100644 assets/effects/run-dusting-left6.png.import create mode 100644 assets/effects/run-dusting-left7.png create mode 100644 assets/effects/run-dusting-left7.png.import create mode 100644 assets/effects/run-dusting.png create mode 100644 assets/effects/run-dusting.png.import create mode 100644 assets/effects/run-dusting5.png create mode 100644 assets/effects/run-dusting5.png.import create mode 100644 assets/effects/run-dusting6.png create mode 100644 assets/effects/run-dusting6.png.import create mode 100644 assets/effects/run-dusting7.png create mode 100644 assets/effects/run-dusting7.png.import diff --git a/assets/blobby/blobby-effects-spritesheet.aseprite b/assets/blobby/blobby-effects-spritesheet.aseprite index c142edd7716c4aa47625113efc936d3f12ca6e08..aa1a190e73bf0f808142653122b652b0122767e5 100644 GIT binary patch delta 1652 zcmbOxa$lDHJ|6?agQa2<*(({(Y;1hN!rsBaz#yT(GP!_NGlCn)hJx=)-5K~8ic0fb zN{dS}^U{4%(@J<4gkaJP3|VKR8Mu%X2s4NxBrmqzXW(SWD$Okj$j{6x*?fj|6O&*V zQ2y6PMurq1%?QM9llwW8>Ukm#yi8{QuRq(ITZcWU`Aqvo1;ZItGbDD!&8SP+%(z}l zy(<#kP&cx(l7W1X>9Pz~NTzczaKlYM(7^ns zz3K9Cz9z$6GCn-BZ8ptH{hZeLG{MA*q4ThTVcLNk2HTZy_vZ2W@J*LJ@y}se^H16N z|2M2`?qp^-nbyowim-C>98TGKB%>Xe7*^WXzENnCn_+q4(~T<&Z+EUqySXQl+Xwhi@F&ZbdEY}=cBnd9`0Vuq*$MvaDe51BSW{rVNm{QHsEkEcRxnpcI*^NKji!7Mk>@B;1I;j!0Rjj&>77DW2ga&3Gxnb<}R+T!vC0=;YX|Z sOHVW-ETKloAsL~{z`)CZ>;@Nx8CFSGm0v5n^J|tJyu!%9(k%ZF0Ez|lI{*Lx delta 412 zcmcaFJ57XLjEjNc!BVb??3IkmH#WXtVNYgYV31H?o?O7HY0Lp+L&5i@?hITEMWuNz zrNt$gdFh-CoG>W}&B~CPTToKD`6KHlCc$u^*sqU_3@JdG5s2L<%X2H4o_==r*ZBq( zKY8mP@-2xq6Qm@hmx!sf`|`|=n^Biy%@9$p?;U}r(_=Chr)+&ff<^6{2lZ?w8*=Wg z`G4bv0mG%{HSg^O6h0?@+Hs`t|@N`Yvrvx0eh fh^mT#;lLusbBDP9804E=2T6Il`njxgN@xNAl>I9e literal 0 HcmV?d00001 diff --git a/assets/effects/jump-point1.png.import b/assets/effects/jump-point1.png.import new file mode 100644 index 0000000..ae6e71e --- /dev/null +++ b/assets/effects/jump-point1.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/jump-point1.png-9bec0c8f51279bc4e9ffef7153622c8a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/jump-point1.png" +dest_files=[ "res://.import/jump-point1.png-9bec0c8f51279bc4e9ffef7153622c8a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/jump-point2.png b/assets/effects/jump-point2.png new file mode 100644 index 0000000000000000000000000000000000000000..5a8dd6a76f8fc02d38c1b1b68237f04cb2a5b3fe GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|d^}woLn`LH zy}VJ7!GMFw;d}fnp9Sf{tN-_j^=Sd+Q9;8}m6=BJrK!>nC$OW+0C|hqxxb6QJk#{` PGDynP)z4*}Q$iB}jte5w literal 0 HcmV?d00001 diff --git a/assets/effects/jump-point2.png.import b/assets/effects/jump-point2.png.import new file mode 100644 index 0000000..5b449e7 --- /dev/null +++ b/assets/effects/jump-point2.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/jump-point2.png-1640d9e8b835a3661bb96eb0afe3c26f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/jump-point2.png" +dest_files=[ "res://.import/jump-point2.png-1640d9e8b835a3661bb96eb0afe3c26f.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/jump-point3.png b/assets/effects/jump-point3.png new file mode 100644 index 0000000000000000000000000000000000000000..cfa4c40ce36525cb042d82e051e5bb4e18c7f638 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|f<0XvLn`LH zy>gI~L4k+)z@vZG$9Y?t0;cRPms4#FV+1Ne1u`lp&&u%L4XT$-^p!uLpwEFS&CoDC YXXbM8*Jt(}xCD~%boFyt=akR{0Oh47PXGV_ literal 0 HcmV?d00001 diff --git a/assets/effects/jump-point3.png.import b/assets/effects/jump-point3.png.import new file mode 100644 index 0000000..9164f84 --- /dev/null +++ b/assets/effects/jump-point3.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/jump-point3.png-0fb85d10b05debd26ae8726c9ead9d09.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/jump-point3.png" +dest_files=[ "res://.import/jump-point3.png-0fb85d10b05debd26ae8726c9ead9d09.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run dust left.tres b/assets/effects/run dust left.tres new file mode 100644 index 0000000..6dea03a --- /dev/null +++ b/assets/effects/run dust left.tres @@ -0,0 +1,18 @@ +[gd_resource type="AnimatedTexture" load_steps=5 format=2] + +[ext_resource path="res://assets/effects/run-dusting-left2.png" type="Texture" id=1] +[ext_resource path="res://assets/effects/run-dusting-left4.png" type="Texture" id=2] +[ext_resource path="res://assets/effects/run-dusting-left3.png" type="Texture" id=3] +[ext_resource path="res://assets/effects/run-dusting-left1.png" type="Texture" id=4] + +[resource] +frames = 4 +fps = 3.0 +frame_0/texture = ExtResource( 4 ) +frame_0/delay_sec = 0.1 +frame_1/texture = ExtResource( 1 ) +frame_1/delay_sec = 0.1 +frame_2/texture = ExtResource( 3 ) +frame_2/delay_sec = 0.1 +frame_3/texture = ExtResource( 2 ) +frame_3/delay_sec = 0.1 diff --git a/assets/effects/running smoke.tres b/assets/effects/run dust.tres similarity index 83% rename from assets/effects/running smoke.tres rename to assets/effects/run dust.tres index 8b73b48..1bd90ac 100644 --- a/assets/effects/running smoke.tres +++ b/assets/effects/run dust.tres @@ -1,18 +1,18 @@ [gd_resource type="AnimatedTexture" load_steps=5 format=2] -[ext_resource path="res://assets/effects/run-dusting2.png" type="Texture" id=1] -[ext_resource path="res://assets/effects/run-dusting3.png" type="Texture" id=2] -[ext_resource path="res://assets/effects/run-dusting1.png" type="Texture" id=3] +[ext_resource path="res://assets/effects/run-dusting1.png" type="Texture" id=1] +[ext_resource path="res://assets/effects/run-dusting2.png" type="Texture" id=2] +[ext_resource path="res://assets/effects/run-dusting3.png" type="Texture" id=3] [ext_resource path="res://assets/effects/run-dusting4.png" type="Texture" id=4] [resource] frames = 4 fps = 3.0 -frame_0/texture = ExtResource( 3 ) +frame_0/texture = ExtResource( 1 ) frame_0/delay_sec = 0.1 -frame_1/texture = ExtResource( 1 ) +frame_1/texture = ExtResource( 2 ) frame_1/delay_sec = 0.1 -frame_2/texture = ExtResource( 2 ) +frame_2/texture = ExtResource( 3 ) frame_2/delay_sec = 0.1 frame_3/texture = ExtResource( 4 ) frame_3/delay_sec = 0.1 diff --git a/assets/effects/run-dusting-left.png b/assets/effects/run-dusting-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5ef2203f9c485f518aafeb7786cbf8a243fd274b GIT binary patch literal 698 zcmeAS@N?(olHy`uVBq!ia0y~yU|IlVCvdO<$wS@;B7hWQage(c!@6@aFM+Zpo-U3d z6?5L+F$}uvz{B=HwEUzBdxMh5L%As;GF?rRsvQ_vWfW%0xM@zR{b;adO_|&M>wC(c zZ`V1U{kxYDXxd-|CR1ld?rrOPvXA{ZW0m#lIEE4v{eA1t_y7F$=Y`Xr0GA^Y_5F=+ zvRBj}VCdrhm^5={zP|r*#}3nH7mQ!W{xiMuKkiF?)Mt%l=QjS#aC&{_j{Lj#MLmYk z^yk06k=^%I@Bh{-|K+~?ubTUOzHXU=vQppKj?#N^^Nt;T8ftUr{?nsRr^C{Q_isS2fE@a4zSG?JLu<=wR3i6I z%j=V8$gs=)!I3HdYX7`{@#p_IXZtm5wW|`}Smi5QGiB!+pn=sF|1-|2tXEtY=P&;L kKYs|&Bzx+_^Z}uI2F}X&XJXT@%>$X}>FVdQ&MBb@0Hjm%s{jB1 literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting-left.png.import b/assets/effects/run-dusting-left.png.import new file mode 100644 index 0000000..9162f3a --- /dev/null +++ b/assets/effects/run-dusting-left.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting-left.png-a905cad7d4e950342a8b268518719b7e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting-left.png" +dest_files=[ "res://.import/run-dusting-left.png-a905cad7d4e950342a8b268518719b7e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting-left1.png b/assets/effects/run-dusting-left1.png new file mode 100644 index 0000000000000000000000000000000000000000..1799e63dbf61138540c6a674aba061653ef6ec93 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|N<3X0Ln`LH zy}FV2Pyi20z-&WJO^Gfg)#@dlhXdTbKpY8j% zOFLGpo_zl?T>GJ!?1J69SH1dI@vUUq(wPe!=NTZh7TgjKEmdmWEPMR}NYK;O&t;uc GLK6TdhdSs0 literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting-left1.png.import b/assets/effects/run-dusting-left1.png.import new file mode 100644 index 0000000..ba832d0 --- /dev/null +++ b/assets/effects/run-dusting-left1.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting-left1.png-51fa6b460e88eab172ebc2acfcc766eb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting-left1.png" +dest_files=[ "res://.import/run-dusting-left1.png-51fa6b460e88eab172ebc2acfcc766eb.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting-left2.png b/assets/effects/run-dusting-left2.png new file mode 100644 index 0000000000000000000000000000000000000000..2c9c443cddfb8559cdd7e90776ee09c1fafd3738 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|x;$MRLn`LH zy}FT?$xwjBp?-D?OS}l9Vyy!MqX@&I8LCEAS{4gubI$#-W%<_QKn++xL$Aut`1330 zEnb@YV_HB$Tb-3$RNMZLxOpo5w^R4bU;qAQ-u`LluJ}!w&sLJ_wDR5gfR#5H$= dWI-7ABVArt+t%aM{KL0Ff}XB^F6*2UngFMKL16#@ literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting-left2.png.import b/assets/effects/run-dusting-left2.png.import new file mode 100644 index 0000000..25e97e3 --- /dev/null +++ b/assets/effects/run-dusting-left2.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting-left2.png-73a079c1363117147954fb2049303bc0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting-left2.png" +dest_files=[ "res://.import/run-dusting-left2.png-73a079c1363117147954fb2049303bc0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting-left3.png b/assets/effects/run-dusting-left3.png new file mode 100644 index 0000000000000000000000000000000000000000..fb2c3787b57b16e6ecd0c0801bd579673d756a1b GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|Zg{#lhE&XX zdv#+Wlc50X1^w@jHcBffF64J&>QYiz!q1`5Fz*^;#<9mteraFg76q*SyL~$+P#-4v z5EN>LEjLKg7zbq}c&d8wQi6!g&`|+NW-sau+JMMf|?AQi|RjYpS-FWxy^1G&m{QKk2 zZ;i^o^?rTbGXt^f;)O=v~J?dIQy3&_jp`^l_S3cNYK;O K&t;ucLK6TtjBMNh literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting-left3.png.import b/assets/effects/run-dusting-left3.png.import new file mode 100644 index 0000000..dea99b4 --- /dev/null +++ b/assets/effects/run-dusting-left3.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting-left3.png-539cfbf8e6582e2ad4e1caef8c368cd7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting-left3.png" +dest_files=[ "res://.import/run-dusting-left3.png-539cfbf8e6582e2ad4e1caef8c368cd7.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting-left4.png b/assets/effects/run-dusting-left4.png new file mode 100644 index 0000000000000000000000000000000000000000..0cc1e572d850ee52480856ca0439a5f46645cd2e GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|j(NH`hE&XX zdwpXrlcNCZ1^X{gj&Rlr#5n}Aw0v=Na$=6qOOuVrPIT$`HsRY|wr?h%)4!Q90yScQ zhL>Bf-MV$(p-#GR@0{g%$I_l8+Wy@8Av9F^y!!v^=WBoYA3r>0vOx*cq$hS?<>%k_ zdZt@9i6@rP_HSsY?ce*`*Q=b&yBVH;B=4sG=2>n22aJtH|LD%`Yd8BWC3Q-5&!V_L rub=+;{@?z$b%JRBdq!V`11dV@uVf{>@KUQf4ifZq^>bP0l+XkK8&qc< literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting-left4.png.import b/assets/effects/run-dusting-left4.png.import new file mode 100644 index 0000000..a454ab7 --- /dev/null +++ b/assets/effects/run-dusting-left4.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting-left4.png-91dc1424d8bea3252aa55346170d537e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting-left4.png" +dest_files=[ "res://.import/run-dusting-left4.png-91dc1424d8bea3252aa55346170d537e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting-left5.png b/assets/effects/run-dusting-left5.png new file mode 100644 index 0000000000000000000000000000000000000000..fb2c3787b57b16e6ecd0c0801bd579673d756a1b GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|Zg{#lhE&XX zdv#+Wlc50X1^w@jHcBffF64J&>QYiz!q1`5Fz*^;#<9mteraFg76q*SyL~$+P#-4v z5EN>LEjLKg7zbq}c&d8wQi6!g&`|+NW-sau+JMMf|?AQi|RjYpS-FWxy^1G&m{QKk2 zZ;i^o^?rTbGXt^f;)O=v~J?dIQy3&_jp`^l_S3cNYK;O K&t;ucLK6TtjBMNh literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting-left5.png.import b/assets/effects/run-dusting-left5.png.import new file mode 100644 index 0000000..d0b7055 --- /dev/null +++ b/assets/effects/run-dusting-left5.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting-left5.png-dced86e33cea65b44d60f5344f3dfd6b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting-left5.png" +dest_files=[ "res://.import/run-dusting-left5.png-dced86e33cea65b44d60f5344f3dfd6b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting-left6.png b/assets/effects/run-dusting-left6.png new file mode 100644 index 0000000000000000000000000000000000000000..2c9c443cddfb8559cdd7e90776ee09c1fafd3738 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|x;$MRLn`LH zy}FT?$xwjBp?-D?OS}l9Vyy!MqX@&I8LCEAS{4gubI$#-W%<_QKn++xL$Aut`1330 zEnb@YV_HB$Tb-3$RNMZLxOpo5w^R4bU;qAQ-u`LluJ}!w&sLJ_wDR5gfR#5H$= dWI-7ABVArt+t%aM{KL0Ff}XB^F6*2UngFMKL16#@ literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting-left6.png.import b/assets/effects/run-dusting-left6.png.import new file mode 100644 index 0000000..cd144e4 --- /dev/null +++ b/assets/effects/run-dusting-left6.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting-left6.png-f0e5125a5fe82e80486b59120e3a376c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting-left6.png" +dest_files=[ "res://.import/run-dusting-left6.png-f0e5125a5fe82e80486b59120e3a376c.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting-left7.png b/assets/effects/run-dusting-left7.png new file mode 100644 index 0000000000000000000000000000000000000000..1799e63dbf61138540c6a674aba061653ef6ec93 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|N<3X0Ln`LH zy}FV2Pyi20z-&WJO^Gfg)#@dlhXdTbKpY8j% zOFLGpo_zl?T>GJ!?1J69SH1dI@vUUq(wPe!=NTZh7TgjKEmdmWEPMR}NYK;O&t;uc GLK6TdhdSs0 literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting-left7.png.import b/assets/effects/run-dusting-left7.png.import new file mode 100644 index 0000000..67934c5 --- /dev/null +++ b/assets/effects/run-dusting-left7.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting-left7.png-563a31de5482c742e2229e9cc0190b94.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting-left7.png" +dest_files=[ "res://.import/run-dusting-left7.png-563a31de5482c742e2229e9cc0190b94.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting.png b/assets/effects/run-dusting.png new file mode 100644 index 0000000000000000000000000000000000000000..4eabb6bd4189589bb5dc7c05d6e2609d54c62430 GIT binary patch literal 709 zcmeAS@N?(olHy`uVBq!ia0y~yU|IlVCvdO<$wS@;B7hWQage(c!@6@aFM+c4o-U3d z6?5L+vCWe<6krQ5`Vh+WoFPz9^qOtVt`7@CR$Q@t;-vS4`NoOF8OM0UJkR$V+|OoN zA;r^vc>dK@B0%E?BWRd$Ez0|NL!rmS@)J9~*%^AucgOwH+p~6SSoYeJ6=5a2<8Gag z=U-aqb$qkXSN_WTml!w9yZ!aj9h)-?uSMODi@(FtdL`<0nVm%Y#w-6Te%YTkW;FVB zwpndTv7K!6e-pmPU;j-1^xro|ZPC^h|7HHx^KE`ow^RDUy%L+ElQ-V-f330FcK2TZ z(4b2Xbyn*i+Wq(7QOf2rAm*nEf0 zbC|+5=KkyVKfiTC_Ei(^Q|oVQmt@*WD{alQCmaJ9mW&Ph!RgO;3;Gcn;wU6s>Nu%zDa z@i(z;!V?okBN!6$LPPKJdKSIo`>{PY_EpjDv>wA<(aSck^?v*LbKOMg sqEBVrg2Vg%-j%&mdKI;Vst0RI_4v;Y7A delta 149 zcmX@jc#d&`p?-&_i(^Q|oVS-Z3N{4@xL%a4D%`>#EX=K{u!Nt-pn<7GC#`o$>)&(s z%bTS4h%-)16pm(KVA!H;Ts-gCns+MxrpE>j9oZ-^s`ae=oFabI&`5|6xzvUGB(zuh=(DBH8D< xbGO$1W#U&Jc)d@L3f;$@v80AU0d8X5TbAq0<{qIZjL(6@JYD@<);T3K0RU?nKZ*bV delta 125 zcmcb>xQ%gwp+b;y$Rztk^{P+a^_Q+q zOceHFU|@J)=H7o*@|0D-?Y%5JGk5;!8ysA0q~Z$&Zogts2`Ky={Gmm7!%v_>DEM=f XwWV6u=id$qDUgV#tDnm{r-UW|@t-a2 diff --git a/assets/effects/run-dusting3.png b/assets/effects/run-dusting3.png index f3ea9b0cac66d59cd9b895594299ff8e27aac401..6c7d0a34a11510a7cfd5a262f53671a2b9c3c6a8 100644 GIT binary patch delta 235 zcmX@kIE86~Vf{Hz7srr_Id89T%sp%%z#0(uAhaok(L8UD`zaAguU4x`MlTdso?j6{wquwuz?2-M#kFD=WDfx-`f5)|KrS=f`X#YD^^NWsR#=8|6cn? zjVE>H@;CQuqc<1*JRBCl|FC9f%Cr!F^AJ|u&r?p@JU#wAe9N_4uYX5Ze&rE8P;cAP z(Q!(^YkhocobB4bEgSN)!>(T_sN%TF|KY;7+_V4mC+uH!-h`){9qyKSSIl#J;ts7i RB@qe|^K|udS?83{1OP0`Vfz38 delta 158 zcmbQjbewU5VSS^gi(^Q|oVV8v`5F{>SOXsa^?&f-g>6Jc)e5Vb5At+4-~0C1FXb({ z&43j=6WIH-R4#IEvgO5SxBQ=TR)5yXep5F&AY%?kozULYw0&IrAGyA{$~fad*Iawn l{sO`K7d#`5AdC{XD`mc8?q%DzPw^B;)YH|^Wt~$(696#pI9>n% diff --git a/assets/effects/run-dusting4.png b/assets/effects/run-dusting4.png index 7b813bbcb2959fe72d9b0db378164385460cf4ba..0f32c13fcaccf33fbb5082656e59f476e4008832 100644 GIT binary patch delta 230 zcmcc0*v~YPc{i(^Q|oVQmE`3@QIuwIZT6lD=lNPH;Q!z0txII+6qr>1Qo822g)fEU{PDlWPg3XE zm3BYm-_5An^7y69(@2*i-_8HUFRnT~?bHSR>(NuH%5N;6a?f!J?+VEy8>9<%-fR2y zbJwSuJD-2?1w{J0S7fCAIBoMZ=sI6w^yWzaYs~!}YU~nlcRV;AH@iJ*@kLhal^`)s LS3j3^P6DOU6Jdm{NuNYyUsXpSx1;6JOGy(03w)&$&^1c`aN`njxgN@xNA DJfc1L diff --git a/assets/effects/run-dusting5.png b/assets/effects/run-dusting5.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7d0a34a11510a7cfd5a262f53671a2b9c3c6a8 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|&Uv~xhE&XX zdwpZ>VFLlyfVc;tO(~4#d3)SXiAZ|2dc9Q?FH(G8qAA37^8w4}y>3qhzaR8pVG7iV z2_85Y8EZeEuhkxYYx~#yk27Zq3W`3jSSeAZA}HAZd+i@Jp46Gk-`uZ_-dyzaa99BU z!<0}7$3*U0j{?nhZf7N*to^E!yL*`vE&+UmjwBnRRC`ioH)z4*}Q$iB})W~R^ literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting5.png.import b/assets/effects/run-dusting5.png.import new file mode 100644 index 0000000..135ea9c --- /dev/null +++ b/assets/effects/run-dusting5.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting5.png-cece5827bc5f23685cee98aead3155fd.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting5.png" +dest_files=[ "res://.import/run-dusting5.png-cece5827bc5f23685cee98aead3155fd.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting6.png b/assets/effects/run-dusting6.png new file mode 100644 index 0000000000000000000000000000000000000000..056d446b1ac7b037a3f1824b962c023e8b68c8d4 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|x;$MRLn`LH zy|R(_kOL2EzcE@ytuLb%$Yam z43{R~-?U8CB+~xwS7u=sxa@ eB{c}s>fW+kXEyf;Jz;zfB>C literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting6.png.import b/assets/effects/run-dusting6.png.import new file mode 100644 index 0000000..d35f3b7 --- /dev/null +++ b/assets/effects/run-dusting6.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting6.png-e402d98b5dad5fd65c029b3903d76590.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting6.png" +dest_files=[ "res://.import/run-dusting6.png-e402d98b5dad5fd65c029b3903d76590.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/assets/effects/run-dusting7.png b/assets/effects/run-dusting7.png new file mode 100644 index 0000000000000000000000000000000000000000..ec5cc3059382ee3213ee8b8bbd14d1126aa1df35 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|T0LDHLn`LH zy|R(_PymnX#qWZv6=rl!YFZeycEn@!F3O=$Xn`dFEV^mO%eS?83{1OOr4MsNTC literal 0 HcmV?d00001 diff --git a/assets/effects/run-dusting7.png.import b/assets/effects/run-dusting7.png.import new file mode 100644 index 0000000..4f0c095 --- /dev/null +++ b/assets/effects/run-dusting7.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/run-dusting7.png-78a80827fd928320a644a5af1e4cdbf3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/effects/run-dusting7.png" +dest_files=[ "res://.import/run-dusting7.png-78a80827fd928320a644a5af1e4cdbf3.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Actors/Blobby/Blobby.tscn b/src/Actors/Blobby/Blobby.tscn index e59006a..9cd9f12 100644 --- a/src/Actors/Blobby/Blobby.tscn +++ b/src/Actors/Blobby/Blobby.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=124 format=2] +[gd_scene load_steps=128 format=2] [ext_resource path="res://assets/effects/blobby-effects-spritesheet.png" type="Texture" id=1] [ext_resource path="res://src/Actors/Blobby/DeathShader.tres" type="Material" id=2] @@ -6,10 +6,11 @@ [ext_resource path="res://src/Actors/Blobby/Blobby.gd" type="Script" id=4] [ext_resource path="res://assets/meta/new_dynamicfont.tres" type="DynamicFont" id=5] [ext_resource path="res://src/ThirdParty/Demo/IridescenceBall.tscn" type="PackedScene" id=6] -[ext_resource path="res://assets/effects/running smoke.tres" type="Texture" id=7] +[ext_resource path="res://assets/effects/run-dusting-left.png" type="Texture" id=7] +[ext_resource path="res://assets/effects/jump-point.png" type="Texture" id=8] [sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 14.9127, 5.98593 ) +extents = Vector2( 12.9698, 8.9748 ) [sub_resource type="StreamTexture" id=62] load_path = "res://.import/blobby-spritesheet.png-205c8efc79bec685345a637ed2dcfc9b.stex" @@ -304,12 +305,12 @@ 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 ) ] start_node = "idling" -graph_offset = Vector2( 1082.54, -290.431 ) +graph_offset = Vector2( 1057.54, -162.431 ) [sub_resource type="AnimationNodeStateMachinePlayback" id=48] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 12.971, 8.99662 ) +extents = Vector2( 12, 8.99662 ) [sub_resource type="Animation" id=17] length = 0.001 @@ -4016,15 +4017,37 @@ tracks/10/keys = { "values": [ Vector2( -1, 1 ) ] } -[sub_resource type="ParticlesMaterial" id=197] +[sub_resource type="CanvasItemMaterial" id=202] +particles_animation = true +particles_anim_h_frames = 7 +particles_anim_v_frames = 1 +particles_anim_loop = false + +[sub_resource type="ParticlesMaterial" id=199] flag_disable_z = true -direction = Vector3( -10, -1, 0 ) -spread = 1.0 -initial_velocity = 40.0 +direction = Vector3( 10, 2, 0 ) +spread = 3.0 +initial_velocity = -40.0 +orbit_velocity = 0.0 +orbit_velocity_random = 0.0 +linear_accel = 20.0 +damping = 30.0 +anim_speed = 1.0 + +[sub_resource type="CanvasItemMaterial" id=201] +particles_animation = true +particles_anim_h_frames = 3 +particles_anim_v_frames = 1 +particles_anim_loop = false + +[sub_resource type="ParticlesMaterial" id=200] +flag_disable_z = true +direction = Vector3( 10, 2, 0 ) +spread = 1.0 orbit_velocity = 0.0 orbit_velocity_random = 0.0 -linear_accel = -20.0 damping = 20.0 +anim_speed = 1.0 [sub_resource type="Animation" id=181] length = 0.001 @@ -4174,7 +4197,7 @@ process_priority = -1 collision_mask = 254 [node name="CollisionPolygon2D" type="CollisionShape2D" parent="BlobbySkin"] -position = Vector2( 0.0286326, -10.0053 ) +position = Vector2( 1, -8.975 ) scale = Vector2( 1.03, 1.04 ) shape = SubResource( 2 ) @@ -4189,7 +4212,6 @@ visible = false [node name="BlobbySprite" type="Sprite" parent="."] material = ExtResource( 2 ) position = Vector2( 0, -16 ) -scale = Vector2( -1, 1 ) texture = SubResource( 62 ) offset = Vector2( 1, 0 ) hframes = 6 @@ -4207,7 +4229,7 @@ root_motion_track = NodePath(".") parameters/playback = SubResource( 48 ) parameters/ducking/blend_position = 1.0 parameters/falling/blend_position = 1.0 -parameters/idling/blend_position = 1.35307 +parameters/idling/blend_position = 1.0 parameters/jumpToFall/blend_position = 1.0 parameters/jumping/blend_position = 1.0 parameters/runToJump/blend_position = 1.0 @@ -4251,16 +4273,31 @@ anims/wallsliding = SubResource( 74 ) anims/wallslidingRight = SubResource( 97 ) [node name="RunningParticles" type="Particles2D" parent="."] -position = Vector2( 0, -17 ) +material = SubResource( 202 ) +position = Vector2( 0, -16 ) +z_index = 1 +z_as_relative = false +emitting = false +amount = 2 +lifetime = 0.6 +local_coords = false +draw_order = 1 +process_material = SubResource( 199 ) +texture = ExtResource( 7 ) + +[node name="JumpPointParticles" type="Particles2D" parent="."] +material = SubResource( 201 ) +position = Vector2( 1, 6 ) z_index = 1 z_as_relative = false emitting = false amount = 1 lifetime = 0.3 +one_shot = true local_coords = false draw_order = 1 -process_material = SubResource( 197 ) -texture = ExtResource( 7 ) +process_material = SubResource( 200 ) +texture = ExtResource( 8 ) [node name="BlobbyActionEffects" type="Sprite" parent="."] visible = false @@ -4282,7 +4319,7 @@ position = Vector2( 0, -9 ) scale = Vector2( 0.48, 0.48 ) [node name="BlobbyBody" type="CollisionShape2D" parent="." groups=["player"]] -position = Vector2( 0.0392303, -10.002 ) +position = Vector2( 1, -8.975 ) shape = SubResource( 1 ) [node name="WallRaycasts" type="Node2D" parent="."] @@ -4291,13 +4328,13 @@ position = Vector2( 0, -1 ) [node name="LeftWallRaycast" type="Node2D" parent="WallRaycasts"] [node name="Left_Wallcast1" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"] -position = Vector2( -11.9763, -5 ) +position = Vector2( -12, -10.686 ) enabled = true cast_to = Vector2( -2, 0 ) collision_mask = 40 [node name="Left_Wallcast2" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"] -position = Vector2( -11.9763, 5 ) +position = Vector2( -12, -1.942 ) enabled = true cast_to = Vector2( -2, 0 ) collision_mask = 40 @@ -4305,13 +4342,13 @@ collision_mask = 40 [node name="RightWallRaycast" type="Node2D" parent="WallRaycasts"] [node name="Right_Wallcast1" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"] -position = Vector2( 12.0551, -5 ) +position = Vector2( 14, -10.686 ) enabled = true cast_to = Vector2( 2, 0 ) collision_mask = 40 [node name="Right_Wallcast2" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"] -position = Vector2( 12.0551, 5 ) +position = Vector2( 14, -1.942 ) enabled = true cast_to = Vector2( 2, 0 ) collision_mask = 40 diff --git a/src/Actors/Blobby/BlobbyStateMachine.gd b/src/Actors/Blobby/BlobbyStateMachine.gd index 8a9d037..3c946da 100644 --- a/src/Actors/Blobby/BlobbyStateMachine.gd +++ b/src/Actors/Blobby/BlobbyStateMachine.gd @@ -8,6 +8,9 @@ onready var anim_player = parent.get_node("BlobbySprite/BlobbymationPlayer") onready var anim_state_playback = parent.get_node("BlobbySprite/AnimationTree").get("parameters/playback") onready var anim_tree = parent.get_node("BlobbySprite/AnimationTree") onready var running_particles = parent.get_node("RunningParticles") +onready var jump_point_particles = parent.get_node("JumpPointParticles") +onready var run_dust_res = load("res://assets/effects/run-dusting.png") +onready var run_dust_left_res = load("res://assets/effects/run-dusting-left.png") onready var sprite = parent.get_node("BlobbySprite") onready var slope_raycast = get_node("%SlopeRaycast") @@ -205,7 +208,10 @@ func _enter_state(new_state, old_state): if(new_state == "run"): running_particles.emitting = true - running_particles.scale.x = facing + + if(new_state == "jump"): + jump_point_particles.position.x = 0 if facing == 1 else 24 + jump_point_particles.emitting = true if !["run", "walk", "idle", "duck"].has(old_state) && parent.is_on_floor(): @@ -244,6 +250,8 @@ func _exit_state(_old_state, _new_state): pass func _set_blendspaces_direction(value): + running_particles.texture = run_dust_res if facing == -1 else run_dust_left_res + running_particles.scale.x = facing anim_tree.set("parameters/ducking/blend_position", value) anim_tree.set("parameters/falling/blend_position", value) anim_tree.set("parameters/idling/blend_position", value)