diff --git a/NOTICE.md b/NOTICE.md index cc84293..d6eb42e 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -21,3 +21,4 @@ This project uses the following external assets: | `./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 | +| `./entities/coin.ogg` | https://freesound.org/people/forrisday/sounds/214509/ | Attribution 4 | diff --git a/behaviours/drop_on_free.gd b/behaviours/drop_on_free.gd deleted file mode 100644 index 0724866..0000000 --- a/behaviours/drop_on_free.gd +++ /dev/null @@ -1,15 +0,0 @@ -extends Node2D - - -# Called when the node enters the scene tree for the first time. -func _ready() -> void: - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta: float) -> void: - pass - - -func _on_tree_exiting() -> void: - pass # Replace with function body. diff --git a/behaviours/drop_on_free.tscn b/behaviours/drop_on_free.tscn deleted file mode 100644 index f1f9efc..0000000 --- a/behaviours/drop_on_free.tscn +++ /dev/null @@ -1,8 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://dv7ea2y0l46e"] - -[ext_resource type="Script" path="res://behaviours/drop_on_free.gd" id="1_4xihn"] - -[node name="DropOnFree" type="Node2D"] -script = ExtResource("1_4xihn") - -[connection signal="tree_exiting" from="." to="." method="_on_tree_exiting"] diff --git a/behaviours/spawner_free.tscn b/behaviours/spawner_free.tscn new file mode 100644 index 0000000..6459ce3 --- /dev/null +++ b/behaviours/spawner_free.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://dv7ea2y0l46e"] + +[ext_resource type="Script" path="res://behaviours/spawner.gd" id="1_fa574"] + +[node name="SpawnerFree" type="Node2D"] +script = ExtResource("1_fa574") + +[connection signal="tree_exiting" from="." to="." method="spawn"] diff --git a/temp/pickup_coin.png b/entities/gold.png similarity index 100% rename from temp/pickup_coin.png rename to entities/gold.png diff --git a/temp/pickup_coin.png.import b/entities/gold.png.import similarity index 72% rename from temp/pickup_coin.png.import rename to entities/gold.png.import index 53b41cd..19ea5a0 100644 --- a/temp/pickup_coin.png.import +++ b/entities/gold.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bfl0tkg85cvb8" -path="res://.godot/imported/pickup_coin.png-24cd85ffeb9f86568a86b5533e35ebe6.ctex" +path="res://.godot/imported/gold.png-2490a66f83b8860580858fb1907ff558.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://temp/pickup_coin.png" -dest_files=["res://.godot/imported/pickup_coin.png-24cd85ffeb9f86568a86b5533e35ebe6.ctex"] +source_file="res://entities/gold.png" +dest_files=["res://.godot/imported/gold.png-2490a66f83b8860580858fb1907ff558.ctex"] [params] diff --git a/entities/gold.tscn b/entities/gold.tscn index 919a16a..2a86cd3 100644 --- a/entities/gold.tscn +++ b/entities/gold.tscn @@ -1,25 +1,29 @@ -[gd_scene load_steps=5 format=3 uid="uid://uoxwjpmgg27a"] +[gd_scene load_steps=7 format=3 uid="uid://uoxwjpmgg27a"] [ext_resource type="Script" path="res://entities/gold.gd" id="1_lbls1"] [ext_resource type="PackedScene" uid="uid://bvrxvrjlo5130" path="res://behaviours/move_towards_mouse.tscn" id="2_lso1v"] +[ext_resource type="Texture2D" uid="uid://bfl0tkg85cvb8" path="res://entities/gold.png" id="2_tt3v6"] [ext_resource type="PackedScene" uid="uid://dj72yshd25ucx" path="res://behaviours/collectable.tscn" id="3_q0bno"] - -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_1f58t"] +[ext_resource type="PackedScene" uid="uid://dv7ea2y0l46e" path="res://behaviours/spawner_free.tscn" id="5_pbaso"] +[ext_resource type="PackedScene" uid="uid://eqg6snsgn1kh" path="res://players/gold_pickup_player.tscn" id="6_eoeje"] [node name="Gold" type="Node2D"] script = ExtResource("1_lbls1") [node name="Sprite" type="Sprite2D" parent="."] -scale = Vector2(12, 12) -texture = SubResource("PlaceholderTexture2D_1f58t") +scale = Vector2(2, 2) +texture = ExtResource("2_tt3v6") [node name="MoveTowardsMouse" parent="." instance=ExtResource("2_lso1v")] -scale = Vector2(5, 5) -speed = 333.0 +scale = Vector2(8, 8) +speed = 555.0 [node name="Collectable" parent="." instance=ExtResource("3_q0bno")] -scale = Vector2(0.87, 0.87) +scale = Vector2(0.6, 0.6) tag = &"Gold" +[node name="SpawnerFree" parent="." instance=ExtResource("5_pbaso")] +scene = ExtResource("6_eoeje") + [connection signal="move" from="MoveTowardsMouse" to="." method="_on_move"] [connection signal="collected" from="Collectable" to="." method="_on_collected"] diff --git a/players/gold_pickup.ogg b/players/gold_pickup.ogg new file mode 100644 index 0000000..c44bd69 --- /dev/null +++ b/players/gold_pickup.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9bb063843a5d725f3c1798f8487ffb20c713403f1c4775d921492b34981d9d0 +size 9754 diff --git a/players/gold_pickup.ogg.import b/players/gold_pickup.ogg.import new file mode 100644 index 0000000..56cfb6e --- /dev/null +++ b/players/gold_pickup.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cogtamt27rox2" +path="res://.godot/imported/gold_pickup.ogg-c4d9dcf906cf090ebcf2a027cf53c3b5.oggvorbisstr" + +[deps] + +source_file="res://players/gold_pickup.ogg" +dest_files=["res://.godot/imported/gold_pickup.ogg-c4d9dcf906cf090ebcf2a027cf53c3b5.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/players/gold_pickup_player.tscn b/players/gold_pickup_player.tscn new file mode 100644 index 0000000..55c10ba --- /dev/null +++ b/players/gold_pickup_player.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=2 format=3 uid="uid://eqg6snsgn1kh"] + +[ext_resource type="AudioStream" uid="uid://cogtamt27rox2" path="res://players/gold_pickup.ogg" id="1_rpx7k"] + +[node name="GoldPickupPlayer" type="AudioStreamPlayer2D"] +stream = ExtResource("1_rpx7k") +autoplay = true + +[connection signal="finished" from="." to="." method="queue_free"] diff --git a/temp/monster_imp_onground_left.png b/temp/monster_imp_onground_left.png deleted file mode 100644 index 621d4fa..0000000 --- a/temp/monster_imp_onground_left.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dfcf56434a18004abf18ec8ea78a04625e046454ea0ac1577b1a4b2c89b42e8 -size 549 diff --git a/temp/monster_imp_onground_left.png.import b/temp/monster_imp_onground_left.png.import deleted file mode 100644 index 69eb8af..0000000 --- a/temp/monster_imp_onground_left.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://crhwsob76ieya" -path="res://.godot/imported/monster_imp_onground_left.png-4d586617808a7c4d0d75fc58328060ab.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://temp/monster_imp_onground_left.png" -dest_files=["res://.godot/imported/monster_imp_onground_left.png-4d586617808a7c4d0d75fc58328060ab.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/temp/monster_imp_onground_right.png b/temp/monster_imp_onground_right.png deleted file mode 100644 index a0fea88..0000000 --- a/temp/monster_imp_onground_right.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dbe77e6dc816a416216dc8220fb3368855ee6ad0c6099ff91109f40a80cb585 -size 577 diff --git a/temp/monster_imp_onground_right.png.import b/temp/monster_imp_onground_right.png.import deleted file mode 100644 index eb2a216..0000000 --- a/temp/monster_imp_onground_right.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bubehid53q8h1" -path="res://.godot/imported/monster_imp_onground_right.png-6be56e3ee4743289f963f848fbdf8e49.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://temp/monster_imp_onground_right.png" -dest_files=["res://.godot/imported/monster_imp_onground_right.png-6be56e3ee4743289f963f848fbdf8e49.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