Skip to content

Commit 7aad1bf

Browse files
pandinocoderpandinocoder
committed
correct ItemEventTrigger enum name
1 parent d0a76e3 commit 7aad1bf

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

Framework/Intersect.Framework.Core/GameObjects/Events/ItemEventTriggers.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Events/ItemEventTrigger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Intersect.GameObjects.Events;
22

3-
public enum ItemEventTriggers
3+
public enum ItemEventTrigger
44
{
55
OnPickup = 0,
66
OnDrop,

‎Framework/Intersect.Framework.Core/GameObjects/ItemBase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,10 @@ public string EffectsJson
337337
public string EventTriggersJson
338338
{
339339
get => JsonConvert.SerializeObject(EventTriggers);
340-
set => EventTriggers = JsonConvert.DeserializeObject<Dictionary<ItemEventTriggers, Guid>>(value ?? string.Empty) ?? new Dictionary<ItemEventTriggers, Guid>();
340+
set => EventTriggers = JsonConvert.DeserializeObject<Dictionary<ItemEventTrigger, Guid>>(value ?? string.Empty) ?? new Dictionary<ItemEventTrigger, Guid>();
341341
}
342342

343-
public EventBase? GetEventTrigger(ItemEventTriggers eventTrigger)
343+
public EventBase? GetEventTrigger(ItemEventTrigger eventTrigger)
344344
{
345345
if (!EventTriggers.TryGetValue(eventTrigger, out var trigger))
346346
{
@@ -351,7 +351,7 @@ public string EventTriggersJson
351351
}
352352

353353
[NotMapped, JsonIgnore]
354-
public Dictionary<ItemEventTriggers, Guid> EventTriggers { get; set; } = new();
354+
public Dictionary<ItemEventTrigger, Guid> EventTriggers { get; set; } = new();
355355

356356
public bool TryGetRangeFor(Stat stat, [NotNullWhen(true)] out ItemRange? range)
357357
{

‎Intersect.Editor/Forms/Editors/frmItem.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,9 @@ private void PopulateEventTriggerList(int lastIndex = -1)
556556
lstEventTriggers.SelectedIndex = -1;
557557

558558
// Some event triggers aren't valid for some item types - setup filters here
559-
var invalidNonEquipOperations = new List<ItemEventTriggers>() { ItemEventTriggers.OnEquip, ItemEventTriggers.OnUnequip, ItemEventTriggers.OnHit, ItemEventTriggers.OnDamageReceived };
559+
var invalidNonEquipOperations = new List<ItemEventTrigger>() { ItemEventTrigger.OnEquip, ItemEventTrigger.OnUnequip, ItemEventTrigger.OnHit, ItemEventTrigger.OnDamageReceived };
560560

561-
var invalidEventOperations = new List<ItemEventTriggers>() { ItemEventTriggers.OnUse };
561+
var invalidEventOperations = new List<ItemEventTrigger>() { ItemEventTrigger.OnUse };
562562
invalidEventOperations.AddRange(invalidNonEquipOperations);
563563

564564
foreach (var triggerMapping in Strings.ItemEditor.EventTriggerSelections)
@@ -1425,9 +1425,9 @@ private Stat? SelectedStatRange
14251425
get => Enum.IsDefined((Stat)lstStatRanges.SelectedIndex) ? (Stat)(lstStatRanges.SelectedIndex) : null;
14261426
}
14271427

1428-
private ItemEventTriggers? SelectedEventTrigger
1428+
private ItemEventTrigger? SelectedEventTrigger
14291429
{
1430-
get => Enum.IsDefined((ItemEventTriggers)lstEventTriggers.SelectedIndex) ? (ItemEventTriggers)(lstEventTriggers.SelectedIndex) : null;
1430+
get => Enum.IsDefined((ItemEventTrigger)lstEventTriggers.SelectedIndex) ? (ItemEventTrigger)(lstEventTriggers.SelectedIndex) : null;
14311431
}
14321432

14331433
private void lstBonusEffects_SelectedIndexChanged(object sender, EventArgs e)

‎Intersect.Editor/Localization/Strings.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3792,26 +3792,26 @@ public partial struct ItemEditor
37923792
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
37933793
public static LocalizedString EventGroupLabel = @"Event";
37943794

3795-
public static Dictionary<ItemEventTriggers, LocalizedString> EventTriggerNames = new Dictionary<ItemEventTriggers, LocalizedString>
3795+
public static Dictionary<ItemEventTrigger, LocalizedString> EventTriggerNames = new Dictionary<ItemEventTrigger, LocalizedString>
37963796
{
3797-
{ItemEventTriggers.OnPickup, @"On Pickup"},
3798-
{ItemEventTriggers.OnDrop, @"On Drop"},
3799-
{ItemEventTriggers.OnUse, @"On Use"},
3800-
{ItemEventTriggers.OnEquip, @"On Equip"},
3801-
{ItemEventTriggers.OnUnequip, @"On Unequip"},
3802-
{ItemEventTriggers.OnHit, @"On Hit"},
3803-
{ItemEventTriggers.OnDamageReceived, @"On Damage Received"},
3797+
{ItemEventTrigger.OnPickup, @"On Pickup"},
3798+
{ItemEventTrigger.OnDrop, @"On Drop"},
3799+
{ItemEventTrigger.OnUse, @"On Use"},
3800+
{ItemEventTrigger.OnEquip, @"On Equip"},
3801+
{ItemEventTrigger.OnUnequip, @"On Unequip"},
3802+
{ItemEventTrigger.OnHit, @"On Hit"},
3803+
{ItemEventTrigger.OnDamageReceived, @"On Damage Received"},
38043804
};
38053805

3806-
public static Dictionary<ItemEventTriggers, LocalizedString> EventTriggerSelections = new Dictionary<ItemEventTriggers, LocalizedString>
3806+
public static Dictionary<ItemEventTrigger, LocalizedString> EventTriggerSelections = new Dictionary<ItemEventTrigger, LocalizedString>
38073807
{
3808-
{ItemEventTriggers.OnPickup, @"On Pickup: {00}"},
3809-
{ItemEventTriggers.OnDrop, @"On Drop: {00}"},
3810-
{ItemEventTriggers.OnUse, @"On Use: {00}"},
3811-
{ItemEventTriggers.OnEquip, @"On Equip: {00}"},
3812-
{ItemEventTriggers.OnUnequip, @"On Unequip: {00}"},
3813-
{ItemEventTriggers.OnHit, @"On Hit: {00}"},
3814-
{ItemEventTriggers.OnDamageReceived, @"On Damage Received: {00}"},
3808+
{ItemEventTrigger.OnPickup, @"On Pickup: {00}"},
3809+
{ItemEventTrigger.OnDrop, @"On Drop: {00}"},
3810+
{ItemEventTrigger.OnUse, @"On Use: {00}"},
3811+
{ItemEventTrigger.OnEquip, @"On Equip: {00}"},
3812+
{ItemEventTrigger.OnUnequip, @"On Unequip: {00}"},
3813+
{ItemEventTrigger.OnHit, @"On Hit: {00}"},
3814+
{ItemEventTrigger.OnDamageReceived, @"On Damage Received: {00}"},
38153815
};
38163816

38173817
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]

‎Intersect.Server.Core/Entities/Player.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ protected override void CheckForOnhitAttack(Entity enemy, bool isAutoAttack)
16431643
{
16441644
if (isAutoAttack)
16451645
{
1646-
EnqueueStartCommonEvent(LastAttackingWeapon?.GetEventTrigger(ItemEventTriggers.OnHit));
1646+
EnqueueStartCommonEvent(LastAttackingWeapon?.GetEventTrigger(ItemEventTrigger.OnHit));
16471647
foreach (var trigger in CachedEquipmentOnHitTriggers)
16481648
{
16491649
EnqueueStartCommonEvent(trigger);
@@ -2962,7 +2962,7 @@ public bool TryGiveItem(Item item, ItemHandling handler = ItemHandling.Normal, b
29622962
if (success)
29632963
{
29642964
// Start common events related to inventory changes.
2965-
EnqueueStartCommonEvent(item.Descriptor?.GetEventTrigger(ItemEventTriggers.OnPickup));
2965+
EnqueueStartCommonEvent(item.Descriptor?.GetEventTrigger(ItemEventTrigger.OnPickup));
29662966
StartCommonEventsWithTrigger(CommonEventTrigger.InventoryChanged);
29672967
UnequipInvalidItems();
29682968

@@ -3310,7 +3310,7 @@ public bool TryDropItemFrom(int slotIndex, int amount)
33103310
EquipmentProcessItemLoss(slotIndex);
33113311
}
33123312

3313-
EnqueueStartCommonEvent(itemDescriptor.GetEventTrigger(ItemEventTriggers.OnDrop));
3313+
EnqueueStartCommonEvent(itemDescriptor.GetEventTrigger(ItemEventTrigger.OnDrop));
33143314
UnequipInvalidItems();
33153315
StartCommonEventsWithTrigger(CommonEventTrigger.InventoryChanged);
33163316
UpdateGatherItemQuests(itemDescriptor.Id);
@@ -3411,7 +3411,7 @@ public void UseItem(int slot, Entity target = null)
34113411
return;
34123412
}
34133413

3414-
var useEvent = itemBase.GetEventTrigger(ItemEventTriggers.OnUse);
3414+
var useEvent = itemBase.GetEventTrigger(ItemEventTrigger.OnUse);
34153415

34163416
switch (itemBase.ItemType)
34173417
{
@@ -5970,7 +5970,7 @@ public void EquipItem(ItemBase itemBase, int slot = -1, bool updateCooldown = fa
59705970
}
59715971
}
59725972

5973-
EnqueueStartCommonEvent(itemBase.GetEventTrigger(ItemEventTriggers.OnEquip));
5973+
EnqueueStartCommonEvent(itemBase.GetEventTrigger(ItemEventTrigger.OnEquip));
59745974

59755975
ProcessEquipmentUpdated(true);
59765976
}
@@ -6004,7 +6004,7 @@ public void UnequipItem(int equipmentSlot, bool sendUpdate = true)
60046004

60056005
if (TryGetEquippedItem(equipmentSlot, out var prevEquipped))
60066006
{
6007-
EnqueueStartCommonEvent(prevEquipped.Descriptor?.GetEventTrigger(ItemEventTriggers.OnUnequip));
6007+
EnqueueStartCommonEvent(prevEquipped.Descriptor?.GetEventTrigger(ItemEventTrigger.OnUnequip));
60086008
}
60096009

60106010
Equipment[equipmentSlot] = -1;
@@ -6047,8 +6047,8 @@ public void CacheEquipmentTriggers()
60476047
continue;
60486048
}
60496049

6050-
var onHit = equippedItem.Descriptor.GetEventTrigger(ItemEventTriggers.OnHit);
6051-
var onDamaged = equippedItem.Descriptor.GetEventTrigger(ItemEventTriggers.OnDamageReceived);
6050+
var onHit = equippedItem.Descriptor.GetEventTrigger(ItemEventTrigger.OnHit);
6051+
var onDamaged = equippedItem.Descriptor.GetEventTrigger(ItemEventTrigger.OnDamageReceived);
60526052

60536053
// We have special logic for handling weapons, so the player can't hot-swap their weapon and get a different on-hit event to proc
60546054
// As a result, don't cache them, instead use property "LastAttackingWeapon"

0 commit comments

Comments
 (0)