diff --git a/NewWorldCompanion.Constants/EmguConstants.cs b/NewWorldCompanion.Constants/EmguConstants.cs index 363bc9b..aefe3ae 100644 --- a/NewWorldCompanion.Constants/EmguConstants.cs +++ b/NewWorldCompanion.Constants/EmguConstants.cs @@ -3,6 +3,8 @@ public class EmguConstants { // Shape detection + public const int Default1600900AreaLower = 4000; + public const int Default1600900AreaUpper = 7000; public const int Default19201080AreaLower = 6000; public const int Default19201080AreaUpper = 8000; public const int Default25601440AreaLower = 10000; diff --git a/NewWorldCompanion.Services/Data/CraftingRecipes.json b/NewWorldCompanion.Services/Data/CraftingRecipes.json index d6a5c4c..0663900 100644 --- a/NewWorldCompanion.Services/Data/CraftingRecipes.json +++ b/NewWorldCompanion.Services/Data/CraftingRecipes.json @@ -323369,7 +323369,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Weaponsmithing", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -323448,7 +323448,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Weaponsmithing", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -323527,7 +323527,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Weaponsmithing", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -323606,7 +323606,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Weaponsmithing", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -323685,7 +323685,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Weaponsmithing", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -323764,7 +323764,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Weaponsmithing", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -323843,7 +323843,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Weaponsmithing", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -323922,7 +323922,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Engineering", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -324001,7 +324001,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Engineering", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -324080,7 +324080,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Engineering", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "engineering5", "StationType2": "", "StationType3": "", @@ -324159,7 +324159,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Engineering", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "engineering5", "StationType2": "", "StationType3": "", @@ -324238,7 +324238,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Arcana", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "alchemy5", "StationType2": "", "StationType3": "", @@ -324317,7 +324317,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Arcana", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "alchemy5", "StationType2": "", "StationType3": "", @@ -324396,7 +324396,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Arcana", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "alchemy5", "StationType2": "", "StationType3": "", @@ -324475,7 +324475,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Arcana", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "alchemy5", "StationType2": "", "StationType3": "", @@ -324554,7 +324554,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Weaponsmithing", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "blacksmith5", "StationType2": "", "StationType3": "", @@ -324633,7 +324633,7 @@ "CraftingFee": 449, "UseCraftingTax": 1, "Tradeskill": "Engineering", - "RecipeLevel": 150, + "RecipeLevel": 0, "StationType1": "engineering5", "StationType2": "", "StationType3": "", @@ -388995,6 +388995,85 @@ "PerkCost": null, "GemSlotCost": null }, + { + "RecipeID": "CastInfused_GreatSword", + "FirstCraftAchievementId": "", + "RecipeNameOverride": "", + "CraftingCategory": "GypsumCasting", + "CraftingGroup": "InfusedCasts", + "AdditionalFilterText": "@Metal_CategoryName", + "RecipeTags": "", + "DisplayIngredients": "", + "bKnownByDefault": true, + "bListedByDefault": true, + "CraftAll": true, + "IsRefining": true, + "IsProcedural": false, + "MaxPerkItemsAllowed": null, + "PerkItemsBucketPush": null, + "ExpertiseBumpChanceOverride": null, + "IsExpertiseBasedGS": null, + "HWMProgressionID": "", + "IsTemporary": false, + "CraftingFee": 500, + "UseCraftingTax": 1, + "Tradeskill": "", + "RecipeLevel": 0, + "StationType1": "gypsumstation1", + "StationType2": "", + "StationType3": "", + "StationType4": "", + "CraftingTime": 1, + "OutputQty": 1, + "ItemID": "CastGypsum_GreatSword", + "SkipGrantItems": null, + "SkipGrantItemsDesc": "", + "SkipGrantItemsTitle": "", + "SkipGrantItemsBody": "", + "BaseGearScore": null, + "BaseTier": null, + "ProceduralTierID1": "", + "ProceduralTierID2": "", + "ProceduralTierID3": "", + "ProceduralTierID4": "", + "ProceduralTierID5": "", + "RequiredAchievementID": "", + "UnlockedAchievementID": "", + "UnlockedAchievementBlocksRecrafting": null, + "Ingredient1": "InfusedOrb", + "Type1": "Item", + "Ingredient2": "", + "Type2": "", + "Ingredient3": "", + "Type3": "", + "Ingredient4": "", + "Type4": "", + "Ingredient5": "", + "Type5": "", + "Ingredient6": "", + "Type6": "", + "Ingredient7": "", + "Type7": "", + "Qty1": 1, + "Qty2": null, + "Qty3": null, + "Qty4": null, + "Qty5": null, + "Qty6": null, + "Qty7": null, + "GameEventID": "", + "Game Event Validation": true, + "CooldownSeconds": 79200, + "CooldownQuantity": 1, + "GearScoreBonus": "", + "GearScoreReduction": "", + "BonusItemChance": null, + "BonusItemChanceIncrease": "", + "BonusItemChanceDecrease": "", + "AttributeCost": null, + "PerkCost": null, + "GemSlotCost": null + }, { "RecipeID": "CastInfused_Rapier", "FirstCraftAchievementId": "", @@ -407295,20 +407374,20 @@ "Type2": "Item", "Ingredient3": "GypsumOrb", "Type3": "Item", - "Ingredient4": "SapphireT4", + "Ingredient4": "SulfurT1", "Type4": "Item", "Ingredient5": "AzureVialT1", "Type5": "Item", - "Ingredient6": "SulfurT1", - "Type6": "Item", + "Ingredient6": "", + "Type6": "", "Ingredient7": "", "Type7": "", "Qty1": 1, "Qty2": 10, "Qty3": 10, - "Qty4": 20, + "Qty4": 30, "Qty5": 50, - "Qty6": 10, + "Qty6": null, "Qty7": null, "GameEventID": "Craft_StonecuttingT2", "Game Event Validation": true, @@ -407374,20 +407453,20 @@ "Type2": "Item", "Ingredient3": "GypsumOrb", "Type3": "Item", - "Ingredient4": "SapphireT4", + "Ingredient4": "SulfurT1", "Type4": "Item", "Ingredient5": "WritofAdventure", "Type5": "Item", - "Ingredient6": "SulfurT1", - "Type6": "Item", + "Ingredient6": "", + "Type6": "", "Ingredient7": "", "Type7": "", "Qty1": 1, "Qty2": 10, "Qty3": 10, - "Qty4": 20, + "Qty4": 30, "Qty5": 5, - "Qty6": 10, + "Qty6": null, "Qty7": null, "GameEventID": "Craft_StonecuttingT2", "Game Event Validation": true, @@ -407453,20 +407532,20 @@ "Type2": "Item", "Ingredient3": "GypsumOrb", "Type3": "Item", - "Ingredient4": "SapphireT4", + "Ingredient4": "SulfurT1", "Type4": "Item", "Ingredient5": "BreachDrop5", "Type5": "Item", - "Ingredient6": "SulfurT1", - "Type6": "Item", + "Ingredient6": "", + "Type6": "", "Ingredient7": "", "Type7": "", "Qty1": 1, "Qty2": 10, "Qty3": 10, - "Qty4": 20, + "Qty4": 30, "Qty5": 5, - "Qty6": 10, + "Qty6": null, "Qty7": null, "GameEventID": "Craft_StonecuttingT2", "Game Event Validation": true, diff --git a/NewWorldCompanion.Services/Data/MasterItemDefinitions_Common.json b/NewWorldCompanion.Services/Data/MasterItemDefinitions_Common.json index 36382b7..2372aac 100644 --- a/NewWorldCompanion.Services/Data/MasterItemDefinitions_Common.json +++ b/NewWorldCompanion.Services/Data/MasterItemDefinitions_Common.json @@ -10997,382 +10997,6 @@ "EventId": "", "AttributionId": "SummerMedleyfaire_2022" }, - { - "ItemID": "NightveilHallow_Token", - "Name": "@NightveilHallow_Token_MasterName", - "ItemType": "Resource", - "ItemTypeDisplayName": "@ui_itemtypedescription_resource", - "Description": "@NightveilHallow_Token_Description", - "ItemClass": "Resource", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, - "GearScoreOverride": null, - "MinGearScore": null, - "MaxGearScore": null, - "Tier": 0, - "ItemStatsRef": "", - "GrantsHWMBump": "", - "IgnoreNameChanges": null, - "IgnoreHWMScaling": "", - "CanHavePerks": 0, - "CanReplaceGem": null, - "Perk1": "", - "Perk2": "", - "Perk3": "", - "Perk4": "", - "Perk5": "", - "PerkBucket1": "", - "PerkBucket2": "", - "PerkBucket3": "", - "PerkBucket4": "", - "PerkBucket5": "", - "ForceRarity": null, - "RequiredLevel": null, - "UseTypeAffix": 0, - "UseMaterialAffix": 1, - "UseMagicAffix": 0, - "IconCaptureGroup": "", - "UiItemClass": "UI_Rewards", - "ArmorAppearanceM": "", - "ArmorAppearanceF": "", - "WeaponAppearanceOverride": "", - "ConfirmDestroy": "", - "ConfirmBeforeUse": null, - "ConsumeOnUse": 0, - "PrefabPath": "", - "HousingTags": "", - "IconPath": "lyshineui/images/icons/items/Resource/Nightveil_token.png", - "HiResIconPath": "lyshineui/images/icons/items_hires/Nightveil_token.png", - "MaxStackSize": 10000, - "DeathDropPercentage": 0, - "Nonremovable": 1, - "IsMissionItem": null, - "IsUniqueItem": "", - "ContainerLevel": null, - "ContainerGS": null, - "ExceedMinIndex": "", - "ExceedMaxIndex": "", - "IsSalvageable": 0, - "SalvageResources": null, - "IsRepairable": 0, - "RepairDustModifier": null, - "RepairRecipe": "", - "CraftingRecipe": "", - "RepairGameEventID": "", - "SalvageGameEventID": "", - "SalvageLootTags": "", - "SalvageAchievement": "", - "RepairTypes": "", - "IngredientCategories": "", - "IngredientBonusPrimary": "", - "IngredientBonusSecondary": "", - "IngredientGearScoreBaseBonus": "", - "IngredientGearScoreMaxBonus": "", - "ExtraBonusItemChance": "", - "Durability": null, - "DurabilityDmgOnDeath": null, - "DestroyOnBreak": 0, - "Weight": 0, - "AcquisitionNotificationId": "", - "AudioPickup": "Play_UI_Pickup_Generic", - "AudioPlace": "Play_UI_Drop_Generic", - "AudioUse": "Play_UI_Use_Generic", - "AudioCreated": "Play_UI_Created_Generic", - "AudioDestroyed": "", - "MannequinTag": "", - "SoundTableID": "", - "WarboardGatherStat": "", - "WarboardDepositStat": "", - "Notes": "", - "HideInLootTicker": "", - "EventId": "NightveilHallow", - "AttributionId": "" - }, - { - "ItemID": "NH_Baalphazu_Ichor", - "Name": "@NH_Baalphazu_Ichor_MasterName", - "ItemType": "Resource", - "ItemTypeDisplayName": "@ui_itemtypedescription_resource", - "Description": "@NH_Baalphazu_Ichor_Description", - "ItemClass": "Resource", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, - "GearScoreOverride": null, - "MinGearScore": null, - "MaxGearScore": null, - "Tier": 0, - "ItemStatsRef": "", - "GrantsHWMBump": "", - "IgnoreNameChanges": null, - "IgnoreHWMScaling": "", - "CanHavePerks": 0, - "CanReplaceGem": null, - "Perk1": "", - "Perk2": "", - "Perk3": "", - "Perk4": "", - "Perk5": "", - "PerkBucket1": "", - "PerkBucket2": "", - "PerkBucket3": "", - "PerkBucket4": "", - "PerkBucket5": "", - "ForceRarity": 4, - "RequiredLevel": null, - "UseTypeAffix": 0, - "UseMaterialAffix": 1, - "UseMagicAffix": 0, - "IconCaptureGroup": "", - "UiItemClass": "UI_Rewards", - "ArmorAppearanceM": "", - "ArmorAppearanceF": "", - "WeaponAppearanceOverride": "", - "ConfirmDestroy": "", - "ConfirmBeforeUse": null, - "ConsumeOnUse": 0, - "PrefabPath": "", - "HousingTags": "", - "IconPath": "lyshineui/images/icons/items/Resource/BaalphazuIchor.png", - "HiResIconPath": "lyshineui/images/icons/items_hires/BaalphazuIchor.png", - "MaxStackSize": 10000, - "DeathDropPercentage": 0, - "Nonremovable": 1, - "IsMissionItem": null, - "IsUniqueItem": "", - "ContainerLevel": null, - "ContainerGS": null, - "ExceedMinIndex": "", - "ExceedMaxIndex": "", - "IsSalvageable": 0, - "SalvageResources": null, - "IsRepairable": 0, - "RepairDustModifier": null, - "RepairRecipe": "", - "CraftingRecipe": "", - "RepairGameEventID": "", - "SalvageGameEventID": "", - "SalvageLootTags": "", - "SalvageAchievement": "", - "RepairTypes": "", - "IngredientCategories": "", - "IngredientBonusPrimary": "", - "IngredientBonusSecondary": "", - "IngredientGearScoreBaseBonus": "", - "IngredientGearScoreMaxBonus": "", - "ExtraBonusItemChance": "", - "Durability": null, - "DurabilityDmgOnDeath": null, - "DestroyOnBreak": 0, - "Weight": 1, - "AcquisitionNotificationId": "", - "AudioPickup": "Play_UI_Pickup_Liquid", - "AudioPlace": "Play_UI_Drop_Liquid", - "AudioUse": "Play_UI_Use_Liquid", - "AudioCreated": "Play_UI_Created_Liquid", - "AudioDestroyed": "", - "MannequinTag": "", - "SoundTableID": "", - "WarboardGatherStat": "", - "WarboardDepositStat": "", - "Notes": "", - "HideInLootTicker": "", - "EventId": "NightveilHallow", - "AttributionId": "" - }, - { - "ItemID": "NH_CauldronCache", - "Name": "@NH_CauldronCache_MasterName", - "ItemType": "Resource", - "ItemTypeDisplayName": "@ui_itemtypedescription_resource", - "Description": "@NH_CauldronCache_Description", - "ItemClass": "Resource+LootContainer", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, - "GearScoreOverride": null, - "MinGearScore": null, - "MaxGearScore": null, - "Tier": 0, - "ItemStatsRef": "", - "GrantsHWMBump": "", - "IgnoreNameChanges": null, - "IgnoreHWMScaling": "", - "CanHavePerks": 0, - "CanReplaceGem": null, - "Perk1": "", - "Perk2": "", - "Perk3": "", - "Perk4": "", - "Perk5": "", - "PerkBucket1": "", - "PerkBucket2": "", - "PerkBucket3": "", - "PerkBucket4": "", - "PerkBucket5": "", - "ForceRarity": 4, - "RequiredLevel": null, - "UseTypeAffix": 0, - "UseMaterialAffix": 0, - "UseMagicAffix": 0, - "IconCaptureGroup": "", - "UiItemClass": "UI_Rewards", - "ArmorAppearanceM": "", - "ArmorAppearanceF": "", - "WeaponAppearanceOverride": "", - "ConfirmDestroy": "", - "ConfirmBeforeUse": 0, - "ConsumeOnUse": 0, - "PrefabPath": "", - "HousingTags": "", - "IconPath": "lyshineui/images/icons/items/Resource/QuestRewardNightveil.png", - "HiResIconPath": "lyshineui/images/icons/items_hires/QuestRewardNightveil.png", - "MaxStackSize": 10000, - "DeathDropPercentage": 0, - "Nonremovable": null, - "IsMissionItem": null, - "IsUniqueItem": "", - "ContainerLevel": 1, - "ContainerGS": null, - "ExceedMinIndex": "", - "ExceedMaxIndex": "", - "IsSalvageable": 1, - "SalvageResources": 1, - "IsRepairable": 0, - "RepairDustModifier": null, - "RepairRecipe": "[LTID]Halloween_CauldronCache", - "CraftingRecipe": "", - "RepairGameEventID": "", - "SalvageGameEventID": "", - "SalvageLootTags": "", - "SalvageAchievement": "", - "RepairTypes": "", - "IngredientCategories": "", - "IngredientBonusPrimary": "", - "IngredientBonusSecondary": "", - "IngredientGearScoreBaseBonus": "", - "IngredientGearScoreMaxBonus": "", - "ExtraBonusItemChance": "", - "Durability": null, - "DurabilityDmgOnDeath": null, - "DestroyOnBreak": 0, - "Weight": 0, - "AcquisitionNotificationId": "", - "AudioPickup": "Play_UI_Pickup_Generic", - "AudioPlace": "Play_UI_Drop_Generic", - "AudioUse": "Play_UI_Use_Generic", - "AudioCreated": "Play_UI_Created_Generic", - "AudioDestroyed": "", - "MannequinTag": "", - "SoundTableID": "", - "WarboardGatherStat": "", - "WarboardDepositStat": "", - "Notes": "", - "HideInLootTicker": "", - "EventId": "NightveilHallow", - "AttributionId": "" - }, - { - "ItemID": "NH_QuestCache", - "Name": "@NH_QuestCache_MasterName", - "ItemType": "Resource", - "ItemTypeDisplayName": "@ui_itemtypedescription_resource", - "Description": "@NH_QuestCache_Description", - "ItemClass": "Resource+LootContainer", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, - "GearScoreOverride": null, - "MinGearScore": null, - "MaxGearScore": null, - "Tier": 0, - "ItemStatsRef": "", - "GrantsHWMBump": "", - "IgnoreNameChanges": null, - "IgnoreHWMScaling": "", - "CanHavePerks": 0, - "CanReplaceGem": null, - "Perk1": "", - "Perk2": "", - "Perk3": "", - "Perk4": "", - "Perk5": "", - "PerkBucket1": "", - "PerkBucket2": "", - "PerkBucket3": "", - "PerkBucket4": "", - "PerkBucket5": "", - "ForceRarity": 3, - "RequiredLevel": null, - "UseTypeAffix": 0, - "UseMaterialAffix": 0, - "UseMagicAffix": 0, - "IconCaptureGroup": "", - "UiItemClass": "UI_Rewards", - "ArmorAppearanceM": "", - "ArmorAppearanceF": "", - "WeaponAppearanceOverride": "", - "ConfirmDestroy": "", - "ConfirmBeforeUse": 0, - "ConsumeOnUse": 0, - "PrefabPath": "", - "HousingTags": "", - "IconPath": "lyshineui/images/icons/items/Resource/QuestRewardNightveil.png", - "HiResIconPath": "lyshineui/images/icons/items_hires/QuestRewardNightveil.png", - "MaxStackSize": 10000, - "DeathDropPercentage": 0, - "Nonremovable": null, - "IsMissionItem": null, - "IsUniqueItem": "", - "ContainerLevel": 1, - "ContainerGS": null, - "ExceedMinIndex": "", - "ExceedMaxIndex": "", - "IsSalvageable": 1, - "SalvageResources": 1, - "IsRepairable": 0, - "RepairDustModifier": null, - "RepairRecipe": "[LTID]Halloween_QuestCache", - "CraftingRecipe": "", - "RepairGameEventID": "", - "SalvageGameEventID": "", - "SalvageLootTags": "", - "SalvageAchievement": "", - "RepairTypes": "", - "IngredientCategories": "", - "IngredientBonusPrimary": "", - "IngredientBonusSecondary": "", - "IngredientGearScoreBaseBonus": "", - "IngredientGearScoreMaxBonus": "", - "ExtraBonusItemChance": "", - "Durability": null, - "DurabilityDmgOnDeath": null, - "DestroyOnBreak": 0, - "Weight": 0, - "AcquisitionNotificationId": "", - "AudioPickup": "Play_UI_Pickup_Generic", - "AudioPlace": "Play_UI_Drop_Generic", - "AudioUse": "Play_UI_Use_Generic", - "AudioCreated": "Play_UI_Created_Generic", - "AudioDestroyed": "", - "MannequinTag": "", - "SoundTableID": "", - "WarboardGatherStat": "", - "WarboardDepositStat": "", - "Notes": "", - "HideInLootTicker": "", - "EventId": "NightveilHallow", - "AttributionId": "" - }, { "ItemID": "NightveilCoinBag", "Name": "@NightveilCoinBag_MasterName", diff --git a/NewWorldCompanion.Services/Data/MasterItemDefinitions_Crafting.json b/NewWorldCompanion.Services/Data/MasterItemDefinitions_Crafting.json index 32fb799..6118dd6 100644 --- a/NewWorldCompanion.Services/Data/MasterItemDefinitions_Crafting.json +++ b/NewWorldCompanion.Services/Data/MasterItemDefinitions_Crafting.json @@ -321511,11 +321511,11 @@ "Description": "@1hSword_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableMainHand+Sword+Melee", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "1Handed", + "TradingGroup": "Swords", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -321607,11 +321607,11 @@ "Description": "@1hHatchet_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableMainHand+Hatchet+Melee", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "1Handed", + "TradingGroup": "Hatchets", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -321703,11 +321703,11 @@ "Description": "@2hWarhammer_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableTwoHand+2HHammer+Melee", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "2Handed", + "TradingGroup": "WarHammers", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -321799,11 +321799,11 @@ "Description": "@2hGreatAxe_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableTwoHand+2HAxe+Melee", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "2Handed", + "TradingGroup": "GreatAxes", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -321895,11 +321895,11 @@ "Description": "@2hSpear_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableTwoHand+Spear+Melee", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "2Handed", + "TradingGroup": "Spears", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -321991,11 +321991,11 @@ "Description": "@2hBow_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableTwoHand+Bow+Ranged", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "2Handed", + "TradingGroup": "Bows", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322087,11 +322087,11 @@ "Description": "@2hMusket_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableTwoHand+Musket+Ranged", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "2Handed", + "TradingGroup": "Muskets", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322183,11 +322183,11 @@ "Description": "@1hShieldA_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableOffHand+Shield+RoundShield", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "Magical", + "TradingGroup": "StavesFire", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322279,11 +322279,11 @@ "Description": "@1hShieldB_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableOffHand+Shield+KiteShield", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "Shields", + "TradingGroup": "ShieldsRound", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322375,11 +322375,11 @@ "Description": "@1hShieldD_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableOffHand+Shield+TowerShield", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "Shields", + "TradingGroup": "ShieldsKite", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322471,11 +322471,11 @@ "Description": "@2hElementalStaff_Fire_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableMainHand+FireStaff+Magic", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "Shields", + "TradingGroup": "ShieldsTower", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322567,11 +322567,11 @@ "Description": "@1hElementalGauntlet_Ice_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableMainHand+IceMagic+Magic", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "Magical", + "TradingGroup": "GauntletIce", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322663,11 +322663,11 @@ "Description": "@1hGauntletVoid_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableMainHand+VoidGauntlet+Magic", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "Magical", + "TradingGroup": "GauntletVoid", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322759,11 +322759,11 @@ "Description": "@1HRapier_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableMainHand+Rapier+Melee", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "1Handed", + "TradingGroup": "Rapiers", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322855,11 +322855,11 @@ "Description": "@2hLifeStaff_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableMainHand+LifeStaff+Magic", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "Magical", + "TradingGroup": "StavesLife", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -322951,11 +322951,11 @@ "Description": "@1hGreatSword_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableTwoHand+GreatSword+Melee", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "2Handed", + "TradingGroup": "GreatSword", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, @@ -323047,11 +323047,11 @@ "Description": "@2hBlunderbuss_HalloweenT5_Description", "HeartgemRuneTooltipTitle": "", "ItemClass": "Weapon+EquippableTwoHand+Blunderbuss+Ranged", - "TradingCategory": "", - "TradingFamily": "", - "TradingGroup": "", - "BindOnPickup": 1, - "BindOnEquip": null, + "TradingCategory": "Weapons", + "TradingFamily": "2Handed", + "TradingGroup": "Blunderbuss", + "BindOnPickup": null, + "BindOnEquip": 1, "GearScoreOverride": null, "MinGearScore": 500, "MaxGearScore": 600, diff --git a/NewWorldCompanion.Services/Data/javelindata_itemdefinitions_master.loc.xml b/NewWorldCompanion.Services/Data/javelindata_itemdefinitions_master.loc.xml index 61c19ae..4fd3d79 100644 --- a/NewWorldCompanion.Services/Data/javelindata_itemdefinitions_master.loc.xml +++ b/NewWorldCompanion.Services/Data/javelindata_itemdefinitions_master.loc.xml @@ -25826,6 +25826,16 @@ Madtom Toxins This objects contains a gift for you. Community Make-Good Container + This object contains an extra GS600 Sickle for your troubles. + GS600 Sickle Make-Good Container + This object contains an extra GS600 Skinning Knife for your troubles. + GS600 Skinning Knife Make-Good Container + This object contains an extra GS600 Pickaxe for your troubles. + GS600 Pickaxe Make-Good Container + This object contains an extra GS600 Logging Axe for your troubles. + GS600 Logging Axe Make-Good Container + This object contains an extra GS600 Bag for your troubles. + GS600 Bag Make-Good Container A gem with an attunement to the Cruel I weapon trait and Spectral Ward I armor trait. Can also be used in Jewelcrafting. Cut Flawed Malachite A gem with an attunement to the Cruel II weapon trait and Spectral Ward II armor trait. Can also be used in Jewelcrafting. diff --git a/NewWorldCompanion/ViewModels/Tabs/Debug/DebugScreenProcessViewModel.cs b/NewWorldCompanion/ViewModels/Tabs/Debug/DebugScreenProcessViewModel.cs index 5d8f36b..bbf50c4 100644 --- a/NewWorldCompanion/ViewModels/Tabs/Debug/DebugScreenProcessViewModel.cs +++ b/NewWorldCompanion/ViewModels/Tabs/Debug/DebugScreenProcessViewModel.cs @@ -186,6 +186,10 @@ private void RestoreDefaultsExecute() { switch ((SelectedPresetConfig as ComboBoxItem)?.Content ?? string.Empty) { + case "1600x900": + AreaLower = EmguConstants.Default1600900AreaLower; + AreaUpper = EmguConstants.Default1600900AreaUpper; + break; case "1920x1080": AreaLower = EmguConstants.Default19201080AreaLower; AreaUpper = EmguConstants.Default19201080AreaUpper; diff --git a/NewWorldCompanion/Views/Tabs/Debug/DebugScreenProcessView.xaml b/NewWorldCompanion/Views/Tabs/Debug/DebugScreenProcessView.xaml index 2efd0a6..d3c92d9 100644 --- a/NewWorldCompanion/Views/Tabs/Debug/DebugScreenProcessView.xaml +++ b/NewWorldCompanion/Views/Tabs/Debug/DebugScreenProcessView.xaml @@ -6,57 +6,58 @@ xmlns:local="clr-namespace:NewWorldCompanion.Views.Tabs.Debug" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> - - + + + - - - - - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + -