Merge pull request #419 from KnowOne134/charm

make all NMs not charmable
project-topaz · Mar 27, 2020 · 5991d15 · 5991d15
2 parents f4b1fbe + 33918de
commit 5991d15
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/map/instance_loader.cpp b/src/map/instance_loader.cpp
@@ -230,6 +230,14 @@ CInstance* CInstanceLoader::LoadInstance(CInstance* instance)
 
             PMob->setMobMod(MOBMOD_CHARMABLE, Sql_GetUIntData(SqlInstanceHandle, 65));
 
+            // Overwrite base family charmables depending on mob type. Disallowed mobs which should be charmable
+            // can be set in mob_spawn_mods or in their onInitialize
+            if (PMob->m_Type & MOBTYPE_EVENT || PMob->m_Type & MOBTYPE_FISHED || PMob->m_Type & MOBTYPE_BATTLEFIELD ||
+                PMob->m_Type & MOBTYPE_NOTORIOUS)
+            {
+                PMob->setMobMod(MOBMOD_CHARMABLE, 0);
+            }
+
             // must be here first to define mobmods
             mobutils::InitializeMob(PMob, zone);
             PMob->PInstance = instance;

diff --git a/src/map/utils/mobutils.cpp b/src/map/utils/mobutils.cpp
@@ -561,12 +561,6 @@ void CalculateStats(CMobEntity * PMob)
         PMob->ResetGilPurse();
     }
 
-    if(PMob->m_Type & MOBTYPE_EVENT || PMob->m_Type & MOBTYPE_FISHED || PMob->m_Type & MOBTYPE_BATTLEFIELD ||
-        zoneType == ZONETYPE_BATTLEFIELD || zoneType == ZONETYPE_DYNAMIS)
-    {
-        PMob->setMobMod(MOBMOD_CHARMABLE, 0);
-    }
-
     // Check for possible miss-setups
     if (PMob->getMobMod(MOBMOD_SPECIAL_SKILL) != 0 && PMob->getMobMod(MOBMOD_SPECIAL_COOL) == 0)
     {

diff --git a/src/map/utils/zoneutils.cpp b/src/map/utils/zoneutils.cpp
@@ -367,8 +367,9 @@ void LoadMOBList()
         while (Sql_NextRow(SqlHandle) == SQL_SUCCESS)
         {
             uint16 ZoneID = (uint16)Sql_GetUIntData(SqlHandle, 0);
+            ZONETYPE zoneType = GetZone(ZoneID)->GetType();
 
-            if (GetZone(ZoneID)->GetType() != ZONETYPE_DUNGEON_INSTANCED)
+            if (zoneType != ZONETYPE_DUNGEON_INSTANCED)
             {
                 CMobEntity* PMob = new CMobEntity;
 
@@ -493,6 +494,14 @@ void LoadMOBList()
 
                 PMob->setMobMod(MOBMOD_CHARMABLE, Sql_GetUIntData(SqlHandle, 67));
 
+                // Overwrite base family charmables depending on mob type. Disallowed mobs which should be charmable
+                // can be set in mob_spawn_mods or in their onInitialize
+                if (PMob->m_Type & MOBTYPE_EVENT || PMob->m_Type & MOBTYPE_FISHED || PMob->m_Type & MOBTYPE_BATTLEFIELD ||
+                    PMob->m_Type & MOBTYPE_NOTORIOUS || zoneType == ZONETYPE_BATTLEFIELD || zoneType == ZONETYPE_DYNAMIS)
+                {
+                    PMob->setMobMod(MOBMOD_CHARMABLE, 0);
+                }
+
                 // must be here first to define mobmods
                 mobutils::InitializeMob(PMob, GetZone(ZoneID));