hungry creatures will now pick up food if they randomly happen to pass by a food source, though they do not actively seek food out

Author: kurtmweber

AUTHORS

@@ -1,4 +1,8 @@
 Kurt M. Weber (kmw) <[email protected]>
+  * Kurt is a Ph.D. student in Russian history at the University of California, Riverside,  He discovered
+    Moria on an old IBM PC/XT his father purchased at a yard sale in the late 90's, then over the next
+    several years became an avid roguelike fan.  Lavender Throne is a hobby for him when he needs a break
+    from his real work.
 
 PCG Random Number Generator (src/pcg_basic.c, src/pcg_basic.h):
   * Melissa O'Neill <[email protected]>

ChangeLog

@@ -1,3 +1,7 @@
+for version 0.10
+  * hungry creatures will now pick up food if they randomly happen to pass by a food source, though
+    they do not actively seek food out (kmw, 2017-06-26)
+
 for version 0.9
   * release (kmw, 2017-05-21)
   * unowned items are saved and restored (kmw, 2017-05-21)

TODO

@@ -1,4 +1,13 @@
 * When updating plant status every turn, any excess growth should be carried over, rather than just stopping
   and resetting growth at the next stage to 0 (2017-03-27, kmw)
 * Make savefiles portable--this will require paying attention to endianness, at the very least (2017-04-11,
-  kmw)
+  kmw)
+* Add creature food preferences, and update creature AI to respect them when eating (2017-05-28, kmw)
+* Creatures should prefer not to waste food by eating items that give more nutrition value than what they
+  need, unless desperately hungry (2017-06-26, kmw)
+* Creatures should avoid eating corpses of former allies (2017-06-26, kmw)
+* Creatures should pick up unneeded food and carry it around for later (2017-06-26, kmw)
+* It should be possible to start eating, get some nutrition, then stop and save the rest for later
+  (2017-06-26, kmw)
+* Hungry creatures should actively seek out food, rather than simply hoping they randomly pass by
+  some (2017-06-26, kmw)

src/Makefile.am

@@ -4,6 +4,6 @@ lvt_SOURCES	=	leveldisp.c levelgen.c main.c pcg_basic.c random.c map.c screen.c
 			util.c messages.c questions.c allocator.c creaturegen.c colors.c name.c faction.c \
 			creaturemove.c attack.c creaturelist.c item.c look.c itemmgmt.c flooritems.c \
 			inventory.c spawnitem.c throw.c plantgen.c plantlist.c plantmgmt.c plants.c \
-			pickfruit.c eat.c seedlist.c seeds.c save.c readsave.c
+			pickfruit.c eat.c seedlist.c seeds.c save.c readsave.c creatureeat.c
 noinst_HEADERS	=	lvt.h level.h pcg_basic.h creature.h messages.h types.h move.h stringlookups.h \
 			colors.h item.h attack.h species.h creaturemgmt.h plant.h save.h

src/Makefile.in

@@ -115,7 +115,7 @@ am_lvt_OBJECTS = leveldisp.$(OBJEXT) levelgen.$(OBJEXT) main.$(OBJEXT) \
 	throw.$(OBJEXT) plantgen.$(OBJEXT) plantlist.$(OBJEXT) \
 	plantmgmt.$(OBJEXT) plants.$(OBJEXT) pickfruit.$(OBJEXT) \
 	eat.$(OBJEXT) seedlist.$(OBJEXT) seeds.$(OBJEXT) \
-	save.$(OBJEXT) readsave.$(OBJEXT)
+	save.$(OBJEXT) readsave.$(OBJEXT) creatureeat.$(OBJEXT)
 lvt_OBJECTS = $(am_lvt_OBJECTS)
 lvt_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -268,7 +268,7 @@ lvt_SOURCES = leveldisp.c levelgen.c main.c pcg_basic.c random.c map.c screen.c
 			util.c messages.c questions.c allocator.c creaturegen.c colors.c name.c faction.c \
 			creaturemove.c attack.c creaturelist.c item.c look.c itemmgmt.c flooritems.c \
 			inventory.c spawnitem.c throw.c plantgen.c plantlist.c plantmgmt.c plants.c \
-			pickfruit.c eat.c seedlist.c seeds.c save.c readsave.c
+			pickfruit.c eat.c seedlist.c seeds.c save.c readsave.c creatureeat.c
 
 noinst_HEADERS = lvt.h level.h pcg_basic.h creature.h messages.h types.h move.h stringlookups.h \
 			colors.h item.h attack.h species.h creaturemgmt.h plant.h save.h
