From ca9c7b8e50f048d5f1df4dc086fd75171cdcdf76 Mon Sep 17 00:00:00 2001 From: kennetha123 Date: Sun, 26 Jan 2025 06:31:06 +0700 Subject: [PATCH] fix: minor spelling mistake --- cards.tres | 2 +- data/cards/support/potion.tres | 3 +-- demo_game.tscn | 4 ++-- tcg/match/match_manager.gd | 6 +++--- ui/card_template/monster_card.tscn | 2 +- ui/card_template/support_card_red.tscn | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cards.tres b/cards.tres index e5f7591..6222ae9 100644 --- a/cards.tres +++ b/cards.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=2 format=3 uid="uid://qe383ytjm3v"] +[gd_resource type="Theme" load_steps=2 format=3 uid="uid://is34t82g4jg"] [ext_resource type="FontFile" uid="uid://ncoq4i61plvt" path="res://assets/Bohemian Soul.otf" id="1_yowck"] diff --git a/data/cards/support/potion.tres b/data/cards/support/potion.tres index 7137c77..926535b 100644 --- a/data/cards/support/potion.tres +++ b/data/cards/support/potion.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="SimpleSupportCard" load_steps=5 format=3 uid="uid://4eod3m0vc5a8"] +[gd_resource type="Resource" script_class="ImplementedSupportCard" load_steps=5 format=3 uid="uid://4eod3m0vc5a8"] [ext_resource type="Script" path="res://tcg/card/support_card_effect_instance.gd" id="1_ujm0o"] [ext_resource type="Resource" uid="uid://cvu0rtt5nggf" path="res://data/support_effects/heal.tres" id="2_k1cnl"] @@ -12,7 +12,6 @@ effect = ExtResource("2_k1cnl") [resource] script = ExtResource("3_at5nt") scope = "turn" -magnitude = 30 type = "green" effects = Array[ExtResource("1_ujm0o")]([SubResource("Resource_88lmk")]) name = "Potion" diff --git a/demo_game.tscn b/demo_game.tscn index d4c8e2d..83eaf33 100644 --- a/demo_game.tscn +++ b/demo_game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://l2ehohbd1xhk"] +[gd_scene load_steps=12 format=3 uid="uid://bgc0u117jqyr1"] [ext_resource type="Script" path="res://demo_game.gd" id="1_jn16u"] [ext_resource type="Script" path="res://player_side.gd" id="2_w4tnt"] @@ -6,7 +6,7 @@ [ext_resource type="PackedScene" uid="uid://cikstg43mudkn" path="res://tcg/match/match_manager.tscn" id="3_3yhrl"] [ext_resource type="Resource" uid="uid://cs7q8i7bvohmj" path="res://data/cards/monster/capytain.tres" id="3_we1tk"] [ext_resource type="Resource" uid="uid://4eod3m0vc5a8" path="res://data/cards/support/potion.tres" id="4_kkhfk"] -[ext_resource type="Resource" uid="uid://deo8mj887rfx1" path="res://data/cards/monster/axoluna.tres" id="5_3cm5x"] +[ext_resource type="Resource" uid="uid://di76avwc0gn8e" path="res://data/cards/monster/axoluna.tres" id="5_3cm5x"] [ext_resource type="PackedScene" uid="uid://bhrelvt51cbp2" path="res://ui/card_template/monster_card.tscn" id="7_4ah45"] [ext_resource type="PackedScene" uid="uid://b60vuykleugjn" path="res://ui/card_template/skip_card.tscn" id="7_skjyk"] [ext_resource type="PackedScene" uid="uid://dg5amjm1gqi06" path="res://ui/card_template/support_card_green.tscn" id="8_dytl5"] diff --git a/tcg/match/match_manager.gd b/tcg/match/match_manager.gd index 4eb4128..fa6e724 100644 --- a/tcg/match/match_manager.gd +++ b/tcg/match/match_manager.gd @@ -101,7 +101,7 @@ func resolve(action_by_player_id: Dictionary) -> PhaseTransition: for played_card in support_cards: var player: MatchPlayer = played_card.player var card: SupportCard = played_card.card - if played_card is ImplementedSupportCard and played_card.scope != 'instant' + if played_card is ImplementedSupportCard and played_card.scope != 'instant': player.active_support_cards.append(played_card) var executed_instant_effects_events = _execute_support_card_instant_effects(player, card) events.append_array(executed_instant_effects_events) @@ -146,7 +146,7 @@ func resolve(action_by_player_id: Dictionary) -> PhaseTransition: for played_card in support_cards: var player: MatchPlayer = played_card.player var card: SupportCard = played_card.card - if played_card is ImplementedSupportCard and played_card.scope != 'instant' + if played_card is ImplementedSupportCard and played_card.scope != 'instant': player.active_support_cards.append(played_card) events.append_array(_execute_support_card_instant_effects(player, card)) @@ -207,4 +207,4 @@ func _player_has_active_support_card(player: MatchPlayer, card_id: String) -> bo return player.active_support_cards.any(func (card): return card.id == card_id) func _player_opponent(player: MatchPlayer) -> MatchPlayer: - return player_2 if player.id == PLAYER_1_ID else player_1 \ No newline at end of file + return player_2 if player.id == PLAYER_1_ID else player_1 diff --git a/ui/card_template/monster_card.tscn b/ui/card_template/monster_card.tscn index 9d8a797..04522b1 100644 --- a/ui/card_template/monster_card.tscn +++ b/ui/card_template/monster_card.tscn @@ -8,7 +8,7 @@ [ext_resource type="Texture2D" uid="uid://b8accn4e2ojau" path="res://assets/monster/froggo 1.png" id="7_j2i0p"] [ext_resource type="Texture2D" uid="uid://dft4fbgoecbp4" path="res://assets/card_base/Illustrated BG.png" id="7_qe8a1"] [ext_resource type="Texture2D" uid="uid://cqttp0i3vph37" path="res://assets/card_base/Star.png" id="8_ophhb"] -[ext_resource type="Theme" path="res://cards.tres" id="9_6x2vq"] +[ext_resource type="Theme" uid="uid://is34t82g4jg" path="res://cards.tres" id="9_6x2vq"] [ext_resource type="Texture2D" uid="uid://cjmxetjq82rl2" path="res://assets/card_base/Pip.png" id="10_14hhn"] [ext_resource type="FontFile" uid="uid://08q3kkwmd4u6" path="res://assets/Inter-Regular.otf" id="11_oy107"] [ext_resource type="Texture2D" uid="uid://bywa8qlwvcksd" path="res://assets/card_base/batu.png" id="12_a4kkh"] diff --git a/ui/card_template/support_card_red.tscn b/ui/card_template/support_card_red.tscn index c84cdc5..60c9770 100644 --- a/ui/card_template/support_card_red.tscn +++ b/ui/card_template/support_card_red.tscn @@ -7,7 +7,7 @@ [ext_resource type="Texture2D" uid="uid://blejyda8mendg" path="res://assets/card_base/InnerFill.png" id="4_2fw8n"] [ext_resource type="Texture2D" uid="uid://by7ws88pn4tvb" path="res://assets/card_base/Separator.png" id="5_n3v14"] [ext_resource type="Texture2D" uid="uid://0gxplli5krq2" path="res://assets/card_base/Pill.png" id="6_wrd2a"] -[ext_resource type="Theme" path="res://cards.tres" id="7_fp6ys"] +[ext_resource type="Theme" uid="uid://is34t82g4jg" path="res://cards.tres" id="7_fp6ys"] [ext_resource type="FontFile" uid="uid://08q3kkwmd4u6" path="res://assets/Inter-Regular.otf" id="9_vilw6"] [ext_resource type="Texture2D" uid="uid://rh3aswb0p7ri" path="res://assets/energy.png" id="10_2t0ey"]