Soullies/Continentis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Card爆改！

Browse Source
This commit is contained in:
SoulliesOfficial
2025-11-15 12:17:34 -05:00
parent 85bbe2431c
commit 5fe665d0ce
121 changed files with 838 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Mods/Basic/Cards/Scripts/Assassin/Ambush.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class Ambush : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_GenerateCards>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));

2
Assets/Mods/Basic/Cards/Scripts/Assassin/AmbushStance.cs
View File

@@ -8,7 +8,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class AmbushStance : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_ParamFunction<CharacterBase>(0.05f, target =>

5
Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs
View File

@@ -9,7 +9,8 @@ namespace Continentis.Mods.Basic.Cards.Assassin
public class Backstab : CardLogicBase
{
private int _sharpnessCount = 0;
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup( targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -22,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
_sharpnessCount = user.combatBuffSubmodule.GetBuff<Buffs.Sharpness>().unitedStackSubmodule.stackAmount;
}
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
}),
new Cmd_ParamFunction<CharacterBase>(target =>
{

6
Assets/Mods/Basic/Cards/Scripts/Assassin/BladeOfFear.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class BladeOfFear : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
}));
mainGroup.AddCommand(new Cmd_Function(() =>
{

2
Assets/Mods/Basic/Cards/Scripts/Assassin/CompoundPoison.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class CompoundPoison : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_ParamFunction<CharacterBase>(0.05f, target =>

8
Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs
View File

@@ -8,7 +8,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class ExtremePain : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -16,15 +16,15 @@ namespace Continentis.Mods.Basic.Cards.Assassin
new Cmd_SpawnVFX("VFX_Basic_RedImpact"),
new Cmd_ParamFunction<CharacterBase>(target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
}));
return new List<CommandBase> { mainGroup };
}
public override int GetFinalDamage(CharacterBase target, List<string> elementalTags = null)
public override int GetTargetedFinalDamage(CharacterBase target, List<string> elementalTags = null)
{
var baseDamage = base.GetFinalDamage(target, elementalTags);
var baseDamage = base.GetTargetedFinalDamage(target, elementalTags);
var extraDamage = 0;
if (target.combatBuffSubmodule.HasBuff<Buffs.Corrosion>())
{

2
Assets/Mods/Basic/Cards/Scripts/Assassin/FlashTerror.cs
View File

@@ -8,7 +8,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class FlashTerror : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_ParamFunction<CharacterBase>(0.01f, target =>

2
Assets/Mods/Basic/Cards/Scripts/Assassin/KnifeTrick.cs
View File

@@ -8,7 +8,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class KnifeTrick : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Assassin/Stealth.cs
View File

@@ -8,7 +8,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class Stealth : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
var mainGroup = new CommandGroup(ExecutionMode.Sequential);
mainGroup.AddCommand(new Cmd_Function(() =>

2
Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs
View File

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class Torture : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandQueueManager.Instance.AddCommand(user.deckSubmodule.DrawCards(GetAttribute("DrawCount")));
CommandGroup mainGroup = TargetListCommandGroup(targetList,

2
Assets/Mods/Basic/Cards/Scripts/Assassin/WoundDeterioration.cs
View File

@@ -8,7 +8,7 @@ namespace Continentis.Mods.Basic.Cards.Assassin
{
public class WoundDeterioration : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_ParamFunction<CharacterBase>(0.05f, target =>

2
Assets/Mods/Basic/Cards/Scripts/Cleric/BlessedHolyWater.cs
View File

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class BlessedHolyWater : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));

8
Assets/Mods/Basic/Cards/Scripts/Cleric/ChainBlessing.cs
View File

@@ -11,12 +11,12 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class ChainBlessing : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_GenerateCards>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
@@ -26,7 +26,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
var powerCards = new List<CardInstance>();
foreach (var card in user.deckSubmodule.HandPile)
{
if (card.cardLogic.contentSubmodule.cardType == MainGame.Card.CardType.Power)
if (card.contentSubmodule.cardType == MainGame.Card.CardType.Power)
{
powerCards.Add(card);
}
@@ -37,7 +37,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
var copyCount = GetAttribute("CopyCount");
for (int i = 0; i < copyCount; i++)
{
CardInstance newCard = CardInstance.GenerateCardInstance(randomPowerCard.cardLogic, user, "Hand");
CardInstance newCard = CardInstance.GenerateCardInstance(randomPowerCard, user, "Hand");
newCard.cardLogic.SetAttribute("StaminaCost", 0);
newCard.GenerateHandCardView("Hand");
}

6
Assets/Mods/Basic/Cards/Scripts/Cleric/DivineProtection.cs
View File

@@ -13,7 +13,7 @@ namespace Continentis.Mods.Basic
{
public class DivineProtection : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
@@ -26,8 +26,8 @@ namespace Continentis.Mods.Basic
mainGroup.AddCommand(new Cmd_Function(() =>
{
CreateCardBuff<Buffs.DivineProtection>(GetAttribute("BlockStack")).Apply(this, user, this);
this.contentSubmodule.dirtyMark = true;
CreateCardBuff<Buffs.DivineProtection>(GetAttribute("BlockStack")).Apply(card, user, this);
card.contentSubmodule.dirtyMark = true;
}));
return new List<CommandBase> { mainGroup };

8
Assets/Mods/Basic/Cards/Scripts/Cleric/DivinePunishment.cs
View File

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic
{
public class DivinePunishment : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
@@ -22,13 +22,13 @@ namespace Continentis.Mods.Basic
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
}));
mainGroup.AddCommand(new Cmd_Function(() =>
{
CreateCardBuff<Buffs.DivinePunishment>(GetAttribute("DamageStack")).Apply(this, user, this);
this.contentSubmodule.dirtyMark = true;
CreateCardBuff<Buffs.DivinePunishment>(GetAttribute("DamageStack")).Apply(card, user, this);
card.contentSubmodule.dirtyMark = true;
}));
return new List<CommandBase> { mainGroup };

2
Assets/Mods/Basic/Cards/Scripts/Cleric/Faith.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class Faith : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = user.deckSubmodule.DrawCards(GetAttribute("DrawCount"));
return new List<CommandBase> { mainGroup };

2
Assets/Mods/Basic/Cards/Scripts/Cleric/FreedomOfMovement.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class FreedomOfMovement : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_ParamFunction<CharacterBase>(0.01f, target =>

2
Assets/Mods/Basic/Cards/Scripts/Cleric/LessRestoration.cs
View File

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class LessRestoration : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Cleric/PrayerOfHealing.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class PrayerOfHealing : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Cleric/Sanctuary.cs
View File

@@ -11,7 +11,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class Sanctuary : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Cleric/ShieldOfDevotion.cs
View File

@@ -11,7 +11,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class ShieldOfDevotion : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_ParamFunction<CharacterBase>(0.01f, target =>

2
Assets/Mods/Basic/Cards/Scripts/Cleric/SpiritGuardian.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric
{
public class SpiritGuardian : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_ParamFunction<CharacterBase>(0.01f, target =>

2
Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/ArmyOfTheDead.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class ArmyOfTheDead : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);

6
Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/GreatswordSweep.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class GreatswordSweep : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(new Cmd_PlayAnimation(user.characterView, "Attack"));
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
ExecutionMode.Parallel, ExecutionMode.Sequential,
new Cmd_ParamFunction<CharacterBase>(target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
})));
return new List<CommandBase> { mainGroup };

8
Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/HellfireBlast.cs
View File

@@ -10,17 +10,17 @@ namespace Continentis.Mods.Basic.Cards
{
public class HellfireBlast : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_ParamFunction<CharacterBase>(0.2f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
CreateCharacterBuff<Burn>(GetAttribute("BuffStack_Burn")).Apply(target, user, this);
}));

2
Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/NecromanticInfusion.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class NecromanticInfusion : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup main = new CommandGroup(new Cmd_Function(() =>
{

6
Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/WrathOfUnderworld.cs
View File

@@ -11,18 +11,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class WrathOfUnderworld : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup singleTargetGroup = new CommandGroup(ExecutionMode.Parallel,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.4f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
})
);

2
Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs
View File

@@ -8,7 +8,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class Rouse : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

6
Assets/Mods/Basic/Cards/Scripts/General/Tactic.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class Tactic : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_SelectHandCards>().SetEffect(SelectEffect);
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"));

2
Assets/Mods/Basic/Cards/Scripts/General/Whimsy.cs
View File

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class Whimsy : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

6
Assets/Mods/Basic/Cards/Scripts/Knight/BattlefieldExperience.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class BattlefieldExperience : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_GenerateCards>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));

4
Assets/Mods/Basic/Cards/Scripts/Knight/BodyAsShield.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class BodyAsShield : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Protect>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

4
Assets/Mods/Basic/Cards/Scripts/Knight/Cover.cs
View File

@@ -10,13 +10,13 @@ namespace Continentis.Mods.Basic.Cards
{
public class Cover : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Defense>();
AddLogicComponent<CardLogicComponent_Protect>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

8
Assets/Mods/Basic/Cards/Scripts/Knight/DivineSmite.cs
View File

@@ -11,19 +11,19 @@ namespace Continentis.Mods.Basic.Cards
{
public class DivineSmite : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
AddLogicComponent<CardLogicComponent_Protect>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_PlaySFX("SFX_Basic_SwordStrike"),
new Cmd_SpawnVFX("VFX_Basic_RedImpact"),
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetFinalDamage(target))));
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetTargetedFinalDamage(target))));
foreach (CharacterBase protectTarget in CombatMainManager.Instance.characterController.GetAllAllies(user))
{

10
Assets/Mods/Basic/Cards/Scripts/Knight/EchoOfHonor.cs
View File

@@ -9,20 +9,20 @@ namespace Continentis.Mods.Basic.Cards
{
public class EchoOfHonor : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_GenerateCards>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
mainGroup.AddCommand(new Cmd_Function(() =>
{
if (user.deckSubmodule.HandPile.Exclude(this.cardInstance).TryGetRandom(out CardInstance randomHandCard))
if (user.deckSubmodule.HandPile.Exclude(this.card).TryGetRandom(out CardInstance randomHandCard))
{
CardInstance newCard = CardInstance.GenerateCardInstance(randomHandCard.cardLogic, user, "Hand");
CardInstance newCard = CardInstance.GenerateCardInstance(randomHandCard, user, "Hand");
newCard.cardLogic.SetAttribute("StaminaCost", 0);
newCard.GenerateHandCardView("Hand");
}

4
Assets/Mods/Basic/Cards/Scripts/Knight/EstablishFormation.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class EstablishFormation : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Defense>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);

12
Assets/Mods/Basic/Cards/Scripts/Knight/FirmBelief.cs
View File

@@ -9,19 +9,19 @@ namespace Continentis.Mods.Basic.Cards
{
public class FirmBelief : CardLogicBase
{
public override void Initialize()
public override void Initialize(CardInstance card)
{
base.Initialize();
this.eventSubmodule.onInitiativeDiscard.Add("FirmBelief_PlayWhenDiscard",
new PrioritizedCheckAndEffect(() => true, () => this.Play(new List<CharacterBase>(), user)));
base.Initialize(card);
this.card.eventSubmodule.onInitiativeDiscard.Add("FirmBelief_PlayWhenDiscard",
new PrioritizedCheckAndEffect(() => true, () => card.Play(new List<CharacterBase>(), user)));
}
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Defense>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = SingleCommandGroup(
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Knight/GuardianAura.cs
View File

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class GuardianAura : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

8
Assets/Mods/Basic/Cards/Scripts/Knight/HeavySlash.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class HeavySlash : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -23,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards
new Cmd_SpawnVFX("VFX_Basic_RedImpact"),
new Cmd_ParamFunction<CharacterBase>(target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
})); //对目标造成伤害
mainGroup.AddCommand(new Cmd_Function(() =>

2
Assets/Mods/Basic/Cards/Scripts/Knight/IronWall.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class IronWall : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

4
Assets/Mods/Basic/Cards/Scripts/Knight/OathOfCourage.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class OathOfCourage : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Defense>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Knight/OathOfHonor.cs
View File

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class OathOfHonor : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

8
Assets/Mods/Basic/Cards/Scripts/Knight/Smite.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class Smite : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -23,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards
new Cmd_SpawnVFX("VFX_Basic_RedImpact"),
new Cmd_ParamFunction<CharacterBase>(target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
CreateCharacterBuff<Weak>(GetAttribute("WeakCount")).Apply(target, user, this);
}));

10
Assets/Mods/Basic/Cards/Scripts/Knight/UtmostStrike.cs
View File

@@ -9,13 +9,13 @@ namespace Continentis.Mods.Basic.Cards
{
public class UtmostStrike : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
AddLogicComponent<CardLogicComponent_SelectHandCards>().SetCondition(SelectCondition).SetEffect(SelectEffect);
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -23,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards
new Cmd_SpawnVFX("VFX_Basic_RedImpact"),
new Cmd_ParamFunction<CharacterBase>(target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
})); //对目标造成伤害
LogicComponent<CardLogicComponent_SelectHandCards>().AddSelectionCommands(ref mainGroup);
@@ -38,7 +38,7 @@ namespace Continentis.Mods.Basic.Cards
private bool SelectCondition(CardInstance card)
{
return card.cardLogic.contentSubmodule.cardType is not CardType.Attack;
return card.contentSubmodule.cardType is not CardType.Attack;
}
private void SelectEffect(CardInstance card)

8
Assets/Mods/Basic/Cards/Scripts/Mage/Abundant.cs
View File

@@ -13,12 +13,12 @@ namespace Continentis.Mods.Basic
{
public class Abundant : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_SelectHandCards>().SetCondition(SelectCondition).SetEffect(SelectEffect);
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"));
@@ -29,12 +29,12 @@ namespace Continentis.Mods.Basic
private bool SelectCondition(CardInstance card)
{
return card.cardLogic.contentSubmodule.cardType is CardType.Attack && card.cardLogic.HasKeyword("Magic");
return card.contentSubmodule.cardType is CardType.Attack && card.HasKeyword("Magic");
}
private void SelectEffect(CardInstance card)
{
CreateCardBuff<Buffs.Abundant>(GetAttribute("BuffStack_Abundant")).Apply(card.cardLogic, user, this);
CreateCardBuff<Buffs.Abundant>(GetAttribute("BuffStack_Abundant")).Apply(card, user, this);
}
}
}

6
Assets/Mods/Basic/Cards/Scripts/Mage/ArcaneMissiles.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class ArcaneMissiles : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
@@ -24,7 +24,7 @@ namespace Continentis.Mods.Basic.Cards
{
templates.Add(new Cmd_ParamFunction<CharacterBase>(0.4f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
Debug.Log("攻击命令触发");
}));
}

2
Assets/Mods/Basic/Cards/Scripts/Mage/ConcentratedSpellcasting.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class ConcentratedSpellcasting : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

6
Assets/Mods/Basic/Cards/Scripts/Mage/ElectricClaw.cs
View File

@@ -10,18 +10,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class ElectricClaw : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
}));
mainGroup.AddCommand(new Cmd_Function(()=>

10
Assets/Mods/Basic/Cards/Scripts/Mage/FarSighted.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class FarSighted : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_SelectHandCards>().SetEffect(SelectEffect);
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
@@ -27,9 +27,9 @@ namespace Continentis.Mods.Basic.Cards
private void SelectEffect(CardInstance card)
{
card.cardLogic.contentSubmodule.keywords.Add("Retain");
card.cardLogic.contentSubmodule.originalFunctionText += " + $Keyword(\"Retain\")";
card.cardLogic.contentSubmodule.dirtyMark = true;
card.contentSubmodule.keywords.Add("Retain");
card.contentSubmodule.originalFunctionText += " + $Keyword(\"Retain\")";
card.contentSubmodule.dirtyMark = true;
}
}
}

