diff --git a/items/active_items/bow/arrow.gd b/items/consumables/bow/arrow.gd similarity index 100% rename from items/active_items/bow/arrow.gd rename to items/consumables/bow/arrow.gd diff --git a/items/active_items/bow/arrow.gd.uid b/items/consumables/bow/arrow.gd.uid similarity index 100% rename from items/active_items/bow/arrow.gd.uid rename to items/consumables/bow/arrow.gd.uid diff --git a/items/active_items/bow/arrow.png b/items/consumables/bow/arrow.png similarity index 100% rename from items/active_items/bow/arrow.png rename to items/consumables/bow/arrow.png diff --git a/items/active_items/bow/arrow.png.import b/items/consumables/bow/arrow.png.import similarity index 77% rename from items/active_items/bow/arrow.png.import rename to items/consumables/bow/arrow.png.import index c80a6e0..79bb0d6 100644 --- a/items/active_items/bow/arrow.png.import +++ b/items/consumables/bow/arrow.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bavoghl2pxs83" -path="res://.godot/imported/arrow.png-11da51178d457b4db8d73e91ed37096d.ctex" +path="res://.godot/imported/arrow.png-2cffe6fabf19679230c231a1fd8a329e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/active_items/bow/arrow.png" -dest_files=["res://.godot/imported/arrow.png-11da51178d457b4db8d73e91ed37096d.ctex"] +source_file="res://items/consumables/bow/arrow.png" +dest_files=["res://.godot/imported/arrow.png-2cffe6fabf19679230c231a1fd8a329e.ctex"] [params] diff --git a/items/active_items/bow/arrow.tscn b/items/consumables/bow/arrow.tscn similarity index 86% rename from items/active_items/bow/arrow.tscn rename to items/consumables/bow/arrow.tscn index 8c6b366..aed9582 100644 --- a/items/active_items/bow/arrow.tscn +++ b/items/consumables/bow/arrow.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://dfva4dhflxglr"] -[ext_resource type="Script" uid="uid://bglrm0bb4nla" path="res://items/active_items/bow/arrow.gd" id="1_lxthq"] -[ext_resource type="Texture2D" uid="uid://bavoghl2pxs83" path="res://items/active_items/bow/arrow.png" id="2_ilsew"] +[ext_resource type="Script" uid="uid://bglrm0bb4nla" path="res://items/consumables/bow/arrow.gd" id="1_lxthq"] +[ext_resource type="Texture2D" uid="uid://bavoghl2pxs83" path="res://items/consumables/bow/arrow.png" id="2_ilsew"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_tfcgf"] size = Vector2(20, 5) diff --git a/items/active_items/bow/arrow_icon.tscn b/items/consumables/bow/arrow_icon.tscn similarity index 83% rename from items/active_items/bow/arrow_icon.tscn rename to items/consumables/bow/arrow_icon.tscn index 6f7fba2..cb4ed10 100644 --- a/items/active_items/bow/arrow_icon.tscn +++ b/items/consumables/bow/arrow_icon.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bu3j6ambrybd2"] -[ext_resource type="Texture2D" uid="uid://bavoghl2pxs83" path="res://items/active_items/bow/arrow.png" id="1_7lvex"] +[ext_resource type="Texture2D" uid="uid://bavoghl2pxs83" path="res://items/consumables/bow/arrow.png" id="1_7lvex"] [node name="TextureRect" type="TextureRect"] custom_minimum_size = Vector2(0, 3) diff --git a/items/active_items/bow/bow.gd b/items/consumables/bow/bow.gd similarity index 100% rename from items/active_items/bow/bow.gd rename to items/consumables/bow/bow.gd diff --git a/items/active_items/bow/bow.gd.uid b/items/consumables/bow/bow.gd.uid similarity index 100% rename from items/active_items/bow/bow.gd.uid rename to items/consumables/bow/bow.gd.uid diff --git a/items/active_items/bow/bow.png b/items/consumables/bow/bow.png similarity index 100% rename from items/active_items/bow/bow.png rename to items/consumables/bow/bow.png diff --git a/items/active_items/bow/bow.png.import b/items/consumables/bow/bow.png.import similarity index 77% rename from items/active_items/bow/bow.png.import rename to items/consumables/bow/bow.png.import index 5b0b4bc..4aeadef 100644 --- a/items/active_items/bow/bow.png.import +++ b/items/consumables/bow/bow.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d01h01le82gyh" -path="res://.godot/imported/bow.png-5c21d924e7ed46a9ae9ef92089b84a58.ctex" +path="res://.godot/imported/bow.png-7ca2f79a3aaf0404b0d2a5f64b2c7b38.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/active_items/bow/bow.png" -dest_files=["res://.godot/imported/bow.png-5c21d924e7ed46a9ae9ef92089b84a58.ctex"] +source_file="res://items/consumables/bow/bow.png" +dest_files=["res://.godot/imported/bow.png-7ca2f79a3aaf0404b0d2a5f64b2c7b38.ctex"] [params] diff --git a/items/active_items/bow/bow.tscn b/items/consumables/bow/bow.tscn similarity index 87% rename from items/active_items/bow/bow.tscn rename to items/consumables/bow/bow.tscn index 848facf..ae701f1 100644 --- a/items/active_items/bow/bow.tscn +++ b/items/consumables/bow/bow.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=10 format=3 uid="uid://ddn025xnjngko"] -[ext_resource type="Script" uid="uid://bkcip66at5sug" path="res://items/active_items/bow/bow.gd" id="1_xppub"] -[ext_resource type="PackedScene" uid="uid://dfva4dhflxglr" path="res://items/active_items/bow/arrow.tscn" id="2_0id2q"] -[ext_resource type="Texture2D" uid="uid://d01h01le82gyh" path="res://items/active_items/bow/bow.png" id="3_vkelq"] +[ext_resource type="Script" uid="uid://bkcip66at5sug" path="res://items/consumables/bow/bow.gd" id="1_xppub"] +[ext_resource type="PackedScene" uid="uid://dfva4dhflxglr" path="res://items/consumables/bow/arrow.tscn" id="2_0id2q"] +[ext_resource type="Texture2D" uid="uid://d01h01le82gyh" path="res://items/consumables/bow/bow.png" id="3_vkelq"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="4_0id2q"] -[ext_resource type="PackedScene" uid="uid://bu3j6ambrybd2" path="res://items/active_items/bow/arrow_icon.tscn" id="4_2dslu"] +[ext_resource type="PackedScene" uid="uid://bu3j6ambrybd2" path="res://items/consumables/bow/arrow_icon.tscn" id="4_2dslu"] [ext_resource type="AudioStream" uid="uid://bg1w0fyeyys2p" path="res://sounds/item-equip-6904.mp3" id="5_gfbg0"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="5_o1smo"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="5_o1smo"] [ext_resource type="AudioStream" uid="uid://10ljbd4djqgb" path="res://sounds/263675__porkmuncher__bow_release_cut.wav" id="7_o1smo"] [sub_resource type="CircleShape2D" id="CircleShape2D_gllxn"] diff --git a/items/immediate_items/heal_item/heal_item.gd b/items/consumables/heal_item/heal_item.gd similarity index 100% rename from items/immediate_items/heal_item/heal_item.gd rename to items/consumables/heal_item/heal_item.gd diff --git a/items/immediate_items/heal_item/heal_item.gd.uid b/items/consumables/heal_item/heal_item.gd.uid similarity index 100% rename from items/immediate_items/heal_item/heal_item.gd.uid rename to items/consumables/heal_item/heal_item.gd.uid diff --git a/items/immediate_items/heal_item/heal_item.png b/items/consumables/heal_item/heal_item.png similarity index 100% rename from items/immediate_items/heal_item/heal_item.png rename to items/consumables/heal_item/heal_item.png diff --git a/items/immediate_items/heal_item/heal_item.png.import b/items/consumables/heal_item/heal_item.png.import similarity index 75% rename from items/immediate_items/heal_item/heal_item.png.import rename to items/consumables/heal_item/heal_item.png.import index 16bc66f..3f37d32 100644 --- a/items/immediate_items/heal_item/heal_item.png.import +++ b/items/consumables/heal_item/heal_item.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dog2yksitfgu1" -path="res://.godot/imported/heal_item.png-fd96dcbc8e00ec13b19c3e58ef0188e6.ctex" +path="res://.godot/imported/heal_item.png-8a8830bfa8056f0430b6f7daf94a6634.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/immediate_items/heal_item/heal_item.png" -dest_files=["res://.godot/imported/heal_item.png-fd96dcbc8e00ec13b19c3e58ef0188e6.ctex"] +source_file="res://items/consumables/heal_item/heal_item.png" +dest_files=["res://.godot/imported/heal_item.png-8a8830bfa8056f0430b6f7daf94a6634.ctex"] [params] diff --git a/items/immediate_items/heal_item/heal_item.tscn b/items/consumables/heal_item/heal_item.tscn similarity index 88% rename from items/immediate_items/heal_item/heal_item.tscn rename to items/consumables/heal_item/heal_item.tscn index 976d574..ab2a262 100644 --- a/items/immediate_items/heal_item/heal_item.tscn +++ b/items/consumables/heal_item/heal_item.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://b00185vygcka1"] -[ext_resource type="Script" uid="uid://b43fudwi47qfd" path="res://items/immediate_items/heal_item/heal_item.gd" id="1_3vbv8"] -[ext_resource type="Texture2D" uid="uid://dog2yksitfgu1" path="res://items/immediate_items/heal_item/heal_item.png" id="2_bqles"] +[ext_resource type="Script" uid="uid://b43fudwi47qfd" path="res://items/consumables/heal_item/heal_item.gd" id="1_3vbv8"] +[ext_resource type="Texture2D" uid="uid://dog2yksitfgu1" path="res://items/consumables/heal_item/heal_item.png" id="2_bqles"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_evqwq"] [ext_resource type="Texture2D" uid="uid://djfc7sdc8wxp6" path="res://player/Heart_cut.png" id="3_fvuym"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_sr4am"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="4_sr4am"] [ext_resource type="AudioStream" uid="uid://b37akn7hmk2r3" path="res://sounds/471834__keshafilm__health-pickup.wav" id="5_1ujdq"] [sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"] diff --git a/items/active_items/horizontal_dash/horizontal_dash.gd b/items/consumables/horizontal_dash/horizontal_dash.gd similarity index 100% rename from items/active_items/horizontal_dash/horizontal_dash.gd rename to items/consumables/horizontal_dash/horizontal_dash.gd diff --git a/items/active_items/horizontal_dash/horizontal_dash.gd.uid b/items/consumables/horizontal_dash/horizontal_dash.gd.uid similarity index 100% rename from items/active_items/horizontal_dash/horizontal_dash.gd.uid rename to items/consumables/horizontal_dash/horizontal_dash.gd.uid diff --git a/items/active_items/horizontal_dash/horizontal_dash.tscn b/items/consumables/horizontal_dash/horizontal_dash.tscn similarity index 90% rename from items/active_items/horizontal_dash/horizontal_dash.tscn rename to items/consumables/horizontal_dash/horizontal_dash.tscn index 6d6903a..cffd2b2 100644 --- a/items/active_items/horizontal_dash/horizontal_dash.tscn +++ b/items/consumables/horizontal_dash/horizontal_dash.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=8 format=3 uid="uid://dy17xhg1yrl0o"] -[ext_resource type="Script" uid="uid://jq326dmuaj22" path="res://items/active_items/horizontal_dash/horizontal_dash.gd" id="1_ktd5x"] -[ext_resource type="Texture2D" uid="uid://cnn3tadylge8y" path="res://items/active_items/horizontal_dash/horizontaldash.png" id="3_ktd5x"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_vqrqe"] +[ext_resource type="Script" uid="uid://jq326dmuaj22" path="res://items/consumables/horizontal_dash/horizontal_dash.gd" id="1_ktd5x"] +[ext_resource type="Texture2D" uid="uid://cnn3tadylge8y" path="res://items/consumables/horizontal_dash/horizontaldash.png" id="3_ktd5x"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="3_vqrqe"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="4_gtuhj"] [ext_resource type="AudioStream" uid="uid://bg1w0fyeyys2p" path="res://sounds/item-equip-6904.mp3" id="5_5y0ew"] [ext_resource type="AudioStream" uid="uid://ds0yw3au0quae" path="res://sounds/whoosh.mp3" id="6_a6gm0"] diff --git a/items/active_items/horizontal_dash/horizontaldash.png b/items/consumables/horizontal_dash/horizontaldash.png similarity index 100% rename from items/active_items/horizontal_dash/horizontaldash.png rename to items/consumables/horizontal_dash/horizontaldash.png diff --git a/items/active_items/horizontal_dash/horizontaldash.png.import b/items/consumables/horizontal_dash/horizontaldash.png.import similarity index 74% rename from items/active_items/horizontal_dash/horizontaldash.png.import rename to items/consumables/horizontal_dash/horizontaldash.png.import index d64bf12..60709cb 100644 --- a/items/active_items/horizontal_dash/horizontaldash.png.import +++ b/items/consumables/horizontal_dash/horizontaldash.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cnn3tadylge8y" -path="res://.godot/imported/horizontaldash.png-3a6880e60346d9b8d19d47557212a382.ctex" +path="res://.godot/imported/horizontaldash.png-9fe6fddd3110882a6c56740b08ea51eb.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/active_items/horizontal_dash/horizontaldash.png" -dest_files=["res://.godot/imported/horizontaldash.png-3a6880e60346d9b8d19d47557212a382.ctex"] +source_file="res://items/consumables/horizontal_dash/horizontaldash.png" +dest_files=["res://.godot/imported/horizontaldash.png-9fe6fddd3110882a6c56740b08ea51eb.ctex"] [params] diff --git a/items/active_items/updash/updash.gd b/items/consumables/updash/updash.gd similarity index 100% rename from items/active_items/updash/updash.gd rename to items/consumables/updash/updash.gd diff --git a/items/active_items/updash/updash.gd.uid b/items/consumables/updash/updash.gd.uid similarity index 100% rename from items/active_items/updash/updash.gd.uid rename to items/consumables/updash/updash.gd.uid diff --git a/items/active_items/updash/updash.png b/items/consumables/updash/updash.png similarity index 100% rename from items/active_items/updash/updash.png rename to items/consumables/updash/updash.png diff --git a/items/active_items/updash/updash.png.import b/items/consumables/updash/updash.png.import similarity index 76% rename from items/active_items/updash/updash.png.import rename to items/consumables/updash/updash.png.import index 2c2814b..81b6490 100644 --- a/items/active_items/updash/updash.png.import +++ b/items/consumables/updash/updash.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dxcfkdhl4g24c" -path="res://.godot/imported/updash.png-ddc6856a4b101f20557ef85572ee190a.ctex" +path="res://.godot/imported/updash.png-6cf7335cc7a138df6d0425e524bb4bb8.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/active_items/updash/updash.png" -dest_files=["res://.godot/imported/updash.png-ddc6856a4b101f20557ef85572ee190a.ctex"] +source_file="res://items/consumables/updash/updash.png" +dest_files=["res://.godot/imported/updash.png-6cf7335cc7a138df6d0425e524bb4bb8.ctex"] [params] diff --git a/items/active_items/updash/updash.tscn b/items/consumables/updash/updash.tscn similarity index 91% rename from items/active_items/updash/updash.tscn rename to items/consumables/updash/updash.tscn index a0c2189..565dc18 100644 --- a/items/active_items/updash/updash.tscn +++ b/items/consumables/updash/updash.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=8 format=3 uid="uid://ewe36lqcjojk"] -[ext_resource type="Script" uid="uid://bbwsc2a2hd0ow" path="res://items/active_items/updash/updash.gd" id="1_ghbl6"] -[ext_resource type="Texture2D" uid="uid://dxcfkdhl4g24c" path="res://items/active_items/updash/updash.png" id="3_a5yxq"] +[ext_resource type="Script" uid="uid://bbwsc2a2hd0ow" path="res://items/consumables/updash/updash.gd" id="1_ghbl6"] +[ext_resource type="Texture2D" uid="uid://dxcfkdhl4g24c" path="res://items/consumables/updash/updash.png" id="3_a5yxq"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_ktv3s"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_ssiqx"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="3_ssiqx"] [ext_resource type="AudioStream" uid="uid://bg1w0fyeyys2p" path="res://sounds/item-equip-6904.mp3" id="5_ssiqx"] [ext_resource type="AudioStream" uid="uid://ds0yw3au0quae" path="res://sounds/whoosh.mp3" id="6_mbe12"] diff --git a/items/ItemShine.png b/items/generic/ItemShine.png similarity index 100% rename from items/ItemShine.png rename to items/generic/ItemShine.png diff --git a/items/ItemShine.png.import b/items/generic/ItemShine.png.import similarity index 76% rename from items/ItemShine.png.import rename to items/generic/ItemShine.png.import index c8d75b2..b96871d 100644 --- a/items/ItemShine.png.import +++ b/items/generic/ItemShine.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d4mrbgfl7jpqq" -path="res://.godot/imported/ItemShine.png-41425a3fac8f6530e2b2e4df0c180258.ctex" +path="res://.godot/imported/ItemShine.png-034066fd9fe20ff0370bbee7c72c08ef.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/ItemShine.png" -dest_files=["res://.godot/imported/ItemShine.png-41425a3fac8f6530e2b2e4df0c180258.ctex"] +source_file="res://items/generic/ItemShine.png" +dest_files=["res://.godot/imported/ItemShine.png-034066fd9fe20ff0370bbee7c72c08ef.ctex"] [params] diff --git a/items/active_items/active_item.gd b/items/generic/active_item.gd similarity index 96% rename from items/active_items/active_item.gd rename to items/generic/active_item.gd index 95ecd2b..93af34e 100644 --- a/items/active_items/active_item.gd +++ b/items/generic/active_item.gd @@ -37,7 +37,8 @@ func activate(): assert(false) func remove(reset_player_active = true): - uses = 0 + if player.active_item == self: + uses = 0 if reset_player_active: player.active_item = null self.queue_free() diff --git a/items/active_items/active_item.gd.uid b/items/generic/active_item.gd.uid similarity index 100% rename from items/active_items/active_item.gd.uid rename to items/generic/active_item.gd.uid diff --git a/items/generic/item_pool.tres b/items/generic/item_pool.tres index 06a99e7..c76f65c 100644 --- a/items/generic/item_pool.tres +++ b/items/generic/item_pool.tres @@ -1,18 +1,18 @@ [gd_resource type="Resource" script_class="ItemPool" load_steps=11 format=3 uid="uid://m6yj45qvoecs"] -[ext_resource type="PackedScene" uid="uid://b00185vygcka1" path="res://items/immediate_items/heal_item/heal_item.tscn" id="1_2l6sh"] -[ext_resource type="PackedScene" uid="uid://wc7kgtomy6xm" path="res://items/permanent_items/extrajump/extrajump.tscn" id="2_rli0f"] -[ext_resource type="PackedScene" uid="uid://gwctb2xqsbj" path="res://items/immediate_items/healthup/healthup.tscn" id="3_g002j"] -[ext_resource type="PackedScene" uid="uid://ewe36lqcjojk" path="res://items/active_items/updash/updash.tscn" id="4_vpswe"] -[ext_resource type="PackedScene" uid="uid://ddn025xnjngko" path="res://items/active_items/bow/bow.tscn" id="5_jwi73"] -[ext_resource type="PackedScene" uid="uid://bbpf28ohayd8n" path="res://items/permanent_items/backslash/backslash.tscn" id="6_73uum"] +[ext_resource type="PackedScene" uid="uid://b00185vygcka1" path="res://items/consumables/heal_item/heal_item.tscn" id="1_rli0f"] +[ext_resource type="PackedScene" uid="uid://dy17xhg1yrl0o" path="res://items/consumables/horizontal_dash/horizontal_dash.tscn" id="2_g002j"] +[ext_resource type="PackedScene" uid="uid://ddn025xnjngko" path="res://items/consumables/bow/bow.tscn" id="3_vpswe"] +[ext_resource type="PackedScene" uid="uid://ewe36lqcjojk" path="res://items/consumables/updash/updash.tscn" id="4_jwi73"] +[ext_resource type="PackedScene" uid="uid://gwctb2xqsbj" path="res://items/rare_items/healthup/healthup.tscn" id="5_73uum"] [ext_resource type="Script" uid="uid://bgbqefa6h7ckv" path="res://items/generic/item_pool.gd" id="6_rli0f"] -[ext_resource type="PackedScene" uid="uid://bpgo1djj8f1rg" path="res://items/permanent_items/high_jump/high_jump.tscn" id="7_k6eth"] -[ext_resource type="PackedScene" uid="uid://bwtdls58ajair" path="res://items/permanent_items/upslash/upslash.tscn" id="8_8cxou"] -[ext_resource type="PackedScene" uid="uid://dy17xhg1yrl0o" path="res://items/active_items/horizontal_dash/horizontal_dash.tscn" id="9_esvgx"] +[ext_resource type="PackedScene" uid="uid://bbpf28ohayd8n" path="res://items/unique_items/backslash/backslash.tscn" id="7_k6eth"] +[ext_resource type="PackedScene" uid="uid://bpgo1djj8f1rg" path="res://items/unique_items/high_jump/high_jump.tscn" id="8_8cxou"] +[ext_resource type="PackedScene" uid="uid://bwtdls58ajair" path="res://items/unique_items/upslash/upslash.tscn" id="9_esvgx"] +[ext_resource type="PackedScene" uid="uid://wc7kgtomy6xm" path="res://items/unique_items/extrajump/extrajump.tscn" id="10_l52h1"] [resource] script = ExtResource("6_rli0f") -common = Array[PackedScene]([ExtResource("1_2l6sh"), ExtResource("1_2l6sh"), ExtResource("1_2l6sh"), ExtResource("9_esvgx"), ExtResource("5_jwi73"), ExtResource("4_vpswe")]) -rare = Array[PackedScene]([ExtResource("3_g002j")]) -unique = Array[PackedScene]([ExtResource("6_73uum"), ExtResource("7_k6eth"), ExtResource("8_8cxou"), ExtResource("2_rli0f")]) +common = Array[PackedScene]([ExtResource("1_rli0f"), ExtResource("1_rli0f"), ExtResource("1_rli0f"), ExtResource("2_g002j"), ExtResource("3_vpswe"), ExtResource("4_jwi73")]) +rare = Array[PackedScene]([ExtResource("5_73uum")]) +unique = Array[PackedScene]([ExtResource("7_k6eth"), ExtResource("8_8cxou"), ExtResource("9_esvgx"), ExtResource("10_l52h1"), ExtResource("5_73uum"), ExtResource("5_73uum"), ExtResource("5_73uum")]) diff --git a/items/generic/item_spawn.gd b/items/generic/item_spawn.gd index 38f6090..b6befd3 100644 --- a/items/generic/item_spawn.gd +++ b/items/generic/item_spawn.gd @@ -5,10 +5,10 @@ static var item_pool = ResourceLoader.load("res://items/generic/item_pool.tres", @export var rarity_bonus : float = 0 @export var guarantee_rare : bool = false -@export var unique_base_chance = 0.08 -@export var rare_base_chance = .16 -@export var unique_bonus_multiplier = .025 -@export var rare_bonus_multiplier = .1 +@export var unique_base_chance = 0.24 +@export var rare_base_chance = 0 +@export var unique_bonus_multiplier = .05 +@export var rare_bonus_multiplier = 0 var remove_after_spawn = false diff --git a/items/immediate_items/healthup/healthup.gd b/items/rare_items/healthup/healthup.gd similarity index 100% rename from items/immediate_items/healthup/healthup.gd rename to items/rare_items/healthup/healthup.gd diff --git a/items/immediate_items/healthup/healthup.gd.uid b/items/rare_items/healthup/healthup.gd.uid similarity index 100% rename from items/immediate_items/healthup/healthup.gd.uid rename to items/rare_items/healthup/healthup.gd.uid diff --git a/items/immediate_items/healthup/healthup.png b/items/rare_items/healthup/healthup.png similarity index 100% rename from items/immediate_items/healthup/healthup.png rename to items/rare_items/healthup/healthup.png diff --git a/items/immediate_items/healthup/healthup.png.import b/items/rare_items/healthup/healthup.png.import similarity index 75% rename from items/immediate_items/healthup/healthup.png.import rename to items/rare_items/healthup/healthup.png.import index 840fb21..545ad84 100644 --- a/items/immediate_items/healthup/healthup.png.import +++ b/items/rare_items/healthup/healthup.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cp4uia4l6j5nt" -path="res://.godot/imported/healthup.png-154169bafb62b18f75d6b0b15f585161.ctex" +path="res://.godot/imported/healthup.png-2c1ab3085e0e24d17f4f5b1fcfed814f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/immediate_items/healthup/healthup.png" -dest_files=["res://.godot/imported/healthup.png-154169bafb62b18f75d6b0b15f585161.ctex"] +source_file="res://items/rare_items/healthup/healthup.png" +dest_files=["res://.godot/imported/healthup.png-2c1ab3085e0e24d17f4f5b1fcfed814f.ctex"] [params] diff --git a/items/immediate_items/healthup/healthup.tscn b/items/rare_items/healthup/healthup.tscn similarity index 89% rename from items/immediate_items/healthup/healthup.tscn rename to items/rare_items/healthup/healthup.tscn index 7b1266a..d78be62 100644 --- a/items/immediate_items/healthup/healthup.tscn +++ b/items/rare_items/healthup/healthup.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=7 format=3 uid="uid://gwctb2xqsbj"] -[ext_resource type="Script" uid="uid://ce6fxbjarlvtk" path="res://items/immediate_items/healthup/healthup.gd" id="1_ivtxh"] -[ext_resource type="Texture2D" uid="uid://cp4uia4l6j5nt" path="res://items/immediate_items/healthup/healthup.png" id="2_gb062"] +[ext_resource type="Script" uid="uid://ce6fxbjarlvtk" path="res://items/rare_items/healthup/healthup.gd" id="1_ivtxh"] +[ext_resource type="Texture2D" uid="uid://cp4uia4l6j5nt" path="res://items/rare_items/healthup/healthup.png" id="2_gb062"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_lolop"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_gb062"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="3_gb062"] [ext_resource type="AudioStream" uid="uid://b37akn7hmk2r3" path="res://sounds/471834__keshafilm__health-pickup.wav" id="6_uq82b"] [sub_resource type="CircleShape2D" id="CircleShape2D_rlcnv"] diff --git a/items/permanent_items/backslash/backslash.gd b/items/unique_items/backslash/backslash.gd similarity index 100% rename from items/permanent_items/backslash/backslash.gd rename to items/unique_items/backslash/backslash.gd diff --git a/items/permanent_items/backslash/backslash.gd.uid b/items/unique_items/backslash/backslash.gd.uid similarity index 100% rename from items/permanent_items/backslash/backslash.gd.uid rename to items/unique_items/backslash/backslash.gd.uid diff --git a/items/permanent_items/backslash/backslash.png b/items/unique_items/backslash/backslash.png similarity index 100% rename from items/permanent_items/backslash/backslash.png rename to items/unique_items/backslash/backslash.png diff --git a/items/permanent_items/backslash/backslash.png.import b/items/unique_items/backslash/backslash.png.import similarity index 75% rename from items/permanent_items/backslash/backslash.png.import rename to items/unique_items/backslash/backslash.png.import index 0a78f86..52bdd7a 100644 --- a/items/permanent_items/backslash/backslash.png.import +++ b/items/unique_items/backslash/backslash.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c7mrm8uel7r36" -path="res://.godot/imported/backslash.png-627b3c40a1c8a6f83dc2a8bbc2d29adb.ctex" +path="res://.godot/imported/backslash.png-d9537e0b7044cf5f7b1de9b329c0275d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/permanent_items/backslash/backslash.png" -dest_files=["res://.godot/imported/backslash.png-627b3c40a1c8a6f83dc2a8bbc2d29adb.ctex"] +source_file="res://items/unique_items/backslash/backslash.png" +dest_files=["res://.godot/imported/backslash.png-d9537e0b7044cf5f7b1de9b329c0275d.ctex"] [params] diff --git a/items/permanent_items/backslash/backslash.tscn b/items/unique_items/backslash/backslash.tscn similarity index 89% rename from items/permanent_items/backslash/backslash.tscn rename to items/unique_items/backslash/backslash.tscn index 032d2de..366f312 100644 --- a/items/permanent_items/backslash/backslash.tscn +++ b/items/unique_items/backslash/backslash.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://bbpf28ohayd8n"] -[ext_resource type="Script" uid="uid://blg876atd71cg" path="res://items/permanent_items/backslash/backslash.gd" id="1_s4bdx"] +[ext_resource type="Script" uid="uid://blg876atd71cg" path="res://items/unique_items/backslash/backslash.gd" id="1_s4bdx"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_kiuxs"] [ext_resource type="PackedScene" uid="uid://d3e3kuyeh6mr1" path="res://player/sword.tscn" id="2_u6vk4"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_legpc"] -[ext_resource type="Texture2D" uid="uid://c7mrm8uel7r36" path="res://items/permanent_items/backslash/backslash.png" id="5_qg660"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="4_legpc"] +[ext_resource type="Texture2D" uid="uid://c7mrm8uel7r36" path="res://items/unique_items/backslash/backslash.png" id="5_qg660"] [ext_resource type="AudioStream" uid="uid://pdd0sy3p4y0d" path="res://sounds/750240__universfield__coin-drop.mp3" id="6_qg660"] [sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"] diff --git a/items/permanent_items/extrajump/extrajump.gd b/items/unique_items/extrajump/extrajump.gd similarity index 100% rename from items/permanent_items/extrajump/extrajump.gd rename to items/unique_items/extrajump/extrajump.gd diff --git a/items/permanent_items/extrajump/extrajump.gd.uid b/items/unique_items/extrajump/extrajump.gd.uid similarity index 100% rename from items/permanent_items/extrajump/extrajump.gd.uid rename to items/unique_items/extrajump/extrajump.gd.uid diff --git a/items/permanent_items/extrajump/extrajump.png b/items/unique_items/extrajump/extrajump.png similarity index 100% rename from items/permanent_items/extrajump/extrajump.png rename to items/unique_items/extrajump/extrajump.png diff --git a/items/permanent_items/extrajump/extrajump.png.import b/items/unique_items/extrajump/extrajump.png.import similarity index 75% rename from items/permanent_items/extrajump/extrajump.png.import rename to items/unique_items/extrajump/extrajump.png.import index 0353123..46cf5c3 100644 --- a/items/permanent_items/extrajump/extrajump.png.import +++ b/items/unique_items/extrajump/extrajump.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dicx1uk4187dq" -path="res://.godot/imported/extrajump.png-b4900058bcc784042b34649841ea8810.ctex" +path="res://.godot/imported/extrajump.png-05dd8382741d643c60de1808878c2a6e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/permanent_items/extrajump/extrajump.png" -dest_files=["res://.godot/imported/extrajump.png-b4900058bcc784042b34649841ea8810.ctex"] +source_file="res://items/unique_items/extrajump/extrajump.png" +dest_files=["res://.godot/imported/extrajump.png-05dd8382741d643c60de1808878c2a6e.ctex"] [params] diff --git a/items/permanent_items/extrajump/extrajump.tscn b/items/unique_items/extrajump/extrajump.tscn similarity index 88% rename from items/permanent_items/extrajump/extrajump.tscn rename to items/unique_items/extrajump/extrajump.tscn index 65d7933..3165003 100644 --- a/items/permanent_items/extrajump/extrajump.tscn +++ b/items/unique_items/extrajump/extrajump.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=7 format=3 uid="uid://wc7kgtomy6xm"] -[ext_resource type="Script" uid="uid://bnr7cpjuvy6xj" path="res://items/permanent_items/extrajump/extrajump.gd" id="1_t7gtn"] +[ext_resource type="Script" uid="uid://bnr7cpjuvy6xj" path="res://items/unique_items/extrajump/extrajump.gd" id="1_t7gtn"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_70c5v"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_hw3fr"] -[ext_resource type="Texture2D" uid="uid://dicx1uk4187dq" path="res://items/permanent_items/extrajump/extrajump.png" id="3_t7gtn"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="3_hw3fr"] +[ext_resource type="Texture2D" uid="uid://dicx1uk4187dq" path="res://items/unique_items/extrajump/extrajump.png" id="3_t7gtn"] [ext_resource type="AudioStream" uid="uid://pdd0sy3p4y0d" path="res://sounds/750240__universfield__coin-drop.mp3" id="5_kn13r"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_hw3fr"] diff --git a/items/permanent_items/high_jump/high_jump.gd b/items/unique_items/high_jump/high_jump.gd similarity index 100% rename from items/permanent_items/high_jump/high_jump.gd rename to items/unique_items/high_jump/high_jump.gd diff --git a/items/permanent_items/high_jump/high_jump.gd.uid b/items/unique_items/high_jump/high_jump.gd.uid similarity index 100% rename from items/permanent_items/high_jump/high_jump.gd.uid rename to items/unique_items/high_jump/high_jump.gd.uid diff --git a/items/permanent_items/high_jump/high_jump.png b/items/unique_items/high_jump/high_jump.png similarity index 100% rename from items/permanent_items/high_jump/high_jump.png rename to items/unique_items/high_jump/high_jump.png diff --git a/items/permanent_items/high_jump/high_jump.png.import b/items/unique_items/high_jump/high_jump.png.import similarity index 75% rename from items/permanent_items/high_jump/high_jump.png.import rename to items/unique_items/high_jump/high_jump.png.import index 6dd0910..df8cece 100644 --- a/items/permanent_items/high_jump/high_jump.png.import +++ b/items/unique_items/high_jump/high_jump.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c6pyyfgkhytu5" -path="res://.godot/imported/high_jump.png-1048e30a3bfeaa9531008ef81208b49f.ctex" +path="res://.godot/imported/high_jump.png-1067a48863a7f4045d2fdd5833c9cc16.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/permanent_items/high_jump/high_jump.png" -dest_files=["res://.godot/imported/high_jump.png-1048e30a3bfeaa9531008ef81208b49f.ctex"] +source_file="res://items/unique_items/high_jump/high_jump.png" +dest_files=["res://.godot/imported/high_jump.png-1067a48863a7f4045d2fdd5833c9cc16.ctex"] [params] diff --git a/items/permanent_items/high_jump/high_jump.tscn b/items/unique_items/high_jump/high_jump.tscn similarity index 88% rename from items/permanent_items/high_jump/high_jump.tscn rename to items/unique_items/high_jump/high_jump.tscn index f47334a..b1e8b12 100644 --- a/items/permanent_items/high_jump/high_jump.tscn +++ b/items/unique_items/high_jump/high_jump.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=7 format=3 uid="uid://bpgo1djj8f1rg"] -[ext_resource type="Script" uid="uid://cq6h2iven3rly" path="res://items/permanent_items/high_jump/high_jump.gd" id="1_7gixi"] +[ext_resource type="Script" uid="uid://cq6h2iven3rly" path="res://items/unique_items/high_jump/high_jump.gd" id="1_7gixi"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_s7mjt"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_ui5no"] -[ext_resource type="Texture2D" uid="uid://c6pyyfgkhytu5" path="res://items/permanent_items/high_jump/high_jump.png" id="4_7gixi"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="3_ui5no"] +[ext_resource type="Texture2D" uid="uid://c6pyyfgkhytu5" path="res://items/unique_items/high_jump/high_jump.png" id="4_7gixi"] [ext_resource type="AudioStream" uid="uid://pdd0sy3p4y0d" path="res://sounds/750240__universfield__coin-drop.mp3" id="5_s7mjt"] [sub_resource type="CircleShape2D" id="CircleShape2D_bya24"] diff --git a/items/permanent_items/upslash/upslash.gd b/items/unique_items/upslash/upslash.gd similarity index 100% rename from items/permanent_items/upslash/upslash.gd rename to items/unique_items/upslash/upslash.gd diff --git a/items/permanent_items/upslash/upslash.gd.uid b/items/unique_items/upslash/upslash.gd.uid similarity index 100% rename from items/permanent_items/upslash/upslash.gd.uid rename to items/unique_items/upslash/upslash.gd.uid diff --git a/items/permanent_items/upslash/upslash.png b/items/unique_items/upslash/upslash.png similarity index 100% rename from items/permanent_items/upslash/upslash.png rename to items/unique_items/upslash/upslash.png diff --git a/items/permanent_items/upslash/upslash.png.import b/items/unique_items/upslash/upslash.png.import similarity index 76% rename from items/permanent_items/upslash/upslash.png.import rename to items/unique_items/upslash/upslash.png.import index 590f1b3..b28e734 100644 --- a/items/permanent_items/upslash/upslash.png.import +++ b/items/unique_items/upslash/upslash.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bhsmtgdpbxq46" -path="res://.godot/imported/upslash.png-284818e0c0e6551e342cba63442fd5f7.ctex" +path="res://.godot/imported/upslash.png-80aa495c6e97ba4b13b5c25052544db0.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/permanent_items/upslash/upslash.png" -dest_files=["res://.godot/imported/upslash.png-284818e0c0e6551e342cba63442fd5f7.ctex"] +source_file="res://items/unique_items/upslash/upslash.png" +dest_files=["res://.godot/imported/upslash.png-80aa495c6e97ba4b13b5c25052544db0.ctex"] [params] diff --git a/items/permanent_items/upslash/upslash.tscn b/items/unique_items/upslash/upslash.tscn similarity index 89% rename from items/permanent_items/upslash/upslash.tscn rename to items/unique_items/upslash/upslash.tscn index b4ea8b7..80049d9 100644 --- a/items/permanent_items/upslash/upslash.tscn +++ b/items/unique_items/upslash/upslash.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=7 format=3 uid="uid://bwtdls58ajair"] -[ext_resource type="Script" uid="uid://cyql6o6m4xrv3" path="res://items/permanent_items/upslash/upslash.gd" id="1_vv4qh"] +[ext_resource type="Script" uid="uid://cyql6o6m4xrv3" path="res://items/unique_items/upslash/upslash.gd" id="1_vv4qh"] [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_ayb0v"] -[ext_resource type="Texture2D" uid="uid://bhsmtgdpbxq46" path="res://items/permanent_items/upslash/upslash.png" id="4_4ynxq"] -[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_35mg8"] +[ext_resource type="Texture2D" uid="uid://bhsmtgdpbxq46" path="res://items/unique_items/upslash/upslash.png" id="4_4ynxq"] +[ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/generic/ItemShine.png" id="4_35mg8"] [ext_resource type="AudioStream" uid="uid://pdd0sy3p4y0d" path="res://sounds/750240__universfield__coin-drop.mp3" id="6_5tj4p"] [sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"] diff --git a/main.tscn b/main.tscn index b0a9b3c..ff2e288 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://cxo6bq26huau7"] +[gd_scene load_steps=17 format=3 uid="uid://cxo6bq26huau7"] [ext_resource type="PackedScene" uid="uid://cmaovvr15b3qk" path="res://player/player.tscn" id="2_1bvp3"] [ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="3_kek77"] @@ -15,6 +15,7 @@ [ext_resource type="PackedScene" uid="uid://cqn67nwyrtq3k" path="res://ui/journal/journal.tscn" id="10_w48qg"] [ext_resource type="PackedScene" uid="uid://cpe4s6vsn0ujd" path="res://enemies/boss/boss.tscn" id="11_efxa6"] [ext_resource type="Script" uid="uid://gul4u5tw1vxk" path="res://bg_image.gd" id="13_vivmo"] +[ext_resource type="PackedScene" uid="uid://dhxnae8wbhp3u" path="res://vines_petals/bud.tscn" id="16_2cqfq"] [node name="main" type="Node2D"] @@ -103,7 +104,8 @@ colors = Array[Color]([Color(0, 0.6441987, 0.6693053, 1), Color(0.90588236, 0.15 script = ExtResource("10_efxa6") boss = ExtResource("11_efxa6") -[node name="Boss" parent="." instance=ExtResource("11_efxa6")] +[node name="Bud" parent="." instance=ExtResource("16_2cqfq")] +position = Vector2(897, -3027) [connection signal="active_item_changed" from="Player" to="UIOverlay/ItemUI" method="_on_player_active_item_changed"] [connection signal="health_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_health_changed"] diff --git a/vine.gd b/vine.gd new file mode 100644 index 0000000..ecec406 --- /dev/null +++ b/vine.gd @@ -0,0 +1,3 @@ +extends Node2D + +var vine_nodes : Array[Vector2] diff --git a/vine.gd.uid b/vine.gd.uid new file mode 100644 index 0000000..35130ed --- /dev/null +++ b/vine.gd.uid @@ -0,0 +1 @@ +uid://dnxttryo3t3sx diff --git a/vines_petals/bud.gd b/vines_petals/bud.gd new file mode 100644 index 0000000..2938b29 --- /dev/null +++ b/vines_petals/bud.gd @@ -0,0 +1,6 @@ +class_name Bud extends Node2D + +func _on_opened(): + $AnimatedSprite2D.play("open") + await $AnimatedSprite2D.animation_finished + queue_free() diff --git a/vines_petals/bud.gd.uid b/vines_petals/bud.gd.uid new file mode 100644 index 0000000..e045c04 --- /dev/null +++ b/vines_petals/bud.gd.uid @@ -0,0 +1 @@ +uid://ceqsyf8voslys diff --git a/vines_petals/bud.tscn b/vines_petals/bud.tscn new file mode 100644 index 0000000..08f8b86 --- /dev/null +++ b/vines_petals/bud.tscn @@ -0,0 +1,65 @@ +[gd_scene load_steps=11 format=3 uid="uid://dhxnae8wbhp3u"] + +[ext_resource type="Script" uid="uid://ceqsyf8voslys" path="res://vines_petals/bud.gd" id="1_543bc"] +[ext_resource type="Texture2D" uid="uid://bvn8x53bmkkww" path="res://vines_petals/bud_closed.png" id="1_nxhvy"] +[ext_resource type="Texture2D" uid="uid://dafanrd3fctmx" path="res://vines_petals/bud_half_open.png" id="2_t3v0v"] +[ext_resource type="Texture2D" uid="uid://d15c1exwtp7sc" path="res://vines_petals/bud_open.png" id="3_543bc"] +[ext_resource type="Texture2D" uid="uid://dcd5lpfmn67m" path="res://vines_petals/bud_open_full.png" id="4_tg157"] +[ext_resource type="Script" uid="uid://ct8am2xeyymuj" path="res://utils/enemy_hurtbox.gd" id="6_tg157"] +[ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="7_tg157"] + +[sub_resource type="SpriteFrames" id="SpriteFrames_rnmbv"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_nxhvy") +}, { +"duration": 1.0, +"texture": ExtResource("2_t3v0v") +}, { +"duration": 1.0, +"texture": ExtResource("3_543bc") +}, { +"duration": 1.0, +"texture": ExtResource("4_tg157") +}], +"loop": false, +"name": &"open", +"speed": 7.5 +}] + +[sub_resource type="CircleShape2D" id="CircleShape2D_rnmbv"] +radius = 12.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_rupnl"] + +[node name="Bud" type="Node2D"] +script = ExtResource("1_543bc") + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +scale = Vector2(3, 3) +sprite_frames = SubResource("SpriteFrames_rnmbv") +animation = &"open" + +[node name="EnemyHurtbox" type="Area2D" parent="."] +scale = Vector2(3, 3) +collision_layer = 16 +collision_mask = 0 +script = ExtResource("6_tg157") +max_hp = 1 +flash_duration = 0.0 +flashColor = Color(1, 1, 1, 1) +metadata/_custom_type_script = "uid://ct8am2xeyymuj" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="EnemyHurtbox"] +position = Vector2(0, 3.5) +shape = SubResource("CircleShape2D_rnmbv") + +[node name="CollisionShape2D2" type="CollisionShape2D" parent="EnemyHurtbox"] +position = Vector2(-0.5, -5) +scale = Vector2(0.5, 1) +shape = SubResource("CircleShape2D_rupnl") + +[node name="EarthAligner" parent="." instance=ExtResource("7_tg157")] + +[connection signal="died" from="EnemyHurtbox" to="." method="_on_opened"] diff --git a/vines_petals/bud_closed.pdn b/vines_petals/bud_closed.pdn new file mode 100644 index 0000000..4f19b72 Binary files /dev/null and b/vines_petals/bud_closed.pdn differ diff --git a/vines_petals/bud_closed.png b/vines_petals/bud_closed.png new file mode 100644 index 0000000..17ec29d Binary files /dev/null and b/vines_petals/bud_closed.png differ diff --git a/vines_petals/bud_closed.png.import b/vines_petals/bud_closed.png.import new file mode 100644 index 0000000..28817f0 --- /dev/null +++ b/vines_petals/bud_closed.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bvn8x53bmkkww" +path="res://.godot/imported/bud_closed.png-5f29bf0d52946dac84c82b0b648a63ec.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/bud_closed.png" +dest_files=["res://.godot/imported/bud_closed.png-5f29bf0d52946dac84c82b0b648a63ec.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/bud_half_open.pdn b/vines_petals/bud_half_open.pdn new file mode 100644 index 0000000..fabe59c Binary files /dev/null and b/vines_petals/bud_half_open.pdn differ diff --git a/vines_petals/bud_half_open.png b/vines_petals/bud_half_open.png new file mode 100644 index 0000000..d19a2a1 Binary files /dev/null and b/vines_petals/bud_half_open.png differ diff --git a/vines_petals/bud_half_open.png.import b/vines_petals/bud_half_open.png.import new file mode 100644 index 0000000..7932919 --- /dev/null +++ b/vines_petals/bud_half_open.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dafanrd3fctmx" +path="res://.godot/imported/bud_half_open.png-a6b3a6e56720d62db70ded60347c8f67.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/bud_half_open.png" +dest_files=["res://.godot/imported/bud_half_open.png-a6b3a6e56720d62db70ded60347c8f67.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/bud_open.pdn b/vines_petals/bud_open.pdn new file mode 100644 index 0000000..2fa5be0 Binary files /dev/null and b/vines_petals/bud_open.pdn differ diff --git a/vines_petals/bud_open.png b/vines_petals/bud_open.png new file mode 100644 index 0000000..0faff96 Binary files /dev/null and b/vines_petals/bud_open.png differ diff --git a/vines_petals/bud_open.png.import b/vines_petals/bud_open.png.import new file mode 100644 index 0000000..a38ecf0 --- /dev/null +++ b/vines_petals/bud_open.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d15c1exwtp7sc" +path="res://.godot/imported/bud_open.png-7112d65aa9de2ae701c4de4b28800546.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/bud_open.png" +dest_files=["res://.godot/imported/bud_open.png-7112d65aa9de2ae701c4de4b28800546.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/bud_open_full.pdn b/vines_petals/bud_open_full.pdn new file mode 100644 index 0000000..f7189f8 Binary files /dev/null and b/vines_petals/bud_open_full.pdn differ diff --git a/vines_petals/bud_open_full.png b/vines_petals/bud_open_full.png new file mode 100644 index 0000000..b733e29 Binary files /dev/null and b/vines_petals/bud_open_full.png differ diff --git a/vines_petals/bud_open_full.png.import b/vines_petals/bud_open_full.png.import new file mode 100644 index 0000000..e665943 --- /dev/null +++ b/vines_petals/bud_open_full.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dcd5lpfmn67m" +path="res://.godot/imported/bud_open_full.png-bbb60391b276fa8ad5d5fe92b4b8dfba.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/bud_open_full.png" +dest_files=["res://.godot/imported/bud_open_full.png-bbb60391b276fa8ad5d5fe92b4b8dfba.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/vine.pdn b/vines_petals/vine.pdn new file mode 100644 index 0000000..c66be67 Binary files /dev/null and b/vines_petals/vine.pdn differ diff --git a/vines_petals/vine.tscn b/vines_petals/vine.tscn new file mode 100644 index 0000000..83f3984 --- /dev/null +++ b/vines_petals/vine.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3 uid="uid://b7o82cdfwuqd1"] + +[ext_resource type="Script" uid="uid://dnxttryo3t3sx" path="res://vine.gd" id="1_3bbo6"] + +[node name="Vine" type="Node2D"] +script = ExtResource("1_3bbo6") diff --git a/vines_petals/vine_active_blue.png b/vines_petals/vine_active_blue.png new file mode 100644 index 0000000..efdadca Binary files /dev/null and b/vines_petals/vine_active_blue.png differ diff --git a/vines_petals/vine_active_blue.png.import b/vines_petals/vine_active_blue.png.import new file mode 100644 index 0000000..4c6b0c6 --- /dev/null +++ b/vines_petals/vine_active_blue.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8lw6or3jteqn" +path="res://.godot/imported/vine_active_blue.png-87243f52c04f878aeb26495b1b6f9567.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/vine_active_blue.png" +dest_files=["res://.godot/imported/vine_active_blue.png-87243f52c04f878aeb26495b1b6f9567.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/vine_active_cyan.png b/vines_petals/vine_active_cyan.png new file mode 100644 index 0000000..bf7d975 Binary files /dev/null and b/vines_petals/vine_active_cyan.png differ diff --git a/vines_petals/vine_active_cyan.png.import b/vines_petals/vine_active_cyan.png.import new file mode 100644 index 0000000..62820fc --- /dev/null +++ b/vines_petals/vine_active_cyan.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c64dfr4y3umc3" +path="res://.godot/imported/vine_active_cyan.png-c63839c9f6ceecc38ef186dd4af26f1e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/vine_active_cyan.png" +dest_files=["res://.godot/imported/vine_active_cyan.png-c63839c9f6ceecc38ef186dd4af26f1e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/vine_active_green.png b/vines_petals/vine_active_green.png new file mode 100644 index 0000000..1c2bee6 Binary files /dev/null and b/vines_petals/vine_active_green.png differ diff --git a/vines_petals/vine_active_green.png.import b/vines_petals/vine_active_green.png.import new file mode 100644 index 0000000..17905e4 --- /dev/null +++ b/vines_petals/vine_active_green.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccu5nta4unn0k" +path="res://.godot/imported/vine_active_green.png-4e6bbb87e7ee83304a3302b8a43f7440.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/vine_active_green.png" +dest_files=["res://.godot/imported/vine_active_green.png-4e6bbb87e7ee83304a3302b8a43f7440.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/vine_active_purple.png b/vines_petals/vine_active_purple.png new file mode 100644 index 0000000..9cc9972 Binary files /dev/null and b/vines_petals/vine_active_purple.png differ diff --git a/vines_petals/vine_active_purple.png.import b/vines_petals/vine_active_purple.png.import new file mode 100644 index 0000000..8ece721 --- /dev/null +++ b/vines_petals/vine_active_purple.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csu4u3ubbm7iu" +path="res://.godot/imported/vine_active_purple.png-bf98a4fafd3d4ed84467af2fe31f9f55.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/vine_active_purple.png" +dest_files=["res://.godot/imported/vine_active_purple.png-bf98a4fafd3d4ed84467af2fe31f9f55.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/vine_active_red.png b/vines_petals/vine_active_red.png new file mode 100644 index 0000000..0d8f628 Binary files /dev/null and b/vines_petals/vine_active_red.png differ diff --git a/vines_petals/vine_active_red.png.import b/vines_petals/vine_active_red.png.import new file mode 100644 index 0000000..03a0986 --- /dev/null +++ b/vines_petals/vine_active_red.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ckg53r1c1iu1" +path="res://.godot/imported/vine_active_red.png-0b26e423cd94f9ee6333d4d7e15441a7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/vine_active_red.png" +dest_files=["res://.godot/imported/vine_active_red.png-0b26e423cd94f9ee6333d4d7e15441a7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/vine_cross.pdn b/vines_petals/vine_cross.pdn new file mode 100644 index 0000000..9702d85 Binary files /dev/null and b/vines_petals/vine_cross.pdn differ diff --git a/vines_petals/vine_inactive.png b/vines_petals/vine_inactive.png new file mode 100644 index 0000000..bc9de88 Binary files /dev/null and b/vines_petals/vine_inactive.png differ diff --git a/vines_petals/vine_inactive.png.import b/vines_petals/vine_inactive.png.import new file mode 100644 index 0000000..a72aa06 --- /dev/null +++ b/vines_petals/vine_inactive.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bec44g83brq0t" +path="res://.godot/imported/vine_inactive.png-81aa5dea26b4c41dddf3d9ffb18374d0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://vines_petals/vine_inactive.png" +dest_files=["res://.godot/imported/vine_inactive.png-81aa5dea26b4c41dddf3d9ffb18374d0.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/vines_petals/vine_node.gd b/vines_petals/vine_node.gd new file mode 100644 index 0000000..54092af --- /dev/null +++ b/vines_petals/vine_node.gd @@ -0,0 +1,9 @@ +class_name VineNode extends Node2D +@onready var grid : Grid = %Grid +var grid_position : Vector2 +var angular_offset : float +var height_offset : float +var bud : Bud + +func _ready() -> void: + position = grid. diff --git a/vines_petals/vine_node.gd.uid b/vines_petals/vine_node.gd.uid new file mode 100644 index 0000000..14607f4 --- /dev/null +++ b/vines_petals/vine_node.gd.uid @@ -0,0 +1 @@ +uid://dmd5rpdq3ij1k