diff --git a/Assets/Mods/Basic/Basic_Manifest.asset b/Assets/Mods/Basic/Basic_Manifest.asset index 71ff8114..8d676069 100644 --- a/Assets/Mods/Basic/Basic_Manifest.asset +++ b/Assets/Mods/Basic/Basic_Manifest.asset @@ -15,6 +15,7 @@ MonoBehaviour: inEditorModFolder: Basic keywordDataIDList: - KeywordData_Basic_Buff + - KeywordData_Basic_Buff_Assassin - KeywordData_Basic_Default cardDataIDList: - CardData_Basic_Rouse diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_LessRestoration.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_LessRestoration.asset index ae776d0d..1b3073fa 100644 --- a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_LessRestoration.asset +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_LessRestoration.asset @@ -45,7 +45,7 @@ MonoBehaviour: Value: 3 index: 3 isKeyDuplicated: 0 - - Key: HealAmount + - Key: Heal Value: 6 index: 4 isKeyDuplicated: 0 diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_PrayerOfHealing.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_PrayerOfHealing.asset index 71491b9b..f8ed12eb 100644 --- a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_PrayerOfHealing.asset +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Cleric/CardData_Basic_PrayerOfHealing.asset @@ -45,7 +45,7 @@ MonoBehaviour: Value: 3 index: 3 isKeyDuplicated: 0 - - Key: HealAmount + - Key: Heal Value: 4 index: 4 isKeyDuplicated: 0 diff --git a/Assets/Mods/Basic/Cards/Scripts/Cleric/LessRestoration.cs b/Assets/Mods/Basic/Cards/Scripts/Cleric/LessRestoration.cs index d9709aa5..73b645ca 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Cleric/LessRestoration.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Cleric/LessRestoration.cs @@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards.Cleric new Cmd_PlayAnimation(user.characterView, "Skill"), new Cmd_ParamFunction(0.1f, target => { - target.Heal(GetAttribute("HealAmount")); + target.Heal(GetAttribute("Heal")); target.combatBuffSubmodule.Dispel(BuffDispelLevel.Basic, user); })); diff --git a/Assets/Mods/Basic/Cards/Scripts/Cleric/PrayerOfHealing.cs b/Assets/Mods/Basic/Cards/Scripts/Cleric/PrayerOfHealing.cs index a45cad04..2b9222fb 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Cleric/PrayerOfHealing.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Cleric/PrayerOfHealing.cs @@ -2,6 +2,7 @@ using Continentis.MainGame.Card; using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; using SLSFramework.General; using System.Collections.Generic; @@ -11,7 +12,14 @@ namespace Continentis.Mods.Basic.Cards.Cleric { protected override List PlayEffect(List targetList) { - return base.PlayEffect(targetList); + CommandGroup mainGroup = TargetListCommandGroup(targetList, + new Cmd_PlayAnimation(user.characterView, "Skill"), + new Cmd_ParamFunction(0.01f, target => + { + target.Heal(GetAttribute("Heal")); + })); + + return new List { mainGroup }; } } } diff --git a/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff.asset b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff.asset index fdbac28b..6c5f8188 100644 --- a/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff.asset +++ b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff.asset @@ -32,29 +32,17 @@ MonoBehaviour: description: Keyword_Basic_Heavy_Description index: 2 isKeyDuplicated: 0 - - Key: Basic_WoundDeterioration - Value: - name: Keyword_Basic_WoundDeterioration - description: Keyword_Basic_WoundDeterioration_Description - index: 3 - isKeyDuplicated: 0 - Key: Basic_Corrosion Value: name: Keyword_Basic_Corrosion description: Keyword_Basic_Corrosion_Description - index: 4 + index: 3 isKeyDuplicated: 0 - Key: Basic_Sharpness Value: name: Keyword_Basic_Sharpness description: Keyword_Basic_Sharpness_Description - index: 5 - isKeyDuplicated: 0 - - Key: Basic_KnifeTrick - Value: - name: Keyword_Basic_KnifeTrick - description: Keyword_Basic_KnifeTrick_Description - index: 6 + index: 4 isKeyDuplicated: 0 dividerPosProp: 0.2 keywordToAdd: Basic_KnifeTrick diff --git a/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff_Assassin.asset b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff_Assassin.asset new file mode 100644 index 00000000..b9e26c2a --- /dev/null +++ b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff_Assassin.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f37d7342fd3cbf4a9b837fca74655cc, type: 3} + m_Name: KeywordData_Basic_Buff_Assassin + m_EditorClassIdentifier: + interpretedKeywords: + dictionaryList: + - Key: Basic_WoundDeterioration + Value: + name: Keyword_Basic_WoundDeterioration + description: Keyword_Basic_WoundDeterioration_Description + index: 0 + isKeyDuplicated: 0 + - Key: Basic_KnifeTrick + Value: + name: Keyword_Basic_KnifeTrick + description: Keyword_Basic_KnifeTrick_Description + index: 1 + isKeyDuplicated: 0 + dividerPosProp: 0.2 + keywordToAdd: Basic_KnifeTrick diff --git a/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff_Assassin.asset.meta b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff_Assassin.asset.meta new file mode 100644 index 00000000..978c6fe6 --- /dev/null +++ b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff_Assassin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 520a82d9a75f52042b5a5c8a156034c7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Keywords/KeywordData_Basic_Default.asset b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Default.asset index 62394df1..f5fe4dbe 100644 --- a/Assets/Mods/Basic/Keywords/KeywordData_Basic_Default.asset +++ b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Default.asset @@ -110,5 +110,11 @@ MonoBehaviour: description: Keyword_Exhaustible_Description index: 15 isKeyDuplicated: 0 + - Key: Blessing + Value: + name: Keyword_Blessing + description: Keyword_Blessing_Description + index: 16 + isKeyDuplicated: 0 dividerPosProp: 0.2 - keywordToAdd: Exhaustible + keywordToAdd: Blessing diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_ClericCards.csv b/Assets/Mods/Basic/Localization/Localization_Basic_ClericCards.csv index 0d6f1be9..7b7e8173 100644 --- a/Assets/Mods/Basic/Localization/Localization_Basic_ClericCards.csv +++ b/Assets/Mods/Basic/Localization/Localization_Basic_ClericCards.csv @@ -1,8 +1,8 @@ Key,English,Simplified Chinese,Traditional Chinese,Japanese,Korean,Vietnamese,Thai Card_Basic_LessRestoration_DisplayName,Less Restoration,次级恢复术,,,,, -Card_Basic_LessRestoration_FunctionText,"$Keyword(""Exhaustible""): $Attribute(""ExhaustibleCount""), Heal $Attribute(""HealAmount"") and basic dispel target.",$Keyword("Exhaustible"): $Attribute("ExhaustibleCount")\n治疗目标$Attribute("HealAmount")点生命值，并施加弱驱散。,,,,, +Card_Basic_LessRestoration_FunctionText,"$Keyword(""Exhaustible""): $Attribute(""ExhaustibleCount""), Heal $Attribute(""HealAmount"") and basic dispel target.",$Keyword("Exhaustible"): $Attribute("ExhaustibleCount")\n治疗目标$Attribute("Heal")点生命值，并施加弱驱散。,,,,, Card_Basic_PrayerOfHealing_DisplayName,Prayer Of Healing,治疗祷言,,,,, -Card_Basic_PrayerOfHealing_FunctionText,TODO,$Keyword("Exhaustible"): $Attribute("ExhaustibleCount")\n治疗所有友方目标$Attribute("HealAmount")点生命值。,,,,, +Card_Basic_PrayerOfHealing_FunctionText,TODO,$Keyword("Exhaustible"): $Attribute("ExhaustibleCount")\n治疗所有友方目标$Attribute("Heal")点生命值。,,,,, Card_Basic_BlessedHolyWater_DisplayName,Blessed Holy Water,祝福圣水,,,,, Card_Basic_BlessedHolyWater_FunctionText,TODO,,,,,, Card_Basic_Sanctuary_DisplayName,Sanctuary,庇护术,,,,, diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_GeneralKeywords.csv b/Assets/Mods/Basic/Localization/Localization_Basic_GeneralKeywords.csv index 213e6b19..9ece4a7c 100644 --- a/Assets/Mods/Basic/Localization/Localization_Basic_GeneralKeywords.csv +++ b/Assets/Mods/Basic/Localization/Localization_Basic_GeneralKeywords.csv @@ -27,3 +27,5 @@ Keyword_Ethereal,Ethereal,虚无,,,,, Keyword_Ethereal_Description,"After you finish your action, if this card is in your hand pile, exhaust it.",你的行动结束时，如果这张卡牌在你的手牌堆中，消耗它。,,,,, Keyword_Exhaustible,Exhaustible,消耗性,,,,, Keyword_Exhaustible_Description,"After play this card for certain times, exhaust it.",在你打出这张牌一定次数之后，消耗它。,,,,, +Keyword_Blessing,Blessing,赐福,,,,, +Keyword_Blessing_Description,This card is able to target allies.,可以对队友使用这张卡牌。,,,,,