From cc347d3766f52fbda5f77da83d230d37d04a681d Mon Sep 17 00:00:00 2001 From: zoe Date: Sun, 23 Jan 2022 20:13:52 +0100 Subject: [PATCH] stop watering if plant has enough water --- ...k.wav-fb28b520dfe4921bc9c03a8382a0798d.md5 | 3 +++ ...av-fb28b520dfe4921bc9c03a8382a0798d.sample | Bin 0 -> 2937 bytes Music/Talk.wav | Bin 0 -> 2748 bytes Music/Talk.wav.import | 21 ++++++++++++++++++ Tools/WateringCan.gd | 10 +++++++-- World/GoodAndWellBalancedWaterParticles.tscn | 1 - World/Main.tscn | 21 ++++++++++++++++-- World/Terminal.gd | 3 ++- default_bus_layout.tres | 4 ++-- export_presets.cfg | 2 +- 10 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 .import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.md5 create mode 100644 .import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.sample create mode 100644 Music/Talk.wav create mode 100644 Music/Talk.wav.import diff --git a/.import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.md5 b/.import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.md5 new file mode 100644 index 0000000..a55308b --- /dev/null +++ b/.import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.md5 @@ -0,0 +1,3 @@ +source_md5="fbfefef2a65ed1a7a9c92b489749044f" +dest_md5="693b134ec89e539e9df9c309685e9619" + diff --git a/.import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.sample b/.import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.sample new file mode 100644 index 0000000000000000000000000000000000000000..0609779dae56e47c473607105ac54564857ec4b3 GIT binary patch literal 2937 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 CqC%|z literal 0 HcmV?d00001 diff --git a/Music/Talk.wav b/Music/Talk.wav new file mode 100644 index 0000000000000000000000000000000000000000..2e05acdde3d630935c43bb05311b803bbe8b951e GIT binary patch literal 2748 zcmZ{mdpMNa8o<~0&5U7YFd1W9av8%!B9~liqYI(Z1<^f`lG>DZDLd^-r8p{;a-tGj ziER^mr*JAIWmF7unK8MHjM2mxmxh^dop1kj{yOXTywCHlwcgu$-e;|6Z3^`Fuc81D zzI?M^%%P(ebN~PXP_U{L0D1)qh=2~FBacQJ;x_;6AOM2^knnW~b6_qcK@Av=ZbFag zoYE<>xM#7>Im9{7`?hzBPrFZ!OSVgr=}A*})D3n0>h_iM!SchcsRrbGoJ@!iTP4z{6h(394xo#J2(rj)SWE=FL z0<>_fU~F6@7p3zr^Rsx@dAFKwH6?tC|Fo@pdpB*EHY}JHOan4PE@3`qMzVLa$85%J zs_m-n@@?~NnH&~}WP}>sr#+y>!C2Tl@o{3Y#8Hydm)-YVSSK774hh@(+xquO_e;A* zyGFCRuXcOatf-mIpUT(D*3OpR8@_k0{zCmO#WqD5w~~7*>_pi8lLaT?>Hl#w`AG6~ z#7xAHgV=$BQqawv5uGb5msdvR?9DOE(9f{TaLkyW!^+{8cb12@gtYJ!9~B-fS5~oG zshd1l7M!=^!H%rR%*gt!Z?;AUMF*8QKX(4vAi)4pVn43-X7w@~^&4xR);;}RK3Yzw z)TrEF7hQMzKV?rH?|l14EZPnlmTaa&-fnZByc?Dyylkiz4#7gj%AeVTGvy~rJMt2z?sDK z#Popt)%i^?nqR~WMi0_88JfekgSMf5;eKzzUxnY;b$i$0?T5D8uXkKu?)j%@m06`( z6tWl5ADTDBYyQ;CsG--Ktw^mHDDNxhSGQF!cxUr&K-ecto4h<3OWQ{qW{sf zDzabQc%|x8b&kqM<-2K-v_z{TR=MtZ?$ax$Rwe`_1PrViTt)Iiy*Ap0*$VZ$^ofuR zU8PH;PrAyx7BxFIe`)AxuzYLt_E~dfb57UYu9XsRNw0E1xs$q;I$|s{7I3?`WCyat zx5eKUrz|?X=ryOFW6UyP8R+Wk{?2^F9OU+K^*op!cUR=Dc!-O~(?o10 z_O4%6KUp+g6nJy>O+jXFCg%qG#{5Fl!iL(nwH5+1LCsv<9La=W@~7()SCc?i;IWWj zL##qgL!;IlSo74Y!fTP0qt#8ybxO;4>v(l{b@yM5e>JAnUaU2L#(s9CE~8HQPW?{O zJ=E>--Sc}cA(v3bDr0T1*Jd+hHhTiHfBUrH3XHCI=LKicQi@(#hVbUV1ydy{}EwcDXOJ z@67bC({=P$^z4N<7Ml8+`E~_&2CoYX4nsqbkY56h2TfVG?>N5rW3x1O^-r#en_1a$;=GX5PV68P;8dCSi?xe z$Yx2HiG zN>t}b7fAlv{@PrIHRIm~cMPIfdswN=RA$7yt@932_fwA$lZZj;Rq8*c%csNT5%Nx1 zn=IyA+&355V%g-_%-GJ!ZIkWFPUTDZA9#oqPYR^0rZj7R(0-y@uKQB=wJukOqoYZs zQbig94NKG--KE~H)>j%R-%P!pDpnLL$O=tGyMnKnoSK=kQ`#txs*b5XU_7i47D0Px z2T_cO6{{br?_&?JAs_}iL>*!fIfyLPl4@P0UZc`!Il0JP>GhIiO30r4UEAXtO-9$k@}tLohn2XhI=np z<*4#h8`QySAIulq33tFGZ~~k`enW!MV7!YRs0M*Z_<|0g2hjuQQ=}RZ0TGbHG01=h za5EN)wW#^(E9!sYa#h`p6M= z&A7*1zypn70DQ%z57!#OEpQub2ipJ>hY#D~EqEQqzyokCTmx4_Kez#g!Q(Ii=D|WJ zfE`c==m9^l3dG}N;M~T!fpZ$9fE{2LZ~;zuHZtghov;$;CeB580iJ`YaBW~nC>Q@7 z1_t}D4-D}SHOBR|>(+%>*c^=AllXIVOzgqE_D&9t4lYi%0K`VSSgiQRdX)%TMHD--|# literal 0 HcmV?d00001 diff --git a/Music/Talk.wav.import b/Music/Talk.wav.import new file mode 100644 index 0000000..8963b0a --- /dev/null +++ b/Music/Talk.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.sample" + +[deps] + +source_file="res://Music/Talk.wav" +dest_files=[ "res://.import/Talk.wav-fb28b520dfe4921bc9c03a8382a0798d.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/Tools/WateringCan.gd b/Tools/WateringCan.gd index e5c243d..e0c7d12 100644 --- a/Tools/WateringCan.gd +++ b/Tools/WateringCan.gd @@ -7,6 +7,12 @@ func _on_WateringCan_pressed(): $Timer.start(0.1) $WaterParticles.emitting = true if !watering: - $Timer.stop() - $WaterParticles.emitting = false + stop_watering() +func on_enough_water(): + watering = false + stop_watering() + +func stop_watering(): + $Timer.stop() + $WaterParticles.emitting = false diff --git a/World/GoodAndWellBalancedWaterParticles.tscn b/World/GoodAndWellBalancedWaterParticles.tscn index 98278e5..2f414a5 100644 --- a/World/GoodAndWellBalancedWaterParticles.tscn +++ b/World/GoodAndWellBalancedWaterParticles.tscn @@ -17,7 +17,6 @@ color = Color( 0.341176, 0.337255, 0.756863, 1 ) [node name="GoodAndWellBalancedWaterParticles" type="Particles2D"] position = Vector2( 0, -3 ) z_index = 2 -emitting = false amount = 32 lifetime = 2.0 explosiveness = 1.0 diff --git a/World/Main.tscn b/World/Main.tscn index 46ebaab..9cb8443 100644 --- a/World/Main.tscn +++ b/World/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=30 format=2] [ext_resource path="res://World/Plant.tscn" type="PackedScene" id=1] [ext_resource path="res://World/FullscreenButton.gd" type="Script" id=2] @@ -20,6 +20,7 @@ [ext_resource path="res://World/Clouds.gd" type="Script" id=18] [ext_resource path="res://Aseprite/sfx.png" type="Texture" id=19] [ext_resource path="res://Aseprite/sfx-hover.png" type="Texture" id=20] +[ext_resource path="res://Music/Talk.wav" type="AudioStream" id=21] [sub_resource type="Theme" id=7] @@ -55,6 +56,14 @@ orbit_velocity = 0.0 orbit_velocity_random = 0.0 color = Color( 0.341176, 0.337255, 0.756863, 1 ) +[sub_resource type="Environment" id=14] +background_mode = 4 +glow_enabled = true +glow_levels/4 = true +glow_levels/5 = false +glow_levels/7 = true +glow_bloom = 0.34 + [node name="Main" type="Node2D"] [node name="Plant" parent="." instance=ExtResource( 1 )] @@ -165,7 +174,7 @@ __meta__ = { material = SubResource( 3 ) margin_left = 1.0 margin_top = 1.0 -margin_right = 105.0 +margin_right = 106.0 margin_bottom = 124.0 theme = ExtResource( 5 ) custom_colors/default_color = Color( 0.94902, 0.988235, 0.878431, 1 ) @@ -183,6 +192,10 @@ wait_time = 0.05 [node name="MessageTimer" type="Timer" parent="RightPanel/Terminal"] +[node name="Talk" type="AudioStreamPlayer" parent="RightPanel/Terminal"] +stream = ExtResource( 21 ) +bus = "SFX" + [node name="WateringCan" type="TextureButton" parent="RightPanel"] margin_left = 1.0 margin_top = 125.0 @@ -209,7 +222,11 @@ amount = 15 lifetime = 0.5 process_material = SubResource( 13 ) +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource( 14 ) + [connection signal="good_water" from="Plant" to="PlantBackground/Pot" method="_on_Plant_good_water"] +[connection signal="good_water" from="Plant" to="RightPanel/WateringCan" method="on_enough_water"] [connection signal="has_need" from="Plant" to="RightPanel/Terminal" method="_on_Plant_has_need"] [connection signal="timeout" from="PlantBackground/Clouds/Timer" to="PlantBackground/Clouds" method="_on_Timer_timeout"] [connection signal="pressed" from="Options/FullscreenButton" to="Options/FullscreenButton" method="_on_FullscreenButton_pressed"] diff --git a/World/Terminal.gd b/World/Terminal.gd index 8028f4e..66c50ae 100644 --- a/World/Terminal.gd +++ b/World/Terminal.gd @@ -25,7 +25,6 @@ var water_msg_good = [ "When i'm happy i grow [shake rate=10 level=2]flowers[/shake]!", "I'm [wave amp=24 freq=2]way[/wave] bigger than the flowers outside :)" ] - var social = [ "You ever think about bees?", "You like [wave amp=24 freq=2]Jazz[/wave]?", @@ -79,6 +78,8 @@ func print_message(mesage): func _on_Reveal_timeout() -> void: if visible_characters <= text.length(): visible_characters += 1 + $Talk.play(0) + $Talk.pitch_scale = rand_range(0.7, 1.3) else: $Reveal.stop() diff --git a/default_bus_layout.tres b/default_bus_layout.tres index 2aa3db1..d12576d 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -6,11 +6,11 @@ bus/1/name = "Music" bus/1/solo = false bus/1/mute = false bus/1/bypass_fx = false -bus/1/volume_db = -80.0 +bus/1/volume_db = -11.952 bus/1/send = "Master" bus/2/name = "SFX" bus/2/solo = false bus/2/mute = false bus/2/bypass_fx = false -bus/2/volume_db = 0.0 +bus/2/volume_db = -11.9576 bus/2/send = "Master" diff --git a/export_presets.cfg b/export_presets.cfg index 50688b2..d5d4b62 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -18,7 +18,7 @@ custom_template/release="" variant/export_type=0 vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=true -html/export_icon=true +html/export_icon=false html/custom_html_shell="" html/head_include="" html/canvas_resize_policy=2