diff --git a/.import/Cloud.png-a0f5bc28b2ba9effeb7a4fe75f154a67.md5 b/.import/Cloud.png-a0f5bc28b2ba9effeb7a4fe75f154a67.md5 index 8d8e8e0..5dbbd8a 100644 --- a/.import/Cloud.png-a0f5bc28b2ba9effeb7a4fe75f154a67.md5 +++ b/.import/Cloud.png-a0f5bc28b2ba9effeb7a4fe75f154a67.md5 @@ -1,3 +1,3 @@ -source_md5="e2f90ec0ece54febcc0c6eb8f92f50f3" -dest_md5="77306c3804fa1897c93aeb7e5967022d" +source_md5="c350e2bb99fd3bbcfa0e51ce07d5d1df" +dest_md5="9780a2ab73ad9cb49a2ac8022da4e194" diff --git a/.import/Cloud.png-a0f5bc28b2ba9effeb7a4fe75f154a67.stex b/.import/Cloud.png-a0f5bc28b2ba9effeb7a4fe75f154a67.stex index 97b61d5..7000c0f 100644 Binary files a/.import/Cloud.png-a0f5bc28b2ba9effeb7a4fe75f154a67.stex and b/.import/Cloud.png-a0f5bc28b2ba9effeb7a4fe75f154a67.stex differ diff --git a/.import/sfx-hover.png-e4fd31a88df381787ed821df25f28804.md5 b/.import/sfx-hover.png-e4fd31a88df381787ed821df25f28804.md5 new file mode 100644 index 0000000..5737db2 --- /dev/null +++ b/.import/sfx-hover.png-e4fd31a88df381787ed821df25f28804.md5 @@ -0,0 +1,3 @@ +source_md5="18204f3c45fbad369b67ea0a0227e09a" +dest_md5="11f28e8d8a17a6bb1c9fad03e0871868" + diff --git a/.import/sfx-hover.png-e4fd31a88df381787ed821df25f28804.stex b/.import/sfx-hover.png-e4fd31a88df381787ed821df25f28804.stex new file mode 100644 index 0000000..4cdf450 Binary files /dev/null and b/.import/sfx-hover.png-e4fd31a88df381787ed821df25f28804.stex differ diff --git a/.import/sfx.png-646761d094e3fff25b90f3b48527552d.md5 b/.import/sfx.png-646761d094e3fff25b90f3b48527552d.md5 new file mode 100644 index 0000000..6b5db72 --- /dev/null +++ b/.import/sfx.png-646761d094e3fff25b90f3b48527552d.md5 @@ -0,0 +1,3 @@ +source_md5="fec3789cbf203105b85c27bd846c2269" +dest_md5="cde5ef8bf3d5f550b9b9c0e893d72360" + diff --git a/.import/sfx.png-646761d094e3fff25b90f3b48527552d.stex b/.import/sfx.png-646761d094e3fff25b90f3b48527552d.stex new file mode 100644 index 0000000..6a85dad Binary files /dev/null and b/.import/sfx.png-646761d094e3fff25b90f3b48527552d.stex differ diff --git a/Aseprite/Cloud.png b/Aseprite/Cloud.png index 43b769d..d46eb4c 100644 Binary files a/Aseprite/Cloud.png and b/Aseprite/Cloud.png differ diff --git a/Aseprite/sfx-hover.png b/Aseprite/sfx-hover.png new file mode 100644 index 0000000..a783602 Binary files /dev/null and b/Aseprite/sfx-hover.png differ diff --git a/Aseprite/sfx-hover.png.import b/Aseprite/sfx-hover.png.import new file mode 100644 index 0000000..da35cb0 --- /dev/null +++ b/Aseprite/sfx-hover.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sfx-hover.png-e4fd31a88df381787ed821df25f28804.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Aseprite/sfx-hover.png" +dest_files=[ "res://.import/sfx-hover.png-e4fd31a88df381787ed821df25f28804.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Aseprite/sfx.png b/Aseprite/sfx.png new file mode 100644 index 0000000..870650d Binary files /dev/null and b/Aseprite/sfx.png differ diff --git a/Aseprite/sfx.png.import b/Aseprite/sfx.png.import new file mode 100644 index 0000000..04deed4 --- /dev/null +++ b/Aseprite/sfx.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sfx.png-646761d094e3fff25b90f3b48527552d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Aseprite/sfx.png" +dest_files=[ "res://.import/sfx.png-646761d094e3fff25b90f3b48527552d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/World/Main.tscn b/World/Main.tscn index 45e1e23..df06f3e 100644 --- a/World/Main.tscn +++ b/World/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=28 format=2] [ext_resource path="res://World/Plant.tscn" type="PackedScene" id=1] [ext_resource path="res://World/FullscreenButton.gd" type="Script" id=2] @@ -18,6 +18,8 @@ [ext_resource path="res://Aseprite/Background.png" type="Texture" id=16] [ext_resource path="res://Aseprite/Mountains.png" type="Texture" id=17] [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] [sub_resource type="Theme" id=7] @@ -57,6 +59,26 @@ color = Color( 0.341176, 0.337255, 0.756863, 1 ) [node name="Plant" parent="." instance=ExtResource( 1 )] +[node name="PlantBackground" type="Node2D" parent="."] + +[node name="Mountains" type="Sprite" parent="PlantBackground"] +position = Vector2( 64, 74 ) +texture = ExtResource( 17 ) + +[node name="Clouds" type="Node2D" parent="PlantBackground"] +script = ExtResource( 18 ) + +[node name="Timer" type="Timer" parent="PlantBackground/Clouds"] + +[node name="Background" type="Sprite" parent="PlantBackground"] +texture = ExtResource( 16 ) +centered = false + +[node name="Pot" type="Sprite" parent="PlantBackground"] +position = Vector2( 64, 135 ) +texture = ExtResource( 9 ) +script = ExtResource( 15 ) + [node name="Blue" type="ColorRect" parent="."] margin_left = 128.0 margin_right = 237.0 @@ -114,10 +136,10 @@ margin_top = 1.0 margin_right = 17.0 margin_bottom = 62.0 rect_scale = Vector2( 1, 0.99844 ) -custom_icons/tick = ExtResource( 7 ) -custom_icons/grabber_disabled = ExtResource( 7 ) -custom_icons/grabber_highlight = ExtResource( 8 ) -custom_icons/grabber = ExtResource( 7 ) +custom_icons/tick = ExtResource( 19 ) +custom_icons/grabber_disabled = ExtResource( 19 ) +custom_icons/grabber_highlight = ExtResource( 20 ) +custom_icons/grabber = ExtResource( 19 ) custom_styles/slider = SubResource( 2 ) max_value = 1.0 step = 0.1 @@ -127,26 +149,6 @@ __meta__ = { } bus_channel = "SFX" -[node name="Node2D" type="Node2D" parent="."] - -[node name="Mountains" type="Sprite" parent="Node2D"] -position = Vector2( 64, 74 ) -texture = ExtResource( 17 ) - -[node name="Clouds" type="Node2D" parent="Node2D"] -script = ExtResource( 18 ) - -[node name="Timer" type="Timer" parent="Node2D/Clouds"] - -[node name="Background" type="Sprite" parent="Node2D"] -texture = ExtResource( 16 ) -centered = false - -[node name="Pot" type="Sprite" parent="Node2D"] -position = Vector2( 64, 135 ) -texture = ExtResource( 9 ) -script = ExtResource( 15 ) - [node name="RightPanel" type="Panel" parent="."] margin_left = 129.0 margin_top = 1.0 @@ -186,9 +188,11 @@ margin_left = 1.0 margin_top = 125.0 margin_right = 18.0 margin_bottom = 142.0 +toggle_mode = true +action_mode = 0 texture_normal = ExtResource( 12 ) texture_pressed = ExtResource( 14 ) -texture_hover = ExtResource( 14 ) +texture_hover = ExtResource( 12 ) texture_disabled = ExtResource( 12 ) script = ExtResource( 13 ) __meta__ = { @@ -205,12 +209,12 @@ amount = 15 lifetime = 0.5 process_material = SubResource( 13 ) -[connection signal="good_water" from="Plant" to="Node2D/Pot" method="_on_Plant_good_water"] +[connection signal="good_water" from="Plant" to="PlantBackground/Pot" method="_on_Plant_good_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"] [connection signal="value_changed" from="Options/MusicVolume" to="Options/MusicVolume" method="_on_MusicVolume_value_changed"] [connection signal="value_changed" from="Options/SFXVolume" to="Options/SFXVolume" method="_on_MusicVolume_value_changed"] -[connection signal="timeout" from="Node2D/Clouds/Timer" to="Node2D/Clouds" method="_on_Timer_timeout"] [connection signal="was_social" from="RightPanel/Terminal" to="Plant" method="_on_Terminal_was_social"] [connection signal="timeout" from="RightPanel/Terminal/Reveal" to="RightPanel/Terminal" method="_on_Reveal_timeout"] [connection signal="timeout" from="RightPanel/Terminal/MessageTimer" to="RightPanel/Terminal" method="_on_MessageTimer_timeout"] diff --git a/World/Terminal.gd b/World/Terminal.gd index 1bd295b..8028f4e 100644 --- a/World/Terminal.gd +++ b/World/Terminal.gd @@ -38,6 +38,7 @@ var social = [ "If i had to fight someone i would simply look up the weaknesses section on their wikipedia page.", "Do you wanna watch anime together?", "I hope you had a nice day today!", + "Do you have games on your phone", ] func _ready() -> void: diff --git a/export_presets.cfg b/export_presets.cfg index 5360b68..50688b2 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -7,7 +7,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../plantGame/Untitled Plant Game.html" +export_path="../plantGame/index.html" script_export_mode=1 script_encryption_key=""