From c5c3e2c5d868a2ff23815dede2690c4e9fcebccc Mon Sep 17 00:00:00 2001 From: FrazeRIP <36977197+FrazeRIP@users.noreply.github.com> Date: Tue, 4 Nov 2025 01:00:38 -0600 Subject: [PATCH] More test --- Assets/ExportedMods/Basic.umod | 4 ++-- Assets/Mods/Basic/Basic_Manifest.asset | 4 ++++ .../Assassin/CardData_Basic_Torture.asset | 4 ++++ Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs | 13 ++++--------- .../Data/CharacterData_Basic_Assassin.asset | 4 +++- .../Localization_Basic_AssassinCards.csv | 3 +++ .../Localization_Basic_AssassinCards.csv.meta | 7 +++++++ .../UModAssistance/Editor/DataEditor.cs | 1 + 8 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv create mode 100644 Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv.meta diff --git a/Assets/ExportedMods/Basic.umod b/Assets/ExportedMods/Basic.umod index 5104df98..726515ce 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:51518351dfb2423d249e8431957023de6052a3fe599ed9f4ef2d2a7a32c76d3e -size 484659576 +oid sha256:7e03ed175d7ff7a7eb3a28840d4ddfa0844283b1f10e7c36ed56405f97f4db22 +size 484662172 diff --git a/Assets/Mods/Basic/Basic_Manifest.asset b/Assets/Mods/Basic/Basic_Manifest.asset index f3494818..59efe1bf 100644 --- a/Assets/Mods/Basic/Basic_Manifest.asset +++ b/Assets/Mods/Basic/Basic_Manifest.asset @@ -50,6 +50,7 @@ MonoBehaviour: - CardData_Basic_Dazed - CardData_Basic_Faint - CardData_Basic_Oblivion + - CardData_Basic_Torture - CardData_Basic_LessRestoration - CardData_Basic_BattlefieldExperience - CardData_Basic_BodyAsShield @@ -78,6 +79,8 @@ MonoBehaviour: - CardData_Basic_Scorch - CardData_Basic_WitchcraftRay characterDataIDList: + - CharacterData_Basic_Assassin + - CharacterData_Basic_Cleric - CharacterData_Basic_Knight - CharacterData_Basic_Mage - CharacterData_Basic_MarshalOfTheUnderworld @@ -95,3 +98,4 @@ MonoBehaviour: - {fileID: 4900000, guid: 5d66745b8665526429012762a60469bd, type: 3} - {fileID: 4900000, guid: b8e11e42fa0f82c41a2cb84cd79ccb79, type: 3} - {fileID: 4900000, guid: 240d7d7c1050c1c498575d637265ab32, type: 3} + - {fileID: 4900000, guid: 189619dba501d344ea1d0f59202d9e6d, type: 3} 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 1f1c96cf..d571e07b 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 @@ -38,6 +38,10 @@ MonoBehaviour: Value: 0 index: 2 isKeyDuplicated: 0 + - Key: DrawCardAmount + Value: 1 + index: 3 + 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 f99409ba..c639655c 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs @@ -10,15 +10,10 @@ namespace Continentis.Mods.Basic.Cards { protected override CommandBase PlayEffect(List targetList) { - CommandGroup mainGroup = TargetListCommandGroup(targetList, - new Cmd_PlayAnimation(user.characterView, "Skill"), - new Cmd_ParamFunction(0.1f, target => - { - user.deckSubmodule.DrawCards(1); - //Todo: Apply debuff - })); - - return base.PlayEffect(targetList); + CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential, new Cmd_PlayAnimation(user.characterView, "Skill")); + mainGroup.AddCommand(new Cmd_DrawCards(user.deckSubmodule, 1)); + //Todo: All enemy apply debuff + return mainGroup; } } } diff --git a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Assassin.asset b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Assassin.asset index 4c7b0bc1..a4c28f0b 100644 --- a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Assassin.asset +++ b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Assassin.asset @@ -201,6 +201,8 @@ MonoBehaviour: derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] initialDeckRef: - - CardData_Basic_TortureTest + - CardData_Basic_Torture + - CardData_Basic_Torture + - CardData_Basic_Torture hudDataRefs: - HUDData_Basic_Default diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv new file mode 100644 index 00000000..efd6d8dc --- /dev/null +++ b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv @@ -0,0 +1,3 @@ +Key,English,Simplified Chinese,Traditional Chinese,Japanese,Korean,Vietnamese,Thai +Card_Basic_Torture_DisplayName,Torture,ܖ,,,,, +Card_Basic_Torture_FunctionText,Test,??,,,,, diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv.meta b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv.meta new file mode 100644 index 00000000..b0a8122c --- /dev/null +++ b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 189619dba501d344ea1d0f59202d9e6d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScriptExtensions/UModAssistance/Editor/DataEditor.cs b/Assets/Scripts/ScriptExtensions/UModAssistance/Editor/DataEditor.cs index 5ed9da4e..51e192ab 100644 --- a/Assets/Scripts/ScriptExtensions/UModAssistance/Editor/DataEditor.cs +++ b/Assets/Scripts/ScriptExtensions/UModAssistance/Editor/DataEditor.cs @@ -37,6 +37,7 @@ namespace SLSFramework.UModAssistance if (listProperty.isExpanded) { EditorGUI.indentLevel++; + EditorGUI.indentLevel++; for (int i = 0; i < listProperty.arraySize; i++) {