Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 13 additions & 24 deletions Main/EvaluateItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,10 @@ public void Update()

var packSize = 0;
var quantity = Entity.GetComponent<Quality>()?.ItemQuality ?? 0;
var settings = new MapNotifySettings();
// get and evaluate mods
var mapComponent = Entity.GetComponent<Map>() ?? null;
Tier = mapComponent?.Tier ?? -1;
NeedsPadding = Tier == -1 ? false : true;
// Map component no longer exists in ExileCore
Tier = -1;
NeedsPadding = false;
ZanaMissionType = ObjectiveType.None;
Bricked = false;
Corrupted = Entity.GetComponent<Base>()?.isCorrupted ?? false;
Expand Down Expand Up @@ -218,7 +217,8 @@ public void Update()
if (WarningDictionary.Where(x => mod.RawName.Contains(x.Key)).Any())
{
var warning = WarningDictionary.Where(x => mod.RawName.Contains(x.Key)).FirstOrDefault().Value;
if (warning.Bricking || settings.ShowQuantityPercent && quantity <= settings.MapQuantSetting || settings.ShowPackSizePercent && packSize <= settings.MapPackSetting)
// only mods flagged as bricking (";true" in the warnings config) brick a map
if (warning.Bricking)
{
Bricked = true;
}
Expand Down Expand Up @@ -302,26 +302,15 @@ void UpdateValueIfStatExists(string key, Action<int> updateAction)
!ClassID.Contains("MiscMapItem") &&
!ClassID.Contains("MapFragment"))
{
var area = mapComponent.Area;
// Map component no longer exists - using basic name extraction
var mapTrim = Entity.GetComponent<Base>().Name.Replace(" Map", "");
if (modsComponent.ItemRarity == ItemRarity.Unique)
{
// normal map at inner, 0x18, 0x18
var mapUnique = gameController.IngameState.M.Read<long>(mapComponent.Address + 0x10, 0x10, 0x20);
area = gameController.Files.WorldAreas.GetByAddress(mapUnique) ?? area;
mapTrim = area.Name;
}
MapName = $"[T{mapComponent.Tier}] {mapTrim}";


Bonus = ingameState.ServerData.BonusCompletedAreas.Contains(area) ? true : false;
Completed = ingameState.ServerData.CompletedAreas.Contains(area) ? true : false;
mavenDetails.MavenCompletion = ingameState.ServerData.MavenWitnessedAreas.Contains(area) ? true : false;

if (AreaRegion.TryGetValue(mapTrim, out var region))
MapRegion = region;
else
MapRegion = "Unknown Region";
MapName = mapTrim;
MapRegion = "Unknown Region";

// ServerData properties for completion tracking no longer exist
Bonus = false;
Completed = false;
mavenDetails.MavenCompletion = false;
}

if (Entity.Path.Contains("MavenMap"))
Expand Down
Loading