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

include/openworld/gen_structs.h

@@ -35,7 +35,8 @@ typedef struct roomspec {
     item_list_t *allowed_items;
     item_hash_t *items;
     path_hash_t *paths;
-   UT_hash_handle hh; 
+   UT_hash_handle hh;
+   npc_t *possible_npcs; 
 } roomspec_t;
 
 /* speclist_t struct
@@ -132,7 +133,7 @@ int gencontext_free(gencontext_t *context);
  * SUCCESS - for SUCCESS
  * FAILURE - if failed to initialize
  */
-int init_roomspec(roomspec_t *spec, char *short_desc, char *long_desc,
+int init_roomspec(npc_t *possible_npcs, roomspec_t *spec, char *short_desc, char *long_desc,
 	item_list_t *allowed, item_hash_t *items, path_hash_t *paths);
 
 /* roomspec_new
@@ -148,7 +149,7 @@ int init_roomspec(roomspec_t *spec, char *short_desc, char *long_desc,
  * 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, 
+roomspec_t* roomspec_new(npc_t *possible_npcs,char *room_name, char *short_desc, char *long_desc, 
 	item_list_t *allowed, item_hash_t *items, path_hash_t *paths);
 
 /* roomspec_free

include/openworld/sample_npc.h

@@ -3,13 +3,22 @@
 #include <stdlib.h>
 #include <stdbool.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, NPC type, and item inventory
+*/
 typedef struct npc
 {
     int level;
@@ -19,22 +28,23 @@ typedef struct npc
     struct npc *prev;
 } npc_t;
 
-/* Will get a linked list of hostile npcs
- * makes 2-3 npcs that are hostile and return them 
+/* 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();
 
 
 /*
- * makes 2-3 npcs that are friendly and return them 
+ * makes 3 npcs that are friendly and includes the items that           
+  each NPC carries with them. Returns NPC as a 
  * as a linked list
  */
 npc_t *get_friendly_npcs();
 
 
 
-/* * makes 2-3 npcs that are generic and return them 
+/* * makes 3 npcs that are generic and return them 
  * as a linked list
  */
 npc_t *get_generic_npcs();

src/openworld/src/default_rooms.c

@@ -30,7 +30,7 @@ item_list_t *allowed) {
 		*video;
 
 	//CLOSET
-	roomspec_t *closet = roomspec_new("closet", "A broom closet",
+	roomspec_t *closet = roomspec_new(get_generic_npcs(),"closet", "A broom closet",
 		"A small broom closet with supplies",
 		allowed, NULL, NULL);
 	HASH_FIND_STR(def, "door", door);
@@ -45,7 +45,7 @@ item_list_t *allowed) {
 	LL_APPEND(closet->allowed_items, llist_new(hat));
 
 	//HALLWAY
-	roomspec_t *hallway = roomspec_new("hallway", "A well-lit hallway",
+	roomspec_t *hallway = roomspec_new(get_hostile_npcs(),"hallway", "A well-lit hallway",
 		"A sterile, white hallway with no windows",
 		allowed, NULL, NULL);
 	LL_APPEND(hallway->allowed_items, llist_new(door));
@@ -58,7 +58,7 @@ item_list_t *allowed) {
 	LL_APPEND(hallway->allowed_items, llist_new(book));
 
 	//LIBRARY
-	roomspec_t *library = roomspec_new("library", 
+	roomspec_t *library = roomspec_new(get_friendly_npcs(),"library", 
 		"This is a library room with resources",
 		"An old, dusty library with skill-boosting resources like books and potions",
 		allowed, NULL, NULL);
@@ -77,7 +77,7 @@ item_list_t *allowed) {
 			*watercolors, *video;
 
 		//CAFETERIA
-		roomspec_t *cafeteria = roomspec_new("cafeteria", "A grungy cafeteria",
+		roomspec_t *cafeteria = roomspec_new(get_friendly_npcs(),"cafeteria", "A grungy cafeteria",
 			"A messy high school cafeteria with trays and tables out",
 			allowed, NULL, NULL);
 		HASH_FIND_STR(def, "apple", apple);
@@ -91,7 +91,7 @@ item_list_t *allowed) {
 		LL_APPEND(cafeteria->allowed_items, llist_new(yam));
 
 		//CLASSROOM
-		roomspec_t *classroom = roomspec_new("classroom",
+		roomspec_t *classroom = roomspec_new(get_generic_npcs(),"classroom",
 			"A medium-sized classroom with 30 desks",
 			"A geography teacher's classroom with 30 desks",
 			allowed, NULL, NULL);
@@ -118,7 +118,7 @@ item_list_t *allowed) {
 			*hat, *mirror;
 
 		//BARN
-		roomspec_t *barn = roomspec_new("barn", "A red barn",
+		roomspec_t *barn = roomspec_new(get_friendly_npcs(),"barn", "A red barn",
 			"A red barn with stables inside",
 			allowed, NULL, NULL);
 		HASH_FIND_STR(def, "apple", apple);
@@ -133,7 +133,7 @@ item_list_t *allowed) {
 		LL_APPEND(barn->allowed_items, llist_new(yam));
 
 		//OPEN FIELD
-		roomspec_t *field = roomspec_new("open field",
+		roomspec_t *field = roomspec_new(get_friendly_npcs(),"open field",
 			"An open field outside",
 			"An open field with grass and a clear view",
 			allowed, NULL, NULL);
@@ -145,7 +145,7 @@ item_list_t *allowed) {
 		LL_APPEND(field->allowed_items, llist_new(apple));
 
 		//KITCHEN
-		roomspec_t *kitchen = roomspec_new("kitchen", "A 60s era (outdated) kitchen",
+		roomspec_t *kitchen = roomspec_new(get_generic_npcs(),"kitchen", "A 60s era (outdated) kitchen",
 			"An outdated kitchen with obvious wear-and-tear",
 			allowed, NULL, NULL);
 		HASH_FIND_STR(def, "olive", olive);
@@ -157,7 +157,7 @@ item_list_t *allowed) {
 		LL_APPEND(kitchen->allowed_items,llist_new(tray));
 
 		//LIVING ROOM
-		roomspec_t *living = roomspec_new("living room", 
+		roomspec_t *living = roomspec_new(get_generic_npcs(),"living room", 
 			"A living room with basic items",
 			"A plain, unremarkable living room",
 			allowed, NULL, NULL);
@@ -183,7 +183,7 @@ item_list_t *allowed) {
 		item_t *ladder, *gold, *yam;
 
 		//DUNGEON
-		roomspec_t *dungeon = roomspec_new("dungeon", "A dark dungeon",
+		roomspec_t *dungeon = roomspec_new(get_hostile_npcs(), "dungeon", "A dark dungeon",
 			"A dank, dark dungeon with traps and enemies to battle",
 			allowed, NULL, NULL);
 		LL_APPEND(dungeon->allowed_items, llist_new(nail));
@@ -196,7 +196,7 @@ item_list_t *allowed) {
 		LL_APPEND(dungeon->allowed_items, llist_new(yam));
 
 		//THRONE ROOM
-		roomspec_t *throne = roomspec_new("throne room", 
+		roomspec_t *throne = roomspec_new(get_hostile_npcs(),"throne room", 
 			"This is a throne room",
 			"A regal throne room decked out with lavish items",
 			allowed, NULL, NULL);

tests/openworld/test_rooms.c

@@ -8,7 +8,7 @@
 
 /* testing make_default_room for defined bucket, NULL sh_desc, l_desc*/
 Test(room, make_default_defn){
-	roomspec_t *hash = make_default_room("school", NULL , NULL, NULL);
+	roomspec_t *hash = make_default_room(NULL, "school", NULL , NULL, NULL);
 	cr_assert_not_null(hash, "make_default_room failed");
 
 	roomspec_t *r1, *r2, *r3, *r4, *r5, *r6;
@@ -43,7 +43,7 @@ Test(room, make_default_defn){
 
 /* testing make_default_room for undef bucket, bogus sh_desc, l_desc */
 Test(room, make_default_undef_bogus) {
-	roomspec_t *hash = make_default_room("pharmacy", "short bogus", 
+	roomspec_t *hash = make_default_room(NULL, "pharmacy", "short bogus", 
 		"long bogus", NULL);
 	cr_assert_not_null(hash, "make_default_room failed");