Pull request for sample_npc.h, sample_npc.c, genstruct.c, and default_room

include/openworld/autogenerate.h

@@ -21,8 +21,10 @@
 #include "game-state/game.h"
 #include "gen_structs.h"
 #include "default_rooms.h"
+#include "default_npcs.h"
 
 #define MAX_RAND_ITEMS (6)
+#define MAX_NPCS (3)
 
 /*
 * path_exists_in_dir
@@ -160,6 +162,33 @@ item_hash_t *random_items(roomspec_t *room);
 */
 int random_item_lookup(item_hash_t **dst, item_hash_t *src, int num_iters);
 
-#endif /* INCLUDE_AUTOGENERATE_H */
+/*
+* random_npcs
+* randomly selects a number of npcs in a room where the max NPCs in a room is 3
+* Assumes that npcs are not automatically assigned to rooms
+* Includes a NPC room description and then randomly generates
+* a certain amount of generic, friendly, and hostile per room.
+*
+* parameters:
+*  - a roomspe_t that icnludes the type npc_t struct 
+* returns: type npc_t and a room npc description
+*/
+npc_t *random_npcs(roomspec_t *room);
 
+/*
+* random_npc_lookup
+* Iterates through num_iters times to and copies the source item at most 3 times
+* Helper function for random_npcs
+*
+* parameters:
+* -  item_hash_t *dst is where you want to store the npc you just found
+* -  item_hash_t *src is where you're looking up the npc
+* -  num_iters is how many times you'll iterate through src to settle on an npc 
+*
+* returns:
+*  - Failure if the NPC is NULL or if the num_iters is 0
+*  - Success if NPC is not NULL and there's at least 1 num_iters.
+*/
+int random_npc_lookup(npc_t **dst, npc_t *src, int num_iters);
 
+#endif /* INCLUDE_AUTOGENERATE_H */

include/openworld/default_npcs.h

@@ -0,0 +1,87 @@
+/* Team RPG-Openworld
+*
+* Default NPC header file
+*
+* default_npc.h: This file: contains all of the necessary npc  structs and functions
+* that are necessary to move npcs in a autogenerated room
+*
+* See chiventure/src/openworld/default_npc.c source code to see implementation.
+*/
+#ifndef _DEFAULT_NPCS_H
+#define _DEFAULT_NPCS_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include "game-state/game_state_common.h"
+
+// Assigns the max_name_lenght an NPC can have
+#define MAX_NAME_LEN (50)
+
+/*
+* npc_classification
+* Classification of the type of NPC characters to be found
+* within the rooms. Where friendly means NPC doesn't engage in fights,
+* Hostile means engages in fights, and generic means can engage in fights
+*/
+
+typedef enum npc_classification {
+    NPC_GENERIC = 0,
+    NPC_HOSTILE = 1,
+    NPC_FRIENDLY = 2
+} npc_classification_t;
+
+
+/* npc_t struct
+* This struct will carry the necessary info for creating a NPC in a room
+* This struct contains:
+* - int level: player level in game
+* - char *npc_name: strings a NPC type and name, ex: wizard type Hostile
+* -  npc_classification_t classification: enum for the three types of NPCs
+* - item_hash_t *item inventory: item inventory for the NPCs
+*/
+typedef struct npc
+{
+    char *npc_name;
+    int level;
+    item_hash_t *inventory;
+    npc_classification_t classification;
+    struct npc *next;
+    struct npc *prev;
+    UT_hash_handle hh;
+} npc_t;
+
+/* get_hostile_npcs produces mock NPCs of type Hostile.
+* Will recieve a linked list of hostile npcs and includes the items that
+* each NPC carries with them makes 3 npcs that are hostile
+* Input:
+*  - none
+* Output:
+*  - a hash list of hostile npcs with their own items inventory
+*/
+npc_t *get_hostile_npcs();
+
+
+/* get_friendly_npcs produces mock NPCs of type Friendly
+* makes 3 npcs that are friendly and includes the items that each NPC carries with them.
+* Input:
+* - none
+* Output:
+* - Returns them as a hash list
+*/
+npc_t *get_friendly_npcs();
+
+
+
+/* get_generic_npcs produces mock NPCs of type Generic
+* Generic: NPCs that you can choose to be friendly or hostile with
+* Function  makes 3 npcs that are generic and includes the items that each NPC carries with them
+* Input:
+* - none
+* Output:
+* - puts the NPCs in as a hash list
+*/
+npc_t *get_generic_npcs();
+
+
+#endif

include/openworld/gen_structs.h

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include "game-state/game.h"
 #include "game-state/game_state_common.h"
+#include "default_npcs.h"
 
 #ifndef GEN_STRUCTS_H
 #define GEN_STRUCTS_H
@@ -30,6 +31,7 @@
 * - char *long_desc: long description for room
 * - int num_built: how many rooms of this type have been already built. An identifier.
 * - item_hash_t *items: hash table of items in room
