Clean up adding extra embryo logic in Avatar::recalcStats

GoJam11 · Aug 31, 2022 · bab6e68 · bab6e68
1 parent 45c08c5
commit bab6e68
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/emu/grasscutter/game/avatar/Avatar.java b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
@@ -556,8 +556,8 @@ public void recalcStats(boolean forceSendAbilityChange) {
                 this.addFightProperty(prop.getProp(), prop.getValue());
             }
 
-            // Add any skill strings from this proud skill
-            this.addToExtraAbilityEmbryos(proudSkillData.getOpenConfig(), true);
+            // Add any embryos from this proud skill
+            this.addToExtraAbilityEmbryos(proudSkillData.getOpenConfig());
         }
 
         // Constellations
@@ -566,7 +566,7 @@ public void recalcStats(boolean forceSendAbilityChange) {
             .filter(Objects::nonNull)
             .map(AvatarTalentData::getOpenConfig)
             .filter(Objects::nonNull)
-            .forEach(openConfig -> this.addToExtraAbilityEmbryos(openConfig, false));
+            .forEach(this::addToExtraAbilityEmbryos);
             // Add any skill strings from this constellation
 
         // Set % stats
@@ -600,6 +600,10 @@ public void recalcStats(boolean forceSendAbilityChange) {
             }
         }
     }
+
+    public void addToExtraAbilityEmbryos(String openConfig) {
+        this.addToExtraAbilityEmbryos(openConfig, false);
+    }
 
     public void addToExtraAbilityEmbryos(String openConfig, boolean forceAdd) {
         if (openConfig == null || openConfig.length() == 0) {