14 files changed, 436 insertions, 102 deletions

@@ -54,6 +54,7 @@ add_executable(Aromatherapy
   src/muxer.cpp
   src/entityfactory.cpp
   src/world.cpp
+  src/components/ai.cpp
   src/components/map_collision.cpp
   src/components/map_render.cpp
   src/components/physics_body.cpp
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <entities>
-  <entity id="checkpoint" name="Checkpoint" sprite="res/keyring.png" width="8" height="11">
-    <event name="touch">
-      <action type="save" />
-    </event>
-  </entity>
+  <entity id="checkpoint" name="Checkpoint" sprite="res/keyring.png" width="8" height="11" action="save" />
   
-  <entity id="movplat" name="Moving Platform" sprite="res/platform.png" action="carry" width="24" height="8">
+  <entity id="movplat" name="Moving Platform" sprite="res/platform.png" width="24" height="8" action="carry">
     <input id="dir" name="Direction" type="choice">
       <value id="0">Left</value>
       <value id="1">Right</value>
@@ -15,8 +11,25 @@
     </input>
     <input id="len" name="Length" type="slider" minvalue="0" maxvalue="320" />
     <input id="speed" name="Speed (px/s)" type="slider" minvalue="1" maxvalue="320" />
-    <event name="touch">
-      <action type="carry" />
-    </event>
+    <ai chance="1">
+      <switch item="dir">
+        <case value="0">
+          <move direction="left" length-var="len" speed-var="speed" />
+          <move direction="right" length-var="len" speed-var="speed" />
+        </case>
+        <case value="1">
+          <move direction="right" length-var="len" speed-var="speed" />
+          <move direction="left" length-var="len" speed-var="speed" />
+        </case>
+        <case value="2">
+          <move direction="up" length-var="len" speed-var="speed" />
+          <move direction="down" length-var="len" speed-var="speed" />
+        </case>
+        <case value="3">
+          <move direction="down" length-var="len" speed-var="speed" />
+          <move direction="up" length-var="len" speed-var="speed" />
+        </case>
+      </switch>
+    </ai>
   </entity>
 </entities>
@@ -95,4 +95,4 @@
 2,2,2,2,2,2,26,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,12,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,27,1,3,4,2,1,3,2,1,1,2,4,1,1,1,3,1,1,4,2,1,3,4,1,25,19,0,0,0,0,0,0,0,0,
 0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-</environment><entity type="movplat" x="98" y="145"><item id="dir">1</item><item id="len">70</item><item id="speed">35</item></entity><adjacent dir="up" type="warp" map="4"/></map></world>
+</environment><entity type="movplat" x="98" y="145"><item id="dir">1</item><item id="len">90</item><item id="speed">30</item></entity><adjacent dir="up" type="warp" map="4"/></map></world>
@@ -0,0 +1,142 @@
+#include "ai.h"
+#include <cstdlib>
+#include "entity.h"
+
+void AIActionContainer::addAction(std::shared_ptr<AIAction> action)
+{
+  actions.push_back(action);
+}
+
+void AIActionContainer::start(Game& game, Entity& entity)
+{
+  currentAction = begin(actions);
+  
+  if (currentAction != end(actions))
+  {
+    (*currentAction)->start(game, entity);
+  }
+}
+
+void AIActionContainer::perform(Game& game, Entity& entity, double dt)
+{
+  if (!isDone())
+  {
+    (*currentAction)->perform(game, entity, dt);
+  
+    if ((*currentAction)->isDone())
+    {
+      currentAction++;
+      
+      if (!isDone())
+      {
+        (*currentAction)->start(game, entity);
+      }
+    }
+  }
+}
+
+bool AIActionContainer::isDone() const
+{
+  return currentAction == end(actions);
+}
+
+AI::AI(int chance)
+{
+  this->chance = chance;
+}
+
+int AI::getChance() const
+{
+  return chance;
+}
+
+AI& AIComponent::emplaceAI(int chance)
+{
+  maxChance += chance;
+  ais.emplace_back(chance);
+  
+  return ais.back();
+}
+
+void AIComponent::tick(Game& game, Entity& entity, double dt)
+{
+  if (currentAI == nullptr)
+  {
+    int toChoose = rand() % maxChance;
+    for (auto& ai : ais)
+    {
+      if (toChoose < ai.getChance())
+      {
+        currentAI = &ai;
+        break;
+      } else {
+        toChoose -= ai.getChance();
+      }
+    }
+    
+    if (currentAI != nullptr)
+    {
+      currentAI->start(game, entity);
+    }
+  }
+  
+  if (currentAI != nullptr)
+  {
+    currentAI->perform(game, entity, dt);
+  
+    if (currentAI->isDone())
+    {
+      currentAI = nullptr;
+    }
+  }
+}
+
+MoveAIAction::MoveAIAction(Direction dir, int len, int speed)
+{
+  this->dir = dir;
+  this->len = len;
+  this->speed = speed;
+}
+
+void MoveAIAction::start(Game& game, Entity& entity)
+{
+  remaining = len;
+}
+
+void MoveAIAction::perform(Game&, Entity& entity, double dt)
+{
+  double dist = dt * speed;
+  remaining -= dist;
+  
+  switch (dir)
+  {
+    case Direction::Left:
+    {
+      entity.position.first -= dist;
+      break;
+    }
+    
+    case Direction::Right:
+    {
+      entity.position.first += dist;
+      break;
+    }
+    
+    case Direction::Up:
+    {
+      entity.position.second -= dist;
+      break;
+    }
+    
+    case Direction::Down:
+    {
+      entity.position.second += dist;
+      break;
+    }
+  }
+}
+
+bool MoveAIAction::isDone() const
+{
+  return remaining <= 0.0;
+}
@@ -0,0 +1,73 @@
+#ifndef AI_H
+#define AI_H
+
+#include <list>
+#include <map>
+#include <string>
+#include <memory>
+
+#include "entity.h"
+
+class AIAction {
+  public:
+    virtual void start(Game& game, Entity& entity) = 0;
+    virtual void perform(Game& game, Entity& entity, double dt) = 0;
+    virtual bool isDone() const = 0;
+};
+
+class AIActionContainer {
+  public:
+    void addAction(std::shared_ptr<AIAction> action);
+    virtual void start(Game& game, Entity& entity);
+    virtual void perform(Game& game, Entity& entity, double dt);
+    virtual bool isDone() const;
+  
+  private:
+    std::list<std::shared_ptr<AIAction>> actions;
+    std::list<std::shared_ptr<AIAction>>::iterator currentAction {end(actions)};
+};
+
+class AI : public AIActionContainer {
+  public:
+    AI(int chance);
+    
+    int getChance() const;
+    
+  private:
+    int chance;
+};
+
+class AIComponent : public Component {
+  public:
+    AI& emplaceAI(int chance);
+    void tick(Game& game, Entity& entity, double dt);
+
+  private:
+    int maxChance = 0;
+    std::list<AI> ais;
+    AI* currentAI = nullptr;
+};
+
+class MoveAIAction : public AIAction {
+  public:
+    enum class Direction {
+      Left,
+      Right,
+      Up,
+      Down
+    };
+    
+    MoveAIAction(Direction dir, int len, int speed);
+    
+    void start(Game& game, Entity& entity);
+    void perform(Game& game, Entity& entity, double dt);
+    bool isDone() const;
+    
+  private:
+    Direction dir;
+    int len;
+    int speed;
+    double remaining;
+};
+
+#endif /* end of include guard: AI_H */
@@ -156,15 +156,24 @@ void MapCollisionComponent::processCollision(Game& game, Entity& collider, Colli
     if (dir == Direction::left)
     {
       collider.position.first = collision.axis;
-      collider.send(game, Message::Type::stopMovingHorizontally);
+      
+      Message msg(Message::Type::setHorizontalVelocity);
+      msg.velocity = 0.0;
+      collider.send(game, msg);
     } else if (dir == Direction::right)
     {
       collider.position.first = collision.axis - collider.size.first;
-      collider.send(game, Message::Type::stopMovingHorizontally);
+
+      Message msg(Message::Type::setHorizontalVelocity);
+      msg.velocity = 0.0;
+      collider.send(game, msg);
     } else if (dir == Direction::up)
     {
       collider.position.second = collision.axis;
-      collider.send(game, Message::Type::stopMovingVertically);
+
+      Message msg(Message::Type::setVerticalVelocity);
+      msg.velocity = 0.0;
+      collider.send(game, msg);
     } else if (dir == Direction::down)
     {
       collider.position.second = collision.axis - collider.size.second;
@@ -13,12 +13,12 @@ void PhysicsBodyComponent::receive(Game&, Entity&, const Message& msg)
   } else if (msg.type == Message::Type::stopWalking)
   {
     velocity.first = 0.0;
-  } else if (msg.type == Message::Type::stopMovingHorizontally)
+  } else if (msg.type == Message::Type::setHorizontalVelocity)
   {
-    velocity.first = 0.0;
-  } else if (msg.type == Message::Type::stopMovingVertically)
+    velocity.first = msg.velocity;
+  } else if (msg.type == Message::Type::setVerticalVelocity)
   {
-    velocity.second = 0.0;
+    velocity.second = msg.velocity;
   }
 }
 
