Merge branch 'master' of git://github.com/takluyver/weatbag into southern-tiles-1

Getting everything up to date before I continue. Also see if anyone has added cool new features.

2 files changed, 32 insertions, 0 deletions

diff --git a/weatbag/items/__init__.py b/weatbag/items/__init__.py
new file mode 100644
index 0000000..3d0922f
--- /dev/null
+++ b/weatbag/items/__init__.py
@@ -0,0 +1,26 @@
+from importlib import import_module
+from types import ModuleType
+
+def get_item_module(name):
+    """Returns the module for that item, or a blank module if no module exists.
+    """
+    name = name.replace(' ','_')
+    try:
+        return import_module('weatbag.items.' + name)
+    except ImportError:
+        return ModuleType(name, "Dummy Module")
+
+
+def _combine(item1, item2):
+    "Try combining items one way"
+    try:
+        return get_item_module(item1).combine(item2)
+    except AttributeError:
+        pass
+
+def combine(item1, item2):
+    "Try combining items either way round."
+    results = _combine(item1, item2)
+    if results is None:
+        results = _combine(item2, item1)
+    return results
diff --git a/weatbag/items/unlit_torch.py b/weatbag/items/unlit_torch.py
new file mode 100644
index 0000000..1f313ca
--- /dev/null
+++ b/weatbag/items/unlit_torch.py
@@ -0,0 +1,6 @@
+def combine(other):
+    if other == 'match':
+        print("The torch sputters into life.")
+        return ['flaming torch']
+    
+    return None