Commit: 67b3fb9439f19b873bb5c0a2224d8911252948f6 - factorio_calc (hg)

Just a simple, and painful to use calculator for the game Factorio written in Python

Commit MetaInfo

• Revision: 67b3fb9439f19b873bb5c0a2224d8911252948f6 (tree)
• Time: 2017-08-07 23:53:24
• Author: Eric Hopper <hopper@omni...>
• Commiter: Eric Hopper

Log Message

Allow ingredient specification by name in constructor.

Change Summary

• modified: factorio_calc.py

Incremental Difference

diff -r f3360cc79f32 -r 67b3fb9439f1 factorio_calc.py
--- a/factorio_calc.py	Sun Aug 06 14:40:20 2017 -0700
+++ b/factorio_calc.py	Mon Aug 07 07:53:24 2017 -0700
@@ -13,7 +13,17 @@
         self._produced = produced
         self._name = name
         self._time = time
-        self._ingredients = ingredients
+        def lookup_ingredients(ingredients):
+            for ct, item in ingredients:
+                print(f"Lookup up ({ct}, {item!s})", file=sys.stderr)
+                if not isinstance(item, ProductionItem):
+                    item = item_db[item]
+                    print(f"Wasn't already an item, found {item!s}",
+                          file=sys.stderr)
+                yield (ct, item)
+        oldlen = len(ingredients)
+        self._ingredients = tuple(item for item in lookup_ingredients(ingredients))
+        assert(len(self._ingredients) == oldlen)
 
     def __hash__(self):
         return hash(self._name)