6
Assets/Mods/Basic/Cards/Scripts/Mage/FireBall.cs
View File

@@ -10,18 +10,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class FireBall : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
CreateCharacterBuff<Burn>(GetAttribute("BuffStack_Burn")).Apply(target, user, this);
}));

2
Assets/Mods/Basic/Cards/Scripts/Mage/FlameInscription.cs
View File

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class FlameInscription : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Mage/Haste.cs
View File

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class Haste : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Mage/IdentifyWeakness.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class IdentifyWeakness : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

2
Assets/Mods/Basic/Cards/Scripts/Mage/Scorch.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class Scorch : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

6
Assets/Mods/Basic/Cards/Scripts/Mage/WitchcraftRay.cs
View File

@@ -9,18 +9,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class WitchcraftRay : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
}));
return new List<CommandBase> { mainGroup };

8
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Bludgeon.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class Bludgeon : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
ExecutionMode.Sequential,
@@ -23,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.1f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
CreateCharacterBuff<Weak>().Apply(target, user, this);
}));

16
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Cohesion.cs
View File

@@ -11,12 +11,12 @@ namespace Continentis.Mods.Basic.Cards.General.Skills
{
public class Cohesion : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_SelectHandCards>().SetCondition(SelectCondition).SetEffect(SelectEffect);
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
@@ -28,16 +28,16 @@ namespace Continentis.Mods.Basic.Cards.General.Skills
private bool SelectCondition(CardInstance card)
{
CardType type = card.cardLogic.contentSubmodule.cardType;
CardType type = card.contentSubmodule.cardType;
return type != CardType.Status && type != CardType.Curse;
}
private void SelectEffect(CardInstance card)
{
card.cardLogic.ModifyAttribute("StaminaCost", -1);
card.cardLogic.contentSubmodule.keywords.Add("Retain");
card.cardLogic.contentSubmodule.originalFunctionText += " + $Keyword(\"Retain\")";
card.cardLogic.contentSubmodule.dirtyMark = true;
card.ModifyAttribute("StaminaCost", -1);
card.contentSubmodule.keywords.Add("Retain");
card.contentSubmodule.originalFunctionText += " + $Keyword(\"Retain\")";
card.contentSubmodule.dirtyMark = true;
}
}
}

6
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/CommonHolyWater.cs
View File

@@ -12,12 +12,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class CommonHolyWater : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_SelectHandCards>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
@@ -29,7 +29,7 @@ namespace Continentis.Mods.Basic.Cards
public bool SelectCondition(CardInstance card)
{
CardType type = card.cardLogic.contentSubmodule.cardType;
CardType type = card.contentSubmodule.cardType;
return type == CardType.Status || type == CardType.Curse;
}

4
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class Defense : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Defense>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);

10
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/DualStrike.cs
View File

@@ -9,23 +9,23 @@ namespace Continentis.Mods.Basic.Cards
{
public class DualStrike : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = TargetListCommandGroup(targetList, ExecutionMode.Sequential, ExecutionMode.Sequential,
new CommandGroup(ExecutionMode.Parallel,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetFinalDamage(target)))
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetTargetedFinalDamage(target)))
),
new CommandGroup(ExecutionMode.Parallel,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetFinalDamage(target)))
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetTargetedFinalDamage(target)))
));
return new List<CommandBase> { mainGroup };

6
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Faint.cs
View File

@@ -7,10 +7,10 @@ namespace Continentis.Mods.Basic.Cards
{
public class Faint : CardLogicBase
{
public override void Initialize()
public override void Initialize(CardInstance card)
{
base.Initialize();
eventSubmodule.onDraw.Add("Basic_Faint", new PrioritizedAction(() =>
base.Initialize(card);
this.card.eventSubmodule.onDraw.Add("Basic_Faint", new PrioritizedAction(() =>
{
user.ModifyStamina(-1);
}));

4
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FightingInspiration.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class FightingInspiration : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_GenerateCards>().SetFilter(CardFilter);
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);

6
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FireBolt.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class FireBolt : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
@@ -23,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
new Burn(GetAttribute("BuffLayer_Burn")).Apply(target, user, this);
}));

2
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Guard.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class Guard : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Skill"),

8
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HiddenBlade.cs
View File

@@ -9,18 +9,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class HiddenBlade : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetFinalDamage(target))));
new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetTargetedFinalDamage(target))));
return new List<CommandBase> { mainGroup };
}

