From 2f0e5a59d9d609e4dbacbe6094334d6aa5aabf26 Mon Sep 17 00:00:00 2001 From: megamichi Date: Mon, 7 Oct 2024 17:02:32 +0200 Subject: [PATCH] - Gui Improvement - ground improvement for future bioms - first sounds --- assets/Ground/background.png | Bin 6016 -> 9839 bytes assets/Ground/ground.png | Bin 5912 -> 0 bytes assets/Ground/ground.png.import | 34 ----- code/GUI/restartschild.gd | 3 + code/GUI/settingsschild.gd | 2 + code/GUI/startschild.gd | 8 +- code/main.gd | 14 +- project.godot | 2 +- scenes/Duck/Duck.gd | 4 +- scenes/Duck/Duck.tscn | 16 +-- scenes/Duck/ente.png | Bin 1026 -> 4674 bytes scenes/Duck/ente_colormask.png | Bin 4705 -> 4892 bytes scenes/Main.tscn | 220 ++++++++++++++++++-------------- {code => scenes}/global.gd | 0 scenes/schild.tscn | 19 ++- 15 files changed, 165 insertions(+), 157 deletions(-) delete mode 100644 assets/Ground/ground.png delete mode 100644 assets/Ground/ground.png.import rename {code => scenes}/global.gd (100%) diff --git a/assets/Ground/background.png b/assets/Ground/background.png index 8734864f1f9447acdffcd1331f5dc08a34ff8093..94408ef26be932dad71a6e1960d7c6c0483cb3e9 100644 GIT binary patch delta 4877 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 N002ovPDHLkV1gDsaGd}E diff --git a/assets/Ground/ground.png b/assets/Ground/ground.png deleted file mode 100644 index 1e4ca324b2ac9b00d824d5aa8e97f32970e86417..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5912 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 GivBlGAS&Dd diff --git a/assets/Ground/ground.png.import b/assets/Ground/ground.png.import deleted file mode 100644 index dfd5542..0000000 --- a/assets/Ground/ground.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bmklwmjrtynqo" -path="res://.godot/imported/ground.png-673271eeeb2d2777787f0fa18dd4ce4d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/Ground/ground.png" -dest_files=["res://.godot/imported/ground.png-673271eeeb2d2777787f0fa18dd4ce4d.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/code/GUI/restartschild.gd b/code/GUI/restartschild.gd index ab4f945..141ab47 100644 --- a/code/GUI/restartschild.gd +++ b/code/GUI/restartschild.gd @@ -12,12 +12,15 @@ func _process(_delta: float) -> void: func _on_duck_gameover() -> void: $AnimationPlayer.play_backwards("out-in") + $"../../Audio/GameOver".play() + $"../../Audio/Gui-in".play() show() func _on_restart_pressed() -> void: $"../..".start_game() $AnimationPlayer.play("out-in") + $"../../Audio/Gui-out".play() await $AnimationPlayer.animation_finished hide() diff --git a/code/GUI/settingsschild.gd b/code/GUI/settingsschild.gd index 550dce0..9c611a0 100644 --- a/code/GUI/settingsschild.gd +++ b/code/GUI/settingsschild.gd @@ -13,9 +13,11 @@ func _process(_delta: float) -> void: func open(): show() $AnimationPlayer.play_backwards("out-in") + $"../../Audio/Gui-in".play() func _on_back_pressed() -> void: $AnimationPlayer.play("out-in") + $"../../Audio/Gui-out".play() await $AnimationPlayer.animation_finished hide() $"../StartSchild"._ready() diff --git a/code/GUI/startschild.gd b/code/GUI/startschild.gd index e249b77..64c3273 100644 --- a/code/GUI/startschild.gd +++ b/code/GUI/startschild.gd @@ -4,22 +4,24 @@ extends TextureRect # Called when the node enters the scene tree for the first time. func _ready() -> void: $AnimationPlayer.play_backwards("out-in") + $"../../Audio/Gui-in".play() show() -func _process(_delta: float) -> void: - global_position.x = get_viewport().get_visible_rect().size.x -100 - $Logo.global_position.x = 0 +func _process(delta: float) -> void: + $Logo.global_position.x = -5 func _on_start_pressed() -> void: $"../..".start_game() $AnimationPlayer.play("out-in") + $"../../Audio/Gui-out".play() await $AnimationPlayer.animation_finished hide() func _on_settings_pressed() -> void: $AnimationPlayer.play("out-in") + $"../../Audio/Gui-out".play() await $AnimationPlayer.animation_finished hide() $"../Settings".open() diff --git a/code/main.gd b/code/main.gd index d734d61..b78cf23 100644 --- a/code/main.gd +++ b/code/main.gd @@ -30,8 +30,14 @@ func _score() -> void: func _process(delta): - if $"/root/Global".gamerunning: - $Screen/Background/Sprites.position.x -= $"/root/Global".speed*delta - if $Screen/Background/Sprites.position.x <= -200: - $Screen/Background/Sprites.position.x = 0 + var background_size_x = $Screen/Background/Sprite.texture.get_size().x + + + var bla = (background_size_x) + $Screen/Background/Sprite.position.x + print(background_size_x) + print(bla) + if $"/root/Global".gamerunning: + $Screen/Background/Sprite.position.x -= $"/root/Global".speed*delta + if bla <= 0: + $Screen/Background/Sprite.position.x = 0 diff --git a/project.godot b/project.godot index acc5f9b..0667d4a 100644 --- a/project.godot +++ b/project.godot @@ -19,7 +19,7 @@ config/icon="res://icon.png" [autoload] -Global="*res://code/global.gd" +Global="*res://scenes/global.gd" [display] diff --git a/scenes/Duck/Duck.gd b/scenes/Duck/Duck.gd index 32d1c40..b3ad055 100644 --- a/scenes/Duck/Duck.gd +++ b/scenes/Duck/Duck.gd @@ -50,8 +50,8 @@ func _collide_with_hindernis(_body: Node2D) -> void: func _color_slider_changed(value) -> void: print($"../../Gui/Settings/ColorSlider".value*0.01) - $EnteSprite/EnteColormask.modulate.h = $"../../Gui/Settings/ColorSlider".value*0.01 + $EnteConstantSprite/EnteColormask.modulate.h = $"../../Gui/Settings/ColorSlider".value*0.01 func _on_ente_sprite_frame_changed() -> void: - $EnteSprite/EnteColormask.frame = $EnteSprite.frame + $EnteConstantSprite/EnteColormask.frame = $EnteConstantSprite.frame diff --git a/scenes/Duck/Duck.tscn b/scenes/Duck/Duck.tscn index 7d8c0ac..cbc47ed 100644 --- a/scenes/Duck/Duck.tscn +++ b/scenes/Duck/Duck.tscn @@ -9,7 +9,7 @@ length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("../EnteSprite:frame") +tracks/0/path = NodePath("../EnteConstantSprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -26,7 +26,7 @@ loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("../EnteSprite:frame") +tracks/0/path = NodePath("../EnteConstantSprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -43,7 +43,7 @@ loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("../EnteSprite:frame") +tracks/0/path = NodePath("../EnteConstantSprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -59,7 +59,7 @@ loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("../EnteSprite:frame") +tracks/0/path = NodePath("../EnteConstantSprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -76,7 +76,7 @@ loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("../EnteSprite:frame") +tracks/0/path = NodePath("../EnteConstantSprite:frame") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -111,7 +111,7 @@ libraries = { "": SubResource("AnimationLibrary_rcmnp") } -[node name="EnteSprite" type="Sprite2D" parent="."] +[node name="EnteConstantSprite" type="Sprite2D" parent="."] texture_filter = 3 position = Vector2(0, -7) texture = ExtResource("1") @@ -119,7 +119,7 @@ hframes = 3 vframes = 2 frame = 4 -[node name="EnteColormask" type="Sprite2D" parent="EnteSprite"] +[node name="EnteColormask" type="Sprite2D" parent="EnteConstantSprite"] modulate = Color(1, 1, 0, 1) texture = ExtResource("3_a4v8w") hframes = 3 @@ -140,5 +140,5 @@ position = Vector2(-13, -4) shape = SubResource("CapsuleShape2D_46c8m") debug_color = Color(0.906661, 0.254677, 0.42413, 0.42) -[connection signal="frame_changed" from="EnteSprite" to="." method="_on_ente_sprite_frame_changed"] +[connection signal="frame_changed" from="EnteConstantSprite" to="." method="_on_ente_sprite_frame_changed"] [connection signal="area_entered" from="hitbox" to="." method="_collide_with_hindernis"] diff --git a/scenes/Duck/ente.png b/scenes/Duck/ente.png index b9baf17c68813bebe29b1e40485788262382b3e4..6508c04f5e5b2cfbc5622ef0154c4d185e1f42cb 100644 GIT binary patch literal 4674 zcmeHLdsGzX6(06?HL~*9-M}I%4^a_F%IwT6Okp4H&aw*% zMbxB91TjriqM}BK#Ym2g?Wu}20TGRaV(f`U4K64>gs8L>Pd%-VezOY*r#YvGbK-yO zIrF;Ty}x_!@80h_-?!URS0)7bFY<>VC_tB}Ne52}xCFCjf%|Y&ZwPqYEy>8_(n%+5 zwONd8Ap>*8Rt9EVtPz4-*LS4d2xx`pKFZr(m`qhv_@kbYAInYxhLAChHk;1Bqg3mv%YirzG`Ds&N zQw99+g}%G)BLjk^WxGSN&b!*z2Mv`DUH-;d-qnbGIk;j*t@(p)E~#VTnzpW}mf1gz zmk1@7_q=;#?#A|Osu>&4t@!(EPfy3RAIv%#8XUas-44{$7tps?f5Y9J63#4Gw{-a{ z2heXT&R6HGjV`;LQ?$;#H%+p8|0`AVEBhC(DcQ3+d55c3(eO*6|Hb0!)t%Y@pLb|2lE|WJ`~zgRDw)>Dy+8H7#J7gLKM-u*dnoDxj!6jqm4wm=Jins z@TC&ubDWhBiJVTS&?ymGY&M~E_E8o9A0iiN6=6bDWHN~+TG%;l5dawt=zA^f8DKh# z(iywOVWSvr5o6{eCPL8ExV_b3EA*s8QzE92F#%OO@QO`xnV{3Bj$7~)nU@_E_#7WuT?k6B-NU;KS2tR07^VL0c%6COoeS45cuM zM2?U&tw3-ZClRHT5rdlqS7I`fB<11>P&%`nBh3`ULjiCh3veifOfF-Tazr6T4G3l>kBBgR% zYEURinb8A9Q^e~Qn~4PFWKCoqBeI(FJOe!8L|m#)B@heIXOh%Hk~0DWl^~flJ6z8O zGFTI{iX(Y8F}YYFK_xOA!!b-I_r~nOTf^Awpc8pa3>8Xb9&^4d1V{!DOY(gR06cP# z3!%0#BxkW@SS*Dq0S^K5mgB>EFr8?UBQ+$)08mtn6BtUM@(c_o#3+GdQK*!=iwE4*cM|(@2$l8JbVvoo>qgFBNy*~YX$4$q!~uOYf-*9kubL7uh>cwoS7E|B3aIhQ!1@f9d(rrM zKgt=1_j&$C+wFO}fZ=H;Q{s1;u4%fa#K4r4r@L#Kt|>7vCFSYv`oZY(e|BPI%wVJE z1n0qDmmRJKXUSQH6$u(B2r7hv8p#(n0LdI{;yOD72_yK+$5kIw1cZK^POtSF@b{Y= z61nAYJ^v3%7^ltT)D{ze@PIt~VTOjCESC@S`{A{l0v7_MGdfLNMrP~1-D&=<=v?)C z;fKyXop&b6wM3u$8%M{nf@OPqQsCf-Y@dkocdElXe|4=UVYV#RcW0ULY8pPX=bKNq zFFM;f!|jvXJ@e?Tx^Iv6{774Hr0#>SdQ)1X=6#vt*c}{ScKz!sKfa-PTU&EXdgt;o zC|2K-x~*r&7T>&@=wjomueEgV_xZDQUziqRPxl`^7x*wP$?kYGb7b&7u}SjLt)f2~ vLr+|~)7v3+v%~K^D35<*e!Da5_8C!1TGE^U6c<_- delta 970 zcmV;*12z1@B!UQ#BYy#dX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ?;d39PCiU zAw%nA7Zq`=RVYG*P%E_RU~>J0CWa)%#ZhoAIQX$xb#QUk)xlK|1V2EW9h?+hq{ROv zg%&X$9QWhhy~o`-IDeutGxb?X%D{7c-NVP% zy9CejKKJJsES5|L_(b9)(+!Jwop^fF(mC%FM_5%Z5}y-~8+1Y9N3JU_zj3ZOEbz>T zk;~2zM~KBr4=X*)s)kBDMI0-t8s!Ulmy4XYIIHyr>)eySFkI4>m$*)I6lpAA5fVfw zXrP8VEF@^vNPjVrrTvtLf5h=i@|;f2TFT;`}a(zzaMe}a;EC6>Vg0O z00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9b^rhX2XskIMF;2z1_~=5 z)i+WYlS&aMe*xP`L_t(o!|hl>Zo)7S97jPM+CxzU;sL1l_Wy5a&qcf-h^7a6K$X}Y zEJJYZWo>V0QL$t>O5(}v?8eRn_>XPXf;zJOs(Gwh5O4s<1}Y_Tjz=X0>gaULA+ng+ zhxK&f|~&fKdm zhz1WIBy@a93=*Cbea`%LKqj%8ZtZ5y{)EBPFlSl@FX;XUrisC2x1&Q=@iCM+(=>P~blHt&rqqjQVn{N*H<1NE!;5J8ndnPS z7cyrW7~DcKTG~G}u2lUJRX1mv1}{{$PL$AJpgQ)zQZJ%`krK#Y=1j}r`Pt?E$w`Qi svX?2^gH|nwbFn#rU1FZLLA<{94M0f5;DL-o+W-In07*qoM6N<$g4zVcVE_OC diff --git a/scenes/Duck/ente_colormask.png b/scenes/Duck/ente_colormask.png index ba78dd466605d9e6ce5994575388e708e32d05f6..37f675739fc26c2c9a25706b1daaaf422284758b 100644 GIT binary patch delta 1245 zcmV<31S0$4B%CIYBmwS`B_DrTZp9!B{O1%sg0}!Z4q2Ym8}#@cz`Qh-D%BE}8BgqC zlCH1MSNiB7Rg!I`X3v=r=H}8+RGP7m%w!{vP>mix@gx!r0n|xB^o3u*QFGiqmhj@Q zL95_~YP%b)1-?J=JqAksJt!0?&&_nk2Qf$`6xqBVp(uMTkEfjnJ)>OS$FxY^G8aQO zp;EG=u0mGe=h=n64)HN)n})uDbzfA0Cb^WAkX7?ksr{I?jw6$n1R@VeKjaO!U!RPLG;VaGUg;H1>f;?j{slq;yla$+@GUY&07oz zh{UtZFm2+04dUrd+u*!U9Azb0B|aw}H|c`Jk6c$ge&bwpS>TybGn1YtjuMN-4pust zl}wFzia4ffI^_#lk5$fFoV7}gweHDZ7|H7^%Uq{9f+QBP1PLM()KEqRHsZAEq*zGP ze!|B;?D{2gDdZ}Hkz)Z>Xpmh$_#gc4)+$U+cuA3e1knBBI3J@xXcuVK9q0SlahfMU z@EN$$+x}_;nE52V-qvDAK;JfSaoyIGJ>YT&7jV`MloHOUKiz1GbXb>oWlu1NER9M69 zSX*+#APf|qTmy0k-^3S%lfWGepFV{8r4FU$Ew@SQoykWsWLYF3SOESby!S|WYaQNu z1OOm{QKDHPH62SU5ywK5QUU-#2q8v!rgU(XSIjfQ*P>&I2bRc$5MpK_Qp!&rLQXJ! zx7H$kj^hAhOi{;@rZ5G6iD-=+M?eq}t+n5{p3f&}t;?BFN{J9cbpiry#M-#tfVAj{ z=SX!t(t*yoQ-XcpVcWK%khq*mn->5egaFhK&akd)*Y95zLt;42g3*Aq2Bm4wY_^5A?3MKYaVN6YqSktdr$>j#owB*e_qO7phz{z15Lc7{M?h}exber# z*-IEa4s*t3@VagQSDCY`7xI?nRWf&M=Im;NM{^Lzne~3;uIRI+bVY?oDFG3&8kEw- zuJxkF!O@fXVrFK&2q#BNrqc{9oL+>}&*V0F^>v2JoN;iJ8i{ibj4{yM8E4HIr@JZwvy`EU4~assB5A0Uc2sKPVeti_6(Vdwvm(|PPxwkm zfO7LemEOzz+|9Y8ANc24;RPdlcCGZ?I7Zip*mR*6>+RpC_;r$ zE41oha_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rz!Aa3YO8j3^Xc6ndaX;SOd)&PP zghqvFR!EDh6H=gdc;LKv-s$F(*kWbRA#!@bUF7#z@3Dp}fAb%ypV0NMaF7kRU=q4P{hdBSx!EiiI@o zC%X8DUB5&wg=VKHI>;lcY<9r`GPV)rt zKLb~K+h1(}v!A5b+gkJp7}y3buG^Zj2VCv|Lr;cm%C6+6DHIC8`x$*x4hY`@!8Nb9 z);>-jfDCn&x&aOjfw3ZGuXlNOUuSRso@w>>1Coz&v$LYA(EtDqcxhBvbXZMHI%98b zE@88~0(}A`V`VjFWo2PzEj42@WGyr{G%+n=FgY|WH8(RbFk>??IAdZslUxO-4L3PB zGB7zgGc-6eGC7kF25|~AR5CF-FflqaIg^V9BnmTBGBG+ZF*-9jv$+Nl0kf?LU6BPEL>t4hl_fuqlBitCYI} zD-}(00;gF^$il;556N!AleSsRN|^~Egli#ojUq%!nSU+u*gD#_eKFU@aeQx@ z=A$gjC)fRvT|yg11T}Nm8frqc)_NL z&#-mG_QI~~PICl(-+vZG@rVhTwi7nI002sdJL*A?gJVtQ(aMB+5l#+DrR@quoL+>}&s4aE91D)soN;hq8%fu7r@F3R z$vb1HIpZ{V26HA4{RUtgs8BD$!C}vzscz^N|En+STliqVNq}5mkaqkez5&?2XUanu R3bOzJ002ovPDHLkV1jGuAEy8S diff --git a/scenes/Main.tscn b/scenes/Main.tscn index 860f0ca..6c522d3 100644 --- a/scenes/Main.tscn +++ b/scenes/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=3 uid="uid://bb5qp5868y5i"] +[gd_scene load_steps=33 format=3 uid="uid://bb5qp5868y5i"] [ext_resource type="Script" path="res://code/main.gd" id="1_ar2ah"] [ext_resource type="PackedScene" uid="uid://8v5mbbnddorh" path="res://scenes/Duck/Duck.tscn" id="2"] @@ -6,7 +6,6 @@ [ext_resource type="FontFile" uid="uid://ddcous2vnc3ux" path="res://m5x7.ttf" id="2_m1hnc"] [ext_resource type="Texture2D" uid="uid://dgfvf2ta4lc4e" path="res://assets/Ground/stars.png" id="2_ohf2r"] [ext_resource type="Texture2D" uid="uid://bg78j6xxw3ck4" path="res://assets/Ground/background.png" id="3"] -[ext_resource type="Texture2D" uid="uid://bmklwmjrtynqo" path="res://assets/Ground/ground.png" id="3_vc02h"] [ext_resource type="Script" path="res://scenes/hindernis/Spawner/hindernis_spawner.gd" id="4_oc6me"] [ext_resource type="PackedScene" uid="uid://dm307sj4nenjt" path="res://scenes/schild.tscn" id="5_ewtcf"] [ext_resource type="Texture2D" uid="uid://do0okfxenx2ci" path="res://assets/GUI/restart button.png" id="6_boo0r"] @@ -19,6 +18,9 @@ [ext_resource type="Texture2D" uid="uid://nvn254p6tk8j" path="res://assets/GUI/back button.png" id="15_wi7xd"] [ext_resource type="Script" path="res://code/GUI/settingsschild.gd" id="16_0wi25"] [ext_resource type="Texture2D" uid="uid://bf82voofmvdj4" path="res://assets/GUI/theme_slider/slider.png" id="17_41xdg"] +[ext_resource type="AudioStream" uid="uid://drriw1cka4m3" path="res://assets/audio/gui-in.ogg" id="20_eihxi"] +[ext_resource type="AudioStream" uid="uid://ctt1kb2a66yyl" path="res://assets/audio/boing.mp3" id="21_ch5yv"] +[ext_resource type="AudioStream" uid="uid://bktthpfrs0118" path="res://assets/audio/gui-out.ogg" id="21_frskh"] [sub_resource type="Animation" id="Animation_n8ktn"] length = 0.001 @@ -164,6 +166,20 @@ size = Vector2(4, 15) [sub_resource type="RectangleShape2D" id="RectangleShape2D_0a3yj"] size = Vector2(361, 8) +[sub_resource type="GDScript" id="GDScript_5rki8"] +script/source = "extends Control + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + show() + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta: float) -> void: +# pass +" + [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_jin1w"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_g0rdc"] @@ -204,7 +220,7 @@ autostart = true script = SubResource("GDScript_rkc4w") [node name="BackgroundRect" type="ColorRect" parent="Screen"] -offset_right = 801.0 +offset_right = 1138.0 offset_bottom = 97.0 color = Color(0.560784, 0.937255, 0.937255, 1) @@ -212,44 +228,24 @@ color = Color(0.560784, 0.937255, 0.937255, 1) [node name="Stars" type="Sprite2D" parent="Screen/Background"] modulate = Color(1, 1, 1, 0) -position = Vector2(85, 50) +position = Vector2(130, 50) texture = ExtResource("2_ohf2r") -[node name="Sprites" type="Node2D" parent="Screen/Background"] -position = Vector2(79, 96) - -[node name="Background" type="Sprite2D" parent="Screen/Background/Sprites"] -position = Vector2(21, -37) +[node name="Sprite" type="TextureRect" parent="Screen/Background"] +offset_top = 8.0 +offset_right = 1134.0 +offset_bottom = 300.0 texture = ExtResource("3") - -[node name="Background2" type="Sprite2D" parent="Screen/Background/Sprites"] -position = Vector2(221, -37) -texture = ExtResource("3") - -[node name="Background3" type="Sprite2D" parent="Screen/Background/Sprites"] -position = Vector2(421, -37) -texture = ExtResource("3") - -[node name="Ground" type="Sprite2D" parent="Screen/Background/Sprites"] -position = Vector2(21, -2) -texture = ExtResource("3_vc02h") - -[node name="Ground2" type="Sprite2D" parent="Screen/Background/Sprites"] -position = Vector2(221, -2) -texture = ExtResource("3_vc02h") - -[node name="Ground3" type="Sprite2D" parent="Screen/Background/Sprites"] -position = Vector2(421, -2) -texture = ExtResource("3_vc02h") +stretch_mode = 1 [node name="Floor" type="StaticBody2D" parent="Screen/Background"] [node name="EasterEggFixCollision" type="CollisionShape2D" parent="Screen/Background/Floor"] -position = Vector2(-2, 83.5) +position = Vector2(-2, 83) shape = SubResource("RectangleShape2D_o05as") [node name="CollisionShape2D" type="CollisionShape2D" parent="Screen/Background/Floor"] -position = Vector2(101.5, 96) +position = Vector2(176, 96) shape = SubResource("RectangleShape2D_0a3yj") [node name="HindernissSpawner" type="Marker2D" parent="Screen"] @@ -283,18 +279,72 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +script = SubResource("GDScript_5rki8") + +[node name="Settings" parent="Gui" instance=ExtResource("5_ewtcf")] +layout_mode = 1 +anchors_preset = 1 +anchor_left = 1.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 0.0 +offset_left = -102.0 +offset_top = -68.0 +offset_right = -2.0 +offset_bottom = 82.0 +grow_horizontal = 0 +size_flags_horizontal = 8 +size_flags_vertical = 4 +stretch_mode = 2 +script = ExtResource("16_0wi25") + +[node name="BackButton" type="TextureButton" parent="Gui/Settings"] +layout_mode = 1 +offset_left = 2.0 +offset_top = 79.0 +offset_right = 17.0 +offset_bottom = 94.0 +texture_normal = ExtResource("15_wi7xd") + +[node name="ColorSlider" type="HSlider" parent="Gui/Settings"] +layout_mode = 1 +anchors_preset = -1 +anchor_right = 0.699 +anchor_bottom = 0.5 +offset_left = 31.0 +offset_top = 93.0 +offset_right = 25.1 +offset_bottom = 34.0 +theme = SubResource("Theme_0130c") +value = 17.0 +allow_greater = true +allow_lesser = true + +[node name="ColorLabel" type="Label" parent="Gui/Settings"] +layout_mode = 0 +offset_left = 4.0 +offset_top = 93.0 +offset_right = 44.0 +offset_bottom = 116.0 +theme_override_fonts/font = ExtResource("2_m1hnc") +text = "Color" [node name="GameOverSchild" parent="Gui" instance=ExtResource("5_ewtcf")] visible = false layout_mode = 1 -anchors_preset = -1 +anchors_preset = 8 anchor_left = 0.5 +anchor_top = 0.5 anchor_right = 0.5 -offset_left = -53.0 -offset_top = -69.0 -offset_right = 47.0 -offset_bottom = 81.0 +anchor_bottom = 0.5 +offset_left = -51.0 +offset_top = -116.0 +offset_right = 49.0 +offset_bottom = 34.0 grow_horizontal = 2 +grow_vertical = 2 +size_flags_vertical = 4 +stretch_mode = 2 [node name="Restart" type="TextureButton" parent="Gui/GameOverSchild"] texture_repeat = 2 @@ -313,18 +363,21 @@ texture_normal = ExtResource("6_boo0r") stretch_mode = 1 [node name="StartSchild" parent="Gui" instance=ExtResource("5_ewtcf")] +visible = false layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 +anchors_preset = 6 +anchor_left = 1.0 anchor_top = 0.5 -anchor_right = 0.5 +anchor_right = 1.0 anchor_bottom = 0.5 -offset_left = -26.0 -offset_top = -118.0 -offset_right = 74.0 -offset_bottom = 32.0 -grow_horizontal = 2 +offset_left = -101.0 +offset_top = -114.0 +offset_right = -1.0 +offset_bottom = 36.0 +grow_horizontal = 0 grow_vertical = 2 +size_flags_vertical = 4 +stretch_mode = 2 script = ExtResource("10_tn1on") [node name="Start" type="TextureButton" parent="Gui/StartSchild"] @@ -365,62 +418,22 @@ stretch_mode = 1 [node name="Logo" type="TextureButton" parent="Gui/StartSchild"] layout_mode = 1 -anchors_preset = 15 +anchors_preset = 3 +anchor_left = 1.0 +anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = -92.0 -offset_top = 111.0 -offset_right = -64.0 -offset_bottom = -10.0 -grow_horizontal = 2 -grow_vertical = 2 -rotation = -0.397935 +offset_left = -177.0 +offset_top = -38.0 +offset_right = -49.0 +offset_bottom = -9.0 +grow_horizontal = 0 +grow_vertical = 0 +rotation = -0.413643 +size_flags_horizontal = 4 +size_flags_vertical = 4 texture_normal = ExtResource("14_4hepj") -[node name="Settings" parent="Gui" instance=ExtResource("5_ewtcf")] -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -26.0 -offset_top = -118.0 -offset_right = 74.0 -offset_bottom = 32.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("16_0wi25") - -[node name="BackButton" type="TextureButton" parent="Gui/Settings"] -layout_mode = 1 -offset_left = 2.0 -offset_top = 79.0 -offset_right = 17.0 -offset_bottom = 94.0 -texture_normal = ExtResource("15_wi7xd") - -[node name="ColorSlider" type="HSlider" parent="Gui/Settings"] -layout_mode = 1 -anchors_preset = -1 -anchor_right = 0.699 -anchor_bottom = 0.5 -offset_left = 34.0 -offset_top = 93.0 -offset_right = 22.1 -offset_bottom = 34.0 -theme = SubResource("Theme_0130c") -value = 16.0 - -[node name="ColorLabel" type="Label" parent="Gui/Settings"] -layout_mode = 0 -offset_left = 4.0 -offset_top = 93.0 -offset_right = 44.0 -offset_bottom = 116.0 -theme_override_fonts/font = ExtResource("2_m1hnc") -text = "Farbe" - [node name="Score" type="Label" parent="Gui"] layout_mode = 1 anchors_preset = 13 @@ -442,15 +455,26 @@ script = ExtResource("2_4em51") wait_time = 0.1 autostart = true +[node name="Audio" type="Node" parent="."] + +[node name="Gui-in" type="AudioStreamPlayer" parent="Audio"] +stream = ExtResource("20_eihxi") + +[node name="Gui-out" type="AudioStreamPlayer" parent="Audio"] +stream = ExtResource("21_frskh") + +[node name="GameOver" type="AudioStreamPlayer" parent="Audio"] +stream = ExtResource("21_ch5yv") + [connection signal="timeout" from="Screen/Day-NightTimer" to="Screen/Day-NightTimer" method="_change_time"] [connection signal="gameover" from="Screen/Duck" to="Gui/GameOverSchild" method="_on_duck_gameover"] [connection signal="timeout" from="Screen/LevelUpTimer" to="." method="_on_level_up_timer_timeout"] [connection signal="timeout" from="Screen/SpawnTimer" to="Screen/HindernissSpawner" method="_spawn"] [connection signal="timeout" from="Screen/WolkenTimer" to="Screen/WolkenSpawner" method="_spawn"] +[connection signal="pressed" from="Gui/Settings/BackButton" to="Gui/Settings" method="_on_back_pressed"] +[connection signal="value_changed" from="Gui/Settings/ColorSlider" to="Screen/Duck" method="_color_slider_changed"] [connection signal="pressed" from="Gui/GameOverSchild/Restart" to="Gui/GameOverSchild" method="_on_restart_pressed"] [connection signal="pressed" from="Gui/StartSchild/Start" to="Gui/StartSchild" method="_on_start_pressed"] [connection signal="pressed" from="Gui/StartSchild/Settings" to="Gui/StartSchild" method="_on_settings_pressed"] [connection signal="pressed" from="Gui/StartSchild/Logo" to="Screen/EastereggSpawner" method="_spawn"] -[connection signal="pressed" from="Gui/Settings/BackButton" to="Gui/Settings" method="_on_back_pressed"] -[connection signal="value_changed" from="Gui/Settings/ColorSlider" to="Screen/Duck" method="_color_slider_changed"] [connection signal="timeout" from="Gui/Score/ScoreCounter" to="." method="_score"] diff --git a/code/global.gd b/scenes/global.gd similarity index 100% rename from code/global.gd rename to scenes/global.gd diff --git a/scenes/schild.tscn b/scenes/schild.tscn index dcedd5e..21a79a6 100644 --- a/scenes/schild.tscn +++ b/scenes/schild.tscn @@ -3,6 +3,9 @@ [ext_resource type="Texture2D" uid="uid://cfmflpkl335e3" path="res://assets/GUI/schild.png" id="1_wyhk0"] [ext_resource type="Script" path="res://code/GUI/restartschild.gd" id="2_pxsow"] +[sub_resource type="Animation" id="Animation_hmob6"] +length = 0.001 + [sub_resource type="Animation" id="Animation_wgvxk"] resource_name = "out-in" length = 0.3 @@ -18,9 +21,6 @@ tracks/0/keys = { "times": PackedFloat32Array(0, 0.3) } -[sub_resource type="Animation" id="Animation_hmob6"] -length = 0.001 - [sub_resource type="AnimationLibrary" id="AnimationLibrary_ur3ij"] _data = { "RESET": SubResource("Animation_hmob6"), @@ -28,10 +28,15 @@ _data = { } [node name="Schild" type="TextureRect"] -offset_left = -48.0 -offset_top = -67.0 -offset_right = 52.0 -offset_bottom = 83.0 +anchors_preset = -1 +anchor_left = -0.259 +anchor_top = 0.14 +anchor_right = 0.282 +anchor_bottom = 0.79 +offset_left = -3.97 +offset_top = -81.0 +offset_right = 4.06 +offset_bottom = 4.0 size_flags_horizontal = 4 texture = ExtResource("1_wyhk0") script = ExtResource("2_pxsow")