Refactor ArenaCharacter set stats

planetarium · Feb 16, 2024 · a5e7333 · a5e7333
1 parent c8369b7
commit a5e7333
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/.Lib9c.Tests/Model/Skill/BuffFactoryTest.cs b/.Lib9c.Tests/Model/Skill/BuffFactoryTest.cs
@@ -52,6 +52,7 @@ public void GetBuffs_Arena(bool setExtraValueBuffBeforeGetBuffs)
                 digest,
                 arenaSheets,
                 simulator.HpModifier,
+                new List<StatModifier>(),
                 setExtraValueBuffBeforeGetBuffs: setExtraValueBuffBeforeGetBuffs);
             var buffs = BuffFactory.GetBuffs(
                 challenger.Stats,

diff --git a/Lib9c/Arena/ArenaSimulator.cs b/Lib9c/Arena/ArenaSimulator.cs
@@ -121,33 +121,17 @@ private static SimplePriorityQueue<ArenaCharacter, decimal> SpawnPlayers(
                 challengerDigest,
                 simulatorSheets,
                 simulator.HpModifier,
+                challengerCollectionModifiers,
                 setExtraValueBuffBeforeGetBuffs: setExtraValueBuffBeforeGetBuffs);
-            if (challengerDigest.Runes != null)
-            {
-                challenger.SetRune(
-                    challengerDigest.Runes,
-                    simulatorSheets.RuneOptionSheet,
-                    simulatorSheets.SkillSheet);
-            }
-
-            challenger.Stats.SetCollections(challengerCollectionModifiers);
 
             var enemy = new ArenaCharacter(
                 simulator,
                 enemyDigest,
                 simulatorSheets,
                 simulator.HpModifier,
+                enemyCollectionModifiers,
                 isEnemy: true,
                 setExtraValueBuffBeforeGetBuffs: setExtraValueBuffBeforeGetBuffs);
-            if (enemyDigest.Runes != null)
-            {
-                enemy.SetRune(
-                    enemyDigest.Runes,
-                    simulatorSheets.RuneOptionSheet,
-                    simulatorSheets.SkillSheet);
-            }
-
-            enemy.Stats.SetCollections(enemyCollectionModifiers);
 
             challenger.Spawn(enemy);
             enemy.Spawn(challenger);

diff --git a/Lib9c/Model/Character/ArenaCharacter.cs b/Lib9c/Model/Character/ArenaCharacter.cs
@@ -157,6 +157,7 @@ public ArenaCharacter(
             ArenaPlayerDigest digest,
             ArenaSimulatorSheets sheets,
             long hpModifier,
+            List<StatModifier> collectionModifiers,
             bool isEnemy = false,
             bool setExtraValueBuffBeforeGetBuffs = false)
         {
@@ -186,6 +187,15 @@ public ArenaCharacter(
             _skills = GetSkills(digest.Equipments, sheets.SkillSheet);
             _attackCountMax = AttackCountHelper.GetCountMax(digest.Level);
             ResetCurrentHP();
+            if (digest.Runes != null)
+            {
+                SetRune(
+                    digest.Runes,
+                    sheets.RuneOptionSheet,
+                    sheets.SkillSheet);
+            }
+
+            Stats.SetCollections(collectionModifiers);
         }
 
         private ArenaCharacter(ArenaCharacter value)