From b4d93cffc240400c4f762659b08c0eb0f8b7b775 Mon Sep 17 00:00:00 2001
From: Bill Rossi <bassguitarbill@gmail.com>
Date: Sun, 19 Jan 2025 09:41:25 -0500
Subject: [PATCH] Add movement

---
 01_text_adventure/data/actions.txt |  9 +++++++++
 01_text_adventure/data/words.txt   |  5 +++++
 01_text_adventure/effect.c         | 14 ++++++++++++--
 01_text_adventure/effect.h         |  1 +
 01_text_adventure/main.c           |  4 ++++
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/01_text_adventure/data/actions.txt b/01_text_adventure/data/actions.txt
index 63e694d..d482962 100644
--- a/01_text_adventure/data/actions.txt
+++ b/01_text_adventure/data/actions.txt
@@ -1,3 +1,12 @@
+QUIT | * | 1000 | Bye! | QUIT_GAME()
+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)
+SOUTH | IN(SECOND_ROOM) | 10 | You head back through the door. | GOTO(FIRST_ROOM)
+EAST | IN(FIRST_ROOM) | 10 | You crouch under the beam and enter the room. | GOTO(LAST_ROOM)
+WEST | IN(LAST_ROOM) | 10 | You crouch under the beam and return to the room. | GOTO(FIRST_ROOM)
 PULL       | *                                      | 1    | You don't see anything to pull |
 PULL       | IN(FIRST_ROOM)                         | 10   | What do you want to pull? |
 PULL LEVER | IN(FIRST_ROOM)                         | 100  | You pull the lever. Nice. | ENABLE(LEVER_PULLED)
diff --git a/01_text_adventure/data/words.txt b/01_text_adventure/data/words.txt
index 9e268ff..e4492d3 100644
--- a/01_text_adventure/data/words.txt
+++ b/01_text_adventure/data/words.txt
@@ -1,3 +1,8 @@
 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
diff --git a/01_text_adventure/effect.c b/01_text_adventure/effect.c
index c53bd7b..ad04a96 100644
--- a/01_text_adventure/effect.c
+++ b/01_text_adventure/effect.c
@@ -26,6 +26,9 @@ void cause_effect(Game *g, Effect *e) {
   case EFFECT_DISABLE:
     find_flag(g->flags, e->argument)->value = 0;
     break;
+  case EFFECT_QUIT_GAME:
+    g->should_close = true;
+    break;
   }
 }
 
@@ -49,11 +52,15 @@ Effect *create_effect(Game *g, const char *string) {
       e->type = EFFECT_ENABLE;
     } else if (strcmp(token, "DISABLE") == 0) {
       e->type = EFFECT_DISABLE;
+    } else if (strcmp(token, "QUIT_GAME") == 0) {
+      e->type = EFFECT_QUIT_GAME;
     }
 
     token = strtok_r(NULL, ")", &strtok_guy);
-    e->argument = malloc(strlen(token) + 1);
-    strcpy(e->argument, token);
+    if (token) {
+      e->argument = malloc(strlen(token) + 1);
+      strcpy(e->argument, token);
+    }
   }
 
   free(buffer);
@@ -80,5 +87,8 @@ void print_effect(Effect *e) {
   case EFFECT_DISABLE:
     printf("DISABLE(%s)", e->argument);
     break;
+  case EFFECT_QUIT_GAME:
+    printf("QUIT_GAME()");
+    break;
   }
 }
diff --git a/01_text_adventure/effect.h b/01_text_adventure/effect.h
index 36e0899..e876657 100644
--- a/01_text_adventure/effect.h
+++ b/01_text_adventure/effect.h
@@ -10,6 +10,7 @@ typedef enum EffectType {
   EFFECT_DECREMENT,
   EFFECT_ENABLE,
   EFFECT_DISABLE,
+  EFFECT_QUIT_GAME,
 } EffectType;
 
 #include "game.h"
diff --git a/01_text_adventure/main.c b/01_text_adventure/main.c
index a48cd06..666cd18 100644
--- a/01_text_adventure/main.c
+++ b/01_text_adventure/main.c
@@ -18,9 +18,13 @@ int main(void) {
     game_load_rooms(g);
     g->current_room = &g->rooms->rooms[0];
     game_load_transitions(g);
+    printf("loaded transitions\n");
     game_load_words(g);
+    printf("loaded words\n");
     game_load_flags(g);
+    printf("loaded flags\n");
     game_load_actions(g);
+    printf("loaded actions\n");
 
     game_run_until_close(g);
     CloseWindow();