@@ -363,6 +363,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chargen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colors.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creatureeat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creaturegen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creatureinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creaturelist.Po@am__quote@

src/creature.h

@@ -119,6 +119,7 @@ typedef struct creature{
   struct item *inventory[52];
   unsigned int weight;
   unsigned int nutrition;
+  bool hungry;
   //creatureAggression aggression;
   struct {
     unsigned int speed;

src/creatureeat.c

@@ -0,0 +1,60 @@
+/*  This file is part of Lavender Throne.
+ *  Copyright 2016 by Kurt Weber
+ *
+ *  Lavender Throne is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Lavender Throne is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Lavender Throne.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _CREATUREEAT_C
+
+#include <stdbool.h>
+
+#include "lvt.h"
+#include "creature.h"
+
+bool hungerAction(creature *curCreature){
+  item *foodItem = 0;
+  coord3D itemLoc;
+  
+  if (getCreatureNutrition(curCreature) <= (getCreatureWeight(curCreature) / 2)){
+    setCreatureHungry(curCreature);
+  }
+  
+  if (isCreatureHungry(curCreature)){
+    if (hasFoodInventory(curCreature)){
+      foodItem = selectOptimalFoodInventory(curCreature);
+      if (foodItem){
+	eatItem(curCreature, foodItem);
+	return true;
+      }
+    }
+    
+    foodItem = checkAdjacentFood(getCreatureLocation(curCreature));
+    if (foodItem){
+      itemLoc = getItemLocation(foodItem);
+      if (addCreatureInventoryItem(curCreature, foodItem)){
+	removeContent(itemLoc.level, itemLoc.x, itemLoc.y, foodItem);
+	return true;
+      }
+    }
+    
+    foodItem = checkAdjacentFruitingBush(getCreatureLocation(curCreature));
+    if (foodItem){
+      if (addCreatureInventoryItem(curCreature, foodItem)){
+	return true;
+      }
+    }      
+  }
+  
+  return false;
+}

src/creaturemgmt.c

@@ -19,6 +19,7 @@
 
 #include <math.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include "creaturemgmt.h"
 #include "lvt.h"
 #include "creature.h"
@@ -545,6 +546,49 @@ void getCreatureInventory(creature *creature, item *inventory[52]){
   return;
 }
 
+bool hasFoodInventory(creature *creature){
+  unsigned int i = 0;
+  itemClassId cId;
+  
+  for (i = 0; i < 52; i++){
+    if (creature->inventory[i]){
+      cId = getItemClass(creature->inventory[i]);
+      if ((cId == ITEM_TYPE_FRUIT) || (cId == ITEM_TYPE_CORPSE)){
+	return true;
+      }
+    }
+  }
+  
+  return false;
+}
+
+item *selectOptimalFoodInventory(creature *creature){  
+  unsigned int nutDiff;
+  item *bestNutDiffItem = 0;
+  itemClassId cId;
+  unsigned int i = 0;
+  int curNutDiff = 0;
+  int bestNutDiff = 0;
+  
+  nutDiff = getCreatureWeight(creature) - getCreatureNutrition(creature);
+  bestNutDiff = nutDiff;
+  
+  for (i = 0; i < 52; i++){
+    if (creature->inventory[i]){
+      cId = getItemClass(creature->inventory[i]);
+      if ((cId == ITEM_TYPE_FRUIT) || (cId == ITEM_TYPE_CORPSE)){
+	curNutDiff = nutDiff - getItemNutrition(creature->inventory[i]);
+	if (abs(curNutDiff) < abs(bestNutDiff)){
+	  bestNutDiff = curNutDiff;
+	  bestNutDiffItem = creature->inventory[i];
+	}
+      }
+    }
+  }
+  
+  return bestNutDiffItem;
+}
+
 void unwieldWeapon(creature *creature){
   item *weapon;
 
@@ -725,6 +769,22 @@ unsigned int getCreatureArmorClass(creature *creature){
   return ac;
 }
 
+void setCreatureHungry(creature *creature){
+  creature->hungry = true;
+  
+  return;
+}
+
+void unsetCreatureHungry(creature *creature){
+  creature->hungry = false;
+  
+  return;
+}
+
+bool isCreatureHungry(creature *creature){
+  return creature->hungry;
+}
+
 void setCreatureNutrition (creature *creature, unsigned int nutrition){
   unsigned int weight;
 

src/creaturemove.c

@@ -39,7 +39,9 @@ void moveCreatures(){
     curCreature = curCreatureNode->creature;
     incrementCreatureSpeedCounter(curCreature, getCreatureSpeed(curCreature));
     while (hasAction(curCreature)){
-      doMoveCreature(curCreature);
+      if (!hungerAction(curCreature)){
+	doMoveCreature(curCreature);
+      }
     }
 
     // we have to do this before we update the life cycle, because if the creature dies as a result of

src/itemmgmt.c

@@ -112,6 +112,24 @@ itemClassId getItemClass(item *item){
   return item->itemClass;
 }
 
+unsigned int getItemNutrition(item *item){
+  itemClassId cId;
+  
+  cId = getItemClass(item);
+  
+  if (cId == ITEM_TYPE_FRUIT){
+    return getFruitNutrition(item);
+  }
+  
+  if (cId == ITEM_TYPE_CORPSE){
+    return getCorpseNutrition(item);
+  }
+  
+  return 0;
+}
+  
+  
+
 unsigned int getEffectiveArmor(item *item){
   unsigned int ac;
 

src/levelgen.c

@@ -379,6 +379,11 @@ void placeDoors(level level){
 
   doorEligible = findDoorEligible(level);
 
+  if (!doorEligible){
+    free(doorEligible);
+    return;
+  }
+  
   while (doorEligible[i].x){
     if (uniformRandomRangeInt(&levelGenRNG, 1, 1000) < doorLikelihood){
       if (uniformRandomRangeInt(&levelGenRNG, 1, 1000) < hiddenDoorLikelihood){

src/lvt.h

@@ -75,6 +75,10 @@ void initializeColors();
 #else
 #endif
 
+#ifndef _CREATUREEAT_C
+bool hungerAction(creature *curCreature);
+#endif
+
 #ifndef _CREATUREGEN_C
 creatureList *generateStartingCreatures();
 #else
@@ -162,6 +166,11 @@ void regenerateHitPoints(creature *creature);
 void setCreatureNutrition (creature *creature, unsigned int nutrition);
 unsigned int getCreatureNutrition(creature *creature);
 bool updateCreatureNutrition(creature *creature);
+void setCreatureHungry(creature *creature);
+void unsetCreatureHungry(creature *creature);
+bool isCreatureHungry(creature *creature);
+bool hasFoodInventory(creature *creature);
+item *selectOptimalFoodInventory(creature *creature);
 #else
 bool updateCreatureLifeCycleNotMatured(creature *creature);
 bool updateCreatureLifeCycleMatured(creature *creature);
@@ -193,6 +202,7 @@ void changeCreatureLocation(creature *creature, coord3D newPos);
 
 #ifndef _EAT_C
 void doEat();
+void eatItem(creature *creature, item *foodItem);
 #else
 void eatItem(creature *creature, item *foodItem);
 #endif
@@ -297,6 +307,11 @@ unsigned int getSeedDormancy(item *seed);
 bool isSeed(item *item);
 void setItemOwner(item *item, creature *owner);
 creature *getItemOwner(item *item);
+unsigned int getItemNutrition(item *item);
+#else
+itemClassId getItemClass(item *item);
+unsigned int getFruitNutrition(item *fruit);
+unsigned int getCorpseNutrition(item *corpse);
 #endif
 
 #ifndef _LEVELDISP_C
@@ -396,6 +411,7 @@ char *generateName();
 
 #ifndef _PICKFRUIT_C
 void doPickFruit();
+item *pickFruitFromPlant(plant *plant);
 #else
 item *pickFruitFromPlant(plant *plant);
 #endif
@@ -590,6 +606,8 @@ char inventoryIndexToLetter(char c);
 bool isInventoryLetter(char c);
 int inventoryLetterToIndex(char c);
 void directionToUnitMatrix(moveDirection dir, moveMatrix *matrix);
+item *checkAdjacentFood(coord3D location);
+item *checkAdjacentFruitingBush(coord3D location);
 #else
 #endif
 

src/move.h

@@ -25,7 +25,6 @@
 #define KEY_DOWNLEFT KEY_END
 #define KEY_DOWNRIGHT KEY_NPAGE
 
-
 typedef enum moveOutcome{
   MOVE_SUCCESS,
   MOVE_FAILED_WALL,