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

Core/Loot: Fix conditional Master Loot

Browse Source
This commit is contained in:
hondacrx
2017-12-11 11:01:38 -05:00
parent 02047abe60
commit 74950e0d66
3 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Item/Item.cs
+1 -1
View File
@@ -1915,7 +1915,7 @@ namespace Game.Entities
// If container item is in a bag, add that player as an allowed looter // If container item is in a bag, add that player as an allowed looter
if (GetBagSlot() != 0) if (GetBagSlot() != 0)
loot_item.allowedGUIDs.Add(GetOwner().GetGUID()); loot_item.AddAllowedLooter(GetOwner());
// Finally add the LootItem to the container // Finally add the LootItem to the container
loot.items.Add(loot_item); loot.items.Add(loot_item);
Source/Game/Entities/Player/Player.Items.cs
+3 -3
View File
@@ -5975,9 +5975,9 @@ namespace Game.Entities
public void SetLootGUID(ObjectGuid guid) { SetGuidValue(PlayerFields.LootTargetGuid, guid); } public void SetLootGUID(ObjectGuid guid) { SetGuidValue(PlayerFields.LootTargetGuid, guid); }
public void StoreLootItem(byte lootSlot, Loot loot, AELootResult aeResult = null) public void StoreLootItem(byte lootSlot, Loot loot, AELootResult aeResult = null)
{ {
QuestItem qitem = null; NotNormalLootItem qitem = null;
QuestItem ffaitem = null; NotNormalLootItem ffaitem = null;
QuestItem conditem = null; NotNormalLootItem conditem = null;
LootItem item = loot.LootItemInSlot(lootSlot, this, out qitem, out ffaitem, out conditem); LootItem item = loot.LootItemInSlot(lootSlot, this, out qitem, out ffaitem, out conditem);
if (item == null) if (item == null)
Source/Game/Loot/Loot.cs
+42 -48
View File
@@ -106,18 +106,18 @@ namespace Game.Loots
public bool canSave; public bool canSave;
} }
public class QuestItem public class NotNormalLootItem
{ {
public byte index; // position in quest_items; public byte index; // position in quest_items or items;
public bool is_looted; public bool is_looted;
public QuestItem() public NotNormalLootItem()
{ {
index = 0; index = 0;
is_looted = false; is_looted = false;
} }
public QuestItem(byte _index, bool _islooted = false) public NotNormalLootItem(byte _index, bool _islooted = false)
{ {
index = _index; index = _index;
is_looted = _islooted; is_looted = _islooted;
@@ -294,16 +294,16 @@ namespace Game.Loots
} }
} }
List<QuestItem> FillFFALoot(Player player) List<NotNormalLootItem> FillFFALoot(Player player)
{ {
List<QuestItem> ql = new List<QuestItem>(); List<NotNormalLootItem> ql = new List<NotNormalLootItem>();
for (byte i = 0; i < items.Count; ++i) for (byte i = 0; i < items.Count; ++i)
{ {
LootItem item = items[i]; LootItem item = items[i];
if (!item.is_looted && item.freeforall && item.AllowedForPlayer(player)) if (!item.is_looted && item.freeforall && item.AllowedForPlayer(player))
{ {
ql.Add(new QuestItem(i)); ql.Add(new NotNormalLootItem(i));
++unlootedCount; ++unlootedCount;
} }
} }
@@ -315,12 +315,12 @@ namespace Game.Loots
return ql; return ql;
} }
List<QuestItem> FillQuestLoot(Player player) List<NotNormalLootItem> FillQuestLoot(Player player)
{ {
if (items.Count == SharedConst.MaxNRLootItems) if (items.Count == SharedConst.MaxNRLootItems)
return null; return null;
List<QuestItem> ql = new List<QuestItem>(); List<NotNormalLootItem> ql = new List<NotNormalLootItem>();
for (byte i = 0; i < quest_items.Count; ++i) for (byte i = 0; i < quest_items.Count; ++i)
{ {
@@ -329,7 +329,7 @@ namespace Game.Loots
if (!item.is_looted && (item.AllowedForPlayer(player) || (item.follow_loot_rules && player.GetGroup() && ((player.GetGroup().GetLootMethod() == LootMethod.MasterLoot if (!item.is_looted && (item.AllowedForPlayer(player) || (item.follow_loot_rules && player.GetGroup() && ((player.GetGroup().GetLootMethod() == LootMethod.MasterLoot
&& player.GetGroup().GetMasterLooterGuid() == player.GetGUID()) || player.GetGroup().GetLootMethod() != LootMethod.MasterLoot)))) && player.GetGroup().GetMasterLooterGuid() == player.GetGUID()) || player.GetGroup().GetLootMethod() != LootMethod.MasterLoot))))
{ {
ql.Add(new QuestItem(i)); ql.Add(new NotNormalLootItem(i));
// quest items get blocked when they first appear in a // quest items get blocked when they first appear in a
// player's quest vector // player's quest vector
@@ -351,21 +351,20 @@ namespace Game.Loots
return ql; return ql;
} }
List<QuestItem> FillNonQuestNonFFAConditionalLoot(Player player, bool presentAtLooting) List<NotNormalLootItem> FillNonQuestNonFFAConditionalLoot(Player player, bool presentAtLooting)
{ {
List<QuestItem> ql = new List<QuestItem>(); List<NotNormalLootItem> ql = new List<NotNormalLootItem>();
for (byte i = 0; i < items.Count; ++i) for (byte i = 0; i < items.Count; ++i)
{ {
LootItem item = items[i]; LootItem item = items[i];
if (!item.is_looted && !item.freeforall && (item.AllowedForPlayer(player) || (item.follow_loot_rules && player.GetGroup() != null if (!item.is_looted && !item.freeforall && item.AllowedForPlayer(player))
&& ((player.GetGroup().GetLootMethod() == LootMethod.MasterLoot && player.GetGroup().GetLooterGuid() == player.GetGUID()) || player.GetGroup().GetLootMethod() != LootMethod.MasterLoot))))
{ {
if (presentAtLooting) if (presentAtLooting)
item.AddAllowedLooter(player); item.AddAllowedLooter(player);
if (!item.conditions.Empty()) if (!item.conditions.Empty())
{ {
ql.Add(new QuestItem(i)); ql.Add(new NotNormalLootItem(i));
if (!item.is_counted) if (!item.is_counted)
{ {
++unlootedCount; ++unlootedCount;
@@ -478,10 +477,10 @@ namespace Game.Loots
public LootItem LootItemInSlot(uint lootSlot, Player player) public LootItem LootItemInSlot(uint lootSlot, Player player)
{ {
QuestItem qitem, ffaitem, conditem; NotNormalLootItem qitem, ffaitem, conditem;
return LootItemInSlot(lootSlot, player, out qitem, out ffaitem, out conditem); return LootItemInSlot(lootSlot, player, out qitem, out ffaitem, out conditem);
} }
public LootItem LootItemInSlot(uint lootSlot, Player player, out QuestItem qitem, out QuestItem ffaitem, out QuestItem conditem) public LootItem LootItemInSlot(uint lootSlot, Player player, out NotNormalLootItem qitem, out NotNormalLootItem ffaitem, out NotNormalLootItem conditem)
{ {
qitem = null; qitem = null;
ffaitem = null; ffaitem = null;
@@ -495,7 +494,7 @@ namespace Game.Loots
var questItems = PlayerQuestItems.LookupByKey(player.GetGUID()); var questItems = PlayerQuestItems.LookupByKey(player.GetGUID());
if (!questItems.Empty()) if (!questItems.Empty())
{ {
QuestItem qitem2 = questItems.Find(p => p.index == questSlot); NotNormalLootItem qitem2 = questItems.Find(p => p.index == questSlot);
if (qitem2 != null) if (qitem2 != null)
{ {
qitem = qitem2; qitem = qitem2;
@@ -517,7 +516,7 @@ namespace Game.Loots
{ {
if (c.index == lootSlot) if (c.index == lootSlot)
{ {
QuestItem ffaitem2 = c; NotNormalLootItem ffaitem2 = c;
ffaitem = ffaitem2; ffaitem = ffaitem2;
is_looted = ffaitem2.is_looted; is_looted = ffaitem2.is_looted;
break; break;
@@ -534,7 +533,7 @@ namespace Game.Loots
{ {
if (iter.index == lootSlot) if (iter.index == lootSlot)
{ {
QuestItem conditem2 = iter; NotNormalLootItem conditem2 = iter;
conditem = conditem2; conditem = conditem2;
is_looted = conditem2.is_looted; is_looted = conditem2.is_looted;
break; break;
@@ -716,7 +715,7 @@ namespace Game.Loots
{ {
for (var i = 0; i < q_list.Count; ++i) for (var i = 0; i < q_list.Count; ++i)
{ {
QuestItem qi = q_list[i]; NotNormalLootItem qi = q_list[i];
LootItem item = quest_items[qi.index]; LootItem item = quest_items[qi.index];
if (!qi.is_looted && !item.is_looted) if (!qi.is_looted && !item.is_looted)
{ {
@@ -725,29 +724,24 @@ namespace Game.Loots
lootItem.Quantity = item.count; lootItem.Quantity = item.count;
lootItem.Loot = new ItemInstance(item); lootItem.Loot = new ItemInstance(item);
if (item.follow_loot_rules) switch (permission)
{ {
switch (permission) case PermissionTypes.Master:
{ lootItem.UIType = LootSlotType.Master;
case PermissionTypes.Master: break;
lootItem.UIType = LootSlotType.Master; case PermissionTypes.Restricted:
break; lootItem.UIType = item.is_blocked ? LootSlotType.Locked : LootSlotType.AllowLoot;
case PermissionTypes.Restricted: break;
lootItem.UIType = item.is_blocked ? LootSlotType.Locked : LootSlotType.AllowLoot; case PermissionTypes.Group:
break; if (!item.is_blocked)
case PermissionTypes.Group: lootItem.UIType = LootSlotType.AllowLoot;
if (!item.is_blocked) else
lootItem.UIType = LootSlotType.AllowLoot; lootItem.UIType = LootSlotType.RollOngoing;
else break;
lootItem.UIType = LootSlotType.RollOngoing; default:
break; lootItem.UIType = slotType;
default: break;
lootItem.UIType = slotType;
break;
}
} }
else
lootItem.UIType = slotType;
packet.Items.Add(lootItem); packet.Items.Add(lootItem);
} }
@@ -849,9 +843,9 @@ namespace Game.Loots
public ObjectGuid GetGUID() { return _GUID; } public ObjectGuid GetGUID() { return _GUID; }
public void SetGUID(ObjectGuid guid) { _GUID = guid; } public void SetGUID(ObjectGuid guid) { _GUID = guid; }
public MultiMap<ObjectGuid, QuestItem> GetPlayerQuestItems() { return PlayerQuestItems; } public MultiMap<ObjectGuid, NotNormalLootItem> GetPlayerQuestItems() { return PlayerQuestItems; }
public MultiMap<ObjectGuid, QuestItem> GetPlayerFFAItems() { return PlayerFFAItems; } public MultiMap<ObjectGuid, NotNormalLootItem> GetPlayerFFAItems() { return PlayerFFAItems; }
public MultiMap<ObjectGuid, QuestItem> GetPlayerNonQuestNonFFAConditionalItems() { return PlayerNonQuestNonFFAConditionalItems; } public MultiMap<ObjectGuid, NotNormalLootItem> GetPlayerNonQuestNonFFAConditionalItems() { return PlayerNonQuestNonFFAConditionalItems; }
public List<LootItem> items = new List<LootItem>(); public List<LootItem> items = new List<LootItem>();
public List<LootItem> quest_items = new List<LootItem>(); public List<LootItem> quest_items = new List<LootItem>();
@@ -864,9 +858,9 @@ namespace Game.Loots
public ObjectGuid containerID; public ObjectGuid containerID;
List<ObjectGuid> PlayersLooting = new List<ObjectGuid>(); List<ObjectGuid> PlayersLooting = new List<ObjectGuid>();
MultiMap<ObjectGuid, QuestItem> PlayerQuestItems = new MultiMap<ObjectGuid, QuestItem>(); MultiMap<ObjectGuid, NotNormalLootItem> PlayerQuestItems = new MultiMap<ObjectGuid, NotNormalLootItem>();
MultiMap<ObjectGuid, QuestItem> PlayerFFAItems = new MultiMap<ObjectGuid, QuestItem>(); MultiMap<ObjectGuid, NotNormalLootItem> PlayerFFAItems = new MultiMap<ObjectGuid, NotNormalLootItem>();
MultiMap<ObjectGuid, QuestItem> PlayerNonQuestNonFFAConditionalItems = new MultiMap<ObjectGuid, QuestItem>(); MultiMap<ObjectGuid, NotNormalLootItem> PlayerNonQuestNonFFAConditionalItems = new MultiMap<ObjectGuid, NotNormalLootItem>();
// All rolls are registered here. They need to know, when the loot is not valid anymore // All rolls are registered here. They need to know, when the loot is not valid anymore
LootValidatorRefManager i_LootValidatorRefManager = new LootValidatorRefManager(); LootValidatorRefManager i_LootValidatorRefManager = new LootValidatorRefManager();