Commit Graph

106 Commits

Author SHA1 Message Date
vleevalerio
c50c8f6c9f fixed a bug, hopefully 2019-05-31 22:01:47 -04:00
Luca Carnegie
d7206c1a43 fixed some things 2019-05-31 21:12:16 -04:00
Luca Carnegie
671f6eacb0 Made warmbread class 2019-05-31 20:59:14 -04:00
Luca Carnegie
8cac7a4315 fixed items display bug 2019-05-31 20:33:29 -04:00
Luca Carnegie
39ab9f2332 Merge branch 'master' of https://github.com/jslightham/Zork
Conflicts:
	src/com/bayviewglen/zork/Game.java
2019-05-31 20:20:28 -04:00
Luca Carnegie
389a7e3c05 fixing item display 2019-05-31 20:10:16 -04:00
jslightham
788271ff3d fixed enemy bug 2019-05-31 19:57:43 -04:00
jslightham
67839c569e added lady pellatt 2019-05-31 19:46:51 -04:00
jslightham
cfc9741f19 enemy drop loot on death 2019-05-31 19:14:21 -04:00
jslightham
45fe341059 finished crafting 2019-05-31 19:02:52 -04:00
elacey
7c1d2918e2 synonyms.dat updated 2019-05-31 17:08:22 -04:00
elacey
25a55c095a words.dat updated 2019-05-31 17:07:41 -04:00
vleevalerio
b1f410da49 fixed a few things in rooms.dat
i think it's done...maybe someone else should check too tho
2019-05-31 09:53:16 -04:00
jslightham
ec64080aa1 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-30 23:46:15 -04:00
jslightham
df3d031933 shavingcream blindness 2019-05-30 23:44:30 -04:00
Luca Carnegie
0da2e95425 added a removeRiddler() method. 2019-05-30 23:41:20 -04:00
Luca Carnegie
c2949d37d7 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-29 23:17:39 -04:00
Luca Carnegie
2fd7b3ed6f Changed riddler execution 2019-05-29 23:17:29 -04:00
vleevalerio
e5d29e67c7 fixed minor formatting errors 2019-05-29 23:05:34 -04:00
vleevalerio
21e7189956 fixed riddles 2019-05-29 22:53:28 -04:00
vleevalerio
2df0c4abb2 added breaks in room descriptions 2019-05-29 22:42:23 -04:00
Luca Carnegie
48b8545cc6 riddles are done! 2019-05-29 22:32:44 -04:00
Luca Carnegie
0fc289deb0 riddler gives you a prize when riddle is successfully answered 2019-05-29 21:39:16 -04:00
Luca Carnegie
657b859686 Made it so that you can enter custom message for each riddler object 2019-05-29 21:16:36 -04:00
Luca Carnegie
52c383a482 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-29 19:48:04 -04:00
Luca Carnegie
87afdf44f4 worked on riddler 2019-05-29 19:47:53 -04:00
vleevalerio
96b1e7b7e1 fixed minor errors 2019-05-29 18:08:44 -04:00
Luca Carnegie
c633473df6 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-29 14:13:23 -04:00
Luca Carnegie
9daad10509 worked on riddle class 2019-05-29 14:13:10 -04:00
elacey
10e5d86a69 Merge remote-tracking branch 'origin/master' 2019-05-29 13:45:56 -04:00
elacey
b1677e58aa Removed one of the leave's 2019-05-29 13:45:35 -04:00
Luca Carnegie
67e7c0ba54 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-29 13:43:06 -04:00
Luca Carnegie
c50c63477c made riddler for rooms, etc... 2019-05-29 13:42:53 -04:00
vleevalerio
01bfc4d473 fixed some more 2019-05-29 13:41:53 -04:00
vleevalerio
b4312ce26b Merge branch 'master' of https://github.com/jslightham/Zork/
Conflicts:
	data/rooms.dat
2019-05-29 13:35:12 -04:00
vleevalerio
48f9d828ff fixed some errors 2019-05-29 13:34:11 -04:00
elacey
81c8b92f1e New items and classes added 2019-05-29 13:24:48 -04:00
jslightham
b7058c3beb Update rooms.dat 2019-05-29 12:59:54 -04:00
Johnathon Slightham
f55e19a76f fix conflicts 2019-05-29 12:57:42 -04:00
jslightham
e4a725cd22 fix conflicts 2019-05-29 12:55:16 -04:00
vleevalerio
8e73e9e024 added another riddle and took out scroll 2
subject to change
2019-05-29 11:42:30 -04:00
jslightham
28a4b723ff boarded rooms 2019-05-29 11:42:22 -04:00
jslightham
4f62ae7c0e removed test items 2019-05-29 10:57:40 -04:00
jslightham
bad3490b1e synonyms, and take all command 2019-05-29 10:56:22 -04:00
Luca Carnegie
5ba426b51b Fixed some story errors and made a synonyms file for the parser 2019-05-28 23:02:13 -04:00
Luca Carnegie
00ba095757 worked on riddle class 2019-05-28 22:49:21 -04:00
vleevalerio
d04eb39853 fixed minor errors 2019-05-28 10:10:50 -04:00
Luca Carnegie
1d3188cb53 made a riddle class 2019-05-27 22:54:35 -04:00
Luca Carnegie
0acb8bd223 Made rooms.dat file easier to read. Probably too late now, eh Victoria? 2019-05-27 20:48:45 -04:00
Luca Carnegie
1d0888f0df Added Item-viewing functionality to the room class! Also changed some
descriptions
2019-05-27 20:34:11 -04:00