vleevalerio
|
96b1e7b7e1
|
fixed minor errors
|
2019-05-29 18:08:44 -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 |
|
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
|
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 |
|
vleevalerio
|
220d9b1268
|
fixed more things
|
2019-05-23 13:26:19 -04:00 |
|
vleevalerio
|
cd0a0c4220
|
fixed something
|
2019-05-23 13:24:18 -04:00 |
|
vleevalerio
|
0879ba4c20
|
added the "locked" feature to each room
|
2019-05-23 13:04:15 -04:00 |
|
vleevalerio
|
66e42d62ac
|
Merge branch 'master' of https://github.com/jslightham/Zork/
Conflicts:
data/rooms.dat
|
2019-05-23 12:58:35 -04:00 |
|
vleevalerio
|
74397502e4
|
added some more items
|
2019-05-23 12:56:43 -04:00 |
|
jslightham
|
59f51231c8
|
worked on locked doors
|
2019-05-22 14:44:22 -04:00 |
|
vleevalerio
|
19f1a5b941
|
finished the rooms
just wondering were to put the "floating" items
also, please check to make sure i didn't make any mistakes
|
2019-05-21 17:21:56 -04:00 |
|
vleevalerio
|
f609ba8be2
|
finished some more rooms on first floor
|
2019-05-21 15:04:09 -04:00 |
|
vleevalerio
|
f1c18673d7
|
Merge remote-tracking branch 'origin/master'
|
2019-05-20 18:18:46 -04:00 |
|
vleevalerio
|
561ceba8b9
|
Finished second floor!
please add an up and down direction for the stairs.
|
2019-05-20 18:18:33 -04:00 |
|
jslightham
|
2781520ba5
|
take and inventory command
|
2019-05-16 22:40:55 -04:00 |
|
vleevalerio
|
7a766cf76a
|
blah
|
2019-05-16 15:25:41 -04:00 |
|
vleevalerio
|
1645441b6a
|
added more rooms
|
2019-05-16 14:15:44 -04:00 |
|
vleevalerio
|
136f318ad5
|
Made changes to rooms.dat
|
2019-05-16 13:17:01 -04:00 |
|
Luca Carnegie
|
04c8716308
|
Changed Welcome message and fixed rooms.dat again.
|
2019-05-14 20:02:22 -04:00 |
|
Luca Carnegie
|
5e93aa35d6
|
Merge branch 'master' of https://github.com/jslightham/Zork
Conflicts:
data/rooms.dat
|
2019-05-14 19:50:32 -04:00 |
|
Luca Carnegie
|
3138bf34c1
|
Fixed rooms.dat formatting (was throwing exceptions)
|
2019-05-14 15:41:26 -04:00 |
|
vleevalerio
|
31a0198d37
|
bleh
|
2019-05-14 15:13:55 -04:00 |
|
vleevalerio
|
c1d572974d
|
added more rooms...
|
2019-05-14 15:13:20 -04:00 |
|
vleevalerio
|
4dc3207fc6
|
added a few room
|
2019-05-10 18:08:42 -04:00 |
|
vleevalerio
|
7300caadab
|
fixed some more
|
2019-05-10 13:51:51 -04:00 |
|
vleevalerio
|
15b0b00300
|
changed some rooms
|
2019-05-10 13:40:13 -04:00 |
|
vleevalerio
|
fb88339836
|
changed some rooms
|
2019-05-10 13:34:13 -04:00 |
|
jslightham
|
9b1cd284ee
|
fixed rooms, worked on take command
|
2019-05-10 12:54:16 -04:00 |
|
vleevalerio
|
f1883a9962
|
added a few rooms
|
2019-05-08 14:54:08 -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 |
|
vleevalerio
|
dfd9b4ab51
|
its not done yet tho
|
2019-05-08 10:35:54 -04:00 |
|
elacey
|
0c44589f03
|
Edited rooms file
|
2019-05-06 13:44:14 -04:00 |
|
jslightham
|
3358439e02
|
items
|
2019-04-26 15:35:03 -04:00 |
|