Commit Graph

51 Commits

Author SHA1 Message Date
jslightham
bad3490b1e synonyms, and take all command 2019-05-29 10:56:22 -04:00
Luca Carnegie
2d40e5954a Fixed some parser things 2019-05-28 23:28:34 -04:00
Luca Carnegie
00ba095757 worked on riddle class 2019-05-28 22:49:21 -04:00
Luca Carnegie
9d073ef642 finish commit "made riddle class" 2019-05-27 22:54:53 -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
jslightham
e4ba347415 finished combat, fixed open door null pointer bug 2019-05-27 18:39:23 -04:00
Luca Carnegie
36fe007dd8 updated some things 2019-05-27 15:12:23 -04:00
Luca Carnegie
81bd3b1c86 Fixed conflicts 2019-05-27 14:43:00 -04:00
Luca Carnegie
9dede87f7f fixed welcome message 2019-05-27 14:40:58 -04:00
jslightham
c0fc0bc2cf worked on combat 2019-05-27 14:15:04 -04:00
jslightham
9e8c5e812c enemies and combat 2019-05-27 12:47:12 -04:00
jslightham
8f8a55949a eat, drop commands 2019-05-27 00:03:23 -04:00
jslightham
58068b94d7 Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-26 23:22:59 -04:00
jslightham
5a5f4fc06a transfer - locked rooms 2019-05-26 23:22:51 -04:00
Luca Carnegie
bfcbba4197 made minor edits 2019-05-26 12:03:49 -04:00
Luca Carnegie
c5e73ec253 Fixed title screen & help screen 2019-05-23 14:02:32 -04:00
Luca Carnegie
ba18bed404 Made a title screen and fixed help command 2019-05-23 13:59:29 -04:00
elacey
d1337bdea7 Sword item added 2019-05-23 13:46:12 -04:00
elacey
c311ada15e Added new constructor for weapons 2019-05-23 13:43:34 -04:00
elacey
31983e88a7 More items 2019-05-23 13:37:47 -04:00
elacey
c8258969f4 Merge remote-tracking branch 'origin/master' 2019-05-23 13:21:51 -04:00
elacey
904e5bdefa Item classes added 2019-05-23 13:21:27 -04:00
Luca Carnegie
5a6802679a Merge branch 'master' of https://github.com/jslightham/Zork 2019-05-23 13:18:42 -04:00
Luca Carnegie
fa0cd81a81 Updated enemy class 2019-05-23 13:18:25 -04:00
elacey
f1c5c19652 Merge remote-tracking branch 'origin/master' 2019-05-22 22:47:28 -04:00
elacey
cfe2f0253d All items and some item classes added 2019-05-22 22:46:57 -04:00
Luca Carnegie
d6ce3ea8b9 created Enemy class 2019-05-22 22:41:31 -04:00
jslightham
59f51231c8 worked on locked doors 2019-05-22 14:44:22 -04:00
vleevalerio
ad302760eb added "u" and "d" to the case thing 2019-05-22 09:51:58 -04:00
jslightham
2781520ba5 take and inventory command 2019-05-16 22:40:55 -04:00
elacey
4506c1e17f Items and classes added 2019-05-16 20:47:49 -04:00
elacey
13837003c2 New items and classes added 2019-05-14 22:29:07 -04:00
Luca Carnegie
04c8716308 Changed Welcome message and fixed rooms.dat again. 2019-05-14 20:02:22 -04:00
Luca Carnegie
3138bf34c1 Fixed rooms.dat formatting (was throwing exceptions) 2019-05-14 15:41:26 -04:00
Luca Carnegie
690ff4abaf Updated Game Class 2019-05-14 14:41:18 -04:00
elacey
029d8d7cf5 Fixed spelling error. 2019-05-10 15:39:51 -04:00
elacey
b103875cec Two more items and their classes added. 2019-05-10 15:37:36 -04:00
elacey
fd9505f1cd Fixed item id 2019-05-10 14:03:34 -04:00
elacey
73279ff515 Item Classes for 6 objects 2019-05-10 14:00:31 -04:00
jslightham
9b1cd284ee fixed rooms, worked on take command 2019-05-10 12:54:16 -04:00
elacey
b316d3daef Fixed small error with down (I think) 2019-05-08 14:44:20 -04:00
vleevalerio
2d22d43fa4 Merge branch 'master' of https://github.com/jslightham/Zork/
Conflicts:
	data/rooms.dat
2019-05-08 14:35:10 -04:00
jslightham
7fa30879c0 Fixed parser, added items starting in rooms, moved item room storage 2019-05-08 11:43:21 -04:00
jslightham
3358439e02 items 2019-04-26 15:35:03 -04:00
jslightham
14bd1aa83f import words through file 2019-04-24 22:52:15 -04:00
jslightham
9805c8ea84 worked on parser 2019-04-24 21:25:48 -04:00
Luca Carnegie
5023bddaad Added exciting text 2019-04-22 22:30:32 -04:00
jslightham
383b4500ef test commit 2019-01-16 10:15:27 -05:00