From eee06bc44400cec70fc73a3103b8d8c951a589e7 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:08:11 +0100 Subject: [PATCH 01/20] Create the enemy action tree --- Entity/Enemy/Enemy.gd | 4 ++++ Entity/Enemy/EnemyActionTree.gd | 18 ++++++++++++++++++ Entity/Enemy/NextCardProbability.gd | 12 ++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 Entity/Enemy/EnemyActionTree.gd create mode 100644 Entity/Enemy/NextCardProbability.gd diff --git a/Entity/Enemy/Enemy.gd b/Entity/Enemy/Enemy.gd index 66ebaba6..9c99389d 100644 --- a/Entity/Enemy/Enemy.gd +++ b/Entity/Enemy/Enemy.gd @@ -2,8 +2,12 @@ extends Entity class_name Enemy ## Base enemy class. +## The name of the enemy, used for display purpose @export var enemy_name: GlobalEnums.PossibleEnemies +## The attack set of the enemy +@export var enemy_attack_tree: EnemyActionTree + ## @Override [br] ## See [Entity] for more information [br] ## Connect the enemy to the [PhaseManager] to make it attack when it's its turn. diff --git a/Entity/Enemy/EnemyActionTree.gd b/Entity/Enemy/EnemyActionTree.gd new file mode 100644 index 00000000..02d4b86f --- /dev/null +++ b/Entity/Enemy/EnemyActionTree.gd @@ -0,0 +1,18 @@ +class_name EnemyActionTree extends Resource +## Holds the dictionary which says what are the attacks that can come after a given attack + +## The attacks the enemy can do, and which attack they can do after, with which probability [br] +## It should have the format : [br] +## [code] +## { +## action_1: [(probability, action_2), (other_probability, action_3)], +## action_2: [(another_probability, action_1), (yet_another_probability, action_3)], +## ... +## } +## [/code] +## The default is an example using the [NextCardProbability] class, and alternating between damage and block +@export var action_tree: Dictionary = { + load("res://Cards/Resource/Card_Damage.tres"): NextCardProbability.new(100, load("res://Cards/Resource/Card_Get_block.tres")), + load("res://Cards/Resource/Card_Get_block.tres"): NextCardProbability.new(100, load("res://Cards/Resource/Card_Damage.tres")) +} + diff --git a/Entity/Enemy/NextCardProbability.gd b/Entity/Enemy/NextCardProbability.gd new file mode 100644 index 00000000..139114c7 --- /dev/null +++ b/Entity/Enemy/NextCardProbability.gd @@ -0,0 +1,12 @@ +class_name NextCardProbability extends Resource +## A class to hold the probability to get a given card played by an enemy + +## Probability to play the associated card, +## this should be between 0 and 100 +@export var probability: int = 0 +## The card to be played +@export var card: CardBase = null + +func _init(new_probability: int, new_card: CardBase) -> void: + probability = new_probability + card = new_card From e3a1208e25c57ff61f3ff83e3cb9b24d90e07677 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:22:35 +0100 Subject: [PATCH 02/20] Add function to choose the next action of an enemy --- Entity/Enemy/EnemyActionTree.gd | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Entity/Enemy/EnemyActionTree.gd b/Entity/Enemy/EnemyActionTree.gd index 02d4b86f..16460fd6 100644 --- a/Entity/Enemy/EnemyActionTree.gd +++ b/Entity/Enemy/EnemyActionTree.gd @@ -16,3 +16,21 @@ class_name EnemyActionTree extends Resource load("res://Cards/Resource/Card_Get_block.tres"): NextCardProbability.new(100, load("res://Cards/Resource/Card_Damage.tres")) } +var last_chosen_action: CardBase = null + +func choose_next_action() -> CardBase: + var possible_next_action: Array = action_tree[last_chosen_action] + # checking the total of the probabilities + var total_probability: int = 0 + for card_probability: NextCardProbability in possible_next_action: + total_probability += card_probability.probability + # choose a number between 0 and the total probability -1 + var random_choice: int = randi_range(0, total_probability -1) + var probability_sum: int = 0 + for card_probability: NextCardProbability in possible_next_action: + if probability_sum <= random_choice && random_choice < probability_sum + card_probability.probability: + return card_probability.card + else: + probability_sum += card_probability.probability + push_error("The next action choice for the enemy didn't find a suitable next action, returning default") + return load("res://Cards/Resource/Card_Damage.tres") From a91dbbdf17a0481f519a05e0882b8d9943903029 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:18:32 +0100 Subject: [PATCH 03/20] Move player and enemy actions in dedicated folders The targeting is different so there needs to be separate cards --- Cards/CardSets/DefaultDeck.tres | 40 +++++++++---------- Cards/CardSets/InstantWinDeck.tres | 10 ++--- Cards/Resource/Card_EnemyAttack.tres | 16 -------- Cards/Resource/Enemy/Card_EnemyAttack.tres | 31 ++++++++++++++ Cards/Resource/{ => Player}/Card_Banana.tres | 0 .../Card_Buff_Poison_Duration.tres | 0 .../{ => Player}/Card_Buff_healing.tres | 0 Cards/Resource/{ => Player}/Card_Damage.tres | 0 .../{ => Player}/Card_DamageAllEnemies.tres | 0 .../{ => Player}/Card_DamageHealth.tres | 0 .../{ => Player}/Card_Damage_EVERYTHING.tres | 0 .../{ => Player}/Card_Debuff_healing.tres | 0 .../Resource/{ => Player}/Card_DrawCards.tres | 0 Cards/Resource/{ => Player}/Card_Energy.tres | 0 .../{ => Player}/Card_FaunaSweep.tres | 0 .../Resource/{ => Player}/Card_Get_block.tres | 0 Cards/Resource/{ => Player}/Card_Heal.tres | 0 Cards/Resource/{ => Player}/Card_Poison.tres | 0 .../{ => Player}/Card_PoisonRandom.tres | 0 Cards/Resource/{ => Player}/Card_Slap.tres | 0 .../Resource/{ => Player}/Card_Strength.tres | 0 .../{ => Player}/Card_Stress_Damage.tres | 0 .../Resource/{ => Player}/Card_SuperSlap.tres | 0 .../{ => Player}/Card_Vulnerability.tres | 0 .../Resource/{ => Player}/Card_Weakness.tres | 0 .../{ => Player}/Card_buff_sooth.tres | 0 .../{ => Player}/Card_damage_and_poison.tres | 0 .../{ => Player}/Card_debuff_sooth.tres | 0 Cards/Resource/{ => Player}/Card_sooth.tres | 0 Entity/Enemy/EnemyScene/Enemy.tscn | 2 +- 30 files changed, 57 insertions(+), 42 deletions(-) delete mode 100644 Cards/Resource/Card_EnemyAttack.tres create mode 100644 Cards/Resource/Enemy/Card_EnemyAttack.tres rename Cards/Resource/{ => Player}/Card_Banana.tres (100%) rename Cards/Resource/{ => Player}/Card_Buff_Poison_Duration.tres (100%) rename Cards/Resource/{ => Player}/Card_Buff_healing.tres (100%) rename Cards/Resource/{ => Player}/Card_Damage.tres (100%) rename Cards/Resource/{ => Player}/Card_DamageAllEnemies.tres (100%) rename Cards/Resource/{ => Player}/Card_DamageHealth.tres (100%) rename Cards/Resource/{ => Player}/Card_Damage_EVERYTHING.tres (100%) rename Cards/Resource/{ => Player}/Card_Debuff_healing.tres (100%) rename Cards/Resource/{ => Player}/Card_DrawCards.tres (100%) rename Cards/Resource/{ => Player}/Card_Energy.tres (100%) rename Cards/Resource/{ => Player}/Card_FaunaSweep.tres (100%) rename Cards/Resource/{ => Player}/Card_Get_block.tres (100%) rename Cards/Resource/{ => Player}/Card_Heal.tres (100%) rename Cards/Resource/{ => Player}/Card_Poison.tres (100%) rename Cards/Resource/{ => Player}/Card_PoisonRandom.tres (100%) rename Cards/Resource/{ => Player}/Card_Slap.tres (100%) rename Cards/Resource/{ => Player}/Card_Strength.tres (100%) rename Cards/Resource/{ => Player}/Card_Stress_Damage.tres (100%) rename Cards/Resource/{ => Player}/Card_SuperSlap.tres (100%) rename Cards/Resource/{ => Player}/Card_Vulnerability.tres (100%) rename Cards/Resource/{ => Player}/Card_Weakness.tres (100%) rename Cards/Resource/{ => Player}/Card_buff_sooth.tres (100%) rename Cards/Resource/{ => Player}/Card_damage_and_poison.tres (100%) rename Cards/Resource/{ => Player}/Card_debuff_sooth.tres (100%) rename Cards/Resource/{ => Player}/Card_sooth.tres (100%) diff --git a/Cards/CardSets/DefaultDeck.tres b/Cards/CardSets/DefaultDeck.tres index 09bf170e..34c84ae1 100644 --- a/Cards/CardSets/DefaultDeck.tres +++ b/Cards/CardSets/DefaultDeck.tres @@ -1,26 +1,26 @@ [gd_resource type="Resource" script_class="CardSetBase" load_steps=22 format=3 uid="uid://cda81lacxt2ai"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="1_pnxc0"] -[ext_resource type="Resource" uid="uid://dam752rc15nu5" path="res://Cards/Resource/Card_Buff_Poison_Duration.tres" id="1_to4gc"] -[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/Card_Damage.tres" id="2_q7qqo"] -[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/Card_DamageAllEnemies.tres" id="3_4ka0y"] -[ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/Card_DamageHealth.tres" id="4_es3ma"] -[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/Card_damage_and_poison.tres" id="5_giy28"] -[ext_resource type="Resource" uid="uid://uv2rili0xf3x" path="res://Cards/Resource/Card_Damage_EVERYTHING.tres" id="6_gr534"] -[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/Card_DrawCards.tres" id="7_y1gya"] -[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/Card_Heal.tres" id="8_haia1"] -[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/Card_Poison.tres" id="9_1tkbv"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/Card_Strength.tres" id="10_7m46u"] -[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/Card_Vulnerability.tres" id="11_0eivv"] -[ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/Card_Weakness.tres" id="12_lo5f6"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Card_Banana.tres" id="13_v3qs7"] -[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Card_FaunaSweep.tres" id="14_ghttq"] -[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/Card_Slap.tres" id="15_ie3pe"] -[ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/Card_SuperSlap.tres" id="16_jluts"] -[ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/Card_Buff_healing.tres" id="17_0kgrg"] -[ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/Card_Debuff_healing.tres" id="18_uj8io"] -[ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/Card_Stress_Damage.tres" id="19_s1aj2"] -[ext_resource type="Resource" uid="uid://b1u8retwosbc0" path="res://Cards/Resource/Card_Get_block.tres" id="20_nvohy"] +[ext_resource type="Resource" uid="uid://dam752rc15nu5" path="res://Cards/Resource/Player/Card_Buff_Poison_Duration.tres" id="1_to4gc"] +[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/Player/Card_Damage.tres" id="2_q7qqo"] +[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/Player/Card_DamageAllEnemies.tres" id="3_4ka0y"] +[ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/Player/Card_DamageHealth.tres" id="4_es3ma"] +[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/Player/Card_damage_and_poison.tres" id="5_giy28"] +[ext_resource type="Resource" uid="uid://uv2rili0xf3x" path="res://Cards/Resource/Player/Card_Damage_EVERYTHING.tres" id="6_gr534"] +[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/Player/Card_DrawCards.tres" id="7_y1gya"] +[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/Player/Card_Heal.tres" id="8_haia1"] +[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/Player/Card_Poison.tres" id="9_1tkbv"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/Player/Card_Strength.tres" id="10_7m46u"] +[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/Player/Card_Vulnerability.tres" id="11_0eivv"] +[ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/Player/Card_Weakness.tres" id="12_lo5f6"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Player/Card_Banana.tres" id="13_v3qs7"] +[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Player/Card_FaunaSweep.tres" id="14_ghttq"] +[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/Player/Card_Slap.tres" id="15_ie3pe"] +[ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/Player/Card_SuperSlap.tres" id="16_jluts"] +[ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/Player/Card_Buff_healing.tres" id="17_0kgrg"] +[ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/Player/Card_Debuff_healing.tres" id="18_uj8io"] +[ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/Player/Card_Stress_Damage.tres" id="19_s1aj2"] +[ext_resource type="Resource" uid="uid://b1u8retwosbc0" path="res://Cards/Resource/Player/Card_Get_block.tres" id="20_nvohy"] [resource] script = ExtResource("1_pnxc0") diff --git a/Cards/CardSets/InstantWinDeck.tres b/Cards/CardSets/InstantWinDeck.tres index d8026ca4..3e4f5c80 100644 --- a/Cards/CardSets/InstantWinDeck.tres +++ b/Cards/CardSets/InstantWinDeck.tres @@ -1,10 +1,10 @@ [gd_resource type="Resource" script_class="CardSetBase" load_steps=7 format=3 uid="uid://pot7cg3o6qy3"] -[ext_resource type="Resource" uid="uid://dliguwgspqyx0" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_kill.tres" id="1_6mukv"] -[ext_resource type="Resource" uid="uid://6thyux8u44dk" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_sooth.tres" id="2_jr0a6"] -[ext_resource type="Resource" uid="uid://c4nm7mbdlsf6r" path="res://Cards/Resource/Card_Banana.tres" id="3_ptv1b"] -[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/Card_Heal.tres" id="4_jfguc"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/Card_Strength.tres" id="5_g72ks"] +[ext_resource type="Resource" uid="uid://dmgrkemuj71na" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_kill.tres" id="1_6mukv"] +[ext_resource type="Resource" uid="uid://b2isycb5jkern" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_sooth.tres" id="2_jr0a6"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Player/Card_Banana.tres" id="3_ptv1b"] +[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/Player/Card_Heal.tres" id="4_jfguc"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/Player/Card_Strength.tres" id="5_g72ks"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="21_rmslx"] [resource] diff --git a/Cards/Resource/Card_EnemyAttack.tres b/Cards/Resource/Card_EnemyAttack.tres deleted file mode 100644 index 3ff9aa39..00000000 --- a/Cards/Resource/Card_EnemyAttack.tres +++ /dev/null @@ -1,16 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=4 format=3 uid="uid://bsrdu33ukb1ym"] - -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="1_2yea2"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="1_5s3qc"] - -[sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("1_2yea2") -energy_cost = 2 - -[resource] -script = ExtResource("1_5s3qc") -application_type = 1 -card_title = "NULL" -card_description = "NULL" -card_effects_data = Array[Resource("res://Cards/Effects/EffectData.gd")]([]) -energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/Enemy/Card_EnemyAttack.tres b/Cards/Resource/Enemy/Card_EnemyAttack.tres new file mode 100644 index 00000000..ca5bebe7 --- /dev/null +++ b/Cards/Resource/Enemy/Card_EnemyAttack.tres @@ -0,0 +1,31 @@ +[gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://bsrdu33ukb1ym"] + +[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_d7vtx"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_xccp1"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_mkvvo"] +[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_gnv12"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_nb026"] + +[sub_resource type="Resource" id="Resource_0buo4"] +script = ExtResource("1_d7vtx") + +[sub_resource type="Resource" id="Resource_bk02b"] +script = ExtResource("3_mkvvo") + +[sub_resource type="Resource" id="Resource_2lb6r"] +script = ExtResource("2_xccp1") +effect = SubResource("Resource_0buo4") +value = 1 +targeting_function = SubResource("Resource_bk02b") + +[sub_resource type="Resource" id="Resource_1hn6q"] +script = ExtResource("4_gnv12") +energy_cost = 2 + +[resource] +script = ExtResource("5_nb026") +application_type = 0 +card_title = "NULL" +card_description = "NULL" +card_effects_data = Array[ExtResource("2_xccp1")]([SubResource("Resource_2lb6r")]) +energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/Card_Banana.tres b/Cards/Resource/Player/Card_Banana.tres similarity index 100% rename from Cards/Resource/Card_Banana.tres rename to Cards/Resource/Player/Card_Banana.tres diff --git a/Cards/Resource/Card_Buff_Poison_Duration.tres b/Cards/Resource/Player/Card_Buff_Poison_Duration.tres similarity index 100% rename from Cards/Resource/Card_Buff_Poison_Duration.tres rename to Cards/Resource/Player/Card_Buff_Poison_Duration.tres diff --git a/Cards/Resource/Card_Buff_healing.tres b/Cards/Resource/Player/Card_Buff_healing.tres similarity index 100% rename from Cards/Resource/Card_Buff_healing.tres rename to Cards/Resource/Player/Card_Buff_healing.tres diff --git a/Cards/Resource/Card_Damage.tres b/Cards/Resource/Player/Card_Damage.tres similarity index 100% rename from Cards/Resource/Card_Damage.tres rename to Cards/Resource/Player/Card_Damage.tres diff --git a/Cards/Resource/Card_DamageAllEnemies.tres b/Cards/Resource/Player/Card_DamageAllEnemies.tres similarity index 100% rename from Cards/Resource/Card_DamageAllEnemies.tres rename to Cards/Resource/Player/Card_DamageAllEnemies.tres diff --git a/Cards/Resource/Card_DamageHealth.tres b/Cards/Resource/Player/Card_DamageHealth.tres similarity index 100% rename from Cards/Resource/Card_DamageHealth.tres rename to Cards/Resource/Player/Card_DamageHealth.tres diff --git a/Cards/Resource/Card_Damage_EVERYTHING.tres b/Cards/Resource/Player/Card_Damage_EVERYTHING.tres similarity index 100% rename from Cards/Resource/Card_Damage_EVERYTHING.tres rename to Cards/Resource/Player/Card_Damage_EVERYTHING.tres diff --git a/Cards/Resource/Card_Debuff_healing.tres b/Cards/Resource/Player/Card_Debuff_healing.tres similarity index 100% rename from Cards/Resource/Card_Debuff_healing.tres rename to Cards/Resource/Player/Card_Debuff_healing.tres diff --git a/Cards/Resource/Card_DrawCards.tres b/Cards/Resource/Player/Card_DrawCards.tres similarity index 100% rename from Cards/Resource/Card_DrawCards.tres rename to Cards/Resource/Player/Card_DrawCards.tres diff --git a/Cards/Resource/Card_Energy.tres b/Cards/Resource/Player/Card_Energy.tres similarity index 100% rename from Cards/Resource/Card_Energy.tres rename to Cards/Resource/Player/Card_Energy.tres diff --git a/Cards/Resource/Card_FaunaSweep.tres b/Cards/Resource/Player/Card_FaunaSweep.tres similarity index 100% rename from Cards/Resource/Card_FaunaSweep.tres rename to Cards/Resource/Player/Card_FaunaSweep.tres diff --git a/Cards/Resource/Card_Get_block.tres b/Cards/Resource/Player/Card_Get_block.tres similarity index 100% rename from Cards/Resource/Card_Get_block.tres rename to Cards/Resource/Player/Card_Get_block.tres diff --git a/Cards/Resource/Card_Heal.tres b/Cards/Resource/Player/Card_Heal.tres similarity index 100% rename from Cards/Resource/Card_Heal.tres rename to Cards/Resource/Player/Card_Heal.tres diff --git a/Cards/Resource/Card_Poison.tres b/Cards/Resource/Player/Card_Poison.tres similarity index 100% rename from Cards/Resource/Card_Poison.tres rename to Cards/Resource/Player/Card_Poison.tres diff --git a/Cards/Resource/Card_PoisonRandom.tres b/Cards/Resource/Player/Card_PoisonRandom.tres similarity index 100% rename from Cards/Resource/Card_PoisonRandom.tres rename to Cards/Resource/Player/Card_PoisonRandom.tres diff --git a/Cards/Resource/Card_Slap.tres b/Cards/Resource/Player/Card_Slap.tres similarity index 100% rename from Cards/Resource/Card_Slap.tres rename to Cards/Resource/Player/Card_Slap.tres diff --git a/Cards/Resource/Card_Strength.tres b/Cards/Resource/Player/Card_Strength.tres similarity index 100% rename from Cards/Resource/Card_Strength.tres rename to Cards/Resource/Player/Card_Strength.tres diff --git a/Cards/Resource/Card_Stress_Damage.tres b/Cards/Resource/Player/Card_Stress_Damage.tres similarity index 100% rename from Cards/Resource/Card_Stress_Damage.tres rename to Cards/Resource/Player/Card_Stress_Damage.tres diff --git a/Cards/Resource/Card_SuperSlap.tres b/Cards/Resource/Player/Card_SuperSlap.tres similarity index 100% rename from Cards/Resource/Card_SuperSlap.tres rename to Cards/Resource/Player/Card_SuperSlap.tres diff --git a/Cards/Resource/Card_Vulnerability.tres b/Cards/Resource/Player/Card_Vulnerability.tres similarity index 100% rename from Cards/Resource/Card_Vulnerability.tres rename to Cards/Resource/Player/Card_Vulnerability.tres diff --git a/Cards/Resource/Card_Weakness.tres b/Cards/Resource/Player/Card_Weakness.tres similarity index 100% rename from Cards/Resource/Card_Weakness.tres rename to Cards/Resource/Player/Card_Weakness.tres diff --git a/Cards/Resource/Card_buff_sooth.tres b/Cards/Resource/Player/Card_buff_sooth.tres similarity index 100% rename from Cards/Resource/Card_buff_sooth.tres rename to Cards/Resource/Player/Card_buff_sooth.tres diff --git a/Cards/Resource/Card_damage_and_poison.tres b/Cards/Resource/Player/Card_damage_and_poison.tres similarity index 100% rename from Cards/Resource/Card_damage_and_poison.tres rename to Cards/Resource/Player/Card_damage_and_poison.tres diff --git a/Cards/Resource/Card_debuff_sooth.tres b/Cards/Resource/Player/Card_debuff_sooth.tres similarity index 100% rename from Cards/Resource/Card_debuff_sooth.tres rename to Cards/Resource/Player/Card_debuff_sooth.tres diff --git a/Cards/Resource/Card_sooth.tres b/Cards/Resource/Player/Card_sooth.tres similarity index 100% rename from Cards/Resource/Card_sooth.tres rename to Cards/Resource/Player/Card_sooth.tres diff --git a/Entity/Enemy/EnemyScene/Enemy.tscn b/Entity/Enemy/EnemyScene/Enemy.tscn index ed23bcc6..d8ec4c8a 100644 --- a/Entity/Enemy/EnemyScene/Enemy.tscn +++ b/Entity/Enemy/EnemyScene/Enemy.tscn @@ -10,7 +10,7 @@ [ext_resource type="Script" path="res://UI/StressLabel.gd" id="8_w2u2o"] [ext_resource type="Script" path="res://Entity/Components/PartyComponent.gd" id="8_yr066"] [ext_resource type="Script" path="res://Entity/Components/BehaviorComponent.gd" id="9_kvor6"] -[ext_resource type="Resource" uid="uid://bsrdu33ukb1ym" path="res://Cards/Resource/Card_EnemyAttack.tres" id="10_l5325"] +[ext_resource type="Resource" uid="uid://bsrdu33ukb1ym" path="res://Cards/Resource/Enemy/Card_EnemyAttack.tres" id="10_l5325"] [ext_resource type="Script" path="res://Entity/Components/StressComponent.gd" id="11_qf75g"] [ext_resource type="PackedScene" uid="uid://dbidy5j4uyopc" path="res://Entity/Components/block_display.tscn" id="13_u3jb7"] From 81100d09897fa6e5d9bccd15e92b814018d9570d Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:51:12 +0100 Subject: [PATCH 04/20] Create folders for normal and overstress attacks --- .../Enemy/{ => Normal}/Card_EnemyAttack.tres | 22 ++++++------- .../Card_EnemyAttackOverstress.tres | 31 +++++++++++++++++++ Entity/Enemy/Enemy.gd | 3 -- Entity/Enemy/EnemyActionTree.gd | 8 +++++ Entity/Enemy/EnemyScene/Enemy.tscn | 2 +- 5 files changed, 51 insertions(+), 15 deletions(-) rename Cards/Resource/Enemy/{ => Normal}/Card_EnemyAttack.tres (74%) create mode 100644 Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres diff --git a/Cards/Resource/Enemy/Card_EnemyAttack.tres b/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres similarity index 74% rename from Cards/Resource/Enemy/Card_EnemyAttack.tres rename to Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres index ca5bebe7..62eb0230 100644 --- a/Cards/Resource/Enemy/Card_EnemyAttack.tres +++ b/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres @@ -1,31 +1,31 @@ [gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://bsrdu33ukb1ym"] -[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_d7vtx"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_xccp1"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_mkvvo"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_gnv12"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_nb026"] +[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_wynd3"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_cag57"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_t1un7"] +[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_m8hst"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_mxn24"] [sub_resource type="Resource" id="Resource_0buo4"] -script = ExtResource("1_d7vtx") +script = ExtResource("1_wynd3") [sub_resource type="Resource" id="Resource_bk02b"] -script = ExtResource("3_mkvvo") +script = ExtResource("3_t1un7") [sub_resource type="Resource" id="Resource_2lb6r"] -script = ExtResource("2_xccp1") +script = ExtResource("2_cag57") effect = SubResource("Resource_0buo4") value = 1 targeting_function = SubResource("Resource_bk02b") [sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("4_gnv12") +script = ExtResource("4_m8hst") energy_cost = 2 [resource] -script = ExtResource("5_nb026") +script = ExtResource("5_mxn24") application_type = 0 card_title = "NULL" card_description = "NULL" -card_effects_data = Array[ExtResource("2_xccp1")]([SubResource("Resource_2lb6r")]) +card_effects_data = Array[ExtResource("2_cag57")]([SubResource("Resource_2lb6r")]) energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres b/Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres new file mode 100644 index 00000000..201dd7d0 --- /dev/null +++ b/Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres @@ -0,0 +1,31 @@ +[gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://bsrdu33ukb1ym"] + +[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_8efj8"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_fv767"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_iist1"] +[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_ak1gu"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_2p1fs"] + +[sub_resource type="Resource" id="Resource_0buo4"] +script = ExtResource("1_8efj8") + +[sub_resource type="Resource" id="Resource_bk02b"] +script = ExtResource("3_iist1") + +[sub_resource type="Resource" id="Resource_2lb6r"] +script = ExtResource("2_fv767") +effect = SubResource("Resource_0buo4") +value = 5 +targeting_function = SubResource("Resource_bk02b") + +[sub_resource type="Resource" id="Resource_1hn6q"] +script = ExtResource("4_ak1gu") +energy_cost = 2 + +[resource] +script = ExtResource("5_2p1fs") +application_type = 0 +card_title = "NULL" +card_description = "NULL" +card_effects_data = Array[ExtResource("2_fv767")]([SubResource("Resource_2lb6r")]) +energy_info = SubResource("Resource_1hn6q") diff --git a/Entity/Enemy/Enemy.gd b/Entity/Enemy/Enemy.gd index 9c99389d..b725534e 100644 --- a/Entity/Enemy/Enemy.gd +++ b/Entity/Enemy/Enemy.gd @@ -5,9 +5,6 @@ class_name Enemy ## The name of the enemy, used for display purpose @export var enemy_name: GlobalEnums.PossibleEnemies -## The attack set of the enemy -@export var enemy_attack_tree: EnemyActionTree - ## @Override [br] ## See [Entity] for more information [br] ## Connect the enemy to the [PhaseManager] to make it attack when it's its turn. diff --git a/Entity/Enemy/EnemyActionTree.gd b/Entity/Enemy/EnemyActionTree.gd index 16460fd6..e7c98f18 100644 --- a/Entity/Enemy/EnemyActionTree.gd +++ b/Entity/Enemy/EnemyActionTree.gd @@ -16,9 +16,17 @@ class_name EnemyActionTree extends Resource load("res://Cards/Resource/Card_Get_block.tres"): NextCardProbability.new(100, load("res://Cards/Resource/Card_Damage.tres")) } +## The last action that was played var last_chosen_action: CardBase = null +## Call to choose the next action given the previous action func choose_next_action() -> CardBase: + var chosen_action: CardBase = _choose_next_action_inner() + last_chosen_action = chosen_action + return chosen_action + +## The actual choice function, the inner pattern is used to change [last_chosen_action] easily +func _choose_next_action_inner() -> CardBase: var possible_next_action: Array = action_tree[last_chosen_action] # checking the total of the probabilities var total_probability: int = 0 diff --git a/Entity/Enemy/EnemyScene/Enemy.tscn b/Entity/Enemy/EnemyScene/Enemy.tscn index d8ec4c8a..32a3c8d7 100644 --- a/Entity/Enemy/EnemyScene/Enemy.tscn +++ b/Entity/Enemy/EnemyScene/Enemy.tscn @@ -10,7 +10,7 @@ [ext_resource type="Script" path="res://UI/StressLabel.gd" id="8_w2u2o"] [ext_resource type="Script" path="res://Entity/Components/PartyComponent.gd" id="8_yr066"] [ext_resource type="Script" path="res://Entity/Components/BehaviorComponent.gd" id="9_kvor6"] -[ext_resource type="Resource" uid="uid://bsrdu33ukb1ym" path="res://Cards/Resource/Enemy/Card_EnemyAttack.tres" id="10_l5325"] +[ext_resource type="Resource" uid="uid://bsrdu33ukb1ym" path="res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres" id="10_l5325"] [ext_resource type="Script" path="res://Entity/Components/StressComponent.gd" id="11_qf75g"] [ext_resource type="PackedScene" uid="uid://dbidy5j4uyopc" path="res://Entity/Components/block_display.tscn" id="13_u3jb7"] From b0e5cab09de2a79816f3cf30acaf3cf384c865b9 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:51:48 +0100 Subject: [PATCH 05/20] Change handling of overstress attack --- Core/Battler.gd | 2 +- Entity/Components/BehaviorComponent.gd | 25 ++++++------------------- Entity/Components/StressComponent.gd | 17 ++++++++--------- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/Core/Battler.gd b/Core/Battler.gd index dda9ffee..5438c044 100644 --- a/Core/Battler.gd +++ b/Core/Battler.gd @@ -127,7 +127,7 @@ func _enemy_turn() -> void: # generate list of enemy actions for enemy: Enemy in _enemy_list: var stress_comp: StressComponent = enemy.get_stress_component() - var enemy_attack: CardBase = enemy.get_behavior_component().get_attack(stress_comp.has_hit_overstress) + var enemy_attack: CardBase = enemy.get_behavior_component().get_attack(stress_comp) var enemy_action: EnemyAction = EnemyAction.new(enemy, enemy_attack, PlayerManager.player) _enemy_action_list.append(enemy_action) diff --git a/Entity/Components/BehaviorComponent.gd b/Entity/Components/BehaviorComponent.gd index e69653a2..530efd68 100644 --- a/Entity/Components/BehaviorComponent.gd +++ b/Entity/Components/BehaviorComponent.gd @@ -10,25 +10,12 @@ class_name BehaviorComponent @export var attack: CardBase = null @export var overstress_attack: CardBase = null - -## Setup the attack of the enemy [br] -## This is a basic attack that deals 1 damage to the target [br] -## @experimental -## This will change as enemies will need to have more than a single type of move possible (and even different movement depending on the enemy) -func _ready() -> void: - attack = CardBase.new() - var basic_effect_data: EffectData = EffectData.new( EffectDamage.new(), - null, - 1, - TargetingBase.new()) - attack.card_effects_data.append(basic_effect_data) - attack.application_type = GlobalEnums.ApplicationType.FRIENDLY_ONLY - - overstress_attack = StressComponent.on_overstress() +## The attack set of the enemy +@export var enemy_attack_tree: EnemyActionTree -func get_attack(has_hit_overstress: bool) -> CardBase: - if has_hit_overstress: - return overstress_attack +func get_attack(stress_component: StressComponent) -> CardBase: + if stress_component.has_hit_overstress: + return stress_component.on_overstress() else: - return attack + return enemy_attack_tree.choose_next_action() diff --git a/Entity/Components/StressComponent.gd b/Entity/Components/StressComponent.gd index 613db380..c27c4e55 100644 --- a/Entity/Components/StressComponent.gd +++ b/Entity/Components/StressComponent.gd @@ -32,6 +32,9 @@ var has_hit_overstress: bool = false ## Between 0 and [member StressComponent.max_stress] var current_stress: int +## The action to use when the enemy overstress +@export var overstress_attack: CardBase = null + ## @Override [br] ## Initialize the stress component, putting stress to max stress [br] ## This does not happen at game start for the player, as only enemies have a stress component [br] @@ -39,6 +42,9 @@ var current_stress: int func _ready() -> void: default_stress = floor(max_stress / 2.) _set_stress(default_stress) + if overstress_attack == null: + # use default + overstress_attack = load("res://Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres") ## Used to emit the specific signal for this class [br] @@ -121,12 +127,5 @@ func on_calmed() -> void: ## Makes the entity execute a powerful attack -static func on_overstress() -> CardBase: - var attack: CardBase = CardBase.new() - var basic_effect_data: EffectData = EffectData.new( EffectDamage.new(), - null, - 5, - TargetingBase.new()) - attack.card_effects_data.append(basic_effect_data) - attack.application_type = GlobalEnums.ApplicationType.FRIENDLY_ONLY - return attack +func on_overstress() -> CardBase: + return overstress_attack From 0aa4626296b6af4fd24e9c92d7b0c553038d5707 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:52:22 +0100 Subject: [PATCH 06/20] Remove useless test Now that the overstress is an export, it can be varied and testing that doesn't make sense anymore (it's not just 5 damage) --- Tests/test_stress.gd | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Tests/test_stress.gd b/Tests/test_stress.gd index d868ac91..cf7fdb17 100644 --- a/Tests/test_stress.gd +++ b/Tests/test_stress.gd @@ -56,14 +56,3 @@ func test_enemy_stays_soothed() -> void: assert_eq(_enemy_stress_component.current_stress, 0) _enemy_stress_component.on_turn_start() assert_eq(_enemy_stress_component.current_stress, 0) - - -func test_enemy_overstress() -> void: - _enemy_stress_component.current_stress = 75 # max stress is 80 - var card_stress: CardBase = load("res://Cards/Resource/Card_Stress_Damage.tres") - card_stress.on_card_play(_player, _enemy) - assert_eq(_enemy_stress_component.current_stress, 80) - assert_true(_enemy_stress_component.has_hit_overstress) - var expected_damage_val: int = StressComponent.on_overstress().card_effects_data[0].value - var actual_damage_val: int = _enemy_behavior_component.get_attack(_enemy_stress_component.has_hit_overstress).card_effects_data[0].value - assert_eq(actual_damage_val, expected_damage_val) From 6b463e852e46d4062b4d2dbaf04ec17ed88efb27 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:18:13 +0100 Subject: [PATCH 07/20] Add a TargetSelf targeting function --- Cards/CardBase.gd | 2 +- Cards/Targeting/TargetAllAllies.gd | 10 +++++----- Cards/Targeting/TargetAllEnemies.gd | 2 +- Cards/Targeting/TargetEverything.gd | 2 +- Cards/Targeting/TargetPlayer.gd | 5 ++--- Cards/Targeting/TargetRandomEnemies.gd | 2 +- Cards/Targeting/TargetRight.gd | 3 ++- Cards/Targeting/TargetSelf.gd | 17 +++++++++++++++++ Cards/Targeting/TargetingBase.gd | 3 ++- 9 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 Cards/Targeting/TargetSelf.gd diff --git a/Cards/CardBase.gd b/Cards/CardBase.gd index 9a4ab0fb..3113fa82 100644 --- a/Cards/CardBase.gd +++ b/Cards/CardBase.gd @@ -70,7 +70,7 @@ func on_card_play(caster: Entity, base_target: Entity) -> void: func _handle_effects_queue(caster: Entity, base_target: Entity) -> void: var card_effect: EffectData = _card_effects_queue[0] var animation_data: CastAnimationData = card_effect.animation_data - var list_targets: Array[Entity] = card_effect.targeting_function.generate_target_list(base_target) + var list_targets: Array[Entity] = card_effect.targeting_function.generate_target_list(caster, base_target) var created_cast_animations: Array[CastAnimation] = [] var can_use_animation: bool = animation_data != null and animation_data.can_use_animation() diff --git a/Cards/Targeting/TargetAllAllies.gd b/Cards/Targeting/TargetAllAllies.gd index 1ba47d7d..6af69240 100644 --- a/Cards/Targeting/TargetAllAllies.gd +++ b/Cards/Targeting/TargetAllAllies.gd @@ -8,13 +8,13 @@ class_name TargetAllAllies extends TargetingBase ## @Override [br] ## See [TargetingBase] for more information [br] func _init() -> void: - cast_type = GlobalEnums.CardCastType.INSTA_CAST + cast_type = GlobalEnums.CardCastType.INSTA_CAST ## @Override [br] ## See [TargetingBase] for more information [br] @warning_ignore("unused_parameter") -func generate_target_list(targeted_entity: Entity) -> Array[Entity]: - return [PlayerManager.player] - # ? this might change if we decide that the player can summon minions - # ? should it be done with get_party_component instead ? +func generate_target_list(caster: Entity, targeted_entity: Entity) -> Array[Entity]: + return [PlayerManager.player] + # ? this might change if we decide that the player can summon minions + # ? should it be done with get_party_component instead ? diff --git a/Cards/Targeting/TargetAllEnemies.gd b/Cards/Targeting/TargetAllEnemies.gd index b5dcbbaa..ac705999 100644 --- a/Cards/Targeting/TargetAllEnemies.gd +++ b/Cards/Targeting/TargetAllEnemies.gd @@ -14,5 +14,5 @@ func _init() -> void: ## @Override [br] ## See [TargetingBase] for more information [br] @warning_ignore("unused_parameter") -func generate_target_list(targeted_entity: Entity) -> Array[Entity]: +func generate_target_list(caster: Entity, targeted_entity: Entity) -> Array[Entity]: return EnemyManager.current_enemy_group.enemy_list diff --git a/Cards/Targeting/TargetEverything.gd b/Cards/Targeting/TargetEverything.gd index 2749d423..3c305a87 100644 --- a/Cards/Targeting/TargetEverything.gd +++ b/Cards/Targeting/TargetEverything.gd @@ -13,7 +13,7 @@ func _init() -> void: ## @Override [br] ## See [TargetingBase] for more information [br] @warning_ignore("unused_parameter") -func generate_target_list(targeted_entity:Entity) -> Array[Entity]: +func generate_target_list(caster: Entity, targeted_entity:Entity) -> Array[Entity]: var targets: Array[Entity] = EnemyManager.current_enemy_group.enemy_list.duplicate() targets.append(PlayerManager.player) return targets diff --git a/Cards/Targeting/TargetPlayer.gd b/Cards/Targeting/TargetPlayer.gd index e9dff015..0f32ee5a 100644 --- a/Cards/Targeting/TargetPlayer.gd +++ b/Cards/Targeting/TargetPlayer.gd @@ -1,8 +1,7 @@ class_name TargetPlayer extends TargetingBase ## Target the player ## -## This is used to apply effects to self [br] -## This is not used by enemies to target the player. +## This is used to apply effects to the player [br] ## @Override [br] ## See [TargetingBase] for more information [br] @@ -13,5 +12,5 @@ func _init() -> void: ## @Override [br] ## See [TargetingBase] for more information [br] @warning_ignore("unused_parameter") -func generate_target_list(targeted_entity: Entity) -> Array[Entity]: +func generate_target_list(caster: Entity, targeted_entity: Entity) -> Array[Entity]: return [PlayerManager.player] diff --git a/Cards/Targeting/TargetRandomEnemies.gd b/Cards/Targeting/TargetRandomEnemies.gd index 727aa45c..f4a02118 100644 --- a/Cards/Targeting/TargetRandomEnemies.gd +++ b/Cards/Targeting/TargetRandomEnemies.gd @@ -16,7 +16,7 @@ func _init() -> void: ## @Override [br] ## See [TargetingBase] for more information [br] @warning_ignore("unused_parameter") -func generate_target_list(targeted_entity: Entity) -> Array[Entity]: +func generate_target_list(caster: Entity, targeted_entity: Entity) -> Array[Entity]: var target_list: Array[Entity] = [] var enemy_list: Array[Entity] = EnemyManager.current_enemy_group.enemy_list.duplicate() var enemy_list_size: int = enemy_list.size() diff --git a/Cards/Targeting/TargetRight.gd b/Cards/Targeting/TargetRight.gd index 5530a13e..538590bc 100644 --- a/Cards/Targeting/TargetRight.gd +++ b/Cards/Targeting/TargetRight.gd @@ -11,7 +11,8 @@ func _init() -> void: ## @Override [br] ## See [TargetingBase] for more information [br] -func generate_target_list(targeted_entity: Entity) -> Array[Entity]: +@warning_ignore("unused_parameter") +func generate_target_list(caster: Entity, targeted_entity: Entity) -> Array[Entity]: var enemy_list: Array[Entity] = EnemyManager.current_enemy_group.enemy_list var index_of_current_target: int = enemy_list.find(targeted_entity) assert(index_of_current_target != -1, "The targeted enemy is not in the list of enemies") diff --git a/Cards/Targeting/TargetSelf.gd b/Cards/Targeting/TargetSelf.gd new file mode 100644 index 00000000..6c377f36 --- /dev/null +++ b/Cards/Targeting/TargetSelf.gd @@ -0,0 +1,17 @@ +class_name TargetSelf extends TargetingBase +## Target the entity that played the card +## +## This is used to apply effects to self [br] + +## @Override [br] +## See [TargetingBase] for more information [br] +func _init() -> void: + cast_type = GlobalEnums.CardCastType.INSTA_CAST + + +## @Override [br] +## See [TargetingBase] for more information [br] +@warning_ignore("unused_parameter") +func generate_target_list(caster: Entity, targeted_entity: Entity) -> Array[Entity]: + return [caster] + diff --git a/Cards/Targeting/TargetingBase.gd b/Cards/Targeting/TargetingBase.gd index 440ebafa..0981443a 100644 --- a/Cards/Targeting/TargetingBase.gd +++ b/Cards/Targeting/TargetingBase.gd @@ -19,5 +19,6 @@ func _init() -> void: ## Generate the list of entities that are targeted by the effect [br] ## The default implementation of the targeting is to return the targeted entity, but there can be a lot more types of possible targeting. [br] ## Other types of targeting are defined by children class that override the functions of this class [br] -func generate_target_list(targeted_entity: Entity) -> Array[Entity]: +@warning_ignore("unused_parameter") +func generate_target_list(caster: Entity, targeted_entity: Entity) -> Array[Entity]: return [targeted_entity] From 6f0f67f88d92e154ae12f26d03cc80084de8a8aa Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:57:57 +0100 Subject: [PATCH 08/20] Move cards that can be played by both player and enemy in a directory --- Cards/CardSets/DefaultDeck.tres | 4 ++-- .../Resource/{Player => Both}/Card_Damage_EVERYTHING.tres | 0 Cards/Resource/{Player => Both}/Card_Get_block.tres | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename Cards/Resource/{Player => Both}/Card_Damage_EVERYTHING.tres (100%) rename Cards/Resource/{Player => Both}/Card_Get_block.tres (77%) diff --git a/Cards/CardSets/DefaultDeck.tres b/Cards/CardSets/DefaultDeck.tres index 34c84ae1..c184ae89 100644 --- a/Cards/CardSets/DefaultDeck.tres +++ b/Cards/CardSets/DefaultDeck.tres @@ -6,7 +6,7 @@ [ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/Player/Card_DamageAllEnemies.tres" id="3_4ka0y"] [ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/Player/Card_DamageHealth.tres" id="4_es3ma"] [ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/Player/Card_damage_and_poison.tres" id="5_giy28"] -[ext_resource type="Resource" uid="uid://uv2rili0xf3x" path="res://Cards/Resource/Player/Card_Damage_EVERYTHING.tres" id="6_gr534"] +[ext_resource type="Resource" uid="uid://uv2rili0xf3x" path="res://Cards/Resource/Both/Card_Damage_EVERYTHING.tres" id="6_gr534"] [ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/Player/Card_DrawCards.tres" id="7_y1gya"] [ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/Player/Card_Heal.tres" id="8_haia1"] [ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/Player/Card_Poison.tres" id="9_1tkbv"] @@ -20,7 +20,7 @@ [ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/Player/Card_Buff_healing.tres" id="17_0kgrg"] [ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/Player/Card_Debuff_healing.tres" id="18_uj8io"] [ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/Player/Card_Stress_Damage.tres" id="19_s1aj2"] -[ext_resource type="Resource" uid="uid://b1u8retwosbc0" path="res://Cards/Resource/Player/Card_Get_block.tres" id="20_nvohy"] +[ext_resource type="Resource" uid="uid://b1u8retwosbc0" path="res://Cards/Resource/Both/Card_Get_block.tres" id="20_nvohy"] [resource] script = ExtResource("1_pnxc0") diff --git a/Cards/Resource/Player/Card_Damage_EVERYTHING.tres b/Cards/Resource/Both/Card_Damage_EVERYTHING.tres similarity index 100% rename from Cards/Resource/Player/Card_Damage_EVERYTHING.tres rename to Cards/Resource/Both/Card_Damage_EVERYTHING.tres diff --git a/Cards/Resource/Player/Card_Get_block.tres b/Cards/Resource/Both/Card_Get_block.tres similarity index 77% rename from Cards/Resource/Player/Card_Get_block.tres rename to Cards/Resource/Both/Card_Get_block.tres index 77f89bf5..316fed50 100644 --- a/Cards/Resource/Player/Card_Get_block.tres +++ b/Cards/Resource/Both/Card_Get_block.tres @@ -3,19 +3,19 @@ [ext_resource type="Script" path="res://Cards/Effects/EffectAddBlock.gd" id="1_2ga3f"] [ext_resource type="Script" path="res://Cards/CardBase.gd" id="1_f1j0k"] [ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_up8rw"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_hmcm7"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetSelf.gd" id="3_c28ln"] [sub_resource type="Resource" id="Resource_1hvmi"] script = ExtResource("1_2ga3f") -[sub_resource type="Resource" id="Resource_frq70"] -script = ExtResource("3_hmcm7") +[sub_resource type="Resource" id="Resource_0jk1u"] +script = ExtResource("3_c28ln") [sub_resource type="Resource" id="Resource_4tqh2"] script = ExtResource("2_up8rw") effect = SubResource("Resource_1hvmi") value = 5 -targeting_function = SubResource("Resource_frq70") +targeting_function = SubResource("Resource_0jk1u") [resource] script = ExtResource("1_f1j0k") From a5ad0466a6688a95c4045179bf261987745dfc77 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:45:30 +0100 Subject: [PATCH 09/20] Modify tests --- .../Enemy/Overstress/Card_EnemyAttackOverstress.tres | 2 ++ Entity/Enemy/EnemyActionTree.gd | 5 +++-- Tests/test_stress.gd | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres b/Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres index 201dd7d0..93502f54 100644 --- a/Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres +++ b/Cards/Resource/Enemy/Overstress/Card_EnemyAttackOverstress.tres @@ -26,6 +26,8 @@ energy_cost = 2 script = ExtResource("5_2p1fs") application_type = 0 card_title = "NULL" +card_type = 0 card_description = "NULL" +card_artist_name = "NULL" card_effects_data = Array[ExtResource("2_fv767")]([SubResource("Resource_2lb6r")]) energy_info = SubResource("Resource_1hn6q") diff --git a/Entity/Enemy/EnemyActionTree.gd b/Entity/Enemy/EnemyActionTree.gd index e7c98f18..5b286b85 100644 --- a/Entity/Enemy/EnemyActionTree.gd +++ b/Entity/Enemy/EnemyActionTree.gd @@ -11,9 +11,10 @@ class_name EnemyActionTree extends Resource ## } ## [/code] ## The default is an example using the [NextCardProbability] class, and alternating between damage and block +## This uses the path to the cards as a key @export var action_tree: Dictionary = { - load("res://Cards/Resource/Card_Damage.tres"): NextCardProbability.new(100, load("res://Cards/Resource/Card_Get_block.tres")), - load("res://Cards/Resource/Card_Get_block.tres"): NextCardProbability.new(100, load("res://Cards/Resource/Card_Damage.tres")) + "res://Cards/Resource/Card_Damage.tres": NextCardProbability.new(100, load("res://Cards/Resource/Card_Get_block.tres")), + "res://Cards/Resource/Card_Get_block.tres": NextCardProbability.new(100, load("res://Cards/Resource/Card_Damage.tres")) } ## The last action that was played diff --git a/Tests/test_stress.gd b/Tests/test_stress.gd index e4339641..c8250df0 100644 --- a/Tests/test_stress.gd +++ b/Tests/test_stress.gd @@ -64,6 +64,6 @@ func test_enemy_overstress() -> void: card_stress.on_card_play(_player, _enemy) assert_eq(_enemy_stress_component.current_stress, 80) assert_true(_enemy_stress_component.has_hit_overstress) - var expected_damage_val: int = StressComponent.on_overstress().card_effects_data[0].value - var actual_damage_val: int = _enemy_behavior_component.get_attack(_enemy_stress_component.has_hit_overstress).card_effects_data[0].value + var expected_damage_val: int = _enemy_2_stress_component.on_overstress().card_effects_data[0].value + var actual_damage_val: int = _enemy_behavior_component.get_attack(_enemy_stress_component).card_effects_data[0].value assert_eq(actual_damage_val, expected_damage_val) From 782d1b2932c5a11f89077d0acdcbefe0eace9ee9 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:46:55 +0100 Subject: [PATCH 10/20] Rename Test cards folder to test_cards --- Cards/CardSets/DefaultDeck.tres | 38 +++++++++---------- Cards/CardSets/InstantWinDeck.tres | 6 +-- .../Card_Buff_Poison_Duration.tres | 0 .../Card_Buff_healing.tres | 0 .../Card_Damage.tres | 0 .../Card_DamageAllEnemies.tres | 0 .../Card_DamageHealth.tres | 0 .../Card_Damage_EVERYTHING.tres | 0 .../Card_Debuff_healing.tres | 0 .../Card_DrawCards.tres | 0 .../Card_EnemyAttack.tres | 0 .../Card_Energy.tres | 0 .../Card_Get_block.tres | 0 .../{Test Cards => test_cards}/Card_Heal.tres | 0 .../Card_Poison.tres | 0 .../Card_PoisonRandom.tres | 0 .../Card_Strength.tres | 0 .../Card_Stress_Damage.tres | 0 .../Card_SuperSlap.tres | 0 .../Card_Vulnerability.tres | 0 .../Card_Weakness.tres | 0 .../Card_buff_sooth.tres | 0 .../Card_damage_and_poison.tres | 0 .../Card_debuff_sooth.tres | 0 Entity/Enemy/EnemyScene/Enemy.tscn | 2 +- Shop/ShopManager.tscn | 8 ++-- 26 files changed, 27 insertions(+), 27 deletions(-) rename Cards/Resource/{Test Cards => test_cards}/Card_Buff_Poison_Duration.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Buff_healing.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Damage.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_DamageAllEnemies.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_DamageHealth.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Damage_EVERYTHING.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Debuff_healing.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_DrawCards.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_EnemyAttack.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Energy.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Get_block.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Heal.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Poison.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_PoisonRandom.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Strength.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Stress_Damage.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_SuperSlap.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Vulnerability.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_Weakness.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_buff_sooth.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_damage_and_poison.tres (100%) rename Cards/Resource/{Test Cards => test_cards}/Card_debuff_sooth.tres (100%) diff --git a/Cards/CardSets/DefaultDeck.tres b/Cards/CardSets/DefaultDeck.tres index 86a42e24..344d18a7 100644 --- a/Cards/CardSets/DefaultDeck.tres +++ b/Cards/CardSets/DefaultDeck.tres @@ -1,26 +1,26 @@ [gd_resource type="Resource" script_class="CardSetBase" load_steps=22 format=3 uid="uid://cda81lacxt2ai"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="1_pnxc0"] -[ext_resource type="Resource" uid="uid://dam752rc15nu5" path="res://Cards/Resource/Test Cards/Card_Buff_Poison_Duration.tres" id="1_to4gc"] -[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/Test Cards/Card_Damage.tres" id="2_q7qqo"] -[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/Test Cards/Card_DamageAllEnemies.tres" id="3_4ka0y"] -[ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/Test Cards/Card_DamageHealth.tres" id="4_es3ma"] -[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/Test Cards/Card_damage_and_poison.tres" id="5_giy28"] -[ext_resource type="Resource" uid="uid://uv2rili0xf3x" path="res://Cards/Resource/Test Cards/Card_Damage_EVERYTHING.tres" id="6_gr534"] -[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/Test Cards/Card_DrawCards.tres" id="7_y1gya"] -[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/Test Cards/Card_Heal.tres" id="8_haia1"] -[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/Test Cards/Card_Poison.tres" id="9_1tkbv"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/Test Cards/Card_Strength.tres" id="10_7m46u"] -[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/Test Cards/Card_Vulnerability.tres" id="11_0eivv"] -[ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/Test Cards/Card_Weakness.tres" id="12_lo5f6"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Card_Banana.tres" id="13_v3qs7"] +[ext_resource type="Resource" uid="uid://dam752rc15nu5" path="res://Cards/Resource/test_cards/Card_Buff_Poison_Duration.tres" id="1_to4gc"] +[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/test_cards/Card_Damage.tres" id="2_q7qqo"] +[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/test_cards/Card_DamageAllEnemies.tres" id="3_4ka0y"] +[ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/test_cards/Card_DamageHealth.tres" id="4_es3ma"] +[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/test_cards/Card_damage_and_poison.tres" id="5_giy28"] +[ext_resource type="Resource" uid="uid://uv2rili0xf3x" path="res://Cards/Resource/test_cards/Card_Damage_EVERYTHING.tres" id="6_gr534"] +[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/test_cards/Card_DrawCards.tres" id="7_y1gya"] +[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Card_Heal.tres" id="8_haia1"] +[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/test_cards/Card_Poison.tres" id="9_1tkbv"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Card_Strength.tres" id="10_7m46u"] +[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/test_cards/Card_Vulnerability.tres" id="11_0eivv"] +[ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/test_cards/Card_Weakness.tres" id="12_lo5f6"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Player/Card_Banana.tres" id="13_v3qs7"] [ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Card_Sweep.tres" id="14_ghttq"] -[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/Card_Slap.tres" id="15_ie3pe"] -[ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/Test Cards/Card_SuperSlap.tres" id="16_jluts"] -[ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/Test Cards/Card_Buff_healing.tres" id="17_0kgrg"] -[ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/Test Cards/Card_Debuff_healing.tres" id="18_uj8io"] -[ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/Test Cards/Card_Stress_Damage.tres" id="19_s1aj2"] -[ext_resource type="Resource" uid="uid://b1u8retwosbc0" path="res://Cards/Resource/Test Cards/Card_Get_block.tres" id="20_nvohy"] +[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/Player/Card_Slap.tres" id="15_ie3pe"] +[ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/test_cards/Card_SuperSlap.tres" id="16_jluts"] +[ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/test_cards/Card_Buff_healing.tres" id="17_0kgrg"] +[ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/test_cards/Card_Debuff_healing.tres" id="18_uj8io"] +[ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/test_cards/Card_Stress_Damage.tres" id="19_s1aj2"] +[ext_resource type="Resource" uid="uid://b1u8retwosbc0" path="res://Cards/Resource/test_cards/Card_Get_block.tres" id="20_nvohy"] [resource] script = ExtResource("1_pnxc0") diff --git a/Cards/CardSets/InstantWinDeck.tres b/Cards/CardSets/InstantWinDeck.tres index 835d511a..d9b94d03 100644 --- a/Cards/CardSets/InstantWinDeck.tres +++ b/Cards/CardSets/InstantWinDeck.tres @@ -2,9 +2,9 @@ [ext_resource type="Resource" uid="uid://dmgrkemuj71na" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_kill.tres" id="1_6mukv"] [ext_resource type="Resource" uid="uid://b2isycb5jkern" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_sooth.tres" id="2_jr0a6"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Card_Banana.tres" id="3_ptv1b"] -[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/Test Cards/Card_Heal.tres" id="4_jfguc"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/Test Cards/Card_Strength.tres" id="5_g72ks"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Player/Card_Banana.tres" id="3_ptv1b"] +[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Card_Heal.tres" id="4_jfguc"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Card_Strength.tres" id="5_g72ks"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="21_rmslx"] [resource] diff --git a/Cards/Resource/Test Cards/Card_Buff_Poison_Duration.tres b/Cards/Resource/test_cards/Card_Buff_Poison_Duration.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Buff_Poison_Duration.tres rename to Cards/Resource/test_cards/Card_Buff_Poison_Duration.tres diff --git a/Cards/Resource/Test Cards/Card_Buff_healing.tres b/Cards/Resource/test_cards/Card_Buff_healing.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Buff_healing.tres rename to Cards/Resource/test_cards/Card_Buff_healing.tres diff --git a/Cards/Resource/Test Cards/Card_Damage.tres b/Cards/Resource/test_cards/Card_Damage.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Damage.tres rename to Cards/Resource/test_cards/Card_Damage.tres diff --git a/Cards/Resource/Test Cards/Card_DamageAllEnemies.tres b/Cards/Resource/test_cards/Card_DamageAllEnemies.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_DamageAllEnemies.tres rename to Cards/Resource/test_cards/Card_DamageAllEnemies.tres diff --git a/Cards/Resource/Test Cards/Card_DamageHealth.tres b/Cards/Resource/test_cards/Card_DamageHealth.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_DamageHealth.tres rename to Cards/Resource/test_cards/Card_DamageHealth.tres diff --git a/Cards/Resource/Test Cards/Card_Damage_EVERYTHING.tres b/Cards/Resource/test_cards/Card_Damage_EVERYTHING.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Damage_EVERYTHING.tres rename to Cards/Resource/test_cards/Card_Damage_EVERYTHING.tres diff --git a/Cards/Resource/Test Cards/Card_Debuff_healing.tres b/Cards/Resource/test_cards/Card_Debuff_healing.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Debuff_healing.tres rename to Cards/Resource/test_cards/Card_Debuff_healing.tres diff --git a/Cards/Resource/Test Cards/Card_DrawCards.tres b/Cards/Resource/test_cards/Card_DrawCards.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_DrawCards.tres rename to Cards/Resource/test_cards/Card_DrawCards.tres diff --git a/Cards/Resource/Test Cards/Card_EnemyAttack.tres b/Cards/Resource/test_cards/Card_EnemyAttack.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_EnemyAttack.tres rename to Cards/Resource/test_cards/Card_EnemyAttack.tres diff --git a/Cards/Resource/Test Cards/Card_Energy.tres b/Cards/Resource/test_cards/Card_Energy.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Energy.tres rename to Cards/Resource/test_cards/Card_Energy.tres diff --git a/Cards/Resource/Test Cards/Card_Get_block.tres b/Cards/Resource/test_cards/Card_Get_block.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Get_block.tres rename to Cards/Resource/test_cards/Card_Get_block.tres diff --git a/Cards/Resource/Test Cards/Card_Heal.tres b/Cards/Resource/test_cards/Card_Heal.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Heal.tres rename to Cards/Resource/test_cards/Card_Heal.tres diff --git a/Cards/Resource/Test Cards/Card_Poison.tres b/Cards/Resource/test_cards/Card_Poison.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Poison.tres rename to Cards/Resource/test_cards/Card_Poison.tres diff --git a/Cards/Resource/Test Cards/Card_PoisonRandom.tres b/Cards/Resource/test_cards/Card_PoisonRandom.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_PoisonRandom.tres rename to Cards/Resource/test_cards/Card_PoisonRandom.tres diff --git a/Cards/Resource/Test Cards/Card_Strength.tres b/Cards/Resource/test_cards/Card_Strength.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Strength.tres rename to Cards/Resource/test_cards/Card_Strength.tres diff --git a/Cards/Resource/Test Cards/Card_Stress_Damage.tres b/Cards/Resource/test_cards/Card_Stress_Damage.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Stress_Damage.tres rename to Cards/Resource/test_cards/Card_Stress_Damage.tres diff --git a/Cards/Resource/Test Cards/Card_SuperSlap.tres b/Cards/Resource/test_cards/Card_SuperSlap.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_SuperSlap.tres rename to Cards/Resource/test_cards/Card_SuperSlap.tres diff --git a/Cards/Resource/Test Cards/Card_Vulnerability.tres b/Cards/Resource/test_cards/Card_Vulnerability.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Vulnerability.tres rename to Cards/Resource/test_cards/Card_Vulnerability.tres diff --git a/Cards/Resource/Test Cards/Card_Weakness.tres b/Cards/Resource/test_cards/Card_Weakness.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_Weakness.tres rename to Cards/Resource/test_cards/Card_Weakness.tres diff --git a/Cards/Resource/Test Cards/Card_buff_sooth.tres b/Cards/Resource/test_cards/Card_buff_sooth.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_buff_sooth.tres rename to Cards/Resource/test_cards/Card_buff_sooth.tres diff --git a/Cards/Resource/Test Cards/Card_damage_and_poison.tres b/Cards/Resource/test_cards/Card_damage_and_poison.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_damage_and_poison.tres rename to Cards/Resource/test_cards/Card_damage_and_poison.tres diff --git a/Cards/Resource/Test Cards/Card_debuff_sooth.tres b/Cards/Resource/test_cards/Card_debuff_sooth.tres similarity index 100% rename from Cards/Resource/Test Cards/Card_debuff_sooth.tres rename to Cards/Resource/test_cards/Card_debuff_sooth.tres diff --git a/Entity/Enemy/EnemyScene/Enemy.tscn b/Entity/Enemy/EnemyScene/Enemy.tscn index e787308c..9e3660d5 100644 --- a/Entity/Enemy/EnemyScene/Enemy.tscn +++ b/Entity/Enemy/EnemyScene/Enemy.tscn @@ -10,7 +10,7 @@ [ext_resource type="Script" path="res://UI/StressLabel.gd" id="8_w2u2o"] [ext_resource type="Script" path="res://Entity/Components/PartyComponent.gd" id="8_yr066"] [ext_resource type="Script" path="res://Entity/Components/BehaviorComponent.gd" id="9_kvor6"] -[ext_resource type="Resource" uid="uid://bsrdu33ukb1ym" path="res://Cards/Resource/Test Cards/Card_EnemyAttack.tres" id="10_l5325"] +[ext_resource type="Resource" uid="uid://bsrdu33ukb1ym" path="res://Cards/Resource/test_cards/Card_EnemyAttack.tres" id="10_l5325"] [ext_resource type="Script" path="res://Entity/Components/StressComponent.gd" id="11_qf75g"] [ext_resource type="PackedScene" uid="uid://dbidy5j4uyopc" path="res://Entity/Components/block_display.tscn" id="13_u3jb7"] diff --git a/Shop/ShopManager.tscn b/Shop/ShopManager.tscn index 7e5a18d4..fd514cbe 100644 --- a/Shop/ShopManager.tscn +++ b/Shop/ShopManager.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=10 format=3 uid="uid://cunr4wwabqn1u"] [ext_resource type="Script" path="res://Managers/ShopManager.gd" id="1_rqenh"] -[ext_resource type="Resource" uid="uid://ckaua56xmrxib" path="res://Cards/Resource/Card_Energy.tres" id="2_bi5vb"] -[ext_resource type="Resource" uid="uid://bdjkrhy06ijb7" path="res://Cards/Resource/Card_PoisonRandom.tres" id="3_m7u3s"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/Card_Strength.tres" id="4_0e1wy"] -[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/Card_Vulnerability.tres" id="5_hech8"] +[ext_resource type="Resource" uid="uid://ckaua56xmrxib" path="res://Cards/Resource/test_cards/Card_Energy.tres" id="2_bi5vb"] +[ext_resource type="Resource" uid="uid://bdjkrhy06ijb7" path="res://Cards/Resource/test_cards/Card_PoisonRandom.tres" id="3_m7u3s"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Card_Strength.tres" id="4_0e1wy"] +[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/test_cards/Card_Vulnerability.tres" id="5_hech8"] [ext_resource type="Resource" uid="uid://c5fh7bnfh3l4u" path="res://Items/test_relic.tres" id="6_whv6x"] [ext_resource type="Resource" uid="uid://cu4gaxrv2jn81" path="res://Items/test_relic_2.tres" id="7_5msik"] [ext_resource type="Resource" uid="uid://m8lhbvw2gawd" path="res://Items/test_consumable.tres" id="8_8fhko"] From 0bdd917d344534f761c7977a1c89f416a5ecb166 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:48:13 +0100 Subject: [PATCH 11/20] Move test cards in the correct directory --- Cards/CardSets/CardArtTest.tres | 8 ++--- Cards/CardSets/DefaultDeck.tres | 36 +++++++++---------- Cards/CardSets/InstantWinDeck.tres | 6 ++-- .../{ => test_cards}/Player/Card_Banana.tres | 0 .../Player/Card_Buff_Poison_Duration.tres | 0 .../Player/Card_Buff_healing.tres | 0 .../{ => test_cards}/Player/Card_Damage.tres | 0 .../Player/Card_DamageAllEnemies.tres | 0 .../Player/Card_DamageHealth.tres | 0 .../Player/Card_Debuff_healing.tres | 0 .../Player/Card_DrawCards.tres | 0 .../{ => test_cards}/Player/Card_Energy.tres | 0 .../Player/Card_FaunaSweep.tres | 0 .../{ => test_cards}/Player/Card_Heal.tres | 0 .../{ => test_cards}/Player/Card_Poison.tres | 0 .../Player/Card_PoisonRandom.tres | 0 .../{ => test_cards}/Player/Card_Slap.tres | 0 .../Player/Card_Strength.tres | 0 .../Player/Card_Stress_Damage.tres | 0 .../Player/Card_SuperSlap.tres | 0 .../Player/Card_Vulnerability.tres | 0 .../Player/Card_Weakness.tres | 0 .../Player/Card_buff_sooth.tres | 0 .../Player/Card_damage_and_poison.tres | 0 .../Player/Card_debuff_sooth.tres | 0 .../{ => test_cards}/Player/Card_sooth.tres | 0 26 files changed, 25 insertions(+), 25 deletions(-) rename Cards/Resource/{ => test_cards}/Player/Card_Banana.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Buff_Poison_Duration.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Buff_healing.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Damage.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_DamageAllEnemies.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_DamageHealth.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Debuff_healing.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_DrawCards.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Energy.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_FaunaSweep.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Heal.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Poison.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_PoisonRandom.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Slap.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Strength.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Stress_Damage.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_SuperSlap.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Vulnerability.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_Weakness.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_buff_sooth.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_damage_and_poison.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_debuff_sooth.tres (100%) rename Cards/Resource/{ => test_cards}/Player/Card_sooth.tres (100%) diff --git a/Cards/CardSets/CardArtTest.tres b/Cards/CardSets/CardArtTest.tres index b8d878be..4bdc4c6f 100644 --- a/Cards/CardSets/CardArtTest.tres +++ b/Cards/CardSets/CardArtTest.tres @@ -2,10 +2,10 @@ [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="1_1a7v4"] [ext_resource type="Resource" uid="uid://dxoesacbfg08l" path="res://Cards/Resource/Card_BackwardsDriving.tres" id="1_pd6qu"] -[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Card_Sweep.tres" id="3_jlhsd"] +[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/test_cards/Player/Card_FaunaSweep.tres" id="3_jlhsd"] [ext_resource type="Resource" uid="uid://b5gr83yvnrv00" path="res://Cards/Resource/Card_AncientMeme.tres" id="5_mwsmk"] -[ext_resource type="Resource" uid="uid://qxm7k4pr54m2" path="res://Cards/Resource/Card_AraAra.tres" id="6_y0mpa"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Card_Banana.tres" id="7_f8uli"] +[ext_resource type="Resource" uid="uid://qxm7k4pr54m2" path="res://Cards/Resource/test_cards/Player/Card_sooth.tres" id="6_y0mpa"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Player/Card_Banana.tres" id="7_f8uli"] [ext_resource type="Resource" uid="uid://cndn68ie86usa" path="res://Cards/Resource/Card_Uuuuu.tres" id="8_018w3"] [ext_resource type="Resource" uid="uid://cmhwcuf1ef634" path="res://Cards/Resource/Card_Broom.tres" id="8_27cbf"] [ext_resource type="Resource" uid="uid://t4pfpsparcir" path="res://Cards/Resource/Card_Whispers.tres" id="9_67g1d"] @@ -17,7 +17,7 @@ [ext_resource type="Resource" uid="uid://cxym5gojbc7v5" path="res://Cards/Resource/Card_StealthCrouch.tres" id="13_lpugv"] [ext_resource type="Resource" uid="uid://blf5d4vfnmp85" path="res://Cards/Resource/Card_HeadbuttAttack.tres" id="13_sj4o2"] [ext_resource type="Resource" uid="uid://dxsak4t37w0po" path="res://Cards/Resource/Card_TakeCover.tres" id="14_vv5cl"] -[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/Card_Slap.tres" id="15_eausw"] +[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/test_cards/Player/Card_Slap.tres" id="15_eausw"] [ext_resource type="Resource" uid="uid://b85t57jpq5x60" path="res://Cards/Resource/Card_VampiricBite.tres" id="15_g6afn"] [ext_resource type="Resource" uid="uid://b5fbomvc1uqqf" path="res://Cards/Resource/Card_HeartHands.tres" id="16_efslq"] [ext_resource type="Resource" uid="uid://cxk0880vdngpf" path="res://Cards/Resource/Card_Sneeze.tres" id="16_gg63s"] diff --git a/Cards/CardSets/DefaultDeck.tres b/Cards/CardSets/DefaultDeck.tres index 344d18a7..f7155360 100644 --- a/Cards/CardSets/DefaultDeck.tres +++ b/Cards/CardSets/DefaultDeck.tres @@ -1,25 +1,25 @@ [gd_resource type="Resource" script_class="CardSetBase" load_steps=22 format=3 uid="uid://cda81lacxt2ai"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="1_pnxc0"] -[ext_resource type="Resource" uid="uid://dam752rc15nu5" path="res://Cards/Resource/test_cards/Card_Buff_Poison_Duration.tres" id="1_to4gc"] -[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/test_cards/Card_Damage.tres" id="2_q7qqo"] -[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/test_cards/Card_DamageAllEnemies.tres" id="3_4ka0y"] -[ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/test_cards/Card_DamageHealth.tres" id="4_es3ma"] -[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/test_cards/Card_damage_and_poison.tres" id="5_giy28"] +[ext_resource type="Resource" uid="uid://dam752rc15nu5" path="res://Cards/Resource/test_cards/Player/Card_Buff_Poison_Duration.tres" id="1_to4gc"] +[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/test_cards/Player/Card_Damage.tres" id="2_q7qqo"] +[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/test_cards/Player/Card_DamageAllEnemies.tres" id="3_4ka0y"] +[ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/test_cards/Player/Card_DamageHealth.tres" id="4_es3ma"] +[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/test_cards/Player/Card_damage_and_poison.tres" id="5_giy28"] [ext_resource type="Resource" uid="uid://uv2rili0xf3x" path="res://Cards/Resource/test_cards/Card_Damage_EVERYTHING.tres" id="6_gr534"] -[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/test_cards/Card_DrawCards.tres" id="7_y1gya"] -[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Card_Heal.tres" id="8_haia1"] -[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/test_cards/Card_Poison.tres" id="9_1tkbv"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Card_Strength.tres" id="10_7m46u"] -[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/test_cards/Card_Vulnerability.tres" id="11_0eivv"] -[ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/test_cards/Card_Weakness.tres" id="12_lo5f6"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Player/Card_Banana.tres" id="13_v3qs7"] -[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Card_Sweep.tres" id="14_ghttq"] -[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/Player/Card_Slap.tres" id="15_ie3pe"] -[ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/test_cards/Card_SuperSlap.tres" id="16_jluts"] -[ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/test_cards/Card_Buff_healing.tres" id="17_0kgrg"] -[ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/test_cards/Card_Debuff_healing.tres" id="18_uj8io"] -[ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/test_cards/Card_Stress_Damage.tres" id="19_s1aj2"] +[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/test_cards/Player/Card_DrawCards.tres" id="7_y1gya"] +[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Player/Card_Heal.tres" id="8_haia1"] +[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/test_cards/Player/Card_Poison.tres" id="9_1tkbv"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Player/Card_Strength.tres" id="10_7m46u"] +[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/test_cards/Player/Card_Vulnerability.tres" id="11_0eivv"] +[ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/test_cards/Player/Card_Weakness.tres" id="12_lo5f6"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Player/Card_Banana.tres" id="13_v3qs7"] +[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/test_cards/Player/Card_FaunaSweep.tres" id="14_ghttq"] +[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/test_cards/Player/Card_Slap.tres" id="15_ie3pe"] +[ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/test_cards/Player/Card_SuperSlap.tres" id="16_jluts"] +[ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/test_cards/Player/Card_Buff_healing.tres" id="17_0kgrg"] +[ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/test_cards/Player/Card_Debuff_healing.tres" id="18_uj8io"] +[ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/test_cards/Player/Card_Stress_Damage.tres" id="19_s1aj2"] [ext_resource type="Resource" uid="uid://b1u8retwosbc0" path="res://Cards/Resource/test_cards/Card_Get_block.tres" id="20_nvohy"] [resource] diff --git a/Cards/CardSets/InstantWinDeck.tres b/Cards/CardSets/InstantWinDeck.tres index d9b94d03..f24cc928 100644 --- a/Cards/CardSets/InstantWinDeck.tres +++ b/Cards/CardSets/InstantWinDeck.tres @@ -2,9 +2,9 @@ [ext_resource type="Resource" uid="uid://dmgrkemuj71na" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_kill.tres" id="1_6mukv"] [ext_resource type="Resource" uid="uid://b2isycb5jkern" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_sooth.tres" id="2_jr0a6"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/Player/Card_Banana.tres" id="3_ptv1b"] -[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Card_Heal.tres" id="4_jfguc"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Card_Strength.tres" id="5_g72ks"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Player/Card_Banana.tres" id="3_ptv1b"] +[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Player/Card_Heal.tres" id="4_jfguc"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Player/Card_Strength.tres" id="5_g72ks"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="21_rmslx"] [resource] diff --git a/Cards/Resource/Player/Card_Banana.tres b/Cards/Resource/test_cards/Player/Card_Banana.tres similarity index 100% rename from Cards/Resource/Player/Card_Banana.tres rename to Cards/Resource/test_cards/Player/Card_Banana.tres diff --git a/Cards/Resource/Player/Card_Buff_Poison_Duration.tres b/Cards/Resource/test_cards/Player/Card_Buff_Poison_Duration.tres similarity index 100% rename from Cards/Resource/Player/Card_Buff_Poison_Duration.tres rename to Cards/Resource/test_cards/Player/Card_Buff_Poison_Duration.tres diff --git a/Cards/Resource/Player/Card_Buff_healing.tres b/Cards/Resource/test_cards/Player/Card_Buff_healing.tres similarity index 100% rename from Cards/Resource/Player/Card_Buff_healing.tres rename to Cards/Resource/test_cards/Player/Card_Buff_healing.tres diff --git a/Cards/Resource/Player/Card_Damage.tres b/Cards/Resource/test_cards/Player/Card_Damage.tres similarity index 100% rename from Cards/Resource/Player/Card_Damage.tres rename to Cards/Resource/test_cards/Player/Card_Damage.tres diff --git a/Cards/Resource/Player/Card_DamageAllEnemies.tres b/Cards/Resource/test_cards/Player/Card_DamageAllEnemies.tres similarity index 100% rename from Cards/Resource/Player/Card_DamageAllEnemies.tres rename to Cards/Resource/test_cards/Player/Card_DamageAllEnemies.tres diff --git a/Cards/Resource/Player/Card_DamageHealth.tres b/Cards/Resource/test_cards/Player/Card_DamageHealth.tres similarity index 100% rename from Cards/Resource/Player/Card_DamageHealth.tres rename to Cards/Resource/test_cards/Player/Card_DamageHealth.tres diff --git a/Cards/Resource/Player/Card_Debuff_healing.tres b/Cards/Resource/test_cards/Player/Card_Debuff_healing.tres similarity index 100% rename from Cards/Resource/Player/Card_Debuff_healing.tres rename to Cards/Resource/test_cards/Player/Card_Debuff_healing.tres diff --git a/Cards/Resource/Player/Card_DrawCards.tres b/Cards/Resource/test_cards/Player/Card_DrawCards.tres similarity index 100% rename from Cards/Resource/Player/Card_DrawCards.tres rename to Cards/Resource/test_cards/Player/Card_DrawCards.tres diff --git a/Cards/Resource/Player/Card_Energy.tres b/Cards/Resource/test_cards/Player/Card_Energy.tres similarity index 100% rename from Cards/Resource/Player/Card_Energy.tres rename to Cards/Resource/test_cards/Player/Card_Energy.tres diff --git a/Cards/Resource/Player/Card_FaunaSweep.tres b/Cards/Resource/test_cards/Player/Card_FaunaSweep.tres similarity index 100% rename from Cards/Resource/Player/Card_FaunaSweep.tres rename to Cards/Resource/test_cards/Player/Card_FaunaSweep.tres diff --git a/Cards/Resource/Player/Card_Heal.tres b/Cards/Resource/test_cards/Player/Card_Heal.tres similarity index 100% rename from Cards/Resource/Player/Card_Heal.tres rename to Cards/Resource/test_cards/Player/Card_Heal.tres diff --git a/Cards/Resource/Player/Card_Poison.tres b/Cards/Resource/test_cards/Player/Card_Poison.tres similarity index 100% rename from Cards/Resource/Player/Card_Poison.tres rename to Cards/Resource/test_cards/Player/Card_Poison.tres diff --git a/Cards/Resource/Player/Card_PoisonRandom.tres b/Cards/Resource/test_cards/Player/Card_PoisonRandom.tres similarity index 100% rename from Cards/Resource/Player/Card_PoisonRandom.tres rename to Cards/Resource/test_cards/Player/Card_PoisonRandom.tres diff --git a/Cards/Resource/Player/Card_Slap.tres b/Cards/Resource/test_cards/Player/Card_Slap.tres similarity index 100% rename from Cards/Resource/Player/Card_Slap.tres rename to Cards/Resource/test_cards/Player/Card_Slap.tres diff --git a/Cards/Resource/Player/Card_Strength.tres b/Cards/Resource/test_cards/Player/Card_Strength.tres similarity index 100% rename from Cards/Resource/Player/Card_Strength.tres rename to Cards/Resource/test_cards/Player/Card_Strength.tres diff --git a/Cards/Resource/Player/Card_Stress_Damage.tres b/Cards/Resource/test_cards/Player/Card_Stress_Damage.tres similarity index 100% rename from Cards/Resource/Player/Card_Stress_Damage.tres rename to Cards/Resource/test_cards/Player/Card_Stress_Damage.tres diff --git a/Cards/Resource/Player/Card_SuperSlap.tres b/Cards/Resource/test_cards/Player/Card_SuperSlap.tres similarity index 100% rename from Cards/Resource/Player/Card_SuperSlap.tres rename to Cards/Resource/test_cards/Player/Card_SuperSlap.tres diff --git a/Cards/Resource/Player/Card_Vulnerability.tres b/Cards/Resource/test_cards/Player/Card_Vulnerability.tres similarity index 100% rename from Cards/Resource/Player/Card_Vulnerability.tres rename to Cards/Resource/test_cards/Player/Card_Vulnerability.tres diff --git a/Cards/Resource/Player/Card_Weakness.tres b/Cards/Resource/test_cards/Player/Card_Weakness.tres similarity index 100% rename from Cards/Resource/Player/Card_Weakness.tres rename to Cards/Resource/test_cards/Player/Card_Weakness.tres diff --git a/Cards/Resource/Player/Card_buff_sooth.tres b/Cards/Resource/test_cards/Player/Card_buff_sooth.tres similarity index 100% rename from Cards/Resource/Player/Card_buff_sooth.tres rename to Cards/Resource/test_cards/Player/Card_buff_sooth.tres diff --git a/Cards/Resource/Player/Card_damage_and_poison.tres b/Cards/Resource/test_cards/Player/Card_damage_and_poison.tres similarity index 100% rename from Cards/Resource/Player/Card_damage_and_poison.tres rename to Cards/Resource/test_cards/Player/Card_damage_and_poison.tres diff --git a/Cards/Resource/Player/Card_debuff_sooth.tres b/Cards/Resource/test_cards/Player/Card_debuff_sooth.tres similarity index 100% rename from Cards/Resource/Player/Card_debuff_sooth.tres rename to Cards/Resource/test_cards/Player/Card_debuff_sooth.tres diff --git a/Cards/Resource/Player/Card_sooth.tres b/Cards/Resource/test_cards/Player/Card_sooth.tres similarity index 100% rename from Cards/Resource/Player/Card_sooth.tres rename to Cards/Resource/test_cards/Player/Card_sooth.tres From d37cae401c226b0ca1ba433979704500faa0de16 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:48:34 +0100 Subject: [PATCH 12/20] Move player cards inside their directory --- Cards/CardSets/CardArtTest.tres | 44 +++++++++---------- Cards/CardSets/DefaultDeck.tres | 32 +++++++------- .../{ => Player}/Card_AncientMeme.tres | 0 Cards/Resource/{ => Player}/Card_AraAra.tres | 0 .../{ => Player}/Card_BackwardsDriving.tres | 0 .../{ => Player}/Card_BlueDartGun.tres | 0 Cards/Resource/{ => Player}/Card_Broom.tres | 0 .../{ => Player}/Card_DoubleSlap.tres | 0 .../Resource/{ => Player}/Card_FunFacts.tres | 0 .../Resource/{ => Player}/Card_Gaslight.tres | 0 .../{ => Player}/Card_GreenDartGun.tres | 0 .../{ => Player}/Card_HeadbuttAttack.tres | 0 .../{ => Player}/Card_HeartHands.tres | 0 Cards/Resource/{ => Player}/Card_MicBonk.tres | 0 Cards/Resource/{ => Player}/Card_Sneeze.tres | 0 .../{ => Player}/Card_StealthCrouch.tres | 0 Cards/Resource/{ => Player}/Card_Sweep.tres | 0 .../Resource/{ => Player}/Card_TakeCover.tres | 0 Cards/Resource/{ => Player}/Card_Uuuuu.tres | 0 .../{ => Player}/Card_VampiricBite.tres | 0 .../Resource/{ => Player}/Card_Whispers.tres | 0 Cards/Resource/{ => Player}/Card_Wink.tres | 0 Cards/Resource/{ => Player}/Card_Wrench.tres | 0 .../Resource/{ => Player}/Card_pspspsps.tres | 0 .../test_cards/Player/Card_Energy.tres | 22 +++++----- .../test_cards/Player/Card_PoisonRandom.tres | 22 +++++----- .../test_cards/Player/Card_Strength.tres | 30 ++++++------- .../test_cards/Player/Card_Vulnerability.tres | 30 ++++++------- 28 files changed, 90 insertions(+), 90 deletions(-) rename Cards/Resource/{ => Player}/Card_AncientMeme.tres (100%) rename Cards/Resource/{ => Player}/Card_AraAra.tres (100%) rename Cards/Resource/{ => Player}/Card_BackwardsDriving.tres (100%) rename Cards/Resource/{ => Player}/Card_BlueDartGun.tres (100%) rename Cards/Resource/{ => Player}/Card_Broom.tres (100%) rename Cards/Resource/{ => Player}/Card_DoubleSlap.tres (100%) rename Cards/Resource/{ => Player}/Card_FunFacts.tres (100%) rename Cards/Resource/{ => Player}/Card_Gaslight.tres (100%) rename Cards/Resource/{ => Player}/Card_GreenDartGun.tres (100%) rename Cards/Resource/{ => Player}/Card_HeadbuttAttack.tres (100%) rename Cards/Resource/{ => Player}/Card_HeartHands.tres (100%) rename Cards/Resource/{ => Player}/Card_MicBonk.tres (100%) rename Cards/Resource/{ => Player}/Card_Sneeze.tres (100%) rename Cards/Resource/{ => Player}/Card_StealthCrouch.tres (100%) rename Cards/Resource/{ => Player}/Card_Sweep.tres (100%) rename Cards/Resource/{ => Player}/Card_TakeCover.tres (100%) rename Cards/Resource/{ => Player}/Card_Uuuuu.tres (100%) rename Cards/Resource/{ => Player}/Card_VampiricBite.tres (100%) rename Cards/Resource/{ => Player}/Card_Whispers.tres (100%) rename Cards/Resource/{ => Player}/Card_Wink.tres (100%) rename Cards/Resource/{ => Player}/Card_Wrench.tres (100%) rename Cards/Resource/{ => Player}/Card_pspspsps.tres (100%) diff --git a/Cards/CardSets/CardArtTest.tres b/Cards/CardSets/CardArtTest.tres index 4bdc4c6f..925c7779 100644 --- a/Cards/CardSets/CardArtTest.tres +++ b/Cards/CardSets/CardArtTest.tres @@ -1,30 +1,30 @@ [gd_resource type="Resource" script_class="CardSetBase" load_steps=26 format=3 uid="uid://dgcxa6ohm5o80"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="1_1a7v4"] -[ext_resource type="Resource" uid="uid://dxoesacbfg08l" path="res://Cards/Resource/Card_BackwardsDriving.tres" id="1_pd6qu"] -[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/test_cards/Player/Card_FaunaSweep.tres" id="3_jlhsd"] -[ext_resource type="Resource" uid="uid://b5gr83yvnrv00" path="res://Cards/Resource/Card_AncientMeme.tres" id="5_mwsmk"] -[ext_resource type="Resource" uid="uid://qxm7k4pr54m2" path="res://Cards/Resource/test_cards/Player/Card_sooth.tres" id="6_y0mpa"] +[ext_resource type="Resource" uid="uid://dxoesacbfg08l" path="res://Cards/Resource/Player/Card_BackwardsDriving.tres" id="1_pd6qu"] +[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Player/Card_Sweep.tres" id="3_jlhsd"] +[ext_resource type="Resource" uid="uid://b5gr83yvnrv00" path="res://Cards/Resource/Player/Card_AncientMeme.tres" id="5_mwsmk"] +[ext_resource type="Resource" uid="uid://qxm7k4pr54m2" path="res://Cards/Resource/Player/Card_AraAra.tres" id="6_y0mpa"] [ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Player/Card_Banana.tres" id="7_f8uli"] -[ext_resource type="Resource" uid="uid://cndn68ie86usa" path="res://Cards/Resource/Card_Uuuuu.tres" id="8_018w3"] -[ext_resource type="Resource" uid="uid://cmhwcuf1ef634" path="res://Cards/Resource/Card_Broom.tres" id="8_27cbf"] -[ext_resource type="Resource" uid="uid://t4pfpsparcir" path="res://Cards/Resource/Card_Whispers.tres" id="9_67g1d"] -[ext_resource type="Resource" uid="uid://j12dgeub7ix4" path="res://Cards/Resource/Card_DoubleSlap.tres" id="9_u377u"] -[ext_resource type="Resource" uid="uid://3wswcvpmk8s2" path="res://Cards/Resource/Card_Wrench.tres" id="9_vry63"] -[ext_resource type="Resource" uid="uid://bqtlo8flqqwdl" path="res://Cards/Resource/Card_MicBonk.tres" id="10_tr6sm"] -[ext_resource type="Resource" uid="uid://bdy33lmlvr2m7" path="res://Cards/Resource/Card_Gaslight.tres" id="11_8j1ly"] -[ext_resource type="Resource" uid="uid://c4u6w1h2m1te0" path="res://Cards/Resource/Card_FunFacts.tres" id="12_je54f"] -[ext_resource type="Resource" uid="uid://cxym5gojbc7v5" path="res://Cards/Resource/Card_StealthCrouch.tres" id="13_lpugv"] -[ext_resource type="Resource" uid="uid://blf5d4vfnmp85" path="res://Cards/Resource/Card_HeadbuttAttack.tres" id="13_sj4o2"] -[ext_resource type="Resource" uid="uid://dxsak4t37w0po" path="res://Cards/Resource/Card_TakeCover.tres" id="14_vv5cl"] +[ext_resource type="Resource" uid="uid://cndn68ie86usa" path="res://Cards/Resource/Player/Card_Uuuuu.tres" id="8_018w3"] +[ext_resource type="Resource" uid="uid://cmhwcuf1ef634" path="res://Cards/Resource/Player/Card_Broom.tres" id="8_27cbf"] +[ext_resource type="Resource" uid="uid://t4pfpsparcir" path="res://Cards/Resource/Player/Card_Whispers.tres" id="9_67g1d"] +[ext_resource type="Resource" uid="uid://j12dgeub7ix4" path="res://Cards/Resource/Player/Card_DoubleSlap.tres" id="9_u377u"] +[ext_resource type="Resource" uid="uid://3wswcvpmk8s2" path="res://Cards/Resource/Player/Card_Wrench.tres" id="9_vry63"] +[ext_resource type="Resource" uid="uid://bqtlo8flqqwdl" path="res://Cards/Resource/Player/Card_MicBonk.tres" id="10_tr6sm"] +[ext_resource type="Resource" uid="uid://bdy33lmlvr2m7" path="res://Cards/Resource/Player/Card_Gaslight.tres" id="11_8j1ly"] +[ext_resource type="Resource" uid="uid://c4u6w1h2m1te0" path="res://Cards/Resource/Player/Card_FunFacts.tres" id="12_je54f"] +[ext_resource type="Resource" uid="uid://cxym5gojbc7v5" path="res://Cards/Resource/Player/Card_StealthCrouch.tres" id="13_lpugv"] +[ext_resource type="Resource" uid="uid://blf5d4vfnmp85" path="res://Cards/Resource/Player/Card_HeadbuttAttack.tres" id="13_sj4o2"] +[ext_resource type="Resource" uid="uid://dxsak4t37w0po" path="res://Cards/Resource/Player/Card_TakeCover.tres" id="14_vv5cl"] [ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/test_cards/Player/Card_Slap.tres" id="15_eausw"] -[ext_resource type="Resource" uid="uid://b85t57jpq5x60" path="res://Cards/Resource/Card_VampiricBite.tres" id="15_g6afn"] -[ext_resource type="Resource" uid="uid://b5fbomvc1uqqf" path="res://Cards/Resource/Card_HeartHands.tres" id="16_efslq"] -[ext_resource type="Resource" uid="uid://cxk0880vdngpf" path="res://Cards/Resource/Card_Sneeze.tres" id="16_gg63s"] -[ext_resource type="Resource" uid="uid://c4wlhlsg0g2np" path="res://Cards/Resource/Card_GreenDartGun.tres" id="17_hvmyf"] -[ext_resource type="Resource" uid="uid://6jxadgup32rv" path="res://Cards/Resource/Card_BlueDartGun.tres" id="18_v8ond"] -[ext_resource type="Resource" uid="uid://b15tsfgho08l3" path="res://Cards/Resource/Card_pspspsps.tres" id="19_22hxk"] -[ext_resource type="Resource" uid="uid://po6k4vvaiqfp" path="res://Cards/Resource/Card_Wink.tres" id="23_1g32d"] +[ext_resource type="Resource" uid="uid://b85t57jpq5x60" path="res://Cards/Resource/Player/Card_VampiricBite.tres" id="15_g6afn"] +[ext_resource type="Resource" uid="uid://b5fbomvc1uqqf" path="res://Cards/Resource/Player/Card_HeartHands.tres" id="16_efslq"] +[ext_resource type="Resource" uid="uid://cxk0880vdngpf" path="res://Cards/Resource/Player/Card_Sneeze.tres" id="16_gg63s"] +[ext_resource type="Resource" uid="uid://c4wlhlsg0g2np" path="res://Cards/Resource/Player/Card_GreenDartGun.tres" id="17_hvmyf"] +[ext_resource type="Resource" uid="uid://6jxadgup32rv" path="res://Cards/Resource/Player/Card_BlueDartGun.tres" id="18_v8ond"] +[ext_resource type="Resource" uid="uid://b15tsfgho08l3" path="res://Cards/Resource/Player/Card_pspspsps.tres" id="19_22hxk"] +[ext_resource type="Resource" uid="uid://po6k4vvaiqfp" path="res://Cards/Resource/Player/Card_Wink.tres" id="23_1g32d"] [resource] script = ExtResource("1_1a7v4") diff --git a/Cards/CardSets/DefaultDeck.tres b/Cards/CardSets/DefaultDeck.tres index f7155360..abe3efac 100644 --- a/Cards/CardSets/DefaultDeck.tres +++ b/Cards/CardSets/DefaultDeck.tres @@ -1,25 +1,25 @@ [gd_resource type="Resource" script_class="CardSetBase" load_steps=22 format=3 uid="uid://cda81lacxt2ai"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="1_pnxc0"] -[ext_resource type="Resource" uid="uid://dam752rc15nu5" path="res://Cards/Resource/test_cards/Player/Card_Buff_Poison_Duration.tres" id="1_to4gc"] -[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/test_cards/Player/Card_Damage.tres" id="2_q7qqo"] -[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/test_cards/Player/Card_DamageAllEnemies.tres" id="3_4ka0y"] -[ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/test_cards/Player/Card_DamageHealth.tres" id="4_es3ma"] -[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/test_cards/Player/Card_damage_and_poison.tres" id="5_giy28"] +[ext_resource type="Resource" uid="uid://dam752rc15nu5" path="res://Cards/Resource/test_cards/Card_Buff_Poison_Duration.tres" id="1_to4gc"] +[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/test_cards/Card_Damage.tres" id="2_q7qqo"] +[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/test_cards/Card_DamageAllEnemies.tres" id="3_4ka0y"] +[ext_resource type="Resource" uid="uid://boodcfdepyk5i" path="res://Cards/Resource/test_cards/Card_DamageHealth.tres" id="4_es3ma"] +[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/test_cards/Card_damage_and_poison.tres" id="5_giy28"] [ext_resource type="Resource" uid="uid://uv2rili0xf3x" path="res://Cards/Resource/test_cards/Card_Damage_EVERYTHING.tres" id="6_gr534"] -[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/test_cards/Player/Card_DrawCards.tres" id="7_y1gya"] -[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Player/Card_Heal.tres" id="8_haia1"] -[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/test_cards/Player/Card_Poison.tres" id="9_1tkbv"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Player/Card_Strength.tres" id="10_7m46u"] -[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/test_cards/Player/Card_Vulnerability.tres" id="11_0eivv"] -[ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/test_cards/Player/Card_Weakness.tres" id="12_lo5f6"] +[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/test_cards/Card_DrawCards.tres" id="7_y1gya"] +[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Card_Heal.tres" id="8_haia1"] +[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/test_cards/Card_Poison.tres" id="9_1tkbv"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Card_Strength.tres" id="10_7m46u"] +[ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/test_cards/Card_Vulnerability.tres" id="11_0eivv"] +[ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/test_cards/Card_Weakness.tres" id="12_lo5f6"] [ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Player/Card_Banana.tres" id="13_v3qs7"] -[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/test_cards/Player/Card_FaunaSweep.tres" id="14_ghttq"] +[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Player/Card_Sweep.tres" id="14_ghttq"] [ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/test_cards/Player/Card_Slap.tres" id="15_ie3pe"] -[ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/test_cards/Player/Card_SuperSlap.tres" id="16_jluts"] -[ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/test_cards/Player/Card_Buff_healing.tres" id="17_0kgrg"] -[ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/test_cards/Player/Card_Debuff_healing.tres" id="18_uj8io"] -[ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/test_cards/Player/Card_Stress_Damage.tres" id="19_s1aj2"] +[ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/test_cards/Card_SuperSlap.tres" id="16_jluts"] +[ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/test_cards/Card_Buff_healing.tres" id="17_0kgrg"] +[ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/test_cards/Card_Debuff_healing.tres" id="18_uj8io"] +[ext_resource type="Resource" uid="uid://wkffjp5doca1" path="res://Cards/Resource/test_cards/Card_Stress_Damage.tres" id="19_s1aj2"] [ext_resource type="Resource" uid="uid://b1u8retwosbc0" path="res://Cards/Resource/test_cards/Card_Get_block.tres" id="20_nvohy"] [resource] diff --git a/Cards/Resource/Card_AncientMeme.tres b/Cards/Resource/Player/Card_AncientMeme.tres similarity index 100% rename from Cards/Resource/Card_AncientMeme.tres rename to Cards/Resource/Player/Card_AncientMeme.tres diff --git a/Cards/Resource/Card_AraAra.tres b/Cards/Resource/Player/Card_AraAra.tres similarity index 100% rename from Cards/Resource/Card_AraAra.tres rename to Cards/Resource/Player/Card_AraAra.tres diff --git a/Cards/Resource/Card_BackwardsDriving.tres b/Cards/Resource/Player/Card_BackwardsDriving.tres similarity index 100% rename from Cards/Resource/Card_BackwardsDriving.tres rename to Cards/Resource/Player/Card_BackwardsDriving.tres diff --git a/Cards/Resource/Card_BlueDartGun.tres b/Cards/Resource/Player/Card_BlueDartGun.tres similarity index 100% rename from Cards/Resource/Card_BlueDartGun.tres rename to Cards/Resource/Player/Card_BlueDartGun.tres diff --git a/Cards/Resource/Card_Broom.tres b/Cards/Resource/Player/Card_Broom.tres similarity index 100% rename from Cards/Resource/Card_Broom.tres rename to Cards/Resource/Player/Card_Broom.tres diff --git a/Cards/Resource/Card_DoubleSlap.tres b/Cards/Resource/Player/Card_DoubleSlap.tres similarity index 100% rename from Cards/Resource/Card_DoubleSlap.tres rename to Cards/Resource/Player/Card_DoubleSlap.tres diff --git a/Cards/Resource/Card_FunFacts.tres b/Cards/Resource/Player/Card_FunFacts.tres similarity index 100% rename from Cards/Resource/Card_FunFacts.tres rename to Cards/Resource/Player/Card_FunFacts.tres diff --git a/Cards/Resource/Card_Gaslight.tres b/Cards/Resource/Player/Card_Gaslight.tres similarity index 100% rename from Cards/Resource/Card_Gaslight.tres rename to Cards/Resource/Player/Card_Gaslight.tres diff --git a/Cards/Resource/Card_GreenDartGun.tres b/Cards/Resource/Player/Card_GreenDartGun.tres similarity index 100% rename from Cards/Resource/Card_GreenDartGun.tres rename to Cards/Resource/Player/Card_GreenDartGun.tres diff --git a/Cards/Resource/Card_HeadbuttAttack.tres b/Cards/Resource/Player/Card_HeadbuttAttack.tres similarity index 100% rename from Cards/Resource/Card_HeadbuttAttack.tres rename to Cards/Resource/Player/Card_HeadbuttAttack.tres diff --git a/Cards/Resource/Card_HeartHands.tres b/Cards/Resource/Player/Card_HeartHands.tres similarity index 100% rename from Cards/Resource/Card_HeartHands.tres rename to Cards/Resource/Player/Card_HeartHands.tres diff --git a/Cards/Resource/Card_MicBonk.tres b/Cards/Resource/Player/Card_MicBonk.tres similarity index 100% rename from Cards/Resource/Card_MicBonk.tres rename to Cards/Resource/Player/Card_MicBonk.tres diff --git a/Cards/Resource/Card_Sneeze.tres b/Cards/Resource/Player/Card_Sneeze.tres similarity index 100% rename from Cards/Resource/Card_Sneeze.tres rename to Cards/Resource/Player/Card_Sneeze.tres diff --git a/Cards/Resource/Card_StealthCrouch.tres b/Cards/Resource/Player/Card_StealthCrouch.tres similarity index 100% rename from Cards/Resource/Card_StealthCrouch.tres rename to Cards/Resource/Player/Card_StealthCrouch.tres diff --git a/Cards/Resource/Card_Sweep.tres b/Cards/Resource/Player/Card_Sweep.tres similarity index 100% rename from Cards/Resource/Card_Sweep.tres rename to Cards/Resource/Player/Card_Sweep.tres diff --git a/Cards/Resource/Card_TakeCover.tres b/Cards/Resource/Player/Card_TakeCover.tres similarity index 100% rename from Cards/Resource/Card_TakeCover.tres rename to Cards/Resource/Player/Card_TakeCover.tres diff --git a/Cards/Resource/Card_Uuuuu.tres b/Cards/Resource/Player/Card_Uuuuu.tres similarity index 100% rename from Cards/Resource/Card_Uuuuu.tres rename to Cards/Resource/Player/Card_Uuuuu.tres diff --git a/Cards/Resource/Card_VampiricBite.tres b/Cards/Resource/Player/Card_VampiricBite.tres similarity index 100% rename from Cards/Resource/Card_VampiricBite.tres rename to Cards/Resource/Player/Card_VampiricBite.tres diff --git a/Cards/Resource/Card_Whispers.tres b/Cards/Resource/Player/Card_Whispers.tres similarity index 100% rename from Cards/Resource/Card_Whispers.tres rename to Cards/Resource/Player/Card_Whispers.tres diff --git a/Cards/Resource/Card_Wink.tres b/Cards/Resource/Player/Card_Wink.tres similarity index 100% rename from Cards/Resource/Card_Wink.tres rename to Cards/Resource/Player/Card_Wink.tres diff --git a/Cards/Resource/Card_Wrench.tres b/Cards/Resource/Player/Card_Wrench.tres similarity index 100% rename from Cards/Resource/Card_Wrench.tres rename to Cards/Resource/Player/Card_Wrench.tres diff --git a/Cards/Resource/Card_pspspsps.tres b/Cards/Resource/Player/Card_pspspsps.tres similarity index 100% rename from Cards/Resource/Card_pspspsps.tres rename to Cards/Resource/Player/Card_pspspsps.tres diff --git a/Cards/Resource/test_cards/Player/Card_Energy.tres b/Cards/Resource/test_cards/Player/Card_Energy.tres index e7a9fc80..f2c85c7f 100644 --- a/Cards/Resource/test_cards/Player/Card_Energy.tres +++ b/Cards/Resource/test_cards/Player/Card_Energy.tres @@ -1,33 +1,33 @@ [gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://ckaua56xmrxib"] -[ext_resource type="Script" path="res://Cards/Effects/EffectAddEnergy.gd" id="1_3yh17"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_dr7f0"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="3_2l1ax"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_jveph"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="3_opvsg"] +[ext_resource type="Script" path="res://Cards/Effects/EffectAddEnergy.gd" id="1_qgjep"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_ytx78"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_7ihwd"] +[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_vcno5"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_qcsut"] [sub_resource type="Resource" id="Resource_jur0i"] -script = ExtResource("1_3yh17") +script = ExtResource("1_qgjep") [sub_resource type="Resource" id="Resource_5r2jn"] -script = ExtResource("3_jveph") +script = ExtResource("3_7ihwd") [sub_resource type="Resource" id="Resource_6gvxm"] -script = ExtResource("2_dr7f0") +script = ExtResource("2_ytx78") effect = SubResource("Resource_jur0i") value = 70 targeting_function = SubResource("Resource_5r2jn") [sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("3_2l1ax") +script = ExtResource("4_vcno5") energy_cost = 2 [resource] -script = ExtResource("3_opvsg") +script = ExtResource("5_qcsut") application_type = 0 card_title = "Gain 70 energy" card_type = 0 card_description = "Gain 70 energy" card_artist_name = "NULL" -card_effects_data = Array[ExtResource("2_dr7f0")]([SubResource("Resource_6gvxm")]) +card_effects_data = Array[ExtResource("2_ytx78")]([SubResource("Resource_6gvxm")]) energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Player/Card_PoisonRandom.tres b/Cards/Resource/test_cards/Player/Card_PoisonRandom.tres index b5e68e60..712706a7 100644 --- a/Cards/Resource/test_cards/Player/Card_PoisonRandom.tres +++ b/Cards/Resource/test_cards/Player/Card_PoisonRandom.tres @@ -1,36 +1,36 @@ [gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://bdjkrhy06ijb7"] -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_p5f6b"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Poison.gd" id="2_ll6ua"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="3_67010"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetRandomEnemies.gd" id="4_0rcsi"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_r13bp"] +[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_40fxr"] +[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Poison.gd" id="2_w577h"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="3_oi81a"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetRandomEnemies.gd" id="4_or1ua"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_1dkqu"] [sub_resource type="Resource" id="Resource_dkfb2"] -script = ExtResource("2_ll6ua") +script = ExtResource("2_w577h") infinite_duration = false status_turn_duration = 3 status_power = 1.0 [sub_resource type="Resource" id="Resource_1uoj5"] -script = ExtResource("1_p5f6b") +script = ExtResource("1_40fxr") status_to_apply = SubResource("Resource_dkfb2") [sub_resource type="Resource" id="Resource_j8krj"] -script = ExtResource("4_0rcsi") +script = ExtResource("4_or1ua") number_of_targets = 3 [sub_resource type="Resource" id="Resource_hpkt0"] -script = ExtResource("3_67010") +script = ExtResource("3_oi81a") effect = SubResource("Resource_1uoj5") value = 0 targeting_function = SubResource("Resource_j8krj") [resource] -script = ExtResource("5_r13bp") +script = ExtResource("5_1dkqu") application_type = 1 card_title = "Random poison" card_type = 0 card_description = "Apply poison randomly 3 times" card_artist_name = "NULL" -card_effects_data = Array[ExtResource("3_67010")]([SubResource("Resource_hpkt0")]) +card_effects_data = Array[ExtResource("3_oi81a")]([SubResource("Resource_hpkt0")]) diff --git a/Cards/Resource/test_cards/Player/Card_Strength.tres b/Cards/Resource/test_cards/Player/Card_Strength.tres index 1a600085..164f250a 100644 --- a/Cards/Resource/test_cards/Player/Card_Strength.tres +++ b/Cards/Resource/test_cards/Player/Card_Strength.tres @@ -1,50 +1,50 @@ [gd_resource type="Resource" script_class="CardBase" load_steps=14 format=3 uid="uid://btj36bhn3n2tr"] -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_k0qgj"] -[ext_resource type="Script" path="res://Status/Buffs/Buff_Strength.gd" id="2_lq0xl"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_q4cd0"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_8rg8k"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_e4pqm"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="5_pg6gn"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="5_xufij"] +[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_1ny7n"] +[ext_resource type="Script" path="res://Status/Buffs/Buff_Strength.gd" id="2_d6nuu"] +[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_6ji4i"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_atooh"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="5_j0dxr"] +[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="6_gg5ls"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="7_5dywi"] [sub_resource type="Resource" id="Resource_jxq2s"] -script = ExtResource("3_q4cd0") +script = ExtResource("3_6ji4i") permanent_add = 0 permanent_multiply = 1.0 temporary_add = 1 temporary_multiply = 1.0 [sub_resource type="Resource" id="Resource_pm26j"] -script = ExtResource("2_lq0xl") +script = ExtResource("2_d6nuu") infinite_duration = false status_turn_duration = 2 status_power = 1.0 status_modifier_base_value = SubResource("Resource_jxq2s") [sub_resource type="Resource" id="Resource_c8rcp"] -script = ExtResource("1_k0qgj") +script = ExtResource("1_1ny7n") status_to_apply = SubResource("Resource_pm26j") [sub_resource type="Resource" id="Resource_8dsc0"] -script = ExtResource("5_pg6gn") +script = ExtResource("5_j0dxr") [sub_resource type="Resource" id="Resource_ucd6r"] -script = ExtResource("4_8rg8k") +script = ExtResource("4_atooh") effect = SubResource("Resource_c8rcp") value = 0 targeting_function = SubResource("Resource_8dsc0") [sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("5_xufij") +script = ExtResource("6_gg5ls") energy_cost = 2 [resource] -script = ExtResource("5_e4pqm") +script = ExtResource("7_5dywi") application_type = 0 card_title = "Strength" card_type = 0 card_description = "Targeted entity deals one more damage for 2 turns" card_artist_name = "NULL" -card_effects_data = Array[ExtResource("4_8rg8k")]([SubResource("Resource_ucd6r")]) +card_effects_data = Array[ExtResource("4_atooh")]([SubResource("Resource_ucd6r")]) energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Player/Card_Vulnerability.tres b/Cards/Resource/test_cards/Player/Card_Vulnerability.tres index 14cfe14b..60fa775b 100644 --- a/Cards/Resource/test_cards/Player/Card_Vulnerability.tres +++ b/Cards/Resource/test_cards/Player/Card_Vulnerability.tres @@ -1,50 +1,50 @@ [gd_resource type="Resource" script_class="CardBase" load_steps=14 format=3 uid="uid://b4kmg3lm0e45q"] -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_imfg2"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Vulnerability.gd" id="2_78lil"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_i1kkg"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_rb4ns"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="5_ko1t2"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="6_t6lxm"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="7_ntxwk"] +[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_2b0xe"] +[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Vulnerability.gd" id="2_hqs5s"] +[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_owoau"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_ve2u8"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="5_mobt6"] +[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="6_8akcd"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="7_s5svm"] [sub_resource type="Resource" id="Resource_5jitw"] -script = ExtResource("3_i1kkg") +script = ExtResource("3_owoau") permanent_add = 0 permanent_multiply = 1.0 temporary_add = -1 temporary_multiply = 1.0 [sub_resource type="Resource" id="Resource_dx65m"] -script = ExtResource("2_78lil") +script = ExtResource("2_hqs5s") infinite_duration = false status_turn_duration = 3 status_power = 1.0 status_modifier_base_value = SubResource("Resource_5jitw") [sub_resource type="Resource" id="Resource_ahy8v"] -script = ExtResource("1_imfg2") +script = ExtResource("1_2b0xe") status_to_apply = SubResource("Resource_dx65m") [sub_resource type="Resource" id="Resource_op0nd"] -script = ExtResource("5_ko1t2") +script = ExtResource("5_mobt6") [sub_resource type="Resource" id="Resource_8k1ut"] -script = ExtResource("4_rb4ns") +script = ExtResource("4_ve2u8") effect = SubResource("Resource_ahy8v") value = 0 targeting_function = SubResource("Resource_op0nd") [sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("6_t6lxm") +script = ExtResource("6_8akcd") energy_cost = 2 [resource] -script = ExtResource("7_ntxwk") +script = ExtResource("7_s5svm") application_type = 1 card_title = "Vulnerable 1" card_type = 0 card_description = "Make targeted entity take one more damage when attacked for 3 turns" card_artist_name = "NULL" -card_effects_data = Array[ExtResource("4_rb4ns")]([SubResource("Resource_8k1ut")]) +card_effects_data = Array[ExtResource("4_ve2u8")]([SubResource("Resource_8k1ut")]) energy_info = SubResource("Resource_1hn6q") From 5035d75ddc2b60243ebb81b71e3052b982252e56 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:51:18 +0100 Subject: [PATCH 13/20] Remove duplicates --- Cards/CardSets/CardArtTest.tres | 8 +-- Cards/CardSets/DefaultDeck.tres | 6 +- Cards/CardSets/InstantWinDeck.tres | 6 +- .../test_cards/{Player => }/Card_Banana.tres | 0 .../{Player => }/Card_FaunaSweep.tres | 0 .../test_cards/{Player => }/Card_Slap.tres | 0 .../test_cards/{Player => }/Card_sooth.tres | 0 .../Player/Card_Buff_Poison_Duration.tres | 49 -------------- .../test_cards/Player/Card_Buff_healing.tres | 50 -------------- .../test_cards/Player/Card_Damage.tres | 32 --------- .../Player/Card_DamageAllEnemies.tres | 32 --------- .../test_cards/Player/Card_DamageHealth.tres | 32 --------- .../Player/Card_Debuff_healing.tres | 50 -------------- .../test_cards/Player/Card_DrawCards.tres | 26 ------- .../test_cards/Player/Card_Energy.tres | 33 --------- .../Resource/test_cards/Player/Card_Heal.tres | 35 ---------- .../test_cards/Player/Card_Poison.tres | 54 --------------- .../test_cards/Player/Card_PoisonRandom.tres | 36 ---------- .../test_cards/Player/Card_Strength.tres | 50 -------------- .../test_cards/Player/Card_Stress_Damage.tres | 46 ------------- .../test_cards/Player/Card_SuperSlap.tres | 39 ----------- .../test_cards/Player/Card_Vulnerability.tres | 50 -------------- .../test_cards/Player/Card_Weakness.tres | 50 -------------- .../test_cards/Player/Card_buff_sooth.tres | 42 ------------ .../Player/Card_damage_and_poison.tres | 67 ------------------- .../test_cards/Player/Card_debuff_sooth.tres | 42 ------------ 26 files changed, 10 insertions(+), 825 deletions(-) rename Cards/Resource/test_cards/{Player => }/Card_Banana.tres (100%) rename Cards/Resource/test_cards/{Player => }/Card_FaunaSweep.tres (100%) rename Cards/Resource/test_cards/{Player => }/Card_Slap.tres (100%) rename Cards/Resource/test_cards/{Player => }/Card_sooth.tres (100%) delete mode 100644 Cards/Resource/test_cards/Player/Card_Buff_Poison_Duration.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Buff_healing.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Damage.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_DamageAllEnemies.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_DamageHealth.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Debuff_healing.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_DrawCards.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Energy.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Heal.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Poison.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_PoisonRandom.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Strength.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Stress_Damage.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_SuperSlap.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Vulnerability.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_Weakness.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_buff_sooth.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_damage_and_poison.tres delete mode 100644 Cards/Resource/test_cards/Player/Card_debuff_sooth.tres diff --git a/Cards/CardSets/CardArtTest.tres b/Cards/CardSets/CardArtTest.tres index 925c7779..0982307b 100644 --- a/Cards/CardSets/CardArtTest.tres +++ b/Cards/CardSets/CardArtTest.tres @@ -2,10 +2,10 @@ [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="1_1a7v4"] [ext_resource type="Resource" uid="uid://dxoesacbfg08l" path="res://Cards/Resource/Player/Card_BackwardsDriving.tres" id="1_pd6qu"] -[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Player/Card_Sweep.tres" id="3_jlhsd"] +[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/test_cards/Card_FaunaSweep.tres" id="3_jlhsd"] [ext_resource type="Resource" uid="uid://b5gr83yvnrv00" path="res://Cards/Resource/Player/Card_AncientMeme.tres" id="5_mwsmk"] -[ext_resource type="Resource" uid="uid://qxm7k4pr54m2" path="res://Cards/Resource/Player/Card_AraAra.tres" id="6_y0mpa"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Player/Card_Banana.tres" id="7_f8uli"] +[ext_resource type="Resource" uid="uid://qxm7k4pr54m2" path="res://Cards/Resource/test_cards/Card_sooth.tres" id="6_y0mpa"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Card_Banana.tres" id="7_f8uli"] [ext_resource type="Resource" uid="uid://cndn68ie86usa" path="res://Cards/Resource/Player/Card_Uuuuu.tres" id="8_018w3"] [ext_resource type="Resource" uid="uid://cmhwcuf1ef634" path="res://Cards/Resource/Player/Card_Broom.tres" id="8_27cbf"] [ext_resource type="Resource" uid="uid://t4pfpsparcir" path="res://Cards/Resource/Player/Card_Whispers.tres" id="9_67g1d"] @@ -17,7 +17,7 @@ [ext_resource type="Resource" uid="uid://cxym5gojbc7v5" path="res://Cards/Resource/Player/Card_StealthCrouch.tres" id="13_lpugv"] [ext_resource type="Resource" uid="uid://blf5d4vfnmp85" path="res://Cards/Resource/Player/Card_HeadbuttAttack.tres" id="13_sj4o2"] [ext_resource type="Resource" uid="uid://dxsak4t37w0po" path="res://Cards/Resource/Player/Card_TakeCover.tres" id="14_vv5cl"] -[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/test_cards/Player/Card_Slap.tres" id="15_eausw"] +[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/test_cards/Card_Slap.tres" id="15_eausw"] [ext_resource type="Resource" uid="uid://b85t57jpq5x60" path="res://Cards/Resource/Player/Card_VampiricBite.tres" id="15_g6afn"] [ext_resource type="Resource" uid="uid://b5fbomvc1uqqf" path="res://Cards/Resource/Player/Card_HeartHands.tres" id="16_efslq"] [ext_resource type="Resource" uid="uid://cxk0880vdngpf" path="res://Cards/Resource/Player/Card_Sneeze.tres" id="16_gg63s"] diff --git a/Cards/CardSets/DefaultDeck.tres b/Cards/CardSets/DefaultDeck.tres index abe3efac..f9a5b0fa 100644 --- a/Cards/CardSets/DefaultDeck.tres +++ b/Cards/CardSets/DefaultDeck.tres @@ -13,9 +13,9 @@ [ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Card_Strength.tres" id="10_7m46u"] [ext_resource type="Resource" uid="uid://b4kmg3lm0e45q" path="res://Cards/Resource/test_cards/Card_Vulnerability.tres" id="11_0eivv"] [ext_resource type="Resource" uid="uid://bobfsmcwcgsbb" path="res://Cards/Resource/test_cards/Card_Weakness.tres" id="12_lo5f6"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Player/Card_Banana.tres" id="13_v3qs7"] -[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/Player/Card_Sweep.tres" id="14_ghttq"] -[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/test_cards/Player/Card_Slap.tres" id="15_ie3pe"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Card_Banana.tres" id="13_v3qs7"] +[ext_resource type="Resource" uid="uid://vydmm1p103mg" path="res://Cards/Resource/test_cards/Card_FaunaSweep.tres" id="14_ghttq"] +[ext_resource type="Resource" uid="uid://dans622owjixj" path="res://Cards/Resource/test_cards/Card_Slap.tres" id="15_ie3pe"] [ext_resource type="Resource" uid="uid://yc2ns5s0qask" path="res://Cards/Resource/test_cards/Card_SuperSlap.tres" id="16_jluts"] [ext_resource type="Resource" uid="uid://c787doijq7xg2" path="res://Cards/Resource/test_cards/Card_Buff_healing.tres" id="17_0kgrg"] [ext_resource type="Resource" uid="uid://bek3vbtsf3x2l" path="res://Cards/Resource/test_cards/Card_Debuff_healing.tres" id="18_uj8io"] diff --git a/Cards/CardSets/InstantWinDeck.tres b/Cards/CardSets/InstantWinDeck.tres index f24cc928..cb6fa9d8 100644 --- a/Cards/CardSets/InstantWinDeck.tres +++ b/Cards/CardSets/InstantWinDeck.tres @@ -2,9 +2,9 @@ [ext_resource type="Resource" uid="uid://dmgrkemuj71na" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_kill.tres" id="1_6mukv"] [ext_resource type="Resource" uid="uid://b2isycb5jkern" path="res://Cards/Resource/DO_NOT_USE_IN_DECKS/DO_NOT_USE_IN_DECK_insta_sooth.tres" id="2_jr0a6"] -[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Player/Card_Banana.tres" id="3_ptv1b"] -[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Player/Card_Heal.tres" id="4_jfguc"] -[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Player/Card_Strength.tres" id="5_g72ks"] +[ext_resource type="Resource" uid="uid://c8kpsky7tt3yq" path="res://Cards/Resource/test_cards/Card_Banana.tres" id="3_ptv1b"] +[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/test_cards/Card_Heal.tres" id="4_jfguc"] +[ext_resource type="Resource" uid="uid://btj36bhn3n2tr" path="res://Cards/Resource/test_cards/Card_Strength.tres" id="5_g72ks"] [ext_resource type="Script" path="res://Cards/CardSetBase.gd" id="21_rmslx"] [resource] diff --git a/Cards/Resource/test_cards/Player/Card_Banana.tres b/Cards/Resource/test_cards/Card_Banana.tres similarity index 100% rename from Cards/Resource/test_cards/Player/Card_Banana.tres rename to Cards/Resource/test_cards/Card_Banana.tres diff --git a/Cards/Resource/test_cards/Player/Card_FaunaSweep.tres b/Cards/Resource/test_cards/Card_FaunaSweep.tres similarity index 100% rename from Cards/Resource/test_cards/Player/Card_FaunaSweep.tres rename to Cards/Resource/test_cards/Card_FaunaSweep.tres diff --git a/Cards/Resource/test_cards/Player/Card_Slap.tres b/Cards/Resource/test_cards/Card_Slap.tres similarity index 100% rename from Cards/Resource/test_cards/Player/Card_Slap.tres rename to Cards/Resource/test_cards/Card_Slap.tres diff --git a/Cards/Resource/test_cards/Player/Card_sooth.tres b/Cards/Resource/test_cards/Card_sooth.tres similarity index 100% rename from Cards/Resource/test_cards/Player/Card_sooth.tres rename to Cards/Resource/test_cards/Card_sooth.tres diff --git a/Cards/Resource/test_cards/Player/Card_Buff_Poison_Duration.tres b/Cards/Resource/test_cards/Player/Card_Buff_Poison_Duration.tres deleted file mode 100644 index 1a67596b..00000000 --- a/Cards/Resource/test_cards/Player/Card_Buff_Poison_Duration.tres +++ /dev/null @@ -1,49 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=14 format=3 uid="uid://dam752rc15nu5"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_2mdel"] -[ext_resource type="Script" path="res://Status/Buffs/Buff_Poison_Duration.gd" id="2_3gm2g"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_euw63"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_y13fe"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="5_8k4sy"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_n2tug"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="5_ywuis"] - -[sub_resource type="Resource" id="Resource_h6yd6"] -script = ExtResource("3_euw63") -permanent_add = 0 -permanent_multiply = 1.0 -temporary_add = 2 -temporary_multiply = 1.0 - -[sub_resource type="Resource" id="Resource_40gpm"] -script = ExtResource("2_3gm2g") -infinite_duration = false -status_turn_duration = 6 -status_power = 1.0 -status_modifier_base_value = SubResource("Resource_h6yd6") - -[sub_resource type="Resource" id="Resource_gd8uo"] -script = ExtResource("1_2mdel") -status_to_apply = SubResource("Resource_40gpm") - -[sub_resource type="Resource" id="Resource_5w54v"] -script = ExtResource("5_8k4sy") - -[sub_resource type="Resource" id="Resource_chqbm"] -script = ExtResource("4_y13fe") -effect = SubResource("Resource_gd8uo") -value = 0 -targeting_function = SubResource("Resource_5w54v") - -[sub_resource type="Resource" id="Resource_noiey"] -script = ExtResource("5_ywuis") -energy_cost = 1 - -[resource] -script = ExtResource("5_n2tug") -application_type = 0 -card_title = "Buff poison duration" -card_type = 0 -card_description = "Add 2 to the duration of poison applied by targeted entity for 6 turns" -card_effects_data = Array[ExtResource("4_y13fe")]([SubResource("Resource_chqbm")]) -energy_info = SubResource("Resource_noiey") diff --git a/Cards/Resource/test_cards/Player/Card_Buff_healing.tres b/Cards/Resource/test_cards/Player/Card_Buff_healing.tres deleted file mode 100644 index 5bf108e2..00000000 --- a/Cards/Resource/test_cards/Player/Card_Buff_healing.tres +++ /dev/null @@ -1,50 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=14 format=3 uid="uid://c787doijq7xg2"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_5r5yp"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_0ql41"] -[ext_resource type="Script" path="res://Status/Buffs/Buff_Healing.gd" id="2_sgtkt"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_60dhg"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_gp26q"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_wyd1i"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_wu6tg"] - -[sub_resource type="Resource" id="Resource_renle"] -script = ExtResource("3_gp26q") -permanent_add = 0 -permanent_multiply = 1.0 -temporary_add = 1 -temporary_multiply = 1.0 - -[sub_resource type="Resource" id="Resource_8rxnt"] -script = ExtResource("2_sgtkt") -infinite_duration = false -status_turn_duration = 3 -status_power = 1.0 -status_modifier_base_value = SubResource("Resource_renle") - -[sub_resource type="Resource" id="Resource_w5qm2"] -script = ExtResource("1_5r5yp") -status_to_apply = SubResource("Resource_8rxnt") - -[sub_resource type="Resource" id="Resource_je5tl"] -script = ExtResource("3_60dhg") - -[sub_resource type="Resource" id="Resource_0xps1"] -script = ExtResource("2_0ql41") -effect = SubResource("Resource_w5qm2") -value = 1 -targeting_function = SubResource("Resource_je5tl") - -[sub_resource type="Resource" id="Resource_308lg"] -script = ExtResource("4_wyd1i") -energy_cost = 0 - -[resource] -script = ExtResource("5_wu6tg") -application_type = 0 -card_title = "Buff heal" -card_type = 0 -card_description = "Buffs healing by 1 for 3 turns" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("2_0ql41")]([SubResource("Resource_0xps1")]) -energy_info = SubResource("Resource_308lg") diff --git a/Cards/Resource/test_cards/Player/Card_Damage.tres b/Cards/Resource/test_cards/Player/Card_Damage.tres deleted file mode 100644 index 465a84e2..00000000 --- a/Cards/Resource/test_cards/Player/Card_Damage.tres +++ /dev/null @@ -1,32 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://dxgoopi1roxu4"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_t2hjo"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_xiweo"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="3_v8rsq"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_u3q3w"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_chdon"] - -[sub_resource type="Resource" id="Resource_twrvn"] -script = ExtResource("1_t2hjo") - -[sub_resource type="Resource" id="Resource_j8q37"] -script = ExtResource("3_v8rsq") - -[sub_resource type="Resource" id="Resource_8ifm0"] -script = ExtResource("2_xiweo") -effect = SubResource("Resource_twrvn") -value = 3 -targeting_function = SubResource("Resource_j8q37") - -[sub_resource type="Resource" id="Resource_noiey"] -script = ExtResource("4_u3q3w") -energy_cost = 1 - -[resource] -script = ExtResource("5_chdon") -application_type = 1 -card_title = "Damage" -card_type = 0 -card_description = "Deal 3 damage" -card_effects_data = Array[ExtResource("2_xiweo")]([SubResource("Resource_8ifm0")]) -energy_info = SubResource("Resource_noiey") diff --git a/Cards/Resource/test_cards/Player/Card_DamageAllEnemies.tres b/Cards/Resource/test_cards/Player/Card_DamageAllEnemies.tres deleted file mode 100644 index 21cbe50c..00000000 --- a/Cards/Resource/test_cards/Player/Card_DamageAllEnemies.tres +++ /dev/null @@ -1,32 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://0x385c3nuq8f"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_fpg0t"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_ib0yg"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetAllEnemies.gd" id="3_rqas5"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_yc1ma"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_cj041"] - -[sub_resource type="Resource" id="Resource_f6djy"] -script = ExtResource("1_fpg0t") - -[sub_resource type="Resource" id="Resource_4lyyh"] -script = ExtResource("3_rqas5") - -[sub_resource type="Resource" id="Resource_cwhuj"] -script = ExtResource("2_ib0yg") -effect = SubResource("Resource_f6djy") -value = 2 -targeting_function = SubResource("Resource_4lyyh") - -[sub_resource type="Resource" id="Resource_noiey"] -script = ExtResource("4_yc1ma") -energy_cost = 1 - -[resource] -script = ExtResource("5_cj041") -application_type = 1 -card_title = "Damage All" -card_type = 0 -card_description = "Deal 2 to all enemies" -card_effects_data = Array[ExtResource("2_ib0yg")]([SubResource("Resource_cwhuj")]) -energy_info = SubResource("Resource_noiey") diff --git a/Cards/Resource/test_cards/Player/Card_DamageHealth.tres b/Cards/Resource/test_cards/Player/Card_DamageHealth.tres deleted file mode 100644 index 403a51fa..00000000 --- a/Cards/Resource/test_cards/Player/Card_DamageHealth.tres +++ /dev/null @@ -1,32 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://boodcfdepyk5i"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectDamageHealth.gd" id="1_v8nqe"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_v2ps8"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="3_6aswi"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="3_bkc3b"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="3_fnmvw"] - -[sub_resource type="Resource" id="Resource_ssnwy"] -script = ExtResource("1_v8nqe") - -[sub_resource type="Resource" id="Resource_fdmh8"] -script = ExtResource("3_6aswi") - -[sub_resource type="Resource" id="Resource_ggt87"] -script = ExtResource("2_v2ps8") -effect = SubResource("Resource_ssnwy") -value = 0 -targeting_function = SubResource("Resource_fdmh8") - -[sub_resource type="Resource" id="Resource_noiey"] -script = ExtResource("3_fnmvw") -energy_cost = 1 - -[resource] -script = ExtResource("3_bkc3b") -application_type = 1 -card_title = "Damage Health" -card_type = 0 -card_description = "Deals damage equal to health lost" -card_effects_data = Array[ExtResource("2_v2ps8")]([SubResource("Resource_ggt87")]) -energy_info = SubResource("Resource_noiey") diff --git a/Cards/Resource/test_cards/Player/Card_Debuff_healing.tres b/Cards/Resource/test_cards/Player/Card_Debuff_healing.tres deleted file mode 100644 index 3c86bc2f..00000000 --- a/Cards/Resource/test_cards/Player/Card_Debuff_healing.tres +++ /dev/null @@ -1,50 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=14 format=3 uid="uid://bek3vbtsf3x2l"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_63tqs"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_healing.gd" id="2_7i6kf"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_omw4j"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_hb64u"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="5_6vc5k"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_8c6ak"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="6_augqn"] - -[sub_resource type="Resource" id="Resource_d5x88"] -script = ExtResource("3_omw4j") -permanent_add = 0 -permanent_multiply = 1.0 -temporary_add = -1 -temporary_multiply = 1.0 - -[sub_resource type="Resource" id="Resource_b0uet"] -script = ExtResource("2_7i6kf") -infinite_duration = false -status_turn_duration = 3 -status_power = 1.0 -status_modifier_base_value = SubResource("Resource_d5x88") - -[sub_resource type="Resource" id="Resource_5niki"] -script = ExtResource("1_63tqs") -status_to_apply = SubResource("Resource_b0uet") - -[sub_resource type="Resource" id="Resource_qxyyl"] -script = ExtResource("5_6vc5k") - -[sub_resource type="Resource" id="Resource_8p0l4"] -script = ExtResource("4_hb64u") -effect = SubResource("Resource_5niki") -value = 0 -targeting_function = SubResource("Resource_qxyyl") - -[sub_resource type="Resource" id="Resource_mrt6b"] -script = ExtResource("6_augqn") -energy_cost = 0 - -[resource] -script = ExtResource("5_8c6ak") -application_type = 2 -card_title = "debuff healing" -card_type = 0 -card_description = "Debuffs your capacity to heal by 1 for 3 turns" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("4_hb64u")]([SubResource("Resource_8p0l4")]) -energy_info = SubResource("Resource_mrt6b") diff --git a/Cards/Resource/test_cards/Player/Card_DrawCards.tres b/Cards/Resource/test_cards/Player/Card_DrawCards.tres deleted file mode 100644 index cf03ba35..00000000 --- a/Cards/Resource/test_cards/Player/Card_DrawCards.tres +++ /dev/null @@ -1,26 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=8 format=3 uid="uid://d4lugn62mmlep"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectDraw.gd" id="1_gma8k"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_1y3ib"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_yf6tk"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="4_lwkdt"] - -[sub_resource type="Resource" id="Resource_2ap55"] -script = ExtResource("1_gma8k") - -[sub_resource type="Resource" id="Resource_oon2r"] -script = ExtResource("3_yf6tk") - -[sub_resource type="Resource" id="Resource_5ywer"] -script = ExtResource("2_1y3ib") -effect = SubResource("Resource_2ap55") -value = 2 -targeting_function = SubResource("Resource_oon2r") - -[resource] -script = ExtResource("4_lwkdt") -application_type = 0 -card_title = "Draw 2" -card_type = 0 -card_description = "Draw 2 cards" -card_effects_data = Array[ExtResource("2_1y3ib")]([SubResource("Resource_5ywer")]) diff --git a/Cards/Resource/test_cards/Player/Card_Energy.tres b/Cards/Resource/test_cards/Player/Card_Energy.tres deleted file mode 100644 index f2c85c7f..00000000 --- a/Cards/Resource/test_cards/Player/Card_Energy.tres +++ /dev/null @@ -1,33 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://ckaua56xmrxib"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectAddEnergy.gd" id="1_qgjep"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_ytx78"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_7ihwd"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_vcno5"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_qcsut"] - -[sub_resource type="Resource" id="Resource_jur0i"] -script = ExtResource("1_qgjep") - -[sub_resource type="Resource" id="Resource_5r2jn"] -script = ExtResource("3_7ihwd") - -[sub_resource type="Resource" id="Resource_6gvxm"] -script = ExtResource("2_ytx78") -effect = SubResource("Resource_jur0i") -value = 70 -targeting_function = SubResource("Resource_5r2jn") - -[sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("4_vcno5") -energy_cost = 2 - -[resource] -script = ExtResource("5_qcsut") -application_type = 0 -card_title = "Gain 70 energy" -card_type = 0 -card_description = "Gain 70 energy" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("2_ytx78")]([SubResource("Resource_6gvxm")]) -energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Player/Card_Heal.tres b/Cards/Resource/test_cards/Player/Card_Heal.tres deleted file mode 100644 index 3fe35db3..00000000 --- a/Cards/Resource/test_cards/Player/Card_Heal.tres +++ /dev/null @@ -1,35 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=11 format=3 uid="uid://d12g33rc6c3u5"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectHeal.gd" id="1_m05j8"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_qberh"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_dy86b"] -[ext_resource type="Texture2D" uid="uid://ceex1yybqmow" path="res://Art/Card_art/Ara_Ara__Ryussei.png" id="4_4joxa"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="5_rftgk"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="6_45ib1"] - -[sub_resource type="Resource" id="Resource_8ubmy"] -script = ExtResource("1_m05j8") - -[sub_resource type="Resource" id="Resource_hq1cx"] -script = ExtResource("3_dy86b") - -[sub_resource type="Resource" id="Resource_mabur"] -script = ExtResource("2_qberh") -effect = SubResource("Resource_8ubmy") -value = 1 -targeting_function = SubResource("Resource_hq1cx") - -[sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("5_rftgk") -energy_cost = 2 - -[resource] -script = ExtResource("6_45ib1") -application_type = 0 -card_title = "Heal" -card_key_art = ExtResource("4_4joxa") -card_type = 0 -card_description = "Heal 1 damage" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("2_qberh")]([SubResource("Resource_mabur")]) -energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Player/Card_Poison.tres b/Cards/Resource/test_cards/Player/Card_Poison.tres deleted file mode 100644 index aca34a3e..00000000 --- a/Cards/Resource/test_cards/Player/Card_Poison.tres +++ /dev/null @@ -1,54 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=17 format=3 uid="uid://ctx8jsvac84so"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_5lji7"] -[ext_resource type="PackedScene" uid="uid://c13302ahcfpuy" path="res://Cards/Animation/Scene/Anim_Poison.tscn" id="1_q5mb6"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="1_u6k7h"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Poison.gd" id="2_6vdl1"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_omhae"] -[ext_resource type="Script" path="res://Cards/Animation/CastPosition/CastPos_AllTargets.gd" id="2_rxe7g"] -[ext_resource type="Script" path="res://Cards/Animation/CastAnimationData.gd" id="3_ph4nu"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="4_2c1xc"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_ux0cs"] - -[sub_resource type="Resource" id="Resource_mt7py"] -script = ExtResource("2_rxe7g") -offset = Vector2(0, 0) - -[sub_resource type="Resource" id="Resource_s0nfu"] -script = ExtResource("3_ph4nu") -cast_animation_scene = ExtResource("1_q5mb6") -cast_position = SubResource("Resource_mt7py") - -[sub_resource type="Resource" id="Resource_lnhao"] -script = ExtResource("2_6vdl1") -infinite_duration = false -status_turn_duration = 3 -status_power = 1.0 - -[sub_resource type="Resource" id="Resource_p8qns"] -script = ExtResource("1_5lji7") -status_to_apply = SubResource("Resource_lnhao") - -[sub_resource type="Resource" id="Resource_oq1u4"] -script = ExtResource("4_2c1xc") - -[sub_resource type="Resource" id="Resource_bamld"] -script = ExtResource("2_omhae") -effect = SubResource("Resource_p8qns") -value = 0 -targeting_function = SubResource("Resource_oq1u4") -animation_data = SubResource("Resource_s0nfu") - -[sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("4_ux0cs") -energy_cost = 2 - -[resource] -script = ExtResource("1_u6k7h") -application_type = 1 -card_title = "Poison" -card_type = 0 -card_description = "Apply 3 poison" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("2_omhae")]([SubResource("Resource_bamld")]) -energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Player/Card_PoisonRandom.tres b/Cards/Resource/test_cards/Player/Card_PoisonRandom.tres deleted file mode 100644 index 712706a7..00000000 --- a/Cards/Resource/test_cards/Player/Card_PoisonRandom.tres +++ /dev/null @@ -1,36 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://bdjkrhy06ijb7"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_40fxr"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Poison.gd" id="2_w577h"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="3_oi81a"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetRandomEnemies.gd" id="4_or1ua"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_1dkqu"] - -[sub_resource type="Resource" id="Resource_dkfb2"] -script = ExtResource("2_w577h") -infinite_duration = false -status_turn_duration = 3 -status_power = 1.0 - -[sub_resource type="Resource" id="Resource_1uoj5"] -script = ExtResource("1_40fxr") -status_to_apply = SubResource("Resource_dkfb2") - -[sub_resource type="Resource" id="Resource_j8krj"] -script = ExtResource("4_or1ua") -number_of_targets = 3 - -[sub_resource type="Resource" id="Resource_hpkt0"] -script = ExtResource("3_oi81a") -effect = SubResource("Resource_1uoj5") -value = 0 -targeting_function = SubResource("Resource_j8krj") - -[resource] -script = ExtResource("5_1dkqu") -application_type = 1 -card_title = "Random poison" -card_type = 0 -card_description = "Apply poison randomly 3 times" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("3_oi81a")]([SubResource("Resource_hpkt0")]) diff --git a/Cards/Resource/test_cards/Player/Card_Strength.tres b/Cards/Resource/test_cards/Player/Card_Strength.tres deleted file mode 100644 index 164f250a..00000000 --- a/Cards/Resource/test_cards/Player/Card_Strength.tres +++ /dev/null @@ -1,50 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=14 format=3 uid="uid://btj36bhn3n2tr"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_1ny7n"] -[ext_resource type="Script" path="res://Status/Buffs/Buff_Strength.gd" id="2_d6nuu"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_6ji4i"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_atooh"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="5_j0dxr"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="6_gg5ls"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="7_5dywi"] - -[sub_resource type="Resource" id="Resource_jxq2s"] -script = ExtResource("3_6ji4i") -permanent_add = 0 -permanent_multiply = 1.0 -temporary_add = 1 -temporary_multiply = 1.0 - -[sub_resource type="Resource" id="Resource_pm26j"] -script = ExtResource("2_d6nuu") -infinite_duration = false -status_turn_duration = 2 -status_power = 1.0 -status_modifier_base_value = SubResource("Resource_jxq2s") - -[sub_resource type="Resource" id="Resource_c8rcp"] -script = ExtResource("1_1ny7n") -status_to_apply = SubResource("Resource_pm26j") - -[sub_resource type="Resource" id="Resource_8dsc0"] -script = ExtResource("5_j0dxr") - -[sub_resource type="Resource" id="Resource_ucd6r"] -script = ExtResource("4_atooh") -effect = SubResource("Resource_c8rcp") -value = 0 -targeting_function = SubResource("Resource_8dsc0") - -[sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("6_gg5ls") -energy_cost = 2 - -[resource] -script = ExtResource("7_5dywi") -application_type = 0 -card_title = "Strength" -card_type = 0 -card_description = "Targeted entity deals one more damage for 2 turns" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("4_atooh")]([SubResource("Resource_ucd6r")]) -energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Player/Card_Stress_Damage.tres b/Cards/Resource/test_cards/Player/Card_Stress_Damage.tres deleted file mode 100644 index c5d7fde9..00000000 --- a/Cards/Resource/test_cards/Player/Card_Stress_Damage.tres +++ /dev/null @@ -1,46 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=15 format=3 uid="uid://wkffjp5doca1"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_j6mcv"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_qpe8d"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetAllEnemies.gd" id="3_kblp8"] -[ext_resource type="Script" path="res://Cards/Effects/EffectStress.gd" id="4_sttxr"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="5_06ud4"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="6_tktqq"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="7_mwudb"] - -[sub_resource type="Resource" id="Resource_0xkly"] -script = ExtResource("1_j6mcv") - -[sub_resource type="Resource" id="Resource_n8t3e"] -script = ExtResource("3_kblp8") - -[sub_resource type="Resource" id="Resource_erfad"] -script = ExtResource("2_qpe8d") -effect = SubResource("Resource_0xkly") -value = 10 -targeting_function = SubResource("Resource_n8t3e") - -[sub_resource type="Resource" id="Resource_0kipv"] -script = ExtResource("4_sttxr") - -[sub_resource type="Resource" id="Resource_l7ne0"] -script = ExtResource("5_06ud4") - -[sub_resource type="Resource" id="Resource_l78bb"] -script = ExtResource("2_qpe8d") -effect = SubResource("Resource_0kipv") -value = 10 -targeting_function = SubResource("Resource_l7ne0") - -[sub_resource type="Resource" id="Resource_j3owp"] -script = ExtResource("6_tktqq") -energy_cost = 1 - -[resource] -script = ExtResource("7_mwudb") -application_type = 1 -card_title = "Stress damage" -card_type = 0 -card_description = "Inflict 10 damage to all enemies and stress the targeted enemy by 10" -card_effects_data = Array[ExtResource("2_qpe8d")]([SubResource("Resource_erfad"), SubResource("Resource_l78bb")]) -energy_info = SubResource("Resource_j3owp") diff --git a/Cards/Resource/test_cards/Player/Card_SuperSlap.tres b/Cards/Resource/test_cards/Player/Card_SuperSlap.tres deleted file mode 100644 index f6ae461b..00000000 --- a/Cards/Resource/test_cards/Player/Card_SuperSlap.tres +++ /dev/null @@ -1,39 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=13 format=3 uid="uid://yc2ns5s0qask"] - -[ext_resource type="PackedScene" uid="uid://bbseovtwsgegg" path="res://Cards/Animation/Scene/Anim_Slap.tscn" id="1_0uyjv"] -[ext_resource type="Script" path="res://Cards/Animation/CastPosition/CastPos_AllTargets.gd" id="2_jfjgp"] -[ext_resource type="Script" path="res://Cards/Animation/CastAnimationData.gd" id="3_hhhei"] -[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="4_gehp1"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="5_ipfy3"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetAllEnemies.gd" id="6_kxvg4"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="7_hdjv3"] - -[sub_resource type="Resource" id="Resource_x0fd8"] -script = ExtResource("2_jfjgp") -offset = Vector2(0, 50) - -[sub_resource type="Resource" id="Resource_uhx7l"] -script = ExtResource("3_hhhei") -cast_animation_scene = ExtResource("1_0uyjv") -cast_position = SubResource("Resource_x0fd8") - -[sub_resource type="Resource" id="Resource_hsf7j"] -script = ExtResource("4_gehp1") - -[sub_resource type="Resource" id="Resource_bi1fs"] -script = ExtResource("6_kxvg4") - -[sub_resource type="Resource" id="Resource_5b3is"] -script = ExtResource("5_ipfy3") -effect = SubResource("Resource_hsf7j") -value = 2 -targeting_function = SubResource("Resource_bi1fs") -animation_data = SubResource("Resource_uhx7l") - -[resource] -script = ExtResource("7_hdjv3") -application_type = 1 -card_title = "Super Slap" -card_type = 0 -card_description = "Deal 2 damage to all targets." -card_effects_data = Array[ExtResource("5_ipfy3")]([SubResource("Resource_5b3is")]) diff --git a/Cards/Resource/test_cards/Player/Card_Vulnerability.tres b/Cards/Resource/test_cards/Player/Card_Vulnerability.tres deleted file mode 100644 index 60fa775b..00000000 --- a/Cards/Resource/test_cards/Player/Card_Vulnerability.tres +++ /dev/null @@ -1,50 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=14 format=3 uid="uid://b4kmg3lm0e45q"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_2b0xe"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Vulnerability.gd" id="2_hqs5s"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_owoau"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_ve2u8"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="5_mobt6"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="6_8akcd"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="7_s5svm"] - -[sub_resource type="Resource" id="Resource_5jitw"] -script = ExtResource("3_owoau") -permanent_add = 0 -permanent_multiply = 1.0 -temporary_add = -1 -temporary_multiply = 1.0 - -[sub_resource type="Resource" id="Resource_dx65m"] -script = ExtResource("2_hqs5s") -infinite_duration = false -status_turn_duration = 3 -status_power = 1.0 -status_modifier_base_value = SubResource("Resource_5jitw") - -[sub_resource type="Resource" id="Resource_ahy8v"] -script = ExtResource("1_2b0xe") -status_to_apply = SubResource("Resource_dx65m") - -[sub_resource type="Resource" id="Resource_op0nd"] -script = ExtResource("5_mobt6") - -[sub_resource type="Resource" id="Resource_8k1ut"] -script = ExtResource("4_ve2u8") -effect = SubResource("Resource_ahy8v") -value = 0 -targeting_function = SubResource("Resource_op0nd") - -[sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("6_8akcd") -energy_cost = 2 - -[resource] -script = ExtResource("7_s5svm") -application_type = 1 -card_title = "Vulnerable 1" -card_type = 0 -card_description = "Make targeted entity take one more damage when attacked for 3 turns" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("4_ve2u8")]([SubResource("Resource_8k1ut")]) -energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Player/Card_Weakness.tres b/Cards/Resource/test_cards/Player/Card_Weakness.tres deleted file mode 100644 index db2c750f..00000000 --- a/Cards/Resource/test_cards/Player/Card_Weakness.tres +++ /dev/null @@ -1,50 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=14 format=3 uid="uid://bobfsmcwcgsbb"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_t3ax7"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Weakness.gd" id="2_p22vg"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_l711h"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_28io2"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="5_1nrcc"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="6_2jpmt"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="7_d5yx2"] - -[sub_resource type="Resource" id="Resource_fppy1"] -script = ExtResource("3_l711h") -permanent_add = 0 -permanent_multiply = 1.0 -temporary_add = -1 -temporary_multiply = 1.0 - -[sub_resource type="Resource" id="Resource_o2ren"] -script = ExtResource("2_p22vg") -infinite_duration = false -status_turn_duration = 5 -status_power = 1.0 -status_modifier_base_value = SubResource("Resource_fppy1") - -[sub_resource type="Resource" id="Resource_i0g8f"] -script = ExtResource("1_t3ax7") -status_to_apply = SubResource("Resource_o2ren") - -[sub_resource type="Resource" id="Resource_dtnir"] -script = ExtResource("5_1nrcc") - -[sub_resource type="Resource" id="Resource_e1gpi"] -script = ExtResource("4_28io2") -effect = SubResource("Resource_i0g8f") -value = 0 -targeting_function = SubResource("Resource_dtnir") - -[sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("6_2jpmt") -energy_cost = 2 - -[resource] -script = ExtResource("7_d5yx2") -application_type = 1 -card_title = "Weakness" -card_type = 0 -card_description = "Targeted entity deals one less damage for 5 turns" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("4_28io2")]([SubResource("Resource_e1gpi")]) -energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Player/Card_buff_sooth.tres b/Cards/Resource/test_cards/Player/Card_buff_sooth.tres deleted file mode 100644 index 59def2d5..00000000 --- a/Cards/Resource/test_cards/Player/Card_buff_sooth.tres +++ /dev/null @@ -1,42 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=12 format=3 uid="uid://cuv4xnxuo5v4e"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_048dj"] -[ext_resource type="Script" path="res://Status/Buffs/Buff_Sooth.gd" id="2_wmqv4"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="3_lj874"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_ugr2k"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="4_xotqq"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_73bhc"] - -[sub_resource type="Resource" id="Resource_3cfuw"] -script = ExtResource("3_ugr2k") -permanent_add = 0 -permanent_multiply = 1.0 -temporary_add = 1 -temporary_multiply = 1.0 - -[sub_resource type="Resource" id="Resource_6mgrq"] -script = ExtResource("2_wmqv4") -infinite_duration = false -status_turn_duration = 5 -status_power = 1.0 -status_modifier_base_value = SubResource("Resource_3cfuw") - -[sub_resource type="Resource" id="Resource_ond7c"] -script = ExtResource("1_048dj") -status_to_apply = SubResource("Resource_6mgrq") - -[sub_resource type="Resource" id="Resource_3w608"] -script = ExtResource("4_xotqq") - -[sub_resource type="Resource" id="Resource_62w63"] -script = ExtResource("3_lj874") -effect = SubResource("Resource_ond7c") -value = 0 -targeting_function = SubResource("Resource_3w608") - -[resource] -script = ExtResource("5_73bhc") -application_type = 0 -card_title = "Buff Sooth" -card_description = "Player can sooth by 1 more for 5 turns" -card_effects_data = Array[ExtResource("3_lj874")]([SubResource("Resource_62w63")]) diff --git a/Cards/Resource/test_cards/Player/Card_damage_and_poison.tres b/Cards/Resource/test_cards/Player/Card_damage_and_poison.tres deleted file mode 100644 index c13f90ef..00000000 --- a/Cards/Resource/test_cards/Player/Card_damage_and_poison.tres +++ /dev/null @@ -1,67 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=21 format=3 uid="uid://3s4aet1ciesh"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_i1ilc"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_13rlh"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetingBase.gd" id="3_b1qwd"] -[ext_resource type="PackedScene" uid="uid://c13302ahcfpuy" path="res://Cards/Animation/Scene/Anim_Poison.tscn" id="4_kjin8"] -[ext_resource type="Script" path="res://Cards/Animation/CastPosition/CastPos_AllTargets.gd" id="5_30tnn"] -[ext_resource type="Script" path="res://Cards/Animation/CastAnimationData.gd" id="6_k1uko"] -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="7_a2c7t"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Poison.gd" id="8_a7e28"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="9_dfkln"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="10_xg3mu"] - -[sub_resource type="Resource" id="Resource_jtcab"] -script = ExtResource("1_i1ilc") - -[sub_resource type="Resource" id="Resource_ojuu2"] -script = ExtResource("3_b1qwd") - -[sub_resource type="Resource" id="Resource_73uy7"] -script = ExtResource("2_13rlh") -effect = SubResource("Resource_jtcab") -value = 1 -targeting_function = SubResource("Resource_ojuu2") - -[sub_resource type="Resource" id="Resource_g3aqa"] -script = ExtResource("5_30tnn") -offset = Vector2(0, 0) - -[sub_resource type="Resource" id="Resource_8bkbn"] -script = ExtResource("6_k1uko") -cast_animation_scene = ExtResource("4_kjin8") -cast_position = SubResource("Resource_g3aqa") - -[sub_resource type="Resource" id="Resource_nlhgr"] -script = ExtResource("8_a7e28") -infinite_duration = false -status_turn_duration = 2 -status_power = 1.0 - -[sub_resource type="Resource" id="Resource_qxsxr"] -script = ExtResource("7_a2c7t") -status_to_apply = SubResource("Resource_nlhgr") - -[sub_resource type="Resource" id="Resource_dso5d"] -script = ExtResource("3_b1qwd") - -[sub_resource type="Resource" id="Resource_tmm5r"] -script = ExtResource("2_13rlh") -effect = SubResource("Resource_qxsxr") -value = 0 -targeting_function = SubResource("Resource_dso5d") -animation_data = SubResource("Resource_8bkbn") - -[sub_resource type="Resource" id="Resource_noiey"] -script = ExtResource("9_dfkln") -energy_cost = 1 - -[resource] -script = ExtResource("10_xg3mu") -application_type = 1 -card_title = "Damage and poison" -card_type = 0 -card_description = "Deals 1 damage and applies 2 poison" -card_artist_name = "NULL" -card_effects_data = Array[ExtResource("2_13rlh")]([SubResource("Resource_73uy7"), SubResource("Resource_tmm5r")]) -energy_info = SubResource("Resource_noiey") diff --git a/Cards/Resource/test_cards/Player/Card_debuff_sooth.tres b/Cards/Resource/test_cards/Player/Card_debuff_sooth.tres deleted file mode 100644 index 526916bb..00000000 --- a/Cards/Resource/test_cards/Player/Card_debuff_sooth.tres +++ /dev/null @@ -1,42 +0,0 @@ -[gd_resource type="Resource" script_class="CardBase" load_steps=12 format=3 uid="uid://b8vwac1aeweiy"] - -[ext_resource type="Script" path="res://Cards/Effects/EffectApplyStatus.gd" id="1_s0fhw"] -[ext_resource type="Script" path="res://Status/Debuffs/Debuff_Sooth.gd" id="2_v0vvp"] -[ext_resource type="Script" path="res://Entity/Components/Stats/StatModifiers.gd" id="3_ssm1f"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="4_wtnve"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="5_y670f"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="6_5diek"] - -[sub_resource type="Resource" id="Resource_4tvm0"] -script = ExtResource("3_ssm1f") -permanent_add = 0 -permanent_multiply = 1.0 -temporary_add = -1 -temporary_multiply = 1.0 - -[sub_resource type="Resource" id="Resource_3fv80"] -script = ExtResource("2_v0vvp") -infinite_duration = false -status_turn_duration = 5 -status_power = 1.0 -status_modifier_base_value = SubResource("Resource_4tvm0") - -[sub_resource type="Resource" id="Resource_vrvdx"] -script = ExtResource("1_s0fhw") -status_to_apply = SubResource("Resource_3fv80") - -[sub_resource type="Resource" id="Resource_1dfso"] -script = ExtResource("5_y670f") - -[sub_resource type="Resource" id="Resource_6jvca"] -script = ExtResource("4_wtnve") -effect = SubResource("Resource_vrvdx") -value = 0 -targeting_function = SubResource("Resource_1dfso") - -[resource] -script = ExtResource("6_5diek") -application_type = 0 -card_title = "Debuff sooth" -card_description = "Debuff sooth of player by 1 for 5 turns" -card_effects_data = Array[ExtResource("4_wtnve")]([SubResource("Resource_6jvca")]) From 29660e5aa2983f76cea98ae4967a7d1aa20b3078 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:55:45 +0100 Subject: [PATCH 14/20] Change default enemy action tree with correct path --- Entity/Enemy/EnemyActionTree.gd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Entity/Enemy/EnemyActionTree.gd b/Entity/Enemy/EnemyActionTree.gd index 5b286b85..9c21a120 100644 --- a/Entity/Enemy/EnemyActionTree.gd +++ b/Entity/Enemy/EnemyActionTree.gd @@ -13,8 +13,8 @@ class_name EnemyActionTree extends Resource ## The default is an example using the [NextCardProbability] class, and alternating between damage and block ## This uses the path to the cards as a key @export var action_tree: Dictionary = { - "res://Cards/Resource/Card_Damage.tres": NextCardProbability.new(100, load("res://Cards/Resource/Card_Get_block.tres")), - "res://Cards/Resource/Card_Get_block.tres": NextCardProbability.new(100, load("res://Cards/Resource/Card_Damage.tres")) + "res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres" : NextCardProbability.new(100, load("res://Cards/Resource/Both/Card_Get_block.tres")), + "res://Cards/Resource/Both/Card_Get_block.tres": NextCardProbability.new(100, load("res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres")) } ## The last action that was played From 70117f2cc47d08fc7cbeb4f1c7af62eea00d03ac Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Thu, 26 Dec 2024 22:34:13 +0100 Subject: [PATCH 15/20] Add an enum to get the name of the enemy attack We do it this way instead of using Strings to avoid mistakes when building decks and writing strings by hand --- Cards/CardBase.gd | 4 ++++ Cards/Resource/Both/Card_Get_block.tres | 2 ++ Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres | 3 +++ Cards/Resource/test_cards/Card_EnemyAttack.tres | 1 + Cards/Resource/test_cards/Card_Energy.tres | 1 + Cards/Resource/test_cards/Card_PoisonRandom.tres | 1 + Cards/Resource/test_cards/Card_Strength.tres | 1 + Cards/Resource/test_cards/Card_Vulnerability.tres | 1 + Entity/Components/BehaviorComponent.gd | 5 +++++ Entity/Enemy/EnemyActionTree.gd | 12 ++++++------ Global/Global_Enums.gd | 5 +++++ 11 files changed, 30 insertions(+), 6 deletions(-) diff --git a/Cards/CardBase.gd b/Cards/CardBase.gd index c191cdce..38f748aa 100644 --- a/Cards/CardBase.gd +++ b/Cards/CardBase.gd @@ -20,6 +20,10 @@ class_name CardBase ## The name of the card @export var card_title: String = "NULL" +## The card name for the enemy, only used by enemies in their decks, cards exclusive to Player should not use this [br] +## See the [EnemyActionTree] to see the use of this +@export var enemy_card_name: GlobalEnums.EnemyAction + ## The art used on the card (ie the image at the top, not the layout of the card) @export var card_key_art: Texture2D = null diff --git a/Cards/Resource/Both/Card_Get_block.tres b/Cards/Resource/Both/Card_Get_block.tres index 3a09b416..2587d1d0 100644 --- a/Cards/Resource/Both/Card_Get_block.tres +++ b/Cards/Resource/Both/Card_Get_block.tres @@ -21,6 +21,8 @@ targeting_function = SubResource("Resource_0jk1u") script = ExtResource("1_f1j0k") application_type = 0 card_title = "Get Block" +enemy_card_name = 1 card_type = 0 card_description = "Get 5 Block" +card_artist_name = "NULL" card_effects_data = Array[ExtResource("2_up8rw")]([SubResource("Resource_4tqh2")]) diff --git a/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres b/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres index 62eb0230..f8368bf5 100644 --- a/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres +++ b/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres @@ -26,6 +26,9 @@ energy_cost = 2 script = ExtResource("5_mxn24") application_type = 0 card_title = "NULL" +enemy_card_name = 0 +card_type = 0 card_description = "NULL" +card_artist_name = "NULL" card_effects_data = Array[ExtResource("2_cag57")]([SubResource("Resource_2lb6r")]) energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Card_EnemyAttack.tres b/Cards/Resource/test_cards/Card_EnemyAttack.tres index 213f200d..5a862f49 100644 --- a/Cards/Resource/test_cards/Card_EnemyAttack.tres +++ b/Cards/Resource/test_cards/Card_EnemyAttack.tres @@ -11,6 +11,7 @@ energy_cost = 2 script = ExtResource("1_5s3qc") application_type = 1 card_title = "NULL" +enemy_card_name = 0 card_type = 0 card_description = "NULL" card_artist_name = "NULL" diff --git a/Cards/Resource/test_cards/Card_Energy.tres b/Cards/Resource/test_cards/Card_Energy.tres index e7a9fc80..14a91779 100644 --- a/Cards/Resource/test_cards/Card_Energy.tres +++ b/Cards/Resource/test_cards/Card_Energy.tres @@ -26,6 +26,7 @@ energy_cost = 2 script = ExtResource("3_opvsg") application_type = 0 card_title = "Gain 70 energy" +enemy_card_name = 0 card_type = 0 card_description = "Gain 70 energy" card_artist_name = "NULL" diff --git a/Cards/Resource/test_cards/Card_PoisonRandom.tres b/Cards/Resource/test_cards/Card_PoisonRandom.tres index b5e68e60..b0da782d 100644 --- a/Cards/Resource/test_cards/Card_PoisonRandom.tres +++ b/Cards/Resource/test_cards/Card_PoisonRandom.tres @@ -30,6 +30,7 @@ targeting_function = SubResource("Resource_j8krj") script = ExtResource("5_r13bp") application_type = 1 card_title = "Random poison" +enemy_card_name = 0 card_type = 0 card_description = "Apply poison randomly 3 times" card_artist_name = "NULL" diff --git a/Cards/Resource/test_cards/Card_Strength.tres b/Cards/Resource/test_cards/Card_Strength.tres index 1a600085..bb4f55b5 100644 --- a/Cards/Resource/test_cards/Card_Strength.tres +++ b/Cards/Resource/test_cards/Card_Strength.tres @@ -43,6 +43,7 @@ energy_cost = 2 script = ExtResource("5_e4pqm") application_type = 0 card_title = "Strength" +enemy_card_name = 0 card_type = 0 card_description = "Targeted entity deals one more damage for 2 turns" card_artist_name = "NULL" diff --git a/Cards/Resource/test_cards/Card_Vulnerability.tres b/Cards/Resource/test_cards/Card_Vulnerability.tres index 14cfe14b..087c0656 100644 --- a/Cards/Resource/test_cards/Card_Vulnerability.tres +++ b/Cards/Resource/test_cards/Card_Vulnerability.tres @@ -43,6 +43,7 @@ energy_cost = 2 script = ExtResource("7_ntxwk") application_type = 1 card_title = "Vulnerable 1" +enemy_card_name = 0 card_type = 0 card_description = "Make targeted entity take one more damage when attacked for 3 turns" card_artist_name = "NULL" diff --git a/Entity/Components/BehaviorComponent.gd b/Entity/Components/BehaviorComponent.gd index 530efd68..2d3ee236 100644 --- a/Entity/Components/BehaviorComponent.gd +++ b/Entity/Components/BehaviorComponent.gd @@ -12,6 +12,11 @@ class_name BehaviorComponent ## The attack set of the enemy @export var enemy_attack_tree: EnemyActionTree + +func _ready() -> void: + if enemy_attack_tree == null: + # give default action tree if no action tree is already set + enemy_attack_tree = EnemyActionTree.new() func get_attack(stress_component: StressComponent) -> CardBase: diff --git a/Entity/Enemy/EnemyActionTree.gd b/Entity/Enemy/EnemyActionTree.gd index 9c21a120..e5eea3f6 100644 --- a/Entity/Enemy/EnemyActionTree.gd +++ b/Entity/Enemy/EnemyActionTree.gd @@ -13,22 +13,22 @@ class_name EnemyActionTree extends Resource ## The default is an example using the [NextCardProbability] class, and alternating between damage and block ## This uses the path to the cards as a key @export var action_tree: Dictionary = { - "res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres" : NextCardProbability.new(100, load("res://Cards/Resource/Both/Card_Get_block.tres")), - "res://Cards/Resource/Both/Card_Get_block.tres": NextCardProbability.new(100, load("res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres")) + GlobalEnums.EnemyAction.BasicAttack : [NextCardProbability.new(100, load("res://Cards/Resource/Both/Card_Get_block.tres"))], + GlobalEnums.EnemyAction.GetBlock : [NextCardProbability.new(100, load("res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres"))] } ## The last action that was played -var last_chosen_action: CardBase = null +var last_chosen_action_name: GlobalEnums.EnemyAction ## Call to choose the next action given the previous action func choose_next_action() -> CardBase: var chosen_action: CardBase = _choose_next_action_inner() - last_chosen_action = chosen_action + last_chosen_action_name = chosen_action.enemy_card_name return chosen_action ## The actual choice function, the inner pattern is used to change [last_chosen_action] easily func _choose_next_action_inner() -> CardBase: - var possible_next_action: Array = action_tree[last_chosen_action] + var possible_next_action: Array = action_tree[last_chosen_action_name] # checking the total of the probabilities var total_probability: int = 0 for card_probability: NextCardProbability in possible_next_action: @@ -42,4 +42,4 @@ func _choose_next_action_inner() -> CardBase: else: probability_sum += card_probability.probability push_error("The next action choice for the enemy didn't find a suitable next action, returning default") - return load("res://Cards/Resource/Card_Damage.tres") + return load("res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres") diff --git a/Global/Global_Enums.gd b/Global/Global_Enums.gd index fb308437..44a2d00b 100644 --- a/Global/Global_Enums.gd +++ b/Global/Global_Enums.gd @@ -189,3 +189,8 @@ enum CardType { SKILL, POWER } + +enum EnemyAction { + BasicAttack, + GetBlock, +} From 37a62b2ca1ca0802134adb7c90ffc6921df5d037 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Thu, 26 Dec 2024 23:06:51 +0100 Subject: [PATCH 16/20] Fix tests --- Cards/Resource/Both/Card_Get_block.tres | 2 +- .../Enemy/Normal/Card_EnemyAttack.tres | 2 +- Entity/Components/BehaviorComponent.gd | 7 +--- Global/Global_Enums.gd | 2 +- Tests/test_death_handling.gd | 10 ++--- Tests/test_energy.gd | 4 +- Tests/test_health.gd | 30 +++++++-------- Tests/test_persistence.gd | 2 +- Tests/test_stats.gd | 38 +++++++++---------- Tests/test_stress.gd | 16 ++++---- 10 files changed, 54 insertions(+), 59 deletions(-) diff --git a/Cards/Resource/Both/Card_Get_block.tres b/Cards/Resource/Both/Card_Get_block.tres index 2587d1d0..0f538f31 100644 --- a/Cards/Resource/Both/Card_Get_block.tres +++ b/Cards/Resource/Both/Card_Get_block.tres @@ -21,7 +21,7 @@ targeting_function = SubResource("Resource_0jk1u") script = ExtResource("1_f1j0k") application_type = 0 card_title = "Get Block" -enemy_card_name = 1 +enemy_card_name = 0 card_type = 0 card_description = "Get 5 Block" card_artist_name = "NULL" diff --git a/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres b/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres index f8368bf5..f5b9e5a3 100644 --- a/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres +++ b/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres @@ -26,7 +26,7 @@ energy_cost = 2 script = ExtResource("5_mxn24") application_type = 0 card_title = "NULL" -enemy_card_name = 0 +enemy_card_name = 1 card_type = 0 card_description = "NULL" card_artist_name = "NULL" diff --git a/Entity/Components/BehaviorComponent.gd b/Entity/Components/BehaviorComponent.gd index 2d3ee236..498d37f5 100644 --- a/Entity/Components/BehaviorComponent.gd +++ b/Entity/Components/BehaviorComponent.gd @@ -3,12 +3,7 @@ class_name BehaviorComponent ## Controls the way enemies behave during a fight. ## ## TODO: right now this just holds a single attack. In the future, we can have this component control the AI decision making for the enemy. -## - - -## The attack that the enemy will do -@export var attack: CardBase = null -@export var overstress_attack: CardBase = null +## ## The attack set of the enemy @export var enemy_attack_tree: EnemyActionTree diff --git a/Global/Global_Enums.gd b/Global/Global_Enums.gd index 44a2d00b..ce78c151 100644 --- a/Global/Global_Enums.gd +++ b/Global/Global_Enums.gd @@ -191,6 +191,6 @@ enum CardType { } enum EnemyAction { - BasicAttack, GetBlock, + BasicAttack, } diff --git a/Tests/test_death_handling.gd b/Tests/test_death_handling.gd index 152bc8ba..9790eb78 100644 --- a/Tests/test_death_handling.gd +++ b/Tests/test_death_handling.gd @@ -82,7 +82,7 @@ func test_handle_enemy_deaths_all() -> void: func test_enemy_death_to_player_attack() -> void: _enemy_health_component._set_health(1) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") assert_eq(_enemy_list.size(), 2) card_damage.on_card_play(_player, _enemy) @@ -95,7 +95,7 @@ func test_enemy_death_to_player_attack() -> void: func test_all_enemy_death_to_player_attack_all() -> void: _enemy_health_component._set_health(1) _enemy_2_health_component._set_health(1) - var card_damage_all: CardBase = load("res://Cards/Resource/Test Cards/Card_DamageAllEnemies.tres") + var card_damage_all: CardBase = load("res://Cards/Resource/test_cards/Card_DamageAllEnemies.tres") assert_eq(_enemy_list.size(), 2) card_damage_all.on_card_play(_player, null) @@ -110,7 +110,7 @@ func test_all_enemy_death_to_player_attack_all() -> void: func test_enemy_death_to_poison() -> void: _enemy_health_component._set_health(1) - var card_poison: CardBase = load("res://Cards/Resource/Test Cards/Card_Poison.tres") + var card_poison: CardBase = load("res://Cards/Resource/test_cards/Card_Poison.tres") card_poison.on_card_play(_player, _enemy) assert_eq(_enemy_list.size(), 2) @@ -123,7 +123,7 @@ func test_enemy_death_to_poison() -> void: func test_enemy_death_to_expiring_poison() -> void: _enemy_health_component._set_health(1) - var card_poison: CardBase = load("res://Cards/Resource/Test Cards/Card_Poison.tres") + var card_poison: CardBase = load("res://Cards/Resource/test_cards/Card_Poison.tres") card_poison.on_card_play(_player, _enemy) _enemy.get_status_component().current_status[0].status_turn_duration = 1 @@ -139,7 +139,7 @@ func test_enemy_death_to_expiring_poison() -> void: func test_enemy_list_size_enemy_manager() -> void: _enemy_health_component._set_health(1) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") assert_eq(_enemy_list.size(), 2) assert_eq(EnemyManager.current_enemy_group.enemy_list.size(), 2) diff --git a/Tests/test_energy.gd b/Tests/test_energy.gd index 50d9fc2f..1216e509 100644 --- a/Tests/test_energy.gd +++ b/Tests/test_energy.gd @@ -12,14 +12,14 @@ func before_each() -> void: _player_energy_component.MAX_ENERGY = 4 func test_add_energy() -> void: - card = load("res://Cards/Resource/Test Cards/Card_Energy.tres") # adds 70 energy + card = load("res://Cards/Resource/test_cards/Card_Energy.tres") # adds 70 energy card.energy_info.energy_cost = 0 card.on_card_play(_player, _player) assert_eq(_player_energy_component.energy, 70) func test_using_energy() -> void: _player_energy_component.add_energy(10) - card = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + card = load("res://Cards/Resource/test_cards/Card_Damage.tres") card.energy_info.energy_cost = 7 card.on_card_play(PlayerManager.player, _enemy) diff --git a/Tests/test_health.gd b/Tests/test_health.gd index 14cd1859..27f5d559 100644 --- a/Tests/test_health.gd +++ b/Tests/test_health.gd @@ -94,7 +94,7 @@ func test_poison_status() -> void: # Test Card to Deal 2 damage to all enemies func test_card_damage_all() -> void: _enemy.get_party_component().set_party(_enemy_list ) - var card_damage_all: CardBase = load("res://Cards/Resource/Test Cards/Card_DamageAllEnemies.tres") + var card_damage_all: CardBase = load("res://Cards/Resource/test_cards/Card_DamageAllEnemies.tres") card_damage_all.on_card_play(_player, null) @@ -104,7 +104,7 @@ func test_card_damage_all() -> void: # Test Card to Deal 3 damage to an enemy func test_card_damage() -> void: - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.on_card_play(_player, _enemy) @@ -114,7 +114,7 @@ func test_card_damage() -> void: # Test Card to deal damage to enemy based on amount of player health lost func test_card_damage_health() -> void: _player.get_health_component()._set_health(90) - var card_damage_health: CardBase = load("res://Cards/Resource/Test Cards/Card_DamageHealth.tres") + var card_damage_health: CardBase = load("res://Cards/Resource/test_cards/Card_DamageHealth.tres") card_damage_health.on_card_play(_player, _enemy) @@ -123,7 +123,7 @@ func test_card_damage_health() -> void: # Test Card that applies 3 poison to enemy and does poison damage on enemy turn func test_card_poison() -> void: - var card_poison: CardBase = load("res://Cards/Resource/Test Cards/Card_Poison.tres") + var card_poison: CardBase = load("res://Cards/Resource/test_cards/Card_Poison.tres") assert_eq(_enemy_status_component.current_status.size(), 0) card_poison.on_card_play(_player, _enemy) @@ -141,7 +141,7 @@ func test_card_poison() -> void: # Test Card that deals 1 damage and applies 2 poison to enemy and does poison damage on enemy turn func test_card_damage_and_poison() -> void: - var card_damage_and_poison: CardBase = load("res://Cards/Resource/Test Cards/Card_damage_and_poison.tres") + var card_damage_and_poison: CardBase = load("res://Cards/Resource/test_cards/Card_damage_and_poison.tres") assert_eq(_enemy_status_component.current_status.size(), 0) card_damage_and_poison.on_card_play(_player, _enemy) @@ -160,7 +160,7 @@ func test_card_damage_and_poison() -> void: # Test Card that heals one HP to player func test_card_heal() -> void: - var card_heal: CardBase = load("res://Cards/Resource/Test Cards/Card_Heal.tres") + var card_heal: CardBase = load("res://Cards/Resource/test_cards/Card_Heal.tres") _player_health_component._set_health(95) card_heal.on_card_play(_player, _player) @@ -168,8 +168,8 @@ func test_card_heal() -> void: assert_eq(_player_health_component.current_health, 96) func test_card_heal_with_strength_buff() -> void: - var card_heal: CardBase = load("res://Cards/Resource/Test Cards/Card_Heal.tres") - var buff: CardBase = load("res://Cards/Resource/Test Cards/Card_Strength.tres") + var card_heal: CardBase = load("res://Cards/Resource/test_cards/Card_Heal.tres") + var buff: CardBase = load("res://Cards/Resource/test_cards/Card_Strength.tres") StatModifiers.ready_card_modifier(buff) _player_health_component._set_health(90) @@ -180,8 +180,8 @@ func test_card_heal_with_strength_buff() -> void: assert_eq(_player_health_component.current_health, 91) func test_card_heal_with_heal_buff() -> void: - var card_heal: CardBase = load("res://Cards/Resource/Test Cards/Card_Heal.tres") - var buff: CardBase = load("res://Cards/Resource/Test Cards/Card_Buff_healing.tres") + var card_heal: CardBase = load("res://Cards/Resource/test_cards/Card_Heal.tres") + var buff: CardBase = load("res://Cards/Resource/test_cards/Card_Buff_healing.tres") StatModifiers.ready_card_modifier(buff) _player_health_component._set_health(90) @@ -194,8 +194,8 @@ func test_card_heal_with_heal_buff() -> void: func test_card_heal_with_heal_debuff() -> void: - var card_heal: CardBase = load("res://Cards/Resource/Test Cards/Card_Heal.tres") - var debuff: CardBase = load("res://Cards/Resource/Test Cards/Card_Debuff_healing.tres") + var card_heal: CardBase = load("res://Cards/Resource/test_cards/Card_Heal.tres") + var debuff: CardBase = load("res://Cards/Resource/test_cards/Card_Debuff_healing.tres") StatModifiers.ready_card_modifier(debuff) _player_health_component._set_health(90) @@ -208,7 +208,7 @@ func test_card_heal_with_heal_debuff() -> void: # Test card that deals 10 damage to every entity (player and enemies) func test_card_damage_everything() -> void: - var card_damage_everything: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage_EVERYTHING.tres") + var card_damage_everything: CardBase = load("res://Cards/Resource/test_cards/Card_Damage_EVERYTHING.tres") card_damage_everything.on_card_play(_player, null) assert_eq(_player_health_component.current_health, 90) @@ -218,7 +218,7 @@ func test_card_damage_everything() -> void: #Apply 3 poison effect randomly, each with 3 turns func test_card_random_poison() -> void: - var card_random_poison: CardBase = load("res://Cards/Resource/Test Cards/Card_PoisonRandom.tres") + var card_random_poison: CardBase = load("res://Cards/Resource/test_cards/Card_PoisonRandom.tres") card_random_poison.on_card_play(_player, null) @@ -235,7 +235,7 @@ func test_card_random_poison() -> void: # Deal 6 damage to all enemies func test_card_sweep() -> void: - var card_fauna_sweep: CardBase = load("res://Cards/Resource/Card_Sweep.tres") + var card_fauna_sweep: CardBase = load("res://Cards/Resource/Player/Card_Sweep.tres") card_fauna_sweep.on_card_play(_player, _enemy) diff --git a/Tests/test_persistence.gd b/Tests/test_persistence.gd index f13c4220..f2d29b6e 100644 --- a/Tests/test_persistence.gd +++ b/Tests/test_persistence.gd @@ -39,7 +39,7 @@ func test_persist_strength_status() -> void: strength_status.status_modifier_base_value = stat_modifer _player.get_status_component().add_status(strength_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 2 card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 96) diff --git a/Tests/test_stats.gd b/Tests/test_stats.gd index 38a6ff24..a91c288e 100644 --- a/Tests/test_stats.gd +++ b/Tests/test_stats.gd @@ -36,20 +36,20 @@ func test_strength_status() -> void: strength_status.status_modifier_base_value = stat_modifer _player.get_status_component().add_status(strength_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 50 # modified for the test card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 49) func test_strength_card() -> void: - var card_strength: CardBase = load("res://Cards/Resource/Test Cards/Card_Strength.tres") + var card_strength: CardBase = load("res://Cards/Resource/test_cards/Card_Strength.tres") StatModifiers.ready_card_modifier(card_strength) card_strength.on_card_play(_player, _player) assert_is(_player.get_status_component().current_status[0], Buff_Strength) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 3 card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 96) @@ -65,20 +65,20 @@ func test_weakness_status() -> void: weakness_status.status_modifier_base_value = stat_modifer _player.get_status_component().add_status(weakness_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 50 # modified for the test card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 51) func test_weakness_card() -> void: - var card_weakness: CardBase = load("res://Cards/Resource/Test Cards/Card_Weakness.tres") + var card_weakness: CardBase = load("res://Cards/Resource/test_cards/Card_Weakness.tres") StatModifiers.ready_card_modifier(card_weakness) card_weakness.on_card_play(_player, _player) assert_is(_player.get_status_component().current_status[0], Debuff_Weakness) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 3 card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 98) @@ -95,20 +95,20 @@ func test_vulnerability_status() -> void: _enemy.get_status_component().add_status(vulnerability_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 50 # modified for the test card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 49) func test_vulnerability_card() -> void: - var card_vulnerability: CardBase = load("res://Cards/Resource/Test Cards/Card_Vulnerability.tres") + var card_vulnerability: CardBase = load("res://Cards/Resource/test_cards/Card_Vulnerability.tres") StatModifiers.ready_card_modifier(card_vulnerability) card_vulnerability.on_card_play(_player, _enemy) assert_is(_enemy.get_status_component().current_status[0], Debuff_Vulnerability) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 3 # due to the caching of Card_Damage.tres because we modified the value to be 50 in a previous test we modify it back to 3 card_damage.on_card_play(_player, _enemy) @@ -140,7 +140,7 @@ func test_multiple_status_modifying_stats() -> void: vulnerability_status.status_modifier_base_value = stat_modifer_vuln _enemy.get_status_component().add_status(vulnerability_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 50 # modified for the test card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 49) @@ -158,7 +158,7 @@ func test_strength_multiplier() -> void: strength_status.status_modifier_base_value = stat_modifer _player.get_status_component().add_status(strength_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 50 # modified for the test card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 25) @@ -174,7 +174,7 @@ func test_remove_strength() -> void: strength_status.status_modifier_base_value = stat_modifer _player.get_status_component().add_status(strength_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 3 card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 96) @@ -198,7 +198,7 @@ func test_remove_weakness() -> void: weakness_status.status_modifier_base_value = stat_modifer _player.get_status_component().add_status(weakness_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 98) # 100 (base health) - (3 (base damage) - 1 (weakness)) @@ -221,7 +221,7 @@ func test_remove_vulnerability() -> void: vulnerability_status.status_modifier_base_value = stat_modifer _enemy.get_status_component().add_status(vulnerability_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 96) # 100 (base health) - (3 (base damage) + 1 (vulnerability)) @@ -260,7 +260,7 @@ func test_remove_multiple_status() -> void: vulnerability_status.status_modifier_base_value = stat_modifer_vuln _enemy.get_status_component().add_status(vulnerability_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 96) # final health : 100 (base health) - (3 (base damage) + 1 (strength) - 1 (weakness) + 1 (vulnerability)) @@ -301,7 +301,7 @@ func test_reset_modifier_dict_temp_to_default() -> void: vulnerability_status.status_modifier_base_value = stat_modifer_vuln _enemy.get_status_component().add_status(vulnerability_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 96) # final health : 100 (base health) - (3 (base damage) + 1 (strength) - 1 (weakness) + 1 (vulnerability)) @@ -324,7 +324,7 @@ func test_remove_strength_multiplier() -> void: strength_status.status_modifier_base_value = stat_modifer _player.get_status_component().add_status(strength_status, _player) - var card_damage: CardBase = load("res://Cards/Resource/Test Cards/Card_Damage.tres") + var card_damage: CardBase = load("res://Cards/Resource/test_cards/Card_Damage.tres") card_damage.card_effects_data[0].value = 10 # modified for the test card_damage.on_card_play(_player, _enemy) assert_eq(_enemy_health_component.current_health, 85) @@ -356,14 +356,14 @@ func test_buff_poison_duration_status() -> void: func test_buff_poison_duration_card() -> void: - var card_buff_poison_duration: CardBase = load("res://Cards/Resource/Test Cards/Card_Buff_Poison_Duration.tres") + var card_buff_poison_duration: CardBase = load("res://Cards/Resource/test_cards/Card_Buff_Poison_Duration.tres") # buff duration by 2 StatModifiers.ready_card_modifier(card_buff_poison_duration) card_buff_poison_duration.on_card_play(_player, _player) assert_is(_player.get_status_component().current_status[0], Buff_Poison_Duration) - var card_poison: CardBase = load("res://Cards/Resource/Test Cards/Card_Poison.tres") + var card_poison: CardBase = load("res://Cards/Resource/test_cards/Card_Poison.tres") card_poison.on_card_play(_player, _enemy) assert_eq(_enemy.get_status_component().current_status.size(), 1) assert_eq(_enemy.get_status_component().current_status[0].status_turn_duration, 5) diff --git a/Tests/test_stress.gd b/Tests/test_stress.gd index c8250df0..3e6afed2 100644 --- a/Tests/test_stress.gd +++ b/Tests/test_stress.gd @@ -17,41 +17,41 @@ func test_stress_generation() -> void: func test_stress_card() -> void: var previous_stress: int = _enemy_stress_component.current_stress - var card_stress: CardBase = load("res://Cards/Resource/Test Cards/Card_Stress_Damage.tres") + var card_stress: CardBase = load("res://Cards/Resource/test_cards/Card_Stress_Damage.tres") card_stress.on_card_play(_player, _enemy) assert_eq(_enemy_stress_component.current_stress, previous_stress + 10) func test_sooth_card() -> void: var previous_stress: int = _enemy_stress_component.current_stress - var card_sooth: CardBase = load("res://Cards/Resource/Card_HeartHands.tres") + var card_sooth: CardBase = load("res://Cards/Resource/Player/Card_HeartHands.tres") card_sooth.on_card_play(_player, _enemy) assert_eq(_enemy_stress_component.current_stress, previous_stress - 8) func test_sooth_buff() -> void: var previous_stress: int = _enemy_stress_component.current_stress - var buff_sooth: CardBase = load("res://Cards/Resource/Test Cards/Card_buff_sooth.tres") + var buff_sooth: CardBase = load("res://Cards/Resource/test_cards/Card_buff_sooth.tres") StatModifiers.ready_card_modifier(buff_sooth) buff_sooth.on_card_play(_player, _player) - var card_sooth: CardBase = load("res://Cards/Resource/Card_HeartHands.tres") + var card_sooth: CardBase = load("res://Cards/Resource/Player/Card_HeartHands.tres") card_sooth.on_card_play(_player, _enemy) assert_eq(_enemy_stress_component.current_stress, previous_stress - 9) func test_sooth_debuff() -> void: var previous_stress: int = _enemy_stress_component.current_stress - var debuff_sooth: CardBase = load("res://Cards/Resource/Test Cards/Card_debuff_sooth.tres") + var debuff_sooth: CardBase = load("res://Cards/Resource/test_cards/Card_debuff_sooth.tres") StatModifiers.ready_card_modifier(debuff_sooth) debuff_sooth.on_card_play(_player, _player) - var card_sooth: CardBase = load("res://Cards/Resource/Card_HeartHands.tres") + var card_sooth: CardBase = load("res://Cards/Resource/Player/Card_HeartHands.tres") card_sooth.on_card_play(_player, _enemy) assert_eq(_enemy_stress_component.current_stress, previous_stress - 7) func test_enemy_stays_soothed() -> void: _enemy_stress_component.current_stress = 2 - var card_sooth: CardBase = load("res://Cards/Resource/Card_HeartHands.tres") + var card_sooth: CardBase = load("res://Cards/Resource/Player/Card_HeartHands.tres") card_sooth.on_card_play(_player, _enemy) assert_eq(_enemy_stress_component.current_stress, 0) _enemy_stress_component.on_turn_start() @@ -60,7 +60,7 @@ func test_enemy_stays_soothed() -> void: func test_enemy_overstress() -> void: _enemy_stress_component.current_stress = 75 # max stress is 80 - var card_stress: CardBase = load("res://Cards/Resource/Test Cards/Card_Stress_Damage.tres") + var card_stress: CardBase = load("res://Cards/Resource/test_cards/Card_Stress_Damage.tres") card_stress.on_card_play(_player, _enemy) assert_eq(_enemy_stress_component.current_stress, 80) assert_true(_enemy_stress_component.has_hit_overstress) From 10d9558aaffc426d59785f522ab0e81d388230ae Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Fri, 27 Dec 2024 18:34:59 +0100 Subject: [PATCH 17/20] Change EnemyActionTree dict to use string as key instead of enum --- Cards/CardBase.gd | 2 +- Cards/Resource/Both/Card_Get_block.tres | 2 +- ...nemyAttack.tres => Card_Basic_Attack.tres} | 24 +++++++++---------- Cards/Resource/test_cards/Card_Energy.tres | 2 +- .../test_cards/Card_PoisonRandom.tres | 2 +- Cards/Resource/test_cards/Card_Strength.tres | 2 +- .../test_cards/Card_Vulnerability.tres | 2 +- Entity/Enemy/EnemyActionTree.gd | 11 +++++---- Entity/Enemy/EnemyScene/Enemy.tscn | 4 +--- Global/Global_Enums.gd | 5 ---- 10 files changed, 26 insertions(+), 30 deletions(-) rename Cards/Resource/Enemy/Normal/{Card_EnemyAttack.tres => Card_Basic_Attack.tres} (73%) diff --git a/Cards/CardBase.gd b/Cards/CardBase.gd index 38f748aa..29eb314b 100644 --- a/Cards/CardBase.gd +++ b/Cards/CardBase.gd @@ -22,7 +22,7 @@ class_name CardBase ## The card name for the enemy, only used by enemies in their decks, cards exclusive to Player should not use this [br] ## See the [EnemyActionTree] to see the use of this -@export var enemy_card_name: GlobalEnums.EnemyAction +@export var enemy_card_name: String = "NULL" ## The art used on the card (ie the image at the top, not the layout of the card) @export var card_key_art: Texture2D = null diff --git a/Cards/Resource/Both/Card_Get_block.tres b/Cards/Resource/Both/Card_Get_block.tres index 0f538f31..5cc1a721 100644 --- a/Cards/Resource/Both/Card_Get_block.tres +++ b/Cards/Resource/Both/Card_Get_block.tres @@ -21,7 +21,7 @@ targeting_function = SubResource("Resource_0jk1u") script = ExtResource("1_f1j0k") application_type = 0 card_title = "Get Block" -enemy_card_name = 0 +enemy_card_name = "Get_Block" card_type = 0 card_description = "Get 5 Block" card_artist_name = "NULL" diff --git a/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres b/Cards/Resource/Enemy/Normal/Card_Basic_Attack.tres similarity index 73% rename from Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres rename to Cards/Resource/Enemy/Normal/Card_Basic_Attack.tres index f5b9e5a3..98080b12 100644 --- a/Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres +++ b/Cards/Resource/Enemy/Normal/Card_Basic_Attack.tres @@ -1,34 +1,34 @@ [gd_resource type="Resource" script_class="CardBase" load_steps=10 format=3 uid="uid://bsrdu33ukb1ym"] -[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_wynd3"] -[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_cag57"] -[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_t1un7"] -[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_m8hst"] -[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_mxn24"] +[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_06h88"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_pkj5v"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_jcsa5"] +[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_gdqys"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_dg36i"] [sub_resource type="Resource" id="Resource_0buo4"] -script = ExtResource("1_wynd3") +script = ExtResource("1_06h88") [sub_resource type="Resource" id="Resource_bk02b"] -script = ExtResource("3_t1un7") +script = ExtResource("3_jcsa5") [sub_resource type="Resource" id="Resource_2lb6r"] -script = ExtResource("2_cag57") +script = ExtResource("2_pkj5v") effect = SubResource("Resource_0buo4") value = 1 targeting_function = SubResource("Resource_bk02b") [sub_resource type="Resource" id="Resource_1hn6q"] -script = ExtResource("4_m8hst") +script = ExtResource("4_gdqys") energy_cost = 2 [resource] -script = ExtResource("5_mxn24") +script = ExtResource("5_dg36i") application_type = 0 card_title = "NULL" -enemy_card_name = 1 +enemy_card_name = "Basic_Attack" card_type = 0 card_description = "NULL" card_artist_name = "NULL" -card_effects_data = Array[ExtResource("2_cag57")]([SubResource("Resource_2lb6r")]) +card_effects_data = Array[ExtResource("2_pkj5v")]([SubResource("Resource_2lb6r")]) energy_info = SubResource("Resource_1hn6q") diff --git a/Cards/Resource/test_cards/Card_Energy.tres b/Cards/Resource/test_cards/Card_Energy.tres index 14a91779..ad1675c4 100644 --- a/Cards/Resource/test_cards/Card_Energy.tres +++ b/Cards/Resource/test_cards/Card_Energy.tres @@ -26,7 +26,7 @@ energy_cost = 2 script = ExtResource("3_opvsg") application_type = 0 card_title = "Gain 70 energy" -enemy_card_name = 0 +enemy_card_name = "NULL" card_type = 0 card_description = "Gain 70 energy" card_artist_name = "NULL" diff --git a/Cards/Resource/test_cards/Card_PoisonRandom.tres b/Cards/Resource/test_cards/Card_PoisonRandom.tres index b0da782d..e1bcc3d9 100644 --- a/Cards/Resource/test_cards/Card_PoisonRandom.tres +++ b/Cards/Resource/test_cards/Card_PoisonRandom.tres @@ -30,7 +30,7 @@ targeting_function = SubResource("Resource_j8krj") script = ExtResource("5_r13bp") application_type = 1 card_title = "Random poison" -enemy_card_name = 0 +enemy_card_name = "NULL" card_type = 0 card_description = "Apply poison randomly 3 times" card_artist_name = "NULL" diff --git a/Cards/Resource/test_cards/Card_Strength.tres b/Cards/Resource/test_cards/Card_Strength.tres index bb4f55b5..e29f13ea 100644 --- a/Cards/Resource/test_cards/Card_Strength.tres +++ b/Cards/Resource/test_cards/Card_Strength.tres @@ -43,7 +43,7 @@ energy_cost = 2 script = ExtResource("5_e4pqm") application_type = 0 card_title = "Strength" -enemy_card_name = 0 +enemy_card_name = "NULL" card_type = 0 card_description = "Targeted entity deals one more damage for 2 turns" card_artist_name = "NULL" diff --git a/Cards/Resource/test_cards/Card_Vulnerability.tres b/Cards/Resource/test_cards/Card_Vulnerability.tres index 087c0656..65770b18 100644 --- a/Cards/Resource/test_cards/Card_Vulnerability.tres +++ b/Cards/Resource/test_cards/Card_Vulnerability.tres @@ -43,7 +43,7 @@ energy_cost = 2 script = ExtResource("7_ntxwk") application_type = 1 card_title = "Vulnerable 1" -enemy_card_name = 0 +enemy_card_name = "NULL" card_type = 0 card_description = "Make targeted entity take one more damage when attacked for 3 turns" card_artist_name = "NULL" diff --git a/Entity/Enemy/EnemyActionTree.gd b/Entity/Enemy/EnemyActionTree.gd index e5eea3f6..0ba32bdf 100644 --- a/Entity/Enemy/EnemyActionTree.gd +++ b/Entity/Enemy/EnemyActionTree.gd @@ -13,12 +13,15 @@ class_name EnemyActionTree extends Resource ## The default is an example using the [NextCardProbability] class, and alternating between damage and block ## This uses the path to the cards as a key @export var action_tree: Dictionary = { - GlobalEnums.EnemyAction.BasicAttack : [NextCardProbability.new(100, load("res://Cards/Resource/Both/Card_Get_block.tres"))], - GlobalEnums.EnemyAction.GetBlock : [NextCardProbability.new(100, load("res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres"))] + "Basic_Attack" : [NextCardProbability.new(100, load("res://Cards/Resource/Both/Card_Get_block.tres"))], + "Get_Block" : [NextCardProbability.new(100, load("res://Cards/Resource/Enemy/Normal/Card_Basic_Attack.tres"))] } ## The last action that was played -var last_chosen_action_name: GlobalEnums.EnemyAction +var last_chosen_action_name: String + +func _init() -> void: + last_chosen_action_name = action_tree.keys()[1] ## Call to choose the next action given the previous action func choose_next_action() -> CardBase: @@ -42,4 +45,4 @@ func _choose_next_action_inner() -> CardBase: else: probability_sum += card_probability.probability push_error("The next action choice for the enemy didn't find a suitable next action, returning default") - return load("res://Cards/Resource/Enemy/Normal/Card_EnemyAttack.tres") + return load("res://Cards/Resource/Enemy/Normal/Card_Basic_Attack.tres") diff --git a/Entity/Enemy/EnemyScene/Enemy.tscn b/Entity/Enemy/EnemyScene/Enemy.tscn index 9e3660d5..ce37f4c6 100644 --- a/Entity/Enemy/EnemyScene/Enemy.tscn +++ b/Entity/Enemy/EnemyScene/Enemy.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://bpgsmfprnm2kk"] +[gd_scene load_steps=15 format=3 uid="uid://bpgsmfprnm2kk"] [ext_resource type="Script" path="res://Entity/Enemy/Enemy.gd" id="1_ya6nf"] [ext_resource type="Script" path="res://Entity/Components/StatComponent.gd" id="2_twygh"] @@ -10,7 +10,6 @@ [ext_resource type="Script" path="res://UI/StressLabel.gd" id="8_w2u2o"] [ext_resource type="Script" path="res://Entity/Components/PartyComponent.gd" id="8_yr066"] [ext_resource type="Script" path="res://Entity/Components/BehaviorComponent.gd" id="9_kvor6"] -[ext_resource type="Resource" uid="uid://bsrdu33ukb1ym" path="res://Cards/Resource/test_cards/Card_EnemyAttack.tres" id="10_l5325"] [ext_resource type="Script" path="res://Entity/Components/StressComponent.gd" id="11_qf75g"] [ext_resource type="PackedScene" uid="uid://dbidy5j4uyopc" path="res://Entity/Components/block_display.tscn" id="13_u3jb7"] @@ -72,7 +71,6 @@ script = ExtResource("8_yr066") [node name="BehaviorComponent" type="Node" parent="."] script = ExtResource("9_kvor6") -attack = ExtResource("10_l5325") [node name="StressComponent" type="Node" parent="."] script = ExtResource("11_qf75g") diff --git a/Global/Global_Enums.gd b/Global/Global_Enums.gd index ce78c151..fb308437 100644 --- a/Global/Global_Enums.gd +++ b/Global/Global_Enums.gd @@ -189,8 +189,3 @@ enum CardType { SKILL, POWER } - -enum EnemyAction { - GetBlock, - BasicAttack, -} From 2f538e8cb4131e247dba45640550686f231ede77 Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Fri, 27 Dec 2024 21:50:59 +0100 Subject: [PATCH 18/20] Add two new cards and an action tree to the golden cauldron --- Cards/Resource/Both/Card_Big_Block.tres | 28 +++++++++++ .../Resource/Both/Card_Damage_EVERYTHING.tres | 2 + .../Enemy/Normal/Card_Block_And_Attack.tres | 48 +++++++++++++++++++ .../golden_cauldron_action_tree.tres | 23 +++++++++ Entity/Enemy/EnemyScene/golden_cauldron.tscn | 6 ++- 5 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 Cards/Resource/Both/Card_Big_Block.tres create mode 100644 Cards/Resource/Enemy/Normal/Card_Block_And_Attack.tres create mode 100644 Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres diff --git a/Cards/Resource/Both/Card_Big_Block.tres b/Cards/Resource/Both/Card_Big_Block.tres new file mode 100644 index 00000000..b0c12916 --- /dev/null +++ b/Cards/Resource/Both/Card_Big_Block.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" script_class="CardBase" load_steps=8 format=3 uid="uid://dluk3gyluaxe6"] + +[ext_resource type="Script" path="res://Cards/Effects/EffectAddBlock.gd" id="1_2ga3f"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="1_f1j0k"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_up8rw"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetSelf.gd" id="3_c28ln"] + +[sub_resource type="Resource" id="Resource_1hvmi"] +script = ExtResource("1_2ga3f") + +[sub_resource type="Resource" id="Resource_0jk1u"] +script = ExtResource("3_c28ln") + +[sub_resource type="Resource" id="Resource_4tqh2"] +script = ExtResource("2_up8rw") +effect = SubResource("Resource_1hvmi") +value = 15 +targeting_function = SubResource("Resource_0jk1u") + +[resource] +script = ExtResource("1_f1j0k") +application_type = 0 +card_title = "Get Block" +enemy_card_name = "Big_Block" +card_type = 0 +card_description = "Get 15 Block" +card_artist_name = "NULL" +card_effects_data = Array[ExtResource("2_up8rw")]([SubResource("Resource_4tqh2")]) diff --git a/Cards/Resource/Both/Card_Damage_EVERYTHING.tres b/Cards/Resource/Both/Card_Damage_EVERYTHING.tres index 992c9cda..177a469f 100644 --- a/Cards/Resource/Both/Card_Damage_EVERYTHING.tres +++ b/Cards/Resource/Both/Card_Damage_EVERYTHING.tres @@ -26,7 +26,9 @@ energy_cost = 2 script = ExtResource("1_lia0m") application_type = 2 card_title = "Damage EVERYTHING" +enemy_card_name = "NULL" card_type = 0 card_description = "Deal 10 to EVERYTHING" +card_artist_name = "NULL" card_effects_data = Array[ExtResource("2_581pa")]([SubResource("Resource_4ktkc")]) energy_info = SubResource("Resource_fw3pq") diff --git a/Cards/Resource/Enemy/Normal/Card_Block_And_Attack.tres b/Cards/Resource/Enemy/Normal/Card_Block_And_Attack.tres new file mode 100644 index 00000000..cfeb3d4d --- /dev/null +++ b/Cards/Resource/Enemy/Normal/Card_Block_And_Attack.tres @@ -0,0 +1,48 @@ +[gd_resource type="Resource" script_class="CardBase" load_steps=15 format=3 uid="uid://bi101t4e16eyn"] + +[ext_resource type="Script" path="res://Cards/Effects/EffectDamage.gd" id="1_06h88"] +[ext_resource type="Script" path="res://Cards/Effects/EffectAddBlock.gd" id="1_ruhyb"] +[ext_resource type="Script" path="res://Cards/Effects/EffectData.gd" id="2_pkj5v"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetSelf.gd" id="3_354ej"] +[ext_resource type="Script" path="res://Cards/Targeting/TargetPlayer.gd" id="3_jcsa5"] +[ext_resource type="Script" path="res://Cards/EnergyData.gd" id="4_gdqys"] +[ext_resource type="Script" path="res://Cards/CardBase.gd" id="5_dg36i"] + +[sub_resource type="Resource" id="Resource_ss6ls"] +script = ExtResource("1_ruhyb") + +[sub_resource type="Resource" id="Resource_cyyn5"] +script = ExtResource("3_354ej") + +[sub_resource type="Resource" id="Resource_alrab"] +script = ExtResource("2_pkj5v") +effect = SubResource("Resource_ss6ls") +value = 5 +targeting_function = SubResource("Resource_cyyn5") + +[sub_resource type="Resource" id="Resource_0buo4"] +script = ExtResource("1_06h88") + +[sub_resource type="Resource" id="Resource_bk02b"] +script = ExtResource("3_jcsa5") + +[sub_resource type="Resource" id="Resource_2lb6r"] +script = ExtResource("2_pkj5v") +effect = SubResource("Resource_0buo4") +value = 3 +targeting_function = SubResource("Resource_bk02b") + +[sub_resource type="Resource" id="Resource_1hn6q"] +script = ExtResource("4_gdqys") +energy_cost = 2 + +[resource] +script = ExtResource("5_dg36i") +application_type = 2 +card_title = "NULL" +enemy_card_name = "Block_And_Attack" +card_type = 0 +card_description = "NULL" +card_artist_name = "NULL" +card_effects_data = Array[ExtResource("2_pkj5v")]([SubResource("Resource_alrab"), SubResource("Resource_2lb6r")]) +energy_info = SubResource("Resource_1hn6q") diff --git a/Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres b/Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres new file mode 100644 index 00000000..4871b1c7 --- /dev/null +++ b/Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres @@ -0,0 +1,23 @@ +[gd_resource type="Resource" script_class="EnemyActionTree" load_steps=7 format=3 uid="uid://bge5wqhr8jgj0"] + +[ext_resource type="Resource" uid="uid://bi101t4e16eyn" path="res://Cards/Resource/Enemy/Normal/Card_Block_And_Attack.tres" id="1_7ay63"] +[ext_resource type="Script" path="res://Entity/Enemy/EnemyActionTree.gd" id="1_yj3at"] +[ext_resource type="Script" path="res://Entity/Enemy/NextCardProbability.gd" id="2_5h3sb"] +[ext_resource type="Resource" uid="uid://dluk3gyluaxe6" path="res://Cards/Resource/Both/Card_Big_Block.tres" id="3_dpwwb"] + +[sub_resource type="Resource" id="Resource_io36s"] +script = ExtResource("2_5h3sb") +probability = 100 +card = ExtResource("1_7ay63") + +[sub_resource type="Resource" id="Resource_2cubn"] +script = ExtResource("2_5h3sb") +probability = 100 +card = ExtResource("3_dpwwb") + +[resource] +script = ExtResource("1_yj3at") +action_tree = { +"Big_Block": SubResource("Resource_io36s"), +"Block_And_Attack": SubResource("Resource_2cubn") +} diff --git a/Entity/Enemy/EnemyScene/golden_cauldron.tscn b/Entity/Enemy/EnemyScene/golden_cauldron.tscn index 6b171467..6622ab1e 100644 --- a/Entity/Enemy/EnemyScene/golden_cauldron.tscn +++ b/Entity/Enemy/EnemyScene/golden_cauldron.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://7hs1nfyh7mj4"] +[gd_scene load_steps=4 format=3 uid="uid://7hs1nfyh7mj4"] [ext_resource type="PackedScene" uid="uid://bpgsmfprnm2kk" path="res://Entity/Enemy/EnemyScene/Enemy.tscn" id="1_kje8b"] [ext_resource type="Texture2D" uid="uid://dvr6ky4vqv4lf" path="res://Art/Enemies/golden_cauldron-finished.png" id="2_nr485"] +[ext_resource type="Resource" uid="uid://bge5wqhr8jgj0" path="res://Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres" id="3_s8e6v"] [node name="Enemy" instance=ExtResource("1_kje8b")] enemy_name = 10 @@ -22,3 +23,6 @@ offset_bottom = -313.0 [node name="StressLabel" parent="." index="7"] offset_top = -411.0 offset_bottom = -372.0 + +[node name="BehaviorComponent" parent="." index="9"] +enemy_attack_tree = ExtResource("3_s8e6v") From 8c692ab3adba6b751d4c45afb52259dfc8f191eb Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Sat, 28 Dec 2024 15:56:57 +0100 Subject: [PATCH 19/20] Fix a problem with improper initialisation of NextCardProbability --- Entity/Enemy/EnemyActionTree.gd | 33 ++++++++++++++++++++--------- Entity/Enemy/NextCardProbability.gd | 4 ---- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Entity/Enemy/EnemyActionTree.gd b/Entity/Enemy/EnemyActionTree.gd index 0ba32bdf..72e03b2f 100644 --- a/Entity/Enemy/EnemyActionTree.gd +++ b/Entity/Enemy/EnemyActionTree.gd @@ -12,34 +12,47 @@ class_name EnemyActionTree extends Resource ## [/code] ## The default is an example using the [NextCardProbability] class, and alternating between damage and block ## This uses the path to the cards as a key -@export var action_tree: Dictionary = { - "Basic_Attack" : [NextCardProbability.new(100, load("res://Cards/Resource/Both/Card_Get_block.tres"))], - "Get_Block" : [NextCardProbability.new(100, load("res://Cards/Resource/Enemy/Normal/Card_Basic_Attack.tres"))] -} +@export var action_tree: Dictionary = {} ## The last action that was played -var last_chosen_action_name: String - -func _init() -> void: - last_chosen_action_name = action_tree.keys()[1] +var last_chosen_action_name: String = "NULL" ## Call to choose the next action given the previous action func choose_next_action() -> CardBase: var chosen_action: CardBase = _choose_next_action_inner() last_chosen_action_name = chosen_action.enemy_card_name return chosen_action + +func _init_default_action_tree() -> void: + if action_tree.is_empty(): + var next_card_prob_1 := NextCardProbability.new() + next_card_prob_1.probability = 100 + next_card_prob_1.card = load("res://Cards/Resource/Enemy/Normal/Card_Basic_Attack.tres") + + var next_card_prob_2 := NextCardProbability.new() + next_card_prob_2.probability = 100 + next_card_prob_2.card = load("res://Cards/Resource/Both/Card_Get_block.tres") + + action_tree["Get_Block"] = [next_card_prob_1] + action_tree["Basic_Attack"] = [next_card_prob_2] + ## The actual choice function, the inner pattern is used to change [last_chosen_action] easily func _choose_next_action_inner() -> CardBase: + _init_default_action_tree() + if last_chosen_action_name == "NULL": + last_chosen_action_name = action_tree.keys()[0] var possible_next_action: Array = action_tree[last_chosen_action_name] # checking the total of the probabilities var total_probability: int = 0 - for card_probability: NextCardProbability in possible_next_action: + # this is a NextCardProbability but Godot typing doesn't seem to understand that + for card_probability: Resource in possible_next_action: total_probability += card_probability.probability # choose a number between 0 and the total probability -1 var random_choice: int = randi_range(0, total_probability -1) var probability_sum: int = 0 - for card_probability: NextCardProbability in possible_next_action: + # this is a NextCardProbability but Godot typing doesn't seem to understand that + for card_probability: Resource in possible_next_action: if probability_sum <= random_choice && random_choice < probability_sum + card_probability.probability: return card_probability.card else: diff --git a/Entity/Enemy/NextCardProbability.gd b/Entity/Enemy/NextCardProbability.gd index 139114c7..383da3a4 100644 --- a/Entity/Enemy/NextCardProbability.gd +++ b/Entity/Enemy/NextCardProbability.gd @@ -6,7 +6,3 @@ class_name NextCardProbability extends Resource @export var probability: int = 0 ## The card to be played @export var card: CardBase = null - -func _init(new_probability: int, new_card: CardBase) -> void: - probability = new_probability - card = new_card From bdce7697f1aaee34ecf57f7e2ffbcd3da5a1423e Mon Sep 17 00:00:00 2001 From: Turtyo <49365680+Turtyo@users.noreply.github.com> Date: Sat, 28 Dec 2024 15:57:11 +0100 Subject: [PATCH 20/20] Update golden cauldron action tree --- Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres b/Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres index 4871b1c7..14303df7 100644 --- a/Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres +++ b/Entity/Enemy/ActionTrees/golden_cauldron_action_tree.tres @@ -5,12 +5,12 @@ [ext_resource type="Script" path="res://Entity/Enemy/NextCardProbability.gd" id="2_5h3sb"] [ext_resource type="Resource" uid="uid://dluk3gyluaxe6" path="res://Cards/Resource/Both/Card_Big_Block.tres" id="3_dpwwb"] -[sub_resource type="Resource" id="Resource_io36s"] +[sub_resource type="Resource" id="Resource_nj3wp"] script = ExtResource("2_5h3sb") probability = 100 card = ExtResource("1_7ay63") -[sub_resource type="Resource" id="Resource_2cubn"] +[sub_resource type="Resource" id="Resource_hfiqb"] script = ExtResource("2_5h3sb") probability = 100 card = ExtResource("3_dpwwb") @@ -18,6 +18,6 @@ card = ExtResource("3_dpwwb") [resource] script = ExtResource("1_yj3at") action_tree = { -"Big_Block": SubResource("Resource_io36s"), -"Block_And_Attack": SubResource("Resource_2cubn") +"Big_Block": [SubResource("Resource_nj3wp")], +"Block_And_Attack": [SubResource("Resource_hfiqb")] }