diff --git a/Assets/ExportedMods/Basic.umod b/Assets/ExportedMods/Basic.umod index 83ba130c..2e689adb 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:d86bc6fd5a9d75f4809195e63520072cd83c20e817c1430a192956d56cf56034 -size 475961539 +oid sha256:5a5cc9edc8b2abd41fea0816ce2d2280c094ab23b1719550ce0f15ac9af48e9e +size 483178938 diff --git a/Assets/Mods/Basic/Basic_Manifest.asset b/Assets/Mods/Basic/Basic_Manifest.asset index 6cec9800..d01c50e0 100644 --- a/Assets/Mods/Basic/Basic_Manifest.asset +++ b/Assets/Mods/Basic/Basic_Manifest.asset @@ -17,6 +17,16 @@ MonoBehaviour: - KeywordData_Basic_Buff - KeywordData_Basic_Default cardDataIDList: + - CardData_Basic_Rouse + - CardData_Basic_Tactic + - CardData_Basic_Whimsy + - CardData_Basic_AblazeInPurgatory + - CardData_Basic_ArmyOfTheDead + - CardData_Basic_HellfireBlast + - CardData_Basic_HellfireBrand + - CardData_Basic_NecromanticInfusion + - CardData_Basic_SoulCleave + - CardData_Basic_WrathOfTheUnderworld - CardData_Basic_Bludgeon - CardData_Basic_DualStrike - CardData_Basic_FireBolt @@ -40,16 +50,11 @@ MonoBehaviour: - CardData_Basic_Dazed - CardData_Basic_Faint - CardData_Basic_Oblivion - - CardData_Basic_AblazeInPurgatory - - CardData_Basic_ArmyOfTheDead - - CardData_Basic_HellfireBlast - - CardData_Basic_HellfireBrand - - CardData_Basic_NecromanticInfusion - - CardData_Basic_SoulCleave - - CardData_Basic_WrathOfTheUnderworld + - CardData_Basic_Cover - CardData_Basic_GuardianAura - CardData_Basic_KightDefense - CardData_Basic_KnightStrike + - CardData_Basic_OathOfCourage - CardData_Basic_Smite characterDataIDList: - CharacterData_Basic_Knight diff --git a/Assets/Mods/Basic/Cards/Data/General.meta b/Assets/Mods/Basic/Cards/Data/General.meta index 2791731c..bd2222ad 100644 --- a/Assets/Mods/Basic/Cards/Data/General.meta +++ b/Assets/Mods/Basic/Cards/Data/General.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bdd687a29a300845bc0610ed4b51101 +guid: bc492abc2479ff74093ccc1c639988fd folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Rouse.asset b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Rouse.asset new file mode 100644 index 00000000..0b80b261 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Rouse.asset @@ -0,0 +1,58 @@ +%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_Rouse + m_EditorClassIdentifier: + modName: Basic + className: Rouse + displayName: Card_Basic_Rouse_DisplayName + cardRarity: 0 + cardType: 10 + keywords: + - Exhaust + - TargetSelf + cardSprite: {fileID: 21300000, guid: e5967a626b6f39b49ba395ee29017963, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Rouse_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: StaminaCost + Value: 0 + index: 0 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 1 + index: 1 + isKeyDuplicated: 0 + - Key: TargetCount + Value: 0 + index: 2 + 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/General/CardData_Basic_Rouse.asset.meta b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Rouse.asset.meta new file mode 100644 index 00000000..57a8a221 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Rouse.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c11da93ec03b3c247a90bd82c7f6bf80 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Tactic.asset b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Tactic.asset new file mode 100644 index 00000000..a8ad066f --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Tactic.asset @@ -0,0 +1,58 @@ +%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_Tactic + m_EditorClassIdentifier: + modName: Basic + className: Tactic + displayName: Card_Basic_Tactic_DisplayName + cardRarity: 0 + cardType: 10 + keywords: + - Exhaust + - TargetSelf + cardSprite: {fileID: 21300000, guid: f1bce6b8b267f1e49ac238ada47a77e1, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Tactic_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: StaminaCost + Value: 1 + index: 0 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 1 + isKeyDuplicated: 0 + - Key: TargetCount + Value: 0 + index: 2 + 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/General/CardData_Basic_Tactic.asset.meta b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Tactic.asset.meta new file mode 100644 index 00000000..078cc87c --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Tactic.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7851c5c44fc59847b8ac23672287f73 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Whimsy.asset b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Whimsy.asset new file mode 100644 index 00000000..30d543f2 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Whimsy.asset @@ -0,0 +1,58 @@ +%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_Whimsy + m_EditorClassIdentifier: + modName: Basic + className: Whimsy + displayName: Card_Basic_Whimsy_DisplayName + cardRarity: 0 + cardType: 10 + keywords: + - Exhaust + - TargetSelf + cardSprite: {fileID: 21300000, guid: e3221876ab05378478e7e47a4035eee2, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Whimsy_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: StaminaCost + Value: 1 + index: 0 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 1 + isKeyDuplicated: 0 + - Key: TargetCount + Value: 0 + index: 2 + 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/General/CardData_Basic_Whimsy.asset.meta b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Whimsy.asset.meta new file mode 100644 index 00000000..09d6cd24 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/General/CardData_Basic_Whimsy.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a3f10e9586d14a4b98370bd76d73f1b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral.meta new file mode 100644 index 00000000..2791731c --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7bdd687a29a300845bc0610ed4b51101 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Bludgeon.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Bludgeon.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Bludgeon.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Bludgeon.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Bludgeon.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Bludgeon.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Bludgeon.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Bludgeon.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_DualStrike.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_DualStrike.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_DualStrike.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_DualStrike.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_DualStrike.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_DualStrike.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_DualStrike.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_DualStrike.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_FireBolt.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_FireBolt.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_FireBolt.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_FireBolt.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_FireBolt.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_FireBolt.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_FireBolt.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_FireBolt.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_HeavySlash.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_HeavySlash.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_HeavySlash.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_HeavySlash.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_HeavySlash.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_HeavySlash.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_HeavySlash.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_HeavySlash.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Prick.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Prick.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Prick.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Prick.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Prick.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Prick.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Prick.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Prick.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RadiantBolt.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RadiantBolt.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RadiantBolt.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RadiantBolt.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RadiantBolt.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RadiantBolt.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RadiantBolt.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RadiantBolt.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RayOfFrost.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RayOfFrost.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RayOfFrost.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RayOfFrost.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RayOfFrost.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RayOfFrost.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RayOfFrost.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RayOfFrost.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RecklessAssault.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RecklessAssault.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RecklessAssault.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RecklessAssault.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RecklessAssault.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RecklessAssault.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_RecklessAssault.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_RecklessAssault.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Slash.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Slash.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Slash.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Slash.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Slash.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Slash.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Slash.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Slash.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Strike.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Strike.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Strike.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Strike.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Strike.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Strike.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_Strike.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_Strike.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_WindBlade.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_WindBlade.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_WindBlade.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_WindBlade.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_WindBlade.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_WindBlade.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Attack/CardData_Basic_WindBlade.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Attack/CardData_Basic_WindBlade.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Curse.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Curse.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Curse.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Curse.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Item.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Item.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_CommomHolyWater.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset similarity index 97% rename from Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_CommomHolyWater.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset index 78216600..be8c82bc 100644 --- a/Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_CommomHolyWater.asset +++ b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset @@ -17,9 +17,9 @@ MonoBehaviour: displayName: Card_Basic_CommonHolyWater_DisplayName cardRarity: 10 cardType: 50 - tags: - - TargetCount + keywords: [] cardSprite: {fileID: 21300000, guid: aae12ccc5edd96c40b082fba851f3056, type: 3} + cardLayoutTags: [] functionText: Card_Basic_CommonHolyWater_FunctionText cardDescription: $Keyword("Exhaust"), exhaust at most 3 Status or Curse cards. baseWeight: 1 diff --git a/Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_CommomHolyWater.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_CommomHolyWater.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_CommomHolyWater.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_HiddenBlade.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_HiddenBlade.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_HiddenBlade.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_HiddenBlade.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_HiddenBlade.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_HiddenBlade.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Item/CardData_Basic_HiddenBlade.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Item/CardData_Basic_HiddenBlade.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Power.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Power.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Power.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Power.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Cohesion.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Cohesion.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Cohesion.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Cohesion.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Cohesion.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Cohesion.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Cohesion.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Cohesion.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_FightingInspiration.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_FightingInspiration.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_FightingInspiration.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_FightingInspiration.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_FightingInspiration.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_FightingInspiration.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_FightingInspiration.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_FightingInspiration.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Guard.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Guard.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Guard.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Guard.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Guard.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Guard.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Guard.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Guard.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_HolyWaterPreparation.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_HolyWaterPreparation.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_HolyWaterPreparation.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_HolyWaterPreparation.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_HolyWaterPreparation.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_HolyWaterPreparation.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_HolyWaterPreparation.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_HolyWaterPreparation.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_MudBarrier.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_MudBarrier.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_MudBarrier.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_MudBarrier.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_MudBarrier.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_MudBarrier.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_MudBarrier.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_MudBarrier.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Recollection.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Recollection.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Recollection.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Recollection.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Recollection.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Recollection.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_Recollection.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_Recollection.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_ThinkingCountermeasures.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_ThinkingCountermeasures.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_ThinkingCountermeasures.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_ThinkingCountermeasures.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_ThinkingCountermeasures.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_ThinkingCountermeasures.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Skill/CardData_Basic_ThinkingCountermeasures.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Skill/CardData_Basic_ThinkingCountermeasures.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Status.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Status.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Dazed.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Dazed.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Dazed.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Dazed.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Dazed.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Dazed.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Dazed.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Dazed.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Faint.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Faint.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Faint.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Faint.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Faint.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Faint.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Faint.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Faint.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Oblivion.asset b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Oblivion.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Oblivion.asset rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Oblivion.asset diff --git a/Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Oblivion.asset.meta b/Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Oblivion.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/General/Status/CardData_Basic_Oblivion.asset.meta rename to Assets/Mods/Basic/Cards/Data/ObsoleteGeneral/Status/CardData_Basic_Oblivion.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_Cover.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_Cover.asset new file mode 100644 index 00000000..27f8ea0e --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_Cover.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_Cover + m_EditorClassIdentifier: + modName: Basic + className: Cover + displayName: Card_Basic_Cover_DisplayName + cardRarity: 10 + cardType: 10 + keywords: + - TargetAllies + cardSprite: {fileID: 21300000, guid: 5fad2ce6ad6b5db4e80c95e55f471ede, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Cover_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: BuffCount_Protecting + Value: 2 + index: 0 + isKeyDuplicated: 0 + - Key: Block + Value: 8 + index: 1 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 1 + index: 2 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 3 + isKeyDuplicated: 0 + - Key: TargetCount + Value: 1 + 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/Knight/CardData_Basic_Cover.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_Cover.asset.meta new file mode 100644 index 00000000..f17d3882 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_Cover.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6aed6dbef8984ae4ca90cf89c799ffdd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_OathOfCourage.asset b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_OathOfCourage.asset new file mode 100644 index 00000000..c8d8c0da --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_OathOfCourage.asset @@ -0,0 +1,66 @@ +%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_OathOfCourage + m_EditorClassIdentifier: + modName: Basic + className: OathOfCourage + displayName: Card_Basic_OathOfCourage_DisplayName + cardRarity: 30 + cardType: 10 + keywords: + - TargetSelf + - Exhaust + cardSprite: {fileID: 21300000, guid: 1e19e7169d28d89428fa35f0e76f0e1a, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_OathOfCourage_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: BuffCount_Consolidate + Value: 1 + index: 0 + isKeyDuplicated: 0 + - Key: Block + Value: 50 + index: 1 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 3 + index: 2 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 1 + index: 3 + isKeyDuplicated: 0 + - Key: TargetCount + Value: 0 + 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/Knight/CardData_Basic_OathOfCourage.asset.meta b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_OathOfCourage.asset.meta new file mode 100644 index 00000000..048d6874 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/PlayerHeros/Knight/CardData_Basic_OathOfCourage.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61cc84c9f7cc4d441bdec17fc3a87c04 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/LogicComponents.meta b/Assets/Mods/Basic/Cards/LogicComponents.meta new file mode 100644 index 00000000..063097f5 --- /dev/null +++ b/Assets/Mods/Basic/Cards/LogicComponents.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a47251c83dd959f4dbd8e5539cb3861b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/LogicComponents/CardLogicComponent_Protect.cs b/Assets/Mods/Basic/Cards/LogicComponents/CardLogicComponent_Protect.cs new file mode 100644 index 00000000..050816d6 --- /dev/null +++ b/Assets/Mods/Basic/Cards/LogicComponents/CardLogicComponent_Protect.cs @@ -0,0 +1,17 @@ +using Continentis.MainGame.Character; +using Continentis.Mods.Basic.Buffs; +using UnityEngine; + +namespace Continentis.MainGame.Card +{ + public class CardLogicComponent_Protect : CardLogicComponentBase + { + public void GenerateProtection(CharacterBase protector, CharacterBase target, int roundCount) + { + Protected protectedBuff = card.CreateCharacterBuff(protector); + protectedBuff.Apply(target, user, card); + Protecting protectingBuff = card.CreateCharacterBuff(target, roundCount, protectedBuff); + protectingBuff.Apply(protector, user, card); + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/LogicComponents/CardLogicComponent_Protect.cs.meta b/Assets/Mods/Basic/Cards/LogicComponents/CardLogicComponent_Protect.cs.meta new file mode 100644 index 00000000..b2c8d5d3 --- /dev/null +++ b/Assets/Mods/Basic/Cards/LogicComponents/CardLogicComponent_Protect.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 95b36354de5cc614e9d5eed46e8049bd \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/General.meta b/Assets/Mods/Basic/Cards/Scripts/General.meta index 3796af7e..7e77474e 100644 --- a/Assets/Mods/Basic/Cards/Scripts/General.meta +++ b/Assets/Mods/Basic/Cards/Scripts/General.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 065c6cea14992804cbdf1fde765bcbd7 +guid: edcb38fe315f1f645bf4bf7728c150eb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs b/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs new file mode 100644 index 00000000..1aab9e8d --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs @@ -0,0 +1,21 @@ +using System.Collections.Generic; +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; +using SLSFramework.General; +using UnityEngine; + +namespace Continentis.Mods.Basic.Cards +{ + public class Rouse : CardLogicBase + { + protected override CommandBase PlayEffect(List targetList) + { + CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential, + new Cmd_PlayAnimation(user.characterView, "Skill"), + new Cmd_Function(() => user.ModifyStamina(1))); + + return mainGroup; + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs.meta b/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs.meta new file mode 100644 index 00000000..44d94003 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b41efaf5743243a4ebf8bd3505bb14b2 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Tactic.cs b/Assets/Mods/Basic/Cards/Scripts/General/Tactic.cs new file mode 100644 index 00000000..3ddab0e2 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/General/Tactic.cs @@ -0,0 +1,36 @@ +using System.Collections.Generic; +using Continentis.MainGame; +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; +using SLSFramework.General; +using UnityEngine; + +namespace Continentis.Mods.Basic.Cards +{ + public class Tactic : CardLogicBase + { + protected override void SetUpLogicComponents() + { + AddLogicComponent().SetEffect(SelectEffect); + } + + protected override CommandBase PlayEffect(List targetList) + { + CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential, + new Cmd_PlayAnimation(user.characterView, "Skill")); + + LogicComponent() + .AddSelectionCommands(ref mainGroup, "Card_Basic_Tactic_SelectionCommandTitle".Localize(), 1, true); + + mainGroup.AddCommand(new Cmd_DrawCards(user.deckSubmodule, 1)); + + return mainGroup; + } + + private void SelectEffect(CardInstance card) + { + user.deckSubmodule.DiscardCard(card); + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Tactic.cs.meta b/Assets/Mods/Basic/Cards/Scripts/General/Tactic.cs.meta new file mode 100644 index 00000000..b466781f --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/General/Tactic.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 71a0c211d23ded94886525ca81a42f85 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Whimsy.cs b/Assets/Mods/Basic/Cards/Scripts/General/Whimsy.cs new file mode 100644 index 00000000..01ec7b2e --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/General/Whimsy.cs @@ -0,0 +1,21 @@ +using System.Collections.Generic; +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; +using SLSFramework.General; +using UnityEngine; + +namespace Continentis.Mods.Basic.Cards +{ + public class Whimsy : CardLogicBase + { + protected override CommandBase PlayEffect(List targetList) + { + CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential, + new Cmd_PlayAnimation(user.characterView, "Skill"), + new Cmd_Function(() => user.ModifyMana(1))); + + return mainGroup; + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Whimsy.cs.meta b/Assets/Mods/Basic/Cards/Scripts/General/Whimsy.cs.meta new file mode 100644 index 00000000..e35f4856 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/General/Whimsy.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fa7f44fcbbe2be14cb30aa67b1bdb17c \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Knight/Cover.cs b/Assets/Mods/Basic/Cards/Scripts/Knight/Cover.cs new file mode 100644 index 00000000..d12e99e7 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Knight/Cover.cs @@ -0,0 +1,35 @@ +using System.Collections.Generic; +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; +using Continentis.Mods.Basic.Buffs; +using SLSFramework.General; +using UnityEngine; + +namespace Continentis.Mods.Basic.Cards +{ + public class Cover : CardLogicBase + { + protected override void SetUpLogicComponents() + { + AddLogicComponent(); + AddLogicComponent(); + } + + protected override CommandBase PlayEffect(List targetList) + { + CommandGroup mainGroup = TargetListCommandGroup(targetList, + new Cmd_PlayAnimation(user.characterView, "Skill"), + new Cmd_Function(() => user.AddBlock(GetAttribute("Block"))), + new Cmd_ParamFunction((target) => + LogicComponent().GenerateProtection(user, target, GetAttribute("BuffCount_Protecting")))); + + return mainGroup; + } + + public override void ApplyAttributeChangesByCard() + { + LogicComponent().SetBlock_Fortitude(); + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Knight/Cover.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Knight/Cover.cs.meta new file mode 100644 index 00000000..c024d0eb --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Knight/Cover.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0293bb4ed1447d14eb3c8c8d247af139 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Knight/OathOfCourage.cs b/Assets/Mods/Basic/Cards/Scripts/Knight/OathOfCourage.cs new file mode 100644 index 00000000..76b82be6 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Knight/OathOfCourage.cs @@ -0,0 +1,36 @@ +using System.Collections.Generic; +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; +using Continentis.Mods.Basic.Buffs; +using SLSFramework.General; +using UnityEngine; + +namespace Continentis.Mods.Basic.Cards +{ + public class OathOfCourage : CardLogicBase + { + protected override void SetUpLogicComponents() + { + AddLogicComponent(); + } + + protected override CommandBase PlayEffect(List targetList) + { + CommandGroup mainGroup = TargetListCommandGroup(targetList, + new Cmd_PlayAnimation(user.characterView, "Skill"), + new Cmd_Function(() => + { + user.AddBlock(GetAttribute("Block")); + CreateCharacterBuff(GetAttribute("BuffCount_Consolidate")).Apply(user, user, this); + })); + + return mainGroup; + } + + public override void ApplyAttributeChangesByCard() + { + LogicComponent().SetBlock_Sorcery(); + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Knight/OathOfCourage.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Knight/OathOfCourage.cs.meta new file mode 100644 index 00000000..3d35bed2 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Knight/OathOfCourage.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4b4fa3f1ad4c3ef4a97a643f206291cd \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral.meta new file mode 100644 index 00000000..3796af7e --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 065c6cea14992804cbdf1fde765bcbd7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Bludgeon.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Bludgeon.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Bludgeon.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Bludgeon.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Bludgeon.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Bludgeon.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Bludgeon.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Bludgeon.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Cohesion.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Cohesion.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Cohesion.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Cohesion.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Cohesion.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Cohesion.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Cohesion.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Cohesion.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/CommonHolyWater.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/CommonHolyWater.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/CommonHolyWater.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/CommonHolyWater.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/CommonHolyWater.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/CommonHolyWater.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/CommonHolyWater.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/CommonHolyWater.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Dazed.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Dazed.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Dazed.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Dazed.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Dazed.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Dazed.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Dazed.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Dazed.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Defense.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Defense.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Defense.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Defense.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/DualStrike.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/DualStrike.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/DualStrike.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/DualStrike.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/DualStrike.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/DualStrike.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/DualStrike.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/DualStrike.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Faint.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Faint.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Faint.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Faint.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Faint.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Faint.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Faint.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Faint.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/FightingInspiration.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FightingInspiration.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/FightingInspiration.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FightingInspiration.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/FightingInspiration.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FightingInspiration.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/FightingInspiration.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FightingInspiration.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/FireBolt.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FireBolt.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/FireBolt.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FireBolt.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/FireBolt.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FireBolt.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/FireBolt.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FireBolt.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Guard.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Guard.cs similarity index 85% rename from Assets/Mods/Basic/Cards/Scripts/General/Guard.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Guard.cs index b0dac4be..4894a284 100644 --- a/Assets/Mods/Basic/Cards/Scripts/General/Guard.cs +++ b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Guard.cs @@ -16,13 +16,11 @@ namespace Continentis.Mods.Basic.Cards new Cmd_PlayAnimation(user.characterView, "Skill"), new Cmd_ParamFunction((target) => { - Debug.Log(user.GetType().FullName); - Debug.Log(typeof(CharacterBase).FullName); Protected protectedBuff = CreateCharacterBuff(user); protectedBuff.Apply(target, user, this); Protecting protectingBuff = CreateCharacterBuff(target, GetAttribute("BuffCount_Protecting"), protectedBuff); protectingBuff.Apply(user, user, this); - })); //对使用者施加沉重状态 + })); return mainGroup; } diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Guard.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Guard.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Guard.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Guard.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/HiddenBlade.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HiddenBlade.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/HiddenBlade.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HiddenBlade.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/HiddenBlade.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HiddenBlade.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/HiddenBlade.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HiddenBlade.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/HolyWaterPreparation.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HolyWaterPreparation.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/HolyWaterPreparation.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HolyWaterPreparation.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/HolyWaterPreparation.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HolyWaterPreparation.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/HolyWaterPreparation.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HolyWaterPreparation.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/MudBarrier.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/MudBarrier.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/MudBarrier.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/MudBarrier.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/MudBarrier.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/MudBarrier.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/MudBarrier.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/MudBarrier.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Oblivion.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Oblivion.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Oblivion.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Oblivion.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Oblivion.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Oblivion.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Oblivion.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Oblivion.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Prick.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Prick.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Prick.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Prick.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Prick.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Prick.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Prick.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Prick.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/RadiantBolt.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RadiantBolt.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/RadiantBolt.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RadiantBolt.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/RadiantBolt.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RadiantBolt.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/RadiantBolt.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RadiantBolt.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/RayOfFrost.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RayOfFrost.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/RayOfFrost.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RayOfFrost.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/RayOfFrost.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RayOfFrost.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/RayOfFrost.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RayOfFrost.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/RecklessAssault.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RecklessAssault.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/RecklessAssault.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RecklessAssault.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/RecklessAssault.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RecklessAssault.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/RecklessAssault.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RecklessAssault.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Recollection.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Recollection.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Recollection.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Recollection.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Recollection.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Recollection.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Recollection.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Recollection.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Slash.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Slash.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Slash.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Slash.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Strike.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Strike.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Strike.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Strike.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Strike.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Strike.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/Strike.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Strike.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/ThinkingCountermeasures.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/ThinkingCountermeasures.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/ThinkingCountermeasures.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/ThinkingCountermeasures.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/ThinkingCountermeasures.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/ThinkingCountermeasures.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/ThinkingCountermeasures.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/ThinkingCountermeasures.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/WindBlade.cs b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/WindBlade.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/WindBlade.cs rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/WindBlade.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/General/WindBlade.cs.meta b/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/WindBlade.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/General/WindBlade.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/WindBlade.cs.meta diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Burn.cs b/Assets/Mods/Basic/Characters/CombatBuffs/General/Burn.cs index af17cdd6..eb758f05 100644 --- a/Assets/Mods/Basic/Characters/CombatBuffs/General/Burn.cs +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Burn.cs @@ -21,6 +21,7 @@ namespace Continentis.Mods.Basic.Buffs this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack); this.eventSubmodule = new EventSubmodule(this); + this.eventSubmodule.onActionStart.Add("Burn", new EventUnit(OnActionStart)); this.eventSubmodule.onAfterPlayCard.Add("Burn", new EventUnit>(OnAfterPlayCard)); } @@ -36,13 +37,16 @@ namespace Continentis.Mods.Basic.Buffs return true; } + + private void OnActionStart() + { + unitedStackSubmodule.ReduceStack(1); + iconSubmodule.Update(); + } private void OnAfterPlayCard(CardInstance card, List targets) { - int reducedStack = Mathf.Max(1, Mathf.FloorToInt(unitedStackSubmodule.stackAmount * 0.3f)); - sourceCharacter.Attack(attachedCharacter, reducedStack, true); - unitedStackSubmodule.ReduceStack(reducedStack); - iconSubmodule.Update(); + sourceCharacter.Attack(attachedCharacter, unitedStackSubmodule.stackAmount, true); } } } \ No newline at end of file diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs b/Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs new file mode 100644 index 00000000..034c10ff --- /dev/null +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs @@ -0,0 +1,37 @@ +using Continentis.MainGame; +using Continentis.MainGame.Character; +using UnityEngine; + +namespace Continentis.Mods.Basic.Buffs +{ + public class Consolidate : CharacterCombatBuffBase + { + public Consolidate(int roundCount) + { + Initialize(BuffType.Positive, BuffDispelLevel.Strong); + + this.contentSubmodule = new ContentSubmodule(this, false) + .AddParameterGetter("Count", () => roundCountSubmodule.remainingCount.ToString()); + + this.iconSubmodule = new IconSubmodule(this); + + this.roundCountSubmodule = new CountSubmodule(this, roundCount); + + this.generalAttributeSubmodule = new GeneralAttributeSubmodule(this); + this.generalAttributeSubmodule.numericChange.Add("KeepBlockOnActionStart", 1); + } + + public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) + { + MainGameManager.Instance.basePrefabs.GenerateInfoText("Consolidate", attachedCharacter.characterView); + + if (FindExistingSameBuff(out existingBuff)) + { + existingBuff.roundCountSubmodule.AddCount(this.roundCountSubmodule.remainingCount); + return false; + } + + return true; + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs.meta b/Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs.meta new file mode 100644 index 00000000..049525bf --- /dev/null +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2e519d542ada508448e92e5dce768770 \ No newline at end of file diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Corrosion.cs b/Assets/Mods/Basic/Characters/CombatBuffs/General/Corrosion.cs index 4784c71b..c949b2ed 100644 --- a/Assets/Mods/Basic/Characters/CombatBuffs/General/Corrosion.cs +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Corrosion.cs @@ -22,6 +22,20 @@ namespace Continentis.Mods.Basic.Buffs this.eventSubmodule.onActionStart.Add("Corrosion", new EventUnit(OnActionStart)); } + public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) + { + MainGameManager.Instance.basePrefabs.GenerateInfoText("Corrosion", attachedCharacter.characterView); + + if (FindExistingSameBuff(out existingBuff)) + { + existingBuff.unitedStackSubmodule.AddStack(this.unitedStackSubmodule.stackAmount); + return false; + } + + return true; + } + + private void OnActionStart() { sourceCharacter.Attack(attachedCharacter, unitedStackSubmodule.stackAmount, true); diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Heavy.cs b/Assets/Mods/Basic/Characters/CombatBuffs/General/Heavy.cs index 41178f97..e30ae424 100644 --- a/Assets/Mods/Basic/Characters/CombatBuffs/General/Heavy.cs +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Heavy.cs @@ -32,7 +32,7 @@ namespace Continentis.Mods.Basic.Buffs { if (this.isAdditive) //可叠加型状态 { - existingBuff.actionCountSubmodule.AddMaxCount(this.actionCountSubmodule.maximumCount); + existingBuff.actionCountSubmodule.AddCount(this.actionCountSubmodule.maximumCount); } return false; diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Protecting.cs b/Assets/Mods/Basic/Characters/CombatBuffs/General/Protecting.cs index 7c63a42c..90450c20 100644 --- a/Assets/Mods/Basic/Characters/CombatBuffs/General/Protecting.cs +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Protecting.cs @@ -21,12 +21,12 @@ namespace Continentis.Mods.Basic.Buffs } this.contentSubmodule = new ContentSubmodule(this) - .AddParameterGetter("Count", () => combatRoundTimeSubmodule.remainingCount.ToString()) + .AddParameterGetter("Count", () => roundCountSubmodule.remainingCount.ToString()) .AddParameterGetter("Target", () => target.data.displayName);//TODO: 以后增加角色的ContentSubmodule this.iconSubmodule = new IconSubmodule(this).SetTextFunctions("Count"); - this.combatRoundTimeSubmodule = new CountSubmodule(this, actionCount); + this.roundCountSubmodule = new CountSubmodule(this, actionCount); this.eventSubmodule = new EventSubmodule(this); } diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Vulnerable.cs b/Assets/Mods/Basic/Characters/CombatBuffs/General/Vulnerable.cs index 3f7bfd75..b5d60074 100644 --- a/Assets/Mods/Basic/Characters/CombatBuffs/General/Vulnerable.cs +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Vulnerable.cs @@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Buffs if (FindExistingSameBuff(out existingBuff)) { - existingBuff.actionCountSubmodule.AddMaxCount(this.combatRoundTimeSubmodule.maximumCount); + existingBuff.actionCountSubmodule.AddCount(this.roundCountSubmodule.maximumCount); return false; } diff --git a/Assets/Mods/Basic/Characters/CombatBuffs/General/Weak.cs b/Assets/Mods/Basic/Characters/CombatBuffs/General/Weak.cs index 7d1c79b1..28bfc889 100644 --- a/Assets/Mods/Basic/Characters/CombatBuffs/General/Weak.cs +++ b/Assets/Mods/Basic/Characters/CombatBuffs/General/Weak.cs @@ -27,7 +27,7 @@ namespace Continentis.Mods.Basic.Buffs if (FindExistingSameBuff(out existingBuff)) { - existingBuff.actionCountSubmodule.AddMaxCount(this.actionCountSubmodule.maximumCount); + existingBuff.actionCountSubmodule.AddCount(this.actionCountSubmodule.maximumCount); return false; } diff --git a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Knight.asset b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Knight.asset index 06ae9384..7cd89eca 100644 --- a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Knight.asset +++ b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Knight.asset @@ -201,13 +201,10 @@ MonoBehaviour: derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] initialDeckRef: - - CardData_Basic_KnightStrike - - CardData_Basic_Cohesion - - CardData_Basic_Recollection - - CardData_Basic_Smite - - CardData_Basic_HeavySlash - - CardData_Basic_ThinkingCountermeasures - - CardData_Basic_GuardianAura - - CardData_Basic_Guard + - CardData_Basic_Whimsy + - CardData_Basic_Rouse + - CardData_Basic_Tactic + - CardData_Basic_Cover + - CardData_Basic_OathOfCourage hudDataRefs: - HUDData_Basic_Default diff --git a/Assets/Mods/Basic/Characters/DefaultCollections/CharacterAttributesDefaultCollection.asset b/Assets/Mods/Basic/Characters/DefaultCollections/CharacterAttributesDefaultCollection.asset index c5858d48..e66130f6 100644 --- a/Assets/Mods/Basic/Characters/DefaultCollections/CharacterAttributesDefaultCollection.asset +++ b/Assets/Mods/Basic/Characters/DefaultCollections/CharacterAttributesDefaultCollection.asset @@ -169,6 +169,14 @@ MonoBehaviour: Value: 0 index: 30 isKeyDuplicated: 0 + - Key: KeepBlockOnActionStart + Value: 0 + index: 31 + isKeyDuplicated: 0 + - Key: KeepDodgeOnActionStart + Value: 0 + index: 32 + isKeyDuplicated: 0 dividerPosProp: 0.75 runtimeGeneralAttributes: dictionaryList: diff --git a/Assets/Mods/Basic/Rules/Basic_AttributeRulesCollection.cs b/Assets/Mods/Basic/Rules/Basic_AttributeRulesCollection.cs index 97dfba24..24ae2dbe 100644 --- a/Assets/Mods/Basic/Rules/Basic_AttributeRulesCollection.cs +++ b/Assets/Mods/Basic/Rules/Basic_AttributeRulesCollection.cs @@ -9,6 +9,10 @@ namespace Continentis.Mods.Basic.Rules { public override void ApplyRules_ConvertCoreIntoGeneral(Dictionary core, Dictionary general) { + float level = core["Level"]; + general["MaximumHealth"] += Mathf.FloorToInt(level * 3); + general["MaximumMana"] += Mathf.FloorToInt(level / 2); + float strengthOffset = core["Strength"] - 12; general["MaximumStamina"] += Mathf.FloorToInt(strengthOffset / 4); //最大行动点加成 general["OffsetFromStrength"] += Mathf.FloorToInt(strengthOffset / 3); //来自核心属性（力量）的调整值 @@ -19,7 +23,6 @@ namespace Continentis.Mods.Basic.Rules float intelligenceOffset = core["Intelligence"] - 12; general["DeckCapacity"] += intelligenceOffset; - general["MaximumMana"] += Mathf.FloorToInt(intelligenceOffset / 4); //最大魔法值加成 general["OffsetFromIntelligence"] += Mathf.FloorToInt(intelligenceOffset / 3); //来自核心属性（智力）的调整值 general["ManaRecoverPerAction"] += Mathf.FloorToInt(intelligenceOffset / 6); //每回合恢复魔法值 diff --git a/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Consolidate.png b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Consolidate.png new file mode 100644 index 00000000..287a2967 Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Consolidate.png differ diff --git a/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Consolidate.png.meta b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Consolidate.png.meta new file mode 100644 index 00000000..e74552bc --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Buffs/BuffIcon_Basic_Consolidate.png.meta @@ -0,0 +1,119 @@ +fileFormatVersion: 2 +guid: dc65588a8af0fc44fac479f343165bc4 +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/Mods/Basic/Sprites/Cards/AI/00029-2825373066.png b/Assets/Mods/Basic/Sprites/Cards/AI/00029-2825373066.png new file mode 100644 index 00000000..1cdb5680 Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/00029-2825373066.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/00029-2825373066.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/00029-2825373066.png.meta new file mode 100644 index 00000000..503d8280 --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/00029-2825373066.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a50c84b115a45a6418e403875f537677 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Mods/Basic/Sprites/Cards/AI/00043-1066028138.png b/Assets/Mods/Basic/Sprites/Cards/AI/00043-1066028138.png new file mode 100644 index 00000000..90c8abfd Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/00043-1066028138.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/00043-1066028138.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/00043-1066028138.png.meta new file mode 100644 index 00000000..6d723f12 --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/00043-1066028138.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 08151241767bc164da8ba328a76a9ced +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Mods/Basic/Sprites/Cards/AI/00065-3230953026.png b/Assets/Mods/Basic/Sprites/Cards/AI/00065-3230953026.png new file mode 100644 index 00000000..6d5988a0 Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/00065-3230953026.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/00065-3230953026.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/00065-3230953026.png.meta new file mode 100644 index 00000000..2d16f6f1 --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/00065-3230953026.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 7774035283803d64fadba0f707508368 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Mods/Basic/Sprites/Cards/AI/4a144ebb050df10ff6befd4f8cf2ad04.png b/Assets/Mods/Basic/Sprites/Cards/AI/4a144ebb050df10ff6befd4f8cf2ad04.png new file mode 100644 index 00000000..0c846cfa Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/4a144ebb050df10ff6befd4f8cf2ad04.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/4a144ebb050df10ff6befd4f8cf2ad04.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/4a144ebb050df10ff6befd4f8cf2ad04.png.meta new file mode 100644 index 00000000..d5b3097a --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/4a144ebb050df10ff6befd4f8cf2ad04.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: f7aa890753b65ec48a3195d42c6a1f97 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Cover.png b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Cover.png new file mode 100644 index 00000000..322db0ec Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Cover.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Cover.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Cover.png.meta new file mode 100644 index 00000000..8c2c432e --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Cover.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 5fad2ce6ad6b5db4e80c95e55f471ede +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_OathOfCourage.png b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_OathOfCourage.png new file mode 100644 index 00000000..f1bba868 Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_OathOfCourage.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_OathOfCourage.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_OathOfCourage.png.meta new file mode 100644 index 00000000..071f3144 --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_OathOfCourage.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 1e19e7169d28d89428fa35f0e76f0e1a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Rouse.png b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Rouse.png new file mode 100644 index 00000000..d017a503 Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Rouse.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Rouse.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Rouse.png.meta new file mode 100644 index 00000000..926ffe68 --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Rouse.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: e5967a626b6f39b49ba395ee29017963 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Tactic.png b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Tactic.png new file mode 100644 index 00000000..c09a0a78 Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Tactic.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Tactic.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Tactic.png.meta new file mode 100644 index 00000000..71ce0656 --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Tactic.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: f1bce6b8b267f1e49ac238ada47a77e1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Whimsy.png b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Whimsy.png new file mode 100644 index 00000000..9b79387d Binary files /dev/null and b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Whimsy.png differ diff --git a/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Whimsy.png.meta b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Whimsy.png.meta new file mode 100644 index 00000000..0bd311d9 --- /dev/null +++ b/Assets/Mods/Basic/Sprites/Cards/AI/CardSprite_Basic_Whimsy.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: e3221876ab05378478e7e47a4035eee2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + 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: 512 + 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 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + 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: iOS + 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/Scripts/MainGame/Base/AttributeGroup.cs b/Assets/Scripts/MainGame/Base/AttributeGroup.cs index a46df7b0..ea72c409 100644 --- a/Assets/Scripts/MainGame/Base/AttributeGroup.cs +++ b/Assets/Scripts/MainGame/Base/AttributeGroup.cs @@ -72,10 +72,24 @@ namespace Continentis.MainGame current[attributeName] = originalAttribute; } } - - public void ModifyAttribute(string attributeName, + + public void ModifyAttribute(string attributeName, float numericChange, float percentageChangeOfAccumulation, float percentChangeOfMultiplication) { + if (!current.ContainsKey(attributeName)) + { + if (attributeName.Contains("Multiplier")) + { + current[attributeName] = 1f; + } + else + { + current[attributeName] = 0f; + } + + Debug.Log($"{attributeName} is not found in current attributes, use default value"); + } + current[attributeName] += numericChange; current[attributeName] = (1 + percentageChangeOfAccumulation) * current[attributeName]; current[attributeName] = percentChangeOfMultiplication * current[attributeName]; diff --git a/Assets/Scripts/MainGame/Buff/BuffSubmodules.cs b/Assets/Scripts/MainGame/Buff/BuffSubmodules.cs index 8c60abc3..1259d269 100644 --- a/Assets/Scripts/MainGame/Buff/BuffSubmodules.cs +++ b/Assets/Scripts/MainGame/Buff/BuffSubmodules.cs @@ -225,7 +225,7 @@ namespace Continentis.MainGame /// /// 增加持续时间和剩余时间。 /// - public void AddMaxCount(int maxCount) + public void AddCount(int maxCount) { if (isInfinite) { diff --git a/Assets/Scripts/MainGame/Card/CardAssistanceFunctions.cs b/Assets/Scripts/MainGame/Card/CardAssistanceFunctions.cs index f647bd4a..deccec5e 100644 --- a/Assets/Scripts/MainGame/Card/CardAssistanceFunctions.cs +++ b/Assets/Scripts/MainGame/Card/CardAssistanceFunctions.cs @@ -258,7 +258,7 @@ namespace Continentis.MainGame.Card /// 注意，此函数依赖ModManager的类型注册功能，请确保在Mod加载时已注册对应Buff类型 /// 此函数中的T并不是原型参数，而是获取Mod中注册的类型用的 /// - protected T CreateCharacterBuff(params object[] parameters) where T :CharacterCombatBuffBase + public T CreateCharacterBuff(params object[] parameters) where T :CharacterCombatBuffBase { string buffTypeID = ModManager.GetTypeID(typeof(T)); @@ -271,7 +271,7 @@ namespace Continentis.MainGame.Card return ModManager.CreateInstance(buffTypeID, parameters); } - protected T CreateCharacterBuff(string buffTypeID, params object[] parameters) where T :CharacterCombatBuffBase + public T CreateCharacterBuff(string buffTypeID, params object[] parameters) where T :CharacterCombatBuffBase { if (string.IsNullOrEmpty(buffTypeID)) { diff --git a/Assets/Scripts/MainGame/Card/CardView/HandCardView/HandCardView_Operations.cs b/Assets/Scripts/MainGame/Card/CardView/HandCardView/HandCardView_Operations.cs index 0cdf21ea..e2550ac0 100644 --- a/Assets/Scripts/MainGame/Card/CardView/HandCardView/HandCardView_Operations.cs +++ b/Assets/Scripts/MainGame/Card/CardView/HandCardView/HandCardView_Operations.cs @@ -280,6 +280,10 @@ namespace Continentis.MainGame.Card { targetList.AddRange(validTargets); } + else if (cardLogic.HasKeyword("TargetSelf") && cardLogic.attributeSubmodule.targetCount == 0) + { + targetList.Add(cardLogic.user); + } if (!isInDropZone) { diff --git a/Assets/Scripts/MainGame/Character/CharacterBuff/CharacterCombatBuffBase.cs b/Assets/Scripts/MainGame/Character/CharacterBuff/CharacterCombatBuffBase.cs index 031757b9..fecbe7e1 100644 --- a/Assets/Scripts/MainGame/Character/CharacterBuff/CharacterCombatBuffBase.cs +++ b/Assets/Scripts/MainGame/Character/CharacterBuff/CharacterCombatBuffBase.cs @@ -11,8 +11,18 @@ namespace Continentis.MainGame.Character { public CardLogicBase sourceCard; + /// + /// 行动计数，每次行动开始时计数-1。 + /// public CountSubmodule actionCountSubmodule; - public CountSubmodule combatRoundTimeSubmodule; + /// + /// 回合计数，每回合开始时计数-1。 + /// + public CountSubmodule roundCountSubmodule; + /// + /// 首次行动计数，仅在角色本回合首次行动时计数-1。 + /// + public CountSubmodule roundFirstActionCountSubmodule; public UnitedStackSubmodule unitedStackSubmodule; public IndependentStackSubmodule independentStackSubmodule; diff --git a/Assets/Scripts/MainGame/Character/CharacterSubmodules/CombatBuffSubmodule.cs b/Assets/Scripts/MainGame/Character/CharacterSubmodules/CombatBuffSubmodule.cs index 2afb669c..4e8d8dd5 100644 --- a/Assets/Scripts/MainGame/Character/CharacterSubmodules/CombatBuffSubmodule.cs +++ b/Assets/Scripts/MainGame/Character/CharacterSubmodules/CombatBuffSubmodule.cs @@ -38,7 +38,7 @@ namespace Continentis.MainGame.Character { public void RoundStart() { - buffList.For(buff => buff.combatRoundTimeSubmodule?.Update()); + buffList.For(buff => buff.roundCountSubmodule?.Update()); buffList.For(buff => buff.eventSubmodule?.onRoundStart?.Invoke()); } @@ -49,6 +49,11 @@ namespace Continentis.MainGame.Character public void ActionStart() { + if (owner.actionCountThisRound == 0) + { + buffList.For(buff => buff.roundFirstActionCountSubmodule?.Update()); + } + buffList.For(buff => buff.actionCountSubmodule?.Update()); buffList.For(buff => buff.eventSubmodule?.onActionStart?.Invoke()); } diff --git a/Assets/Scripts/MainGame/Character/CharacterSubmodules/EventSubmodule.cs b/Assets/Scripts/MainGame/Character/CharacterSubmodules/EventSubmodule.cs index fb1bd866..48493232 100644 --- a/Assets/Scripts/MainGame/Character/CharacterSubmodules/EventSubmodule.cs +++ b/Assets/Scripts/MainGame/Character/CharacterSubmodules/EventSubmodule.cs @@ -52,6 +52,19 @@ namespace Continentis.MainGame.Character owner.ModifyAttribute("Mana", owner.GetAttribute("ManaRecoverPerAction")); owner.ClampAttribute("Mana", 0, owner.GetAttribute("MaximumMana")); }, 999)); + + onActionStart.InsertByPriority("DefenseReset", new EventUnit(() => + { + if (owner.GetAttribute("KeepBlockOnActionStart") <= 0) + { + owner.SetAttribute("Block", 0); + } + + if (owner.GetAttribute("KeepDodgeOnActionStart") <= 0) + { + owner.SetAttribute("Dodge", 0); + } + }, 998)); } } diff --git a/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-7221-7c74-823b-d3eee3d142ea.jpg b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-7221-7c74-823b-d3eee3d142ea.jpg new file mode 100644 index 00000000..e0febc8d Binary files /dev/null and b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-7221-7c74-823b-d3eee3d142ea.jpg differ diff --git a/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-7221-7c74-823b-d3eee3d142ea.jpg.json b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-7221-7c74-823b-d3eee3d142ea.jpg.json new file mode 100644 index 00000000..48d88aa0 --- /dev/null +++ b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-7221-7c74-823b-d3eee3d142ea.jpg.json @@ -0,0 +1,20 @@ +{ + "asset": "dc65588a8af0fc44fac479f343165bc4", + "fileName": "019a342c-7221-7c74-823b-d3eee3d142ea.jpg", + "prompt": "an iron wall, representing \"Consolidate\"", + "negativePrompt": "", + "model": "9118f8cf-d5fa-4ffe-91d5-9268467fcbe1", + "modelName": "Game Icons", + "customSeed": -1, + "w3CTraceId": "358c996107acc152e14c795e710da432", + "refinementMode": "Generation", + "pixelateTargetSize": 0, + "pixelateKeepImageSize": false, + "pixelatePixelBlockSize": 0, + "pixelateMode": 0, + "pixelateOutlineThickness": 0, + "doodles": { + "m_Items": [] + }, + "upscaleFactor": 0 +} \ No newline at end of file diff --git a/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-ac53-7a90-bfc0-6a979c66bd78.png b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-ac53-7a90-bfc0-6a979c66bd78.png new file mode 100644 index 00000000..287a2967 Binary files /dev/null and b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-ac53-7a90-bfc0-6a979c66bd78.png differ diff --git a/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-ac53-7a90-bfc0-6a979c66bd78.png.json b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-ac53-7a90-bfc0-6a979c66bd78.png.json new file mode 100644 index 00000000..d487b1d5 --- /dev/null +++ b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/019a342c-ac53-7a90-bfc0-6a979c66bd78.png.json @@ -0,0 +1,20 @@ +{ + "asset": "dc65588a8af0fc44fac479f343165bc4", + "fileName": "019a342c-ac53-7a90-bfc0-6a979c66bd78.png", + "prompt": "", + "negativePrompt": "", + "model": "", + "modelName": "", + "customSeed": -1, + "w3CTraceId": "514bc94ed7fd9e63eb4597c8322fb5e9", + "refinementMode": "RemoveBackground", + "pixelateTargetSize": 0, + "pixelateKeepImageSize": false, + "pixelatePixelBlockSize": 0, + "pixelateMode": 0, + "pixelateOutlineThickness": 0, + "doodles": { + "m_Items": [] + }, + "upscaleFactor": 0 +} \ No newline at end of file diff --git a/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/BuffIcon_Basic_Consolidate.png b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/BuffIcon_Basic_Consolidate.png new file mode 100644 index 00000000..47182649 Binary files /dev/null and b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/BuffIcon_Basic_Consolidate.png differ diff --git a/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/BuffIcon_Basic_Consolidate.png.json b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/BuffIcon_Basic_Consolidate.png.json new file mode 100644 index 00000000..089411b4 --- /dev/null +++ b/GeneratedAssets/dc65588a8af0fc44fac479f343165bc4/BuffIcon_Basic_Consolidate.png.json @@ -0,0 +1,20 @@ +{ + "asset": "dc65588a8af0fc44fac479f343165bc4", + "fileName": "BuffIcon_Basic_Consolidate.png", + "prompt": "", + "negativePrompt": "", + "model": "", + "modelName": "", + "customSeed": -1, + "w3CTraceId": "", + "refinementMode": "Generation", + "pixelateTargetSize": 0, + "pixelateKeepImageSize": false, + "pixelatePixelBlockSize": 0, + "pixelateMode": 0, + "pixelateOutlineThickness": 0, + "doodles": { + "m_Items": [] + }, + "upscaleFactor": 0 +} \ No newline at end of file