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,60 @@
+#ifndef _DEFAULT_NPCS_H
+#define _DEFAULT_NPCS_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include "game-state/game_state_common.h"
+
+/*
+* 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 = -1,
+	NPC_HOSTILE = 0,
+	NPC_FRIENDLY = 1
+} npc_classification_t;
+
+
+/* NPC mock struct that contains the bare minimum to add a NPC in a
+* openworld room.Consists of player level, char *npc_name, NPC type, and item inventory
+*/
+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
+* Will get a linked list of hostile npcs and includes the items that
+* each NPC carries with them  makes 3 npcs that are hostile and return them
+* as a linked list
+*/
+npc_t *get_hostile_npcs();
+
+
+/* get_friendly_npcs
+* makes 3 npcs that are friendly and includes the items that
+* each NPC carries with them. 
+* Return them as a hash list
+*/
+npc_t *get_friendly_npcs();
+
+
+
+/* get_generic_npcs
+* makes 3 npcs that are generic 
+* Return them as a hash list
+*/
+npc_t *get_generic_npcs();
+
+
+#endif

include/openworld/default_rooms.h

@@ -31,6 +31,6 @@ int copy_item_to_hash(item_hash_t **dst, item_hash_t *src, char *name);
 * Output:
 *    - roomspec_t updated hash
 */
-roomspec_t *make_default_room(char *bucket, char *sh_desc, char *l_desc);
+roomspec_t *make_default_room( char *bucket, char *sh_desc, char *l_desc);
 
 #endif /* _DEFAULT_ROOM_H */

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,15 +31,17 @@
 * - 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 {
-    char *room_name;
-    char *short_desc;
-    char *long_desc;
-    int num_built;
-    item_hash_t *items;
-    UT_hash_handle hh;
+	char *room_name;
+	char *short_desc;
+	char *long_desc;
+	int num_built;
+	item_hash_t *items;
+	npc_t *npcs;
+	UT_hash_handle hh;
 } roomspec_t;
 
 /* speclist_t struct
@@ -48,9 +51,9 @@ typedef struct roomspec {
 * - speclist_t *next: pointer to the next part of the list.
 */
 typedef struct speclist {
-    roomspec_t *spec;
-    struct speclist *prev;
-    struct speclist *next;
+	roomspec_t *spec;
+	struct speclist *prev;
+	struct speclist *next;
 } speclist_t;
 
 /* gencontext_t struct
@@ -62,10 +65,10 @@ typedef struct speclist {
 * - speclist_t *speclist: the llist of roomspect_t that each hold the room info.
 */
 typedef struct gencontext {
-    path_t *open_paths;
-    int num_open_paths;
-    int level;
-    speclist_t *speclist;
+	path_t *open_paths;
+	int num_open_paths;
+	int level;
+	speclist_t *speclist;
 } gencontext_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/)