Add SKillId on ArenaSkill

planetarium · May 16, 2024 · d6c1b5b · d6c1b5b
1 parent 8392014
commit d6c1b5b
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 24 deletions.
diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaAreaAttack.cs b/Lib9c/Model/BattleStatus/Arena/ArenaAreaAttack.cs
@@ -8,10 +8,11 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaAreaAttack : ArenaSkill
     {
         public ArenaAreaAttack(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaBlowAttack.cs b/Lib9c/Model/BattleStatus/Arena/ArenaBlowAttack.cs
@@ -8,10 +8,11 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaBlowAttack : ArenaSkill
     {
         public ArenaBlowAttack(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaBuff.cs b/Lib9c/Model/BattleStatus/Arena/ArenaBuff.cs
@@ -7,8 +7,8 @@ namespace Nekoyume.Model.BattleStatus.Arena
     [Serializable]
     public class ArenaBuff : ArenaSkill
     {
-        public ArenaBuff(ArenaCharacter character, IEnumerable<ArenaSkillInfo> skillInfos)
-            : base(character, skillInfos, null)
+        public ArenaBuff(int skillId, ArenaCharacter character, IEnumerable<ArenaSkillInfo> skillInfos)
+            : base(skillId, character, skillInfos, null)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaBuffRemovalAttack.cs b/Lib9c/Model/BattleStatus/Arena/ArenaBuffRemovalAttack.cs
@@ -8,10 +8,11 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaBuffRemovalAttack : ArenaSkill
     {
         public ArenaBuffRemovalAttack(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaDoubleAttack.cs b/Lib9c/Model/BattleStatus/Arena/ArenaDoubleAttack.cs
@@ -8,10 +8,11 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaDoubleAttack : ArenaSkill
     {
         public ArenaDoubleAttack(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaDoubleAttackWithCombo.cs b/Lib9c/Model/BattleStatus/Arena/ArenaDoubleAttackWithCombo.cs
@@ -8,10 +8,11 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaDoubleAttackWithCombo : ArenaSkill
     {
         public ArenaDoubleAttackWithCombo(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaHeal.cs b/Lib9c/Model/BattleStatus/Arena/ArenaHeal.cs
@@ -8,10 +8,11 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaHeal : ArenaSkill
     {
         public ArenaHeal(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaNormalAttack.cs b/Lib9c/Model/BattleStatus/Arena/ArenaNormalAttack.cs
@@ -8,10 +8,11 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaNormalAttack : ArenaSkill
     {
         public ArenaNormalAttack(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaShatterStrike.cs b/Lib9c/Model/BattleStatus/Arena/ArenaShatterStrike.cs
@@ -8,10 +8,11 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaShatterStrike : ArenaSkill
     {
         public ArenaShatterStrike(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos
-        ) : base(character, skillInfos, buffInfos)
+        ) : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaSkill.cs b/Lib9c/Model/BattleStatus/Arena/ArenaSkill.cs
@@ -47,17 +47,20 @@ public ArenaSkillInfo(ArenaCharacter character, long effect, bool critical, Skil
             }
         }
 
-        public readonly IEnumerable<ArenaSkillInfo> SkillInfos;
+        public readonly int SkillId;
 
+        public readonly IEnumerable<ArenaSkillInfo> SkillInfos;
 
         public readonly IEnumerable<ArenaSkillInfo>? BuffInfos;
 
         protected ArenaSkill(
+            int skillId,
             ArenaCharacter character,
             IEnumerable<ArenaSkillInfo> skillInfos,
             IEnumerable<ArenaSkillInfo> buffInfos)
             : base(character)
         {
+            SkillId = skillId;
             SkillInfos = skillInfos;
             BuffInfos = buffInfos;
         }

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaTick.cs b/Lib9c/Model/BattleStatus/Arena/ArenaTick.cs
@@ -8,14 +8,15 @@ namespace Nekoyume.Model.BattleStatus.Arena
     public class ArenaTick : ArenaSkill
     {
         public ArenaTick(ArenaCharacter character) : this(
+            0,
             character,
             ArraySegment<ArenaSkillInfo>.Empty,
             ArraySegment<ArenaSkillInfo>.Empty)
         {
         }
 
-        public ArenaTick(ArenaCharacter character, IEnumerable<ArenaSkillInfo> skillInfos, IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+        public ArenaTick(int skillId, ArenaCharacter character, IEnumerable<ArenaSkillInfo> skillInfos, IEnumerable<ArenaSkillInfo> buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/BattleStatus/Arena/ArenaTickDamage.cs b/Lib9c/Model/BattleStatus/Arena/ArenaTickDamage.cs
@@ -7,8 +7,8 @@ namespace Nekoyume.Model.BattleStatus.Arena
     [Serializable]
     public class ArenaTickDamage : ArenaSkill
     {
-        public ArenaTickDamage(ArenaCharacter character, IEnumerable<ArenaSkillInfo> skillInfos, IEnumerable<ArenaSkillInfo> buffInfos)
-            : base(character, skillInfos, buffInfos)
+        public ArenaTickDamage(int skillId, ArenaCharacter character, IEnumerable<ArenaSkillInfo> skillInfos, IEnumerable<ArenaSkillInfo> buffInfos)
+            : base(skillId, character, skillInfos, buffInfos)
         {
         }
 

diff --git a/Lib9c/Model/Buff/Bleed.cs b/Lib9c/Model/Buff/Bleed.cs
@@ -70,6 +70,7 @@ public ArenaSkill GiveEffectForArena(
             };
 
             return new ArenaTickDamage(
+                RowData.Id,
                 clone,
                 damageInfos,
                 null);

diff --git a/Lib9c/Model/Buff/Vampiric.cs b/Lib9c/Model/Buff/Vampiric.cs
@@ -73,6 +73,7 @@ public ArenaSkill GiveEffectForArena(ArenaCharacter affectedCharacter, ArenaSkil
                     RowData.TargetType)
             };
             return new ArenaTick(
+                RowData.Id,
                 clone,
                 infos,
                 null);

diff --git a/Lib9c/Model/Character/ArenaCharacter.cs b/Lib9c/Model/Character/ArenaCharacter.cs
@@ -665,6 +665,7 @@ private ArenaSkill GiveThornDamage(long targetThorn)
             };
 
             var tickDamage = new ArenaTickDamage(
+                default,
                 clone,
                 damageInfos,
                 null);

diff --git a/Lib9c/Model/Skill/Arena/ArenaAreaAttack.cs b/Lib9c/Model/Skill/Arena/ArenaAreaAttack.cs
@@ -27,7 +27,7 @@ public override BattleStatus.Arena.ArenaSkill Use(
             var damage = ProcessDamage(caster, target, turn);
             var buff = ProcessBuff(caster, target, turn, buffs);
 
-            return new BattleStatus.Arena.ArenaAreaAttack(clone, damage, buff);
+            return new BattleStatus.Arena.ArenaAreaAttack(SkillRow.Id, clone, damage, buff);
         }
     }
 }
diff --git a/Lib9c/Model/Skill/Arena/ArenaBlowAttack.cs b/Lib9c/Model/Skill/Arena/ArenaBlowAttack.cs
@@ -27,7 +27,7 @@ public override BattleStatus.Arena.ArenaSkill Use(
             var damage = ProcessDamage(caster, target, turn);
             var buff = ProcessBuff(caster, target, turn, buffs);
 
-            return new BattleStatus.Arena.ArenaBlowAttack(clone, damage, buff);
+            return new BattleStatus.Arena.ArenaBlowAttack(SkillRow.Id, clone, damage, buff);
         }
     }
 }
diff --git a/Lib9c/Model/Skill/Arena/ArenaBuffRemovalAttack.cs b/Lib9c/Model/Skill/Arena/ArenaBuffRemovalAttack.cs
@@ -28,7 +28,7 @@ public override BattleStatus.Arena.ArenaSkill Use(
             var buff = ProcessBuff(caster, target, turn, buffs);
             target.RemoveRecentStatBuff();
 
-            return new BattleStatus.Arena.ArenaBuffRemovalAttack(clone, damage, buff);
+            return new BattleStatus.Arena.ArenaBuffRemovalAttack(SkillRow.Id, clone, damage, buff);
         }
     }
 }
diff --git a/Lib9c/Model/Skill/Arena/ArenaBuffSkill.cs b/Lib9c/Model/Skill/Arena/ArenaBuffSkill.cs
@@ -26,7 +26,7 @@ public override BattleStatus.Arena.ArenaSkill Use(
             var clone = (ArenaCharacter)caster.Clone();
             var buff = ProcessBuff(caster, target, turn, buffs);
 
-            return new BattleStatus.Arena.ArenaBuff(clone, buff);
+            return new BattleStatus.Arena.ArenaBuff(SkillRow.Id, clone, buff);
         }
     }
 }
diff --git a/Lib9c/Model/Skill/Arena/ArenaDoubleAttack.cs b/Lib9c/Model/Skill/Arena/ArenaDoubleAttack.cs
@@ -30,11 +30,11 @@ public override BattleStatus.Arena.ArenaSkill Use(
 
             if (SkillRow.Combo)
             {
-                return new BattleStatus.Arena.ArenaDoubleAttackWithCombo(clone, damage, buff);
+                return new BattleStatus.Arena.ArenaDoubleAttackWithCombo(SkillRow.Id, clone, damage, buff);
             }
             else
             {
-                return new BattleStatus.Arena.ArenaDoubleAttack(clone, damage, buff);
+                return new BattleStatus.Arena.ArenaDoubleAttack(SkillRow.Id, clone, damage, buff);
             }
         }
     }

diff --git a/Lib9c/Model/Skill/Arena/ArenaHealSkill.cs b/Lib9c/Model/Skill/Arena/ArenaHealSkill.cs
@@ -27,7 +27,7 @@ public override BattleStatus.Arena.ArenaSkill Use(
             var heal = ProcessHeal(caster, turn);
             var buff = ProcessBuff(caster, target, turn, buffs);
 
-            return new BattleStatus.Arena.ArenaHeal(clone, heal, buff);
+            return new BattleStatus.Arena.ArenaHeal(SkillRow.Id, clone, heal, buff);
         }
 
         private IEnumerable<BattleStatus.Arena.ArenaSkill.ArenaSkillInfo> ProcessHeal(

diff --git a/Lib9c/Model/Skill/Arena/ArenaNormalAttack.cs b/Lib9c/Model/Skill/Arena/ArenaNormalAttack.cs
@@ -27,7 +27,7 @@ public override BattleStatus.Arena.ArenaSkill Use(
             var damage = ProcessDamage(caster, target, turn, true);
             var buff = ProcessBuff(caster, target, turn, buffs);
 
-            return new BattleStatus.Arena.ArenaNormalAttack(clone, damage, buff);
+            return new BattleStatus.Arena.ArenaNormalAttack(SkillRow.Id, clone, damage, buff);
         }
     }
 }
diff --git a/Lib9c/Model/Skill/Arena/ArenaShatterStrike.cs b/Lib9c/Model/Skill/Arena/ArenaShatterStrike.cs
@@ -18,7 +18,7 @@ public override BattleStatus.Arena.ArenaSkill Use(ArenaCharacter caster, ArenaCh
             var damage = ProcessDamage(caster, target, turn);
             var buff = ProcessBuff(caster, target, turn, buffs);
 
-            return new BattleStatus.Arena.ArenaShatterStrike(clone, damage, buff);
+            return new BattleStatus.Arena.ArenaShatterStrike(SkillRow.Id, clone, damage, buff);
         }
     }
 }