Merge branch 'master' of https://github.com/Simplesmente-O-Grupo/projeto-fantasiaHEADmaster

3 files changed, 62 insertions, 0 deletions

diff --git a/assets/definitions/Items/big_potion_of_heals.tres b/assets/definitions/Items/big_potion_of_heals.tres
new file mode 100644
index 0000000..81c5e0b
--- /dev/null
+++ b/assets/definitions/Items/big_potion_of_heals.tres
@@ -0,0 +1,23 @@
+[gd_resource type="Resource" script_class="ItemResource" load_steps=7 format=3 uid="uid://dm0v0aoarb4dp"]
+
+[ext_resource type="Script" uid="uid://bslt4pbvwvsj1" path="res://scripts/Magic/HealEffect.cs" id="1_2x33w"]
+[ext_resource type="Script" uid="uid://bybli1lduvm3n" path="res://scripts/Entities/Items/ItemResource.cs" id="1_vsyyt"]
+[ext_resource type="Script" uid="uid://b72fwkwul1wet" path="res://scripts/Entities/Items/SpellEffectItemActivation.cs" id="2_l4xm8"]
+[ext_resource type="Texture2D" uid="uid://dftr4yuf72gg2" path="res://assets/sprites/items/big_health_potion.png" id="3_4nt2e"]
+
+[sub_resource type="Resource" id="Resource_8peth"]
+script = ExtResource("1_2x33w")
+Healing = 20
+metadata/_custom_type_script = "uid://bslt4pbvwvsj1"
+
+[sub_resource type="Resource" id="Resource_jdsxe"]
+script = ExtResource("2_l4xm8")
+effect = SubResource("Resource_8peth")
+metadata/_custom_type_script = "uid://b72fwkwul1wet"
+
+[resource]
+script = ExtResource("1_vsyyt")
+DisplayName = "Poção de cura grande"
+Icon = ExtResource("3_4nt2e")
+Activation = SubResource("Resource_jdsxe")
+metadata/_custom_type_script = "uid://bybli1lduvm3n"
diff --git a/assets/definitions/Items/uohhh.tres b/assets/definitions/Items/uohhh.tres
new file mode 100644
index 0000000..c48c07a
--- /dev/null
+++ b/assets/definitions/Items/uohhh.tres
@@ -0,0 +1,21 @@
+[gd_resource type="Resource" script_class="ItemResource" load_steps=6 format=3 uid="uid://otklq7k1tb45"]
+
+[ext_resource type="Script" uid="uid://bybli1lduvm3n" path="res://scripts/Entities/Items/ItemResource.cs" id="1_6qucm"]
+[ext_resource type="Script" uid="uid://bslt4pbvwvsj1" path="res://scripts/Magic/HealEffect.cs" id="1_uvkms"]
+[ext_resource type="Script" uid="uid://b72fwkwul1wet" path="res://scripts/Entities/Items/SpellEffectItemActivation.cs" id="2_i5wwe"]
+
+[sub_resource type="Resource" id="Resource_idx7p"]
+script = ExtResource("1_uvkms")
+Healing = 89
+metadata/_custom_type_script = "uid://bslt4pbvwvsj1"
+
+[sub_resource type="Resource" id="Resource_v7ab0"]
+script = ExtResource("2_i5wwe")
+effect = SubResource("Resource_idx7p")
+metadata/_custom_type_script = "uid://b72fwkwul1wet"
+
+[resource]
+script = ExtResource("1_6qucm")
+DisplayName = "ojo"
+Activation = SubResource("Resource_v7ab0")
+metadata/_custom_type_script = "uid://bybli1lduvm3n"
diff --git a/assets/definitions/actor/toilet.tres b/assets/definitions/actor/toilet.tres
new file mode 100644
index 0000000..f33a878
--- /dev/null
+++ b/assets/definitions/actor/toilet.tres
@@ -0,0 +1,18 @@
+[gd_resource type="Resource" script_class="EnemyDefinition" load_steps=4 format=3 uid="uid://bbj06osf7pjor"]
+
+[ext_resource type="Script" uid="uid://dkfdm2m2scyks" path="res://scripts/Entities/Actors/EnemyDefinition.cs" id="1_mh1wq"]
+[ext_resource type="Texture2D" uid="uid://w0808ug4al66" path="res://assets/sprites/actors/generic_grave.png" id="1_tv8qd"]
+[ext_resource type="Texture2D" uid="uid://j1b2vbolwsch" path="res://assets/sprites/actors/ToiletMan.png" id="3_riy75"]
+
+[resource]
+script = ExtResource("1_mh1wq")
+AI = 1
+deathTexture = ExtResource("1_tv8qd")
+Hp = 16
+Atk = 6
+Def = 2
+Men = 3
+name = "SKIBIDI"
+texture = ExtResource("3_riy75")
+Type = 2
+metadata/_custom_type_script = "uid://dkfdm2m2scyks"