Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add ability effects and change block indicator #22

Merged
merged 1 commit into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions resources/abilities/bosses/colossus/forced_recall.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://forced_recall"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://umfgaernudr5"]

[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_8leyx"]
[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/force_play_effect.gd" id="2_t555q"]

[sub_resource type="Resource" id="Resource_8m6t3"]
script = ExtResource("2_t555q")
parameters = {
"value": 1
}

[resource]
script = ExtResource("1_ability")
name = "Forced Recall"
type = 3 # DEBUFF
value = 1
effects = Array[ExtResource("1_8leyx")]([SubResource("Resource_8m6t3")])
weight = 1
description = "Forces you to play 1 random card next turn."
description = "Forces you to play 1 random card next turn."
16 changes: 12 additions & 4 deletions resources/abilities/bosses/colossus/memory_crush.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://memory_crush"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://dt2rcypnegbmf"]

[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_0stwl"]
[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/damage_effect.gd" id="2_bhcqk"]

[sub_resource type="Resource" id="Resource_3r653"]
script = ExtResource("2_bhcqk")
parameters = {
"max_damage": 20,
"min_damage": 15
}

[resource]
script = ExtResource("1_ability")
name = "Memory Crush"
type = 0 # ATTACK
value = 20
effects = Array[ExtResource("1_0stwl")]([SubResource("Resource_3r653")])
weight = 2
description = "A devastating blow dealing 20 damage."
description = "A devastating blow dealing 20 damage."
15 changes: 11 additions & 4 deletions resources/abilities/bosses/colossus/memory_surge.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://memory_surge"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://dbnx6sxany16a"]

[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_0oxrn"]
[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/strength_effect.gd" id="2_t70th"]

[sub_resource type="Resource" id="Resource_xmmuo"]
script = ExtResource("2_t70th")
parameters = {
"value": 3
}

[resource]
script = ExtResource("1_ability")
name = "Memory Surge"
type = 2 # BUFF
value = 3
effects = Array[ExtResource("1_0oxrn")]([SubResource("Resource_xmmuo")])
weight = 2
description = "Gains 3 strength for each unread card in your hand."
description = "Gains 3 strength for each unread card in your hand."
13 changes: 10 additions & 3 deletions resources/abilities/bosses/colossus/stone_form.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://d02eoja420eub"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://d02eoja420eub"]

[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_g4fcm"]
[ext_resource type="Script" path="res://scripts/effects/block_effect.gd" id="2_i3nyb"]

[sub_resource type="Resource" id="Resource_pfj30"]
script = ExtResource("2_i3nyb")
parameters = {
"value": 15
}

[resource]
script = ExtResource("1_ability")
name = "Stone Form"
type = 1
value = 0
effects = Array[ExtResource("1_g4fcm")]([SubResource("Resource_pfj30")])
weight = 2
description = "Hardens into stone gaining 15 block."
18 changes: 18 additions & 0 deletions resources/abilities/bosses/librarian/drain_strength.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://bac6xeq8gr4i2"]

[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_joppq"]
[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="2_e5f3f"]
[ext_resource type="Script" path="res://scripts/effects/weakness_effect.gd" id="2_ypp4s"]

[sub_resource type="Resource" id="Resource_hl8b2"]
script = ExtResource("2_ypp4s")
parameters = {
"value": 5
}

[resource]
script = ExtResource("2_e5f3f")
name = "Seal Scroll"
effects = Array[ExtResource("1_joppq")]([SubResource("Resource_hl8b2")])
weight = 1
description = "Drains 5 strength from the target."
13 changes: 10 additions & 3 deletions resources/abilities/bosses/librarian/knowledge_ward.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://b6322ib2s7xct"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://b6322ib2s7xct"]

[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_8jcgh"]
[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/block_effect.gd" id="2_5ue1x"]

[sub_resource type="Resource" id="Resource_rh2cv"]
script = ExtResource("2_5ue1x")
parameters = {
"value": 12
}

[resource]
script = ExtResource("1_ability")
name = "Knowledge Ward"
type = 1
value = 0
effects = Array[ExtResource("1_8jcgh")]([SubResource("Resource_rh2cv")])
weight = 2
description = "Creates a ward of ancient knowledge for 12 block."
11 changes: 0 additions & 11 deletions resources/abilities/bosses/librarian/seal_scroll.tres

This file was deleted.

14 changes: 11 additions & 3 deletions resources/abilities/bosses/librarian/tome_slam.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://dnvhj5c8rxs1e"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://dnvhj5c8rxs1e"]

[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_epc7p"]
[ext_resource type="Script" path="res://scripts/effects/damage_effect.gd" id="2_3n0sf"]

[sub_resource type="Resource" id="Resource_ipiux"]
script = ExtResource("2_3n0sf")
parameters = {
"max_damage": 15,
"min_damage": 10
}

[resource]
script = ExtResource("1_ability")
name = "Ancient Tome Slam"
type = 0
value = 0
effects = Array[ExtResource("1_epc7p")]([SubResource("Resource_ipiux")])
weight = 3
description = "Slams with a heavy tome dealing 15 damage."
15 changes: 11 additions & 4 deletions resources/abilities/bosses/scholar/knowledge_corruption.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://knowledge_corruption"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://qqocts3i2bf5"]

[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_y5fmi"]
[ext_resource type="Script" path="res://scripts/effects/corrupt_knowledge_effect.gd" id="2_k65yi"]

[sub_resource type="Resource" id="Resource_iv1fq"]
script = ExtResource("2_k65yi")
parameters = {
"value": 1
}

[resource]
script = ExtResource("1_ability")
name = "Knowledge Corruption"
type = 3 # DEBUFF
value = 1
effects = Array[ExtResource("1_y5fmi")]([SubResource("Resource_iv1fq")])
weight = 1
description = "Scrambles your decoded card information for 1 card."
description = "Scrambles your decoded card information for 1 card."
16 changes: 12 additions & 4 deletions resources/abilities/bosses/scholar/void_blast.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://void_blast"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://nt0yhrp5bo86"]

[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_g4xge"]
[ext_resource type="Script" path="res://scripts/effects/damage_effect.gd" id="2_2ebc2"]

[sub_resource type="Resource" id="Resource_wr2ye"]
script = ExtResource("2_2ebc2")
parameters = {
"max_damage": 12,
"min_damage": 8
}

[resource]
script = ExtResource("1_ability")
name = "Void Blast"
type = 0 # ATTACK
value = 12
effects = Array[ExtResource("1_g4xge")]([SubResource("Resource_wr2ye")])
weight = 3
description = "Channels void energy dealing 12 damage."
description = "Channels void energy dealing 12 damage."
15 changes: 11 additions & 4 deletions resources/abilities/bosses/scholar/void_mist.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://void_mist"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://ckr4qn4qstwep"]

[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_35ae7"]
[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/block_effect.gd" id="2_y2gcu"]

[sub_resource type="Resource" id="Resource_ng5cp"]
script = ExtResource("2_y2gcu")
parameters = {
"value": 10
}

[resource]
script = ExtResource("1_ability")
name = "Void Mist"
type = 1 # BLOCK
value = 10
effects = Array[ExtResource("1_35ae7")]([SubResource("Resource_ng5cp")])
weight = 2
description = "Surrounds self with void mist gaining 10 block."
description = "Surrounds self with void mist gaining 10 block."
15 changes: 11 additions & 4 deletions resources/abilities/bosses/scholar/void_shield.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://void_shield"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://bq0qaa7a821ku"]

[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_ability"]
[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_v53dm"]
[ext_resource type="Script" path="res://scripts/effects/decoded_card_resist_effect.gd" id="2_3qjhc"]

[sub_resource type="Resource" id="Resource_1fp0p"]
script = ExtResource("2_3qjhc")
parameters = {
"value": 50
}

[resource]
script = ExtResource("1_ability")
name = "Void Shield"
type = 2 # BUFF
value = 50
effects = Array[ExtResource("1_v53dm")]([SubResource("Resource_1fp0p")])
weight = 2
description = "Takes 50% less damage from decoded cards this turn."
description = "Takes 50% less damage from decoded cards this turn."
14 changes: 11 additions & 3 deletions resources/abilities/dark_ritual.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://df2hudinfu3iv"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://df2hudinfu3iv"]

[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_32x2t"]
[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_lbhpu"]
[ext_resource type="Script" path="res://scripts/effects/damage_effect.gd" id="2_x6a1i"]

[sub_resource type="Resource" id="Resource_1rqcj"]
script = ExtResource("2_x6a1i")
parameters = {
"max_damage": 12,
"min_damage": 7
}

[resource]
script = ExtResource("1_32x2t")
name = "Dark Ritual"
type = 0
value = 9
effects = Array[ExtResource("1_lbhpu")]([SubResource("Resource_1rqcj")])
weight = 1
description = "A powerful dark magic attack that deals 9 damage."
14 changes: 11 additions & 3 deletions resources/abilities/slash.tres
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
[gd_resource type="Resource" script_class="AbilityData" load_steps=2 format=3 uid="uid://17tkjbfkx2sh"]
[gd_resource type="Resource" script_class="AbilityData" load_steps=5 format=3 uid="uid://17tkjbfkx2sh"]

[ext_resource type="Script" path="res://scripts/effects/ability_effect.gd" id="1_5i510"]
[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_nhtau"]
[ext_resource type="Script" path="res://scripts/effects/damage_effect.gd" id="2_igbh0"]

[sub_resource type="Resource" id="Resource_kjhuo"]
script = ExtResource("2_igbh0")
parameters = {
"max_damage": 5,
"min_damage": 3
}

[resource]
script = ExtResource("1_nhtau")
name = "Slash"
type = 0
value = 6
effects = Array[ExtResource("1_5i510")]([SubResource("Resource_kjhuo")])
weight = 1
description = "A basic slashing attack that deals 6 damage."
6 changes: 3 additions & 3 deletions resources/enemies/bosses/librarian.tres
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

[ext_resource type="Script" path="res://scripts/data/ability_data.gd" id="1_fs2q8"]
[ext_resource type="Script" path="res://scripts/data/enemy_data.gd" id="1_script"]
[ext_resource type="Resource" path="res://resources/abilities/bosses/librarian/seal_scroll.tres" id="2_cm3kg"]
[ext_resource type="Resource" uid="uid://bac6xeq8gr4i2" path="res://resources/abilities/bosses/librarian/drain_strength.tres" id="2_cm3kg"]
[ext_resource type="PackedScene" uid="uid://cbtac01eivwim" path="res://scenes/enemies/cultist.tscn" id="2_enemy"]
[ext_resource type="Resource" path="res://resources/abilities/bosses/librarian/knowledge_ward.tres" id="3_j2nrr"]
[ext_resource type="Resource" path="res://resources/abilities/bosses/librarian/tome_slam.tres" id="4_lkjm0"]
[ext_resource type="Resource" uid="uid://b6322ib2s7xct" path="res://resources/abilities/bosses/librarian/knowledge_ward.tres" id="3_j2nrr"]
[ext_resource type="Resource" uid="uid://dnvhj5c8rxs1e" path="res://resources/abilities/bosses/librarian/tome_slam.tres" id="4_lkjm0"]

[resource]
script = ExtResource("1_script")
Expand Down
2 changes: 1 addition & 1 deletion resources/enemies/bosses/memory_colossus.tres
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[ext_resource type="Resource" path="res://resources/abilities/bosses/colossus/forced_recall.tres" id="2_u5hn7"]
[ext_resource type="Resource" path="res://resources/abilities/bosses/colossus/memory_crush.tres" id="3_wcx5e"]
[ext_resource type="Resource" path="res://resources/abilities/bosses/colossus/memory_surge.tres" id="4_sduki"]
[ext_resource type="Resource" path="res://resources/abilities/bosses/colossus/stone_form.tres" id="5_xhaua"]
[ext_resource type="Resource" uid="uid://d02eoja420eub" path="res://resources/abilities/bosses/colossus/stone_form.tres" id="5_xhaua"]

[resource]
script = ExtResource("1_script")
Expand Down
43 changes: 42 additions & 1 deletion scenes/enemies/enemy.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[gd_scene load_steps=4 format=3 uid="uid://b3hv5sm4hjouf"]
[gd_scene load_steps=5 format=3 uid="uid://b3hv5sm4hjouf"]

[ext_resource type="Script" path="res://scripts/enemy.gd" id="1_wa7o7"]
[ext_resource type="PackedScene" uid="uid://c0l75fsf0a0lh" path="res://scenes/ui/health_bar.tscn" id="2_ahs3m"]
[ext_resource type="Script" path="res://scripts/animators/combat_animator.gd" id="3_l6amq"]
[ext_resource type="Script" path="res://scripts/ui/intent_display.gd" id="4_ymp68"]

[node name="Enemy" type="Node2D"]
script = ExtResource("1_wa7o7")
Expand All @@ -15,3 +16,43 @@ offset_bottom = 680.0

[node name="CombatAnimator" type="Node" parent="."]
script = ExtResource("3_l6amq")

[node name="IntentDisplay" type="Control" parent="."]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -50.0
offset_right = 350.0
offset_bottom = 50.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("4_ymp68")

[node name="Icon" type="TextureRect" parent="IntentDisplay"]
layout_mode = 1
anchors_preset = 4
anchor_top = 0.5
anchor_bottom = 0.5
offset_top = -20.0
offset_right = 40.0
offset_bottom = 20.0
grow_vertical = 2

[node name="ValueLabel" type="Label" parent="IntentDisplay"]
layout_mode = 1
anchors_preset = 6
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -400.0
offset_top = -25.0
offset_bottom = 25.0
grow_horizontal = 0
grow_vertical = 2
theme_override_font_sizes/font_size = 34
text = "?"
horizontal_alignment = 1

[node name="AnimationPlayer" type="AnimationPlayer" parent="IntentDisplay"]
Loading
Loading