From 5d01f40535f124b46af1fab4d293b4407f0372a3 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sat, 17 Dec 2022 01:35:22 -0500 Subject: [PATCH] better doublejump animation --- ...e.wav-6a217455eb3593edcc27ac957b5c6218.md5 | 3 ++ ...av-6a217455eb3593edcc27ac957b5c6218.sample | Bin 0 -> 4001 bytes ...p.png-dd8c75624dec8df436835e183d040f72.md5 | 3 ++ ....png-dd8c75624dec8df436835e183d040f72.stex | Bin 0 -> 300 bytes audio/sounds/a_bree.wav | Bin 0 -> 3702 bytes audio/sounds/a_bree.wav.import | 23 ++++++++++++ game.gd | 1 + graphics/player/sg_doublejump.png | Bin 0 -> 360 bytes graphics/player/sg_doublejump.png.import | 35 ++++++++++++++++++ maps/map01.tscn | 18 ++++----- objects/player/player.gd | 1 + objects/player/player.tscn | 15 ++++---- 12 files changed, 83 insertions(+), 16 deletions(-) create mode 100644 .import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.md5 create mode 100644 .import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.sample create mode 100644 .import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.md5 create mode 100644 .import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.stex create mode 100644 audio/sounds/a_bree.wav create mode 100644 audio/sounds/a_bree.wav.import create mode 100644 graphics/player/sg_doublejump.png create mode 100644 graphics/player/sg_doublejump.png.import diff --git a/.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.md5 b/.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.md5 new file mode 100644 index 0000000..1a7f8fa --- /dev/null +++ b/.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.md5 @@ -0,0 +1,3 @@ +source_md5="f054210203aa705ec9b4b5b4e53b13f0" +dest_md5="2306656825af0907fd3c08c11a03f630" + diff --git a/.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.sample b/.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.sample new file mode 100644 index 0000000000000000000000000000000000000000..d81d5e0813d05957ab2816a1f88bdafc4c1e9e39 GIT binary patch literal 4001 zcmbuC%Wh*u5QYs1AwXimirwr{CQj0El9>^U5j&PM4-lE;fFdPv^N52=hj_+{qRH!-H&>Ez9HuiHJG?2Qk1XOrF2z3#Xhe6{@Sczo0~Jp1F>c<@;~`e`yf z8qWr-ayXfs>>f?_yTO-v^<($*!SUepyzGwm+r`nrFT2z6tZOTr&bnzg@pNx`a59Ux z2ZN7dxM-kxJ{+zOo^UIU|EA&Nc*1xR-);MYQNXczZ z^*Y|Xjt}qL#CeUUym=XS-pASR_1F4c`L;YS!?IP@%cyLW&G_)W5qDP0vl!cP&an|^ z+<97d;@!=5ue4uhaAQ=~V%|oZy%tx@V#TYlf7Ot1#sMnMMFvv*x(RG|F>e3yk0*&_ zD^?mV5U@J9wwlFZU~+IhiucwVT4t;--r;SKIYw#({9cAtaEKbL z*Mao5p_@0P*9)u{^&yz_T^ZM}8XgcA;^9~e>!UyeOK>eW;(#T%+m2D%H>`o2H}ydF zSDUAB?97~>s*q9Dkt*R?GK?PJ8C35A`$f|OG4ToS;`@315aX`-y|bhOv16Sx)spwb z3{EtoD!}eJ{t+cS=NJ{3{5LM*Kaaa`ty20Jpmgx&yqs$e7zvd_w1^37$xPzGvdpTN z?eJnFaIKUVfg5a_ffJQ)$9c|DH>rBq1Nl{8IgfD_jP?4KZ8Vei&A-HS(>PV-M0^+n zRb<4?8!U2~OB_fr_`k=`C zN=16#ngLIVIA9l)XNHRh>sf`cB3j;2b>=;BH(I>!nra3Ps5mOk8iPHC`RrL@qe`p> z<}ej2sS~RWIjJg$AJ2H2Rh2Wa+_%gXA8N^3lNB-Vr2gSXKCFvkLqDUykoKtq_}AxX zYNUomYR_4-OodMUqbu3B7UR3tGykY`L@evAQS*veP<>hLHZ0F0tKZhY!WP-B9ld;< zLsTy;!_VW`Wf=FrU|8fLn&&w4qpaLIs0*X!Bsy-a){ zOD49Wwzw1G340^HVx`|Po-nd%s9{QFX(`mRficEDZ`+-K&SM7(XhAC0373ZQF zB7`TIy;x)Dd-e?KHfsXf(MNicv}R20Qq-;$SpBI3d#u#uGQ*kAVLGs^wC;(OQH8Zy z)v}MsAv^!Fj_uIc%gjRRUPdr6B)>-RuCk|^_m9<=+OV(aH3^UAe4ok7e5K7)h#3kq z?BD9FkB|PTaw3&_-!8<%$Sik4*wh;Fk-fB(^S5L7dJ(%=R?fb2GY@hf+AL(0E5Z&6 z_Z$DNL(LD7!E|BVH*VCs$6ZVIjaJI7sEMd4RpUH&0j!}zxX^E|I7Y3~trT`k>zSz3 zCDwDUz4FeYCc~*3@D02{*SY&p1I$P}4%ki0*u;}(g&LOX?~$s17|T6}v#f-64p>!B z_(^^E5F@kFp55wWzR+Df4U5#S>=o>${GahqdCLBp`9=4dnbcQ6Enw5C>%I+>YS_Nk zUe;YVeRK_bIC{z6AERQ8vZ7mWW!7B`C6r*CE{;A4to?cRm1Y_d#2Wl$7BAZ%2gqcr zrnqF^Z~GK|0@Y5lNnf@R8Z*b)2lPyZ-quth3}jzLeJlkYP&KtNsj literal 0 HcmV?d00001 diff --git a/.import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.md5 b/.import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.md5 new file mode 100644 index 0000000..900fd4e --- /dev/null +++ b/.import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.md5 @@ -0,0 +1,3 @@ +source_md5="8a9e7a46d5e15ed3c094a631969ad605" +dest_md5="2b98f6f5502f4657455d0e8833d2bb9b" + diff --git a/.import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.stex b/.import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.stex new file mode 100644 index 0000000000000000000000000000000000000000..9a74f5b491b3a33b47492e776f80d7679bf37803 GIT binary patch literal 300 zcmZ>F2@cUFPcOD%(zii zEz&msfyDypKOZ!B=2y&{f4*>T*_8JCHS^jk@4wbDka6Gq#(81w>}79VquG6b+xfpg zI?r=oj95a)vdr1{)_wXDw(M+M?q`#?pa1M_NQl0km^E`_&a7*dx4uqK=8k4`dm7qm!7 tD$R-3*VlU$;Gm_gr)R~$zIsn}ck_>=K8-JhDaD)GH%SY`wohba004}uf4l$y literal 0 HcmV?d00001 diff --git a/audio/sounds/a_bree.wav b/audio/sounds/a_bree.wav new file mode 100644 index 0000000000000000000000000000000000000000..9934ee55dee77cacc405638e77534cb99618a679 GIT binary patch literal 3702 zcmZ9POOhK^5JhDcKzIp^iFSYVT2dPa10ui?Fk}Es9pUf{MqUJqVHJk%c1urIf6Qk& zZ{EClU;6uRU%ve1)7k9DuYUOE&ChQ?dpeuVp47juf1AyI{prc< zliAbR>sN1IeOJ%){-JYh#_zVi*Zr=)@Av(>e%JlBj@>wV-`11c`o}Z7I`4ItCvWP? zhdTSS|K7iBpSLgCNn5tFwrKNqUjO)>*OlY;ypC0!^O@HfSDv+tdiH!=Yvb1yTv)Wz zS~nl7PwOvM@y1QX-wY(2@c|X*A_FOT?F!pn9k>7G$DJTq)|*cD2zWcVmLuXxVe;Vb zMLl;m(6Zue{|rxq)O8bb@;Yhv{i^u*qyOFC)$dJ31&64?x-F!)1KoNc-R`ko_lIKA zXJy>HdSyUesE5aCMPC#eSb}T05eF>6-Kvf@zF`gIJZT29e>^gUV^?N>xWRT_I8phk z&a+D0MD?%-@=am6s$)}(P5PE?G?V!DUohdNapVWaWQgQo+h+Lx&y{mG)a$G$N zVo-`IeJ*cCj0&iA`~uE&0kkP5n8OpeM@I#b%H#c@NPk668Z&D|^4LzwUs2}&Z8&~BF zEcc^x#fMtrHF3mTiT>e6KJ-Pgp`S%zNPK*N{H7j_MtViWdoD+096I_(SF*1cle^K= ze>fc#i{Dx`|DqPSFK@f8$m{Crcm1D=MRyy=EFbp}?nPwyd0gB0=@buT$hNMaZsT1t zip#5k^tU~<+gHO*xAyVNb%#q1SoD1pyHl3I2eL4+EN^iqBop>VawW>N!|2eL{jcG3 z^l(&Z2k6F$W4`95*1WGW!wP+-ripr4EZ@}M=BgV<3#t;muLnN*ID10!jYCm$odW+% zj`@XIBA73=z8*UnvF$qhUG1?ep@nrv)9#+U+x{YQ+w+L)6K}b{;?8v3?naJg8YwDDu zc6DI&rw*L4qRT^u)6W&UupEu)i8rGPy;{|>kH{fA|DleZ(AdlDLVPb342JM)1@Ah0 zs(t@hebI(<#iU7iwCATzKIAJgqYyh3X4t>g*;F6%Q{_}DdS5l_VPy^{Az~Vh`p8}) zW&NsluNSq8#W|+;8&RmYN@`gPFp(Zr$*^$5Tt@MxAn5o`{;F z8rQiC5Dgu|g?aNApT%&xqsDHjpNUFc5_{gL*iB?& zlF9RiheiDpQuPmG*>gCH6FNB%RXvd>{_wGmbfq)9?qk0&T|BFZcvofxrz!uR@zA-; z{+j+`dQB%y4rl~o>bmaRFsX)}Yn^4?b(5p-aE4=+obs_MdX$c?-^#4J7)ofxI8z*R z5?H76%$0T;6(kz`q>B$@&;xX`t|>0r_uDzeoIrIkVltP_OJnvp`+%9L(Aypr!a(LK r{INB7K-KJ)eAFo2Ir*o1yZas$z&q?W`-6<&9#?^LxX{Us;UxYqWvDJU literal 0 HcmV?d00001 diff --git a/audio/sounds/a_bree.wav.import b/audio/sounds/a_bree.wav.import new file mode 100644 index 0000000..c7fc368 --- /dev/null +++ b/audio/sounds/a_bree.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.sample" + +[deps] + +source_file="res://audio/sounds/a_bree.wav" +dest_files=[ "res://.import/a_bree.wav-6a217455eb3593edcc27ac957b5c6218.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/game.gd b/game.gd index 4b73455..b8d764d 100644 --- a/game.gd +++ b/game.gd @@ -21,6 +21,7 @@ onready var a_shard = preload("res://audio/sounds/tempjingle.wav") onready var a_climb_up = preload("res://audio/sounds/a_climb.ogg") onready var a_climb_down = preload("res://audio/sounds/a_bmilc.ogg") onready var a_sword = preload("res://audio/sounds/sword.ogg") +onready var a_doublejump = preload("res://audio/sounds/a_bree.wav") #Objects onready var block_text = preload("res://objects/hud/blocktext.tscn") diff --git a/graphics/player/sg_doublejump.png b/graphics/player/sg_doublejump.png new file mode 100644 index 0000000000000000000000000000000000000000..d77733fcf16c47c8dff36e6a8233dcff353d3fac GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<Nn{1`6$5-iTp1YtJ23qJ4@3_C8yNmKIQ(}2qK5wr4*wZ|Bm;wA`raNO#a$BQ z7yKU%7`*%$KLLd~3p^r=85sBugD~Uq{1quc!JVEijv*HQQ~RUE4l8iDa4M<2t3N0! zXL#}3mY07|BtFn;`{n#k{N#yW!q0m$e&;>Y*lR8<%d_W`Om}aGdd8gYwi9Q*b!zA)G2O3*5gz1=UoHa`B`tK#O?ZY5>0_nyWfi?@a=r@D6Sl~q)~vU1fU z>5B(bPgVH-c`zfSdQpnO6{!f*bzWf`SHAmpAUnP3-@K)lZ{(&Cz-jN8ajE pN!ef-rLwd44ypcou<*uj?#vE}H|IV?@c})-;OXk;vd$@?2>?xYmMZ`N literal 0 HcmV?d00001 diff --git a/graphics/player/sg_doublejump.png.import b/graphics/player/sg_doublejump.png.import new file mode 100644 index 0000000..0e79e56 --- /dev/null +++ b/graphics/player/sg_doublejump.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/player/sg_doublejump.png" +dest_files=[ "res://.import/sg_doublejump.png-dd8c75624dec8df436835e183d040f72.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=true +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=true +svg/scale=1.0 diff --git a/maps/map01.tscn b/maps/map01.tscn index c4cb4e4..4cfebf4 100644 --- a/maps/map01.tscn +++ b/maps/map01.tscn @@ -35,7 +35,7 @@ __meta__ = { tile_set = ExtResource( 7 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 327687, 2, 1, 327689, 2, 0, 327695, 2, 2, 327696, 2, 2, 327702, 2, 3, 327703, 2, 3, 393219, 0, 65536, 393220, 0, 65537, 393221, 0, 65537, 393222, 0, 65537, 393223, 0, 65537, 393224, 0, 65537, 393225, 0, 65537, 393226, 0, 65537, 393227, 0, 65538, 393230, 0, 65536, 393231, 0, 65537, 393232, 0, 65537, 393233, 0, 65538, 393236, 0, 65536, 393237, 0, 65537, 393238, 0, 65537, 393239, 0, 65537, 393240, 0, 65537, 393241, 0, 65538, 589844, 0, 65536, 589845, 0, 65537, 589846, 0, 65537, 589847, 0, 65537, 589848, 0, 65537, 589849, 0, 65538, 655370, 2, 2, 655373, 2, 0, 720904, 0, 65536, 720905, 0, 65537, 720906, 0, 65537, 720907, 0, 65537, 720908, 0, 65537, 720909, 0, 65537, 720910, 0, 65537, 720911, 0, 65538, 786433, 0, 65536, 786434, 0, 65537, 786435, 0, 65537, 786436, 0, 65537, 786437, 0, 65538, 851987, 2, 1, 851989, 2, 2, 917521, 0, 65536, 917522, 0, 65537, 917523, 0, 65537, 917524, 0, 65537, 917525, 0, 65537, 917526, 0, 65537, 917527, 0, 65537, 917528, 0, 65537, 917529, 0, 65537, 917530, 0, 65537, 917531, 0, 65537, 917532, 0, 65538, 1114152, 0, 131072, 1114153, 0, 0, 1114154, 0, 131073, 1179649, 0, 65536, 1179650, 0, 65537, 1179651, 0, 65538, 1179654, 0, 65536, 1179655, 0, 65537, 1179656, 0, 65537, 1179657, 0, 65537, 1179658, 0, 65537, 1179659, 0, 65537, 1179660, 0, 65537, 1179661, 0, 65537, 1179662, 0, 65538, 1179688, 0, 2, 1179689, 0, 1, 1179690, 536870912, 2, 1245202, 2, 2, 1245224, 0, 2, 1245225, 0, 1, 1245226, 536870912, 2, 1310736, 0, 131072, 1310737, 536870912, 0, 1310738, 536870912, 0, 1310739, 536870912, 0, 1310740, 0, 131073, 1310760, 0, 2, 1310761, 0, 1, 1310762, 536870912, 2, 1376257, 2, 0, 1376261, 2, 1, 1376263, 2, 2, 1376266, 2, 2, 1376269, 2, 3, 1376271, 0, 131072, 1376272, 0, 131075, 1376273, 536870912, 1, 1376274, 536870912, 1, 1376275, 536870912, 1, 1376276, 0, 131074, 1376277, 0, 131073, 1376281, 2, 1, 1376296, 0, 2, 1376297, 0, 1, 1376298, 536870912, 2, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 131075, 1441808, 0, 1, 1441809, 0, 1, 1441810, 0, 1, 1441811, 0, 1, 1441812, 0, 1, 1441813, 0, 131074, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 131075, 1441833, 0, 1, 1441834, 0, 131074, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1441848, 0, 0, 1441849, 0, 0, 1441850, 0, 0, 1441851, 0, 0, 1441852, 0, 0, 1441853, 0, 0, 1441854, 0, 0, 1441855, 0, 0, 1441856, 0, 0, 1441857, 0, 0, 1441858, 0, 0, 1441859, 0, 0, 1441860, 0, 0, 1441861, 0, 0, 1441862, 0, 0, 1441863, 0, 0, 1441864, 0, 0, 1441865, 0, 0, 1441866, 0, 0, 1441867, 0, 0, 1441868, 0, 0, 1441869, 0, 0, 1441870, 0, 0, 1441871, 0, 0, 1441872, 0, 0, 1441873, 0, 0, 1441874, 0, 0, 1441875, 0, 0, 1441876, 0, 0, 1441877, 0, 0, 1441878, 0, 0, 1441879, 0, 0, 1441880, 0, 0, 1441881, 0, 0, 1441882, 0, 0, 1441883, 0, 0, 1441884, 0, 0, 1441885, 0, 0, 1441886, 0, 0, 1441887, 0, 0, 1507328, 0, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1, 1507360, 0, 1, 1507361, 0, 1, 1507362, 0, 1, 1507363, 0, 1, 1507364, 0, 1, 1507365, 0, 1, 1507366, 0, 1, 1507367, 0, 1, 1507368, 0, 1, 1507369, 0, 1, 1507370, 0, 1, 1507371, 0, 1, 1507372, 0, 1, 1507373, 0, 1, 1507374, 0, 1, 1507375, 0, 1, 1507376, 0, 1, 1507377, 0, 1, 1507378, 0, 1, 1507379, 0, 1, 1507380, 0, 1, 1507381, 0, 1, 1507382, 0, 1, 1507383, 0, 1, 1507384, 0, 1, 1507385, 0, 1, 1507386, 0, 1, 1507387, 0, 1, 1507388, 0, 1, 1507389, 0, 1, 1507390, 0, 1, 1507391, 0, 1, 1507392, 0, 1, 1507393, 0, 1, 1507394, 0, 1, 1507395, 0, 1, 1507396, 0, 1, 1507397, 0, 1, 1507398, 0, 1, 1507399, 0, 1, 1507400, 0, 1, 1507401, 0, 1, 1507402, 0, 1, 1507403, 0, 1, 1507404, 0, 1, 1507405, 0, 1, 1507406, 0, 1, 1507407, 0, 1, 1507408, 0, 1, 1507409, 0, 1, 1507410, 0, 1, 1507411, 0, 1, 1507412, 0, 1, 1507413, 0, 1, 1507414, 0, 1, 1507415, 0, 1, 1507416, 0, 1, 1507417, 0, 1, 1507418, 0, 1, 1507419, 0, 1, 1507420, 0, 1, 1507421, 0, 1, 1507422, 0, 1, 1507423, 0, 1 ) +tile_data = PoolIntArray( 327687, 2, 1, 327689, 2, 0, 327695, 2, 2, 327696, 2, 2, 327702, 2, 3, 327703, 2, 3, 393219, 0, 65536, 393220, 0, 65537, 393221, 0, 65537, 393222, 0, 65537, 393223, 0, 65537, 393224, 0, 65537, 393225, 0, 65537, 393226, 0, 65537, 393227, 0, 65538, 393230, 0, 65536, 393231, 0, 65537, 393232, 0, 65537, 393233, 0, 65538, 393236, 0, 65536, 393237, 0, 65537, 393238, 0, 65537, 393239, 0, 65537, 393240, 0, 65537, 393241, 0, 65538, 589844, 0, 65536, 589845, 0, 65537, 589846, 0, 65537, 589847, 0, 65537, 589848, 0, 65537, 589849, 0, 65538, 655370, 2, 2, 655373, 2, 0, 720904, 0, 65536, 720905, 0, 65537, 720906, 0, 65537, 720907, 0, 65537, 720908, 0, 65537, 720909, 0, 65537, 720910, 0, 65537, 720911, 0, 65538, 851969, 0, 65536, 851970, 0, 65537, 851971, 0, 65537, 851972, 0, 65537, 851973, 0, 65538, 851987, 2, 1, 851989, 2, 2, 917521, 0, 65536, 917522, 0, 65537, 917523, 0, 65537, 917524, 0, 65537, 917525, 0, 65537, 917526, 0, 65537, 917527, 0, 65537, 917528, 0, 65537, 917529, 0, 65537, 917530, 0, 65537, 917531, 0, 65537, 917532, 0, 65538, 1114152, 0, 131072, 1114153, 0, 0, 1114154, 0, 131073, 1179649, 0, 65536, 1179650, 0, 65537, 1179651, 0, 65538, 1179654, 0, 65536, 1179655, 0, 65537, 1179656, 0, 65537, 1179657, 0, 65537, 1179658, 0, 65537, 1179659, 0, 65537, 1179660, 0, 65537, 1179661, 0, 65537, 1179662, 0, 65538, 1179688, 0, 2, 1179689, 0, 1, 1179690, 536870912, 2, 1245202, 2, 2, 1245224, 0, 2, 1245225, 0, 1, 1245226, 536870912, 2, 1310736, 0, 131072, 1310737, 536870912, 0, 1310738, 536870912, 0, 1310739, 536870912, 0, 1310740, 0, 131073, 1310760, 0, 2, 1310761, 0, 1, 1310762, 536870912, 2, 1376257, 2, 0, 1376261, 2, 1, 1376263, 2, 2, 1376266, 2, 2, 1376269, 2, 3, 1376271, 0, 131072, 1376272, 0, 131075, 1376273, 536870912, 1, 1376274, 536870912, 1, 1376275, 536870912, 1, 1376276, 0, 131074, 1376277, 0, 131073, 1376281, 2, 1, 1376296, 0, 2, 1376297, 0, 1, 1376298, 536870912, 2, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 131075, 1441808, 0, 1, 1441809, 0, 1, 1441810, 0, 1, 1441811, 0, 1, 1441812, 0, 1, 1441813, 0, 131074, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 131075, 1441833, 0, 1, 1441834, 0, 131074, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1441848, 0, 0, 1441849, 0, 0, 1441850, 0, 0, 1441851, 0, 0, 1441852, 0, 0, 1441853, 0, 0, 1441854, 0, 0, 1441855, 0, 0, 1441856, 0, 0, 1441857, 0, 0, 1441858, 0, 0, 1441859, 0, 0, 1441860, 0, 0, 1441861, 0, 0, 1441862, 0, 0, 1441863, 0, 0, 1441864, 0, 0, 1441865, 0, 0, 1441866, 0, 0, 1441867, 0, 0, 1441868, 0, 0, 1441869, 0, 0, 1441870, 0, 0, 1441871, 0, 0, 1441872, 0, 0, 1441873, 0, 0, 1441874, 0, 0, 1441875, 0, 0, 1441876, 0, 0, 1441877, 0, 0, 1441878, 0, 0, 1441879, 0, 0, 1441880, 0, 0, 1441881, 0, 0, 1441882, 0, 0, 1441883, 0, 0, 1441884, 0, 0, 1441885, 0, 0, 1441886, 0, 0, 1441887, 0, 0, 1507328, 0, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1, 1507360, 0, 1, 1507361, 0, 1, 1507362, 0, 1, 1507363, 0, 1, 1507364, 0, 1, 1507365, 0, 1, 1507366, 0, 1, 1507367, 0, 1, 1507368, 0, 1, 1507369, 0, 1, 1507370, 0, 1, 1507371, 0, 1, 1507372, 0, 1, 1507373, 0, 1, 1507374, 0, 1, 1507375, 0, 1, 1507376, 0, 1, 1507377, 0, 1, 1507378, 0, 1, 1507379, 0, 1, 1507380, 0, 1, 1507381, 0, 1, 1507382, 0, 1, 1507383, 0, 1, 1507384, 0, 1, 1507385, 0, 1, 1507386, 0, 1, 1507387, 0, 1, 1507388, 0, 1, 1507389, 0, 1, 1507390, 0, 1, 1507391, 0, 1, 1507392, 0, 1, 1507393, 0, 1, 1507394, 0, 1, 1507395, 0, 1, 1507396, 0, 1, 1507397, 0, 1, 1507398, 0, 1, 1507399, 0, 1, 1507400, 0, 1, 1507401, 0, 1, 1507402, 0, 1, 1507403, 0, 1, 1507404, 0, 1, 1507405, 0, 1, 1507406, 0, 1, 1507407, 0, 1, 1507408, 0, 1, 1507409, 0, 1, 1507410, 0, 1, 1507411, 0, 1, 1507412, 0, 1, 1507413, 0, 1, 1507414, 0, 1, 1507415, 0, 1, 1507416, 0, 1, 1507417, 0, 1, 1507418, 0, 1, 1507419, 0, 1, 1507420, 0, 1, 1507421, 0, 1, 1507422, 0, 1, 1507423, 0, 1 ) [node name="Water" type="TileMap" parent="."] tile_set = ExtResource( 10 ) @@ -49,7 +49,7 @@ position = Vector2( 32, 160 ) tile_set = ExtResource( 7 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 327707, 1, 0, 393243, 1, 0, 458779, 1, 0, 524315, 1, 0, 589851, 1, 0, 655387, 1, 0, 720923, 1, 0, 786459, 1, 0, 851995, 1, 0, 917511, 1, 0, 983047, 1, 0, 1048583, 1, 0 ) +tile_data = PoolIntArray( 327707, 1, 0, 393243, 1, 0, 458779, 1, 0, 524315, 1, 0, 589851, 1, 0, 655387, 1, 0, 720923, 1, 0, 786459, 1, 0, 851995, 1, 0, 983047, 1, 0, 1048583, 1, 0, 1114119, 1, 0 ) [node name="StaticBody2D" type="StaticBody2D" parent="."] @@ -65,7 +65,7 @@ shape = SubResource( 1 ) [node name="Platforms" type="Node2D" parent="."] [node name="Ladder" parent="Platforms" instance=ExtResource( 2 )] -position = Vector2( 56, 112 ) +position = Vector2( 56, 120 ) scale = Vector2( 1, 3 ) [node name="Ladder2" parent="Platforms" instance=ExtResource( 2 )] @@ -99,13 +99,13 @@ position = Vector2( 136, 152 ) position = Vector2( 152, 152 ) [node name="Gold8" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 104, 128 ) +position = Vector2( 104, 136 ) [node name="Gold9" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 88, 128 ) +position = Vector2( 88, 136 ) [node name="Gold10" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 72, 128 ) +position = Vector2( 72, 136 ) [node name="Gold11" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 144, 104 ) @@ -123,10 +123,10 @@ position = Vector2( 112, 80 ) position = Vector2( 72, 80 ) [node name="Gold19" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 16, 88 ) +position = Vector2( 16, 96 ) [node name="Gold20" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 24, 88 ) +position = Vector2( 24, 96 ) [node name="Star" parent="Collectibles" instance=ExtResource( 4 )] position = Vector2( 16, 136 ) @@ -136,7 +136,7 @@ position = Vector2( 176, 64 ) color = 1 [node name="Gold21" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 32, 88 ) +position = Vector2( 32, 96 ) [node name="Enemies" type="Node2D" parent="."] diff --git a/objects/player/player.gd b/objects/player/player.gd index a65cf17..e4944ab 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -161,6 +161,7 @@ func check_jump(): func check_double_jump(): if Input.is_action_just_pressed("jump") && can_doublejump: + Game.play_sound(Game.a_doublejump,Game.ac_jump) can_doublejump = false velocity.y = -doublejump_force anims.play("doublejump") diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 568099f..944c7ca 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=44 format=2] +[gd_scene load_steps=45 format=2] [ext_resource path="res://objects/player/player.gd" type="Script" id=1] [ext_resource path="res://graphics/player/sg_walk.png" type="Texture" id=2] @@ -13,6 +13,7 @@ [ext_resource path="res://graphics/player/sword_stab.png" type="Texture" id=11] [ext_resource path="res://graphics/player/sg_slash.png" type="Texture" id=12] [ext_resource path="res://scripts/recolor.tres" type="Shader" id=13] +[ext_resource path="res://graphics/player/sg_doublejump.png" type="Texture" id=14] [sub_resource type="ShaderMaterial" id=14] shader = ExtResource( 4 ) @@ -225,10 +226,10 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), +"times": PoolRealArray( 0, 0.038, 0.076, 0.114, 0.152, 0.19, 0.228, 0.266 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 1, -"values": [ Rect2( 0, 0, 20, 20 ) ] +"values": [ Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ), Rect2( 0, 0, 20, 20 ), Rect2( 20, 0, 20, 20 ) ] } tracks/1/type = "value" tracks/1/path = NodePath("Sprite:texture") @@ -240,7 +241,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 1, -"values": [ ExtResource( 7 ) ] +"values": [ ExtResource( 14 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("SwordArea/SwordHitBox:disabled") @@ -276,7 +277,7 @@ tracks/4/keys = { "times": PoolRealArray( 0, 0.038, 0.076, 0.114, 0.152, 0.19, 0.228, 0.266, 0.3 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 1, -"values": [ 0.0, 45.0, 90.0, 135.0, 180.0, 225.0, 270.0, 315.0, 360.0 ] +"values": [ 0.0, 0.0, 90.0, 90.0, 180.0, 180.0, 270.0, 270.0, 360.0 ] } [sub_resource type="Animation" id=30] @@ -577,7 +578,7 @@ playing = true [node name="Sprite" type="Sprite" parent="."] material = SubResource( 27 ) -texture = ExtResource( 3 ) +texture = ExtResource( 14 ) region_enabled = true region_rect = Rect2( 0, 0, 20, 20 )