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 |
|
Luca Carnegie
|
37aec4befc
|
made scream command
|
2019-05-31 17:31:56 -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
|
2fd7b3ed6f
|
Changed riddler execution
|
2019-05-29 23:17:29 -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
|
87afdf44f4
|
worked on riddler
|
2019-05-29 19:47:53 -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 |
|
jslightham
|
28a4b723ff
|
boarded rooms
|
2019-05-29 11:42:22 -04:00 |
|
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
|
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
|
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
|
5a5f4fc06a
|
transfer - locked rooms
|
2019-05-26 23:22:51 -04:00 |
|
Luca Carnegie
|
ba18bed404
|
Made a title screen and fixed help command
|
2019-05-23 13:59:29 -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 |
|
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 |
|
jslightham
|
9b1cd284ee
|
fixed rooms, worked on take command
|
2019-05-10 12:54:16 -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 |
|
jslightham
|
edf347a11b
|
Initial
|
2019-01-15 20:45:15 -05:00 |
|