Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup Loot File

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b49a9b44af5ba8255d7427b34170ea9fd9546310)
Port From (https://github.com/TrinityCore/TrinityCore/commit/430321a80367be039c8dadfdb50ba950270bd720)
This commit is contained in:
Hondacrx
2024-09-26 17:48:13 -04:00
parent 1bdcc2fbb7
commit 902f562f0a
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Loot/LootManager.cs
+12 -24
View File
@@ -620,7 +620,7 @@ namespace Game.Loots
Log.outError(LogFilter.Sql, "Table '{0}' Entry {1} does not exist but it is used by {2} {3}", GetName(), lootId, GetEntryName(), ownerId); Log.outError(LogFilter.Sql, "Table '{0}' Entry {1} does not exist but it is used by {2} {3}", GetName(), lootId, GetEntryName(), ownerId);
} }
public bool HaveLootFor(uint loot_id) { return m_LootTemplates.LookupByKey(loot_id) != null; } public bool HaveLootFor(uint loot_id) { return m_LootTemplates.ContainsKey(loot_id); }
public bool HaveQuestLootFor(uint loot_id) public bool HaveQuestLootFor(uint loot_id)
{ {
var lootTemplate = m_LootTemplates.LookupByKey(loot_id); var lootTemplate = m_LootTemplates.LookupByKey(loot_id);
@@ -642,22 +642,12 @@ namespace Game.Loots
public LootTemplate GetLootFor(uint loot_id) public LootTemplate GetLootFor(uint loot_id)
{ {
var tab = m_LootTemplates.LookupByKey(loot_id); return m_LootTemplates.LookupByKey(loot_id);
if (tab == null)
return null;
return tab;
} }
public LootTemplate GetLootForConditionFill(uint loot_id) public LootTemplate GetLootForConditionFill(uint loot_id)
{ {
var tab = m_LootTemplates.LookupByKey(loot_id); return m_LootTemplates.LookupByKey(loot_id);
if (tab == null)
return null;
return tab;
} }
public string GetName() { return m_name; } public string GetName() { return m_name; }
@@ -687,12 +677,6 @@ namespace Game.Loots
byte mincount = result.Read<byte>(7); byte mincount = result.Read<byte>(7);
byte maxcount = result.Read<byte>(8); byte maxcount = result.Read<byte>(8);
if (groupid >= 1 << 7) // it stored in 7 bit field
{
Log.outError(LogFilter.Sql, "Table '{0}' entry {1} item {2}: group ({3}) must be less {4} - skipped", GetName(), entry, item, groupid, 1 << 7);
return 0;
}
LootStoreItem storeitem = new(item, reference, chance, needsquest, lootmode, groupid, mincount, maxcount); LootStoreItem storeitem = new(item, reference, chance, needsquest, lootmode, groupid, mincount, maxcount);
if (!storeitem.IsValid(this, entry)) // Validity checks if (!storeitem.IsValid(this, entry)) // Validity checks
@@ -701,7 +685,7 @@ namespace Game.Loots
// Looking for the template of the entry // Looking for the template of the entry
// often entries are put together // often entries are put together
if (m_LootTemplates.Empty() || !m_LootTemplates.ContainsKey(entry)) if (m_LootTemplates.Empty() || !m_LootTemplates.ContainsKey(entry))
m_LootTemplates.Add(entry, new LootTemplate()); m_LootTemplates.TryAdd(entry, new LootTemplate());
// Adds current row to the template // Adds current row to the template
m_LootTemplates[entry].AddEntry(storeitem); m_LootTemplates[entry].AddEntry(storeitem);
@@ -1196,9 +1180,14 @@ namespace Game.Loots
LootStoreItem Roll(ushort lootMode, Player personalLooter = null) LootStoreItem Roll(ushort lootMode, Player personalLooter = null)
{ {
LootStoreItemList possibleLoot = ExplicitlyChanced; LootStoreItemList getValidLoot(LootStoreItemList items, ushort lootMode, Player personalLooter)
possibleLoot.RemoveAll(new LootGroupInvalidSelector(lootMode, personalLooter).Check); {
LootStoreItemList possibleLoot = new(items);
possibleLoot.RemoveAll(new LootGroupInvalidSelector(lootMode, personalLooter).Check);
return possibleLoot;
}
var possibleLoot = getValidLoot(ExplicitlyChanced, lootMode, personalLooter);
if (!possibleLoot.Empty()) // First explicitly chanced entries are checked if (!possibleLoot.Empty()) // First explicitly chanced entries are checked
{ {
float roll = (float)RandomHelper.randChance(); float roll = (float)RandomHelper.randChance();
@@ -1214,8 +1203,7 @@ namespace Game.Loots
} }
} }
possibleLoot = EqualChanced; possibleLoot = getValidLoot(EqualChanced, lootMode, personalLooter);
possibleLoot.RemoveAll(new LootGroupInvalidSelector(lootMode, personalLooter).Check);
if (!possibleLoot.Empty()) // If nothing selected yet - an item is taken from equal-chanced part if (!possibleLoot.Empty()) // If nothing selected yet - an item is taken from equal-chanced part
return possibleLoot.SelectRandom(); return possibleLoot.SelectRandom();