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.

1 files changed, 5 insertions, 2 deletions

diff --git a/weatbag/words.py b/weatbag/words.py
index 25f762e..94d2134 100644
--- a/weatbag/words.py
+++ b/weatbag/words.py
@@ -6,7 +6,7 @@ e.g. This will recognise take, pick, get or collect::
     if do[0] in weatbag.words.take:
         #...
 """
-
+# Verbs
 move = {'move','walk','go'}
 give = {'give', 'feed', 'present'}
 use = {'eat', 'use', 'wear'}
@@ -15,7 +15,10 @@ drop = {'drop'}
 take = {'pick', 'take', 'get', 'collect'}
 look = {'look', 'inspect', 'examine'}
 attack = {'attack', 'swing', 'hit', 'punch', 'fight'}
+combine = {'combine', 'join', 'mix'}
+
+# Nouns
 inventory = {'inventory', 'possessions', 'belongings', 'bag'}
 surroundings = {'surroundings', 'around', 'scenery'}
 
-prepositions = {'up', 'down', 'on', 'under', 'in', 'at', 'to'}
+prepositions = {'up', 'down', 'on', 'under', 'in', 'at', 'to', 'with', 'and'}