Implement most of the real adventure

01_text_adventure/action.c

@@ -9,6 +9,8 @@
 #include "util.h"
 
 void load_action(Game *g, char *line) {
+  if (strlen(line) == 0 || line[0] == '#') return;
+
   Action *action = &g->actions->actions[g->actions->count];
   action->words_count = 0;
   action->predicates_count = 0;

01_text_adventure/data/actions.txt

@@ -1,39 +1,135 @@
 QUIT | * | 1000 | Bye! | QUIT_GAME()
 LOOK | * | 1 | * | LOOK_ROOM()
-HELP | * | 1 | Type commands to explore the environment. Use 'LOOK' to examine the room you're in, or 'LOOK <item>' to examine an item closely. 'N', 'S', 'E', and 'W' will move you in the four cardinal directions, and 'I' will let you check your inventory. The parser is not very advanced, so do your best. 'Q', 'QUIT', or 'EXIT' will let you quit. |
+HELP | * | 1 | Type commands to explore the environment. Use 'LOOK' to examine the room you're in, or 'LOOK <item>' to examine an item closely. 'N', 'S', 'E', and 'W' will move you in the four cardinal directions, and 'I' will let you check your inventory. The parser is not very advanced, so do your best. Nothing more than a one- or two- word phrase is required. 'Q', 'QUIT', or 'EXIT' will let you quit. If you REALLY need help, type 'WALKTHROUGH'. |
 INVENTORY | * | 1 | * | CHECK_INVENTORY()
 NORTH | * | 1 | You can't go north from here. |
 SOUTH | * | 1 | You can't go south from here. |
 EAST | * | 1 | You can't go east from here. |
 WEST | * | 1 | You can't go west from here. |
-NORTH | IN(FIRST_ROOM) | 10 | You head through the door. | GOTO(SECOND_ROOM)
+UP | * | 1 | You can't go up from here. |
-SOUTH | IN(SECOND_ROOM) | 10 | You head back through the door. | GOTO(FIRST_ROOM)
+DOWN | * | 1 | You can't go down from here. |
-EAST | IN(FIRST_ROOM) & ENABLED(LEVER_PULLED) | 20 | You crouch under the portcullis and enter the room. | GOTO(FIRE_ROOM)
+SLEEP | * | 1 | You're not especially tired |
-EAST | IN(FIRST_ROOM) | 10 | There is a portcullis in the way. |
+BREAK | * | 1 | That doesn't seem like a good idea |
-WEST | IN(FIRE_ROOM) | 10 | You crouch under the portcullis and return to the room. | GOTO(FIRST_ROOM)
+LOOK ROBOTS | * | 2 | There aren't any robots to look at here. |
-WEST | IN(FIRST_ROOM) | 10 | It's way too dark in there. You shouldn't go in without a light source. |
+WALKTHROUGH | * | 1 | Yeah, fair enough. I'm not great at designing adventure games. If you're really sure you want a walkthrough, ask one more time. | ENABLE(ASKED_FOR_WALKTHROUGH)
-WEST | IN(FIRST_ROOM) & HAS_ITEM(LIT_TORCH) | 100 | You cautiously enter the darkened room. | GOTO(DARK_ROOM)
+WALKTHROUGH | ENABLED(ASK_FOR_WALKTHROUGH) | 2 | OPEN LOCKER, TAKE HAMMER, WEST, TAKE BARREL, EAST, EAST, POUR BARREL, NORTH, WEST, WEST, SOUTH, ATTACK ROBOT, LOOK SHELF, TAKE GLOVES, EAST, NORTH, EAST, NORTH, UP, TAKE REBAR, DOWN, SOUTH, WEST, SOUTH, WEST, USE ANVIL, EAST, NORTH, EAST, EAST, NORTH, USE PRYBAR, NORTH, <the part where you're in the dam>
-EAST | IN(DARK_ROOM) | 10 | You make your way out of the darkened room. | GOTO(FIRST_ROOM)
+
-PULL       | *                                      | 1    | You don't see anything to pull |
+### HUT ###
-PULL       | IN(SECOND_ROOM)                         | 10   | What do you want to pull? |
+EAST | IN(HUT) | 2 | You walk into your east yard. | GOTO(EAST_YARD)
-PULL LEVER | IN(SECOND_ROOM)                         | 100  | You pull the lever and the sound of grinding machinery comes from the first room. | ENABLE(LEVER_PULLED)
+WEST | IN(HUT) | 2 | You walk into your west yard. | GOTO(WEST_YARD)
-PULL LEVER | IN(SECOND_ROOM) & ENABLED(LEVER_PULLED) | 1000 | You already pulled it.    |
+LOOK BED | IN(HUT) | 10 | There's not a lot of room to sleep, but you've gathered enough blankets such that it's pretty comfortable at night. |
-TAKE TORCH | ITEM_HERE(UNLIT_TORCH) | 1000 | You pick up the torch | TAKE(UNLIT_TORCH)
+SLEEP | IN(HUT) | 10 | The bed's comfortable, but you're not especially tired |
-TAKE TORCH | ITEM_HERE(LIT_TORCH) | 1000 | You carefully pick up the torch | TAKE(LIT_TORCH)
+LOOK FOOTLOCKER | IN(HUT) | 10 | The footlocker is made of cheap plastic. It's closed but not locked. |
-TAKE TORCH | HAS_ITEM(UNLIT_TORCH) | 1001 | You already have a torch |
+OPEN FOOTLOCKER | IN(HUT) | 10 | You swing the footlocker open. Inside it is a well-worn claw hammer | ENABLE(FOOTLOCKER_OPEN)
-TAKE TORCH | HAS_ITEM(LIT_TORCH) | 1001 | You already have a torch |
+OPEN FOOTLOCKER | IN(HUT) & ENABLED(TAKEN_HAMMER) | 50 | You swing the footlocker open. It's empty. | ENABLE(FOOTLOCKER_OPEN)
-TAKE TORCH | * | 100 | What torch? |
+OPEN FOOTLOCKER | IN(HUT) & ENABLED(FOOTLOCKER_OPEN) | 100 | The footlocker is already open. |
-DROP TORCH | * | 100 | What torch? |
+LOOK FOOTLOCKER | IN(HUT) & ENABLED(FOOTLOCKER_OPEN) | 100 | The footlocker is made of cheap plastic. It's open, and there's a hammer inside. |
-DROP TORCH | HAS_ITEM(UNLIT_TORCH) | 1000 | You lay the torch carefully on the ground. | DROP(UNLIT_TORCH)
+LOOK FOOTLOCKER | IN(HUT) & ENABLED(FOOTLOCKER_OPEN) & ENABLED(TAKEN_HAMMER) | 1000 | The footlocker is made of cheap plastic. It's open, but empty. |
-DROP TORCH | HAS_ITEM(LIT_TORCH) | 1000 | You lay the torch carefully on the ground. | DROP(LIT_TORCH)
+CLOSE FOOTLOCKER | IN(HUT) & ENABLED(FOOTLOCKER_OPEN) | 100 | You close the footlocker. | DISABLE(FOOTLOCKER_OPEN)
-LIGHT TORCH | HAS_ITEM(LIT_TORCH) | 1000 | The torch is already burning brightly. |
+CLOSE FOOTLOCKER | IN(HUT) | 10 | It's already closed. |
-LIGHT TORCH | * | 1 | What torch? |
+TAKE HAMMER | IN(HUT) & ENABLED(FOOTLOCKER_OPEN) | 100 | You pick up the hammer. | TAKE_ITEM(HAMMER) & ENABLE(TAKEN_HAMMER)
-LIGHT TORCH | HAS_ITEM(UNLIT_TORCH) | 10 | You don't have any way to light that. |
+TAKE HAMMER | IN(HUT) & ENABLED(FOOTLOCKER_OPEN) & ENABLED(TAKEN_HAMMER) | 1000 | You've already taken it. |
-LIGHT TORCH | HAS_ITEM(UNLIT_TORCH) & IN(FIRE_ROOM) | 100 | You light the torch in the fire. It can illuminate a decent area. | TAKE(LIT_TORCH) & DESTROY(UNLIT_TORCH)
+TAKE HAMMER | ITEM_HERE(HAMMER) | 100 | You pick up the hammer. | TAKE_ITEM(HAMMER)
-TOUCH FIRE | * | 1 | Why? What fire? |
+DROP HAMMER | HAS_ITEM(HAMMER) | 100 | You drop the hammer. | DROP_ITEM(HAMMER)
-TOUCH FIRE | HAS_ITEM(LIT_TORCH) | 10 | The torch singes your hand. Why would you do such a thing? |
+
-TOUCH FIRE | IN(FIRE_ROOM) | 100 | You burn your hand quite badly in the flames! Why would you do that? |
+### East Yard ###
-LOOK PORTCULLIS | * | 1 | What portcullis? |
+WEST | IN(EAST_YARD) | 2 | You enter your hut. | GOTO(HUT)
-LOOK PORTCULLIS | IN(FIRST_ROOM) | 10 | The portcullis is made of wide metal slabs. In the room behind it, a merry fire crackles. |
+NORTH | IN(EAST_YARD) | 2 | Your plants are not looking too healthy. You should see if you can do something to help them out before leaving. |
-LOOK PORTCULLIS | IN(FIRST_ROOM) & ENABLED(LEVER_PULLED) | 100 | The portcullis is mostly retracted into a slot in the ceiling in the doorway. |
+NORTH | IN(EAST_YARD) & ENABLED(PLANTS_SAVED) | 5 | You open the north gate and head through it. | GOTO(SE_RESERVOIR)
-LOOK PORTCULLIS | IN(FIRE_ROOM) | 100 | The portcullis is mostly retracted into a slot in the ceiling in the doorway. |
+SOUTH | IN(EAST_YARD) | 2 | Your plants are not looking too healthy. You should see if you can do something to help them out before leaving. |
+SOUTH | IN(EAST_YARD) & ENABLED(PLANTS_SAVED) | 5 | You open the south gate and head through it. | GOTO(CLIFF)
+LOOK PLANTER | IN(EAST_YARD) | 10 | The planter is pretty wide, and has <HELP I AM NOT GOOD WITH PLANTS>. They're looking pretty brown and scraggly. Positioned next to the planter is a water tank, hooked to an irrigation system. |
+LOOK TANK | IN(EAST_YARD) | 10 | This tank supplies the water to your plants. It's completely empty. |
+LOOK TANK | IN(EAST_YARD) & ENABLED(PLANTS_SAVED) | 100 | This tank supplies the water to your plants. It's got enough water for a few months in it. |
+TAKE TANK | IN(EAST_YARD) | 10 | The tank is attached to the irrigation system; taking it would damage all of the little pipes. |
+TAKE PLANTER | IN(EAST_YARD) | 10 | The planter is enormous, you couldn't move it even if you wanted to. |
+USE BARREL | IN(EAST_YARD) | 10 | What barrel? |
+USE BARREL | IN(EAST_YARD) & HAS_ITEM(FULL_BARREL) | 1000 | You pour the contents of the barrel into the tank. The plants should be nice and healthy now! | ENABLE(PLANTS_SAVED) & DESTROY(FULL_BARREL) & TAKE(EMPTY_BARREL)
+POUR BARREL | IN(EAST_YARD) & HAS_ITEM(FULL_BARREL) | 1000 | You pour the contents of the barrel into the tank. The plants should be nice and healthy now! | ENABLE(PLANTS_SAVED) & DESTROY(FULL_BARREL) & TAKE(EMPTY_BARREL)
+
+### West Yard ###
+EAST | IN(WEST_YARD) | 2 | You enter your hut. | GOTO(HUT)
+LOOK BARRELS | IN(WEST_YARD) | 10 | The barrels are positioned to collect rainwater from the roof. Most are empty, but one of them is full of water. |
+LOOK BARREL | IN(WEST_YARD) | 10 | The barrels are positioned to collect rainwater from the roof. Most are empty, but one of them is full of water. |
+TAKE BARREL | IN(WEST_YARD) | 10 | There's no reason to take the empty barrels |
+TAKE BARREL | IN(WEST_YARD) & ITEM_HERE(FULL_BARREL) | 100 | The full barrel is heavy, but you take it with you. | TAKE(FULL_BARREL)
+
+### SE Reservoir ###
+SOUTH | IN(SE_RESERVOIR) | 2 | You open the gate and reenter your yard. | GOTO(EAST_YARD)
+NORTH | IN(SE_RESERVOIR) | 2 | You head up the path towards the dam. | GOTO(NE_RESERVOIR)
+WEST | IN(SE_RESERVOIR) | 2 | You head down the path and around the reservoir. | GOTO(SW_RESERVOIR)
+LOOK RESERVOIR | IN(SE_RESERVOIR) | 5 | It's an enormous pit with steep, dusty sides. At the bottom there's a lot of mud, but no real water to speak of. |
+LOOK DAM | IN(SE_RESERVOIR) | 5 | The dam is enormous and made of concrete. High up, it has two huge metal floodgates, but they're closed. At ground lever, there seems to be a door in the side of the wall. |
+LOOK ROBOTS | IN(SE_RESERVOIR) | 5 | It's hard to make out any details, but you'd recognize these robots anywhere. Their lasers are a painful deterrant from those who get to close to the places they guard. |
+
+### NE Reservoir ###
+NORTH | IN(NE_RESERVOIR) | 2 | A sturdy metal door blocks your path. |
+NORTH | IN(NE_RESERVOIR) & ENABLED(OPENED_DOOR) | 5 | You make your way inside the dam. | GOTO(DAM_INSIDE)
+WEST | IN(NE_RESERVOIR) | 2 | The reservoir is that way. No real reason to go in there, and there'd be no way to get back out. |
+SOUTH | IN(NE_RESERVOIR) | 2 | You head back down the path. | GOTO(SE_RESERVOIR)
+LOOK RESERVOIR | IN(NE_RESERVOIR) | 5 | It's an enormous pit with steep, dusty sides. At the bottom there's a lot of mud, but no real water to speak of. |
+LOOK DAM | IN(NE_RESERVOIR) | 5 | The dam towers over you. It's made of concrete, now somewhat pitted and cracked from hundreds of years of exposure to the elements. |
+LOOK ROBOTS | IN(NE_RESERVOIR) | 5 | The robots are above the dam, and from this angle you can't see them. |
+LOOK DOOR | IN(NE_RESERVOIR) | 5 | The door is very sturdy and made of metal. It's stuck in place, but has very clearly been pried open at some point; the edge is bent in places. |
+LOOK DOOR | IN(NE_RESERVOIR) & ENABLED(OPENED_DOOR) | 10 | The door is very sturdy and made of metal, but it's open now. |
+OPEN DOOR | IN(NE_RESERVOIR) | 10 | You get a good grip on the door and yank as hard as you can, but it doesn't budge. The sharp edge of the door hurts your fingers. |
+OPEN DOOR | IN(NE_RESERVOIR) & HAS_ITEM(GLOVES) | 50 | You get a good grip on the door and yank as hard as you can, but it doesn't budge. The edge of the door is sharp, but the gloves protect your fingers. You pull a couple more times, but the door refuses to budge. |
+OPEN DOOR | IN(NE_RESERVOIR) & HAS_ITEM(PRYBAR) | 100 | You wedge the bar against the bottom of the door, and give it a shove. With an earsplitting creak, the door slides open several inches, enough that you can wriggle your way through the opening. | ENABLE(OPENED_DOOR)
+OPEN DOOR | IN(NE_RESERVOIR) & ENABLED(OPENED_DOOR) | 1000 | The door is already open. |
+PULL DOOR | IN(NE_RESERVOIR) | 10 | You get a good grip on the door and yank as hard as you can, but it doesn't budge. The sharp edge of the door hurts your fingers. |
+PULL DOOR | IN(NE_RESERVOIR) & HAS_ITEM(GLOVES) | 50 | You get a good grip on the door and yank as hard as you can, but it doesn't budge. The edge of the door is sharp, but the gloves protect your fingers. You pull a couple more times, but the door refuses to budge. |
+PULL DOOR | IN(NE_RESERVOIR) & ENABLED(OPENED_DOOR) | 1000 | The door is already open. |
+PUSH DOOR | IN(NE_RESERVOIR) | 10 | Good thought, but no, the door does not open inwards. |
+
+### SW Reservoir ###
+NORTH | IN(SW_RESERVOIR) | 2 | You head up the path towards the dam. | GOTO(NW_RESERVOIR)
+WEST | IN(SW_RESERVOIR) | 2 | You walk on the train into the woods. | GOTO(TRAIL)
+EAST | IN(SW_RESERVOIR) | 2 | You head down the path and around the reservoir. | GOTO(SE_RESERVOIR)
+LOOK RESERVOIR | IN(SW_RESERVOIR) | 5 | It's an enormous pit with steep, dusty sides. At the bottom there's a lot of mud, but no real water to speak of. |
+LOOK DAM | IN(SW_RESERVOIR) | 5 | The dam is enormous and made of concrete. High up, it has two huge metal floodgates, but they're closed. At ground lever, there seems to be a door in the side of the wall. |
+LOOK ROBOTS | IN(SW_RESERVOIR) | 5 | It's hard to make out any details, but you'd recognize these robots anywhere. Their lasers are a painful deterrant from those who get to close to the places they guard. |
+
+### NW Reservoir ###
+UP | IN(NW_RESERVOIR) | 2 | You try to climb the rungs of the ladder, but they're very slippery from exposure to the elements. If you can find a way to grip onto things, you should be able to make your way up. |
+UP | IN(NW_RESERVOIR) & HAS_ITEM(GLOVES) | 50 | Cautiously, you use the rungs to climb to the top of the dam. | GOTO(DAM)
+UP | IN(NW_RESERVOIR) & HAS_ITEM(FULL_BARREL) | 50 | You can't make the climb while carrying a barrel around. |
+UP | IN(NW_RESERVOIR) & HAS_ITEM(EMPTY_BARREL) | 50 | You can't make the climb while carrying a barrel around. |
+EAST | IN(NW_RESERVOIR) | 2 | The reservoir is that way. No real reason to go in there, and there'd be no way to get back out. |
+SOUTH | IN(NW_RESERVOIR) | 2 | You head back down the path. | GOTO(SW_RESERVOIR)
+LOOK RESERVOIR | IN(NW_RESERVOIR) | 5 | It's an enormous pit with steep, dusty sides. At the bottom there's a lot of mud, but no real water to speak of. |
+LOOK DAM | IN(NW_RESERVOIR) | 5 | The dam towers over you. It's made of concrete, now somewhat pitted and cracked from hundreds of years of exposure to the elements. |
+LOOK ROBOTS | IN(NW_RESERVOIR) | 5 | The robots are above the dam, and from this angle you can't see them. |
+LOOK LADDER | IN(NW_RESERVOIR) | 2 | The rungs appear to be made of concrete. They're staying together despite centuries of exposure, but they're completely smooth at this point.
+
+### Dam ###
+DOWN | IN(DAM) | 2 | Fearful of softlocking, you decide it's better to put your gloves on before climbing down. |
+DOWN | IN(DAM) & HAS_ITEM(GLOVES) | 10 | You carefully navigate the ladder an climb down to the ground. | GOTO(NW_RESERVOIR)
+NORTH | IN(DAM) | 2 | The water's that way, but any one of these robots would zap you if you got too close. |
+SOUTH | IN(DAM) | 2 | There's nothing but open air to the south. Instead, you could try going DOWN the ladder. |
+TAKE REBAR | ITEM_HERE(REBAR) | 100 | You pick up the rebar. | TAKE_ITEM(REBAR)
+DROP REBAR | HAS_ITEM(REBAR) | 100 | You drop the rebar. | DROP_ITEM(REBAR)
+
+### Trail ###
+EAST | IN(TRAIL) | 2 | You emerge from the woods at the southwest corner of the reservoir. | GOTO(SW_RESERVOIR)
+SOUTH | IN(TRAIL) | 2 | You head down the trail, further into the woods | GOTO(OUT_CABIN)
+LOOK TREES | IN(TRAIL) | 2 | The trees are definitely alive, but the woods are not an especially vibrant place: there are very few leaves, and the air has a stillness to it. Maybe the trees are hibernating? |
+
+### Out Cabin ###
+NORTH | IN(OUT_CABIN) | 2 | You head up the trail, into the woods. | GOTO(TRAIL)
+EAST | IN(OUT_CABIN) | 2 | You head down the trail, emerging from the woods onto a clifftop. | GOTO(CLIFF) & ENABLE(FOUND_CLIFF)
+WEST | IN(OUT_CABIN) | 2 | You can't approach the cabin, a security robot is guarding it. |
+WEST | IN(OUT_CABIN) & ENABLED(CABIN_ROBOT_DESTROYED) | 10 | You cautiously enter the cabin | GOTO(IN_CABIN)
+ATTACK ROBOT | IN(OUT_CABIN) | 10 | With what, your bare hands? The robot's made of metal. |
+ATTACK ROBOT | IN(OUT_CABIN) & HAS_ITEM(GLOVES) | 11 | With what, your gloved hands? The robot's made of metal. |
+ATTACK ROBOT | IN(OUT_CABIN) & HAS_ITEM(HAMMER) | 20 | You grit your teeth, leap towards the robot, and bop it with your hammer. It zaps you with a laser, which knocks you back, but you've damaged its hovering capabilities, and it falls to the ground. After you catch your breath, you walk over and finish it off. | ENABLE(CABIN_ROBOT_DESTROYED)
+ATTACK ROBOT | IN(OUT_CABIN) & ENABLED(CABIN_ROBOT_DESTROYED) | 50 | The robot is already destroyed |
+LOOK ROBOT | IN(OUT_CABIN) | 10 | It's a smooth metal ball, punctuated by many sharp, angular antennae sticking off in all directions, and three bright red eyes, or things that look like eyes. It's mean-looking, but pretty small, and you might be able to destroy it with a weapon of some kind. |
+LOOK ROBOT | IN(OUT_CABIN) & ENABLED(CABIN_ROBOT_DESTROYED) | 50 | The metal shell doesn't seem to have been that thick, and it's dented and even punctured in places. It's not moving, glowing, or making any noise at all any more. |
+LOOK CABIN | IN(OUT_CABIN) | 2 | Parts of the roof are definitely missing, but you've slept in worse lodgings before. |
+
+### In Cabin ###
+### Cliff ###
+### Dam Inside ###
+### Office ###
+### Break Room ###
+### Control Room ###

01_text_adventure/data/flags.txt

@@ -1,2 +1,6 @@
-LEVER_PULLED|0
+FOOTLOCKER_OPEN|0
-STEPS_TAKEN|10
+TAKEN_HAMMER|0
+PLANTS_SAVED|0
+OPENED_DOOR|0
+CABIN_ROBOT_DESTROYED|0
+ASKED_FOR_WALKTHROUGH|0

01_text_adventure/data/items.txt

@@ -1,4 +1,6 @@
-UNLIT_TORCH | a torch | true | A sturdy torch. It's unlit.
+HAMMER | a hammer | true | A well-worn claw hammer. It's on the small side. | *
-LIT_TORCH | a lit torch | true | A sturdy torch. It's on fire, and illuminates its surroundings.
+FULL_BARREL | a barrel of water | true | A barrel filled with rainwater. It's pretty heavy. | WEST_YARD
-FLASK | a flask | true | An empty glass flask, with a cork.
+EMPTY_BARREL | a barrel | true | A barrel, filled with nothing. It's pretty light now. | *
-ANVIL | an anvil | false | A heavy iron anvil.
+GLOVES | a pair of gloves | true | A pair of thick, knobbly gloves. | *
+REBAR | a piece of rebar | true | A thin steel rod. | DAM
+PRYBAR | a prybar | true | A thin steel rod, bent into a hook shape. | *

01_text_adventure/data/room_ins.txt

@@ -1,5 +1,16 @@
-FIRST_ROOM  | *                     | 1  | You are in a plain room. A doorway is on the north wall, and a portcullis obstructs a doorway to the east. A pitch-dark room is through a doorway to the west.
+HUT | * | 1 | You're in a dingy hut. Light entring through a dirty window lets you see little more than a small, comfortable bed and a beat-up footlocker. There are doors on the east and west walls.
-FIRST_ROOM  | ENABLED(LEVER_PULLED) | 10 | You are in a plain room. A doorway is on the north wall, and the doorway once obstructed by the portcullis is to the east.
+EAST_YARD | * | 1 | This side of the yard is surrounded by a wall made of scrap metal. It's pretty high. Amidst discarded objects, there is a wide planter containing vegetables and flowers, all of which are looking pretty scrawny. Your hut is to the west, and there are gates to the north and the south.
-SECOND_ROOM | *                     | 1 | This is a small room. It's painted blue. There's a doorway on the south wall, and a conspicuous lever in the middle of the floor.
+WEST_YARD | * | 1 | This side of the yard is surrounded by a high wall made of scrap metal. Your hut is to the east, and several large barrels are positioned beneath the edge of your roof.
-FIRE_ROOM   | *                     | 1 | This room is in disrepair. A fire crackles merrily in a small fireplace. A doorway is open to the west.
+SE_RESERVOIR | * | 1 | You're at the southeast corner of an enormous reservoir, empty except for some mud at the very bottom. Climbing down there doesn't seem like a good idea. To the north, the wall of an enormous dam stands. Its floodgates are closed, and a swarm of black, angular security robots are buzzing above it. A path leads north to the dam and west around the reservoir. Your compound lies to the south.
-DARK_ROOM | * | 1 | This room is gloomy and very cold. There's no reason to be in here, but it's the last room in the game so far.
+NE_RESERVOIR | * | 1 | You're at the foot of the dam. There's a human-sized door in the wall to the north, but it's sturdy and made of metal. It's clearly been forced open before, as there are obvious dents on the edge. A path leads south.
+SW_RESERVOIR | * | 1 | You're at the southwest corner of the reservoir. A path leads north towards the dam and east around the reservoir, and there's a trail leading west in the woods.
+NW_RESERVOIR | * | 1 | You're at the foot of the dam. On this side, there is a series of rungs carved into the concrete. They're pretty worn and eroded at this point, though, so they might be hard to climb. A path leads south.
+DAM | * | 1 | The dam is gigantic, and pretty much completely full of bright blue water. Swarming above the water are a flock of security robots; you can't spend much time up here or else you'll surely be seen. You can climb back down the ladder.
+TRAIL | * | 1 | The trees in these woods are dense, but not especially leafy. The trail leads east and douth.
+OUT_CABIN | * | 1 | You're standing in front of a ruins of a cabin in the forest, to the west of the path. Hovering menacingly in front is a tiny security robot. The path through the woods goes north and east. 
+IN_CABIN | * | 1 | The cabin, though pretty much destroyed at this point, seems like it was a cozy place some time in the past. An anvil stands in the corner, surrounded by shelves. The exit is to the east.
+CLIFF | * | 1 | You're on top of an enormous, steep cliff. Beneath you, the valley stretches out far into the distance. The bright sun illuminates the forests and plains. Your compound is north of here, and there are thick woods to the west.
+DAM_INSIDE | * | 1 | Dim emergency lighting barely illuminates this small hallway within the dam. Doorways are north, east, and west of you, and the exit is to the south.
+OFFICE | * | 1 | This dimly-lit office has a few ruined desks and a wall filled with bookshelves and filing cabinets. A medium-sized security robot hovers in the center of the room. The hallway is west of here.
+BREAK_ROOM | * | 1 | This appears to be the break room. Some tables, chairs, and counters are here. On a hook on the far cabinet, there is a ring with a single key on it. A small security robot hovers slightly above a table. The hallway is east of here.
+CONTROL_ROOM | * | 1 | This room houses an enormous console, with knobs, buttons, and levers all over it. In front of the console, a large security robot is hovering. The hallway is south of here.

01_text_adventure/data/rooms.txt

@@ -1,4 +1,16 @@
-FIRST_ROOM
+HUT
-SECOND_ROOM
+EAST_YARD
-FIRE_ROOM
+WEST_YARD
-DARK_ROOM
+SE_RESERVOIR
+NE_RESERVOIR
+SW_RESERVOIR
+NW_RESERVOIR
+DAM
+TRAIL
+OUT_CABIN
+IN_CABIN
+CLIFF
+DAM_INSIDE
+OFFICE
+BREAK_ROOM
+CONTROL_ROOM

01_text_adventure/data/words.txt

@@ -1,20 +1,41 @@
-PULL|PULL,YANK,TUG
-ROPE|ROPE,CORD,STRING,CABLE
-LEVER|LEVER
 QUIT|QUIT,Q,EXIT
 NORTH|NORTH,N
 SOUTH|SOUTH,S
 EAST|EAST,E
 WEST|WEST,W
+UP|UP,U
+DOWN|DOWN,D
 LOOK|LOOK,L
 INVENTORY|INVENTORY,I,INV
 HELP|HELP,H
-ANVIL|ANVIL
-FLASK|FLASK,BOTTLE,JAR
-TORCH|TORCH
 TAKE|TAKE,PICKUP,GET
 DROP|DROP
-LIGHT|LIGHT
 TOUCH|TOUCH,FEEL
-FIRE|FIRE,FLAMES,FLAME
+FOOTLOCKER|FOOTLOCKER,LOCKER,CHEST
-PORTCULLIS|PORTCULLIS
+SLEEP|SLEEP,REST
+BREAK|BREAK,DESTROY
+BED|BED
+OPEN|OPEN
+CLOSE|CLOSE
+HAMMER|HAMMER,CLAWHAMMER,MALLET
+PLANTER|PLANTER
+TANK|TANK
+USE|USE
+BARREL|BARREL,CASK
+BARRELS|BARRELS,CASKS
+POUR|POUR,DUMP
+PLANTS|PLANTS,FLOWERS,VEGETABLES
+ROBOT|ROBOT,ROBOTS,DRONE,DRONES
+DAM|DAM
+DOOR|DOOR
+PRYBAR|PRYBAR,CROWBAR
+PULL|PULL,YANK
+PUSH|PUSH,SHOVE,PRESS
+LADDER|LADDER,RUNGS
+REBAR|REBAR
+TREES|TREES,TREE
+ATTACK|ATTACK,HIT,SMACK,PUNCH,WHACK
+TALK|TALK,SPEAK
+WALKTHROUGH|WALKTHROUGH,GUIDE
+CABIN|CABIN,COTTAGE,HOUSE
+RESERVOIR|RESERVOIR

01_text_adventure/game.c

@@ -24,8 +24,6 @@ Game *game_create(void) {
   game_load_room_ins(g);
   game_load_items(g);
 
-  g->items->items[0].location = &g->rooms->rooms[0];
-
   Log *log = create_log();
   g->log = log;
 

01_text_adventure/item.c

@@ -24,8 +24,13 @@ void load_item(Game *g, char *line) {
   item->description = malloc(strlen(token) + 1);
   strcpy(item->description, token);
 
+  token = strtok(NULL, "|");
+  if (strcmp(token, "*") == 0) {
+    item->location = NULL;
+  } else {
+	item->location = find_room(g->rooms, token);
+  }
   item->in_inventory = false;
-  item->location = NULL;
 
   g->items->count++;
 }
@@ -72,6 +77,7 @@ void take_item(Game *g, char *item_name) {
   Item *item = find_item(g->items, item_name);
   item->location = NULL;
   item->in_inventory = true;
+  printf("%s is in the inventory yeop %d\n", item->name, item->in_inventory);
 }
 
 void drop_item(Game *g, char *item_name) {

01_text_adventure/predicate.c

@@ -14,6 +14,8 @@ bool predicate_fulfilled(Game *g, Predicate *p) {
     return strcmp(g->current_room->name, p->argument) == 0;
   case PREDICATE_ITEM_HERE:
     return find_item(g->items, p->argument)->location == g->current_room;
+  case PREDICATE_ITEM_NOT_HERE:
+    return find_item(g->items, p->argument)->location != g->current_room;
   case PREDICATE_HAS_ITEM:
     return find_item(g->items, p->argument)->in_inventory;
   case PREDICATE_FLAG_ENABLED:
@@ -43,6 +45,11 @@ Predicate *create_predicate(Game *g, const char *string) {
     token = strtok_r(NULL, ")", &strtok_guy);
     p->argument = malloc(strlen(token) + 1);
     strcpy(p->argument, token);
+  } else if (strcmp(token, "ITEM_NOT_HERE") == 0) {
+    p->type = PREDICATE_ITEM_HERE;
+    token = strtok_r(NULL, ")", &strtok_guy);
+    p->argument = malloc(strlen(token) + 1);
+    strcpy(p->argument, token);
   } else if (strcmp(token, "HAS_ITEM") == 0) {
     p->type = PREDICATE_HAS_ITEM;
     token = strtok_r(NULL, ")", &strtok_guy);
@@ -53,6 +60,8 @@ Predicate *create_predicate(Game *g, const char *string) {
     token = strtok_r(NULL, ")", &strtok_guy);
     p->argument = malloc(strlen(token) + 1);
     strcpy(p->argument, token);
+  } else {
+    printf("Invalid predicate %s\n", token);
   }
 
   free(buffer);
@@ -70,6 +79,9 @@ void print_predicate(Predicate *p) {
   case PREDICATE_ITEM_HERE:
     printf("ITEM_HERE(%s)", p->argument);
     break;
+  case PREDICATE_ITEM_NOT_HERE:
+    printf("ITEM_NOT_HERE(%s)", p->argument);
+    break;
   case PREDICATE_HAS_ITEM:
     printf("HAS_ITEM(%s)", p->argument);
     break;

01_text_adventure/predicate.h

@@ -7,6 +7,7 @@ typedef enum PredicateType {
   PREDICATE_TRUE,
   PREDICATE_IN_ROOM,
   PREDICATE_ITEM_HERE,
+  PREDICATE_ITEM_NOT_HERE,
   PREDICATE_HAS_ITEM,
   PREDICATE_FLAG_ENABLED,
 } PredicateType;