From 798e64e284dd543dc3114aca646cc0fe525b9923 Mon Sep 17 00:00:00 2001 From: Florian Date: Thu, 18 Sep 2025 17:47:49 +0200 Subject: [PATCH] Included Graphics --- background/background.gd | 5 ++ background/background.gd.uid | 1 + background/background.tscn | 49 ++++++++++++++++++ enemies/ghost animation/Ghost 0.png | Bin 0 -> 1835 bytes enemies/ghost animation/Ghost 0.png.import | 40 ++++++++++++++ enemies/ghost animation/Ghost 1.png | Bin 1657 -> 1962 bytes enemies/ghost animation/Ghost 2.png | Bin 1713 -> 1903 bytes enemies/ghost.tscn | 18 ++----- main.tscn | 33 ++++++++---- main_menu/main_menu.tscn | 14 ++++- .../attack_animation/Attack Animation 0.png | Bin 0 -> 1469 bytes .../Attack Animation 0.png.import | 40 ++++++++++++++ .../attack_animation/Attack Animation 1.png | Bin 0 -> 1397 bytes .../Attack Animation 1.png.import | 40 ++++++++++++++ .../attack_animation/Attack Animation 2.png | Bin 0 -> 1264 bytes .../Attack Animation 2.png.import | 40 ++++++++++++++ .../attack_animation/Attack Animation 3.png | Bin 0 -> 1260 bytes .../Attack Animation 3.png.import | 40 ++++++++++++++ player/double_jump/Double Jump 0.png | Bin 0 -> 535 bytes player/double_jump/Double Jump 0.png.import | 40 ++++++++++++++ player/double_jump/Double Jump 1.png | Bin 0 -> 581 bytes player/double_jump/Double Jump 1.png.import | 40 ++++++++++++++ player/double_jump/Double Jump 2.png | Bin 0 -> 545 bytes player/double_jump/Double Jump 2.png.import | 40 ++++++++++++++ player/double_jump/Double Jump 3.png | Bin 0 -> 455 bytes player/double_jump/Double Jump 3.png.import | 40 ++++++++++++++ player/double_jump/Double Jump 4.png | Bin 0 -> 330 bytes player/double_jump/Double Jump 4.png.import | 40 ++++++++++++++ player/double_jump/double_jump_animation.gd | 7 +++ .../double_jump/double_jump_animation.gd.uid | 1 + player/double_jump/double_jump_animation.tscn | 38 ++++++++++++++ player/player.gd | 10 ++++ player/player.tscn | 4 +- traps/Morning Star.png | Bin 0 -> 1482 bytes traps/Morning Star.png.import | 40 ++++++++++++++ traps/morning_star.tscn | 13 ++--- water/water.gd | 10 ++-- .../Background prototype.png | Bin .../Background prototype.png.import | 6 +-- 39 files changed, 609 insertions(+), 40 deletions(-) create mode 100644 background/background.gd create mode 100644 background/background.gd.uid create mode 100644 background/background.tscn create mode 100644 enemies/ghost animation/Ghost 0.png create mode 100644 enemies/ghost animation/Ghost 0.png.import create mode 100644 player/attack_animation/Attack Animation 0.png create mode 100644 player/attack_animation/Attack Animation 0.png.import create mode 100644 player/attack_animation/Attack Animation 1.png create mode 100644 player/attack_animation/Attack Animation 1.png.import create mode 100644 player/attack_animation/Attack Animation 2.png create mode 100644 player/attack_animation/Attack Animation 2.png.import create mode 100644 player/attack_animation/Attack Animation 3.png create mode 100644 player/attack_animation/Attack Animation 3.png.import create mode 100644 player/double_jump/Double Jump 0.png create mode 100644 player/double_jump/Double Jump 0.png.import create mode 100644 player/double_jump/Double Jump 1.png create mode 100644 player/double_jump/Double Jump 1.png.import create mode 100644 player/double_jump/Double Jump 2.png create mode 100644 player/double_jump/Double Jump 2.png.import create mode 100644 player/double_jump/Double Jump 3.png create mode 100644 player/double_jump/Double Jump 3.png.import create mode 100644 player/double_jump/Double Jump 4.png create mode 100644 player/double_jump/Double Jump 4.png.import create mode 100644 player/double_jump/double_jump_animation.gd create mode 100644 player/double_jump/double_jump_animation.gd.uid create mode 100644 player/double_jump/double_jump_animation.tscn create mode 100644 traps/Morning Star.png create mode 100644 traps/Morning Star.png.import rename world/{ => Background Prototype}/Background prototype.png (100%) rename world/{ => Background Prototype}/Background prototype.png.import (73%) diff --git a/background/background.gd b/background/background.gd new file mode 100644 index 0000000..d4ec954 --- /dev/null +++ b/background/background.gd @@ -0,0 +1,5 @@ +extends Node2D + +#func _process(delta: float) -> void: + #for p : Parallax2D in get_children(): + #p.scroll_offset += Vector2.RIGHT * 100 * delta * p.scroll_scale diff --git a/background/background.gd.uid b/background/background.gd.uid new file mode 100644 index 0000000..fb6f298 --- /dev/null +++ b/background/background.gd.uid @@ -0,0 +1 @@ +uid://c6q1tgl7kag67 diff --git a/background/background.tscn b/background/background.tscn new file mode 100644 index 0000000..803f028 --- /dev/null +++ b/background/background.tscn @@ -0,0 +1,49 @@ +[gd_scene load_steps=6 format=3 uid="uid://bcph46qvs6s1"] + +[ext_resource type="Script" uid="uid://c6q1tgl7kag67" path="res://background/background.gd" id="1_gsnt7"] +[ext_resource type="Texture2D" uid="uid://bk0lxjv2qjxnp" path="res://world/Background Prototype/Background Prototype Layer 1.png" id="1_qjy44"] +[ext_resource type="Texture2D" uid="uid://b3d276mpm5mqr" path="res://world/Background Prototype/Background Prototype Layer 4.png" id="2_eva80"] +[ext_resource type="Texture2D" uid="uid://b6fkgig57ki5j" path="res://world/Background Prototype/Background Prototype Layer 2.png" id="2_gsnt7"] +[ext_resource type="Texture2D" uid="uid://tctuwr3rmof4" path="res://world/Background Prototype/Background Prototype Layer 3.png" id="3_3phoi"] + +[node name="Background" type="Node2D"] +script = ExtResource("1_gsnt7") + +[node name="Parallax2D" type="Parallax2D" parent="."] +scroll_scale = Vector2(0.1, 0.1) +repeat_size = Vector2(1920, 1080) +repeat_times = 2 + +[node name="Sprite2D" type="Sprite2D" parent="Parallax2D"] +position = Vector2(960, 540) +scale = Vector2(2, 2) +texture = ExtResource("1_qjy44") + +[node name="Parallax2D2" type="Parallax2D" parent="."] +scroll_scale = Vector2(0.4, 0.4) +repeat_size = Vector2(1920, 1080) +repeat_times = 2 + +[node name="Sprite2D" type="Sprite2D" parent="Parallax2D2"] +position = Vector2(960, 540) +scale = Vector2(2, 2) +texture = ExtResource("2_gsnt7") + +[node name="Parallax2D3" type="Parallax2D" parent="."] +scroll_scale = Vector2(0.7, 0.7) +repeat_size = Vector2(1920, 1080) +repeat_times = 2 + +[node name="Sprite2D" type="Sprite2D" parent="Parallax2D3"] +position = Vector2(960, 540) +scale = Vector2(2, 2) +texture = ExtResource("3_3phoi") + +[node name="Parallax2D4" type="Parallax2D" parent="."] +repeat_size = Vector2(1920, 1080) +repeat_times = 2 + +[node name="Sprite2D" type="Sprite2D" parent="Parallax2D4"] +position = Vector2(960, 540) +scale = Vector2(2, 2) +texture = ExtResource("2_eva80") diff --git a/enemies/ghost animation/Ghost 0.png b/enemies/ghost animation/Ghost 0.png new file mode 100644 index 0000000000000000000000000000000000000000..31852843d8e3b346cf5e0bcef78fcaeca97127c4 GIT binary patch literal 1835 zcmY+F2~-ot7CQKLZ^%h~%aLeKF&9ZH}8NeaRT4z7KSjZ5q=dBeNh}Q=EBVwhZ?itzZmi4<7 z18eAUfsQf6A`JGIbJI_Md6JgNOOnem2jUZzV@necyF+8=a#-4P4Xfr=g;1Ie*RXwz z)`IYkgWBfvGog3GdD6rk2dbbK!;wTxB?vqc+S?)X41@o1chBHi0%R_nN53ENK!9N6 zIh1n?pxx~Wju;l|rV;K4DJb3qo?EDlyF&1RqAB5XRdq*)UB*H?c2w%!JPLBsd1vSZ>f`f>wWj zx*DLZ@Xhu~if9`~SQEn!r%x}MGH8vR-fd4rX47uUHuCp=Lz#mLSv_>Y`Kk}LegKqs zsTH#$d-bXF`8y9D9W8+oD5GAH_V4CRDceHR%WM=KW@nvNrpE%Y+@z%;{=_qq&r}?3 zqR8ASFM+c)2;u};e{Pl&K(Rbkf}ofMKv#(BYMv+<;%OjPeFi)1M-j(kn=_0%NoYT} z)z5oE;vZ~n(0(C&Q7TVC}@H8~Ceg$&|8?0LnN=$|?^N@mY-9uwp zNF3_Be4!aZYoTe$jYMs-qt5S~wWufi9}0uN5DH4=O=P`YLe;1P%_jU|15<4f`j)qk zyl@(VoAe$z0|{^Wx$^ePfVbrQ9`&;b2Dh05ouR*ezSiUjkD_{pylZ_wK~^hY|CdZA z%?}Jw#caK&$`CB;3x41R-*In#50OCemEN{Myzlst&!3hFafX0j+vudO4dk#jl?nP% zUN||vh%)~zV!M<{;SwKRobcfrnLA6f*JP%Q#c^bXb(p`NAht>bYEa+<$Ld(525qjD zD()hJT=JLWHP-90#IlMAxclB(*&cVH1 zwh(uqaYO~#m^VC9Vr!LX%BVZ0`zvO7!Ug>?PZ$D4e81EF{VM6t3G!yfy5Z&+qnuH7 z&74J6BigLD2I|l*X&_WXqbB1D1rq&}mzRGCVS}`P%{YaW1OI#nekuN-1hGGR`aF;1t*H9|EANIxCPQIPfbouQ!$r%%dN3y&wX+ z5*XKHP)2R2?u)UPpz?hwtlX0Y1dx4HMBs0_*p?B0HQj(S)PlXsR@AK8qXly&_?eAY zL@ElV#M{a}A8C6V22gylA)#z5Pgdw8cV)bnSN;*t*1q#zx&-&vEmDe+@^b{XnIZ$b z@~ygP*9;Q-(`mF|%%nlN(vQNS_jHN~->PDj8@;kB{+!!$ z4FT}h$+F$YOLBYcRgZ-V=5(zv_6{{#)&JR9X+JiD1MR+-mOt5`soQGS_$KQLFQ!>a zUsi6rnbL$xlL6Z{j8&tJl>ZM!JF_aeEsdKe}WHRGtrTCMl0zl+s|*8lDI{ z9oA&kG4|uy9V8JB(!QC!hRE)`Z3Xj^(4R_v=DX|WBITD_zc=1>CN+9cc!dpWA}&TH zbfIvlJqCUsn4XN#S;F~$u6A+=l#pWE!g?+=yPmey8rl4{e7NjmGCC}Q@&u{{)x8Oc l2JSCS|F2j4?S#d^)*w?2n7Nm9fj7_$4_CZPg>%@g{{h_sX2t*j literal 0 HcmV?d00001 diff --git a/enemies/ghost animation/Ghost 0.png.import b/enemies/ghost animation/Ghost 0.png.import new file mode 100644 index 0000000..9aa9c33 --- /dev/null +++ b/enemies/ghost animation/Ghost 0.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8732t0313bqs" +path="res://.godot/imported/Ghost 0.png-54508e305bb055698e5019e1d53e16ab.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://enemies/ghost animation/Ghost 0.png" +dest_files=["res://.godot/imported/Ghost 0.png-54508e305bb055698e5019e1d53e16ab.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/enemies/ghost animation/Ghost 1.png b/enemies/ghost animation/Ghost 1.png index 7360438b55a6e59129d28b298df446759a549bc4..9240b5821b665795eb924eb5d2e86c4ac8e4c3cb 100644 GIT binary patch delta 1855 zcmV-F2f+CG45|;1fPV)RNkl|KXzWe%{uS)u_+V|sC6L;Qi7=PH#0ZNr#O5<+MUfL)ZY`)D>Numk7{9af&k z0d`e`JA>f0wG-F@?vQ>$Q}a6j zJGB>iDE9kr-@W?v?sq@FfByCFmv7$|O${D{TH%7%E4Fe1J3y}$S_HS51N2rte5zup zCzd(@<09NzJaBu*N1eb9(0hd@$A9=OV3hJvCd#GUn(yBDt@AC#vjdbewpst`JHS=S zhwo8J9Dg-0&z&1k}zCss|V6pxiqu52?G5=A+}a zJyo^?q!`+~J?Q|w-v1xvHKk<5FYT}6TbIe_voAhx4PAt12PmRzzs^Yq=>5ol{qg7X z6n~{kNS)QG_TJAG;iLShoin}kE)e0R>g@n2hBj|cIsiM7o%tvqt#DF#pfsF-m>PF= zd#wYu%F_OaYWvR;EOw0ul(!)y_j7Dx4Q$dlYilZole>DJ_GRA%L(iN_xazxHR%BSzjgdg zp!bg4p7F#3qI7tsJLRao)>-WUFnnlCIsm-r&eI)9KO*gvqaDiaT>CTbw8-}X-Ujsf zTk~WGP=*gHXFGu21tOkwhvFPhPcMJT7o-IJce6jANrZ zORGHL4}5*f8=o&N|L_0U-O3K2j2~7m{`Udkr}P&$j3eq!);mD01E`Xihk0uwxZpkN z0N~Z;qvKM)fz7%A$^lv_mFL0%DA(r6c*Ub$V=JXAE@e9aOdJ}!I{>`qIzg?nqB}q>9(fa0 zv9-901HQ)I%4a@108AVjtG@)6^2LtMb%Ij-tNQERqV>G+)EYO!vjarT9Dh=OnFA=F zoT2*OPCw4{((eI`?-e=2$-i_S90Z)w@vZyY0a`P<7~W-X0m=(^0hFXpKz*(Q;27Yb zH0pD4G*2y~+}!+he#R^A)n`BR+W}zW&^YW4pnRj)NFmxkDk~03jr!--KblwWJXiO# z16QHu-P5Q4$y7s z*8m>&9RPax9za>0AXh=0@i+>2#9Ca&bGP6vgZXGr<;i&Z6Gy%OGrt`GCJv3m?*Q-~ zDU0^p2u`H9Tpap=qqyoQ^j|I70ajbF#`#X;04R;;Lt&h?(HToS<9`%~`r4?>{|+IDqoSZ64*IBvlyWZuPH!E2rb>pTeVG6v+>#(thC6ulBc+ zirczu2WZXcVtB*91HhMl51^i?N<;A|jea-9QS%ZbCjjSl?^_A{2v_rBq~dZnArJn= z75a~gc7RdLPcrW`4u1e2xlVw>QVIo^m{Kfw^e09RK)Xhij`C?A{pF85h;{&&I5bY@ z0I79Qhd^nZsoEal;RNa=+MjlmjDn+iXjhzB%XWZSSLUL;mUDnoULvJ}gM&~;>6BMf zG^sdxYY delta 1548 zcmZWpX;hL46#ejXnK8mPfg>ljWxOCR+>&(idv4lHn~=oQX!i1ecBjpXoYKv zHkzY_phr_IL2yYMO(`=7EJ2XU6itm35gn^@=Fhx;@4WNweed3L?mayv@;VG@N%y<& zIgCfhOAgf=*sl4rZA6T8&a8cOg`y`06M?C~B+G2h`oQnFZJv&X^f-0i;hQ%}9CEo!i6!8m87m*^dS0>zg=qm%8=-5UySa#`HZZ;pzU&F-iG~p|=Ay}**A!P&q9XxbOa#||S-Hfs0ZZ8h&{znd~NCp8&CXbM1G zr)?q6uE%ND9k|8Jj%c5@Se9LUP)C(`QnW^a7`InEIfR45Wfg;Q+rB4icy@2~K07q7 ziG|37VR~O4l@@aW7MFk@6`*NPf|3IH6HN*WBb~yqyHV40 zd(eIN!Gy2|yPN3SO;{p{-Gx9=hqyBFPnDwd#gchx7Mf#&4Ppxs9+V|(sr|_ZB?*a{ zLdX>h2X~=1M#upo4H956ll7Ve&3v$i&XLRufvc7(2aC zkQJ+DIexNoMLq2mznN`B?6QtLy&wcw$WzYj6p-oIfzOVX7@Y_&vP-3S&1&OUm-AIN z7_}A0YOSG(Q=iSSBx;JBJmydV@!gzRNuyskm8Uh7OM(z~l>yFbEsLrL))CxH*a?=@Lh6uG}{V65f# z>XpV-6vB2X?4y(kQo3G0C*^Q+3V)aC<8VeLQ-POU@TBurYf>E`YM1l}#(~KqZwI7H7C0@)=M{yo9xu9L& z4*GpXKS0BGHa0inan8-u;br{@6rf+wG&Za?Xx7UkDN7|2^8*BfQ}K({Nm$q<#K?`dj69QU!DE$vba8+*qSu1%44r?#Ra zcUBaSST3W1))nSv5%vCnva^9!CH4z_v!hk9JjX~;e3E_fZzV7|QnLPb)V61yM?bQ7 z{j*(y@yhupTeB&Q1+vRbMc!x45*&2!_b#0KCbw(Hi{UxwL*d)k48E_8?k7p2sGln= z0HbJ6?l7Cqz`@~;m6^vVK;;?8b{{!8-dx8d`u)?S?%lw-^H`0pXQlKso~aIe*=y(o w8eVX=Z?o(n>aCboz4m`m{56+3BgixzuXzrxcwk@)uu}W?d26}T_eN&^3tp`u)Bpeg diff --git a/enemies/ghost animation/Ghost 2.png b/enemies/ghost animation/Ghost 2.png index 3da1dc5288aca894452db5cac9637a1493e29155..658d847ef47825c2cb163517e1f2ff91f7b28277 100644 GIT binary patch delta 1794 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 diff --git a/enemies/ghost.tscn b/enemies/ghost.tscn index af8a491..25223b0 100644 --- a/enemies/ghost.tscn +++ b/enemies/ghost.tscn @@ -1,13 +1,11 @@ -[gd_scene load_steps=11 format=3 uid="uid://chu67ci7sl488"] +[gd_scene load_steps=9 format=3 uid="uid://chu67ci7sl488"] [ext_resource type="Script" uid="uid://12jns4dppxxj" path="res://enemies/ghost.gd" id="1_6attn"] [ext_resource type="PackedScene" uid="uid://mtfsdd4cdf3a" path="res://utils/enemy_hurtbox.tscn" id="2_34o1m"] [ext_resource type="Texture2D" uid="uid://d3b5hmhjw2jyc" path="res://enemies/ghost animation/Ghost 1.png" id="3_34o1m"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_obmiq"] +[ext_resource type="Texture2D" uid="uid://b8732t0313bqs" path="res://enemies/ghost animation/Ghost 0.png" id="3_rbwoc"] [ext_resource type="Texture2D" uid="uid://dfhxhum8lek56" path="res://enemies/ghost animation/Ghost 2.png" id="4_4awot"] -[ext_resource type="Texture2D" uid="uid://ve5px6ib45g" path="res://enemies/ghost animation/Ghost 3.png" id="5_etobg"] -[ext_resource type="Texture2D" uid="uid://cmg8yws3gwx6u" path="res://enemies/ghost animation/Ghost 4.png" id="6_kbrsm"] -[ext_resource type="Texture2D" uid="uid://bs3lt13umfxu8" path="res://enemies/ghost animation/Ghost 5.png" id="7_a4rx2"] [sub_resource type="CircleShape2D" id="CircleShape2D_6attn"] @@ -15,19 +13,13 @@ animations = [{ "frames": [{ "duration": 1.0, +"texture": ExtResource("3_rbwoc") +}, { +"duration": 1.0, "texture": ExtResource("3_34o1m") }, { "duration": 1.0, "texture": ExtResource("4_4awot") -}, { -"duration": 1.0, -"texture": ExtResource("5_etobg") -}, { -"duration": 1.0, -"texture": ExtResource("6_kbrsm") -}, { -"duration": 1.0, -"texture": ExtResource("7_a4rx2") }], "loop": true, "name": &"default", diff --git a/main.tscn b/main.tscn index 71bac63..69e0e51 100644 --- a/main.tscn +++ b/main.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=11 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.png" id="3_kek77"] +[ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="3_kek77"] [ext_resource type="PackedScene" uid="uid://jjoyj1ldafkf" path="res://world/earth.tscn" id="3_lquwl"] [ext_resource type="Script" uid="uid://colvx6wq0e8n7" path="res://world/building_generator.gd" id="4_1bvp3"] [ext_resource type="PackedScene" uid="uid://73g8y37skebh" path="res://item_ui/item_ui.tscn" id="6_4c57u"] @@ -44,19 +44,19 @@ initial_buildings = 10 wait_time = 2.5 autostart = true -[node name="CanvasLayer" type="CanvasLayer" parent="."] +[node name="CanvasLayer1" type="CanvasLayer" parent="."] -[node name="Healthbar" parent="CanvasLayer" instance=ExtResource("6_7mycd")] +[node name="Healthbar" parent="CanvasLayer1" instance=ExtResource("6_7mycd")] offset_right = 96.0 offset_bottom = 96.0 -[node name="ItemUI" parent="CanvasLayer" node_paths=PackedStringArray("player") instance=ExtResource("6_4c57u")] +[node name="ItemUI" parent="CanvasLayer1" node_paths=PackedStringArray("player") instance=ExtResource("6_4c57u")] player = NodePath("../../Player") -[node name="DeathScreen" parent="CanvasLayer" instance=ExtResource("7_5vw27")] +[node name="DeathScreen" parent="CanvasLayer1" instance=ExtResource("7_5vw27")] visible = false -[node name="FPS" type="Label" parent="CanvasLayer"] +[node name="FPS" type="Label" parent="CanvasLayer1"] anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 @@ -71,9 +71,20 @@ position = Vector2(0, -3015) [node name="Water" parent="." instance=ExtResource("10_4c57u")] z_index = 15 -[connection signal="active_item_changed" from="Player" to="CanvasLayer/ItemUI" method="_on_player_active_item_changed"] -[connection signal="health_changed" from="Player" to="CanvasLayer/Healthbar" method="_on_player_health_changed"] -[connection signal="max_hp_changed" from="Player" to="CanvasLayer/Healthbar" method="_on_player_max_hp_changed"] -[connection signal="player_died" from="Player" to="CanvasLayer/DeathScreen" method="_on_player_player_died"] +[node name="CanvasLayer-1" type="CanvasLayer" parent="."] +layer = -1 + +[node name="ColorRect" type="TextureRect" parent="CanvasLayer-1"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("3_kek77") + +[connection signal="active_item_changed" from="Player" to="CanvasLayer1/ItemUI" method="_on_player_active_item_changed"] +[connection signal="health_changed" from="Player" to="CanvasLayer1/Healthbar" method="_on_player_health_changed"] +[connection signal="max_hp_changed" from="Player" to="CanvasLayer1/Healthbar" method="_on_player_max_hp_changed"] +[connection signal="player_died" from="Player" to="CanvasLayer1/DeathScreen" method="_on_player_player_died"] [connection signal="timeout" from="Building Generator/Timer" to="Building Generator" method="_on_timer_timeout"] -[connection signal="visibility_changed" from="CanvasLayer/DeathScreen" to="Player" method="_on_death_screen_visibility_changed"] +[connection signal="visibility_changed" from="CanvasLayer1/DeathScreen" to="Player" method="_on_death_screen_visibility_changed"] diff --git a/main_menu/main_menu.tscn b/main_menu/main_menu.tscn index faaf5f1..349f20d 100644 --- a/main_menu/main_menu.tscn +++ b/main_menu/main_menu.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=9 format=3 uid="uid://dpkr8yoobtej6"] +[gd_scene load_steps=10 format=3 uid="uid://dpkr8yoobtej6"] [ext_resource type="Script" uid="uid://bg4qx85we014d" path="res://main_menu/main_menu.gd" id="1_bws42"] [ext_resource type="PackedScene" uid="uid://jjoyj1ldafkf" path="res://world/earth.tscn" id="1_oa53l"] [ext_resource type="Script" uid="uid://colvx6wq0e8n7" path="res://world/building_generator.gd" id="2_d3a7t"] [ext_resource type="Theme" uid="uid://dwlus1hjwtch4" path="res://large_theme.tres" id="3_3shxk"] +[ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="5_3f7m4"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_d3a7t"] bg_color = Color(0, 0.7529412, 0, 1) @@ -101,6 +102,17 @@ layout_mode = 2 theme_type_variation = &"FlatButton" text = "Quit Forever" +[node name="CanvasLayer-1" type="CanvasLayer" parent="."] +layer = -1 + +[node name="ColorRect" type="TextureRect" parent="CanvasLayer-1"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("5_3f7m4") + [connection signal="timeout" from="Building Generator/Timer" to="Building Generator" method="_on_timer_timeout"] [connection signal="pressed" from="CanvasLayer/Control/PanelContainer/ButtonStart" to="." method="_on_button_start_pressed"] [connection signal="pressed" from="CanvasLayer/Control/MarginContainer/PanelContainer/Button_Quit" to="." method="_on_button_quit_pressed"] diff --git a/player/attack_animation/Attack Animation 0.png b/player/attack_animation/Attack Animation 0.png new file mode 100644 index 0000000000000000000000000000000000000000..de98156c3e97f9e645540513eaf6d70215b150d9 GIT binary patch literal 1469 zcmb7EeK^wz9RL0H;$^AiEG&+ayd|9Dd1{)MIM!;US<6a7#CW(0OU$O?$%%C3ZhK6~ z?7}w1OlIR0J?Zk2*T^(ZkxY`sw#&_P&)xld_s8e^`FvlV@ALiR`+Tki;{!G#PzV43 zHev()LbOa@hn|i$KEj-SrX}!vNPsWE?>3*+CVpo~*qFnI0SB$t1Hjxk0Jc7&1xgD5 zfR=#(RLkIctqk%{mtF?_SFaBS7QoT~0B(!*^C3{d`4ZRS0T+WD#*_J(CfxyoF<~Hi z^FBPpBA1cy^;*kykFOnnBo(m>J1I|!IYC2~3kFH2B$JjfD*)8<1|WuX;6F&0O^o4< zzN?gkA!Xf?u%!{dbT-Y9S|8@YhzB(vcrZZ2BH z=^35+#tD(kBnWgzAF!0fbBU52@n)Bmrj7n!&S9Q&UGd=2nurCNJ34QG60{U&3$bhK zDD-(&y|?+CM0x8)@%^|$1=+YvZLHW}RdF!>wsl;tTzEj)=G)LIsLJGD(rC* zSYe(*{;c@QOl(?7IYPf+e=TJu-{AxC7aRHVAZ3EmqjDu!!c866W0x!k5(*2PwTb~&oi!RL9bK*C~gt1Qa$2EXg(TQ}y1zUD;)Q2F*|W=-Z^ zkw%DQSVuu(wC5jvh_X*-qPI`5gm&I;4Vk8xsq=Ir=8dkkmE~tGYoee#INI(`?rQz1 ze$93y1Wu|{r?U@nRfh07Bwrdrah$*mdkXIorIQChzsZV39XN@nS@6o*9r95=uJ)fu zeXsFqrS%*oED8_)v_DkyZPubfuq>2{w!&weqIA{hS_rA54qu6!zx5;)U`ys~UvDBh0%S+pJqh>x+1va5RBrN7g-o~ea3@p`FFKVYw zkrToYiZ6>Z3GZm0#XyBHCVaW-a2bWfo0 z2v_Gm3-37`G8{F$Z&VEnrmHh@vRI3mjjA8vSl$`?A8_<##^|U9#%E%yP*2`$lB{ E2`Qe3H2?qr literal 0 HcmV?d00001 diff --git a/player/attack_animation/Attack Animation 0.png.import b/player/attack_animation/Attack Animation 0.png.import new file mode 100644 index 0000000..a1cb9cd --- /dev/null +++ b/player/attack_animation/Attack Animation 0.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7asmyuhicfoj" +path="res://.godot/imported/Attack Animation 0.png-489acc9ce1151ab08e3e3b5b444c6f87.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/attack_animation/Attack Animation 0.png" +dest_files=["res://.godot/imported/Attack Animation 0.png-489acc9ce1151ab08e3e3b5b444c6f87.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/player/attack_animation/Attack Animation 1.png b/player/attack_animation/Attack Animation 1.png new file mode 100644 index 0000000000000000000000000000000000000000..d0f78f62db8acd9e8b0d235348b816dd394381ee GIT binary patch literal 1397 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(bu;FFUEb)N;cNb-2b}iqwSXp=L z>bE+kZj95szFXc9WZh6&v}X4Cc}2@P8wFV}s0j2-6MXUUPETp|I{vM1r%s%mBFbgp zspNh5#M^zBYPXecwK7k0uX!Um`_0RDT}(T?BV*gE%RJwnTbsLHFH-$l0E2pG)>Ads z3tel3cZ)PkcG+6A`MIP+(u%)t*5&&DiFwq;q%-kZ!31s51It8KW(lg9-LwX>Q&z4P z?t5z7;4Pe@?*DLEbi+r}cns=t}Uim3QE`!vl%gs`e4AJbDT3_zWGAd4CG~wh}T*;!*U=w%w z>@tRB-kEU@`Jb1W&(wY1aOLvvSoM_syUUhE^fUQPJoZUJr_6bkP{#e>>zulKwKrW%CeE)9Z)knb z*b)-eJQ?*KUy@yYe0sN>`Bxjs_Gjy> zL(Tl|c(`@R4FpO5ib|Ni{i+y8W?zN~Jt?f=8OzyGeWeQ&?`Iy1M=I@|05 zan=lmtCKysug+V-aOtArjwr@0NiEl6?`%KtW| z?u@$@Zrd67`8}iD`Dds3>TNDhe`PZJ<@5g%Nv8UD|76{3Rb-vOk-WTmrulQFn2=Ek2m+;T8dk9duZ{@U+ z+xJ&-cUO89Jl_2$Y{u@*S)wN{>Twk;+4$gfVyJ8|Q>~cBkJ$ZXR_z;C$)30<2a$Of zD*L)-F7r92Ssr%{xdNsyx6VFW&)Xwt`A2KV|EwPY9krcy%pJ1K>5PS`UD{j*u2QF) zU(~UA6ny=3p8rKD+mr)J*1eimZj6gMp3O_x*)@5J!}9b7qlmN>ALks?IKX)_%G@UO z{W^}Fvh%F}yZy4=Si>jGTH&_wS@*;H%qa=?t>1hsXY8Kh@cwe3}m09&fts7TlhL+4P63rZ;MlNS6+urgfsKKmws}v}aPVBE9%cM? zdBY_c(K)O!W&1ujGPWF96n_1x^vTFKIs#p`+x+sSH!XfXQ)V%P+T}~wNf*G_+1S(dVIr8ZZBmaGLc!D0rRf>RuSm=y|kyvVrWkqavFJYD@<);T3K0RX0Y BT4DeI literal 0 HcmV?d00001 diff --git a/player/attack_animation/Attack Animation 1.png.import b/player/attack_animation/Attack Animation 1.png.import new file mode 100644 index 0000000..d3c1bc7 --- /dev/null +++ b/player/attack_animation/Attack Animation 1.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4klsmctmol5b" +path="res://.godot/imported/Attack Animation 1.png-ee24e1daff1b2693d0a213bfef8b6a35.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/attack_animation/Attack Animation 1.png" +dest_files=["res://.godot/imported/Attack Animation 1.png-ee24e1daff1b2693d0a213bfef8b6a35.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/player/attack_animation/Attack Animation 2.png b/player/attack_animation/Attack Animation 2.png new file mode 100644 index 0000000000000000000000000000000000000000..12ac8a390745277310817579f9f98131f50dd17b GIT binary patch literal 1264 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(dE{vOM>+~2Ub z+lcRhQtwwsg@&p!y(lFH@ys>+hng6^+1i%JuUFrg;myqyVPcwmC@zx0;`FkOQ&|nt zIyL2wPGX4ID0?KulR@^-a_@eo8}~naoTeXqTaI;tq}A0jCNb6nkqZ`<>2fVd{87@% zAabGUQ`F^d_|C{XB_)!9_t0|gUZw|^ z4>-hTi5xiaK{D&vfA$xy_4d+F{(S6x=*G!@Vq({0E3q)gcU^f?)wq44j&?DdC}(a_ z=FXCT%P`4{J11q`)$nr+S6|eaTv_ueQrrH_nl!hEG2N#v91M-(c?BBQ*NC|{GjvV- znYG}f?}MlJ{=d9^z4_1g^YL9q0k_v>2ppbT$Z+^%wqa?n`klj!ho=61{Pelzy?*(5 z{!cgTn{t0&efcW!ZPvDX^fFRPY%h21ws2rI@%J^E$H=#D)AiF{evZ?Bt*o-K7e2sv z&Ssi+=AHX`_N+cLhiEV|vp=eQjkH zw9Q&RGfJ3b4m?$d-1HscWkztPS^ z%E4K^Do>^fyZqWyd|M<~=7HZT*)66^ud%%MR^PF4y8L0!YDw$I(H_A*g$yU(ED8_K z@_q8+5~EOVm5td^5%w2~jLx;Qg0j`FU-V0urN}p7rPlhZKC8_qP6>qY115eyez;zE z1xH5K)4rk!D?JJtR{nU-zi$)sk{8|1N9H)pTmCEXuMB&@Tsbv%tQi}7c1MVQ;`qb- XX>yBhTG&ERX~f{^>gTe~DWM4fpjP^k literal 0 HcmV?d00001 diff --git a/player/attack_animation/Attack Animation 2.png.import b/player/attack_animation/Attack Animation 2.png.import new file mode 100644 index 0000000..9fb632f --- /dev/null +++ b/player/attack_animation/Attack Animation 2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8xmypqf63l8f" +path="res://.godot/imported/Attack Animation 2.png-d547f6c17bbb65420b4918144823411b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/attack_animation/Attack Animation 2.png" +dest_files=["res://.godot/imported/Attack Animation 2.png-d547f6c17bbb65420b4918144823411b.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/player/attack_animation/Attack Animation 3.png b/player/attack_animation/Attack Animation 3.png new file mode 100644 index 0000000000000000000000000000000000000000..bed801e95b234a44d651ea5515c7485841ad316b GIT binary patch literal 1260 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(T=-ZAzpb$h9~;LhCTURPEee8jN$MAw(qUsi^%XMQ7l zc}1P7N&~aUlFXP190@Yfo$~}6TxK0(l?-IKJnP=>b^XfPmx^5&I~IHwRAc%uvHkKQ z2ZrSfzZWL6JW%Fe?%K%U=luThF|YfqZ&cI#nX2t2b>4r@_`S(KJXPjEs8yVN&m@Lr zGbO6b_SyZN-aU!o+ymi%^Co_0So`Fr+`>@(FQqaHB~`bZPb)C&lfH4mk&Q8jXTEn= zHAA(K#jZB_T=5`X3x^Y1zVUN0e%Z_wDa_d7ll^}|j_uq0hs&R>*cvnQ%8#l4ljgxkX^L==F{Cl)oUESYp zGbi4wnmu<N%@7q0**oJW-=zfy)<_HUUFg+HbKQBKF~?W`^2TlA z8n2^mt@EF5+OLx;qu{+P{MgD3^FqHf?Em*Cj_2j)rLho- z7}=V$7kt>eKe|nILzE=@ia^g2zrek5*Zu{mb?N-{UzjSkdFovq#>=zvU;mq@;#19V zoBd6u`(1OUJQfG1bBYR^^JZFasXLjRcVU&ez;>R?os4`20i0a1-YdV_UwHL-|KCr` z|FmAX^|SHh#H21}o{%P|>p@v_ts4$*mCSp3ZDUDC*k9)BOJ_V{U^kLk**PVO`$M-s zOSIpIrkVKg0O%2W7>cym*!~iZ3CT-KtT=Tjs!&iC;8U-l|-;&bWS~_>B15 zRrUusRU#iTL~D5#_y%p=x@U&)jWc$M{t73B*jKF7ylClp)$G&e8^T-W9FSRj@%gpX z%r=VyVOhd4-1-ffZT5-N+NU~IFt(h%Gnq|oZ{1phh&PO3ug>^S=c&3q{q3{bQ+tjx zrUaR)T{!b!Rp$s#U5J>)fyFFGZ@bT9UAuLU>9?)l)|LfLI>5N(lIsTCnHzhS2a7K7 adm!Jh)U2?ZY2!0cN#p72=d#Wzp$Pz*8wkw+ literal 0 HcmV?d00001 diff --git a/player/attack_animation/Attack Animation 3.png.import b/player/attack_animation/Attack Animation 3.png.import new file mode 100644 index 0000000..0cc27c5 --- /dev/null +++ b/player/attack_animation/Attack Animation 3.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://em1kmgnaikc1" +path="res://.godot/imported/Attack Animation 3.png-d741f7f68a27aab201a287d419122401.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/attack_animation/Attack Animation 3.png" +dest_files=["res://.godot/imported/Attack Animation 3.png-d741f7f68a27aab201a287d419122401.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/player/double_jump/Double Jump 0.png b/player/double_jump/Double Jump 0.png new file mode 100644 index 0000000000000000000000000000000000000000..038a208d70b17f69f4f826a0a291a89cb9ece300 GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<^uz(rC1}St4blLz^*68Wt7*fIb zcDkV-vm=iy^Qq7m4^&EavR?@i3Ayr6u4E326(2Ll%Y{$8uboLT=ly)C;_XJ;+0X5T zQ#XH9X5{p6U=o_pz@nmnm1)4<*u6CV^V7FqUvD`6{P*#NzrXLPuaLR*`rpr&EA)HU z<*lpyv$cHt?uGl@kJ_J0WlQ_q{&H^iBi#?rgIc&UCZ^9l8J<38&&ADtvFq1Paj-3S zd4G2SlR|i;8h_xQGx?gzpQr!wvHJa_`cb;vzb{-joEB{ob$m2cX_LHgw&qgv{(o1i z1=QDX(psQ2`D4~4pD8B;!;hX!o?G+i<>cwFkDNUIX`U8?67TIj%$w{^K1+#67rGK& zcx~fM_y1aPR|WHLzI@;C@IRC16i?%YG5+)a*c`TexyF0G-QM46wm{n?_Ax88$67J| z>bbS`TPWk=C)ZCsKePVo`zv;rwG%$BKd|!2&Z8^iU;A8Mf8B3A1LGI3qc#|!b>P3^ Z2i|(|rt4c*`s9Nm#naW#Wt~$(69C)p)~5gf literal 0 HcmV?d00001 diff --git a/player/double_jump/Double Jump 0.png.import b/player/double_jump/Double Jump 0.png.import new file mode 100644 index 0000000..40436aa --- /dev/null +++ b/player/double_jump/Double Jump 0.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cnnuplvwpo351" +path="res://.godot/imported/Double Jump 0.png-e1ba562e6b13c8446a336c30d2d5dd60.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/double_jump/Double Jump 0.png" +dest_files=["res://.godot/imported/Double Jump 0.png-e1ba562e6b13c8446a336c30d2d5dd60.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/player/double_jump/Double Jump 1.png b/player/double_jump/Double Jump 1.png new file mode 100644 index 0000000000000000000000000000000000000000..6eab56f23151888c4b8e58f4292f881c79f837f5 GIT binary patch literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<^uz(rC1}St4blLz^w%*glF{Fa= z?F?JL!wv$i%#XB63WRpuVb0Rx(t7nouEdhFM20P3iT|egM)Pj^-bs-^Tk%}H{_`6a zGwJ^`8aVNz9;XLsYo+hX+tvGjt*g7GckazvYtz+_cCS^5Ek5_iY?--SZrUv4z30qq z&#sMGZ+f4rvzFIA`mr*9YnX$!;isDn z>33Pq>wJt`T|47&jn2PomSEx4M^;yUIU01l?PGFh@jIYW{he#x1xfD;ng8OuY#bw- zfM>Eu{jdKGTOD59u6>(syNlnRNpNQ1pRfZOv-{o^SFpMyyfJ4KHUOg?bxieQvGZ@8 Sn)I6o6osCyelF{r5}E+=6z)L) literal 0 HcmV?d00001 diff --git a/player/double_jump/Double Jump 1.png.import b/player/double_jump/Double Jump 1.png.import new file mode 100644 index 0000000..87b6af1 --- /dev/null +++ b/player/double_jump/Double Jump 1.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bsx1yxgxv7rcy" +path="res://.godot/imported/Double Jump 1.png-69539f806c4752d0093ea6a956b823b9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/double_jump/Double Jump 1.png" +dest_files=["res://.godot/imported/Double Jump 1.png-69539f806c4752d0093ea6a956b823b9.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/player/double_jump/Double Jump 2.png b/player/double_jump/Double Jump 2.png new file mode 100644 index 0000000000000000000000000000000000000000..ce69462236a05b5cac8af7707b3ffb96f45c0a0f GIT binary patch literal 545 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<^uz(rC1}St4blLz^*6r!y7*fIb zcDij4vmuY0c-!hF&66(_@&^S61_U0qePO{_V(GKuo=@0&S*RkSvvXrdi~$)zuk$uKV@foWnlXEZ*@ENGZAhcS%@>3jTThVAbzJCO7K{LAk5_KbNn2&f;?DV*ioNmv?_()3NLLv-InS zYeRNj_CLV7#EARg+sB7r)joLnuI?+#Nh>e8^Oawcp0DWVdwoUmoL$L>mBODR&aV-k zFtPLF4aaLQecbF$E89m|b?d!8^3vq>kh~>M^ z?YPg`;ZpUtr{dbexZ0AWxi7xI+H{|@!DaPXt4UAgZ)<*9G5w`*x_spkZR@`*YwkVM zidr7?ys}Six%EH)n=jQD{1JQc*5!5mMDrtIf5YyE*?#l2XWU=Lb|KK}Vs+JI^Q`6b l85n!|Cj3MWy&v;g>=+ii&*oL|GCmE89#2<4mvv4FO#tnI*e(D7 literal 0 HcmV?d00001 diff --git a/player/double_jump/Double Jump 2.png.import b/player/double_jump/Double Jump 2.png.import new file mode 100644 index 0000000..4818254 --- /dev/null +++ b/player/double_jump/Double Jump 2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d4kk1kbnnvoiu" +path="res://.godot/imported/Double Jump 2.png-f1a820e0078cf2a6b005cbe59b43e27a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://player/double_jump/Double Jump 2.png" +dest_files=["res://.godot/imported/Double Jump 2.png-f1a820e0078cf2a6b005cbe59b43e27a.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/player/double_jump/Double Jump 3.png b/player/double_jump/Double Jump 3.png new file mode 100644 index 0000000000000000000000000000000000000000..51a11da6b4548e7b094c8e6b768aba1f71c9e490 GIT binary patch literal 455 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<^uz(rC1}St4blLz^X6WhS7*fIb z_L@E4AqA1+AG7v!&7ODUZ1sybPaZs3^S$7+%C1U@UX}ezYTG_6;9F7?t5we}FE?e~ z<8}rn4uuB1gh6fN%(;)g)>VK1TsHfy|J=IDxBr7b&%AEOc&yz)mFfQ8l<&c+&eA-} z<#W!?XY6L2ue?xW#oN~l3N4oztZ-uCv5?{1{pt5-%{$W5UWaDno|cVG3%%&IU+(;c zcSRO$)m`^i7v(QM>we%x^t>ZmnI?tryRxaaPV za(sF`%;;+Wt?72N`y1X=H-tyUw?@>?eYCOY>GEHJdoQJb7Bu*!9ia8zmf7p~_ifpB oObj2|xV{QFFfg(p5i|M@u void: + queue_free() diff --git a/player/double_jump/double_jump_animation.gd.uid b/player/double_jump/double_jump_animation.gd.uid new file mode 100644 index 0000000..868f770 --- /dev/null +++ b/player/double_jump/double_jump_animation.gd.uid @@ -0,0 +1 @@ +uid://courx3cleht2d diff --git a/player/double_jump/double_jump_animation.tscn b/player/double_jump/double_jump_animation.tscn new file mode 100644 index 0000000..b758794 --- /dev/null +++ b/player/double_jump/double_jump_animation.tscn @@ -0,0 +1,38 @@ +[gd_scene load_steps=8 format=3 uid="uid://beotdg4etmevc"] + +[ext_resource type="Texture2D" uid="uid://cnnuplvwpo351" path="res://player/double_jump/Double Jump 0.png" id="1_x551h"] +[ext_resource type="Texture2D" uid="uid://bsx1yxgxv7rcy" path="res://player/double_jump/Double Jump 1.png" id="2_q6kgq"] +[ext_resource type="Texture2D" uid="uid://d4kk1kbnnvoiu" path="res://player/double_jump/Double Jump 2.png" id="3_d5r54"] +[ext_resource type="Texture2D" uid="uid://btxj42ov7tlxx" path="res://player/double_jump/Double Jump 3.png" id="4_sevse"] +[ext_resource type="Texture2D" uid="uid://7mgi2hnujphy" path="res://player/double_jump/Double Jump 4.png" id="5_2o7pi"] +[ext_resource type="Script" uid="uid://courx3cleht2d" path="res://player/double_jump/double_jump_animation.gd" id="6_q6kgq"] + +[sub_resource type="SpriteFrames" id="SpriteFrames_qajm0"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_x551h") +}, { +"duration": 1.0, +"texture": ExtResource("2_q6kgq") +}, { +"duration": 1.0, +"texture": ExtResource("3_d5r54") +}, { +"duration": 1.0, +"texture": ExtResource("4_sevse") +}, { +"duration": 1.0, +"texture": ExtResource("5_2o7pi") +}], +"loop": false, +"name": &"default", +"speed": 10.0 +}] + +[node name="DoubleJumpAnimation" type="AnimatedSprite2D"] +sprite_frames = SubResource("SpriteFrames_qajm0") +frame_progress = 0.30051297 +script = ExtResource("6_q6kgq") + +[connection signal="animation_finished" from="." to="." method="_on_animation_finished"] diff --git a/player/player.gd b/player/player.gd index 288808b..0da6cdc 100644 --- a/player/player.gd +++ b/player/player.gd @@ -6,6 +6,8 @@ class_name Player extends CharacterBody2D @onready var sword : Area2D = $Sword; @onready var active_item_cooldown : Timer = $ActiveItemCooldown +@export var double_jump_animation : PackedScene + # allow taking away player control var handle_input : bool = true @@ -131,6 +133,7 @@ func manage_velocity(delta: float) -> void: var dropped = false if(not is_on_floor()): air_jumps_current -= 1; + play_double_jump_animation() elif (Input.is_action_pressed("drop")): dropped = true self.position += earth_aligner.global_from_local(Vector2(0,3)) @@ -163,3 +166,10 @@ func die(): func _on_death_screen_visibility_changed() -> void: handle_input = !handle_input + +func play_double_jump_animation() -> void: + var node = double_jump_animation.instantiate() + add_child(node) + node.position = Vector2(0, 5) + node.scale = .5 * Vector2.ONE + node.reparent(get_parent()) diff --git a/player/player.tscn b/player/player.tscn index 7297c6b..785c4f1 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://cmaovvr15b3qk"] +[gd_scene load_steps=13 format=3 uid="uid://cmaovvr15b3qk"] [ext_resource type="Script" uid="uid://ddidj1uau28ck" path="res://player/player.gd" id="1_4flbx"] [ext_resource type="Texture2D" uid="uid://c4xg25s8loxp0" path="res://player/Player_Walk/Walk 1.png" id="2_hg6s5"] @@ -9,6 +9,7 @@ [ext_resource type="Texture2D" uid="uid://dawbam413fob" path="res://player/Player_Walk/Walk 4.png" id="5_ebec5"] [ext_resource type="Texture2D" uid="uid://y32k1koww7oy" path="res://player/Player_Walk/Walk 5.png" id="6_yllr7"] [ext_resource type="Texture2D" uid="uid://bo7h3yc40kon3" path="res://player/Player_Walk/Walk 6.png" id="7_kb6p2"] +[ext_resource type="PackedScene" uid="uid://beotdg4etmevc" path="res://player/double_jump/double_jump_animation.tscn" id="10_8t03j"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_onrkg"] @@ -43,6 +44,7 @@ z_index = 10 collision_layer = 5 safe_margin = 1.0 script = ExtResource("1_4flbx") +double_jump_animation = ExtResource("10_8t03j") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(0, 5.6) diff --git a/traps/Morning Star.png b/traps/Morning Star.png new file mode 100644 index 0000000000000000000000000000000000000000..acc7efb2f839da9bb7080dc4b29d25208e3f4543 GIT binary patch literal 1482 zcmYLJdo+}J7=FL`%#az49cLI!MmKE9O1f^wXlbaBbXqYOLrX5HD4m+Nk8;nYV@tWs zg!Z)U7)3*wFp|;@2^A~Xgr=rkYMaT}nf+t;kLUNi*XR7+^Pcmj@AP6D=$q*SfPsg* z>n;srTIdlpZ!|^SJvBi~D4PV)9?V?|s$ScjYVXmdibY3$>wlUeAIOnP8>P+;)tO^K zRJJ24Q8w!@x_3>jo|<}d(X;aB5#FzI{sZy(kZ8J@sqMM!@Wlt?B}HpPN606ojROjW zvp|p)Gd@49Zg}zWa%fVgihnA!+E{vr#$6o|x1-2Pcf%2H^`yf|5&ssx>J;OC)cZe_ zU1L#e?FbRc{M>g1Cmqtf*xj;6KdsBDSN?ULKf{~X71T-fM-6KO7y3y1u0A#2#~~TE z7-h}4=b^w5@mu36zx5Rs&UIDB#;SVS6_sSCsu~_9Dk=0(#BT)o=aoitz5(_yh8VH7 zdcnpMD+#S1n$nf2`yfok>kzUm?4YQH!!vXzY1n*w6zqp)Ann-C*<6-vVh%)yL zgpc-v9!1*)aNKEI)nSa{FzKDhI!1tuO$&4=(>0Hfv6eOc(Gw*LqLZ&zA~!ojKfKF8 z#Xvr0T@MQuY4BAfHonWPQ%FUlIAN#OYTNGpI45ie_2Bwi9_5(1kTq ziRPap?82RO)qf;kY*=5!P@= z2BPgXK(8v-)BAW>2&YTBM`t(jdI|O45xQ|T0cNC>(g2eE8GRpyCk!sjZLKZaab*GK zqtQ>dgPD3Te-n>zpXR&9QN{x+@|w^kJYblHIT)bamNGN void: update_shader() radius = rise_from - #auto_rise = false - #radius = 2950; - #create_tsunami(4.712, 1); - #await get_tree().create_timer(10).timeout - #create_tsunami(4.712, 1); + auto_rise = false + radius = 2950; + create_tsunami(4.712, 1); + await get_tree().create_timer(10).timeout + create_tsunami(4.712, 1); func _process(_delta: float) -> void: diff --git a/world/Background prototype.png b/world/Background Prototype/Background prototype.png similarity index 100% rename from world/Background prototype.png rename to world/Background Prototype/Background prototype.png diff --git a/world/Background prototype.png.import b/world/Background Prototype/Background prototype.png.import similarity index 73% rename from world/Background prototype.png.import rename to world/Background Prototype/Background prototype.png.import index e719aee..ebf7d0f 100644 --- a/world/Background prototype.png.import +++ b/world/Background Prototype/Background prototype.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d3fpq76anm4t7" -path="res://.godot/imported/Background prototype.png-82410769bb8789c49aff3e49453fc3fe.ctex" +path="res://.godot/imported/Background prototype.png-3a0b707a19d2bad459544182fdfe35b0.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://world/Background prototype.png" -dest_files=["res://.godot/imported/Background prototype.png-82410769bb8789c49aff3e49453fc3fe.ctex"] +source_file="res://world/Background Prototype/Background prototype.png" +dest_files=["res://.godot/imported/Background prototype.png-3a0b707a19d2bad459544182fdfe35b0.ctex"] [params]