From 621069fd71c2d6caafa31ec50426cd2f96ce783a Mon Sep 17 00:00:00 2001 From: henriquenakashima Date: Thu, 24 Sep 2020 00:35:08 -0400 Subject: [PATCH] Rename CardId to HCardId --- Assets/Battle/BattleController.cs | 22 ++++++------ Assets/Battle/CardsHeroes/CardCover.cs | 2 +- .../Battle/CardsHeroes/CardCrashingPunch.cs | 2 +- .../Battle/CardsHeroes/CardLightningStrike.cs | 2 +- Assets/Battle/CardsHeroes/CardScarring.cs | 2 +- Assets/Battle/CardsHeroes/CardThunderstorm.cs | 4 +-- Assets/Battle/CardsHeroes/MeditateHCard.cs | 2 +- Assets/Battle/Effects/AcquireCardsEffect.cs | 4 +-- Assets/Battle/HeroCard.cs | 6 ++-- Assets/Battle/HeroCardDatabase.cs | 34 +++++++++---------- TODO.txt | 1 - 11 files changed, 40 insertions(+), 41 deletions(-) diff --git a/Assets/Battle/BattleController.cs b/Assets/Battle/BattleController.cs index bfe108c..e0a6a74 100644 --- a/Assets/Battle/BattleController.cs +++ b/Assets/Battle/BattleController.cs @@ -40,17 +40,17 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe HeroId.Shaman, }; - CardId[] cardIds = new CardId[10] { - CardId.CrashingPunch, - CardId.CrashingPunch, - CardId.CrashingPunch, - CardId.Cover, - CardId.Cover, - CardId.Cover, - CardId.Thunderstorm, - CardId.Scarring, - CardId.Scarring, - CardId.Meditate, + HCardId[] cardIds = new HCardId[10] { + HCardId.CrashingPunch, + HCardId.CrashingPunch, + HCardId.CrashingPunch, + HCardId.Cover, + HCardId.Cover, + HCardId.Cover, + HCardId.Thunderstorm, + HCardId.Scarring, + HCardId.Scarring, + HCardId.Meditate, }; MonsterId[] monsterIds = new MonsterId[3] { diff --git a/Assets/Battle/CardsHeroes/CardCover.cs b/Assets/Battle/CardsHeroes/CardCover.cs index 9608a8c..8789597 100644 --- a/Assets/Battle/CardsHeroes/CardCover.cs +++ b/Assets/Battle/CardsHeroes/CardCover.cs @@ -5,7 +5,7 @@ using UnityEngine; public class CardCover : HeroCard { public CardCover(BattleParticipant owner) - : base(owner, CardId.Cover, "Cover", 1, CardType.Skill, + : base(owner, HCardId.Cover, "Cover", 1, CardType.Skill, "Block 3 damage on another target ally.") { } diff --git a/Assets/Battle/CardsHeroes/CardCrashingPunch.cs b/Assets/Battle/CardsHeroes/CardCrashingPunch.cs index d32161d..01bcdff 100644 --- a/Assets/Battle/CardsHeroes/CardCrashingPunch.cs +++ b/Assets/Battle/CardsHeroes/CardCrashingPunch.cs @@ -5,7 +5,7 @@ using UnityEngine; public class CardCrashingPunch : HeroCard { public CardCrashingPunch(BattleParticipant owner) - : base(owner, CardId.CrashingPunch, "Crashing Punch", 3, CardType.Attack, + : base(owner, HCardId.CrashingPunch, "Crashing Punch", 3, CardType.Attack, "Deals 3 damage to target.") { } diff --git a/Assets/Battle/CardsHeroes/CardLightningStrike.cs b/Assets/Battle/CardsHeroes/CardLightningStrike.cs index 2cdc723..5ac5348 100644 --- a/Assets/Battle/CardsHeroes/CardLightningStrike.cs +++ b/Assets/Battle/CardsHeroes/CardLightningStrike.cs @@ -5,7 +5,7 @@ using UnityEngine; public class CardLightningStrike : HeroCard { public CardLightningStrike(BattleParticipant owner) - : base(owner, CardId.LightningStrike, "Lightning Strike", 2, CardType.Attack, + : base(owner, HCardId.LightningStrike, "Lightning Strike", 2, CardType.Attack, "Deals 3 damage to target.") { } diff --git a/Assets/Battle/CardsHeroes/CardScarring.cs b/Assets/Battle/CardsHeroes/CardScarring.cs index cac91d3..4eb06ff 100644 --- a/Assets/Battle/CardsHeroes/CardScarring.cs +++ b/Assets/Battle/CardsHeroes/CardScarring.cs @@ -5,7 +5,7 @@ using UnityEngine; public class CardScarring : HeroCard { public CardScarring(BattleParticipant owner) - : base(owner, CardId.Scarring, "Scarring", 2, CardType.Skill, + : base(owner, HCardId.Scarring, "Scarring", 2, CardType.Skill, "Block 4 damage. The next time damage is taken until next turn, gain 1 Max HP.") { } diff --git a/Assets/Battle/CardsHeroes/CardThunderstorm.cs b/Assets/Battle/CardsHeroes/CardThunderstorm.cs index 07a6c21..6d1ffc8 100644 --- a/Assets/Battle/CardsHeroes/CardThunderstorm.cs +++ b/Assets/Battle/CardsHeroes/CardThunderstorm.cs @@ -5,13 +5,13 @@ using UnityEngine; public class CardThunderstorm : HeroCard { public CardThunderstorm(BattleParticipant owner) - : base(owner, CardId.Thunderstorm, "Thunderstorm", 3, CardType.Enchantment, + : base(owner, HCardId.Thunderstorm, "Thunderstorm", 3, CardType.Enchantment, "Add 1 max energy. Acquire 2 Lightning Strike into draw pile.") { } public override IEnumerator Use(IBattleEffectApplier effectApplier, BattlePlayerControls playerControls) { effectApplier.Apply(new IncreaseMaxEnergyEffect(1)); - effectApplier.Apply(new AcquireCardsEffect(new CardId[] {CardId.LightningStrike, CardId.LightningStrike}, BattleZone.DrawPile, this.owner)); + effectApplier.Apply(new AcquireCardsEffect(new HCardId[] {HCardId.LightningStrike, HCardId.LightningStrike}, BattleZone.DrawPile, this.owner)); yield break; } } diff --git a/Assets/Battle/CardsHeroes/MeditateHCard.cs b/Assets/Battle/CardsHeroes/MeditateHCard.cs index ac23235..b788984 100644 --- a/Assets/Battle/CardsHeroes/MeditateHCard.cs +++ b/Assets/Battle/CardsHeroes/MeditateHCard.cs @@ -5,7 +5,7 @@ using UnityEngine; public class MeditateHCard : HeroCard { public MeditateHCard(BattleParticipant owner) - : base(owner, CardId.Meditate, "Meditate", 2, CardType.Skill, "+1 insight. Draw a card.") { + : base(owner, HCardId.Meditate, "Meditate", 2, CardType.Skill, "+1 insight. Draw a card.") { } public override IEnumerator Use( diff --git a/Assets/Battle/Effects/AcquireCardsEffect.cs b/Assets/Battle/Effects/AcquireCardsEffect.cs index 3f5aa74..c09ea9e 100644 --- a/Assets/Battle/Effects/AcquireCardsEffect.cs +++ b/Assets/Battle/Effects/AcquireCardsEffect.cs @@ -9,11 +9,11 @@ public class AcquireCardsEffect : IBattleEffect private BattleZone zone; private BattleParticipant participant; - public AcquireCardsEffect(CardId cardId, BattleZone zone, BattleParticipant participant) { + public AcquireCardsEffect(HCardId cardId, BattleZone zone, BattleParticipant participant) { Initialize(new int[1] {(int) cardId}, zone, participant); } - public AcquireCardsEffect(CardId[] cardIds, BattleZone zone, BattleParticipant participant) { + public AcquireCardsEffect(HCardId[] cardIds, BattleZone zone, BattleParticipant participant) { Initialize(cardIds.Cast().ToArray(), zone, participant); } diff --git a/Assets/Battle/HeroCard.cs b/Assets/Battle/HeroCard.cs index 270cea0..cef515c 100644 --- a/Assets/Battle/HeroCard.cs +++ b/Assets/Battle/HeroCard.cs @@ -4,9 +4,9 @@ using UnityEngine; public abstract class HeroCard : BaseCard { - private CardId id; + private HCardId id; - public HeroCard(BattleParticipant owner, CardId id, string displayName, int cost, CardType type, + public HeroCard(BattleParticipant owner, HCardId id, string displayName, int cost, CardType type, string effectText) : base(owner, displayName, cost, type, effectText) { this.id = id; @@ -14,5 +14,5 @@ public abstract class HeroCard : BaseCard public abstract IEnumerator Use(IBattleEffectApplier effectApplier, BattlePlayerControls playerControls); - public CardId GetId() {return this.id;} + public HCardId GetId() {return this.id;} } diff --git a/Assets/Battle/HeroCardDatabase.cs b/Assets/Battle/HeroCardDatabase.cs index b3a25d1..2998ba3 100644 --- a/Assets/Battle/HeroCardDatabase.cs +++ b/Assets/Battle/HeroCardDatabase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -public enum CardId { +public enum HCardId { CrashingPunch, Cover, LightningStrike, @@ -23,37 +23,37 @@ public enum CardId { public class HeroCardDatabase : CardDatabase { - private static Dictionary CARD_TO_HERO = new Dictionary() { - {CardId.CrashingPunch, HeroId.Brute}, - {CardId.Cover, HeroId.Brute}, - {CardId.LightningStrike, HeroId.Shaman}, - {CardId.Scarring, HeroId.Brute}, - {CardId.Thunderstorm, HeroId.Shaman}, - {CardId.Meditate, HeroId.Shaman}, + private static Dictionary CARD_TO_HERO = new Dictionary() { + {HCardId.CrashingPunch, HeroId.Brute}, + {HCardId.Cover, HeroId.Brute}, + {HCardId.LightningStrike, HeroId.Shaman}, + {HCardId.Scarring, HeroId.Brute}, + {HCardId.Thunderstorm, HeroId.Shaman}, + {HCardId.Meditate, HeroId.Shaman}, }; public override HeroCard CreateCard(int id, BattleParticipant owner) { - CardId heroCardId = (CardId) id; + HCardId heroCardId = (HCardId) id; switch (heroCardId) { - case CardId.CrashingPunch: + case HCardId.CrashingPunch: return new CardCrashingPunch(owner); - case CardId.Cover: + case HCardId.Cover: return new CardCover(owner); - case CardId.LightningStrike: + case HCardId.LightningStrike: return new CardLightningStrike(owner); - case CardId.Scarring: + case HCardId.Scarring: return new CardScarring(owner); - case CardId.Thunderstorm: + case HCardId.Thunderstorm: return new CardThunderstorm(owner); - case CardId.Meditate: + case HCardId.Meditate: return new MeditateHCard(owner); default: - throw new System.ArgumentException("CardId unknown", "id"); + throw new System.ArgumentException("HCardId unknown", "id"); } } - public static HeroId GetHeroIdOfCard(CardId id) { + public static HeroId GetHeroIdOfCard(HCardId id) { return CARD_TO_HERO[id]; } } diff --git a/TODO.txt b/TODO.txt index af19cff..cb77fed 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,4 +1,3 @@ -- Rename CardId to HCardId - Animate rearrange hand after card is used - Make hero cards be used in sequence Coroutines, not in parallel - Do not Highlight unusable cards