@@ -29,12 +29,12 @@ void PlayerPhysicsComponent::receive(Game&, Entity& entity, const Message& msg)
   {
     velocity.first = 0.0;
     direction = 0;
-  } else if (msg.type == Message::Type::stopMovingHorizontally)
+  } else if (msg.type == Message::Type::setHorizontalVelocity)
   {
-    velocity.first = 0.0;
-  } else if (msg.type == Message::Type::stopMovingVertically)
+    velocity.first = msg.velocity;
+  } else if (msg.type == Message::Type::setVerticalVelocity)
   {
-    velocity.second = 0.0;
+    velocity.second = msg.velocity;
   } else if (msg.type == Message::Type::hitTheGround)
   {
     if (isFalling)
@@ -15,8 +15,8 @@ class Message {
       walkLeft,
       walkRight,
       stopWalking,
-      stopMovingHorizontally,
-      stopMovingVertically,
+      setHorizontalVelocity,
+      setVerticalVelocity,
       collision,
       jump,
       stopJump,
@@ -33,6 +33,7 @@ class Message {
     Type type;
     Entity* collisionEntity;
     int dropAxis;
+    double velocity;
 };
 
 class Entity {
@@ -3,103 +3,180 @@
 #include "muxer.h"
 #include <cstdio>
 #include <map>
+#include <list>
 #include "components/static_image.h"
 #include "components/simple_collider.h"
 #include "components/physics_body.h"
+#include "components/ai.h"
 #include "game.h"
 
-struct EntityData {
-  char* sprite;
-  char* action;
-  bool hasPhysics;
-  int width;
-  int height;
-};
-
-static std::map<std::string, EntityData> factories;
-
-std::shared_ptr<Entity> EntityFactory::createNamedEntity(const std::string name)
+void parseEntityAIData(AI& ai, xmlNodePtr node, const std::map<std::string, int>& items)
 {
-  auto it = factories.find(name);
-  EntityData data = factories[name];
-  if (it == factories.end())
-  {
-    xmlDocPtr doc = xmlParseFile(("entities/" + name + ".xml").c_str());
-    if (doc == nullptr)
-    {
-      fprintf(stderr, "Error reading entity %s\n", name.c_str());
-      exit(-1);
-    }
-  
-    xmlNodePtr top = xmlDocGetRootElement(doc);
-    if (top == nullptr)
-    {
-      fprintf(stderr, "Empty entity %s\n", name.c_str());
-      exit(-1);
-    }
-  
-    if (xmlStrcmp(top->name, (const xmlChar*) "entity-def"))
-    {
-      fprintf(stderr, "Invalid entity definition %s\n", name.c_str());
-      exit(-1);
-    }
+  xmlChar* key;
   
-    for (xmlNodePtr node = top->xmlChildrenNode; node != NULL; node = node->next)
+  for (xmlNodePtr aiNode = node->xmlChildrenNode; aiNode != NULL; aiNode = aiNode->next)
+  {
+    if (!xmlStrcmp(aiNode->name, (xmlChar*) "move"))
     {
-      if (!xmlStrcmp(node->name, (const xmlChar*) "sprite"))
+      MoveAIAction::Direction dir;
+      int len;
+      int speed;
+      
+      key = xmlGetProp(aiNode, (xmlChar*) "direction");
+      if (key == 0) exit(2);
+      if (!xmlStrcmp(key, (xmlChar*) "left"))
       {
-        xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
-        data.sprite = (char*) calloc(xmlStrlen(key)+1, sizeof(char));
-        strcpy(data.sprite, (char*) key);
-        xmlFree(key);
-      } else if (!xmlStrcmp(node->name, (const xmlChar*) "action"))
+        dir = MoveAIAction::Direction::Left;
+      } else if (!xmlStrcmp(key, (xmlChar*) "right"))
       {
-        xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
-        data.action = (char*) calloc(xmlStrlen(key)+1, sizeof(char));
-        strcpy(data.action, (char*) key);
-        xmlFree(key);
-      } else if (!xmlStrcmp(node->name, (const xmlChar*) "size"))
+        dir = MoveAIAction::Direction::Right;
+      } else if (!xmlStrcmp(key, (xmlChar*) "up"))
       {
-        xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
-        data.hasPhysics = true;
-        sscanf((char*) key, "%d,%d", &data.width, &data.height);
-        xmlFree(key);
+        dir = MoveAIAction::Direction::Up;
+      } else if (!xmlStrcmp(key, (xmlChar*) "down"))
+      {
+        dir = MoveAIAction::Direction::Down;
+      } else {
+        exit(2);
+      }
+      xmlFree(key);
+      
+      key = xmlGetProp(aiNode, (xmlChar*) "length");
+      if (key != 0)
+      {
+        len = atoi((char*) key);
+      } else {
+        key = xmlGetProp(aiNode, (xmlChar*) "length-var");
+        if (key == 0) exit(2);
+        std::string varName = (char*) key;
+        len = items.at(varName);
+      }
+      xmlFree(key);
+      
+      key = xmlGetProp(aiNode, (xmlChar*) "speed");
+      if (key != 0)
+      {
+        speed = atoi((char*) key);
+      } else {
+        key = xmlGetProp(aiNode, (xmlChar*) "speed-var");
+        if (key == 0) exit(2);
+        std::string varName = (char*) key;
+        speed = items.at(varName);
+      }
+      xmlFree(key);
+      
+      ai.addAction(std::make_shared<MoveAIAction>(dir, len, speed));
+    } else if (!xmlStrcmp(aiNode->name, (xmlChar*) "switch"))
+    {
+      key = xmlGetProp(aiNode, (xmlChar*) "item");
+      if (key == 0) exit(2);
+      std::string switchItem = (char*) key;
+      xmlFree(key);
+      
+      for (xmlNodePtr switchNode = aiNode->xmlChildrenNode; switchNode != NULL; switchNode = switchNode->next)
+      {
+        if (!xmlStrcmp(switchNode->name, (xmlChar*) "case"))
+        {
+          key = xmlGetProp(switchNode, (xmlChar*) "value");
+          if (key == 0) exit(2);
+          int caseValue = atoi((char*) key);
+          xmlFree(key);
+          
+          if (items.at(switchItem) == caseValue)
+          {
+            parseEntityAIData(ai, switchNode, items);
+          }
+        }
       }
     }
-  
-    xmlFreeDoc(doc);
-    
-    factories[name] = data;
   }
-  
-  auto entity = std::make_shared<Entity>();
-  
-  if (data.sprite)
+}
+
+std::shared_ptr<Entity> EntityFactory::createNamedEntity(const std::string name, const std::map<std::string, int>& items)
+{
+  xmlDocPtr doc = xmlParseFile("res/entities.xml");
+  if (doc == nullptr)
   {
-    auto component = std::make_shared<StaticImageComponent>(data.sprite);
-    entity->addComponent(component);
+    fprintf(stderr, "Error reading entities\n");
+    exit(-1);
   }
-  
-  if (data.action)
+
+  xmlNodePtr top = xmlDocGetRootElement(doc);
+  if (top == nullptr)
   {
-    if (!strcmp(data.action, "save"))
-    {
-      auto component = std::make_shared<SimpleColliderComponent>([&] (Game& game, Entity&) {
-        playSound("res/Pickup_Coin23.wav", 0.25);
-  
-        game.saveGame();
-      });
-      entity->addComponent(component);
-    }
+    fprintf(stderr, "Empty entities file\n");
+    exit(-1);
+  }
+
+  if (xmlStrcmp(top->name, (const xmlChar*) "entities"))
+  {
+    fprintf(stderr, "Invalid entities definition\n");
+    exit(-1);
   }
   
-  if (data.hasPhysics)
+  auto entity = std::make_shared<Entity>();
+
+  xmlChar* key;
+  for (xmlNodePtr node = top->xmlChildrenNode; node != NULL; node = node->next)
   {
-    auto component = std::make_shared<PhysicsBodyComponent>();
-    entity->addComponent(component);
-    
-    entity->size = std::make_pair(data.width, data.height);
+    if (!xmlStrcmp(node->name, (xmlChar*) "entity"))
+    {
+      key = xmlGetProp(node, (xmlChar*) "id");
+      if (key == 0) exit(-1);
+      std::string entityID = (char*) key;
+      xmlFree(key);
+      
+      if (entityID == name)
+      {
+        key = xmlGetProp(node, (xmlChar*) "sprite");
+        if (key == 0) exit(-1);
+        auto spriteComponent = std::make_shared<StaticImageComponent>((char*) key);
+        entity->addComponent(spriteComponent);
+        xmlFree(key);
+        
+        auto physicsComponent = std::make_shared<PhysicsBodyComponent>();
+        entity->addComponent(physicsComponent);
+      
+        key = xmlGetProp(node, (xmlChar*) "width");
+        if (key == 0) exit(-1);
+        entity->size.first = atoi((char*) key);
+        xmlFree(key);
+      
+        key = xmlGetProp(node, (xmlChar*) "height");
+        if (key == 0) exit(-1);
+        entity->size.second = atoi((char*) key);
+        xmlFree(key);
+        
+        bool addAI = false;
+        auto aiComponent = std::make_shared<AIComponent>();
+        
+        for (xmlNodePtr entityNode = node->xmlChildrenNode; entityNode != NULL; entityNode = entityNode->next)
+        {
+          if (!xmlStrcmp(entityNode->name, (xmlChar*) "ai"))
+          {
+            addAI = true;
+            
+            xmlChar* chanceKey = xmlGetProp(entityNode, (xmlChar*) "chance");
+            if (chanceKey == 0) exit(2);
+            int chance = atoi((char*) chanceKey);
+            xmlFree(chanceKey);
+            
+            AI& ai = aiComponent->emplaceAI(chance);
+            parseEntityAIData(ai, entityNode, items);
+          }
+        }
+        
+        if (addAI)
+        {
+          entity->addComponent(aiComponent);
+        }
+        
+        break;
+      }
+    }
   }
+
+  xmlFreeDoc(doc);
   
   return entity;
 }
@@ -2,13 +2,14 @@
 #define ENTITYFACTORY_H
 
 #include <string>
+#include <map>
 
 class Entity;
 class Map;
 
 class EntityFactory {
   public:
-    static std::shared_ptr<Entity> createNamedEntity(const std::string name);
+    static std::shared_ptr<Entity> createNamedEntity(const std::string name, const std::map<std::string, int>& items);
 };
 
 #endif
@@ -69,7 +69,7 @@ void Map::createEntities(std::list<std::shared_ptr<Entity>>& entities) const
 {
   for (auto data : this->entities)
   {
-    auto entity = EntityFactory::createNamedEntity(data.name);
+    auto entity = EntityFactory::createNamedEntity(data.name, data.items);
     entity->position = data.position;
     
     entities.push_back(entity);
@@ -34,6 +34,7 @@ class Map {
     struct EntityData {
       std::string name;
       std::pair<int, int> position;
+      std::map<std::string, int> items;
     };
     
     struct Adjacent {
@@ -57,7 +57,7 @@ World::World(const char* filename)
       {
         if (!xmlStrcmp(mapNode->name, (const xmlChar*) "environment"))
         {
-          xmlChar* key = xmlNodeListGetString(doc, mapNode->xmlChildrenNode, 1);
+          xmlChar* key = xmlNodeGetContent(mapNode);
           int* mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int));
           mapdata[0] = atoi(strtok((char*) key, ",\n"));
           for (int i=1; i<(MAP_WIDTH*MAP_HEIGHT); i++)
@@ -85,6 +85,22 @@ World::World(const char* filename)
           data.position.second = atoi((char*) yKey);
           xmlFree(yKey);
           
+          for (xmlNodePtr entityNode = mapNode->xmlChildrenNode; entityNode != NULL; entityNode = entityNode->next)
+          {
+            if (!xmlStrcmp(entityNode->name, (xmlChar*) "item"))
+            {
+              xmlChar* itemIdKey = xmlGetProp(entityNode, (const xmlChar*) "id");
+              if (itemIdKey == 0) exit(2);
+              std::string itemId = (char*) itemIdKey;
+              xmlFree(itemIdKey);
+              
+              xmlChar* itemIdVal = xmlNodeGetContent(entityNode);
+              if (itemIdVal == 0) exit(2);
+              data.items[itemId] = atoi((char*) itemIdVal);
+              xmlFree(itemIdVal);
+            }
+          }
+          
           map.addEntity(data);
         } else if (!xmlStrcmp(mapNode->name, (const xmlChar*) "adjacent"))
         {