From b23b02a3c1309f328aa34a107e76fd7ccf25aea5 Mon Sep 17 00:00:00 2001 From: FrazeRIP <36977197+FrazeRIP@users.noreply.github.com> Date: Wed, 5 Nov 2025 00:44:59 -0600 Subject: [PATCH] Torture is basically done --- .gitignore | 3 ++- Assets/ExportedMods/Basic.umod | 4 ++-- .../Assassin/CardData_Basic_Torture.asset | 7 ++++++- .../Mods/Basic/Cards/Scripts/Assassin/Torture.cs | 14 ++++++++++---- .../Basic/Characters/CombatBuffs/Assassin.meta | 8 ++++++++ .../Localization_Basic_AssassinCards.csv | 2 +- 6 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 Assets/Mods/Basic/Characters/CombatBuffs/Assassin.meta diff --git a/.gitignore b/.gitignore index f9e14436..56ab03c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + # ---> Unity # This .gitignore file should be placed at the root of your Unity project directory # @@ -75,4 +76,4 @@ crashlytics-build.properties # Temporary auto-generated Android Assets /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* -/[Aa]ssets/[Ee]xportedMods/* +/[Aa]ssets/[Ee]xportedMods/** diff --git a/Assets/ExportedMods/Basic.umod b/Assets/ExportedMods/Basic.umod index 2f4380e4..0e3e2bda 100644 --- a/Assets/ExportedMods/Basic.umod +++ b/Assets/ExportedMods/Basic.umod @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cb18cafbafa4abf59d881c0ca280feaa21d093bba43cb2caefcaff074e8bd68 -size 484662204 +oid sha256:68a9791cf9f91cc5970263116a8c808573097b254f64247d11ab4ab3eb3f9d02 +size 484663644 diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Torture.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Torture.asset index d571e07b..ecce19e3 100644 --- a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Torture.asset +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Torture.asset @@ -19,6 +19,7 @@ MonoBehaviour: cardType: 10 keywords: - TargetSelf + - TargetEnemies cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} cardLayoutTags: [] functionText: Card_Basic_Torture_FunctionText @@ -27,7 +28,7 @@ MonoBehaviour: variableAttributes: dictionaryList: - Key: TargetCount - Value: 0 + Value: -1 index: 0 isKeyDuplicated: 0 - Key: StaminaCost @@ -42,6 +43,10 @@ MonoBehaviour: Value: 1 index: 3 isKeyDuplicated: 0 + - Key: MagicNumber + Value: 1 + index: 4 + isKeyDuplicated: 0 dividerPosProp: 0.5 originalAttributes: dictionaryList: [] diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs index 47db288b..4838ae15 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs @@ -1,6 +1,7 @@ using Continentis.MainGame.Card; using Continentis.MainGame.Character; using Continentis.MainGame.Commands; +using Continentis.Mods.Basic.Buffs; using MoreMountains.Tools; using SLSFramework.General; using System.Collections.Generic; @@ -11,10 +12,15 @@ namespace Continentis.Mods.Basic.Cards { protected override CommandBase PlayEffect(List targetList) { - CommandGroup mainGroup = user.deckSubmodule.DrawCards(1); - mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill")); - - //Todo: All enemy apply debuff + CommandQueueManager.Instance.AddCommand(user.deckSubmodule.DrawCards(GetAttribute("DrawCardAmount"))); + CommandGroup mainGroup = TargetListCommandGroup(targetList, + new Cmd_ParamFunction(0.05f, target => + { + if (target != user) + { + CreateCharacterBuff(GetAttribute("MagicNumber")).Apply(target, user, this); + } + })); return mainGroup; } } diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/Assassin.meta b/Assets/Mods/Basic/Characters/CombatBuffs/Assassin.meta new file mode 100644 index 00000000..79ad17b6 --- /dev/null +++ b/Assets/Mods/Basic/Characters/CombatBuffs/Assassin.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0117a21d05f91074e9e621b631a13f43 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv index baa01687..6e366527 100644 --- a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv +++ b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv @@ -1,3 +1,3 @@ Key,English,Simplified Chinese,Traditional Chinese,Japanese,Korean,Vietnamese,Thai Card_Basic_Torture_DisplayName,Torture,折磨,,,,, -Card_Basic_Torture_FunctionText,Test,抽一张牌,并折磨程序员,,,,, +Card_Basic_Torture_FunctionText,Test,抽$Attribute("DrawCardAmount")张牌,\n给予所有敌人$Attribute("MagicNumber")层腐蚀。,,,,,