+* - npc_t *npcs: doubly linked list of the npcs
 * - UT_hash_handle hh: hash handle for room spec
 */
 typedef struct roomspec {
@@ -38,6 +40,7 @@ typedef struct roomspec {
     char *long_desc;
     int num_built;
     item_hash_t *items;
+    npc_t *npcs;
     UT_hash_handle hh;
 } roomspec_t;
 
@@ -135,7 +138,7 @@ int gencontext_free(gencontext_t *context);
 * SUCCESS - for SUCCESS
 * FAILURE - if failed to initialize
 */
-int init_roomspec(roomspec_t *spec, char *room_name, char *short_desc, char *long_desc, item_hash_t *items);
+int init_roomspec(roomspec_t *spec, char *room_name, char *short_desc, char *long_desc, item_hash_t *items, npc_t *npcs);
 
 /* roomspec_new
 * Creates a new roomspec_t* based off the given parameters.
@@ -150,7 +153,7 @@ int init_roomspec(roomspec_t *spec, char *room_name, char *short_desc, char *lon
 * roomspec_t *roomspecnew - the new roomspec
 * NULL - if fails to create a new roomspec.
 */
-roomspec_t* roomspec_new(char *room_name, char *short_desc, char *long_desc, item_hash_t *items);
+roomspec_t* roomspec_new(char *room_name, char *short_desc, char *long_desc, item_hash_t *items, npc_t *npcs);
 
 /* roomspec_free
 * Frees a gencontext_t* and returns whether or not it was succesful.
@@ -218,4 +221,4 @@ int speclist_free(speclist_t *list);
 */
 int speclist_free_all(speclist_t *list);
 
-#endif
+#endif

src/openworld/CMakeLists.txt

@@ -2,6 +2,7 @@ add_library(openworld
             src/autogenerate.c
             src/default_rooms.c
             src/default_items.c
+	        src/default_npcs.c
             src/gen_structs.c)
 
 target_include_directories(openworld PRIVATE src/)

src/openworld/src/autogenerate.c

@@ -19,6 +19,7 @@
 #include "openworld/autogenerate.h"
 #include "openworld/gen_structs.h"
 #include "openworld/default_rooms.h"
+#include "openworld/default_npcs.h"
 
 /* See autogenerate.h */
 bool path_exists_in_dir(room_t *r, char *direction)
@@ -51,7 +52,7 @@ room_t* roomspec_to_room(roomspec_t *roomspec)
     room_t *res = room_new(buff, roomspec->short_desc, roomspec->long_desc);
     // instead of taking all the items, just take a few of them
     res->items = random_items(roomspec);
-
+    //res->npcs = random_npcs(roomspec);
     res->paths = NULL;
     return res;
 }
@@ -178,13 +179,84 @@ int random_item_lookup(item_hash_t **dst, item_hash_t *src, int num_iters)
 
     HASH_ITER(hh, src, current, tmp) {
         if (i == num_iters) {
-            copy_item_to_hash(dst, src, tmp->item_id);
+            copy_item_to_hash(dst, src, current->item_id);
             return SUCCESS;
         }
         i++;
     }
 
-    return FAILURE;
 }
 
+/* See autogenerate.h */
+npc_t *random_npcs(roomspec_t *room)
+{
+    if (room == NULL) {
+        return NULL;
+    }
+
+    int num_npcs = rand() % MAX_NPCS;
+
+    //assuming that npcs are not automatically assigned to rooms
+    npc_t *hostiles = get_hostile_npcs();
+    npc_t *friendlies = get_friendly_npcs();
+    npc_t *generic = get_generic_npcs();
 
+
+    npc_t *combo = NULL;
+    npc_t *current = NULL;
+    npc_t *tmp = NULL;
+
+    strcat(room->long_desc, "These npcs are in the room: ");
+    for (int i = 0; i < num_npcs; i++) {
+        int random_num = rand() % 3;
+        if(random_num == 1)
+        {
+            random_npc_lookup(&current, hostiles, rand() % MAX_NPCS);
+        }
+        else if(random_num  == 2)
+        {
+            random_npc_lookup(&current, friendlies, rand() % MAX_NPCS);
+        }
+        else
+        {
+            random_npc_lookup(&current, generic, rand() % MAX_NPCS);
+        }
+        HASH_ADD_STR(combo,npc_name,current);
+    }
+    HASH_ITER(hh, combo, current, tmp) {
+        strncat(room->long_desc, current->npc_name, MAX_NAME_LEN);
+        if (tmp != NULL)
+            strncat(room->long_desc, ", ", MAX_NAME_LEN);
+    }
+    strcat(room->long_desc, ".\n");
+
+    if (combo == NULL)
+        return NULL;
+
+    return combo;
+}
+
+/* See autogenerate.h */
+int random_npc_lookup(npc_t **dst, npc_t *src, int num_iters)
+{
+    npc_t *current = NULL;
+    npc_t *tmp = NULL;
+
+    int i = 0;
+    HASH_ITER(hh, src, current, tmp) {
+    if (i == num_iters) {
+       npc_t *new_npc = calloc(1, sizeof(npc_t));
+
+       new_npc->npc_name = calloc(MAX_NAME_LEN + 1, sizeof(char));
+       strncpy(new_npc->npc_name, current->npc_name, MAX_NAME_LEN); 
+       new_npc->level = current->level;
+       new_npc->inventory = current->inventory;
+       new_npc->classification = current->classification;
+       HASH_ADD_STR(*dst, npc_name, new_npc);
+       return SUCCESS;
+    }
+      i++;
+}
+
+   return FAILURE;
+}