From 24a2e5e4ab00897f89eeb970e7cf0781d1522118 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 29 Jan 2024 19:13:12 -0500 Subject: [PATCH] make player player player player player player player player player player player player player player player player player player player palyer player player player player player player player player player --- graphics/player/sg_particles_mask.png | Bin 4463 -> 4829 bytes objects/player/player.gd | 4 +++- objects/player/player.tscn | 29 ++++++++++++++++++++------ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/graphics/player/sg_particles_mask.png b/graphics/player/sg_particles_mask.png index fd4b40dba462d3487b3a618c148424518deb2316..5e793069bd2555f564cb6a91f9317caf685d3548 100644 GIT binary patch delta 1216 zcmaE_bXRqPO8te@2+uT6Pb~%x1_lN$1_nkJ21X!D1c(`t*i4Mf49q~WHXs%PvO#J< zSc;JqO!olU(opskAX@{f2BgQ3k%@s9NY4RcBOn`O_9`IGY-eGp2N|*th(Uk@49_t! zFbD&AFxuVIH$cHi&(J{6*bHcZfsu)ofuWU=rGlZQm4Stop$X6dj0+G>0-5y0Z#9r) zY|V6b4)An#RwyXSPs_|nWnie7Q#;Yt<8XjTtAFrPB~kYJ?v52HEBwj=C-!aSa$O;i z)fy)26ZebVS89@oxckAa4<4LPx_aP z;=P^2is>`cN{=%5Za*8Mq?fj7b=hq9I&%4F;y!MfR_9?B8mLHdRimTK;+4bm?^mC`ltn(y|F0ZV7 zB(O2!MZ(hN$ctAx(mM{XS{A%-LSf|7Jx3$8!y{kM`_p=G&c01&N~4rL5(K>`C^$Ka zs!mB%cG~UN)haUgxb2_AzWZJDT4PiVigXq*@fKa?|Hr;RJ^ShM<#(1O)XTi6E1c6` zsIYj%LL`*~wxwwtE%@3_O*Hjn4#l-ZN! zPn&R_`F;8q-^hdqVlQHgpI@^&{*rmZvPjkZhGyr4MGiM#%e{a1a?b7jwrhX>W%$-z zbX(5ZsGos>-!3yGq9nrC$0|8LS1)n%1g2Uhm1IN1BooU-GhOo}Gc#S2G=n5vi{vCD z-DHDQgVbbmgS2E5)5(UcOEt|6%uLOVjVw(JEQ~FUO_jJ56cj+|!zwJbs5mn}&sGVV zP$vIp4RnMiln_`#(KRr&GB5yZs>m&{^36}lOsjNBEJ+1wgC{Fw)te`>@i9)`!xpP- znwV&AZjq{MnP_gPYm#JXsGF2%Xr^mvVQOxgl9Fg>Vwf`7hTT=dMAyJj*T^!&(A>(z z$jZY7*reQ0TtVyK&zl9FO(W}cdAnP>_!MHp@h zG=&3A**t|ko1^}^{iH3xgw2-Z?d}3f=L`%#op;v*Db50q$YKTtzQZ8Qcszea3Q&-} z#M9T6{RN{O0|(y}mbo!Nq0OEyjv*GO*G|35dsu;|<$T!p6`M}>9?Q75S@+?S}{v%w2>&A(l@>~sr1ui+BBaGJvLDf1gHGVl6l@ga}LQgZLr_yf}W YW$m_dYp*wC;0F4@)78&qol`;+06qtn=Kufz delta 1118 zcmV-k1fl!gCGR4TB!9ztR9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}ZBW|{!!QW^ zXNr!10l&s^5?AU59lsDrltewr81AeC1M~ZN!^=QPKyq!Rmx2oE(rIYY&@uLyQ1PrHeZkyS3 zO3W8l#n3Av2qOSsR%VtlCrKIjuCIHy5_bunTC0|Fv(k{PCdO}s%ovuPWg z_laYyBCEvb#1kexkob}7ipOu9%PtE%GiK(p^TaV?vE0K-53`D?5l<7xRZXXSA@8xu zd5g1FYp~8c`46K-ePx;Jv`3M~B9j$5~@7`LasYx$?DVhTMUmWLS3<&K4?WW^=A3IL_1PDF@S9;f9Z_x-pNpE(w z_z^I;4P0DzHDwRD+yRE44B3=jDM(u=m4Np%8dCunx&E91lM{=8WFmxdR01bF)R9JLaO-wptZ*4BKo&tUXBrs)SVlXf; zWi2*gGiEI`Wi~M_VPZ5kEiq+cH#K8sHDWL@F_SkWpZGBG+ZG&(UbEig1XFfbwt zARr)kZE!kGZ)9m^c|>7!Wj!J?FfubbF)%tXH&ik)IxsXkF)%GKG_#-v4gs@t31A2o zNn5D~00006VoOIv03ZM&06N7--$#?`5gvc%3J3uN3eD>G`2YX`8c9S!R5;6HWWW#p zXsGWpA%<;L9vF!xI|0)ZHmj6i%H}79#U|?WiSgdpcE>5fq8IfbM z1ueW_d|WZjgwN%$h}gP!IW9GfB&S0L1_lNdC4GiF_bxIpFfcHvD{7G(hKQsFO){~~ zm*9enYxQ6e!$@A%Lvj_&mG}T&0~tQGlNef-{6R5{P_khnGdRfB^uN?b6wW#P;wu9K k0|Uc}JKxAEvB|0e06ENMHLNZa&Hw-a07*qoM6N<$f void: #set palette var palette = load("res://graphics/player/palettes/%s.png" % Game.current_palette) sprite.material.set_shader_param("palette", palette) - $Graphics/CFox.material.set_shader_param("palette", palette) + $"%CFox".material.set_shader_param("palette", palette) + $"%DissolveParticles".material.set_shader_param("palette", palette) + # death handling Game.respawn_point = global_position connect("died", Game, "_on_player_died") diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 1f0fb0a..85edbd5 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=40 format=2] +[gd_scene load_steps=42 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] @@ -21,6 +21,22 @@ shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = true shader_param/palette = ExtResource( 2 ) +[sub_resource type="Shader" id=26] +code = "// Recolor +shader_type canvas_item; + +uniform sampler2D palette : hint_albedo; + +void fragment() { + vec4 result_color = texture(palette, COLOR.rg); + result_color.a = 1.0; + COLOR = result_color; +}" + +[sub_resource type="ShaderMaterial" id=27] +shader = SubResource( 26 ) +shader_param/palette = ExtResource( 2 ) + [sub_resource type="Curve" id=13] _data = [ Vector2( 0, 1 ), 0.0, -0.0636948, 0, 0, Vector2( 1, 0 ), -3.43886, 0.0, 0, 0 ] @@ -671,16 +687,17 @@ vframes = 16 [node name="DissolveParticles" type="CPUParticles2D" parent="Graphics"] unique_name_in_owner = true +material = SubResource( 27 ) position = Vector2( -9.5, -19.5 ) emitting = false amount = 256 lifetime = 0.8 one_shot = true explosiveness = 1.0 -lifetime_randomness = 1.0 +lifetime_randomness = 0.9 emission_shape = 3 emission_points = PoolVector2Array( 4, 6, 4, 7, 4, 8, 4, 9, 4, 10, 5, 2, 5, 3, 5, 4, 5, 5, 5, 6, 5, 7, 5, 8, 5, 9, 5, 10, 5, 11, 6, 1, 6, 2, 6, 3, 6, 4, 6, 5, 6, 6, 6, 7, 6, 8, 6, 9, 6, 10, 6, 11, 6, 12, 6, 13, 6, 14, 6, 15, 6, 16, 7, 0, 7, 1, 7, 2, 7, 3, 7, 4, 7, 5, 7, 6, 7, 7, 7, 8, 7, 9, 7, 10, 7, 11, 7, 12, 7, 13, 7, 14, 7, 15, 7, 16, 7, 17, 7, 18, 7, 19, 8, 0, 8, 1, 8, 2, 8, 3, 8, 4, 8, 5, 8, 6, 8, 7, 8, 8, 8, 9, 8, 10, 8, 11, 8, 12, 8, 13, 8, 14, 8, 15, 8, 16, 8, 17, 8, 18, 8, 19, 9, 0, 9, 1, 9, 2, 9, 3, 9, 4, 9, 5, 9, 6, 9, 7, 9, 8, 9, 9, 9, 10, 9, 11, 9, 12, 9, 13, 9, 14, 9, 15, 9, 16, 9, 17, 9, 18, 9, 19, 10, 0, 10, 1, 10, 2, 10, 3, 10, 4, 10, 5, 10, 6, 10, 7, 10, 8, 10, 9, 10, 10, 10, 11, 10, 12, 10, 13, 10, 14, 10, 15, 10, 16, 10, 17, 10, 18, 10, 19, 11, 0, 11, 1, 11, 2, 11, 3, 11, 4, 11, 5, 11, 6, 11, 7, 11, 8, 11, 9, 11, 10, 11, 11, 11, 12, 11, 13, 11, 14, 11, 15, 11, 16, 11, 17, 11, 18, 11, 19, 12, 0, 12, 1, 12, 2, 12, 3, 12, 4, 12, 5, 12, 6, 12, 7, 12, 8, 12, 9, 12, 10, 12, 11, 12, 12, 12, 13, 12, 14, 12, 15, 12, 16, 12, 17, 12, 18, 12, 19, 13, 0, 13, 1, 13, 2, 13, 3, 13, 4, 13, 5, 13, 6, 13, 7, 13, 8, 13, 9, 13, 10, 13, 11, 13, 12, 13, 13, 13, 14, 13, 15, 13, 16, 13, 17, 13, 18, 13, 19, 14, 1, 14, 2, 14, 3, 14, 4, 14, 5, 14, 6, 14, 7, 14, 8, 14, 9, 14, 10, 14, 11, 15, 2, 15, 3, 15, 4, 15, 5, 15, 6, 15, 7, 15, 8, 15, 9, 15, 10, 15, 11 ) -emission_colors = PoolColorArray( 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.72549, 0.607843, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.835294, 0.619608, 1, 1, 0.478431, 0.219608, 1, 1, 0.835294, 0.619608, 1, 1, 0.478431, 0.219608, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 0.458824, 0.235294, 0.0823529, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.72549, 0.607843, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 0.219608, 0.211765, 0.254902, 1, 0.360784, 0.345098, 0.439216, 1, 0.360784, 0.345098, 0.439216, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 0.458824, 0.235294, 0.0823529, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.513726, 0.47451, 0.603922, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 0.360784, 0.345098, 0.439216, 1, 0.360784, 0.345098, 0.439216, 1, 0.360784, 0.345098, 0.439216, 1, 0.219608, 0.211765, 0.254902, 1, 0.360784, 0.345098, 0.439216, 1, 0.360784, 0.345098, 0.439216, 1, 0.219608, 0.211765, 0.254902, 1, 0.219608, 0.211765, 0.254902, 1, 0.458824, 0.235294, 0.0823529, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 0, 0, 0, 1, 0.360784, 0.345098, 0.439216, 1, 0.360784, 0.345098, 0.439216, 1, 0.360784, 0.345098, 0.439216, 1, 0.219608, 0.211765, 0.254902, 1, 0.360784, 0.345098, 0.439216, 1, 0.219608, 0.211765, 0.254902, 1, 0.219608, 0.211765, 0.254902, 1, 0.219608, 0.211765, 0.254902, 1, 0.219608, 0.141176, 0.0392157, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 0.513726, 0.47451, 0.603922, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.219608, 0.141176, 0.0392157, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.513726, 0.47451, 0.603922, 1, 1, 0.835294, 0.619608, 1, 1, 0.835294, 0.619608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 1, 0.478431, 0.219608, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1 ) +emission_colors = PoolColorArray( 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.372549, 0.623529, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.372549, 1, 1, 0.87451, 0.372549, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.121569, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.372549, 0.623529, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.623529, 0.623529, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.372549, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.121569, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.121569, 0.372549, 1, 1, 0.121569, 0.372549, 1, 1, 0.372549, 0.623529, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.372549, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.121569, 0.372549, 1, 1, 0.372549, 0.372549, 1, 1, 0.121569, 0.372549, 1, 1, 0.121569, 0.372549, 1, 1, 0.121569, 0.372549, 1, 1, 0.121569, 0.623529, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.372549, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.623529, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.623529, 0.623529, 1, 1, 0.623529, 0.121569, 1, 1, 0.623529, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.372549, 1, 1, 0.87451, 0.372549, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.121569, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1, 0.87451, 0.121569, 1, 1 ) direction = Vector2( 0, -1 ) spread = 15.0 gravity = Vector2( 0, 0 ) @@ -1259,8 +1276,8 @@ align = 1 [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Shooting" to="." method="_on_Shooting_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Pushing" to="." method="_on_Pushing_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/Pushing" to="." method="_process_pushing"] -[connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="_on_Airborne_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="reset_fall_speed"] +[connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="_on_Airborne_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne" to="." method="_process_gravity"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_horizontal_movement"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_jump"] @@ -1272,8 +1289,8 @@ align = 1 [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Falling/NormalFalling" to="." method="_on_NormalFalling_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Falling/NormalFalling" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Falling/ScaredFalling" to="." method="_on_ScaredFalling_state_entered"] -[connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="_on_DoubleJump_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="reset_fall_speed"] +[connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="_on_DoubleJump_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/AirShooting" to="." method="_on_AirShooting_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/AirShooting" to="." method="_process_horizontal_movement"] @@ -1285,8 +1302,8 @@ align = 1 [connection signal="state_entered" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Inactive_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Teleporting_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Inactive_state_exited"] -[connection signal="state_entered" from="StateChart/Root/Movement/Appearing" to="." method="_on_Inactive_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Appearing" to="." method="_on_Appearing_state_entered"] +[connection signal="state_entered" from="StateChart/Root/Movement/Appearing" to="." method="_on_Inactive_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Appearing" to="." method="_on_Inactive_state_exited"] [connection signal="state_entered" from="StateChart/Root/Health/Respawn" to="." method="_on_Respawn_state_entered"] [connection signal="state_entered" from="StateChart/Root/Health/Dead" to="." method="_on_Dead_state_entered"]