From 189579d619d0875d16f3378d94a0f284e8b6a4aa Mon Sep 17 00:00:00 2001 From: lustlion Date: Fri, 29 Oct 2021 02:17:18 +0200 Subject: [PATCH] 3rd color, cleaning --- assets/characters/kupo/kupo.ase | Bin 635 -> 630 bytes assets/characters/kupo/kupo1.png | Bin 149 -> 188 bytes assets/characters/kupo/kupo2.png | Bin 148 -> 185 bytes assets/characters/kupo/kupo3.png | Bin 145 -> 186 bytes assets/characters/kupo/kupo4.png | Bin 148 -> 180 bytes assets/characters/kupo/kupo_arrow1.png | Bin 92 -> 94 bytes assets/characters/nancy/fall.ase | Bin 0 -> 1271 bytes assets/characters/nancy/fall.png | Bin 272 -> 0 bytes assets/characters/nancy/fall1.png | Bin 180 -> 920 bytes assets/characters/nancy/fall2.png | Bin 184 -> 923 bytes assets/characters/nancy/fall3.png | Bin 183 -> 922 bytes assets/characters/nancy/idle.ase | Bin 0 -> 1370 bytes assets/characters/nancy/idle.png | Bin 361 -> 0 bytes assets/characters/nancy/idle1.png | Bin 190 -> 919 bytes assets/characters/nancy/idle2.png | Bin 188 -> 918 bytes assets/characters/nancy/idle3.png | Bin 187 -> 919 bytes assets/characters/nancy/idle4.png | Bin 186 -> 917 bytes assets/characters/nancy/jump.ase | Bin 0 -> 1260 bytes assets/characters/nancy/jump.png | Bin 324 -> 0 bytes assets/characters/nancy/jump1.png | Bin 919 -> 916 bytes assets/characters/nancy/jump2.png | Bin 921 -> 919 bytes assets/characters/nancy/jump3.png | Bin 919 -> 918 bytes assets/characters/nancy/moth_mask/fall.ase | Bin 0 -> 1169 bytes assets/characters/nancy/moth_mask/fall1.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/fall2.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/fall3.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/idle.ase | Bin 0 -> 1247 bytes assets/characters/nancy/moth_mask/idle1.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/idle2.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/idle3.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/idle4.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/jump.ase | Bin 0 -> 1169 bytes assets/characters/nancy/moth_mask/jump1.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/jump2.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/jump3.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/run.ase | Bin 0 -> 1407 bytes assets/characters/nancy/moth_mask/run1.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/run2.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/run3.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/run4.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/run5.png | Bin 0 -> 890 bytes assets/characters/nancy/moth_mask/run6.png | Bin 0 -> 890 bytes assets/characters/nancy/run.ase | Bin 0 -> 1572 bytes assets/characters/nancy/run.png | Bin 409 -> 0 bytes assets/characters/nancy/run1.png | Bin 914 -> 914 bytes assets/characters/nancy/run2.png | Bin 916 -> 915 bytes assets/characters/nancy/run3.png | Bin 922 -> 917 bytes assets/characters/nancy/run4.png | Bin 920 -> 919 bytes assets/characters/nancy/run5.png | Bin 917 -> 913 bytes assets/characters/nancy/run6.png | Bin 912 -> 916 bytes assets/terrain/tileset.png | Bin 2429 -> 2387 bytes data/scripts/animation.lua | 127 ++++++++++++++++++++ data/scripts/entities/player.lua | 16 +-- data/scripts/enums.lua | 22 ++++ data/scripts/lights.lua | 6 +- 55 files changed, 158 insertions(+), 13 deletions(-) create mode 100644 assets/characters/nancy/fall.ase delete mode 100644 assets/characters/nancy/fall.png create mode 100644 assets/characters/nancy/idle.ase delete mode 100644 assets/characters/nancy/idle.png create mode 100644 assets/characters/nancy/jump.ase delete mode 100644 assets/characters/nancy/jump.png create mode 100644 assets/characters/nancy/moth_mask/fall.ase create mode 100644 assets/characters/nancy/moth_mask/fall1.png create mode 100644 assets/characters/nancy/moth_mask/fall2.png create mode 100644 assets/characters/nancy/moth_mask/fall3.png create mode 100644 assets/characters/nancy/moth_mask/idle.ase create mode 100644 assets/characters/nancy/moth_mask/idle1.png create mode 100644 assets/characters/nancy/moth_mask/idle2.png create mode 100644 assets/characters/nancy/moth_mask/idle3.png create mode 100644 assets/characters/nancy/moth_mask/idle4.png create mode 100644 assets/characters/nancy/moth_mask/jump.ase create mode 100644 assets/characters/nancy/moth_mask/jump1.png create mode 100644 assets/characters/nancy/moth_mask/jump2.png create mode 100644 assets/characters/nancy/moth_mask/jump3.png create mode 100644 assets/characters/nancy/moth_mask/run.ase create mode 100644 assets/characters/nancy/moth_mask/run1.png create mode 100644 assets/characters/nancy/moth_mask/run2.png create mode 100644 assets/characters/nancy/moth_mask/run3.png create mode 100644 assets/characters/nancy/moth_mask/run4.png create mode 100644 assets/characters/nancy/moth_mask/run5.png create mode 100644 assets/characters/nancy/moth_mask/run6.png create mode 100644 assets/characters/nancy/run.ase delete mode 100644 assets/characters/nancy/run.png create mode 100644 data/scripts/animation.lua diff --git a/assets/characters/kupo/kupo.ase b/assets/characters/kupo/kupo.ase index 8b34622768cd537ddc49239d54947c200f608ab3..47a0b8dd671bfec49ad5eb8d516040c585211f51 100644 GIT binary patch literal 630 zcmXS8Vqkc%l!ZY62o)GWAO%dq2}U@JCX7iyQ-6JAg4-$!tX5{RcW60zgi$n3J3!vFE{m)xG~;G^p&oa>0L@q{gp{hMMmjg1md|g8p_c6mOs3 zxo!5D0_SVp@5GC~B!6WPOnb0t_M8IOkK97D<$iVgnll)x3rds&P5t$e5$>XNARo7- z3uJ%Pd%m}~Qt;F_{W3X|t*fr2=O|CiGv&{PH+iqQ9H^Oew}*8?4&TgQ51$1rkYCO2 z@sYXp*TFP~!wk|OOFhl6FfjacU{j*lTAwcK30Ed9>KAD^8^h!Oc%yW*#6+RI8;3Y% zOMm#)*bq1A@qDMh2Ih&$m!0ixFY$6PFz^fT$d#e_HjPx@!mJf?=(J5ZpU7#Pbf)FC ms_~tPUl0F$a;u;DLXBRA?_E^${;bvv={#hGH4Gfzb(yyN`0POk3X zJKK=2ZXJKq^h-a#Q851gsf(~3FCLRA_M;SN>aUNCa5v$# zbdn(-g968qAODw^sy|ROT{ic|DOnef<5~)L^?xicv-r8Zdd0KZ`%c!(o&RFazRGVC z>J~Kzmp#(|Y&SXYmVdgqpy0&%n~~?_K2)Jung!(J^yx%HE|5?E{9k^1Wq`}Bm$D`^ zOAMF0{n*4cC6E1oNZa)N+RmoG-&vQ3|F!(RS|@nsr?s(pi$1Kbd+^9!a@8;P{Z-{a z;~VtM9!ZJ)s6ewh1Ha91?-~_a^m5B|zE$bgRa~U+{Gg=#L%8XkKa#x5_kXv{E`L5Z kzIxT{J9Sqdl!Tk__`BM1Z~ceeI~#jLaixZpBCLF~hpkwb1kYT;yF8vvF!DBVo~<|LJ719sD>wFGdJEjbnb`bgK( a0iXkfE diff --git a/assets/characters/kupo/kupo2.png b/assets/characters/kupo/kupo2.png index 961686c62c1b1b277d40f36a9b24532a0cbae45b..6f86f950038362549a8a6b7b71799bb4493e5088 100644 GIT binary patch delta 157 zcmV;O0Al}?0l5K?B!7TOL_t(Ijm=U?62Kq`gO1GL z8BIKV&Jh)7NMHlSb=t;G1xK||MeW4QwifwZ-@6&G2By^7pMYloC^K0`6RKT3Z`n3Y z&4*Dk@hU%ITIbJ6U4sP616rHVYV;hCd6idd%69Iq}S37z)_zY;}d#st0H+H|lwWARA&g&jdP>6_7 z8I~w-50Dr&0hJ*=P@>*yLyTR-F*Y%#k%=%><*3$Sm33_C<`=!i32JRr1H3*rJ^%m! M07*qoM6N<$f~HDCzyJUM delta 116 zcmV-)0E_>+0g(ZaByCtpL_t(IjkS?W5&$3wLbLnd*;X}EL17=3DNnpVGPMxp=}90njrd#qy3FcVrB!eW9=EI8K~1KAOfLH>Nk$gC~J4ZzZ)pipQr$( WfIsUV!3X020000-B!7EJL_t(IjkQwC6@V}ZBR=P``>$aKiYI-P#)1cPhI}Aqe}d=1 zh&Z#YmMbE!1P^)}iGz#1qM}FuptS21)eX|63{wP>wB96%vi*L<-lps+Nb>%@+1vxQ zllQ>6P$cq=05BA(8YL=JUN}VXSN0B8wO&@)6PBCz6&G5xZV}(TJLeVv0000gnPb!Z9=XPrc`Rdu9=XSFuSc2N)AxNqp5aG*aRg;FdVKk(0stlQ7e> SStl$RfWXt$&t;ucLK6VRR26#w delta 61 zcma!xnV@2!?CIhd!Z9=X&;S4b>)A9CQh?w9W5O$m#I6aZLd+5;H*zu@;}l`olfxRq O00f?{elF{r5}E+f#}!`y diff --git a/assets/characters/nancy/fall.ase b/assets/characters/nancy/fall.ase new file mode 100644 index 0000000000000000000000000000000000000000..06c5f08472e05e2eaedfa0780ca855cc2483bd61 GIT binary patch literal 1271 zcmey)!ocugDKmor5OOepKnj?I6O3>cO&HUd85n+jWQN2|BUO6(X{CnpWPyc)IchWWH zsxpSVg+LR3ePo2^%0wU^w{?Mh3l)%l}J+ugbn*{yP6ey5Xjsx&Y0>1iThr! z(Gr9p2t~!&|Nmw7MOq-aBF#?4OOtZAib%Egaw9a!%zOffAcOdSux4-q%>u)P=osGZ zDm%u_1Stp3Bq&;hh_7NGzM}tGIqz7MwW?+KuEa?LW2Yw|ti_x7?kD}OwSV@At9(V@ z+yU(v9p9>xNG(@*eUGwy*P^@G_Ts3EWcZ3c&EP;_nLQK(@mKVFYrop_m#AVsPBvDR zGhIl7db628k_0J5VWMv0+3_@*@{aW3mpBrN><+%q9L0I(-{on%G2da{#vehR$bSK< W4)hrw2F{xR0000wR7T diff --git a/assets/characters/nancy/fall1.png b/assets/characters/nancy/fall1.png index 49567e5f948e42b66d1c0c1f0112a1afae616483..c6737234c45a67f9bf38a9d8e0d311e6bd832c97 100644 GIT binary patch literal 920 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@Zk{fVArezd`)_kG7;rcV|NlS#I&V?$Pk|B-?aloH zm)aJpUCm+mYQboF*wdiE=(ZAD=N#1{x3g<}UJ1p7tGw8BuUhV06+`13hP#(#lQTg< N>gnp|vd$@?2>^1*G%5f9 delta 163 zcmV;U09^l=2ebi@8Gi-<001BJ|6u?C0DDP9K~y-6rIAYx03irNE%E+WW;T#WVMOCw zsnGIqj7P8ws;VXd5H#V!0?PHAU@}*6CFq#DU@<{L`~U!}z*B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@o}Mm_Arezd`)~6x7_c~-{{3G+Pcb_38hfX6>>0bJ z)u|;9m*|L|)H?En<%;6Fn>>4*PhTn*2%4`D^<={xC&r9$mK6r~s^$82FqD}woDO{@ QwEz^Vp00i_>zopr09^exdjJ3c delta 167 zcmV;Y09gN<2e<){8Gi-<001BJ|6u?C0DnnDK~y-6rIAY#z#s@igX8_LoNnw)3{;(( zjUQeB5x7*Wf+RV?5s6P1YI2@rN)i%eWhx3xNxHR|;GLS7Lk*)+GWZjk17216Dq%Bt zB1po!a&-y%mmSSuIYd2IUkH56z$>40@`41wv8~o5AKJ3i(I68Pt_;7#q3a~o{R51X VUI44_p|=14002ovPDHLkV1jh@M9lyI diff --git a/assets/characters/nancy/fall3.png b/assets/characters/nancy/fall3.png index 87c85bdf4e39c3f28ea4be260a0743e753a9d1da..a1d10fd965b0cd06b7e0f2fb3fe6b5d31724b1d1 100644 GIT binary patch literal 922 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@9-c0aArez_`vdtH6gZqx@BKd~X?(GZ-#o4}>zlaK z;mQ>PvaM_l*F;(Df)2g2Uw0wr<@>HH6PWHWF_qOwH*I8foc4O(^Q3F6wQdYI*XS#6 P2L-C9tDnm{r-UW|%A_@4 delta 166 zcmV;X09pT<2e$!`8Gi-<001BJ|6u?C0DehCK~y-6rIJe$z#s@i!Rh_4oNlxeBPbnN zLU?@5F3qz508B#nP&+v}N%bS7ASVHmA`6Hi&q;i;_O;^foX{&R2|7a4pjKsl1e^f6 zc>tzer2t)GWua#M3Y81!_M;A#7Ry%{WG=v0*n!ed48^+no2A{;r)S@_`AgcmI=06im1t=3&%*pM$&Bvg?;gtC2zkRx2 z_cR-eesdN#!zU{Q@`E=WQu~z063m}9eMQ=}KO3vgExd5PzAV%7*4Ovn>X)5UXW%aJ zW_X$dH1O9)MtG)-0rGL#R@=|W1+5`{H)9aqpKVt9yeB<$>na5tt;f-jOW%!VXW*0u6mG&Nl`0U?*d-t%eb_)af zVumFe3tiem9D~^T=bp^+=+V2P7$$JdUH-|6-)F!6j?MVCQ#i-?*b}1!#x@3qH`!>m zMdR@qN;pp2F3NxIun6nEMJp%!WLiw!IPnaxd+32gW05n~_LuJ0{5$Wu;Mcz&*MA?J MF^4sxWCg>00J8O%u>b%7 literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/idle.png b/assets/characters/nancy/idle.png deleted file mode 100644 index f773a618b808244f0d321470b0d41a8cb7cedfa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3-oPT6RhUDaPU;cPEB*=VV?2IUWH%A+A7r z%Pw~vX}#PYqi|Jgjqv0-sW}R~D(=Eg92^`MxAa`eGoE5<`~S;>{xhdtrgZ9S$9P-M zajm)bX`Ah1rz8kz%4w)$k*WkVOQIymFPPy!cJT6!iy2VOYEKu(5R2ZalMeD7QQ&Z? zmgc+n^S^!UmDstAvwMASeL2Xp;)l(1c89b*9{x-R&T25snE5zV{*BIyBYkH!H!f%U zsNc$U?Q)X4{{2?Abrt`* hAN0wuId5CfaF<8m)AXYZ?m%ZVc)I$ztaD0e0sy09niT*5 diff --git a/assets/characters/nancy/idle1.png b/assets/characters/nancy/idle1.png index 37bee31c0fe4a9303ffdf919682144185f92169a..4771efeca548005e148b226d7201c4383a3dcdc2 100644 GIT binary patch literal 919 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@uAVNAArezd`!8}aC~z>FfBXM`PTNf7Th3d!ty%06 zkL*&CIe$qd@}!|i!>4sAA>#uqlqvEvlojW7&IC56ctlR83bsTPzBrp)618)U# bn*BsKvd3zdu7A*=00000NkvXXu0mjfuZK-4 diff --git a/assets/characters/nancy/idle2.png b/assets/characters/nancy/idle2.png index c6d29ad4e3a71768e4b4ae5fcd39dc53df58091a..2a42d7455d078312f51001affed283dc4a49a290 100644 GIT binary patch literal 918 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@E}kxqArez-`x&_y6nL0K|Nno!O>Aq6kwk@w?gAGf z-z7`hE-m}PR65@}tx8s2!CzqRv8|7E?+da23y4bl`-aV61G@o3&vS+kMLB};paAuB L^>bP0l+XkKnVB(L delta 171 zcmV;c095~$2fP808Gi-<001BJ|6u?C0E0v;TjYoooojt|M8p zIs|6TH~;|pJu}mBY_S`;r?pgQ699n0YzeW*Gcw6_xf$V_+_ibC6@A>IJ4c;CDd7~` z3UUG^y2#UYasotzeP9&FA>QIR#9soEWIO8uHByLcg>MH~jwHZ)|21{{3zORw+*P?+ Z;{^r1UJPCCf!P26002ovPDHLkV1g8sMyLP) diff --git a/assets/characters/nancy/idle3.png b/assets/characters/nancy/idle3.png index 6be79eda95f3dfd189d0a827ed9f948df12d3daf..f4da759d119da07add191d9cd43f364be20aca9b 100644 GIT binary patch literal 919 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@uAVNAArezddv9|w7;rdE{r7+V^INLYXV_0NYi@Ai zR5eTaLn2KE?cw%$7oZ~kqxSpf=B MPgg&ebxsLQ09TVVxc~qF delta 170 zcmV;b09F5&2fG1~8Gi-<001BJ|6u?C0D?(GK~y-6m6J;nz#s@iiR1mRoUYoz5Ye)6 zL`a@LL=z;L=K!EJC6ODoo@5az0wigSwj#4@mK_wLh=|cS-Q-4EEa=Wr&tM@S*H Y2TB236B3(9uK)l507*qoM6N<$f-FQv761SM diff --git a/assets/characters/nancy/idle4.png b/assets/characters/nancy/idle4.png index f0e2f7f28ce5bad7c62b2360f92bea5084aaa56c..7d90e55bf6b185ebbfb5606479ef37f8220f3e00 100644 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@&YmugArezd`!8}aC~z>F|M_3<=Y7TXZDIkt7SsF- z${F*_q}w^wsxvnCs=DvkD0D_}@5dd7x K=d#Wzp$Pz;WHO)t delta 169 zcmV;a09OB%2f6`}8Gi-<001BJ|6u?C0D(zFK~y-6rBXo-z%U3JOaK36cA1G4bWKLm zLt8{quj?l;eUjux283?~BCzsFiiil1q)F6@tSPuSkczenTrdD9vZ>r{ttP9hKm>9| zl5%ea03Z{lMviz#Xiwb>vG6rQhp~yybH%C;F+L}9w946M1R|u>7Jh5Nk&oay?cM?p X{4-qwHkSr*00000NkvXXu0mjf`D8cO&AlI85n+jWQNv4QQmcunSW+4dce8Ghyh z4g2+x5uPDqfqYyx_4Y>#F&MBgPcHm#eLY#A{_J$qHDW6+G;?Oo%T&o-95_?k!z6LL zp_)&P(S5tRxMa?9TY*piK2J@Fnf8mZWj(|5JT%MV@K{#b@5slXz;QU@+kboQMF)D$ zb*nB3-ps+Unn5M|(UXI-lP!65LY0* zWtY2-v|etHQMjtLMtJg^)Eos~6?b7L4i1isTY9eK8BZ~_{r}}b|C!S+Q#$pvW4x{B zxYk_zw9WRhQxb$UNL2!wB~cRO7tHVdt!(b7tG|u5>^2b4j$Dw0-Z==Z06#ChYnnZOpz@k}KG0Hs4O8=hjyb vEIlvYcGTvN!LqYq^EcOCkb12BnESp(G|#2CH-1I{UBuw&>gTe~DWM4fF!+lw diff --git a/assets/characters/nancy/jump1.png b/assets/characters/nancy/jump1.png index 03c850f72c46f5650de25786de668af5200da4ef..46a36050d4b668fccc50f66203eaa51b9cc0f697 100644 GIT binary patch delta 128 zcmV-`0Du3N2b2epEC&Do|Nqi1v2nNpk$^vIJm+Fr00001bW%=J06^y0W&i*HLP ij3#{Z`MWt0000^A2B delta 191 zcmbQjKAnAnj_a0P?mE(XxjjbVs@59e$#YV36nItKg`GG!I4*AKxsqo*#nkrymk0f4 zPPaHHc6ro0{T^Z6JU7#K@}{DK)Ap4~_Ta$G%K z9780g=Jp@tWia4iifpj|?H`rv;}ZSnglZR)YFol0C*O+N$y=82e*C(K?F82%zcn)_ qX0Ckd{zAM*``Wp$;X*nIe;MB`eqxTLqSa0k=G2Kzjl=Sh(a3=E7VL4Lsu4$p3+0XeRoE{-7*Q)~Mj z`4|*94sZML-=13|v7kWxng{OzZrc|Vo@Gu7_4vxDG3m{+15|zjE!O j4!*sq_ogy%pQvHzX=Hd_bSk10Xdr{9tDnm{r-UW|^xrlS delta 193 zcmbQvK9hZdj_a0P?mE(XxjjbVs@59e$#YV36nItKg`GG!I4*AKxsqo*#nkrymk0f4 zPPaHHc6rh*;u^Z6JU7#K@}{DK)Ap4~_Ta@;*# z9780gruHA?Wl-Q?-tF-JZha7=smR;YyFEA$a4Nr;(6vR=WU|jKfqJp0N?NZc@44ds tZqoGQmo#@ouT_$)JH2N$i(KM+*7I*TR1eR3xgTgGgQu&X%Q~loCIH4!PF?^2 diff --git a/assets/characters/nancy/jump3.png b/assets/characters/nancy/jump3.png index 35558f02077b9cf21bece8663dbf6dda6a813361..6e32136d904a4d63994192264fd00bb2312f6958 100644 GIT binary patch delta 130 zcmbQvK8<~X4%>eqxTLqSa0k=G2K!u_=Sh(a3=E7VL4Lsu4$p3+0XZ(7E{-7*Q%m~; z`4|*9oD%Q+KezPem04eu^Ep{tJQj6K37HTntX}Xgy{paHHc6ro0{T^Z6JU7#K@}{DK)Ap4~_Ta$G%K z9780gmi8ayWH8`hj(za&X8omWN+wZK_Rky^3#uykD4YzqCBkO$t9l{ZCbNsaYi3UT qw8W@}{l~)e*!wr-y#<&f_A|^4WxrkG>CX!^kipZ{&t;ucLK6VkSxMgj diff --git a/assets/characters/nancy/moth_mask/fall.ase b/assets/characters/nancy/moth_mask/fall.ase new file mode 100644 index 0000000000000000000000000000000000000000..40eab5c8fe3819492c0138b8edb023581d5fa731 GIT binary patch literal 1169 zcmbQp!ocugDKmor5OOepKnj?I6O3>cO&F!j3=F?MGQ(}<0`gfHpqBmzf=hZdv3Jza z(GVEiAs`EM9*Y7nJD>no2A{;r)FL~eAgcmI=06im1t=3&%t=mA;5TR#Z0bIho|KZ5 kB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6ArM>IKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^voPoh$0)uPB!lZUkpn1CbxvXB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6ArM>IKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^voPoh$0)uPB!lZUkpn1CbxvXB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6ArM>IKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^voPoh$0)uPB!lZUkpn1CbxvXcO&F!j3=F?MGQ(}<0`gfHpqBmzf=hZdv3Jza z(GVEiAs`EM9*Y7nJD>no2A{;r)FL~eAgcmI=06im1t=3&%t=mA;5TR#Z0bIho|KZ5 k4vXq00j+Bwg3PC literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/moth_mask/idle1.png b/assets/characters/nancy/moth_mask/idle1.png new file mode 100644 index 0000000000000000000000000000000000000000..926ca8a8aa4dda3680955db643e61cfa28691d82 GIT binary patch literal 890 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6ArM>IKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^voPoh$0)uPB!lZUkpn1CbxvXB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6ArM>IKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^voPoh$0)uPB!lZUkpn1CbxvXB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6ArM>IKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^voPoh$0)uPB!lZUkpn1CbxvXB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6ArM>IKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^voPoh$0)uPB!lZUkpn1CbxvXcO&F!j3=F?MGQ(}<0`gfHpqBmzf=hZdv3Jza z(GVEiAs`EM9*Y7nJD>no2A{;r)FL~eAgcmI=06im1t=3&%t=mA5H@HOZ0bIho|KZ5 k<85F>mwsP(+wum0E=Ef$N&HU literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/moth_mask/jump1.png b/assets/characters/nancy/moth_mask/jump1.png new file mode 100644 index 0000000000000000000000000000000000000000..284391c0e99a7c60b666b8bd02a8f9dcdc7f17f7 GIT binary patch literal 890 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6Ap0BIKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^vn1R8-hru;#QAIi^&^%rJT-G@yGywpdbtJw3 literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/moth_mask/jump2.png b/assets/characters/nancy/moth_mask/jump2.png new file mode 100644 index 0000000000000000000000000000000000000000..284391c0e99a7c60b666b8bd02a8f9dcdc7f17f7 GIT binary patch literal 890 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6Ap0BIKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^vn1R8-hru;#QAIi^&^%rJT-G@yGywpdbtJw3 literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/moth_mask/jump3.png b/assets/characters/nancy/moth_mask/jump3.png new file mode 100644 index 0000000000000000000000000000000000000000..284391c0e99a7c60b666b8bd02a8f9dcdc7f17f7 GIT binary patch literal 890 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6Ap0BIKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f^vn1R8-hru;#QAIi^&^%rJT-G@yGywpdbtJw3 literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/moth_mask/run.ase b/assets/characters/nancy/moth_mask/run.ase new file mode 100644 index 0000000000000000000000000000000000000000..159c762862cd81cdcccb80d87ae6f5eda1b70bad GIT binary patch literal 1407 zcmb<|HR5h#NEtHg%s$PfAHj za(c+jDlu{D;#0;83SY7^$jxOi_6KVC^^p;t>Fj}gJf?}^FpZsyfkAOE)s6E*bKP+E FD*&H@aajNW literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/moth_mask/run1.png b/assets/characters/nancy/moth_mask/run1.png new file mode 100644 index 0000000000000000000000000000000000000000..0ce1a955e2f497633754db476abebfc7b32a9ff7 GIT binary patch literal 890 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6AtjsIKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f@EpMk-EgTdAG>W^elpn1CbxvXM literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/moth_mask/run2.png b/assets/characters/nancy/moth_mask/run2.png new file mode 100644 index 0000000000000000000000000000000000000000..ee7afb4586f5b4d9190b5dfc73d888b6a69069a1 GIT binary patch literal 890 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6B?M+44fVrI~sgs^6ByMS-~aIsMMoj hbs@xH!Dn^}1_qNJ2GB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6B?M+44fVrI~sgs^6ByMS-~aIsMMoj hbs@xH!Dn^}1_qNJ2GB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6AtjsIKa_)p5@>XZUaLj!-ZN2EL{eR iUN{6FY&f@EpMk-EgTdAG>W^elpn1CbxvXM literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/moth_mask/run5.png b/assets/characters/nancy/moth_mask/run5.png new file mode 100644 index 0000000000000000000000000000000000000000..ee7afb4586f5b4d9190b5dfc73d888b6a69069a1 GIT binary patch literal 890 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6B?M+44fVrI~sgs^6ByMS-~aIsMMoj hbs@xH!Dn^}1_qNJ2GB|mLR^8||3Gj_56Bn=qaiTT zLcr#EQY6sNj3q&S!3+-1ZlnP@8lEnWAre!Q6B?M+44fVrI~sgs^6ByMS-~aIsMMoj hbs@xH!Dn^}1_qNJ2G=JfV?@-Y~2Fsc6ge?IqU zYlW6NJI}#4-WTc6AADjFkKXmGi{uGwI zErp-XG;aG-6t^R7yTGMmyBwFbUNtwcUGJPd^YrKWhxfAACo{axL$fLluT_ykKp#1$ z7X7y_SDfZoTj`kajh}(pbJ?csJ&fw-1(h2`b~jvhJo~*)I?wZD$2Y?{+MdqJw>`5o@H3?-8pZU6u{2-rvf literal 0 HcmV?d00001 diff --git a/assets/characters/nancy/run.png b/assets/characters/nancy/run.png deleted file mode 100644 index b89115a04cc05d9cdd431303e194f33bac51c16e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmeAS@N?(olHy`uVBq!ia0vp^2|z5s!3-qtrF5MJQjEnx?oJHr&dIz4ay$ZjLR^9L zmR;^T(t5c)M&YW~8sW)vQgak|RosQ0I5;>iZt1y_XFSE!_Wzd${bx?QOzG6uj`6mh z<63j=(>B}3PDv2bl+#ehB2@`!mPARAUogXe?BL}c7c-!m+nz3tAr`$yCv9XpqQK#N zx8TLO|NmdE4Dp?CDew8EZk2wqbyMnPGoQPv8$IJ(b&D@WskbgyDB9pWk9Ohh<;j0m z-Eau{&rxufu{!XHQmo_sHuw6}`kahkRTpZ9&+sM4|{~g{L2kzCxtetwUd*eqxTLqSa0k=G274Bp=Sh*1b(zKedi%}!7z{X=H~#r=@4j%dPQ~uU z94^}$mnoWdEOOcwA$n$_z!}-RRfne+_=wDQ5WddSr``VJUxjNsb45GD4PmLUEet^5 M>FVdQ&MBb@0Ng_?9{>OV delta 168 zcmbQlK8byTj_a0P?mE(XxjjbVs@59e$#YV36nItKg`GG!I4*AKxsqo*#nkrymk0f4 zPPaHHc6CYBxX^Z6$0GK>2qCn$)0Xksu5XJV;% zI7xxei8De>qeD@F(VS%+b0V9*3yUZFB-sGv2`mmu8Z|4l1MhY|=d#Wzp$PzeJUh1l diff --git a/assets/characters/nancy/run2.png b/assets/characters/nancy/run2.png index d60c289bbf88d6634a59775c35004c14afd0363e..64e3c5fb826d2426b537b987ce9d95c14688fca3 100644 GIT binary patch delta 127 zcmbQjKAC-j4%>eqxTLqSa0k=G2Ky|V=Sh(a3=E7VL4Lsu4$p3+0XdGIE{-7*QG%skG+)MKDGgE^dOYD!ynBd5XPvkhGeAq%8W^01z$aSLIbvGs(XOQHId&NWO< ekH4r%F)(z*Fg$)a(P1IbFa}RoKbLh*2~7YQkuMGa delta 188 zcmbQtK81aPj_a0P?mE(XxjjbVs@59e$#YV36nItKg`GG!I4*AKxsqo*#nkrymk0f4 zPPaHHc6rtBT@^Z6JU7#K@}{DK)Ap4~_Ta-2L} z9780gCMO(Vt!QLuRcB<`Q=r$;9Kba3$F diff --git a/assets/characters/nancy/run3.png b/assets/characters/nancy/run3.png index 1fe2f76738c32b01cfd5527ddf55dde1cf195de9..3606397ec10caecee8ee614694ac1b38e860c8b7 100644 GIT binary patch delta 129 zcmbQmK9zlf4%>eqxTLqSa0k=G2KyYF=Sh(a3=E7VL4Lsu4$p3+0Xfc|E{-7*Q%m~; zxfl#MoF>1kf3ACB)4@L)TdHyd?H4|=^PX|jbnl_WZ=Fp!Y{JclCMNZXA8g(#D3ExM h^Ayw6zdOwn?3)W2p8a88y%%U4gQu&X%Q~loCIH0fHVXg% delta 194 zcmbQrK8t;Vj_a0P?mE(XxjjbVs@59e$#YV36nItKg`GG!I4*AKxsqo*#nkrymk0f4 zPPaHHc6rotWZ^Z6JU7#K@}{DK)Ap4~_Tay&d; z9780gmijyLF(`06V!reDzqfJeis+47o0vF%H1-`mdvG7Oo?_?8$?Gexe`xn#`9wr( ubEWG#$vL_Ugkq=MF%~%fck=Rp-;8~>9CG`z4jloS$>8bg=d#Wzp$PzM-cMx! diff --git a/assets/characters/nancy/run4.png b/assets/characters/nancy/run4.png index 241217cd37b2c536203cbbf940bfc46152ad6ca9..7470db745ef9fb44b3ef8917c420ffe1e7189023 100644 GIT binary patch delta 131 zcmbQiKAnAn4%>eqxTLqSa0k=G2Kzjl=Sh(a3=E7VL4Lsu4$p3+0XeRoE{-7*Q%n0j z`4|*9j^sT1Uth+^;`7ACTcWTho^h_~(x~9Mhb}hUC<k8%o1gQwD?_cGhvC8Z(r!thfefCmelF{r5}E+ib2YsH delta 192 zcmbQvK7)ONj_a0P?mE(XxjjbVs@59e$#YV36nItKg`GG!I4*AKxsqo*#nkrymk0f4 zPPaHHc6ru-f8^Z6JU7#K@}{DK)Ap4~_Ta@;&! z9780gmi8ayWl-Q?j(za&ZherifTmRCMJD#1kK7BgJu5=B)J5hjTpKEKC?Iihj%-ew qajy0$)4I!-{_43e`}(I$dZv$72YW}FMany%i42~uelF{r5}E+vZAw)D diff --git a/assets/characters/nancy/run5.png b/assets/characters/nancy/run5.png index 047b8c0cc42c6bf38dd1381c4eb03070f5069f7d..786e84b419f20e55e27337e7a58e33d400e05c06 100644 GIT binary patch delta 125 zcmbQrK9PNb4%>eqxTLqSa0k=G2Kx+~=Sh(a3=E7VL4Lsu4$p3+0Xg=bE{-7*Q%n0j z`4|j1m=yp0KkvKtnr@MEVbcMnRg*+TH}{^n9rUl0HE)@M&=$pBLz~+T69ZgUcHX*` detU8-d&@S4+uVjyaHHc6rkow|^Z6JU7#K@}{DK)Ap4~_Ta-2O~ z9780gmiC_%WKiH>zU=Vt<^CX78B3WTZ~b;OEc6JQBJ%1Hw`5)z2mcniWz%Lfnj8*E oH9P2WK>UgK$+91XmnYZjYI(CO*~TyJ1RBTS>FVdQ&MBb@09@8e0{{R3 diff --git a/assets/characters/nancy/run6.png b/assets/characters/nancy/run6.png index 3890c8e4f220ec0091e0b6dd0fd0ccb7d1015a03..7a3b7579ae22c4934069cd7f0f85e9e6a450683f 100644 GIT binary patch delta 128 zcmbQhK81aP4%>eqxTLqSa0k=G2K#KA=Sh(a3=E7VL4Lsu4$p3+0Xa^dE{-7*Q%n0V zaxo}yFiZdbU+)*WMDLU09`4+=U-cO#dpvRqm?u;zdPb^|Wx2wwAQ{tm4aFk2`37MI f=l|B6c71JL!NhR+kCJ2*&@={5S3j3^P6lw delta 184 zcmbQjK7oCLj_a0P?mE(XxjjbVs@59e$#YV36nItKg`GG!I4*AKxsqo*#nkrymk0f4 zPPaHHc6rt}^0^Z6JU7#K@}{DK)Ap4~_Ta_l@^ z9780gCMPI}eQ07Za%W;$pcK%@;>78}vV_f-;i^CgV_Zj-h^$B10o{oXGa8Py@0uj; i*}&M^9Lvzj%WylL?f>B* z5EyA8VDmgF66j~fk|4ie28U-i(ij-n7(HDaLn`LHoz+{k*no#EvEqOEK2PDM+&|r+ zH(uGD-Fj!)#*0eIPLoorkM7F-T~_=5)}`b2w@rI5|8Ns|_BU_3+m>hXZmrv5Tpq7B z)W0&LK4L}W!mM7MmRFzWd*6__&~x(RWv7>cQT_ktY|q~Cg6sCpkFrizf2y{KZ?a>b zXWuS#dfm2I%Tt#h-)3K9W$&M{`q-|k&+j)lomGvN-2ds^!k5Jpu0370`^lS@nawxs z{~0r>PB}IsU`w*J;%ieIv%1rECY%3H4k&Tu`(3SgX|c(Tr+(L`-qf3UFaD117XD2l zUEWpeFH|qjbXxjxr#O?c)6L`l>({nTt2}QRQ0ez>YkJzB#F=3lpMR`$+8q1o%FjTibbBcXsK4EZd|wZr>@qNmev5nYuEp+`pkTO;VtXX<$KP37T+ED@#AN^ zq=PrN-R^ky_ri*RU0elDiTC-#uU+Nxjd!o=(fWM6+ej>`xc-IUD!q?xUpTHli$Aol ze$|CMdA*&%;iqH{9=iB`SKpVA6-M<-WWH@W?bQ4F#Fl{Mf2yy3yEz>-5L$Ki|L2}N zO#5p1wysm|&EUTJJiqU*UH+Ci{m*`Xyry%%dAqz+vRu)xS5t1Kv|n1!ohlx?+UjWO z{jguP3pdz_E{t8Sp5-O5aNesgp)c7MD$k!3aD{7@)7N57g^<@dOLHS%7A~Avtlm54 z60cJt+sl9JLzc%ay)X2$=;1nrYdclG+>2iIWx)lHbZzdXUj3YB=U8X9c$sswR>$$K zp1dBY=lH+<<^s*v=Uy`lsdC6zwt4Ed_DgS_rakwQdU$5PhRC~(UoJiWVJo${vrm5O zsZtGrs{hqa8PZ*L3!mzi96j!kvBsv>Dg63vV<*A-&+(VT9XaKEcWg5iywzV;y*pgv zf%5$qU%fUx`L=)iHj#z4D;L-V278>I-g|zsg40K>(?y%D(wvwBE!uTj*LBrczKdF$ zyYKYe={LTrwhLI9H@@~w3|sN-r~j_CbqVFWiv9TO({FDRc-5!-H_CZ?K>du66^pIj zADUu!G+%e8bt{|Kmik3iLRqG*yIXfHR@$Po@j_AQ)wA5D_D)twnl*i%W@d6CAozx7F_PN#9=|h6_9G{DWle-r$uxnvsxImEPE$sCBO)Zqo&GcIS`b;v T#gsh(R2zD_`njxgN@xNA8ng5u literal 2429 zcmeHI{ZrBh7{|y&P4iOOolQ-bCzfK_S`$JNP(%{RbQEaj3yC%i=DF_4xkxzsN7@?#C@3{w_T;fA<@ye;NlM%TN}*&GyWuhqVQi$g?Yg<*B7RQd|XFZMnV34uVSF|o_7D5K7o_~O8S z&VjOLrMHbsn`DHMPJxckzC8~D?KnWd`G@CJsD&y)J<}V*e7V5aQF2R^$IW`MLK6?^=dGw1S|iTn z(MDW;)?+AUZJo!Zq9omCHH{S%R1HIuTvA2aY|90M$@4|e?}JGgio+!B|T?w79b@qzxC zf?m6>Ml^Yq$CT$HzE5Z;0MdvG+q#T_P&*YhNpYW77V8r3+0&QUzIF8|udcaznpMm1 zyD}DCeNd}Jtr9X)@LlD?0wsoG6~eV=5f~LDCaZ?kiNUE%I-Xu zsW4P$u32_g?}FDPTLOh1;Tt=<_sgSCuxk&$+FBN<7bf4@KtC?YKwA#*a zj=&8{ZM=p61BGG#I3?kf%zKLWM3qcr>p-vwwOlo~s#e#S`e4#kvcYX5PQo+1DyVYz zrxilX1xJK_rA`Fxg=98h0en;0Nt`vj0lV}~&W!yQMx%393n7($`-&w)TZgi->*ROZ ze7b0OQhnIZIAcy10Bm14C<1oT@1xx|?Pu0YtZ>jgR zT?s0_i%Dc5reXlLVe^Gkn)^(?byq6O?{N*-35w8`q5= animation.speed then + animation.frame = animation.frame + 1 + animation.subframe = animation.subframe - animation.speed + end + + -- cycle + if animation.frame >= animation.frames+1 then + animation.frame = animation.frame - animation.frames + end + end + love.graphics.draw( + animation.imgs[animation.frame], + x - Camera.pos.x, + y - Camera.pos.y, + rotate, + sx, + sy + ) +end + +function Entity:Animate() + if game_paused ~= true and self.anim.path ~= nil then + -- try to animate + self.anim.subframe = self.anim.subframe + current_dt + + if self.anim.subframe >= self.anim.speed then + self.anim.frame = self.anim.frame + 1 + self.anim.subframe = self.anim.subframe - self.anim.speed + end + + -- cycle + if self.anim.frame >= self.anim.frames+1 then + self.anim.frame = self.anim.frame - self.anim.frames + end + + -- change + self.sprite = self.anim.imgs[self.anim.frame] + end +end + +function Entity:LoadAnimation(anim,frames,speed) + if self.anim.path ~= anim and self.anim.path ~= anim.path then + if frames ~= nil and speed ~= nil then + self.anim.path = anim or nil + self.anim.frames = frames or 4 + self.anim.speed = speed or frames + else + self.anim.path = anim.path + self.anim.frames = anim.frames + self.anim.speed = anim.speed + end + + self.anim.imgs = anim.imgs + end +end + +require "data/scripts/entities/kupo" +require "data/scripts/entities/arrow" +require "data/scripts/entities/player" diff --git a/data/scripts/entities/player.lua b/data/scripts/entities/player.lua index 855b8aa..5d60d3c 100644 --- a/data/scripts/entities/player.lua +++ b/data/scripts/entities/player.lua @@ -11,7 +11,7 @@ x = 0, y = 0 } - + -- constants o.acc = 45 o.friction = 20 @@ -22,7 +22,7 @@ o.jumpMaxSpeed = 9.5 o.zeroSpeed = 0.001 o.lightRange = 20 - + -- status o.isJumping = false o.isOnGround = 0 @@ -35,11 +35,10 @@ -- sprite o.sprite_offset = {x = 8, y = 16} o.target_offset = {x = 0, y = 12} - + -- lights - o.light = CreateLight(o.pos.x,o.pos.y,o.lightRange) - - + + setmetatable(o, self) self.__index = self @@ -86,10 +85,7 @@ function Player:Smart() end function Player:HandleAnimation() - -- move light to position, :D - self.light.pos.x = self.pos.x - self.target_offset.x - self.light.pos.y = self.pos.y - self.target_offset.y - + -- flip sprite to look in the direction is moving if self.vel.x ~= 0 then self.sprite_flip.x = math.sign(self.vel.x) end diff --git a/data/scripts/enums.lua b/data/scripts/enums.lua index f7272f5..913d5e3 100644 --- a/data/scripts/enums.lua +++ b/data/scripts/enums.lua @@ -17,6 +17,28 @@ animation = { speed = 1 } }, + nancy_moth_mask = { + idle = { + path = "assets/characters/nancy/moth_mask/idle", + frames = 4, + speed = 1/8 + }, + run = { + path = "assets/characters/nancy/moth_mask/run", + frames = 6, + speed = 1/8 + }, + fall = { + path = "assets/characters/nancy/moth_mask/fall", + frames = 3, + speed = 1/8 + }, + jump = { + path = "assets/characters/nancy/moth_mask/jump", + frames = 3, + speed = 1/8 + } + }, nancy = { idle = { path = "assets/characters/nancy/idle", diff --git a/data/scripts/lights.lua b/data/scripts/lights.lua index 709eaf9..b9b3c4f 100644 --- a/data/scripts/lights.lua +++ b/data/scripts/lights.lua @@ -24,7 +24,7 @@ function SetDarkness() end function DoDarkness() - love.graphics.setColor(0,0,0,0.3) + love.graphics.setColor(0,0,0,1) love.graphics.rectangle("fill",0,0,game.width,game.height) end @@ -34,8 +34,8 @@ function DoLights() if LightTimer >= 3 then LightTimer = LightTimer - 3 for _, light in pairs(Lights) do - light.flicker = math.random(-2,2) - light.dim = (light.range+light.flicker)/5 + light.flicker = math.random(-1,1) + light.dim = (light.range+light.flicker)/2 end end