diff --git a/Assets/Mods/Basic/Basic_Manifest.asset b/Assets/Mods/Basic/Basic_Manifest.asset index d80b8e48..d1aed5fa 100644 --- a/Assets/Mods/Basic/Basic_Manifest.asset +++ b/Assets/Mods/Basic/Basic_Manifest.asset @@ -50,7 +50,15 @@ MonoBehaviour: - CardData_Basic_Dazed - CardData_Basic_Faint - CardData_Basic_Oblivion + - CardData_Basic_Ambush + - CardData_Basic_AmbushStance + - CardData_Basic_Backstab + - CardData_Basic_BladeOfFear - CardData_Basic_CompoundPosion + - CardData_Basic_ExtremePain + - CardData_Basic_FlashTerror + - CardData_Basic_KnifeTrick + - CardData_Basic_Stealth - CardData_Basic_Torture - CardData_Basic_WoundDeterioration - CardData_Basic_LessRestoration diff --git a/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_HolyWaterPreparation.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_HolyWaterPreparation.asset index b59ff326..35b20a05 100644 --- a/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_HolyWaterPreparation.asset +++ b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_HolyWaterPreparation.asset @@ -17,9 +17,10 @@ MonoBehaviour: displayName: Card_Basic_HolyWaterPreparation_DisplayName cardRarity: 20 cardType: 10 - tags: - - TargetSelf + keywords: [] cardSprite: {fileID: 21300000, guid: 12363d2684ec21944b784f4708f4f2d4, type: 3} + cardLayoutTags: + - TargetSelf functionText: Card_Basic_HolyWaterPreparation_FunctionText cardDescription: $Keyword("Innate"), create a bottle of Holy Water into team pile. baseWeight: 1 diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Ambush.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Ambush.asset new file mode 100644 index 00000000..5d42c20a --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Ambush.asset @@ -0,0 +1,62 @@ +%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: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} + m_Name: CardData_Basic_Ambush + m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + modName: Basic + className: Ambush + displayName: Card_Basic_Ambush_DisplayName + cardRarity: 20 + cardType: 10 + keywords: + - TargetSelf + cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Ambush_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: 0 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 1 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: CardCount + Value: 1 + index: 3 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: + - CardData_Basic_Rouse + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Ambush.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Ambush.asset.meta new file mode 100644 index 00000000..0aa7c0ab --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Ambush.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4953547729b6c174bb500a01c8b16881 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_AmbushStance.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_AmbushStance.asset new file mode 100644 index 00000000..067ca917 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_AmbushStance.asset @@ -0,0 +1,61 @@ +%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: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} + m_Name: CardData_Basic_AmbushStance + m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + modName: Basic + className: AmbushStance + displayName: Card_Basic_AmbushStance_DisplayName + cardRarity: 20 + cardType: 20 + keywords: + - TargetSelf + cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_AmbushStance_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: 0 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 2 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: BuffStack + Value: 1 + index: 3 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: [] + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_AmbushStance.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_AmbushStance.asset.meta new file mode 100644 index 00000000..2ae8f000 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_AmbushStance.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 863b42ac1c414064399c26a3bb2ec771 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Backstab.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Backstab.asset new file mode 100644 index 00000000..f860dc4d --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Backstab.asset @@ -0,0 +1,61 @@ +%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: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} + m_Name: CardData_Basic_Backstab + m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + modName: Basic + className: Backstab + displayName: Card_Basic_Backstab_DisplayName + cardRarity: 20 + cardType: 0 + keywords: + - TargetEnemies + cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Backstab_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: 1 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 1 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: Damage + Value: 8 + index: 3 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: [] + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Backstab.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Backstab.asset.meta new file mode 100644 index 00000000..81b523a1 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Backstab.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e459a8dff2d3cb44794ac1ee7b0c80e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_BladeOfFear.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_BladeOfFear.asset new file mode 100644 index 00000000..ddd8ef8e --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_BladeOfFear.asset @@ -0,0 +1,65 @@ +%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: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} + m_Name: CardData_Basic_BladeOfFear + m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + modName: Basic + className: BladeOfFear + displayName: Card_Basic_BladeOfFear_DisplayName + cardRarity: 20 + cardType: 0 + keywords: + - TargetEnemies + cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_BladeOfFear_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: 1 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 2 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: Damage + Value: 5 + index: 3 + isKeyDuplicated: 0 + - Key: BuffStack + Value: 5 + index: 4 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: [] + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_BladeOfFear.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_BladeOfFear.asset.meta new file mode 100644 index 00000000..c8c8cbc6 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_BladeOfFear.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d43ff6c21aa08c45afe1f00098bc8a7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_CompoundPosion.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_CompoundPosion.asset index 76240850..b10a87de 100644 --- a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_CompoundPosion.asset +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_CompoundPosion.asset @@ -61,6 +61,5 @@ MonoBehaviour: upgradeCards: [] customDescriptions: [] prefabRefs: [] - derivativeCardDataRefs: - - CardData_Basic_Strike + derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_ExtremePain.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_ExtremePain.asset new file mode 100644 index 00000000..dff52442 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_ExtremePain.asset @@ -0,0 +1,61 @@ +%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: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} + m_Name: CardData_Basic_ExtremePain + m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + modName: Basic + className: ExtremePain + displayName: Card_Basic_ExtremePain_DisplayName + cardRarity: 20 + cardType: 0 + keywords: + - TargetEnemies + cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_ExtremePain_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: 1 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 1 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: Damage + Value: 12 + index: 3 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: [] + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_ExtremePain.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_ExtremePain.asset.meta new file mode 100644 index 00000000..76e1ab41 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_ExtremePain.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2144b44a8c68f474ca1b1d08c9a08746 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_FlashTerror.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_FlashTerror.asset new file mode 100644 index 00000000..8e83e1f6 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_FlashTerror.asset @@ -0,0 +1,61 @@ +%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: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} + m_Name: CardData_Basic_FlashTerror + m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + modName: Basic + className: FlashTerror + displayName: Card_Basic_FlashTerror_DisplayName + cardRarity: 20 + cardType: 10 + keywords: + - TargetEnemies + cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_FlashTerror_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: -1 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 0 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: BuffStack + Value: 2 + index: 3 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: [] + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_FlashTerror.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_FlashTerror.asset.meta new file mode 100644 index 00000000..a398c0eb --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_FlashTerror.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7fb29c3d7122934cbf1d544e803b6dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_KnifeTrick.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_KnifeTrick.asset new file mode 100644 index 00000000..21faa8a0 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_KnifeTrick.asset @@ -0,0 +1,61 @@ +%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: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} + m_Name: CardData_Basic_KnifeTrick + m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + modName: Basic + className: KnifeTrick + displayName: Card_Basic_KnifeTrick_DisplayName + cardRarity: 20 + cardType: 20 + keywords: + - TargetSelf + cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_KnifeTrick_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: 0 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 2 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: BuffStack + Value: 4 + index: 3 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: [] + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_KnifeTrick.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_KnifeTrick.asset.meta new file mode 100644 index 00000000..dc9c5347 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_KnifeTrick.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d1c12aaf526cdb46837223b914e3fae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Stealth.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Stealth.asset new file mode 100644 index 00000000..a45e5bc7 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Stealth.asset @@ -0,0 +1,61 @@ +%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: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} + m_Name: CardData_Basic_Stealth + m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + modName: Basic + className: Stealth + displayName: Card_Basic_Stealth_DisplayName + cardRarity: 20 + cardType: 10 + keywords: + - TargetSelf + cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Stealth_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: 0 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 1 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: DrawCount + Value: 3 + index: 3 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: [] + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Stealth.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Stealth.asset.meta new file mode 100644 index 00000000..324a71b9 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_Stealth.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f83a04c863056eb4cb0e846a4ef4fd5a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: 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 5cec42ee..bb679583 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 @@ -39,11 +39,11 @@ MonoBehaviour: Value: 0 index: 2 isKeyDuplicated: 0 - - Key: DrawCardAmount + - Key: DrawCount Value: 1 index: 3 isKeyDuplicated: 0 - - Key: BuffStack_Corrosion + - Key: BuffStack Value: 1 index: 4 isKeyDuplicated: 0 @@ -62,6 +62,5 @@ MonoBehaviour: upgradeCards: [] customDescriptions: [] prefabRefs: [] - derivativeCardDataRefs: - - CardData_Basic_Strike + derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_WoundDeterioration.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_WoundDeterioration.asset index fe96e8d5..cb387c98 100644 --- a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_WoundDeterioration.asset +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Assassin/CardData_Basic_WoundDeterioration.asset @@ -38,11 +38,11 @@ MonoBehaviour: Value: 0 index: 2 isKeyDuplicated: 0 - - Key: DrawCardAmount + - Key: DrawCount Value: 1 index: 3 isKeyDuplicated: 0 - - Key: BuffStack_WD + - Key: BuffStack Value: 4 index: 4 isKeyDuplicated: 0 @@ -65,6 +65,5 @@ MonoBehaviour: upgradeCards: [] customDescriptions: [] prefabRefs: [] - derivativeCardDataRefs: - - CardData_Basic_Strike + derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Ambush.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/Ambush.cs new file mode 100644 index 00000000..109795b5 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Ambush.cs @@ -0,0 +1,32 @@ +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; +using NUnit.Framework.Internal.Filters; +using SLSFramework.General; +using System.Collections.Generic; +using UnityEngine; + +namespace Continentis.Mods.Basic.Cards +{ + public class Ambush : CardLogicBase + { + protected override void SetUpLogicComponents() + { + AddLogicComponent(); + } + + protected override List PlayEffect(List targetList) + { + CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential); + mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill")); + mainGroup.AddCommand(new Cmd_Function(() => + { + CardData cardData = GetDerivativeCardData(0); + Debug.LogError(cardData.displayName); + CardInstance.GenerateCardInstance(cardData, user.team, "Hand"); + })); + + return new List { mainGroup }; + } + } +} diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Ambush.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Assassin/Ambush.cs.meta new file mode 100644 index 00000000..7a6f1013 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Ambush.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b19b39e60ae48444c95d9289dc952107 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/AmbushStance.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/AmbushStance.cs new file mode 100644 index 00000000..dd2b0d74 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/AmbushStance.cs @@ -0,0 +1,15 @@ +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using SLSFramework.General; +using System.Collections.Generic; + +namespace Continentis.Mods.Basic.Cards +{ + public class AmbushStance : CardLogicBase + { + protected override List PlayEffect(List targetList) + { + return base.PlayEffect(targetList); + } + } +} diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/AmbushStance.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Assassin/AmbushStance.cs.meta new file mode 100644 index 00000000..af95b7f0 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/AmbushStance.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9b47c680dd1337840b91b925ef86e635 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs new file mode 100644 index 00000000..fdd8d1e2 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs @@ -0,0 +1,15 @@ +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using SLSFramework.General; +using System.Collections.Generic; + +namespace Continentis.Mods.Basic.Cards +{ + public class Backstab : CardLogicBase + { + protected override List PlayEffect(List targetList) + { + return base.PlayEffect(targetList); + } + } +} diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs.meta new file mode 100644 index 00000000..0944c258 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Backstab.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b41fb03d7937c154b9dedab2fd72e81f \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/BladeOfFear.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/BladeOfFear.cs new file mode 100644 index 00000000..0b485000 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/BladeOfFear.cs @@ -0,0 +1,15 @@ +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using SLSFramework.General; +using System.Collections.Generic; + +namespace Continentis.Mods.Basic.Cards +{ + public class BladeOfFear : CardLogicBase + { + protected override List PlayEffect(List targetList) + { + return base.PlayEffect(targetList); + } + } +} diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/BladeOfFear.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Assassin/BladeOfFear.cs.meta new file mode 100644 index 00000000..c7e46b7c --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/BladeOfFear.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: de6bd3c09b2925046a1e25a562cca030 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs new file mode 100644 index 00000000..c93ecbf8 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs @@ -0,0 +1,15 @@ +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using SLSFramework.General; +using System.Collections.Generic; + +namespace Continentis.Mods.Basic.Cards +{ + public class ExtremePain : CardLogicBase + { + protected override List PlayEffect(List targetList) + { + return base.PlayEffect(targetList); + } + } +} diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs.meta new file mode 100644 index 00000000..0f78acac --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/ExtremePain.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 025365c127c0a0d4697d1b7ebdd22a0d \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/FlashTerror.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/FlashTerror.cs new file mode 100644 index 00000000..2b0996eb --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/FlashTerror.cs @@ -0,0 +1,15 @@ +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using SLSFramework.General; +using System.Collections.Generic; + +namespace Continentis.Mods.Basic.Cards +{ + public class FlashTerror : CardLogicBase + { + protected override List PlayEffect(List targetList) + { + return base.PlayEffect(targetList); + } + } +} diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/FlashTerror.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Assassin/FlashTerror.cs.meta new file mode 100644 index 00000000..77259579 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/FlashTerror.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c22de886be072a2499a681b976bb0907 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/KnifeTrick.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/KnifeTrick.cs new file mode 100644 index 00000000..bbec8644 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/KnifeTrick.cs @@ -0,0 +1,15 @@ +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using SLSFramework.General; +using System.Collections.Generic; + +namespace Continentis.Mods.Basic.Cards +{ + public class KnifeTrick : CardLogicBase + { + protected override List PlayEffect(List targetList) + { + return base.PlayEffect(targetList); + } + } +} diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/KnifeTrick.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Assassin/KnifeTrick.cs.meta new file mode 100644 index 00000000..f8400f02 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/KnifeTrick.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5f9dc3416c7ec564db47fbe922672a89 diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Stealth.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/Stealth.cs new file mode 100644 index 00000000..e316a251 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Stealth.cs @@ -0,0 +1,22 @@ +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; +using SLSFramework.General; +using System.Collections.Generic; + +namespace Continentis.Mods.Basic.Cards +{ + public class Stealth : CardLogicBase + { + protected override List PlayEffect(List targetList) + { + var mainGroup = new CommandGroup(ExecutionMode.Sequential); + mainGroup.AddCommand(new Cmd_Function(() => + { + user.deckSubmodule.ReshuffleDeck(); + })); + mainGroup.AddCommand(user.deckSubmodule.DrawCards(GetAttribute("DrawCount"))); + return new List { mainGroup }; + } + } +} diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Stealth.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Assassin/Stealth.cs.meta new file mode 100644 index 00000000..cc5bc5a1 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Stealth.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6ba8c3ed31d4647468104483b8196621 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs index 76eab207..2d70a4e4 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs @@ -2,7 +2,6 @@ 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; @@ -12,13 +11,13 @@ namespace Continentis.Mods.Basic.Cards { protected override List PlayEffect(List targetList) { - CommandQueueManager.Instance.AddCommand(user.deckSubmodule.DrawCards(GetAttribute("DrawCardAmount"))); + CommandQueueManager.Instance.AddCommand(user.deckSubmodule.DrawCards(GetAttribute("DrawCount"))); CommandGroup mainGroup = TargetListCommandGroup(targetList, new Cmd_ParamFunction(0.05f, target => { if (target != user) { - CreateCharacterBuff(GetAttribute("BuffStack_Corrosion")).Apply(target, user, this); + CreateCharacterBuff(GetAttribute("BuffStack")).Apply(target, user, this); } })); return new List { mainGroup }; diff --git a/Assets/Mods/Basic/Cards/Scripts/Assassin/WoundDeterioration.cs b/Assets/Mods/Basic/Cards/Scripts/Assassin/WoundDeterioration.cs index 15959811..43ccf9cd 100644 --- a/Assets/Mods/Basic/Cards/Scripts/Assassin/WoundDeterioration.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Assassin/WoundDeterioration.cs @@ -1,7 +1,6 @@ using Continentis.MainGame.Card; using Continentis.MainGame.Character; using Continentis.MainGame.Commands; -using Continentis.Mods.Basic.Buffs; using SLSFramework.General; using System.Collections.Generic; @@ -14,7 +13,7 @@ namespace Continentis.Mods.Basic.Cards CommandGroup mainGroup = TargetListCommandGroup(targetList, new Cmd_ParamFunction(0.05f, target => { - CreateCharacterBuff(GetAttribute("BuffStack_WD"), GetAttribute("DamageCount")).Apply(target, user, this); + CreateCharacterBuff(GetAttribute("BuffStack"), GetAttribute("DamageCount")).Apply(target, user, this); })); return new List { mainGroup }; } diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs b/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs index 34173429..1706fba8 100644 --- a/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs +++ b/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; using Continentis.MainGame.Card; using Continentis.MainGame.Character; using Continentis.MainGame.Commands; using SLSFramework.General; -using UnityEngine; +using System.Collections.Generic; namespace Continentis.Mods.Basic.Cards { diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/Assassin/KnifeTrick.cs b/Assets/Mods/Basic/Characters/CombatBuffs/Assassin/KnifeTrick.cs new file mode 100644 index 00000000..9d6b4303 --- /dev/null +++ b/Assets/Mods/Basic/Characters/CombatBuffs/Assassin/KnifeTrick.cs @@ -0,0 +1,57 @@ +using Continentis.MainGame; +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.Mods.Basic.Buffs; +using SLSFramework.General; +using System.Collections.Generic; + +namespace Continentis.Mods.Basic.Buffs +{ + public class KnifeTrick : CharacterCombatBuffBase, IBuffExtension_IntegerRange + { + private bool _canTrigger = false; + + public KnifeTrick(int stack) + { + Initialize(BuffType.Positive, BuffDispelLevel.Strong); + this.contentSubmodule = new ContentSubmodule(this, false) + .AddParameterGetter("Stack", () => unitedStackSubmodule.stackAmount.ToString()); + this.iconSubmodule = new IconSubmodule(this); + this.eventSubmodule = new EventSubmodule(this); + + //TODO: Event listener for adding/removing buffs + + //this.eventSubmodule.onPreAttack.Add("KnifeTrick", new PrioritizedAction((damage) => + //{ + // if (this.attachedCharacter.combatBuffSubmodule.HasBuff()) + // { + // _canTrigger = true; + // } + //})); + + //this.eventSubmodule.onDealAttack.Add("KnifeTrick", new PrioritizedAction((result) => + //{ + // if (_canTrigger) + // { + // CreateCharacterBuff(this.unitedStackSubmodule.stackAmount).Apply(this.attachedCharacter, this.attachedCharacter); + // _canTrigger = false; + // } + //})); + + (this as IBuffExtension_IntegerRange).Initialize(stack); + } + + public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) + { + MainGameManager.Instance.basePrefabs.GenerateInfoText("Knife Trick", attachedCharacter.characterView); + if (FindExistingSameBuff(out existingBuff)) + { + existingBuff.unitedStackSubmodule.ModifyStack(this.unitedStackSubmodule.stackAmount); + int newStack = existingBuff.unitedStackSubmodule.stackAmount; + existingBuff.coreAttributeSubmodule.numericChange["DodgeChanceOffset"] = newStack; + return false; + } + return true; + } + } +} diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/Assassin/KnifeTrick.cs.meta b/Assets/Mods/Basic/Characters/CombatBuffs/Assassin/KnifeTrick.cs.meta new file mode 100644 index 00000000..e94e8021 --- /dev/null +++ b/Assets/Mods/Basic/Characters/CombatBuffs/Assassin/KnifeTrick.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 44b807e0cc85f4f438e1840542e98324 \ No newline at end of file diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Sharpness.cs b/Assets/Mods/Basic/Characters/CombatBuffs/General/Sharpness.cs new file mode 100644 index 00000000..c145ff3d --- /dev/null +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Sharpness.cs @@ -0,0 +1,51 @@ +using Continentis.MainGame; +using Continentis.MainGame.Character; +using SLSFramework.General; + +namespace Continentis.Mods.Basic.Buffs +{ + public class Sharpness : CharacterCombatBuffBase, IBuffExtension_IntegerRange + { + public Sharpness(int stack) + { + Initialize(BuffType.Positive, BuffDispelLevel.Strong); + + this.contentSubmodule = new ContentSubmodule(this, false) + .AddParameterGetter("Stack", () => unitedStackSubmodule.stackAmount.ToString()); + + this.iconSubmodule = new IconSubmodule(this); + + this.unitedStackSubmodule = new UnitedStackSubmodule(this, true, -1, stack, true); + + this.coreAttributeSubmodule = new CoreAttributeSubmodule(this); + this.coreAttributeSubmodule.numericChange.Add("PhysicsDamageDealtOffset", stack); + + this.eventSubmodule = new EventSubmodule(this); + this.eventSubmodule.onDealAttack.Add("Sharpness", new PrioritizedAction(atkRes => + { + if (atkRes.attacker.combatBuffSubmodule.HasBuff()) + { + atkRes.attacker.combatBuffSubmodule.GetBuff().Remove(); + } + })); + + (this as IBuffExtension_IntegerRange).Initialize(stack); + } + + public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) + { + MainGameManager.Instance.basePrefabs.GenerateInfoText("Sharpness", attachedCharacter.characterView); + + if (FindExistingSameBuff(out existingBuff)) + { + existingBuff.unitedStackSubmodule.ModifyStack(this.unitedStackSubmodule.stackAmount); + + int newStack = existingBuff.unitedStackSubmodule.stackAmount; + existingBuff.coreAttributeSubmodule.numericChange["PhysicsDamageDealtOffset"] = newStack; + return false; + } + + return true; + } + } +} diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Sharpness.cs.meta b/Assets/Mods/Basic/Characters/CombatBuffs/General/Sharpness.cs.meta new file mode 100644 index 00000000..9a7c943f --- /dev/null +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Sharpness.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3269dfba0fee4fa4ea1eeecb87b9f71b \ No newline at end of file diff --git a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Assassin.asset b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Assassin.asset index a2549952..ad7a25fc 100644 --- a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Assassin.asset +++ b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Assassin.asset @@ -160,7 +160,7 @@ MonoBehaviour: index: 25 isKeyDuplicated: 0 - Key: DrawCardAmountPerAction - Value: 4 + Value: 10 index: 26 isKeyDuplicated: 0 - Key: Awareness @@ -202,10 +202,15 @@ MonoBehaviour: derivativeCharacterDataRefs: [] initialDeckRef: - CardData_Basic_Torture - - CardData_Basic_Torture - - CardData_Basic_Torture - CardData_Basic_CompoundPosion - CardData_Basic_WoundDeterioration - - CardData_Basic_DivineSmite + - CardData_Basic_Ambush + - CardData_Basic_AmbushStance + - CardData_Basic_Stealth + - CardData_Basic_KnifeTrick + - CardData_Basic_ExtremePain + - CardData_Basic_BladeOfFear + - CardData_Basic_Backstab + - CardData_Basic_FlashTerror hudDataRefs: - HUDData_Basic_Default diff --git a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Cleric.asset b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Cleric.asset index f53af3a3..e2b130d6 100644 --- a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Cleric.asset +++ b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Cleric.asset @@ -202,5 +202,6 @@ MonoBehaviour: derivativeCharacterDataRefs: [] initialDeckRef: - CardData_Basic_LessRestoration + - CardData_Basic_HolyWaterPreparation hudDataRefs: - HUDData_Basic_Default diff --git a/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff.asset b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff.asset index bf03eb47..fdbac28b 100644 --- a/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff.asset +++ b/Assets/Mods/Basic/Keywords/KeywordData_Basic_Buff.asset @@ -32,5 +32,29 @@ 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 + 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 + isKeyDuplicated: 0 dividerPosProp: 0.2 - keywordToAdd: Basic_Heavy + keywordToAdd: Basic_KnifeTrick diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinBuffs.csv b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinBuffs.csv index 95645844..4906789b 100644 --- a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinBuffs.csv +++ b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinBuffs.csv @@ -1,3 +1,7 @@ Key,English,Simplified Chinese,Traditional Chinese,Japanese,Korean,Vietnamese,Thai Buff_Basic_WoundDeterioration_DisplayName,Wound Deterioration,恶化伤口,,,,, -Buff_Basic_WoundDeterioration_FunctionText,TODO,你单次造成至少$ParameterInt("Damage")点的伤害时，额外给予$ParameterInt("BuffStack_Corrosion")层腐蚀,,,,, +Buff_Basic_WoundDeterioration_FunctionText,TODO,你单次造成至少$ParameterInt("Damage")点的伤害时，额外给予$ParameterInt("Stack")%层$Keyword("Basic_WoundDeterioration")。,,,,, +Buff_Basic_Sharpness_DisplayName,Sharpness,锋利,,,,, +Buff_Basic_Sharpness_FunctionText,TODO,下次攻击将造成额外$ParameterInt("Stack")点伤害并失去所有层数。,,,,, +Buff_Basic_KnifeTrick_DisplayName,Knife Trick,刀具把戏,,,,, +Buff_Basic_KnifeTrick_FunctionText,TODO,每次失去所有$Keyword("Basic_Sharpness")后，获得$ParameterInt("Stack")层$Keyword("Basic_Sharpness")。,,,,, diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv index 6f703c51..d7b7a1f0 100644 --- a/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv +++ b/Assets/Mods/Basic/Localization/Localization_Basic_AssassinCards.csv @@ -1,7 +1,23 @@ Key,English,Simplified Chinese,Traditional Chinese,Japanese,Korean,Vietnamese,Thai Card_Basic_Torture_DisplayName,Torture,折磨,,,,, -Card_Basic_Torture_FunctionText,Test Description,抽$Attribute("DrawCardAmount")张牌，\n给予所有敌人$Attribute("BuffStack_Corrosion")层腐蚀。,,,,, +Card_Basic_Torture_FunctionText,Test Description,抽$Attribute("DrawCount")张牌。\n给予所有敌人$Attribute("BuffStack")层$Keyword("Basic_Corrosion")。,,,,, Card_Basic_CompoundPoison_DisplayName,Compound Poison,混合毒药,,,,, -Card_Basic_CompoundPoison_FunctionText,Test Description,给予$Attribute("BuffStack_Weak")层虚弱。\n目标每有一种负面效果，给予$Attribute("BuffStack_Corrosion")层腐蚀。,,,,, +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_Corrosion")层腐蚀。,,,,, +Card_Basic_WoundDeterioration_FunctionText,Test Description,单次造成至少$Attribute("DamageCount")点伤害时，额外给予$Attribute("BuffStack")层$Keyword("Basic_Corrosion")。,,,,, +Card_Basic_Ambush_DisplayName,Ambush,埋伏（TODO）,,,,, +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_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_BladeOfFear_DisplayName,Blade of Fear,怖刃（TODO）,,,,, +Card_Basic_BladeOfFear_FunctionText,Test Description,TODO,,,,, +Card_Basic_AmbushStance_DisplayName,Ambush Stance,伺机待发（TODO）,,,,, +Card_Basic_AmbushStance_FunctionText,Test Description,TODO,,,,, +Card_Basic_Backstab_DisplayName,Backstab,背刺（TODO）,,,,, +Card_Basic_Backstab_FunctionText,Test Description,TODO,,,,, +Card_Basic_FlashTerror_DisplayName,FlashTerror,快速威吓（TODO）,,,,, +Card_Basic_FlashTerror_FunctionText,Test Description,TODO,,,,, diff --git a/Assets/Mods/Basic/Localization/Localization_Basic_BuffKeywords.csv b/Assets/Mods/Basic/Localization/Localization_Basic_BuffKeywords.csv index 4db7b1f7..393a14e0 100644 --- a/Assets/Mods/Basic/Localization/Localization_Basic_BuffKeywords.csv +++ b/Assets/Mods/Basic/Localization/Localization_Basic_BuffKeywords.csv @@ -5,3 +5,11 @@ Keyword_Basic_Vulnerable,Vulnerable,易伤,,,,, Keyword_Basic_Vulnerable_Description,Increase 50% more physics damage gain.,增加50%受到的物理伤害。,,,,, Keyword_Basic_Heavy,Heavy,沉重,,,,, Keyword_Basic_Heavy_Description,Can not draw cards.,不能抽牌。,,,,, +Keyword_Basic_WoundDeterioration,WoundDeterioration,恶化伤口,,,,, +Keyword_Basic_WoundDeterioration_Description,"When dealing at least 20 damage in a single hit, apply 4 Corrosion to the target.",单次造成至少20点的伤害时，额外给予目标4层$Keyword("Basic_WoundDeterioration")。,,,,, +Keyword_Basic_Corrosion,Corrosion,腐蚀,,,,, +Keyword_Basic_Corrosion_Description,TODO,未知效果。,,,,, +Keyword_Basic_Sharpness,Sharpness,锋利,,,,, +Keyword_Basic_Sharpness_Description,TODO,下次攻击将造成额外等同于层数的伤害并失去所有层数。,,,,, +Keyword_Basic_KnifeTrick,Knife Trick,刀具把戏,,,,, +Keyword_Basic_KnifeTrick_Description,TODO,每次失去所有锋利后，获得4层锋利。,,,,, diff --git a/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png new file mode 100644 index 00000000..33e3c855 Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png differ diff --git a/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png.meta b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png.meta new file mode 100644 index 00000000..7bb07e0c --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Sharpness.png.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: 3c126886acf6535418c51c5e2c67347a +labels: +- UnityAI +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1024 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UMod/Resources/Settings/ExportSettings.asset b/Assets/UMod/Resources/Settings/ExportSettings.asset index 674a4392..76a1a24d 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