@@ -112,6 +112,10 @@ def emotion(self) -> GemsEmotion:
112112 self .campaign .config .override (Emotion_Mode = 'ignore' )
113113 self .campaign .config .override (EnemyPriority_EnemyScaleBalanceWeight = 'S1_enemy_first' )
114114
115+ @property
116+ def emotion_lower_bound (self ):
117+ return 4 + self .campaign ._map_battle * 2
118+
115119 @property
116120 def change_flagship (self ):
117121 return 'ship' in self .config .GemsFarming_ChangeFlagship
@@ -221,7 +225,8 @@ def get_common_rarity_cv(self):
221225
222226 logger .hr ('FINDING FLAGSHIP' )
223227
224- scanner = ShipScanner (level = (1 , 31 ), emotion = (10 , 150 ),
228+ scanner = ShipScanner (level = (1 , 31 ),
229+ emotion = (self .emotion_lower_bound , 150 ),
225230 fleet = self .fleet_to_attack , status = 'free' )
226231 scanner .disable ('rarity' )
227232
@@ -269,7 +274,8 @@ def get_common_rarity_cv(self):
269274
270275 def get_common_rarity_dd (self ):
271276 """
272- Get a common rarity dd with level is 100 (70 for servers except CN) and emotion > 10
277+ Get a common rarity dd with level is 100 (70 for servers except CN)
278+ and emotion >= self.emotion_lower_bound
273279 Returns:
274280 Ship:
275281 """
@@ -280,7 +286,8 @@ def get_common_rarity_dd(self):
280286 else :
281287 max_level = 70
282288
283- scanner = ShipScanner (level = (max_level , max_level ), emotion = (10 , 150 ),
289+ scanner = ShipScanner (level = (max_level , max_level ),
290+ emotion = (self .emotion_lower_bound , 150 ),
284291 fleet = self .fleet_to_attack , status = 'free' )
285292 scanner .disable ('rarity' )
286293
0 commit comments