Merged in DR v1.4.8

source/classes/CustomSettings.py

@@ -21,11 +21,20 @@ class CustomSettings(object):
         self.relative_dir = None
         self.world_rep = {}
         self.player_range = None
+        self.player_map = {}  # player number to name
 
     def load_yaml(self, file):
         self.file_source = load_yaml(file)
         head, filename = os.path.split(file)
         self.relative_dir = head
+        if 'version' in self.file_source and self.file_source['version'].startswith('2'):
+            player_number = 1
+            for key in self.file_source.keys():
+                if key in ['meta', 'version']:
+                    continue
+                else:
+                    self.player_map[player_number] = key
+                    player_number += 1
 
     def determine_seed(self, default_seed):
         if 'meta' in self.file_source:
@@ -179,6 +188,7 @@ class CustomSettings(object):
                 args.restrict_boss_items[p] = get_setting(settings['restrict_boss_items'], args.restrict_boss_items[p])
                 args.overworld_map[p] = get_setting(settings['overworld_map'], args.overworld_map[p])
                 args.pseudoboots[p] = get_setting(settings['pseudoboots'], args.pseudoboots[p])
+                args.mirrorscroll[p] = get_setting(settings['mirrorscroll'], args.mirrorscroll[p])
                 args.triforce_goal[p] = get_setting(settings['triforce_goal'], args.triforce_goal[p])
                 args.triforce_pool[p] = get_setting(settings['triforce_pool'], args.triforce_pool[p])
                 args.triforce_goal_min[p] = get_setting(settings['triforce_goal_min'], args.triforce_goal_min[p])
@@ -189,6 +199,7 @@ class CustomSettings(object):
                 args.triforce_max_difference[p] = get_setting(settings['triforce_max_difference'], args.triforce_max_difference[p])
                 args.beemizer[p] = get_setting(settings['beemizer'], args.beemizer[p])
                 args.aga_randomness[p] = get_setting(settings['aga_randomness'], args.aga_randomness[p])
+                args.money_balance[p] = get_setting(settings['money_balance'], args.money_balance[p])
 
                 # mystery usage
                 args.usestartinventory[p] = get_setting(settings['usestartinventory'], args.usestartinventory[p])
@@ -219,6 +230,9 @@ class CustomSettings(object):
             return self.file_source['placements']
         return None
 
+    def get_prices(self, player):
+        return self.get_attribute_by_player_composite('prices', player)
+
     def get_advanced_placements(self):
         if 'advanced_placements' in self.file_source:
             return self.file_source['advanced_placements']
@@ -284,6 +298,34 @@ class CustomSettings(object):
             return self.file_source['enemies']
         return None
 
+
+    def get_attribute_by_player_composite(self, attribute, player):
+        attempt = self.get_attribute_by_player_new(attribute, player)
+        if attempt is not None:
+            return attempt
+        attempt = self.get_attribute_by_player(attribute, player)
+        return attempt
+
+    def get_attribute_by_player(self, attribute, player):
+        if attribute in self.file_source:
+            if player in self.file_source[attribute]:
+                return self.file_source[attribute][player]
+        return None
+
+    def get_attribute_by_player_new(self, attribute, player):
+        player_id = self.get_player_id(player)
+        if player_id is not None:
+            if attribute in self.file_source[player_id]:
+                return self.file_source[player_id][attribute]
+        return None
+
+    def get_player_id(self, player):
+        if player in self.file_source:
+            return player
+        if player in self.player_map and self.player_map[player] in self.file_source:
+            return self.player_map[player]
+        return None
+
     def create_from_world(self, world, settings):
         self.player_range = range(1, world.players + 1)
         settings_dict, meta_dict = {}, {}
@@ -355,10 +397,12 @@ class CustomSettings(object):
             settings_dict[p]['linked_drops'] = world.linked_drops[p]
             settings_dict[p]['overworld_map'] = world.overworld_map[p]
             settings_dict[p]['pseudoboots'] = world.pseudoboots[p]
+            settings_dict[p]['mirrorscroll'] = world.mirrorscroll[p]
             settings_dict[p]['triforce_goal'] = world.treasure_hunt_count[p]
             settings_dict[p]['triforce_pool'] = world.treasure_hunt_total[p]
             settings_dict[p]['beemizer'] = world.beemizer[p]
             settings_dict[p]['aga_randomness'] = world.aga_randomness[p]
+            settings_dict[p]['money_balance'] = world.money_balance[p]
             if world.precollected_items:
                 start_inv[p] = []
         for item in world.precollected_items: