Factorio: fix progressive science pack order

BaseClasses.py

@@ -1495,8 +1495,9 @@ class Spoiler(object):
             if self.world.factorio_player_ids:
                 outfile.write('\n\nRecipes:\n')
                 for player in self.world.factorio_player_ids:
+                    name = self.world.get_player_names(player)
                     for recipe in self.world.worlds[player].custom_recipes.values():
-                        outfile.write(f"{recipe.name}: {recipe.ingredients} -> {recipe.products}\n")
+                        outfile.write(f"\n{recipe.name} ({name}): {recipe.ingredients} -> {recipe.products}")
 
             if self.startinventory:
                 outfile.write('\n\nStarting Inventory:\n\n')

worlds/AutoWorld.py

@@ -33,25 +33,30 @@ class World(metaclass=AutoWorldRegister):
         self.world = world
         self.player = player
 
-    # overwritable methods that get called by Main.py
-    def generate_basic(self):
+    # overwritable methods that get called by Main.py, sorted by execution order
+    def create_regions(self):
         pass
 
     def set_rules(self):
         pass
 
-    def create_regions(self):
+    def generate_basic(self):
         pass
 
     def generate_output(self):
+        """This method gets called from a threadpool, do not use world.random here.
+        If you need any last-second randomization, use MultiWorld.slot_seeds[slot] instead."""
         pass
 
+    def get_required_client_version(self) -> tuple:
+        return 0, 0, 3
+
+    # end of Main.py calls
+
     def collect(self, state, item) -> bool:
-        """Collect an item into state"""
+        """Collect an item into state. For speed reasons items that aren't logically useful get skipped."""
         if item.advancement:
             state.prog_items[item.name, item.player] += 1
             return True  # indicate that a logical state change has occured
         return False
 
-    def get_required_client_version(self) -> tuple:
-        return 0, 0, 3

worlds/factorio/Technologies.py

@@ -326,9 +326,7 @@ for root in base_starts:
     progressive_rows["progressive-"+root] = tuple(progressive)
 
 # science packs
-progressive_rows["progressive-science-pack"] = tuple(sorted(required_technologies,
-                                                            key=lambda name: len(required_technologies[name]))[1:] +
-                                                     ["space-science-pack"])
+progressive_rows["progressive-science-pack"] = tuple(Options.MaxSciencePack.get_ordered_science_packs())[1:]
 
 
 # manual progressive