From 00209475330ca427b0b79e7baf90ad9721ac62dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melvin=20Wei=C3=9F?= Date: Tue, 23 Sep 2025 17:40:50 +0200 Subject: [PATCH] Added item journal --- items/active_items/bow/bow.png | Bin 1150 -> 967 bytes items/active_items/bow/bow.tscn | 4 +- .../horizontal_dash/horizontal_dash.tscn | 4 +- .../horizontal_dash/horizontaldash.png | Bin 6578 -> 1243 bytes items/active_items/updash/updash.png | Bin 6631 -> 1280 bytes items/active_items/updash/updash.tscn | 4 +- items/generic/item.gd | 2 + items/generic/item_pool.tres | 4 +- items/immediate_items/heal_item/heal_item.png | Bin 0 -> 928 bytes .../heal_item/heal_item.png.import | 40 ++++++++++++++++++ .../immediate_items/heal_item/heal_item.tscn | 5 ++- items/immediate_items/healthup/healthup.png | Bin 0 -> 3060 bytes .../healthup/healthup.png.import | 40 ++++++++++++++++++ items/immediate_items/healthup/healthup.tscn | 17 +++----- items/permanent_items/backslash/backslash.png | Bin 1667 -> 1516 bytes .../permanent_items/backslash/backslash.tscn | 4 +- items/permanent_items/extrajump/extrajump.png | Bin 5195 -> 1062 bytes .../permanent_items/extrajump/extrajump.tscn | 4 +- items/permanent_items/high_jump/high_jump.png | Bin 705 -> 868 bytes .../permanent_items/high_jump/high_jump.tscn | 2 + items/permanent_items/upslash/upslash.png | Bin 0 -> 2508 bytes .../upslash/upslash.png.import | 40 ++++++++++++++++++ items/permanent_items/upslash/upslash.tscn | 20 +++------ main.tscn | 6 ++- player/Heart_cut.png | Bin 4541 -> 886 bytes project.godot | 9 ++++ ui/journal/journal.gd | 19 +++++++++ ui/journal/journal.gd.uid | 1 + ui/journal/journal.tscn | 21 +++++++++ 29 files changed, 213 insertions(+), 33 deletions(-) create mode 100644 items/immediate_items/heal_item/heal_item.png create mode 100644 items/immediate_items/heal_item/heal_item.png.import create mode 100644 items/immediate_items/healthup/healthup.png create mode 100644 items/immediate_items/healthup/healthup.png.import create mode 100644 items/permanent_items/upslash/upslash.png create mode 100644 items/permanent_items/upslash/upslash.png.import create mode 100644 ui/journal/journal.gd create mode 100644 ui/journal/journal.gd.uid create mode 100644 ui/journal/journal.tscn diff --git a/items/active_items/bow/bow.png b/items/active_items/bow/bow.png index d2a3c1a15f91ebe2aa45988afc1e221dd07ea548..5d92e73fbf8e3799685485d083513fe7c58b6bd9 100644 GIT binary patch literal 967 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz}TGW>>S|f?5q$_l%JNFlghxL zaenGVOAls8iB@~zqs&JSi71Ihub3((*Rj-1kweg_N1*@E-QLc|H&SKFX49H-4;)(j zQ7dQ7)~y>vSq?HEiQ5pgMKJRJO%6^c7WTHE6~^xkKeI8hTV5{8c0ag@+s{Vm+N90J zQGbnlw_J3P|GVquv*Sq{HA0Uc*EP-B`!YE4PyUuA(_)0POdbXrzZYo{Z*9NMRe99< zkYaJ9Kj(a|?^Z>Q5383-tJVe1`DnSo$k|WHPESVYnvrNu$cCM7A`Uqpiq$+l?T^Ez zBbrBFcdfm%>SwY4*F(=#tJ9)h8d-N5oD?xM;R!oAX|Y0W>PFYX&eL@}y7nLbe*8#k zhjzDSA7|Kx3$^yI`0L7FFJou-@;sZkqWaUG?RhKiH?3dvyjHI2-gQA1`G<$}euwiV zJc<316#4pA`!!yR-8$LF%;w}f{dSHkFNxRtvY3HEPYHw>S3SBr2`DI0;u=vBoS#-wo>-L1 z5RjOeSEA?V8lqsTXQ*c)bbnbhP>m!=jdOl(Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk> zpEyv_s?-S2G*3@01`Z&Hl|hP;m4Ok+@&aOMC>xZRG#Ht|;!HrcAtMum0FaIX;>>my zuy_`b4FdNkvoO2>ra2gm<}wDL)C6`07NAN4BV&WMNlXkvK=u?MW?TTV0qAisz;G}_ z(MfgLKfUQ5KoMv9@2 zg6v7LYL-LHS$F+4bPh~UW8weMYIu;z<V(CN#+9f>3j`*AA8gz8hD#EE>5UsP`#z3li>Gf!yzSu_(gwz%=+7~{ylry zJ@$?tuf3vKE(k^Km*24Q^zMcqlG*ckj@a{DtvvAc#1|pg_7g0>4(&L{{Oi)1b1YFC ekI6OaFe%A*vuN*>dv@v!$hV%ZelF{r5}E+6d}`tV delta 1129 zcmX@k{*R-+Gr-TCmrII^fq{Y7)59eQNH>5m2OE$)Y?pW%NU@|l`Z_W&Z0zU$lgP@z zz}S-M>>S|f?5t2wl%JNFlghxLF|l@{t;b;pnWOQ+OGCBz-YPtru+Zw}LH;8f!xnOg zI<391s`=#7_zO!EJqrs(Vz~M0bi!m~=9HG!7l^VPrZ@ehT!9ah4%OE zR^Qpn+~U@n8Rjo@q2#uYx^R-&b}hEJi|qzY9f?k9(+t%;H7okoSO54?CH^?_-t&Jl z%vtx68vIrIj1O<=H19|^%WeK_SJ*N&W$KSP6?c|!3)vUN7XIul-guPhe9w%TUu+6n zB6P|&)?YfhCME00{?TF@6npjtTna%{|*Jj#YaA~IxDEMu|w5EVBvx` zBdrZ9*Bg}t=`6{#fA~;7@26^!<`b>viOGzi855%GKG^@byEb&jtdhx2oD04mEwpoM zJfL@BjrFY24jXj3=3ET?rsH&a29w(7BevDDT6R$#Zvn+pdfpRr>`sfOHN@< z27NK*8XJbmLQHD)Om3bojv*Dd-rn8o%j_t?79c%QSkO_N3$x^It#wU1ulC!05nWz*XtPb@I0t{yu4p)6z zSY429+{m?nRe@m!V^-`B326;xPt%$%y=KyC5NlvaU|Vp;C*apD zM^OiE2Zk46KdM=te*3@pEvrxIi)x;gV2dReOp{!&b)J2xnn&+k!4L*r2F3-^-gY39F4A-u?R3yuWVMhp+#%K!JGSw3S2E zoVjxC{;Kk%e{rpPAK1lPjF^4iK1{xP?{g?9h#y?%4|cd2 VE_~^!Cor)wc)I$ztaD0e0sw1A(|G^@ diff --git a/items/active_items/bow/bow.tscn b/items/active_items/bow/bow.tscn index c96c7b5..9bfa446 100644 --- a/items/active_items/bow/bow.tscn +++ b/items/active_items/bow/bow.tscn @@ -17,6 +17,8 @@ collision_mask = 4 script = ExtResource("1_xppub") arrow_scene = ExtResource("2_0id2q") sprite = ExtResource("3_vkelq") +icon = ExtResource("3_vkelq") +item_name = "Bow" [node name="EarthAligner" parent="." instance=ExtResource("4_0id2q")] @@ -32,7 +34,7 @@ scale = Vector2(1.5, 1.5) texture = ExtResource("5_o1smo") [node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(0.7, 0.7) +scale = Vector2(1.4, 1.4) texture = ExtResource("3_vkelq") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] diff --git a/items/active_items/horizontal_dash/horizontal_dash.tscn b/items/active_items/horizontal_dash/horizontal_dash.tscn index 5621d47..9f9c5e3 100644 --- a/items/active_items/horizontal_dash/horizontal_dash.tscn +++ b/items/active_items/horizontal_dash/horizontal_dash.tscn @@ -14,6 +14,8 @@ radius = 12.6667 scale = Vector2(1.4, 1.4) script = ExtResource("1_ktd5x") sprite = ExtResource("3_ktd5x") +icon = ExtResource("3_ktd5x") +item_name = "Dash" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] visible = false @@ -37,7 +39,7 @@ texture = ExtResource("3_vqrqe") [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(4.9999995, 12.999999) -scale = Vector2(0.8, 0.8) +scale = Vector2(1.6, 1.6) texture = ExtResource("3_ktd5x") [node name="EarthAligner" parent="." instance=ExtResource("4_gtuhj")] diff --git a/items/active_items/horizontal_dash/horizontaldash.png b/items/active_items/horizontal_dash/horizontaldash.png index 2edcb77a026b2b96c2cf6e8429c0aa8b290d4a09..e5cd9a88a0c0dba52f51b8771c8d72ddd9189383 100644 GIT binary patch literal 1243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~I~Cb`J1#c2)=|%1_J8No8Qr zI6rlwr3bU4MC*Q+qs<+ynl3uq0#+{x6!h+G;^0!$QptMw?wE>G8SidEY43w!8$M+0 z;gZhI)y-jb{J^kLe2qx1%e8v5Mi#{;=EF66W`3Vh$$aqep3I$J4=3DoRX3EoJZYun z+K;VihqhdBbTPks$iv3Y^X$h;cZapx1E(JS@0MM4(o}H)C;x2LUTcajZ_@wC&zn8h!pH&vGivv>I=FU8_q97vTblAqgqiN?hwy?MCzC2C$=fRZD z%U#z+qko2OuJQkR=)xph>$N2_V|$DbiWHjgghi_PPh7EPn}#0e&Hk$&%76Xav4f{j zH@PdhM^vZee*drL`*(NE{I@SCNP~^{{Jih?n0s%3*!#3H-hJNpTAot>g3Rzg+U*8k z6n}-ezP4-F#%r;ERmL&Cm>j3$$&TeE@vA0Fo=JJ|He{bB>s#{+M)9xK?m2(b_KZjP zdvCQDTR;hfRVyk;1OBOz`!jG!i)^F=12eq zB}!Z)N`mv#O3D+9QW*jgGxJLH{9Hp6O!W-)OoZ+)YX++6NsaJK^YqkW-~e)18Kf9l z85n^qFCdnNvO&?W!N?32X9BVf8JQRafOHfPXSTC|#j}8H5b%^_WO%`hpwTR40P3H> z&cFgxX<%e*z_i_>>%?vhkcD3@%%>i1-#)$W_}jk&mUS#r0W2aGEE+;W-`4HgCU;YFTg0w(4&QIJC*RC| z_wr@rx4rA+s#*k`I22<)zW(xle@VpVs$a{3PxoY+-FwI7N$L06m;2=r+<+8eoOg@`Gp6f3>b*|0j`bR$f&xz$frj-BV00x<~$^mQc z4bN(WT8@8F^gEZG%~Z7i-+BGV>01{kgG^tfqQIzp)z0&I_6}X2hD@`%T=%UE28>fD zy>)w1^KM@}H&8JBN9@9|=ZwM$Q9bK98-URwvis58?|hG|)}Cu#>F@Ad<@w@W0m?oM fiomE|HYM)8{p0JdQ>v3?et{FFtDnm{r-UW|qmBqD literal 6578 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 nsDj-;?`?)614U~=x2REsh7q!)$>H~ zn>k^BeRO@d7&vUt+ja9{MoH7A$B(BqMCDh7iv5@7?Nq(q(x4_|w%O0GBCw*sbb9C> zWf`OCUt2z`Ea+Dj7ugrSEAWB%QO)_yTEwuATkny|&6#_XV#`e!ge5u!?)1neF?}7e4RnTkuFw@696n zVg~2;i}J;`_SI&@v~NDWC@tskPqr;~DW&e;mvYTKm?9MC|73RB!k<#Fo^kK}`=+>t z{qm)&M?~Mea}4*|Bz|ho?qyrH+n@jOSMVnrLs!v#rlY^rfw96_;1OBOz`!jG!i)^F z=12eqB}!Z)N`mv#O3D+9QW*jgGxJLH{9Hp6O!W-)OoZ+)YX++6NsaJK^YqkW-~e)1 z8Kf9l85n^qFCdnNvO)2$!N?32X9BVf8JQRafOHfPXSTC|#j}8H5b%^_WO%`hpwTR4 z0P3H>&cFgxX<%e*z_i_>>%?vhkcD3@%%>i1-l$!&*}b=Ww!h7e8&a3o9DT%lAWA2A&CLzJ{{DQI_AT9U5BCPKZgYn0 zvJL0AUwyy2f+?bV=?}IO_t?*`)610oP*Cmu^!q!pmFtKlkVFf3ZI`^#x}} z=M!FrbM+4n9<6WhXIyi#QN-rsak+V4bPRsi{O#DaYvVoFyZ7(SboT94Z!ndf(85?B zb8PZFQ9i%E%&-QP1qniv>=pxMEFajImi=GqZhYw0qkwxn7mYhETQMHs@Gq!s^WuHX znQ*r4tDis`}$AXGLPX}=f*i#PrS&#I{o#b8L|8u{-dNv2p2?B-pikvts^Xrnt{GGE<1!UAlAwjPOi)$r&clBl4Fs^Ydxj%gx-`U$? z@mKlUUq$ZEUu%#&`2lAFZ_-!8)lZ%8M{{=Ujo&cOy*~dTXTsbWyL9DdHwcvezkW#g zz^vY7LKj4isxR2e=5Tzqd-M;91G8i$xm)hk#(ywu*c#E5&v3lZYuV+WOzy2-e$6}* P{ousw>gTe~DWM4fqJtS? literal 6631 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 qD4aMR^lok|5Am(r#7#H00<3vB1UA!=c void: if(is_instance_valid(player) and overlaps_body(player)): diff --git a/items/generic/item_pool.tres b/items/generic/item_pool.tres index 5035d1b..f902935 100644 --- a/items/generic/item_pool.tres +++ b/items/generic/item_pool.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" load_steps=11 format=3 uid="uid://m6yj45qvoecs"] +[gd_resource type="Resource" script_class="ItemPool" load_steps=11 format=3 uid="uid://m6yj45qvoecs"] [ext_resource type="PackedScene" uid="uid://b00185vygcka1" path="res://items/immediate_items/heal_item/heal_item.tscn" id="1_2l6sh"] [ext_resource type="PackedScene" uid="uid://wc7kgtomy6xm" path="res://items/permanent_items/extrajump/extrajump.tscn" id="2_rli0f"] @@ -14,5 +14,5 @@ [resource] script = ExtResource("6_rli0f") common = Array[PackedScene]([ExtResource("1_2l6sh")]) -rare = Array[PackedScene]([ExtResource("2_rli0f"), ExtResource("3_g002j"), ExtResource("4_vpswe"), ExtResource("5_jwi73")]) +rare = Array[PackedScene]([ExtResource("3_g002j"), ExtResource("2_rli0f"), ExtResource("4_vpswe"), ExtResource("5_jwi73")]) unique = Array[PackedScene]([ExtResource("6_73uum"), ExtResource("7_k6eth"), ExtResource("8_8cxou"), ExtResource("9_esvgx")]) diff --git a/items/immediate_items/heal_item/heal_item.png b/items/immediate_items/heal_item/heal_item.png new file mode 100644 index 0000000000000000000000000000000000000000..ae880e070c8f06ad4d5fe072a49febc4bbc955f0 GIT binary patch literal 928 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz}S@O>>S|f?5q$_l%JNFlghxL zaenGVZw;3~nPc^7Cl*gk5u0>0HsL5+r>wJY*DSWw4F&J#vYURN^-lI?gjRIw!;K%K zZbWR}x*^o7a>|>jq8lf!`@hrJbh6abD=+{2I`?zmxu1M2e4Cd&4dZW4eLlCsWYJl* zXIpNGzsg+J>DN|r`E2izB;gR5`Q;%izix9+{kZ?)44<89A(@8`r=2^=t)&+pFBpn$>AuFO6<@8l6)yG~o%0RP&xE7nvIv^JtU&$_M$M{~8ub zK8iXfa$G_?;>AAsuk8DGmtL;j+qxuxC2OAT`@O3_7_ z4Sp#83iEtz(XfoyV!u}AF}|1_r`O4T5LirU&8J@eFUnx8@Jon^`z*BRFub7=GV{r_*?lC^T)uVoByNP-UB0rC%`AfHA6>dg}Hf?mKIPT zBkjK*kYXtb@(cd||38C+*2*tHK4*bPWHAE+w=f7ZGR&GI0Th%dag8Vm&QB{TPb^Ah z2uRG#E79|F4N)-FGt@H?y1%R$sHP`1!ZXd&Q;UHE$YEuWVq|4t1hTwUVR0t?i_o0e&jen)P*w1r6`2v3pmWf;IjX^>aTU{{)0+(5rU&JRh%!`adoOrh zz>#FIL!qqvjp$a^=&KiYs~_CvWAx})1e1`9>C^gy7nIxE0s|d>Ep{-je4)@$ZP>2x zfV*!ti{Rak&VnSBMs24L4fd8X@qaoM-q!!=DCf?(?VIpMwB)%^PS=@-C1N|2p17La zn&;xj-8gajq8z*R`*#jhYIN%+w?LKpyvW L^>bP0l+XkK9P4Fk literal 0 HcmV?d00001 diff --git a/items/immediate_items/heal_item/heal_item.png.import b/items/immediate_items/heal_item/heal_item.png.import new file mode 100644 index 0000000..16bc66f --- /dev/null +++ b/items/immediate_items/heal_item/heal_item.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dog2yksitfgu1" +path="res://.godot/imported/heal_item.png-fd96dcbc8e00ec13b19c3e58ef0188e6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://items/immediate_items/heal_item/heal_item.png" +dest_files=["res://.godot/imported/heal_item.png-fd96dcbc8e00ec13b19c3e58ef0188e6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/items/immediate_items/heal_item/heal_item.tscn b/items/immediate_items/heal_item/heal_item.tscn index b8d04db..b5edbd1 100644 --- a/items/immediate_items/heal_item/heal_item.tscn +++ b/items/immediate_items/heal_item/heal_item.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=7 format=3 uid="uid://b00185vygcka1"] +[gd_scene load_steps=8 format=3 uid="uid://b00185vygcka1"] [ext_resource type="Script" uid="uid://b43fudwi47qfd" path="res://items/immediate_items/heal_item/heal_item.gd" id="1_3vbv8"] +[ext_resource type="Texture2D" uid="uid://dog2yksitfgu1" path="res://items/immediate_items/heal_item/heal_item.png" id="2_bqles"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_evqwq"] [ext_resource type="Texture2D" uid="uid://djfc7sdc8wxp6" path="res://player/Heart_cut.png" id="3_fvuym"] [ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_sr4am"] @@ -10,6 +11,8 @@ [node name="HealItem" type="Area2D"] script = ExtResource("1_3vbv8") +icon = ExtResource("2_bqles") +item_name = "HP +1" [node name="EarthAligner" parent="." instance=ExtResource("2_evqwq")] diff --git a/items/immediate_items/healthup/healthup.png b/items/immediate_items/healthup/healthup.png new file mode 100644 index 0000000000000000000000000000000000000000..49b2f9f8bc6f524573f379d9c9b6d2cbdfbb25ba GIT binary patch literal 3060 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 literal 1667 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 literal 0 HcmV?d00001 diff --git a/items/permanent_items/upslash/upslash.png.import b/items/permanent_items/upslash/upslash.png.import new file mode 100644 index 0000000..590f1b3 --- /dev/null +++ b/items/permanent_items/upslash/upslash.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bhsmtgdpbxq46" +path="res://.godot/imported/upslash.png-284818e0c0e6551e342cba63442fd5f7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://items/permanent_items/upslash/upslash.png" +dest_files=["res://.godot/imported/upslash.png-284818e0c0e6551e342cba63442fd5f7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/items/permanent_items/upslash/upslash.tscn b/items/permanent_items/upslash/upslash.tscn index 5a7fe35..d3e8f16 100644 --- a/items/permanent_items/upslash/upslash.tscn +++ b/items/permanent_items/upslash/upslash.tscn @@ -1,16 +1,17 @@ -[gd_scene load_steps=8 format=3 uid="uid://bwtdls58ajair"] +[gd_scene load_steps=7 format=3 uid="uid://bwtdls58ajair"] [ext_resource type="Script" uid="uid://cyql6o6m4xrv3" path="res://items/permanent_items/upslash/upslash.gd" id="1_vv4qh"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_ayb0v"] +[ext_resource type="Texture2D" uid="uid://bhsmtgdpbxq46" path="res://items/permanent_items/upslash/upslash.png" id="4_4ynxq"] [ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_35mg8"] -[ext_resource type="Texture2D" uid="uid://c7mrm8uel7r36" path="res://items/permanent_items/backslash/backslash.png" id="5_f1n28"] -[ext_resource type="Texture2D" uid="uid://dxcfkdhl4g24c" path="res://items/active_items/updash/updash.png" id="6_4gfq4"] [ext_resource type="AudioStream" uid="uid://pdd0sy3p4y0d" path="res://sounds/750240__universfield__coin-drop.mp3" id="6_5tj4p"] [sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"] [node name="Upslash" type="Area2D"] script = ExtResource("1_vv4qh") +icon = ExtResource("4_4ynxq") +item_name = "Upward Slash" [node name="EarthAligner" parent="." instance=ExtResource("3_ayb0v")] @@ -24,17 +25,10 @@ modulate = Color(0.725757, 0.519822, 5.77569e-07, 1) scale = Vector2(2.5, 2.5) texture = ExtResource("4_35mg8") -[node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2(0, -13) -rotation = 0.7853982 -scale = Vector2(1.2, 1.2) -texture = ExtResource("5_f1n28") - [node name="Sprite2D3" type="Sprite2D" parent="."] -z_index = -1 -position = Vector2(2, -18) -scale = Vector2(1.4, 1.4) -texture = ExtResource("6_4gfq4") +position = Vector2(0, -18) +scale = Vector2(2.8, 2.8) +texture = ExtResource("4_4ynxq") [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("6_5tj4p") diff --git a/main.tscn b/main.tscn index c26f383..b93192a 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=3 uid="uid://cxo6bq26huau7"] +[gd_scene load_steps=15 format=3 uid="uid://cxo6bq26huau7"] [ext_resource type="PackedScene" uid="uid://cmaovvr15b3qk" path="res://player/player.tscn" id="2_1bvp3"] [ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="3_kek77"] @@ -12,6 +12,7 @@ [ext_resource type="Script" uid="uid://3k6r3jnko4hg" path="res://utils/show_fps.gd" id="8_5vw27"] [ext_resource type="PackedScene" uid="uid://ca5ndobertnp4" path="res://water/water.tscn" id="10_4c57u"] [ext_resource type="Script" uid="uid://cpaskpj67pnaj" path="res://enemies/boss/boss_spawner.gd" id="10_efxa6"] +[ext_resource type="PackedScene" uid="uid://cqn67nwyrtq3k" path="res://ui/journal/journal.tscn" id="10_w48qg"] [ext_resource type="PackedScene" uid="uid://cpe4s6vsn0ujd" path="res://enemies/boss/boss.tscn" id="11_efxa6"] [node name="main" type="Node2D"] @@ -68,6 +69,9 @@ offset_bottom = 23.0 grow_horizontal = 0 script = ExtResource("8_5vw27") +[node name="Journal" parent="UIOverlay" instance=ExtResource("10_w48qg")] +visible = false + [node name="Water" parent="." instance=ExtResource("10_4c57u")] unique_name_in_owner = true z_index = 15 diff --git a/player/Heart_cut.png b/player/Heart_cut.png index 3da92459c688d12ce3e95a0765e8c596bdc33276..fa3ca6d3e9985eeaa80c94e6f2fe6996dba31f17 100644 GIT binary patch literal 886 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=3?wxlRx~p(Fg9g6I|q0=J1Ybf<)>xlq%tsQ zoS!<;Tf-$#=2(5&iNzCB#3mh$O*qQdDeLUpHH$5EL&5vG?55vmy_3Bep%tC_aO20Q z8xfngZV2_NobqO>=*Efb{_iw4ohjNamr#Y3ELI>vQq1d0O06 z-g@}iqwk`=^$(m>Tey?!W_J`G{Kkw_adH-9Y$-f|T`XB9f zgCB~&!aQGFG%Vw_*sqm&j4vj~>2&cFgxX<%e*z_~auD?cIMXC~85NcjdhxE{Cun$a$~ry#n9-YMG6W|IvhIRd0fgrE@wOs$H#+1(^Nk`I%G1X@4J z&ecpHS<|nO+3*ZKGIUG)aHeQ_!?jrV@<_mro#N<_h+tuvUwM;VZg6s~P zkxr)|Cd*Dil$$nkIPM#k)i-%f(2V{kL7`rM@e&7S^;L#2&$;%NBE2k#c$$mWHf~DH z#=P~#rIPnc=0lozA1M8mzz?)oVirf1Klk;lu^CApj%&&l*>J&H(x*7)q@*c1>|{@>R!|RGhzm{@(A>ihkPrpx~md%wOOiB__*LemK9#Q1$hNgpit#kMRcbA3nh1_MYMIhm^TFOB0qfEicjkF~~psMxpDw z!usv`8@MMDHg~O!^$8|hXAbx^o~nDi@1>2&P$1JNZI1KqZu1G2TzndxS$1K1=MLY> zzWt5Ke#U6+pX+MB9o35P%vx@pjCYjrE-gv}zr zNt=NZxGi?jg&a;)jN6VATPOxHP$t@{;6FOm$cJcB!GB$%6YA_L%1p;+JE)ZGRjEYw z7D7hyW1_iHZaE;ZPz(;aE$LRL+^yhyc;(=kH6wh;17Wr(_-l1ZkjmzuAWVP>gs{d< zXNvgITqw#x8s*9AlwCvLE1FbX~&_@UwaEOwo4gx=~LQUU0JxN$pz3WSKof{cxD zGMY?4GL+CSMmST!nnjW+r!B)lP?}82%7l%jAc>K9dxj(3Qw~WWR61n=P$w7_9XDj0 zR+lsq!AfAFEp|^75PKYwp^c+rjmwSoc*+@@2nZkH9fuyS-2(($)<3s3VoOP$>+~s)Ds70=FP&i|Aq}puh3O<_>#72&|bznJ>ID@Nkh61EQkwh+( z$edCr#(vv zf;@{tjuV3=IPpwsP+`C|=pxLx)kJ~aW2jw+?es6Sf`q_il-NMRn2c=&u?UBy5s?Pi zfEy*G7{hQ0X7s2q!tS&g85i!LlqR4f&pJ@{10gTyXK-{1WY+hh5L`F8lAtFKn~QtyOj)qA;G=&KZtub_Uevp=!qhos2D~nQetwN{pKi&y7oju4 z?nMs_v?``#z0Dgp?8)t2+}}2faE07lVcc=mTF^G@?83IR z>Qj#Lz+2Ol>J?KKT%C>H{+G#Qn%$;}&AvO0pIrD;@f~C3wG?6V_D{v7eSO|Fdh?!m zMa}ifz{2x4)*G^>s%uHZJ`OK@-s`QZRzu&E_Sv0_)Ar}vfX*DPW|g|~waq#I1+FTN AqyPW_ diff --git a/project.godot b/project.godot index 196a2a2..1440eaf 100644 --- a/project.godot +++ b/project.godot @@ -74,6 +74,11 @@ up={ , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) ] } +journal={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":74,"key_label":0,"unicode":106,"location":0,"echo":false,"script":null) +] +} [layer_names] @@ -82,3 +87,7 @@ up={ 2d_physics/layer_4="SolidGround" 2d_physics/layer_5="EnemyHurtBoxNonTrap" 2d_physics/layer_6="TrulySolidGround" + +[rendering] + +textures/canvas_textures/default_texture_filter=0 diff --git a/ui/journal/journal.gd b/ui/journal/journal.gd new file mode 100644 index 0000000..cc164c3 --- /dev/null +++ b/ui/journal/journal.gd @@ -0,0 +1,19 @@ +extends Control + +@onready var item_list : ItemList = $ItemList + +func _ready() -> void: + await get_tree().create_timer(0.3).timeout + for item_scene in ItemSpawn.item_pool.common: + add_item_to_journal(item_scene.instantiate()) + for item_scene in ItemSpawn.item_pool.rare: + add_item_to_journal(item_scene.instantiate()) + for item_scene in ItemSpawn.item_pool.unique: + add_item_to_journal(item_scene.instantiate()) + +func _process(_delta: float) -> void: + if Input.is_action_just_pressed("journal"): + visible = not visible + +func add_item_to_journal(item: Item): + item_list.add_item(item.item_name, item.icon) diff --git a/ui/journal/journal.gd.uid b/ui/journal/journal.gd.uid new file mode 100644 index 0000000..ab79a61 --- /dev/null +++ b/ui/journal/journal.gd.uid @@ -0,0 +1 @@ +uid://bb8ojv1mwuyy5 diff --git a/ui/journal/journal.tscn b/ui/journal/journal.tscn new file mode 100644 index 0000000..859755e --- /dev/null +++ b/ui/journal/journal.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=2 format=3 uid="uid://cqn67nwyrtq3k"] + +[ext_resource type="Script" uid="uid://bb8ojv1mwuyy5" path="res://ui/journal/journal.gd" id="1_q8app"] + +[node name="Journal" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("1_q8app") + +[node name="ItemList" type="ItemList" parent="."] +layout_mode = 0 +offset_left = 610.0 +offset_top = 70.0 +offset_right = 1310.0 +offset_bottom = 970.0 +max_text_lines = 2 +item_count = 1