Merge branch 'master' of https://github.com/jslightham/Zork
Conflicts: src/com/bayviewglen/zork/Game.java
This commit is contained in:
@@ -46,10 +46,12 @@ absorb, eat
|
||||
drink, eat
|
||||
i, inventory
|
||||
henry, henrypellatt
|
||||
pellatt, henrypellatt
|
||||
lady, ladypellatt
|
||||
shaving, shavingcream
|
||||
cream, shavingcream
|
||||
water, waterbottle
|
||||
bottle, waterbottle
|
||||
warm, warmbread
|
||||
bread, warmbread
|
||||
bread, warmbread
|
||||
battering, batteringram
|
||||
ram, batteringram
|
||||
Reference in New Issue
Block a user