Core: Adds region check for Ionis and corrects conquest latent error …

…message
LandSandBoat · Aug 16, 2024 · 407c8af · 407c8af
1 parent c45e9a8
commit 407c8af
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/map/conquest_data.cpp b/src/map/conquest_data.cpp
@@ -90,7 +90,12 @@ uint8 ConquestData::getRegionOwner(REGION_TYPE region) const
         return regionControls[regionNum].current;
     }
 
-    ShowError(fmt::format("Invalid conquest region passed to function ({})", regionNum));
+    // This can be called for Latent effects that work outside of conquest areas eg. Dynamis/Limbus
+    if (regionNum > (uint8)REGION_TYPE::LIMBUS)
+    {
+        ShowError(fmt::format("Invalid conquest region passed to function ({})", regionNum));
+    }
+
     return 0;
 }
 

diff --git a/src/map/entities/mobentity.cpp b/src/map/entities/mobentity.cpp
@@ -997,6 +997,7 @@ void CMobEntity::DropItems(CCharEntity* PChar)
         if (m_Element > 0)
         {
             REGION_TYPE regionID = PChar->loc.zone->GetRegionID();
+
             switch (regionID)
             {
                 // Sanction Regions
@@ -1006,6 +1007,7 @@ void CMobEntity::DropItems(CCharEntity* PChar)
                 case REGION_TYPE::ARRAPAGO:
                     effect = 2;
                     break;
+
                 // Sigil Regions
                 case REGION_TYPE::RONFAURE_FRONT:
                 case REGION_TYPE::NORVALLEN_FRONT:
@@ -1017,9 +1019,16 @@ void CMobEntity::DropItems(CCharEntity* PChar)
                 case REGION_TYPE::VALDEAUNIA_FRONT:
                     effect = 3;
                     break;
+
+                // Ionis Regions
+                case REGION_TYPE::ADOULIN_ISLANDS:
+                case REGION_TYPE::EAST_ULBUKA:
+                    effect = 4;
+                    break;
+
                 // Signet Regions
                 default:
-                    effect = (conquest::GetRegionOwner(PChar->loc.zone->GetRegionID()) <= 2) ? 1 : 0;
+                    effect = (regionID < REGION_TYPE::TAVNAZIA && conquest::GetRegionOwner(regionID) <= 2) ? 1 : 0;
                     break;
             }
         }
@@ -1050,6 +1059,13 @@ void CMobEntity::DropItems(CCharEntity* PChar)
                         crystalRolls++;
                     }
                     break;
+                case 4:
+                    if (PMember->StatusEffectContainer->HasStatusEffect(EFFECT_IONIS) && PMember->getZone() == getZone() &&
+                        distance(PMember->loc.p, loc.p) < 100)
+                    {
+                        crystalRolls++;
+                    }
+                    break;
                 default:
                     break;
             }