diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs index c93ecbf8..d1c04769 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs @@ -1,5 +1,6 @@ -using Continentis.MainGame.Card; +using Continentis.MainGame.Card; using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; using SLSFramework.General; using System.Collections.Generic; @@ -9,7 +10,32 @@ namespace Continentis.Mods.Basic.Cards { protected override List PlayEffect(List targetList) { - return base.PlayEffect(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(target => + { + var extraDamage = 0; + if (target.combatBuffSubmodule.HasBuff()) + { + extraDamage = target.combatBuffSubmodule.GetBuff().unitedStackSubmodule.stackAmount; + } + user.Attack(target, GetFinalDamage(target)); + })); + + return new List { mainGroup }; + } + + public override int GetFinalDamage(CharacterBase target, List elementalTags = null) + { + var baseDamage = base.GetFinalDamage(target, elementalTags); + var extraDamage = 0; + if (target.combatBuffSubmodule.HasBuff()) + { + extraDamage = target.combatBuffSubmodule.GetBuff().unitedStackSubmodule.stackAmount; + } + return baseDamage + extraDamage; } } } diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv index d7b7a1f0..3bdcf0e9 100644 --- a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv +++ b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv @@ -5,14 +5,14 @@ Card_Basic_CompoundPoison_DisplayName,Compound Poison,混合毒药,,,,, Card_Basic_CompoundPoison_FunctionText,Test Description,给予$Attribute("BuffStack_Weak")层$Keyword("Basic_Weak")。\n目标每有一种负面效果,给予$Attribute("BuffStack_Corrosion")层$Keyword("Basic_Corrosion")。,,,,, Card_Basic_WoundDeterioration_DisplayName,Compound Poison,恶化伤口,,,,, Card_Basic_WoundDeterioration_FunctionText,Test Description,单次造成至少$Attribute("DamageCount")点伤害时,额外给予$Attribute("BuffStack")层$Keyword("Basic_Corrosion")。,,,,, -Card_Basic_Ambush_DisplayName,Ambush,埋伏(TODO),,,,, +Card_Basic_Ambush_DisplayName,Ambush,埋伏,,,,, Card_Basic_Ambush_FunctionText,Test Description,将1张“奋起”加入公共牌组。,,,,, Card_Basic_Stealth_DisplayName,Stealth,潜行,,,,, Card_Basic_Stealth_FunctionText,Test Description,将弃牌堆洗回牌库。\n抽$Attribute("DrawCount")张牌。,,,,, -Card_Basic_KnifeTrick_DisplayName,Knife Trick,刀具把戏(TODO),,,,, +Card_Basic_KnifeTrick_DisplayName,Knife Trick,刀具把戏,,,,, Card_Basic_KnifeTrick_FunctionText,Test Description,每次失去所有$Keyword("Basic_Sharpness")后,获得$Attribute("BuffStack")层$Keyword("Basic_Sharpness")。,,,,, -Card_Basic_ExtremePain_DisplayName,Extreme Pain,极端痛苦(TODO),,,,, -Card_Basic_ExtremePain_FunctionText,Test Description,TODO,,,,, +Card_Basic_ExtremePain_DisplayName,Extreme Pain,极端痛苦,,,,, +Card_Basic_ExtremePain_FunctionText,Test Description,造成$Attribute("Damage")点伤害,目标额外受到$Keyword("Basic_Corrosion")层数点伤害。,,,,, Card_Basic_BladeOfFear_DisplayName,Blade of Fear,怖刃(TODO),,,,, Card_Basic_BladeOfFear_FunctionText,Test Description,TODO,,,,, Card_Basic_AmbushStance_DisplayName,Ambush Stance,伺机待发(TODO),,,,, diff --git a/Assets/UMod/Resources/Settings/ExportSettings.asset b/Assets/UMod/Resources/Settings/ExportSettings.asset index 33789786..3a71ba90 100644 --- a/Assets/UMod/Resources/Settings/ExportSettings.asset +++ b/Assets/UMod/Resources/Settings/ExportSettings.asset @@ -27,8 +27,8 @@ MonoBehaviour: modAuthor: Soullies modVersion: 0.0.1 modDescription: Basic Content of Continentis - modAssetPath: D:/Projects/Continentis/Assets/Mods/Basic - modExportPath: D:/Projects/Continentis/Assets/ExportedMods + modAssetPath: X:/Projects/Unity/Others/Soulies_Cards/Assets/Mods/Basic + modExportPath: X:/Projects/Unity/Others/Soulies_Cards/Assets/ExportedMods modIcon: {fileID: 2800000, guid: f6735e582463aa3409372b4c7689192c, type: 3} logLevel: 3 optimizeMode: 0