From 1a26ce6002183dd786ef488ff283c7fe4a18f136 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 20 Nov 2017 12:31:49 -0500 Subject: [PATCH] Updated gameobject template fields and GameError enum --- .../Framework/Constants/AchievementConst.cs | 2 +- Source/Framework/Constants/SharedConst.cs | 430 +++++++++--------- Source/Game/Achievements/CriteriaHandler.cs | 33 ++ .../Entities/GameObject/GameObjectData.cs | 3 + 4 files changed, 253 insertions(+), 215 deletions(-) diff --git a/Source/Framework/Constants/AchievementConst.cs b/Source/Framework/Constants/AchievementConst.cs index ee151a919..4bcd46774 100644 --- a/Source/Framework/Constants/AchievementConst.cs +++ b/Source/Framework/Constants/AchievementConst.cs @@ -394,7 +394,7 @@ namespace Framework.Constants // 197 - Order Hall Advancement related OrderHallTalentLearned = 198, AppearanceUnlockedBySlot = 199, - OrderHallRecruitTyoop = 200, + OrderHallRecruitTroop = 200, // 201 - 0 criterias (Legion - 23420) // 202 - 0 criterias (Legion - 23420) CompleteWorldQuest = 203, diff --git a/Source/Framework/Constants/SharedConst.cs b/Source/Framework/Constants/SharedConst.cs index 85418688f..3091a6196 100644 --- a/Source/Framework/Constants/SharedConst.cs +++ b/Source/Framework/Constants/SharedConst.cs @@ -2095,220 +2095,222 @@ namespace Framework.Constants LfgJoinedRfQueue = 768, LfgJoinedScenarioQueue = 769, LfgJoinedWorldPvpQueue = 770, - LfgJoinedList = 771, - LfgLeftQueue = 772, - LfgLeftList = 773, - LfgRoleCheckAborted = 774, - LfgReadyCheckAborted = 775, - LfgCantUseBattleground = 776, - LfgCantUseDungeons = 777, - LfgReasonTooManyLfg = 778, - InvalidTeleportLocation = 779, - TooFarToInteract = 780, - BattlegroundPlayersFromDifferentRealms = 781, - DifficultyChangeCooldownS = 782, - DifficultyChangeCombatCooldownS = 783, - DifficultyChangeWorldstate = 784, - DifficultyChangeEncounter = 785, - DifficultyChangeCombat = 786, - DifficultyChangePlayerBusy = 787, - DifficultyChangeAlreadyStarted = 788, - DifficultyChangeOtherHeroicS = 789, - DifficultyChangeHeroicInstanceAlreadyRunning = 790, - ArenaTeamPartySize = 791, - QuestForceRemovedS = 792, - AttackNoActions = 793, - InRandomBg = 794, - InNonRandomBg = 795, - AuctionEnoughItems = 796, - BnFriendSelf = 797, - BnFriendAlready = 798, - BnFriendBlocked = 799, - BnFriendListFull = 800, - BnFriendRequestSent = 801, - BnBroadcastThrottle = 802, - BgDeveloperOnly = 803, - CurrencySpellSlotMismatch = 804, - CurrencyNotTradable = 805, - RequiresExpansionS = 806, - QuestFailedSpell = 807, - TalentFailedNotEnoughTalentsInPrimaryTree = 808, - TalentFailedNoPrimaryTreeSelected = 809, - TalentFailedCantRemoveTalent = 810, - TalentFailedUnknown = 811, - WargameRequestFailure = 812, - RankRequiresAuthenticator = 813, - GuildBankVoucherFailed = 814, - WargameRequestSent = 815, - RequiresAchievementI = 816, - RefundResultExceedMaxCurrency = 817, - CantBuyQuantity = 818, - ItemIsBattlePayLocked = 819, - PartyAlreadyInBattlegroundQueue = 820, - PartyConfirmingBattlegroundQueue = 821, - BattlefieldTeamPartySize = 822, - InsuffTrackedCurrencyIs = 823, - NotOnTournamentRealm = 824, - GuildTrialAccountTrial = 825, - GuildTrialAccountVeteran = 826, - GuildUndeletableDueToLevel = 827, - CantDoThatInAGroup = 828, - GuildLeaderReplaced = 829, - TransmogrifyCantEquip = 830, - TransmogrifyInvalidItemType = 831, - TransmogrifyNotSoulbound = 832, - TransmogrifyInvalidSource = 833, - TransmogrifyInvalidDestination = 834, - TransmogrifyMismatch = 835, - TransmogrifyLegendary = 836, - TransmogrifySameItem = 837, - TransmogrifySameAppearance = 838, - TransmogrifyNotEquipped = 839, - VoidDepositFull = 840, - VoidWithdrawFull = 841, - VoidStorageWrapped = 842, - VoidStorageStackable = 843, - VoidStorageUnbound = 844, - VoidStorageRepair = 845, - VoidStorageCharges = 846, - VoidStorageQuest = 847, - VoidStorageConjured = 848, - VoidStorageMail = 849, - VoidStorageBag = 850, - VoidTransferStorageFull = 851, - VoidTransferInvFull = 852, - VoidTransferInternalError = 853, - VoidTransferItemInvalid = 854, - DifficultyDisabledInLfg = 855, - VoidStorageUnique = 856, - VoidStorageLoot = 857, - VoidStorageHoliday = 858, - VoidStorageDuration = 859, - VoidStorageLoadFailed = 860, - VoidStorageInvalidItem = 861, - ParentalControlsChatMuted = 862, - SorStartExperienceIncomplete = 863, - SorInvalidEmail = 864, - SorInvalidComment = 865, - ChallengeModeResetCooldownS = 866, - ChallengeModeResetKeystone = 867, - PetJournalAlreadyInLoadout = 868, - ReportSubmittedSuccessfully = 869, - ReportSubmissionFailed = 870, - SuggestionSubmittedSuccessfully = 871, - BugSubmittedSuccessfully = 872, - ChallengeModeEnabled = 873, - ChallengeModeDisabled = 874, - PetbattleCreateFailed = 875, - PetbattleNotHere = 876, - PetbattleNotHereOnTransport = 877, - PetbattleNotHereUnevenGround = 878, - PetbattleNotHereObstructed = 879, - PetbattleNotWhileInCombat = 880, - PetbattleNotWhileDead = 881, - PetbattleNotWhileFlying = 882, - PetbattleTargetInvalid = 883, - PetbattleTargetOutOfRange = 884, - PetbattleTargetNotCapturable = 885, - PetbattleNotATrainer = 886, - PetbattleDeclined = 887, - PetbattleInBattle = 888, - PetbattleInvalidLoadout = 889, - PetbattleAllPetsDead = 890, - PetbattleNoPetsInSlots = 891, - PetbattleNoAccountLock = 892, - PetbattleWildPetTapped = 893, - PetbattleRestrictedAccount = 894, - PetbattleNotWhileInMatchedBattle = 895, - CantHaveMorePetsOfThatType = 896, - CantHaveMorePets = 897, - PvpMapNotFound = 898, - PvpMapNotSet = 899, - PetbattleQueueQueued = 900, - PetbattleQueueAlreadyQueued = 901, - PetbattleQueueJoinFailed = 902, - PetbattleQueueJournalLock = 903, - PetbattleQueueRemoved = 904, - PetbattleQueueProposalDeclined = 905, - PetbattleQueueProposalTimeout = 906, - PetbattleQueueOpponentDeclined = 907, - PetbattleQueueRequeuedInternal = 908, - PetbattleQueueRequeuedRemoved = 909, - PetbattleQueueSlotLocked = 910, - PetbattleQueueSlotEmpty = 911, - PetbattleQueueSlotNoTracker = 912, - PetbattleQueueSlotNoSpecies = 913, - PetbattleQueueSlotCantBattle = 914, - PetbattleQueueSlotRevoked = 915, - PetbattleQueueSlotDead = 916, - PetbattleQueueSlotNoPet = 917, - PetbattleQueueNotWhileNeutral = 918, - PetbattleGameTimeLimitWarning = 919, - PetbattleGameRoundsLimitWarning = 920, - HasRestriction = 921, - ItemUpgradeItemTooLowLevel = 922, - ItemUpgradeNoPath = 923, - ItemUpgradeNoMoreUpgrades = 924, - BonusRollEmpty = 925, - ChallengeModeFull = 926, - ChallengeModeInProgress = 927, - ChallengeModeIncorrectKeystone = 928, - BattletagFriendNotFound = 929, - BattletagFriendNotValid = 930, - BattletagFriendNotAllowed = 931, - BattletagFriendThrottled = 932, - BattletagFriendSuccess = 933, - PetTooHighLevelToUncage = 934, - PetbattleInternal = 935, - CantCagePetYet = 936, - NoLootInChallengeMode = 937, - QuestPetBattleVictoriesPvpIi = 938, - RoleCheckAlreadyInProgress = 939, - RecruitAFriendAccountLimit = 940, - RecruitAFriendFailed = 941, - SetLootPersonal = 942, - SetLootMethodFailedCombat = 943, - ReagentBankFull = 944, - ReagentBankLocked = 945, - GarrisonBuildingExists = 946, - GarrisonInvalidPlot = 947, - GarrisonInvalidBuildingid = 948, - GarrisonInvalidPlotBuilding = 949, - GarrisonRequiresBlueprint = 950, - GarrisonNotEnoughCurrency = 951, - GarrisonNotEnoughGold = 952, - GarrisonCompleteMissionWrongFollowerType = 953, - AlreadyUsingLfgList = 954, - RestrictedAccountLfgListTrial = 955, - ToyUseLimitReached = 956, - ToyAlreadyKnown = 957, - TransmogSetAlreadyKnown = 958, - NotEnoughCurrency = 959, - SpecIsDisabled = 960, - FeatureRestrictedTrial = 961, - CantBeObliterated = 962, - ArtifactRelicDoesNotMatchArtifact = 963, - MustEquipArtifact = 964, - CantDoThatRightNow = 965, - AffectingCombat = 966, - EquipmentManagerCombatSwapS = 967, - EquipmentManagerBagsFull = 968, - EquipmentManagerMissingItemS = 969, - MovieRecordingWarningPerf = 970, - MovieRecordingWarningDiskFull = 971, - MovieRecordingWarningNoMovie = 972, - MovieRecordingWarningRequirements = 973, - MovieRecordingWarningCompressing = 974, - NoChallengeModeReward = 975, - ClaimedChallengeModeReward = 976, - ChallengeModePeriodResetSs = 977, - CantDoThatChallengeModeActive = 978, - TalentFailedRestArea = 979, - CannotAbandonLastPet = 980, - TestCvarSetSss = 981, - QuestTurnInFailReason = 982, - ClaimedChallengeModeRewardOld = 983, - TalentGrantedByAura = 984 + ErrLfgJoinedBattlefieldQueue = 771, + LfgJoinedList = 772, + LfgLeftQueue = 773, + LfgLeftList = 774, + LfgRoleCheckAborted = 775, + LfgReadyCheckAborted = 776, + LfgCantUseBattleground = 777, + LfgCantUseDungeons = 778, + LfgReasonTooManyLfg = 779, + InvalidTeleportLocation = 780, + TooFarToInteract = 781, + BattlegroundPlayersFromDifferentRealms = 782, + DifficultyChangeCooldownS = 783, + DifficultyChangeCombatCooldownS = 784, + DifficultyChangeWorldstate = 785, + DifficultyChangeEncounter = 786, + DifficultyChangeCombat = 787, + DifficultyChangePlayerBusy = 788, + DifficultyChangeAlreadyStarted = 789, + DifficultyChangeOtherHeroicS = 790, + DifficultyChangeHeroicInstanceAlreadyRunning = 791, + ArenaTeamPartySize = 792, + QuestForceRemovedS = 793, + AttackNoActions = 794, + InRandomBg = 795, + InNonRandomBg = 796, + AuctionEnoughItems = 797, + BnFriendSelf = 798, + BnFriendAlready = 799, + BnFriendBlocked = 800, + BnFriendListFull = 801, + BnFriendRequestSent = 802, + BnBroadcastThrottle = 803, + BgDeveloperOnly = 804, + CurrencySpellSlotMismatch = 805, + CurrencyNotTradable = 806, + RequiresExpansionS = 807, + QuestFailedSpell = 808, + TalentFailedNotEnoughTalentsInPrimaryTree = 809, + TalentFailedNoPrimaryTreeSelected = 810, + TalentFailedCantRemoveTalent = 811, + TalentFailedUnknown = 812, + WargameRequestFailure = 813, + RankRequiresAuthenticator = 814, + GuildBankVoucherFailed = 815, + WargameRequestSent = 816, + RequiresAchievementI = 817, + RefundResultExceedMaxCurrency = 818, + CantBuyQuantity = 819, + ItemIsBattlePayLocked = 820, + PartyAlreadyInBattlegroundQueue = 821, + PartyConfirmingBattlegroundQueue = 822, + BattlefieldTeamPartySize = 823, + InsuffTrackedCurrencyIs = 824, + NotOnTournamentRealm = 825, + GuildTrialAccountTrial = 826, + GuildTrialAccountVeteran = 827, + GuildUndeletableDueToLevel = 828, + CantDoThatInAGroup = 829, + GuildLeaderReplaced = 830, + TransmogrifyCantEquip = 831, + TransmogrifyInvalidItemType = 832, + TransmogrifyNotSoulbound = 833, + TransmogrifyInvalidSource = 834, + TransmogrifyInvalidDestination = 835, + TransmogrifyMismatch = 836, + TransmogrifyLegendary = 837, + TransmogrifySameItem = 838, + TransmogrifySameAppearance = 839, + TransmogrifyNotEquipped = 840, + VoidDepositFull = 841, + VoidWithdrawFull = 842, + VoidStorageWrapped = 843, + VoidStorageStackable = 844, + VoidStorageUnbound = 845, + VoidStorageRepair = 846, + VoidStorageCharges = 847, + VoidStorageQuest = 848, + VoidStorageConjured = 849, + VoidStorageMail = 850, + VoidStorageBag = 851, + VoidTransferStorageFull = 852, + VoidTransferInvFull = 853, + VoidTransferInternalError = 854, + VoidTransferItemInvalid = 855, + DifficultyDisabledInLfg = 856, + VoidStorageUnique = 857, + VoidStorageLoot = 858, + VoidStorageHoliday = 859, + VoidStorageDuration = 860, + VoidStorageLoadFailed = 861, + VoidStorageInvalidItem = 862, + ParentalControlsChatMuted = 863, + SorStartExperienceIncomplete = 864, + SorInvalidEmail = 865, + SorInvalidComment = 866, + ChallengeModeResetCooldownS = 867, + ChallengeModeResetKeystone = 868, + PetJournalAlreadyInLoadout = 869, + ReportSubmittedSuccessfully = 870, + ReportSubmissionFailed = 871, + SuggestionSubmittedSuccessfully = 872, + BugSubmittedSuccessfully = 873, + ChallengeModeEnabled = 874, + ChallengeModeDisabled = 875, + PetbattleCreateFailed = 876, + PetbattleNotHere = 877, + PetbattleNotHereOnTransport = 878, + PetbattleNotHereUnevenGround = 879, + PetbattleNotHereObstructed = 880, + PetbattleNotWhileInCombat = 881, + PetbattleNotWhileDead = 882, + PetbattleNotWhileFlying = 883, + PetbattleTargetInvalid = 884, + PetbattleTargetOutOfRange = 885, + PetbattleTargetNotCapturable = 886, + PetbattleNotATrainer = 887, + PetbattleDeclined = 888, + PetbattleInBattle = 889, + PetbattleInvalidLoadout = 890, + PetbattleAllPetsDead = 891, + PetbattleNoPetsInSlots = 892, + PetbattleNoAccountLock = 893, + PetbattleWildPetTapped = 894, + PetbattleRestrictedAccount = 895, + PetbattleNotWhileInMatchedBattle = 896, + CantHaveMorePetsOfThatType = 897, + CantHaveMorePets = 898, + PvpMapNotFound = 899, + PvpMapNotSet = 900, + PetbattleQueueQueued = 901, + PetbattleQueueAlreadyQueued = 902, + PetbattleQueueJoinFailed = 903, + PetbattleQueueJournalLock = 904, + PetbattleQueueRemoved = 905, + PetbattleQueueProposalDeclined = 906, + PetbattleQueueProposalTimeout = 907, + PetbattleQueueOpponentDeclined = 908, + PetbattleQueueRequeuedInternal = 909, + PetbattleQueueRequeuedRemoved = 910, + PetbattleQueueSlotLocked = 911, + PetbattleQueueSlotEmpty = 912, + PetbattleQueueSlotNoTracker = 913, + PetbattleQueueSlotNoSpecies = 914, + PetbattleQueueSlotCantBattle = 915, + PetbattleQueueSlotRevoked = 916, + PetbattleQueueSlotDead = 917, + PetbattleQueueSlotNoPet = 918, + PetbattleQueueNotWhileNeutral = 919, + PetbattleGameTimeLimitWarning = 920, + PetbattleGameRoundsLimitWarning = 921, + HasRestriction = 922, + ItemUpgradeItemTooLowLevel = 923, + ItemUpgradeNoPath = 924, + ItemUpgradeNoMoreUpgrades = 925, + BonusRollEmpty = 926, + ChallengeModeFull = 927, + ChallengeModeInProgress = 928, + ChallengeModeIncorrectKeystone = 929, + BattletagFriendNotFound = 930, + BattletagFriendNotValid = 931, + BattletagFriendNotAllowed = 932, + BattletagFriendThrottled = 933, + BattletagFriendSuccess = 934, + PetTooHighLevelToUncage = 935, + PetbattleInternal = 936, + CantCagePetYet = 937, + NoLootInChallengeMode = 938, + QuestPetBattleVictoriesPvpIi = 939, + RoleCheckAlreadyInProgress = 940, + RecruitAFriendAccountLimit = 941, + RecruitAFriendFailed = 942, + SetLootPersonal = 943, + SetLootMethodFailedCombat = 944, + ReagentBankFull = 945, + ReagentBankLocked = 946, + GarrisonBuildingExists = 947, + GarrisonInvalidPlot = 948, + GarrisonInvalidBuildingid = 949, + GarrisonInvalidPlotBuilding = 950, + GarrisonRequiresBlueprint = 951, + GarrisonNotEnoughCurrency = 952, + GarrisonNotEnoughGold = 953, + GarrisonCompleteMissionWrongFollowerType = 954, + AlreadyUsingLfgList = 955, + RestrictedAccountLfgListTrial = 956, + ToyUseLimitReached = 957, + ToyAlreadyKnown = 958, + TransmogSetAlreadyKnown = 959, + NotEnoughCurrency = 960, + SpecIsDisabled = 961, + FeatureRestrictedTrial = 962, + CantBeObliterated = 963, + ArtifactRelicDoesNotMatchArtifact = 964, + MustEquipArtifact = 965, + CantDoThatRightNow = 966, + AffectingCombat = 967, + EquipmentManagerCombatSwapS = 968, + EquipmentManagerBagsFull = 969, + EquipmentManagerMissingItemS = 970, + MovieRecordingWarningPerf = 971, + MovieRecordingWarningDiskFull = 972, + MovieRecordingWarningNoMovie = 973, + MovieRecordingWarningRequirements = 974, + MovieRecordingWarningCompressing = 975, + NoChallengeModeReward = 976, + ClaimedChallengeModeReward = 977, + ChallengeModePeriodResetSs = 978, + CantDoThatChallengeModeActive = 979, + TalentFailedRestArea = 980, + CannotAbandonLastPet = 981, + TestCvarSetSss = 982, + QuestTurnInFailReason = 983, + ClaimedChallengeModeRewardOld = 984, + TalentGrantedByAura = 985, + ChallengeModeAlreadyComplete = 986 } public enum SceneFlags diff --git a/Source/Game/Achievements/CriteriaHandler.cs b/Source/Game/Achievements/CriteriaHandler.cs index 0c9697651..c4ce30d94 100644 --- a/Source/Game/Achievements/CriteriaHandler.cs +++ b/Source/Game/Achievements/CriteriaHandler.cs @@ -391,6 +391,36 @@ namespace Game.Achievements case CriteriaTypes.OwnToy: case CriteriaTypes.OwnToyCount: case CriteriaTypes.OwnHeirlooms: + case CriteriaTypes.SurveyGameobject: + case CriteriaTypes.ClearDigsite: + case CriteriaTypes.ManualCompleteCriteria: + case CriteriaTypes.CompleteChallengeModeGuild: + case CriteriaTypes.DefeatCreatureGroup: + case CriteriaTypes.CompleteChallengeMode: + case CriteriaTypes.SendEvent: + case CriteriaTypes.CookRecipesGuild: + case CriteriaTypes.EarnPetBattleAchievementPoints: + case CriteriaTypes.SendEventScenario: + case CriteriaTypes.ReleaseSpirit: + case CriteriaTypes.OwnPet: + case CriteriaTypes.GarrisonCompleteDungeonEncounter: + case CriteriaTypes.CompleteLfgDungeon: + case CriteriaTypes.LfgVoteKicksInitiatedByPlayer: + case CriteriaTypes.LfgVoteKicksNotInitByPlayer: + case CriteriaTypes.BeKickedFromLfg: + case CriteriaTypes.LfgLeaves: + case CriteriaTypes.CountOfLfgQueueBoostsByTank: + case CriteriaTypes.ReachAreatriggerWithActionset: + case CriteriaTypes.StartOrderHallMission: + case CriteriaTypes.RecruitGarrisonFollowerWithQuality: + case CriteriaTypes.ArtifactPowerEarned: + case CriteriaTypes.ArtifactTraitsUnlocked: + case CriteriaTypes.OrderHallTalentLearned: + case CriteriaTypes.OrderHallRecruitTroop: + case CriteriaTypes.CompleteWorldQuest: + case CriteriaTypes.GainParagonReputation: + case CriteriaTypes.EarnHonorXp: + case CriteriaTypes.RelicTalentUnlocked: break; // Not implemented yet :( } @@ -760,6 +790,9 @@ namespace Game.Achievements case CriteriaTypes.PlaceGarrisonBuilding: case CriteriaTypes.OwnBattlePetCount: case CriteriaTypes.AppearanceUnlockedBySlot: + case CriteriaTypes.GainParagonReputation: + case CriteriaTypes.EarnHonorXp: + case CriteriaTypes.RelicTalentUnlocked: return progress.Counter >= requiredAmount; case CriteriaTypes.CompleteAchievement: case CriteriaTypes.CompleteQuest: diff --git a/Source/Game/Entities/GameObject/GameObjectData.cs b/Source/Game/Entities/GameObject/GameObjectData.cs index 7ffe89232..02f1a925c 100644 --- a/Source/Game/Entities/GameObject/GameObjectData.cs +++ b/Source/Game/Entities/GameObject/GameObjectData.cs @@ -409,6 +409,7 @@ namespace Game.Entities public uint DoorisOpaque; // 8 Door is Opaque (Disable portal on close), enum { false, true, }; Default: true public uint GiganticAOI; // 9 Gigantic AOI, enum { false, true, }; Default: false public uint InfiniteAOI; // 10 Infinite AOI, enum { false, true, }; Default: false + public uint NotLOSBlocking; // 11 Not LOS Blocking, enum { false, true, }; Default: false } @@ -938,6 +939,7 @@ namespace Game.Entities public uint SpellVisual3; // 19 Spell Visual 3, References: SpellVisual, NoValue = 0 public uint SpellVisual4; // 20 Spell Visual 4, References: SpellVisual, NoValue = 0 public uint SpellVisual5; // 21 Spell Visual 5, References: SpellVisual, NoValue = 0 + public uint SpawnVignette; // 22 Spawn Vignette, References: vignette, NoValue = 0 } @@ -977,6 +979,7 @@ namespace Game.Entities public uint IgnoreBoundingBox; // 2 Ignore Bounding Box, enum { false, true, }; Default: false public uint CameraMode; // 3 Camera Mode, References: CameraMode, NoValue = 0 public uint FadeRegionRadius; // 4 Fade Region Radius, int, Min value: 0, Max value: 2147483647, Default value: 0 + public uint ForgeType; // 5 Forge Type, enum { Artifact Forge, Relic Forge, }; Default: Relic Forge } public struct uilink