6
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HolyWaterPreparation.cs
View File

@@ -11,12 +11,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class HolyWaterPreparation : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_GenerateCards>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);

4
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/MudBarrier.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class MudBarrier : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Defense>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);

10
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Oblivion.cs
View File

@@ -9,14 +9,14 @@ namespace Continentis.Mods.Basic.Cards
{
public partial class Oblivion : CardLogicBase
{
public override void Initialize()
public override void Initialize(CardInstance card)
{
base.Initialize();
eventSubmodule.onActionEnd.Add("Basic_Oblivion_ExhaustCard", new PrioritizedAction(() =>
base.Initialize(card);
this.card.eventSubmodule.onActionEnd.Add("Basic_Oblivion_ExhaustCard", new PrioritizedAction(() =>
{
List<CardInstance> handPile = user.deckSubmodule.HandPile;
if (handPile.Contains(cardInstance))
if (handPile.Contains(card))
{
if (handPile.Filtered(CardFilter).TryGetRandom(out CardInstance randomCard))
{
@@ -31,7 +31,7 @@ namespace Continentis.Mods.Basic.Cards
{
private static bool CardFilter(CardInstance card)
{
return card.cardLogic.contentSubmodule.cardType is not CardType.Status and not CardType.Curse;
return card.contentSubmodule.cardType is not CardType.Status and not CardType.Curse;
}
}
}

8
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Prick.cs
View File

@@ -9,18 +9,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class Prick : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.1f, target => user.Attack(target, GetFinalDamage(target))));
new Cmd_ParamFunction<CharacterBase>(0.1f, target => user.Attack(target, GetTargetedFinalDamage(target))));
return new List<CommandBase> { mainGroup };
}

8
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RadiantBolt.cs
View File

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class RadiantBolt : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
@@ -23,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target =>
{
user.Attack(target, GetFinalDamage(target));
user.Attack(target, GetTargetedFinalDamage(target));
new Blind(GetAttribute("BuffLayer_Blind")).Apply(target, user, this);
}));

6
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RayOfFrost.cs
View File

@@ -10,18 +10,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class RayOfFrost : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetFinalDamage(target))));
new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetTargetedFinalDamage(target))));
return new List<CommandBase> { mainGroup };
}

8
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RecklessAssault.cs
View File

@@ -9,18 +9,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class RecklessAssault : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.1f, target => user.Attack(target, GetFinalDamage(target))));
new Cmd_ParamFunction<CharacterBase>(0.1f, target => user.Attack(target, GetTargetedFinalDamage(target))));
return new List<CommandBase> { mainGroup };
}

6
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Recollection.cs
View File

@@ -9,12 +9,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class Recollection : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_SelectCustomCards>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
@@ -27,7 +27,7 @@ namespace Continentis.Mods.Basic.Cards
public void SelectEffect(CardInstance card)
{
CommandQueueManager.Instance.AddCommand(new Cmd_DrawCards(owner.deckSubmodule, new List<CardInstance>() { card }, 0.1f));
CommandQueueManager.Instance.AddCommand(new Cmd_DrawCards(card.deck, new List<CardInstance>() { card }, 0.1f));
}
}
}

8
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs
View File

@@ -9,18 +9,18 @@ namespace Continentis.Mods.Basic.Cards
{
public class Slash : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetFinalDamage(target))));
new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetTargetedFinalDamage(target))));
return new List<CommandBase> { mainGroup };
}

6
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Strike.cs
View File

@@ -11,12 +11,12 @@ namespace Continentis.Mods.Basic.Cards
{
public class Strike : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Cards
foreach (Cmd_PlayAnimation cmd in mainGroup.GetAllCommands<Cmd_PlayAnimation>())
{
cmd.AddAction<CharacterBase>(0.7f, "Target", target => user.Attack(target, GetFinalDamage(target)));
cmd.AddAction<CharacterBase>(0.7f, "Target", target => user.Attack(target, GetTargetedFinalDamage(target)));
}
return new List<CommandBase> { mainGroup };

2
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/ThinkingCountermeasures.cs
View File

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
{
public class ThinkingCountermeasures : CardLogicBase
{
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
user.deckSubmodule.DrawCards(GetAttribute("DrawCardAmount")));

10
Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/WindBlade.cs
View File

@@ -9,17 +9,17 @@ namespace Continentis.Mods.Basic.Cards
{
public class WindBlade : CardLogicBase
{
protected override void SetUpLogicComponents()
public override void SetUpLogicComponents()
{
AddLogicComponent<CardLogicComponent_Attack>();
}
protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
public override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
{
base.PlayEffect(targetList);
CommandGroup mainGroup = TargetListCommandGroup(targetList,
new Cmd_PlayAnimation(user.characterView, "Attack"),
new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetFinalDamage(target))));
new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetTargetedFinalDamage(target))));
return new List<CommandBase> { mainGroup };
}
@@ -29,7 +29,7 @@ namespace Continentis.Mods.Basic.Cards
LogicComponent<CardLogicComponent_Attack>().SetDamage_Arcane();
}
public override int GetFinalDamage(CharacterBase target, List<string> elementalTags = null)
public override int GetTargetedFinalDamage(CharacterBase target, List<string> elementalTags = null)
{
float baseDamageFromSuppress = 0;