From 95a8e8895a22dff06d63f1b4ed2ef88e976c5af5 Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Sat, 24 Aug 2024 20:23:17 -0700 Subject: [PATCH] Add glow to effects --- Assets/Sprites/Misc/flame-large.ase | Bin 0 -> 4033 bytes Assets/Sprites/Misc/flame-large.png | Bin 0 -> 743 bytes Assets/Sprites/Misc/flame-large.png.import | 34 +++++ Assets/Sprites/Misc/torch-base.ase | Bin 0 -> 682 bytes Assets/Sprites/Misc/torch-base.png | Bin 0 -> 92 bytes Assets/Sprites/Misc/torch-base.png.import | 34 +++++ Assets/Sprites/Misc/torch-fire.ase | Bin 0 -> 2382 bytes Assets/Sprites/Misc/torch-fire.png | Bin 0 -> 379 bytes Assets/Sprites/Misc/torch-fire.png.import | 34 +++++ Assets/Sprites/Misc/torch-lamp-base-back.ase | Bin 0 -> 982 bytes Assets/Sprites/Misc/torch-lamp-base-back.png | Bin 0 -> 379 bytes .../Misc/torch-lamp-base-back.png.import | 34 +++++ Assets/Sprites/Misc/torch-lamp-base.ase | Bin 0 -> 982 bytes Assets/Sprites/Misc/torch-lamp-base.png | Bin 0 -> 416 bytes .../Sprites/Misc/torch-lamp-base.png.import | 34 +++++ Entities/Lightning.tscn | 4 +- Entities/Torch.tscn | 76 ++++++----- Entities/TorchLamp.tscn | 127 +++++++++++------- Entities/UnwantedFrequency.tscn | 14 +- Items/Weapons/Bow.cs | 7 +- Items/Weapons/Bow.tscn | 8 +- Scenes/BaseMap.tscn | 2 +- 22 files changed, 316 insertions(+), 92 deletions(-) create mode 100644 Assets/Sprites/Misc/flame-large.ase create mode 100644 Assets/Sprites/Misc/flame-large.png create mode 100644 Assets/Sprites/Misc/flame-large.png.import create mode 100644 Assets/Sprites/Misc/torch-base.ase create mode 100644 Assets/Sprites/Misc/torch-base.png create mode 100644 Assets/Sprites/Misc/torch-base.png.import create mode 100644 Assets/Sprites/Misc/torch-fire.ase create mode 100644 Assets/Sprites/Misc/torch-fire.png create mode 100644 Assets/Sprites/Misc/torch-fire.png.import create mode 100644 Assets/Sprites/Misc/torch-lamp-base-back.ase create mode 100644 Assets/Sprites/Misc/torch-lamp-base-back.png create mode 100644 Assets/Sprites/Misc/torch-lamp-base-back.png.import create mode 100644 Assets/Sprites/Misc/torch-lamp-base.ase create mode 100644 Assets/Sprites/Misc/torch-lamp-base.png create mode 100644 Assets/Sprites/Misc/torch-lamp-base.png.import diff --git a/Assets/Sprites/Misc/flame-large.ase b/Assets/Sprites/Misc/flame-large.ase new file mode 100644 index 0000000000000000000000000000000000000000..2a0c2b5d61a5a7b47713a39b2c51341bc067acbd GIT binary patch literal 4033 zcmcJS2~1R16o${6x6HyDLDZ@Nho>kaZlkUHxQ!r1P(g^b*5ZsnZLLc+YQeO1aHDmp zTU=w@Dprk2-D7H1Q0s;yZDSWr(~hLkrfMrz8?`3%zwgasE>ww0?IipRx%b_B{_mW7 z?xQ@CC|IhJN{z@y0ukloC;UkcfBj#+rAkDPs-3mF9zX~!HFMV?_4lkHvWbnLkxiOH zW8&hV-Fo$gj()=roxCUjb%~9keIuGf(_6AR%iDE<9_ZT_di?b?=-k{_q06REfo?3G z3q7%I8}x^R2cdsly$XGJ?;bSPAwj#wuzkIWY|X4bY)yZ9C+M`?p3vfVlcAe8On`oV zkj1cNSTyv=_!#K9IqjfV*0A00lxH#hz7Tq^itRXQ%1~&@lCjV=yC*`AocjQJ;>vvJ z_t)1$Z&e?KI=!*b=+Uj9oeR4{hkQH$TCi&*bXobEP#VEj)}}3lc3H)q^&USAExd9D zy6fgiXtS79Xk5~0XqWyz=zy%5(BV@{p#Dvz&=}PP?cAJsOzAKXn$?vN4vb+jZ;WFsfgHR68>E35i~$&Qffif= z6-0p(ECCV}fe`!v59ELi%m56ufC`)d350+LYybvSfCM}M10;X}3;+P`VI96<8jfKX zUSSk2VG;gd4$fdJj=9pJq2^~4zE~;4UsNzd>uwB-<`{m1M(uF#hKFBlc(`Z7!!I>F z+@s;)UV{;*tPv6>QjGpP~oOL9|@x9w(l6+Nfd3B0q^N{sv1vxD6j33hC+U+F#42->t=QU#H6g+MC8l&D`38PHs+MZo z$bWV@P~V!ll!YQ$tHpPSlTP4EjPI5CGvq#nP^Rt;6vMJQDX(tD4_Fr7y znB3~T7GPgrw6JtcJEqsd+ek;6u(*7VkC;O;u9qrS@mV+ zXG(%*CwZM`aDAtbgs?MKk# z&z6YVP@7Kr6b6GYCiCo|MJymi(JZ8n6w;056vV+-h_PHA7=d*korUuJ&dkete5^I_ zd)ml}tfnm8@5C*5s&^pnK}~wzx97iU6iD7Hr49YDYGQ^Mo=m4+Uc6 z5~rGnLd2oC6-zXgs{`ZUdxy_XjBD$g9>V@F(Jmh3ZnqKH)SNe)#6E?6I$qE<;{KPIGy zUGu!3;JUpYBMt(V4VSAGxLEOP5pIOPhveU$(QOVcsh$32w3;(w&CiBA-^#gF;U0Ue`7pK`a^c z2mNGmxuPszdpr(@wrJkG?b|Jp3$7PC+-@Sb(=x~CIwDr#NwL>Ib`bSWtx~?(o7lhQ O;lNqpv%t-_pML<(uNGqf literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Misc/flame-large.png b/Assets/Sprites/Misc/flame-large.png new file mode 100644 index 0000000000000000000000000000000000000000..fd1a759a57af97113afaf0ff8957da99f54afa4d GIT binary patch literal 743 zcmeAS@N?(olHy`uVBq!ia0vp^6M&eHgBeJE|B|{BNSz7r32_C|9L#+D!Xnc0@`mOX zVQGmuZ4GkFf>zw(-jeeDs(PEOtoFuw*2hKm7Us@stlzhA;f>9k-`~3R^UD_*E*5=h zJ|_+FKuh^VZ=L)&v&M3lc{7uCZEl$FCA2MG`goP<&8b!&4hDX>Uh(D8!mM1k_U@>u zE7P|fuiJOC`TDaNZ$9qeb&?SZlhv)zckZ)GUE$w*FoVIbLLt9ZZ_*5>y<0189$E2v zzo@jkyjGZ=ZGv53iEmze;+&<@JaW3?I{rztHv%XAE19+N`m}? z8U9laHfej7F)%Q;dAc};SoF>f@!oXUfa7z@T5ExK^(V!X?GE`~I`?^zZ<4^I19Fd- zm*)Jxed%xP`$PBd)h+!nD|GgbrC;YLzn%TUhSy%JZy>v0H}V(pTeDmU-D z&eOAk9pUqj@Dwl7GW->A;N({A$p^m*&-``v_Mx2`ELs8r8~T~nFFy3h_RohWOkC1O zCZ!lG-aYl2g65f1k-U*rwh8=}Has6q%2NcUT%37-!>_fMmKca`6BA8as>+bcc&2}q z&n{Cnix~|0+G^*&u1N9TQE#l4ac|i=ulZ`#>|qPDRC2DJ7R}e*moDdiR{Euq zw`$5_?hQ;Tl?eul4{Ubpd3t!(cf0(2m;31C`DzulnZ<{vUQ0^b^zVG|R~APzUPq0E zyG+=Y9@E=>jq}njz81ayy@44mw?3+!U`Wb5^8E3+W!C!TKdN3W+oJ627vFPi``3cN goY$Jq>UY-9l(c<&b>G%Qz!+xmboFyt=akR{0KVgCJ^%m! literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Misc/flame-large.png.import b/Assets/Sprites/Misc/flame-large.png.import new file mode 100644 index 0000000..9ec42f2 --- /dev/null +++ b/Assets/Sprites/Misc/flame-large.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1garalf1clsp" +path="res://.godot/imported/flame-large.png-41b172a8bfc9c186ab97a98ae0c5a459.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Misc/flame-large.png" +dest_files=["res://.godot/imported/flame-large.png-41b172a8bfc9c186ab97a98ae0c5a459.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Sprites/Misc/torch-base.ase b/Assets/Sprites/Misc/torch-base.ase new file mode 100644 index 0000000000000000000000000000000000000000..d213a9d5aae0285efc8dfb8fa50e5c4c4d7e2514 GIT binary patch literal 682 zcmcJN-77<30EgeLgSgOyv@$yvV;W8y!lY#>$ww?PSE9Iar7exQL6V}RmfgsOEK*YB z#)XJ{wVIODg*&-9o|71VfcJEs-t*P_dw%a(*9-9w(Fut|7CIqBA7^4HiRr)0 zY^?wBCjG3c5Wy&auUhhF%^bN(6(Ya78`gBsz}C54=-<19E4Me$SXKh_I~7)_gX7rcni!Jc&i&%j>fmq8~}yHHB^{hE}MAJ}84GsDTbB0DIK&MjB&u zaYYnM6!Ak2Gqi9*2pd%JKmr5elbztCCNg;mOHyKzk$|Kl8o3B%)-uVNzjltWB1JU! zj`aIvhm(sW`Rl35=6?LpWw8hX{uLKY!rB0fhtS q8W^+|z51Uh(GC*38%WPN)8y8`d%{YvgrB%d*IF;Lg?GMW^ zWjNf{NCvv8(MYz%7=eX|#w;)phho^AQ!cyUrr-rl8u(*Or9R(j3#Uj4|5(C9+wbx| zzxR927q0TwiZyK1~g%}^oDL9~9; zZm41RVdx`AKZ91ByA1u{+Bj5`6c1g$D*>8)P!Fv-l?6Th)#K2MV>alvjqLmVxtY+9 zs*9jK%@xoex|*R=SI$C{*KUBC;^Lr(@;5@yRWrT*4qNq0@5|7r5H=?>LIu4 zh=B`MfPxZ;-~$}UfCVN1fd(kx00anNAKqacu3;H|VHQqd6CPm@?qChRU`oq82|<#R zgIQ8hfw}g%azXDL#;Gs7q{9!cJe;)haI$mQTWy^IHI)LPVRCZF-3E9>zvkq#CZjU{ z&+GHUmaS^*rMd2YAM;a_6ZhmCueZxO@`^unu9ab}Lb6tgPi(Epl%{=g#A>4lc?i-}@gIjSlpYdPXvYir8dCpL4<)(+bo&20~;jTYx~*jpu; z&uZ74Jiz9XYJk(Ei?bBi)kiW*Av${W?#CP-%lo7CfkUK-E!6QbmchQ;7fNNM^^d)Y zg?H@Ag=a2I+{o1yb_KXzTkuyYu(F(_01t>oPHEs^F#fd9eb9hNrwu7^(*eo?ihJC(y zPUo%`NSse$kJS+7xCjZmF9t$|%B)t8VybWNeB=!9{%L5eA4#ljO>6SI6?ynpl4>-g zGGoX;%#W(-Vvo4b*E1VS&UaIZMIIPV#o8d7b3PkiArE@Y4-2QPw*zXuVNR|RGkaM~ z9~Y*@^5ouq4o!P|+2DJZM@GQh6L#W>KpO1rH~(fovo$q9LEmgk9cP!aQjjl+gWNO4 z>LlYF9kHm*&Vy$emWGFYmK-D3oc(;{OlC5vuZEoQMrmIq<<134na5$O#EMSJ;fC?Q z8#*+{`ZJSr{Rj9wU#t7fO1EvReA011ds0A2O91pP{Lp*;kxVWW>^VEFZ-r zu{z_E&ixOs)yzkg6{pa2evr)@@QYuJ*r_UUzR9vvDu zrHbay3sv2-JwKUlj?7L}a1@to7` z*XW4enoyg)0ghsu)jXc=+B_B9`N`Pyd>;$!eB{@4w*~fi2J{IT1?rM}3*tLJ s6;kN@YccWcp9q%Q0fhdEP)ZrE5JhLVMWW6LXpw0_}T`xZRH?bT4_?&I^zi2NZSpndQRjR~`EF97!#-WP&B$EKC2tc|bF&n-8%rUqyZ zp~Hn~BCp%o1@VvN>3TO?;n+7SYcn>jj7__M^T`Fzv1w)MXD_2>v)sgFwFtd1O(ck| zu#tv_4#SxG*$d0>O#S=|SQi$cx5oTnWq!*6j+E9#Wo@39$1240@>uSA>bxQJa3ZAM z5C<5l+)e$wytBu)1jKIw5zIJ*-U5H%biJFYpI5D1v<%UhGWel0RgJJaLHgEbEWHqg5(#N1i1(|b}QrY^X(M3+Aya*M9 zfreCGNZM66k}$MJhCyC52yMHHF1jf&VFm@Uo`2z_?mMuD|Jb|pp5OC3GkTE^gE}$G zN->E}L>l=lT{TO`|8nxP|Hpi8cIya_P^2wxt^RjsM#Q8qfGbuPLYv(VE4OZg{xbo1 z{&obG>Q_Pcax1JYQZwD<4mjd=!|{{*VQbxS*m`eXj+Mp0dHI8|5$=RolPDeTuVT znEt3Xo^9C+JMNr-(cvaII&~9HB-`Qar(XDF{wd7&6hn)@1XhHdu)3=Xo*p^`JLAnz z4yrqAp6%5dbEdgi`s({T8~LS}}Q2KDBs(kO>!sD(}_gf^&x9w>nZ(2sk>V;$xAMmDC= zjAI027qxgrDn`+XOGIK3h4@1r=Fo;SgkcL+ctR3}(1RPqUM5zR)Ug}h~y(2$%s{^Qfa)L*^9W6Cr3h;gUwn)Ab75X?*`41{ar*&Ec-LzP)AK9 z2QitP#Tk?6CEOo$8TGkW*123wk+){i9_tdm-_ts#^?yz0GktWrvOrv>oLw&;UhK(a r9vy!6F21(+^;mmZqS2Ci6Dah)m`uF#E?77D>*v1x>@s#ojk|vVrS~ET literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Misc/torch-lamp-base-back.png b/Assets/Sprites/Misc/torch-lamp-base-back.png new file mode 100644 index 0000000000000000000000000000000000000000..dad040d94bc11697ce078052891a7e27b7c54959 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eK!3-ot_ve`csWSmSA+A80gPD(CSVUT0-q744 zEG;potwD}i(285!TT;GXRd17()!tao`nbs6!rWPn_4^hsys>%n`&+kue)%H9#iB3G z=cFMXXepoQt&<;T)>!T`Z)Vc2%?NEBt#8W-$0wDCD>5O`74fcWcGXBP(9- z7nOFG*9z0KO|T0r@y%;boU>G#M^0B<$5qolP(QIDV&TlvGbn4cvuq#8FePGNtzV6}V-1B1UT<3+`E6?vd422WQ% Jmvv4FO#lshul4`{ literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Misc/torch-lamp-base-back.png.import b/Assets/Sprites/Misc/torch-lamp-base-back.png.import new file mode 100644 index 0000000..8106ac6 --- /dev/null +++ b/Assets/Sprites/Misc/torch-lamp-base-back.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://i5ksh8i0q48o" +path="res://.godot/imported/torch-lamp-base-back.png-a6c17eff02f04f493c4e495a2d662d5a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Misc/torch-lamp-base-back.png" +dest_files=["res://.godot/imported/torch-lamp-base-back.png-a6c17eff02f04f493c4e495a2d662d5a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Sprites/Misc/torch-lamp-base.ase b/Assets/Sprites/Misc/torch-lamp-base.ase new file mode 100644 index 0000000000000000000000000000000000000000..53c995316d2a50896dd6ea086443a3c13ed17ff0 GIT binary patch literal 982 zcmcJNT}V@59EacSEH`XgO=HN^9Sox{w|UdYAggIblRgGDD#$#}QYu@YG`h%%loz3b zFwl_73rV{YM-qnC$S}x@2BB?N(M2}}Cd{B9PS0CRsrwG>*%|xq{h#0S+pHqQhe3m| ziq*m*3_^%TUdva_^6h`Q3$p*mLeA3GQ68a4&2Fv!cc(6dMahS&3JRga>4cTrw!`3A z4PLktg{8_G=v`@twMBBKyW9mwyHuu5I{`Z{x4?UCt#EQ+0KSjM;e0v`zh^SA zIM)Q-4!PI2L7o}dA}SR@io<2Hx*$fa7ub3=jM^ICk0rr*D?SR7`IFng~eF zMPTNm+<2~KAMCh$62^v`;MnvnIGJjPbDw(QmxZS=&sPj>!4g;zal`7aDtKn-Fzie; zLvcu+tcGtxSC9OyZ{i7zq^97|=jU*(V?T6m3PRV;dRP^>1`l5BfLi|`bXZGagoOr}zeFnbYK9C$bQYcoLKQ^!XWCp3_&sf4TKQ`_kLhDGmHEPBG46i(=u(fa rKR)v8U1DAD>+$xoWTP$pMl1Bcm`c9#FWNT;>*v4y>@s)9%zJ(TrPU$` literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Misc/torch-lamp-base.png b/Assets/Sprites/Misc/torch-lamp-base.png new file mode 100644 index 0000000000000000000000000000000000000000..270b1aaba4dfc1b3de110c07ad59fa9ea775d96f GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eK!3-ot_ve`csWSmSA+A80gPD(CSVUT0-q744 zEG;potwD}i(285!TT;GXRd17()!tao`nbs6!rWPn_4^hsys>%n`&+kue)%H9#iB3G z=cFMXXepoQt&<;T)>!T`Z)Vc2%?NEBt#8W-$0wDCD>5O`74fcWcGXBP(9- z7nOFG*9z0KO|T0r@y%;boU>G#M^0B<$5qolP(QIDV&TlvGbr#X(>9!V5f+&C wC03=iulmdKI;Vst0Llu(fB*mh literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Misc/torch-lamp-base.png.import b/Assets/Sprites/Misc/torch-lamp-base.png.import new file mode 100644 index 0000000..a81c890 --- /dev/null +++ b/Assets/Sprites/Misc/torch-lamp-base.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ca0htndnsb38k" +path="res://.godot/imported/torch-lamp-base.png-03b38ecb41ff35cadec5aeaad2c98e38.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Misc/torch-lamp-base.png" +dest_files=["res://.godot/imported/torch-lamp-base.png-03b38ecb41ff35cadec5aeaad2c98e38.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Entities/Lightning.tscn b/Entities/Lightning.tscn index 2970374..031e582 100644 --- a/Entities/Lightning.tscn +++ b/Entities/Lightning.tscn @@ -85,7 +85,7 @@ tracks/2/keys = { "times": PackedFloat32Array(0, 0.7), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [0.5, 0.0] +"values": [1.0, 0.0] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_g3m4l"] @@ -105,6 +105,7 @@ ProjectileName = "Lightning" Hitbox = NodePath("Hitbox") [node name="Sprite2D" type="Sprite2D" parent="."] +modulate = Color(4, 4, 4, 1) material = SubResource("CanvasItemMaterial_3bsa7") position = Vector2(0, 8) texture = ExtResource("1_bf8ae") @@ -119,6 +120,7 @@ libraries = { [node name="Hitbox" parent="." instance=ExtResource("3_vlt1v")] collision_layer = 0 +priority = 5 Damage = 20.0 [node name="CollisionShape2D" parent="Hitbox" index="0"] diff --git a/Entities/Torch.tscn b/Entities/Torch.tscn index d0d49c1..283322d 100644 --- a/Entities/Torch.tscn +++ b/Entities/Torch.tscn @@ -1,59 +1,60 @@ -[gd_scene load_steps=12 format=3 uid="uid://c1w7t6irnohfx"] +[gd_scene load_steps=13 format=3 uid="uid://c1w7t6irnohfx"] -[ext_resource type="Texture2D" uid="uid://har1bd5u4dq3" path="res://Assets/Sprites/Misc/torch.png" id="1_14bgb"] +[ext_resource type="Texture2D" uid="uid://cyfyelyq3o15s" path="res://Assets/Sprites/Misc/torch-fire.png" id="1_gnoxc"] +[ext_resource type="Texture2D" uid="uid://bitpf645g0prl" path="res://Assets/Sprites/Misc/torch-base.png" id="2_cwgtj"] [ext_resource type="Texture2D" uid="uid://coarr28adgo1u" path="res://Assets/Sprites/Particles/point-light.png" id="2_hotvd"] -[sub_resource type="AtlasTexture" id="AtlasTexture_js1l1"] -atlas = ExtResource("1_14bgb") -region = Rect2(0, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_vnjya"] +atlas = ExtResource("1_gnoxc") +region = Rect2(0, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_gdxtl"] -atlas = ExtResource("1_14bgb") -region = Rect2(8, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_l2emm"] +atlas = ExtResource("1_gnoxc") +region = Rect2(8, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_da7fw"] -atlas = ExtResource("1_14bgb") -region = Rect2(16, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_03weu"] +atlas = ExtResource("1_gnoxc") +region = Rect2(16, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_rpccx"] -atlas = ExtResource("1_14bgb") -region = Rect2(24, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_1fqw1"] +atlas = ExtResource("1_gnoxc") +region = Rect2(24, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_crwu1"] -atlas = ExtResource("1_14bgb") -region = Rect2(32, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_sj1bi"] +atlas = ExtResource("1_gnoxc") +region = Rect2(32, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_r3kxc"] -atlas = ExtResource("1_14bgb") -region = Rect2(40, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_1xpxx"] +atlas = ExtResource("1_gnoxc") +region = Rect2(40, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_225la"] -atlas = ExtResource("1_14bgb") -region = Rect2(48, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_dxfgw"] +atlas = ExtResource("1_gnoxc") +region = Rect2(48, 0, 8, 8) [sub_resource type="SpriteFrames" id="SpriteFrames_gf7ku"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_js1l1") +"texture": SubResource("AtlasTexture_vnjya") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_gdxtl") +"texture": SubResource("AtlasTexture_l2emm") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_da7fw") +"texture": SubResource("AtlasTexture_03weu") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_rpccx") +"texture": SubResource("AtlasTexture_1fqw1") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_crwu1") +"texture": SubResource("AtlasTexture_sj1bi") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_r3kxc") +"texture": SubResource("AtlasTexture_1xpxx") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_225la") +"texture": SubResource("AtlasTexture_dxfgw") }], "loop": true, "name": &"default", @@ -64,19 +65,28 @@ animations = [{ radius = 4.0 [node name="Torch" type="Node2D"] +y_sort_enabled = true -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -texture_filter = 1 -position = Vector2(0, -10) +[node name="Sprites" type="Node2D" parent="."] + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Sprites"] +modulate = Color(3.5, 3.5, 3, 1) +position = Vector2(0, -14) sprite_frames = SubResource("SpriteFrames_gf7ku") autoplay = "default" frame_progress = 0.337799 +[node name="Sprite2D" type="Sprite2D" parent="Sprites"] +position = Vector2(0, -8) +texture = ExtResource("2_cwgtj") + [node name="PointLight2D" type="PointLight2D" parent="."] color = Color(1, 0.811765, 0.537255, 1) +energy = 1.2 blend_mode = 2 shadow_enabled = true shadow_filter_smooth = 3.0 +shadow_item_cull_mask = 8 texture = ExtResource("2_hotvd") offset = Vector2(0, 2) texture_scale = 0.25 diff --git a/Entities/TorchLamp.tscn b/Entities/TorchLamp.tscn index d858e18..1ce4a7d 100644 --- a/Entities/TorchLamp.tscn +++ b/Entities/TorchLamp.tscn @@ -1,94 +1,96 @@ -[gd_scene load_steps=16 format=3 uid="uid://ceadk7pam7vab"] +[gd_scene load_steps=18 format=3 uid="uid://ceadk7pam7vab"] -[ext_resource type="Texture2D" uid="uid://cyldr0ck3yfrp" path="res://Assets/Sprites/Misc/torch-lamp.png" id="1_dlkl0"] [ext_resource type="Texture2D" uid="uid://coarr28adgo1u" path="res://Assets/Sprites/Particles/point-light.png" id="2_0xpf8"] +[ext_resource type="Texture2D" uid="uid://c1garalf1clsp" path="res://Assets/Sprites/Misc/flame-large.png" id="2_a6lwn"] +[ext_resource type="Texture2D" uid="uid://ca0htndnsb38k" path="res://Assets/Sprites/Misc/torch-lamp-base.png" id="2_bq1kw"] +[ext_resource type="Texture2D" uid="uid://i5ksh8i0q48o" path="res://Assets/Sprites/Misc/torch-lamp-base-back.png" id="3_vh465"] -[sub_resource type="AtlasTexture" id="AtlasTexture_ikvnd"] -atlas = ExtResource("1_dlkl0") -region = Rect2(0, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_dtmd3"] +atlas = ExtResource("2_a6lwn") +region = Rect2(0, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_b7wal"] -atlas = ExtResource("1_dlkl0") -region = Rect2(12, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_irtpk"] +atlas = ExtResource("2_a6lwn") +region = Rect2(12, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_68y2k"] -atlas = ExtResource("1_dlkl0") -region = Rect2(24, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_0gb20"] +atlas = ExtResource("2_a6lwn") +region = Rect2(24, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_eib4d"] -atlas = ExtResource("1_dlkl0") -region = Rect2(36, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_5uhdg"] +atlas = ExtResource("2_a6lwn") +region = Rect2(36, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_7q5cd"] -atlas = ExtResource("1_dlkl0") -region = Rect2(48, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_e4moo"] +atlas = ExtResource("2_a6lwn") +region = Rect2(48, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_k8jtr"] -atlas = ExtResource("1_dlkl0") -region = Rect2(60, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_soja6"] +atlas = ExtResource("2_a6lwn") +region = Rect2(60, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_egan1"] -atlas = ExtResource("1_dlkl0") -region = Rect2(72, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_sn741"] +atlas = ExtResource("2_a6lwn") +region = Rect2(72, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_eymjc"] -atlas = ExtResource("1_dlkl0") -region = Rect2(84, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_r825r"] +atlas = ExtResource("2_a6lwn") +region = Rect2(84, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_go3ky"] -atlas = ExtResource("1_dlkl0") -region = Rect2(96, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_75y5m"] +atlas = ExtResource("2_a6lwn") +region = Rect2(96, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_rvq52"] -atlas = ExtResource("1_dlkl0") -region = Rect2(108, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_l8r4c"] +atlas = ExtResource("2_a6lwn") +region = Rect2(108, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_cjdtb"] -atlas = ExtResource("1_dlkl0") -region = Rect2(120, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_7gxo8"] +atlas = ExtResource("2_a6lwn") +region = Rect2(120, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_vi5xh"] -atlas = ExtResource("1_dlkl0") -region = Rect2(132, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_60wov"] +atlas = ExtResource("2_a6lwn") +region = Rect2(132, 0, 12, 14) [sub_resource type="SpriteFrames" id="SpriteFrames_gf7ku"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_ikvnd") +"texture": SubResource("AtlasTexture_dtmd3") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_b7wal") +"texture": SubResource("AtlasTexture_irtpk") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_68y2k") +"texture": SubResource("AtlasTexture_0gb20") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_eib4d") +"texture": SubResource("AtlasTexture_5uhdg") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_7q5cd") +"texture": SubResource("AtlasTexture_e4moo") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_k8jtr") +"texture": SubResource("AtlasTexture_soja6") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_egan1") +"texture": SubResource("AtlasTexture_sn741") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_eymjc") +"texture": SubResource("AtlasTexture_r825r") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_go3ky") +"texture": SubResource("AtlasTexture_75y5m") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_rvq52") +"texture": SubResource("AtlasTexture_l8r4c") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_cjdtb") +"texture": SubResource("AtlasTexture_7gxo8") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_vi5xh") +"texture": SubResource("AtlasTexture_60wov") }], "loop": true, "name": &"default", @@ -97,15 +99,26 @@ animations = [{ [node name="TorchLamp" type="Node2D"] +[node name="Sprite2D2" type="Sprite2D" parent="."] +texture = ExtResource("3_vh465") +centered = false +offset = Vector2(-6, -16) + [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +modulate = Color(2.5, 2, 2, 1) y_sort_enabled = true texture_filter = 1 +position = Vector2(0, -6) sprite_frames = SubResource("SpriteFrames_gf7ku") autoplay = "default" -frame = 9 -frame_progress = 0.966501 +frame_progress = 0.557817 offset = Vector2(0, -12) +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("2_bq1kw") +centered = false +offset = Vector2(-6, -16) + [node name="PointLight2D" type="PointLight2D" parent="."] color = Color(1, 0.811765, 0.537255, 1) energy = 1.2 @@ -113,3 +126,13 @@ blend_mode = 2 shadow_filter_smooth = 3.0 texture = ExtResource("2_0xpf8") texture_scale = 0.25 + +[node name="PointLight2D2" type="PointLight2D" parent="."] +visible = false +color = Color(1, 0.811765, 0.537255, 1) +energy = 1.2 +blend_mode = 2 +range_item_cull_mask = 8 +shadow_filter_smooth = 3.0 +texture = ExtResource("2_0xpf8") +texture_scale = 0.25 diff --git a/Entities/UnwantedFrequency.tscn b/Entities/UnwantedFrequency.tscn index d831162..bd1dd69 100644 --- a/Entities/UnwantedFrequency.tscn +++ b/Entities/UnwantedFrequency.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=3 uid="uid://1y5r6sklwgrp"] +[gd_scene load_steps=25 format=3 uid="uid://1y5r6sklwgrp"] [ext_resource type="Script" path="res://Entities/UnwantedFrequency.cs" id="1_6sbe0"] [ext_resource type="PackedScene" uid="uid://du5vhccg75nrq" path="res://BoundingBoxes/Hitbox.tscn" id="2_gxtvd"] @@ -10,17 +10,20 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_30y8q"] size = Vector2(8, 8) +[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_dhurx"] +light_mode = 1 + [sub_resource type="Curve" id="Curve_eu273"] _data = [Vector2(0.0618557, 0), 0.0, 0.0, 0, 0, Vector2(0.489691, 1), 0.0, 0.0, 0, 0] point_count = 2 [sub_resource type="Gradient" id="Gradient_dyqhb"] offsets = PackedFloat32Array(0.00662252, 0.715232, 1) -colors = PackedColorArray(0.996078, 0, 0.164706, 0, 0.996045, 0, 0.166638, 1, 1, 1, 1, 1) +colors = PackedColorArray(0.996078, 0, 0.164706, 0, 1.992, 0, 0.334, 1, 2, 2, 2, 1) [sub_resource type="Gradient" id="Gradient_m1y6u"] offsets = PackedFloat32Array(0.00662252, 0.715232, 1) -colors = PackedColorArray(0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1) +colors = PackedColorArray(0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 1) [sub_resource type="Gradient" id="Gradient_2q0ut"] offsets = PackedFloat32Array(0.525926, 0.740741, 1) @@ -132,11 +135,14 @@ Knockback = 324.0 shape = SubResource("RectangleShape2D_30y8q") [node name="TrailRotation" type="Node2D" parent="."] +material = SubResource("CanvasItemMaterial_dhurx") [node name="TrailPosition" type="Node2D" parent="TrailRotation"] +use_parent_material = true [node name="Trail" parent="TrailRotation/TrailPosition" instance=ExtResource("3_67uhs")] self_modulate = Color(2, 2, 2, 1) +use_parent_material = true width = 2.0 width_curve = SubResource("Curve_eu273") default_color = Color(1, 0.0862745, 0.207843, 1) @@ -148,9 +154,11 @@ MaximumPoints = 64 Frequency = 30 [node name="TrailPosition2" type="Node2D" parent="TrailRotation"] +use_parent_material = true [node name="Trail" parent="TrailRotation/TrailPosition2" instance=ExtResource("3_67uhs")] self_modulate = Color(2, 2, 2, 1) +use_parent_material = true width = 2.0 width_curve = SubResource("Curve_eu273") gradient = SubResource("Gradient_m1y6u") diff --git a/Items/Weapons/Bow.cs b/Items/Weapons/Bow.cs index 5850878..78c906f 100644 --- a/Items/Weapons/Bow.cs +++ b/Items/Weapons/Bow.cs @@ -1,4 +1,5 @@ using Godot; +using SupaLidlGame.Extensions; namespace SupaLidlGame.Items.Weapons; @@ -30,7 +31,11 @@ public partial class Bow : ProjectileSpawner _ignitionArea = GetNode("IgnitionArea"); var onAreaEntered = (Area2D area) => { - GetNode("%Flame").Visible = true; + var flame = GetNode("%Flame"); + flame.Visible = true; + flame.GetNode("Ignite") + .OnWorld() + .PlayOneShot(); _isOnFire = true; }; _ignitionArea.Connect( diff --git a/Items/Weapons/Bow.tscn b/Items/Weapons/Bow.tscn index 707aadf..401809d 100644 --- a/Items/Weapons/Bow.tscn +++ b/Items/Weapons/Bow.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=3 uid="uid://cgg0sfm2qeiwn"] +[gd_scene load_steps=29 format=3 uid="uid://cgg0sfm2qeiwn"] [ext_resource type="Texture2D" uid="uid://dam6aigkw8xs" path="res://Assets/Sprites/Items/bow-and-arrow.png" id="1_1ghvv"] [ext_resource type="Script" path="res://Items/Weapons/Bow.cs" id="1_ikgu2"] @@ -12,6 +12,7 @@ [ext_resource type="Texture2D" uid="uid://coarr28adgo1u" path="res://Assets/Sprites/Particles/point-light.png" id="9_tk6lc"] [ext_resource type="AudioStream" uid="uid://cwy4giq8eod5g" path="res://Assets/Sounds/bow-release.wav" id="9_v051g"] [ext_resource type="Texture2D" uid="uid://dj1vsctgh1scr" path="res://Assets/Sprites/Misc/flame.png" id="9_xwcvy"] +[ext_resource type="AudioStream" uid="uid://braj74by0oowo" path="res://Assets/Sounds/fire-burst-flash.wav" id="11_65ega"] [sub_resource type="AtlasTexture" id="AtlasTexture_5af70"] atlas = ExtResource("9_xwcvy") @@ -370,15 +371,20 @@ hframes = 8 [node name="Flame" type="AnimatedSprite2D" parent="Anchor"] unique_name_in_owner = true visible = false +modulate = Color(3, 3, 3, 1) position = Vector2(15, -8) sprite_frames = SubResource("SpriteFrames_b2khh") autoplay = "default" [node name="PointLight2D" type="PointLight2D" parent="Anchor/Flame"] color = Color(1, 0.8, 0.701961, 1) +energy = 0.5 texture = ExtResource("9_tk6lc") texture_scale = 0.13 +[node name="Ignite" type="AudioStreamPlayer2D" parent="Anchor/Flame"] +stream = ExtResource("11_65ega") + [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { "": SubResource("AnimationLibrary_5vx8d") diff --git a/Scenes/BaseMap.tscn b/Scenes/BaseMap.tscn index 9a3bc17..278f92a 100644 --- a/Scenes/BaseMap.tscn +++ b/Scenes/BaseMap.tscn @@ -10,7 +10,7 @@ physics_layer_1/collision_mask = 0 [sub_resource type="Environment" id="Environment_pxx66"] background_mode = 3 glow_enabled = true -glow_hdr_threshold = 1.4 +glow_hdr_threshold = 1.2 [node name="TileMap" type="Node2D" node_paths=PackedStringArray("Entities", "Areas", "Spawners", "Markers")] process_mode = 1