diff --git a/data/synonyms.dat b/data/synonyms.dat index 7b770a9..e35d04e 100644 --- a/data/synonyms.dat +++ b/data/synonyms.dat @@ -1,31 +1,37 @@ -suicide, die -grab, take +everything, all +raid, attack destroy, attack kill, attack +charge, attack +raid, attack +strike, attack ?, help +advice, help +aid, help +benefit, help man, riddler butler, riddler helper, riddler leave, quit -drive, go move, go +scram, go +hightail, go glance, look glimpse, look peek, look gander, look -charge, attack -raid, attack -strike, attack -drown, die -expire, die -perish, die -bounce, jump +grab, take +suicide, die dive, jump fall, jump rise, jump free, unlock +quack, talk +chat, talk +speak, talk +jabber, talk release, unlock -raid, attack +pick, unlock bite, eat chew, eat devour, eat @@ -36,10 +42,5 @@ inhale, eat nibble, eat swallow, eat absorb, eat -advice, help -aid, help -benefit, help -scram, go -hightail, go -everything, all -drink, eat \ No newline at end of file +drink, eat + diff --git a/data/words.dat b/data/words.dat index cc48477..8467652 100644 --- a/data/words.dat +++ b/data/words.dat @@ -4,6 +4,15 @@ help, verb jump, verb read, verb talk, verb +eat, verb +look, verb +take, verb +open, verb +unlock, verb +inventory, verb +die, verb +drop, verb +attack, verb north, direction south, direction west, direction @@ -16,10 +25,7 @@ up, direction down, direction d, direction u, direction -eat, verb candlestick, item -look, verb -take, verb lockpick, item key, item crowbar, item @@ -33,7 +39,6 @@ pen, item book, item socks, item painting, item -inventory, verb notebook, item shaving cream, item toothbrush, item @@ -48,18 +53,12 @@ warm bread, item clothes, item sword, item blanket, item -die, verb butter, item novel, item mop, item bucket, item towels, item -open, verb -i, verb -unlock, verb -drop, verb henrypellatt, enemy -attack, verb clock, item keyboard, item lightbulb, item \ No newline at end of file diff --git a/src/com/bayviewglen/zork/CommandWords.java b/src/com/bayviewglen/zork/CommandWords.java index a5ade3d..472c84f 100644 --- a/src/com/bayviewglen/zork/CommandWords.java +++ b/src/com/bayviewglen/zork/CommandWords.java @@ -107,9 +107,9 @@ class CommandWords { public static String replaceSynonym(String word) { try { String words = m_synonyms.get(word); - if(words == null) + if(words == null) { throw new Exception(); - else + }else return words; } catch(Exception e) { return word; diff --git a/src/com/bayviewglen/zork/Game.java b/src/com/bayviewglen/zork/Game.java index b946f3f..f467611 100644 --- a/src/com/bayviewglen/zork/Game.java +++ b/src/com/bayviewglen/zork/Game.java @@ -361,7 +361,8 @@ class Game { } break; case "talk": - + System.out.println("Salad"); + break; case "take": boolean hasAll = false; for(String a : command.getOtherWords()) {