2 files changed, 3 insertions, 80 deletions

diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 26ac28591..38ce44efe 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -98,52 +98,14 @@ void HomunculusDB::loadXmlFile(const std::string &fileName,
         BeingCommon::readWalkingAttributes(currentInfo,
             homunculusNode,
             0);
+        BeingCommon::readAiAttributes(currentInfo,
+            homunculusNode);
 
         currentInfo->setMaxHP(XML::getProperty(homunculusNode, "maxHP", 0));
 
         currentInfo->setDeadSortOffsetY(XML::getProperty(
             homunculusNode, "deadSortOffsetY", 31));
 
-        currentInfo->setStartFollowDist(XML::getProperty(homunculusNode,
-            "startFollowDistance", 3));
-        currentInfo->setFollowDist(XML::getProperty(homunculusNode,
-            "followDistance", 0));
-        currentInfo->setWarpDist(XML::getProperty(homunculusNode,
-            "warpDistance", 11));
-
-        currentInfo->setTargetOffsetX(XML::getProperty(homunculusNode,
-            "offsetX", 0));
-        currentInfo->setTargetOffsetY(XML::getProperty(homunculusNode,
-            "offsetY", 1));
-        currentInfo->setSitOffsetX(XML::getProperty(homunculusNode,
-            "sitOffsetX", 0));
-        currentInfo->setSitOffsetY(XML::getProperty(homunculusNode,
-            "sitOffsetY", 1));
-        currentInfo->setMoveOffsetX(XML::getProperty(homunculusNode,
-            "moveOffsetX", 0));
-        currentInfo->setMoveOffsetY(XML::getProperty(homunculusNode,
-            "moveOffsetY", 1));
-        currentInfo->setDeadOffsetX(XML::getProperty(homunculusNode,
-            "deadOffsetX", 0));
-        currentInfo->setDeadOffsetY(XML::getProperty(homunculusNode,
-            "deadOffsetY", 1));
-        currentInfo->setAttackOffsetX(XML::getProperty(homunculusNode,
-            "attackOffsetX", currentInfo->getTargetOffsetX()));
-        currentInfo->setAttackOffsetY(XML::getProperty(homunculusNode,
-            "attackOffsetY", currentInfo->getTargetOffsetY()));
-
-        currentInfo->setThinkTime(XML::getProperty(homunculusNode,
-            "thinkTime", 500) / 10);
-
-        currentInfo->setDirectionType(XML::getProperty(homunculusNode,
-            "directionType", 1));
-        currentInfo->setSitDirectionType(XML::getProperty(homunculusNode,
-            "sitDirectionType", 1));
-        currentInfo->setDeadDirectionType(XML::getProperty(homunculusNode,
-            "deadDirectionType", 1));
-        currentInfo->setAttackDirectionType(XML::getProperty(homunculusNode,
-            "attackDirectionType", 4));
-
         currentInfo->setColorsList(XML::getProperty(homunculusNode,
             "colors", ""));
 
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index bb582dc92..9e7ccf511 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -97,52 +97,13 @@ void MercenaryDB::loadXmlFile(const std::string &fileName,
         currentInfo->setBlockType(BlockType::NONE);
         BeingCommon::readBasicAttributes(currentInfo, mercenaryNode, "attack");
         BeingCommon::readWalkingAttributes(currentInfo, mercenaryNode, 0);
+        BeingCommon::readAiAttributes(currentInfo, mercenaryNode);
 
         currentInfo->setMaxHP(XML::getProperty(mercenaryNode, "maxHP", 0));
 
         currentInfo->setDeadSortOffsetY(XML::getProperty(
             mercenaryNode, "deadSortOffsetY", 31));
 
-        currentInfo->setStartFollowDist(XML::getProperty(mercenaryNode,
-            "startFollowDistance", 3));
-        currentInfo->setFollowDist(XML::getProperty(mercenaryNode,
-            "followDistance", 0));
-        currentInfo->setWarpDist(XML::getProperty(mercenaryNode,
-            "warpDistance", 11));
-
-        currentInfo->setTargetOffsetX(XML::getProperty(mercenaryNode,
-            "offsetX", 0));
-        currentInfo->setTargetOffsetY(XML::getProperty(mercenaryNode,
-            "offsetY", 1));
-        currentInfo->setSitOffsetX(XML::getProperty(mercenaryNode,
-            "sitOffsetX", 0));
-        currentInfo->setSitOffsetY(XML::getProperty(mercenaryNode,
-            "sitOffsetY", 1));
-        currentInfo->setMoveOffsetX(XML::getProperty(mercenaryNode,
-            "moveOffsetX", 0));
-        currentInfo->setMoveOffsetY(XML::getProperty(mercenaryNode,
-            "moveOffsetY", 1));
-        currentInfo->setDeadOffsetX(XML::getProperty(mercenaryNode,
-            "deadOffsetX", 0));
-        currentInfo->setDeadOffsetY(XML::getProperty(mercenaryNode,
-            "deadOffsetY", 1));
-        currentInfo->setAttackOffsetX(XML::getProperty(mercenaryNode,
-            "attackOffsetX", currentInfo->getTargetOffsetX()));
-        currentInfo->setAttackOffsetY(XML::getProperty(mercenaryNode,
-            "attackOffsetY", currentInfo->getTargetOffsetY()));
-
-        currentInfo->setThinkTime(XML::getProperty(mercenaryNode,
-            "thinkTime", 500) / 10);
-
-        currentInfo->setDirectionType(XML::getProperty(mercenaryNode,
-            "directionType", 1));
-        currentInfo->setSitDirectionType(XML::getProperty(mercenaryNode,
-            "sitDirectionType", 1));
-        currentInfo->setDeadDirectionType(XML::getProperty(mercenaryNode,
-            "deadDirectionType", 1));
-        currentInfo->setAttackDirectionType(XML::getProperty(mercenaryNode,
-            "attackDirectionType", 4));
-
         currentInfo->setColorsList(XML::getProperty(mercenaryNode,
             "colors", ""));