diff --git a/NOTICE.md b/NOTICE.md index 6aaaea6..a83d625 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -9,8 +9,23 @@ This project uses the following external assets: | `./entities/sheep_drag.wav` | https://freesound.org/people/michaelperfect/sounds/710298/ | CC0 | | `./temp/click&pop.wav` | https://freesound.org/people/GammaGool/sounds/730488/ | CC0 | | `./temp/pop.wav` | https://freesound.org/people/NovaSoundTechnology/sounds/727104/ | CC0 | +<<<<<<< HEAD | `./temp/mouth_pop.wav` | https://freesound.org/people/igaopuromalte/sounds/725453/ | CC-BY 4.0 | | `./temp/puff.wav` | https://freesound.org/people/JustInvoke/sounds/446124/ | CC-BY 4.0 | | `./entities/drop.wav` | https://freesound.org/people/Planman/sounds/208111/ | CC0 | | `./temp/gore.wav` | https://freesound.org/people/MinecraftGamerLR/sounds/728695/ | CC-BY 4.0 | -| `./temp/bones.wav` | https://freesound.org/people/cliftonmcarlson/sounds/392883/ | CC0 | \ No newline at end of file +| `./temp/bones.wav` | https://freesound.org/people/cliftonmcarlson/sounds/392883/ | CC0 | +======= +| `./temp/mouth_pop.wav` | https://freesound.org/people/igaopuromalte/sounds/725453/ | Attribution 4 | +| `./temp/puff.wav` | https://freesound.org/people/JustInvoke/sounds/446124/ | Attribution 4 | +| `./temp/place.wav` | https://freesound.org/people/Planman/sounds/208111/ | CC0 | +| `./temp/gore.wav` | https://freesound.org/people/MinecraftGamerLR/sounds/728695/ | Attribution 4 | +| `./temp/bones.wav` | https://freesound.org/people/cliftonmcarlson/sounds/392883/ | CC0 | +| `./temp/metallic_whistle.wav` | https://freesound.org/people/furbyguy/sounds/365643/| Attribution 3| +| `./temp/upgradeselect.wav` | https://freesound.org/people/TechspiredMinds/sounds/729216/| Attribution 4| +| `./temp/upgrade.wav` | https://freesound.org/people/colorsCrimsonTears/sounds/607409/ | CC0 | +| `./temp/again.wav` | https://freesound.org/people/LorenzoTheGreat/sounds/417795/ | Attribution 3 | +| `./temp/squelch.wav` | https://freesound.org/people/primeval_polypod/sounds/159389/ | Attribution 3 | +| `./temp/arcade_cancel.flac` | https://freesound.org/people/plasterbrain/sounds/464912/ | CC0 | +| `./temp/cancel.wav` | https://freesound.org/people/Kagateni/sounds/571510/ | CC0 | +>>>>>>> beb42d04ed6a0801686ed9ca29e323c6916aae97 diff --git a/behaviours/spawner.gd b/behaviours/spawner.gd index 13a0411..507117a 100644 --- a/behaviours/spawner.gd +++ b/behaviours/spawner.gd @@ -16,3 +16,4 @@ func spawn(): func _ready(): if parent == null: parent = MainGame.get_ancestor(self).get_node("SpawnedEntities") + diff --git a/entities/cloud.gd b/entities/cloud.gd new file mode 100644 index 0000000..17e0734 --- /dev/null +++ b/entities/cloud.gd @@ -0,0 +1,14 @@ +extends Node2D +class_name Cloud + +@onready var player = $"AnimationPlayer" +@onready var spawner = $"Spawner" + +func _ready(): + spawner.spawn() + var player = $"AnimationPlayer" + player.play("fade_out") + await player.animation_finished + queue_free() + + diff --git a/entities/cloud.tscn b/entities/cloud.tscn new file mode 100644 index 0000000..454b64c --- /dev/null +++ b/entities/cloud.tscn @@ -0,0 +1,123 @@ +[gd_scene load_steps=8 format=3 uid="uid://eqb3vfbvjefp"] + +[ext_resource type="Script" path="res://entities/cloud.gd" id="1_8jsek"] +[ext_resource type="PackedScene" uid="uid://bc2bm8lbol18w" path="res://entities/sheep.tscn" id="3_naxi5"] +[ext_resource type="PackedScene" uid="uid://cyrg770fsetyu" path="res://behaviours/spawner.tscn" id="4_0cics"] + +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_08frh"] + +[sub_resource type="Animation" id="Animation_mqmwg"] +resource_name = "fade_out" +tracks/0/type = "bezier" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite:modulate:r") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"handle_modes": PackedInt32Array(0, 0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0, 1) +} +tracks/1/type = "bezier" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite:modulate:g") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"handle_modes": PackedInt32Array(0, 0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0, 1) +} +tracks/2/type = "bezier" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Sprite:modulate:b") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"handle_modes": PackedInt32Array(0, 0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0, 1) +} +tracks/3/type = "bezier" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("Sprite:modulate:a") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"handle_modes": PackedInt32Array(0, 0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0, 1) +} + +[sub_resource type="Animation" id="Animation_rrrnd"] +length = 0.001 +tracks/0/type = "bezier" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite:modulate:r") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) +} +tracks/1/type = "bezier" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite:modulate:g") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) +} +tracks/2/type = "bezier" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Sprite:modulate:b") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) +} +tracks/3/type = "bezier" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("Sprite:modulate:a") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_fs8h8"] +_data = { +"RESET": SubResource("Animation_rrrnd"), +"fade_out": SubResource("Animation_mqmwg") +} + +[node name="Cloud" type="Node2D"] +script = ExtResource("1_8jsek") + +[node name="Sprite" type="Sprite2D" parent="."] +position = Vector2(1.90735e-06, -9.53674e-07) +scale = Vector2(64.4688, 51.1875) +texture = SubResource("PlaceholderTexture2D_08frh") + +[node name="Spawner" parent="." instance=ExtResource("4_0cics")] +scene = ExtResource("3_naxi5") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +"": SubResource("AnimationLibrary_fs8h8") +} diff --git a/scenes/game/main_game.tscn b/scenes/game/main_game.tscn index ba7eb3a..dbbb5f1 100644 --- a/scenes/game/main_game.tscn +++ b/scenes/game/main_game.tscn @@ -1,14 +1,23 @@ -[gd_scene load_steps=8 format=3 uid="uid://cxj5aud02f40j"] +[gd_scene load_steps=13 format=3 uid="uid://cxj5aud02f40j"] [ext_resource type="Script" path="res://scenes/game/main_game.gd" id="1_wiglu"] +[ext_resource type="PackedScene" uid="uid://cyrg770fsetyu" path="res://behaviours/spawner.tscn" id="2_bx37o"] [ext_resource type="PackedScene" uid="uid://dm068vaseh45n" path="res://scenes/game/game_camera.tscn" id="2_db5xs"] [ext_resource type="PackedScene" uid="uid://brvbtvt4em32" path="res://behaviours/counter.tscn" id="3_p6jw3"] +[ext_resource type="PackedScene" uid="uid://eqb3vfbvjefp" path="res://entities/cloud.tscn" id="3_whlmm"] [ext_resource type="PackedScene" uid="uid://7j1b55t8tafg" path="res://scenes/game/cursor_magnet.tscn" id="3_xbolm"] [ext_resource type="PackedScene" uid="uid://uoxwjpmgg27a" path="res://entities/gold.tscn" id="4_eu7q4"] [ext_resource type="PackedScene" uid="uid://bc2bm8lbol18w" path="res://entities/sheep.tscn" id="5_63bwb"] +[ext_resource type="Texture2D" uid="uid://dyvkvmw7wxwe5" path="res://icon.svg" id="9_8kxq4"] [sub_resource type="TileSet" id="TileSet_g2dkm"] +[sub_resource type="RectangleShape2D" id="RectangleShape2D_p1lg5"] +size = Vector2(1280, 720) + +[sub_resource type="CircleShape2D" id="CircleShape2D_3du4x"] +radius = 29.14 + [node name="MainGame" type="Node2D"] script = ExtResource("1_wiglu") @@ -16,6 +25,16 @@ script = ExtResource("1_wiglu") tile_set = SubResource("TileSet_g2dkm") format = 2 +[node name="CloudSpawner" parent="." instance=ExtResource("2_bx37o")] +position = Vector2(41.795, -60.05) +scene = ExtResource("3_whlmm") + +[node name="PlayArea" type="Area2D" parent="."] + +[node name="Shape" type="CollisionShape2D" parent="PlayArea"] +shape = SubResource("RectangleShape2D_p1lg5") +debug_color = Color(1, 1, 1, 0) + [node name="GameCamera" parent="." instance=ExtResource("2_db5xs")] [node name="CursorMagnet" parent="." instance=ExtResource("3_xbolm")] @@ -55,7 +74,23 @@ position = Vector2(456, -7) [node name="Sheep" parent="." instance=ExtResource("5_63bwb")] position = Vector2(-135, -134) -[node name="Sheep2" parent="." instance=ExtResource("5_63bwb")] -position = Vector2(-462, -77) - [node name="SpawnedEntities" type="Node2D" parent="."] + +[node name="Cloud" parent="." instance=ExtResource("3_whlmm")] +position = Vector2(-3, -112) + +[node name="Node2D" type="Node2D" parent="."] +position = Vector2(590, 317) +scale = Vector2(11.285, 11.285) + +[node name="Sprite2D" type="Sprite2D" parent="Node2D"] +scale = Vector2(0.03, 0.029) +texture = ExtResource("9_8kxq4") + +[node name="Area2D" type="Area2D" parent="Node2D"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Node2D/Area2D"] +scale = Vector2(0.0886132, 0.0886132) +shape = SubResource("CircleShape2D_3du4x") + +[connection signal="mouse_entered" from="Node2D/Area2D" to="CloudSpawner" method="spawn"] diff --git a/temp/again.wav b/temp/again.wav new file mode 100644 index 0000000..f0995ac --- /dev/null +++ b/temp/again.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71f5b785f5e534c80a322d2422eda72ca932eda6136d2c125ae668b6ab0af958 +size 326654 diff --git a/temp/arcade_cancel.flac b/temp/arcade_cancel.flac new file mode 100644 index 0000000..0fa1af9 --- /dev/null +++ b/temp/arcade_cancel.flac @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:404f54f8536ca5c61148c9d5ceb361501ae53c3979ce6d23127cd25217ee0bf4 +size 14555 diff --git a/temp/cancel.wav b/temp/cancel.wav new file mode 100644 index 0000000..b59884a --- /dev/null +++ b/temp/cancel.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d52a7c538ebfecacf52a46049fabe4518eb9d7f85669e5222bbfeaf634190b7e +size 447446 diff --git a/temp/metallic_whistle.wav b/temp/metallic_whistle.wav new file mode 100644 index 0000000..2f99ac8 --- /dev/null +++ b/temp/metallic_whistle.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:579d2ee783953b558ed1835ce706826a835c9f1fb94be2ad5c9cf8eeec0134c0 +size 5292730 diff --git a/temp/squelch.wav b/temp/squelch.wav new file mode 100644 index 0000000..4bfcc88 --- /dev/null +++ b/temp/squelch.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ad18c17703943cfb607ba23e5631edcf58fab0aa18d8f9a5467dc5f643eb008 +size 28276 diff --git a/temp/upgrade.wav b/temp/upgrade.wav new file mode 100644 index 0000000..be33dd2 --- /dev/null +++ b/temp/upgrade.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7037445e7db2d558bafe8e34b4c6cf4cc0382d13d0c6dedcbb89c2f2def57e9e +size 339272 diff --git a/temp/upgradeselect.wav b/temp/upgradeselect.wav new file mode 100644 index 0000000..8f6bfcc --- /dev/null +++ b/temp/upgradeselect.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5351166b6970407f329cbc54c559613be9939003da2f1475d61b264d06bc882d +size 73540