Simplify PMO general comparator

rs/ai/pwnder_my_orbs/comparators/pmo_general_comparator.py

@@ -1,57 +1,20 @@
-from typing import List
-
 from rs.calculator.enums.power_id import PowerId
-from rs.common.comparators.common_general_comparator import Comparison, CommonGeneralComparator, powers_we_like, \
+from rs.common.comparators.common_general_comparator import CommonGeneralComparator, powers_we_like, \
     powers_we_like_less, powers_we_dislike
 from rs.common.comparators.core.assessment import ComparatorAssessmentConfig
 from rs.common.comparators.core.comparisons import *
 
-default_comparisons = [
-    battle_not_lost,
-    battle_is_won,
-    preserve_revive_options,
-    most_optimal_winning_battle,
-    most_free_early_draw,
-    most_free_draw,
-    most_lasting_intangible,
-    least_incoming_damage_over_1,
-    most_great_player_powers,
-    most_dead_monsters,
-    most_enemy_vulnerable,
-    most_enemy_weak,
-    least_awkward_shivs,
-    most_powered_up_ritual_dagger,
-    lowest_health_monster,
-    most_good_player_powers,
-    most_orb_slots,
-    lowest_total_monster_health,
-    lowest_barricaded_block,
-    lowest_enemy_plated_armor,
-    most_channeled_orbs,
-    most_draw_pay_early,
-    most_draw_pay,
-    least_bad_player_powers,
-    most_less_good_player_powers,
-    least_enemy_artifacts,
-    most_bad_cards_exhausted,
-    most_powered_up_genetic_algorithm,
-    most_cards_left_in_hand,
-    least_incoming_damage,
-    most_ethereal_cards_saved_for_later,
-    most_powered_up_claws,
-    most_cards_left_in_hand,
-    least_powered_down_steam_barrier,
-    most_block_saved_for_next_turn,
-    most_energy,
-]
-
 
 class PmoGeneralComparator(CommonGeneralComparator):
 
-    def __init__(self, comparisons: List[Comparison] = None):
+    def __init__(self):
+        comparisons = default_comparisons.copy()
+        move_in_comparison_list(comparisons, comparison_to_move=most_good_player_powers, after=lowest_health_monster)
+        move_in_comparison_list(comparisons, comparison_to_move=most_orb_slots, after=most_good_player_powers)
+
         powers_we_love = [
             PowerId.ECHO_FORM,
             PowerId.ELECTRO,
         ]
         config = ComparatorAssessmentConfig(powers_we_like, powers_we_like_less, powers_we_dislike, powers_we_love)
-        super().__init__(default_comparisons if comparisons is None else comparisons, config)
+        super().__init__(comparisons, config)

rs/common/comparators/common_general_comparator.py

@@ -20,6 +20,7 @@
     most_free_draw,
     most_lasting_intangible,
     least_incoming_damage_over_1,
+    most_great_player_powers,
     most_dead_monsters,
     most_tranquility,
     most_enemy_talking_to_hand,