继续

Assets/Mods/Basic/Characters/CombatBuffs/General/Bleed.cs

@@ -4,13 +4,12 @@ using Continentis.MainGame.Card;
 using Continentis.MainGame.Character;
 using SLSFramework.General;
 using UnityEngine;
-using CombatBuffBase = Continentis.MainGame.Character.CombatBuffBase;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Bleed : CombatBuffBase
+    public sealed class Bleed : CharacterCombatBuffBase
     {
-        public Basic_Bleed(int stack)
+        public Bleed(int stack)
         {
             Initialize(BuffType.Negative, BuffDispelLevel.Basic);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Blind.cs

@@ -4,14 +4,9 @@ using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Blind : CombatBuffBase
+    public sealed class Blind : CharacterCombatBuffBase
     {
-        private string GetDescription(int rounds, int stacks)
-        {
-            return $"This character's start damage in Dodge Check is decreased by {stacks}% for {rounds} rounds.";
-        }
-        
-        public Basic_Blind(int initialCount, int stack = 25)
+        public Blind(int initialCount, int stack = 25)
         {
             Initialize(BuffType.Negative, BuffDispelLevel.Basic);
             
@@ -27,7 +22,7 @@ namespace Continentis.Mods.Basic.Buffs
             generalAttributeSubmodule.numericChange.Add("DodgeCheckStartDamageMultiplier", -0.01f * stack);
         }
         
-        public override bool OnBuffApply(out CombatBuffBase existingBuff)
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Blind", attachedCharacter.characterView);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Burn.cs

@@ -4,13 +4,12 @@ using Continentis.MainGame.Card;
 using Continentis.MainGame.Character;
 using SLSFramework.General;
 using UnityEngine;
-using CombatBuffBase = Continentis.MainGame.Character.CombatBuffBase;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Burn : CombatBuffBase
+    public sealed class Burn : CharacterCombatBuffBase
     {
-        public Basic_Burn(int stack)
+        public Burn(int stack)
         {
             Initialize(BuffType.Negative, BuffDispelLevel.Basic);
             
@@ -25,7 +24,7 @@ namespace Continentis.Mods.Basic.Buffs
             this.eventSubmodule.onAfterPlayCard.Add("Burn", new EventUnit<CardInstance, List<CharacterBase>>(OnAfterPlayCard));
         }
 
-        public override bool OnBuffApply(out CombatBuffBase existingBuff)
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Burn", attachedCharacter.characterView);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Corrosion.cs

@@ -5,9 +5,9 @@ using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Corrosion : CombatBuffBase
+    public sealed class Corrosion : CharacterCombatBuffBase
     {
-        public Basic_Corrosion(int stack)
+        public Corrosion(int stack)
         {
             Initialize(BuffType.Negative, BuffDispelLevel.Basic);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Firm.cs

@@ -6,9 +6,9 @@ using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Firm : CombatBuffBase, IBuffExtension_IntegerRange
+    public sealed class Firm : CharacterCombatBuffBase, IBuffExtension_IntegerRange
     {
-        public Basic_Firm(int stack)
+        public Firm(int stack)
         {
             Initialize(BuffType.Positive, BuffDispelLevel.Strong);
             
@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Buffs
             (this as IBuffExtension_IntegerRange).Initialize(stack);
         }
         
-        public override bool OnBuffApply(out CombatBuffBase existingBuff) 
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Firm", attachedCharacter.characterView);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Freeze.cs

@@ -4,9 +4,9 @@ using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Freeze : CombatBuffBase
+    public sealed class Freeze : CharacterCombatBuffBase
     {
-        public Basic_Freeze(int initialCount, int stack = 25)
+        public Freeze(int initialCount, int stack = 25)
         {
             Initialize(BuffType.Negative, BuffDispelLevel.Basic);
             
@@ -24,7 +24,7 @@ namespace Continentis.Mods.Basic.Buffs
             generalAttributeSubmodule.numericChange.Add("DodgeGainMultiplier", -0.01f * stack);
         }
         
-        public override bool OnBuffApply(out CombatBuffBase existingBuff) 
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Freeze", attachedCharacter.characterView);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Heavy.cs

@@ -0,0 +1,44 @@
+using Continentis.MainGame;
+using Continentis.MainGame.Character;
+using UnityEngine;
+
+namespace Continentis.Mods.Basic.Buffs
+{
+    public class Heavy : CharacterCombatBuffBase
+    {
+        private readonly bool isAdditive;
+        
+        
+        public Heavy(bool additive = false, int actionCount = 1)
+        {
+            Initialize(BuffType.Negative, BuffDispelLevel.Basic);
+            this.isAdditive = additive;
+            
+            this.contentSubmodule = new ContentSubmodule(this)
+                .AddParameterGetter("Count", () => actionCountSubmodule.remainingCount.ToString());
+            
+            this.iconSubmodule = new IconSubmodule(this);
+            
+            this.actionCountSubmodule = new CountSubmodule(this, actionCount);
+            
+            this.statusSubmodule = new StatusSubmodule(this, StatusType.Heavy);
+        }
+        
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
+        {
+            MainGameManager.Instance.basePrefabs.GenerateInfoText("Heavy", attachedCharacter.characterView);
+            
+            if (FindExistingSameBuff(out existingBuff))
+            {
+                if (this.isAdditive) //可叠加型状态
+                {
+                    existingBuff.actionCountSubmodule.AddMaxCount(this.actionCountSubmodule.maximumCount);
+                }
+                
+                return false;
+            }
+            
+            return true;
+        }
+    }
+}

Assets/Mods/Basic/Characters/CombatBuffs/General/Heavy.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fa6416b18bb0122409abb80cfddbedc2

Assets/Mods/Basic/Characters/CombatBuffs/General/Nimble.cs

@@ -6,9 +6,9 @@ using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Nimble : CombatBuffBase, IBuffExtension_IntegerRange
+    public sealed class Nimble : CharacterCombatBuffBase, IBuffExtension_IntegerRange
     {
-        public Basic_Nimble(int stack)
+        public Nimble(int stack)
         {
             Initialize(BuffType.Positive, BuffDispelLevel.Strong);
            
@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Buffs
             (this as IBuffExtension_IntegerRange).Initialize(stack);
         }
         
-        public override bool OnBuffApply(out CombatBuffBase existingBuff) 
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Nimble", attachedCharacter.characterView);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Prowess.cs

@@ -6,9 +6,9 @@ using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Prowess : CombatBuffBase, IBuffExtension_IntegerRange
+    public sealed class Prowess : CharacterCombatBuffBase, IBuffExtension_IntegerRange
     {
-        public Basic_Prowess(int stack)
+        public Prowess(int stack)
         {
             Initialize(BuffType.Positive, BuffDispelLevel.Strong);
             
@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Buffs
             (this as IBuffExtension_IntegerRange).Initialize(stack);
         }
         
-        public override bool OnBuffApply(out CombatBuffBase existingBuff) 
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Prowess", attachedCharacter.characterView);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Resonance.cs

@@ -3,15 +3,14 @@ using Continentis.MainGame;
 using Continentis.MainGame.Character;
 using SLSFramework.General;
 using UnityEngine;
-using CombatBuffBase = Continentis.MainGame.Character.CombatBuffBase;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Resonance : CombatBuffBase, IBuffExtension_IntegerRange
+    public sealed class Resonance : CharacterCombatBuffBase, IBuffExtension_IntegerRange
     {
         public Func<string> GetDescription { get; set; }
         
-        public Basic_Resonance(int stack)
+        public Resonance(int stack)
         {
             Initialize(BuffType.Positive, BuffDispelLevel.Strong);
            
@@ -28,7 +27,7 @@ namespace Continentis.Mods.Basic.Buffs
             (this as IBuffExtension_IntegerRange).Initialize(stack);
         }
         
-        public override bool OnBuffApply(out CombatBuffBase existingBuff) 
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Resonance", attachedCharacter.characterView);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Vulnerable.cs

@@ -5,9 +5,9 @@ using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Vulnerable : CombatBuffBase
+    public sealed class Vulnerable : CharacterCombatBuffBase
     {
-        public Basic_Vulnerable(int duration)
+        public Vulnerable(int duration)
         {
             Initialize(BuffType.Negative, BuffDispelLevel.Basic);
             
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Buffs
             generalAttributeSubmodule.numericChange.Add("PhysicsDamageGainMultiplier", 0.5f);
         }
         
-        public override bool OnBuffApply(out CombatBuffBase existingBuff) 
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Vulnerable", attachedCharacter.characterView);
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Weak.cs

@@ -4,9 +4,9 @@ using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
 {
-    public sealed class Basic_Weak : CombatBuffBase
+    public sealed class Weak : CharacterCombatBuffBase
     {
-        public Basic_Weak(int duration)
+        public Weak(int duration)
         {
             Initialize(BuffType.Negative, BuffDispelLevel.Basic);
             
@@ -21,7 +21,7 @@ namespace Continentis.Mods.Basic.Buffs
             generalAttributeSubmodule.numericChange.Add("PhysicsDamageDealtMultiplier", -0.25f);
         }
         
-        public override bool OnBuffApply(out CombatBuffBase existingBuff) 
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
         {
             MainGameManager.Instance.basePrefabs.GenerateInfoText("Weak", attachedCharacter.characterView);