diff --git a/Assets/Editor.meta b/Assets/Mods/Basic/Cards/Data/Enemies.meta similarity index 77% rename from Assets/Editor.meta rename to Assets/Mods/Basic/Cards/Data/Enemies.meta index 41506ef9..3ea3d40e 100644 --- a/Assets/Editor.meta +++ b/Assets/Mods/Basic/Cards/Data/Enemies.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 72f87a610c81daa43b94c3663e973efa +guid: 6e5d85e43b11d0544be47b1b97d6c083 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses.meta similarity index 77% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses.meta index 76195d15..cc83c805 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead.meta +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8155160458c0f9f47807872413e96088 +guid: a18ff060dd48a1f49a5eba17d132923f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand/HellfireBrand.cs b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand/HellfireBrand.cs rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand/HellfireBrand.cs.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBrand/HellfireBrand.cs.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/CardData_Basic_NecromanticInfusion.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion/CardData_Basic_NecromanticInfusion.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/CardData_Basic_NecromanticInfusion.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion/CardData_Basic_NecromanticInfusion.asset diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/CardData_Basic_NecromanticInfusion.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion/CardData_Basic_NecromanticInfusion.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/CardData_Basic_NecromanticInfusion.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion/CardData_Basic_NecromanticInfusion.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/SoulCleave.cs b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/SoulCleave.cs rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/SoulCleave.cs.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/SoulCleave.cs.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/CardData_Basic_ArmyOfTheDead.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_ArmyOfTheDead.asset similarity index 70% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/CardData_Basic_ArmyOfTheDead.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_ArmyOfTheDead.asset index 411a7ba1..5ac42b14 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/CardData_Basic_ArmyOfTheDead.asset +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_ArmyOfTheDead.asset @@ -13,17 +13,36 @@ MonoBehaviour: m_Name: CardData_Basic_ArmyOfTheDead m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData modName: Basic + categoryName: className: ArmyOfTheDead displayName: Card_Basic_ArmyOfTheDead_DisplayName cardRarity: 40 cardType: 10 - tags: [] + keywords: + - TargetSelf cardSprite: {fileID: 21300000, guid: 38466aa09b7b3dc468a47c6ca7251524, type: 3} + cardLayoutTags: [] functionText: Card_Basic_ArmyOfTheDead_FunctionText - cardDescription: Spawn 2 Skeleton Guards. + cardDescription: baseWeight: 1 variableAttributes: - dictionaryList: [] + dictionaryList: + - Key: TargetCount + Value: 0 + index: 0 + isKeyDuplicated: 0 + - Key: SummonCount + Value: 2 + index: 1 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 2 + index: 2 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 3 + isKeyDuplicated: 0 dividerPosProp: 0.5 originalAttributes: dictionaryList: [] @@ -40,4 +59,5 @@ MonoBehaviour: customDescriptions: [] prefabRefs: [] derivativeCardDataRefs: [] - derivativeCharacterDataRefs: [] + derivativeCharacterDataRefs: + - CharacterData_Basic_SkeletonGuard diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/CardData_Basic_ArmyOfTheDead.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_ArmyOfTheDead.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/CardData_Basic_ArmyOfTheDead.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_ArmyOfTheDead.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/CardData_Basic_WrathOfTheUnderworld.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_GreatswordSweep.asset similarity index 64% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/CardData_Basic_WrathOfTheUnderworld.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_GreatswordSweep.asset index 721702a7..9c498b01 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/CardData_Basic_WrathOfTheUnderworld.asset +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_GreatswordSweep.asset @@ -10,21 +10,40 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} - m_Name: CardData_Basic_WrathOfTheUnderworld + m_Name: CardData_Basic_GreatswordSweep m_EditorClassIdentifier: modName: Basic - className: WrathOfTheUnderworld - displayName: Card_Basic_WrathOfTheUnderworld_DisplayName - cardRarity: 50 + categoryName: + className: GreatswordSweep + displayName: Card_Basic_GreatswordSweep_DisplayName + cardRarity: 30 cardType: 0 - tags: [] + keywords: + - TargetEnemies cardSprite: {fileID: 21300000, guid: 37468a98d6a5a824d880a27afec07d29, type: 3} - functionText: Card_Basic_WrathOfTheUnderworld_FunctionText + cardLayoutTags: [] + functionText: Card_Basic_GreatswordSweep_FunctionText cardDescription: '$Keyword("Sorcery"), $Keyword("LifeSteal"): $Attribute("LifeStealPercent", true, true), deal $Attribute("Damage") darkness damage 3 times to all enemies.' - baseWeight: 99999 + baseWeight: 0 variableAttributes: - dictionaryList: [] + dictionaryList: + - Key: TargetCount + Value: -1 + index: 0 + isKeyDuplicated: 0 + - Key: Damage + Value: 8 + index: 1 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 2 + index: 2 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 3 + isKeyDuplicated: 0 dividerPosProp: 0.5 originalAttributes: dictionaryList: [] diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/CardData_Basic_WrathOfTheUnderworld.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_GreatswordSweep.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/CardData_Basic_WrathOfTheUnderworld.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_GreatswordSweep.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/CardData_Basic_HellfireBlast.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_HellfireBlast.asset similarity index 69% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/CardData_Basic_HellfireBlast.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_HellfireBlast.asset index 24122945..5280c162 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/CardData_Basic_HellfireBlast.asset +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_HellfireBlast.asset @@ -13,19 +13,41 @@ MonoBehaviour: m_Name: CardData_Basic_HellfireBlast m_EditorClassIdentifier: modName: Basic + categoryName: className: HellfireBlast displayName: Card_Basic_HellfireBlast_DisplayName cardRarity: 30 cardType: 0 - tags: [] + keywords: + - TargetEnemies + - Magic cardSprite: {fileID: 21300000, guid: 1b371965578c19a4c934f642b8a7420e, type: 3} + cardLayoutTags: [] functionText: Card_Basic_HellfireBlast_FunctionText - cardDescription: '$Keyword("Strike"): Deal $Attribute("Damage") fire & physics - damage. $Keyword("Arcane"): Apply $Attribute("HellfireStack") stacks of Hellfire - to the target.' + cardDescription: baseWeight: 1 variableAttributes: - dictionaryList: [] + dictionaryList: + - Key: TargetCount + Value: 1 + index: 0 + isKeyDuplicated: 0 + - Key: Damage + Value: 18 + index: 1 + isKeyDuplicated: 0 + - Key: BuffStack_Burn + Value: 2 + index: 2 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 2 + index: 3 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 4 + isKeyDuplicated: 0 dividerPosProp: 0.5 originalAttributes: dictionaryList: [] diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/CardData_Basic_HellfireBlast.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_HellfireBlast.asset.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/CardData_Basic_HellfireBlast.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_HellfireBlast.asset.meta diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_WrathOfUnderworld.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_WrathOfUnderworld.asset new file mode 100644 index 00000000..aa188614 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_WrathOfUnderworld.asset @@ -0,0 +1,63 @@ +%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_WrathOfUnderworld + m_EditorClassIdentifier: + modName: Basic + categoryName: + className: WrathOfUnderworld + displayName: Card_Basic_WrathOfUnderworld_DisplayName + cardRarity: 50 + cardType: 0 + keywords: + - TargetEnemies + - Magic + cardSprite: {fileID: 21300000, guid: 1b371965578c19a4c934f642b8a7420e, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_WrathOfUnderworld_FunctionText + cardDescription: + baseWeight: 1 + variableAttributes: + dictionaryList: + - Key: TargetCount + Value: 1 + index: 0 + isKeyDuplicated: 0 + - Key: Damage + Value: 5 + index: 1 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 2 + index: 2 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 3 + isKeyDuplicated: 0 + dividerPosProp: 0.5 + originalAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + runtimeCurrentAttributes: + dictionaryList: [] + dividerPosProp: 0.5 + upgradeNode: + sourceCard: {fileID: 0} + isTerminalNode: 0 + isInfiniteUpgrade: 0 + maxUpgradeLevel: 0 + upgradeCards: [] + customDescriptions: [] + prefabRefs: [] + derivativeCardDataRefs: [] + derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Characters/Data/New Material.mat.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_WrathOfUnderworld.asset.meta similarity index 64% rename from Assets/Mods/Basic/Characters/Data/New Material.mat.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_WrathOfUnderworld.asset.meta index 9a4a45e2..e809ed19 100644 --- a/Assets/Mods/Basic/Characters/Data/New Material.mat.meta +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/CardData_Basic_WrathOfUnderworld.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a7e6e890cbcf4f64d92166428b365bad +guid: 48406db0406bf2d4d851d2bccf85ea21 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast.meta b/Assets/Mods/Basic/Cards/Scripts/Enemies.meta similarity index 77% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast.meta rename to Assets/Mods/Basic/Cards/Scripts/Enemies.meta index f23ad3fb..35c13bd6 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast.meta +++ b/Assets/Mods/Basic/Cards/Scripts/Enemies.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc26238c26933b845b4efec43ee942ce +guid: 6d003cedcc9e4d1428b63909b5f72798 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld.meta b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses.meta similarity index 77% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld.meta rename to Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses.meta index bb7060ef..d25c81bb 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld.meta +++ b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 53ad5c109a3d9244eb28840b69d3abbb +guid: d5624af2d49c1704e9ab5a65bc927398 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld.meta b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld.meta new file mode 100644 index 00000000..a019539d --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 407cb8d52d035514f94999dc568358ce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/ArmyOfTheDead.cs b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/ArmyOfTheDead.cs similarity index 68% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/ArmyOfTheDead.cs rename to Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/ArmyOfTheDead.cs index a33c245f..a54bfc10 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/ArmyOfTheDead.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/ArmyOfTheDead.cs @@ -14,10 +14,14 @@ namespace Continentis.Mods.Basic.Cards { base.PlayEffect(targetList); - CommandGroup mainGroup = new CommandGroup(ExecutionMode.Parallel, new Cmd_Function(() => + CommandGroup mainGroup = new CommandGroup(new Cmd_Function(() => { CharacterData minion = cardData.GetDerivativeCharacterData(0); - CombatMainManager.Instance.characterController.AddCombatNPCs((minion, Fraction.Enemy), (minion, Fraction.Enemy)); + + for (int i = 0; i < GetAttribute("SummonCount"); i++) + { + CombatMainManager.Instance.characterController.AddCombatNPC((minion, Fraction.Enemy)); + } })); return new List { mainGroup }; diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/ArmyOfTheDead.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/ArmyOfTheDead.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/ArmyOfTheDead.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/ArmyOfTheDead.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/GreatswordSweep.cs b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/GreatswordSweep.cs new file mode 100644 index 00000000..72d4909f --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/GreatswordSweep.cs @@ -0,0 +1,36 @@ +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 GreatswordSweep : CardLogicBase + { + protected override void SetUpLogicComponents() + { + AddLogicComponent(); + } + + protected override List PlayEffect(List targetList) + { + CommandGroup mainGroup = new CommandGroup(new Cmd_PlayAnimation(user.characterView, "Attack")); + + mainGroup.AddCommand(TargetListCommandGroup(targetList, + ExecutionMode.Parallel, ExecutionMode.Sequential, + new Cmd_ParamFunction(target => + { + user.Attack(target, GetFinalDamage(target)); + }))); + + return new List { mainGroup }; + } + + public override void ApplyAttributeChangesByCard() + { + LogicComponent().SetDamage_Slash(); + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/GreatswordSweep.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/GreatswordSweep.cs.meta new file mode 100644 index 00000000..f218ff89 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/GreatswordSweep.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a75438b2c74d2ce4886a72b3a42c667d \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/HellfireBlast.cs b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/HellfireBlast.cs similarity index 57% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/HellfireBlast.cs rename to Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/HellfireBlast.cs index 7f81293c..17b9a94c 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/HellfireBlast.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/HellfireBlast.cs @@ -14,27 +14,14 @@ namespace Continentis.Mods.Basic.Cards { AddLogicComponent(); } - - public override void TargetingEffect(CharacterBase target) - { - SetAttribute("DisplayHellfireStack", GetAttribute("HellfireStack")); - } - - public override void UntargetingEffect() - { - SetAttribute("DisplayHellfireStack", GetAttribute("HellfireStack")); - } protected override List PlayEffect(List targetList) { - base.PlayEffect(targetList); - CommandGroup mainGroup = TargetListCommandGroup(targetList, new Cmd_ParamFunction(0.2f, target => { user.Attack(target, GetFinalDamage(target)); - Basic_Hellfire buff = new Basic_Hellfire(GetAttribute("HellfireStack")); - buff.Apply(target, user, this); + CreateCharacterBuff(GetAttribute("BuffStack_Burn")).Apply(target, user, this); })); return new List { mainGroup }; @@ -42,11 +29,7 @@ namespace Continentis.Mods.Basic.Cards public override void ApplyAttributeChangesByCard() { - int offsetFromStr = user.GetAttribute("OffsetFromStrength"); - LogicComponent().SetDamage(offsetFromStr); - - int offsetFromInt = user.GetAttribute("OffsetFromIntelligence"); - SetVariableAttribute("HellfireStack", offsetFromInt); + LogicComponent().SetDamage_Strike(); } } } \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/HellfireBlast.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/HellfireBlast.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/HellfireBlast.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/HellfireBlast.cs.meta diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/WrathOfTheUnderworld.cs b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/WrathOfUnderworld.cs similarity index 77% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/WrathOfTheUnderworld.cs rename to Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/WrathOfUnderworld.cs index 5173acdf..9db45396 100644 --- a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/WrathOfTheUnderworld.cs +++ b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/WrathOfUnderworld.cs @@ -9,12 +9,11 @@ using UnityEngine; namespace Continentis.Mods.Basic.Cards { - public class WrathOfTheUnderworld : CardLogicBase + public class WrathOfUnderworld : CardLogicBase { protected override void SetUpLogicComponents() { AddLogicComponent(); - AddLogicComponent(); } protected override List PlayEffect(List targetList) @@ -23,15 +22,14 @@ namespace Continentis.Mods.Basic.Cards CommandGroup singleTargetGroup = new CommandGroup(ExecutionMode.Parallel, new Cmd_PlayAnimation(user.characterView, "Attack"), - new Cmd_ParamFunction(0.5f, target => + new Cmd_ParamFunction(0.4f, target => { - int hurt = user.Attack(target, GetFinalDamage(target)).hurtDamage; - LogicComponent().LifeSteal(hurt); + user.Attack(target, GetFinalDamage(target)); }) ); CommandGroup mainGroup = TargetListCommandGroup(targetList, ExecutionMode.Parallel, ExecutionMode.Sequential, - singleTargetGroup, singleTargetGroup, singleTargetGroup); + singleTargetGroup, singleTargetGroup, singleTargetGroup, singleTargetGroup, singleTargetGroup); return new List { mainGroup }; } diff --git a/Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/WrathOfTheUnderworld.cs.meta b/Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/WrathOfUnderworld.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/WrathOfTheUnderworld.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/Enemies/Bosses/MarshalOfUnderworld/WrathOfUnderworld.cs.meta diff --git a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_MarshalOfTheUnderworld.asset b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_MarshalOfTheUnderworld.asset index aa7eca04..52fd5cde 100644 --- a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_MarshalOfTheUnderworld.asset +++ b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_MarshalOfTheUnderworld.asset @@ -52,6 +52,10 @@ MonoBehaviour: Value: 24 index: 6 isKeyDuplicated: 0 + - Key: DisableConversion + Value: 1 + index: 7 + isKeyDuplicated: 0 dividerPosProp: 0.5 generalAttributes: dictionaryList: @@ -116,7 +120,7 @@ MonoBehaviour: index: 14 isKeyDuplicated: 0 - Key: MaximumStamina - Value: 2 + Value: 4 index: 15 isKeyDuplicated: 0 - Key: MaximumMana @@ -124,7 +128,7 @@ MonoBehaviour: index: 16 isKeyDuplicated: 0 - Key: MaximumHealth - Value: 20 + Value: 1000 index: 17 isKeyDuplicated: 0 - Key: BlockGainOffset diff --git a/Assets/Mods/Basic/Characters/Data/New Material.mat b/Assets/Mods/Basic/Characters/Data/New Material.mat deleted file mode 100644 index 3465cff8..00000000 --- a/Assets/Mods/Basic/Characters/Data/New Material.mat +++ /dev/null @@ -1,137 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Material - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _XRMotionVectorsPass: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 ---- !u!114 &3060163818772001751 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion - version: 10 diff --git a/Assets/Mods/Basic/Characters/Scripts.meta b/Assets/Mods/Basic/Characters/Scripts.meta new file mode 100644 index 00000000..3402ad2c --- /dev/null +++ b/Assets/Mods/Basic/Characters/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b8e6b6d54a1e37439a90f30567aeaeb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/Basic/Characters/Scripts/MarshallOfUnderworld.cs b/Assets/Mods/Basic/Characters/Scripts/MarshallOfUnderworld.cs new file mode 100644 index 00000000..994b82cf --- /dev/null +++ b/Assets/Mods/Basic/Characters/Scripts/MarshallOfUnderworld.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class MarshallOfUnderworld : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Mods/Basic/Characters/Scripts/MarshallOfUnderworld.cs.meta b/Assets/Mods/Basic/Characters/Scripts/MarshallOfUnderworld.cs.meta new file mode 100644 index 00000000..2216900a --- /dev/null +++ b/Assets/Mods/Basic/Characters/Scripts/MarshallOfUnderworld.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fea5037c82d665c4fa025f25b2136547 \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Combat/CombatCharacterController.cs b/Assets/Scripts/MainGame/Combat/CombatCharacterController.cs index 7fc0f0e0..9e8911e8 100644 --- a/Assets/Scripts/MainGame/Combat/CombatCharacterController.cs +++ b/Assets/Scripts/MainGame/Combat/CombatCharacterController.cs @@ -69,7 +69,7 @@ namespace Continentis.MainGame.Combat ModManager.CreateInstance("Basic.Buffs.Weak", 2).Apply(enemies[0]); } - public void AddCombatNPCs(params (CharacterData, Fraction)[] dataList) + public void AddCombatNPC(params (CharacterData, Fraction)[] dataList) { foreach ((CharacterData, Fraction) npcData in dataList) { diff --git a/Assets/Scripts/ScriptExtensions/CommandQueue/CommandGroup.cs b/Assets/Scripts/ScriptExtensions/CommandQueue/CommandGroup.cs index 9affb846..3b687c51 100644 --- a/Assets/Scripts/ScriptExtensions/CommandQueue/CommandGroup.cs +++ b/Assets/Scripts/ScriptExtensions/CommandQueue/CommandGroup.cs @@ -18,6 +18,13 @@ namespace SLSFramework.General /// public readonly CommandContext groupContext; + public CommandGroup(params CommandBase[] commands) + { + this.mode = ExecutionMode.Sequential; + this.groupContext = new CommandContext(); + this.commands.AddRange(commands); + } + public CommandGroup(ExecutionMode mode, params CommandBase[] commands) { this.mode = mode;