Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@Triky313
Triky313 committed Mar 7, 2023
2 parents 7b750df + cadd436 commit cd91b99
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 27 deletions.
6 changes: 3 additions & 3 deletions src/StatisticsAnalysisTool/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@
<setting name="GatheringFileName" serializeAs="String">
<value>Gathering.json</value>
</setting>
<setting name="IsDebugMode" serializeAs="String">
<value>False</value>
</setting>
</StatisticsAnalysisTool.Properties.Settings>
</userSettings>
<applicationSettings>
Expand Down Expand Up @@ -284,9 +287,6 @@
<setting name="ModifiedMobDataFileName" serializeAs="String">
<value>mobs-modified.json</value>
</setting>
<setting name="IsDebugMode" serializeAs="String">
<value>False</value>
</setting>
</StatisticsAnalysisTool.Properties.Settings>
</applicationSettings>
<runtime>
Expand Down
40 changes: 20 additions & 20 deletions src/StatisticsAnalysisTool/Enumerations/EventCodes.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,19 +219,19 @@ public enum EventCodes
Cloak,
PartyInvitation,
PartyJoined,
PartyChangedOrder = 219, // map[0:14368 2:1 3:[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101] 4:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101] [-118 61 -70 72 17 -107 121 72 -102 110 20 -25 64 20 106 2]] 5:[Triky313 Bruno313] 6:[0 0] 7:[18 0] 8:[35 0] 9:[-1 -1] 10:[true true] 252:212]
PartyDisbanded = 220, // map[1:14184 252:213]
PartyPlayerJoined = 221, // map[0:11925 1:[-63 -19 39 16 26 35 -25 67 -111 60 -87 -58 -31 -100 -124 -44] 2:Mitch77 3:1 4:20 5:12 6:-1 7:true 252:214]
PartyPlayerLeft = 223, // map[0:14368 1:[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101] 252:216]
PartyLeaderChanged = 224, // map[0:14595 1:[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101] 252:217]
PartyLootSettingChangedPlayer = 225, // map[0:14368 1:1 252:218]
PartyChangedOrder = 220, // map[0:14368 2:1 3:[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101] 4:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101] [-118 61 -70 72 17 -107 121 72 -102 110 20 -25 64 20 106 2]] 5:[Triky313 Bruno313] 6:[0 0] 7:[18 0] 8:[35 0] 9:[-1 -1] 10:[true true] 252:212]
PartyDisbanded = 221, // map[1:14184 252:213]
PartyPlayerJoined = 222, // map[0:11925 1:[-63 -19 39 16 26 35 -25 67 -111 60 -87 -58 -31 -100 -124 -44] 2:Mitch77 3:1 4:20 5:12 6:-1 7:true 252:214]
PartyPlayerLeft = 224, // map[0:14368 1:[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101] 252:216]
PartyLeaderChanged = 225, // map[0:14595 1:[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101] 252:217]
PartyLootSettingChangedPlayer = 226, // map[0:14368 1:1 252:218]
PartySilverGained,
PartyPlayerUpdated = 228, // map[0:Bruno313 1:true 3:5 252:221]
PartyPlayerUpdated = 229, // map[0:Bruno313 1:true 3:5 252:221]
PartyInvitationPlayerBusy,
PartyMarkedObjectsUpdated,
PartyOnClusterPartyJoined,
PartySetRoleFlag, // map[0:8 1:[-118 61 -70 72 17 -107 121 72 -102 110 20 -25 64 20 106 2] 252:225] (0: FlagType, 1: ObjectId)
PartyJoinRequest = 233,
PartyJoinRequest = 234,
SpellCooldownUpdate,
NewHellgate,
NewHellgateExit,
Expand Down Expand Up @@ -260,9 +260,9 @@ public enum EventCodes
InvitedToArenaMatch,
PlayerCounts,
OtherGrabbedLoot,
InCombatStateUpdate = 262, // map[0:671362 1:true 2:true 252:257] | 1 = true; player hits enemy | 2 = true; enemy hits player
GrabbedLoot = 263, // LOOT: map[0:424 1:Triky313 2:Bruno313 4:1841 5:1 252:256] | SILVER: map[0:6436 2:Triky313 3:true 5:1550115 252:256] (0: ObjectId, 1: LootedBody, 2: Looter, 4: ItemId, 5: Quantity)
SiegeCampClaimStart = 264,
InCombatStateUpdate = 263, // map[0:671362 1:true 2:true 252:257] | 1 = true; player hits enemy | 2 = true; enemy hits player
GrabbedLoot = 264, // LOOT: map[0:424 1:Triky313 2:Bruno313 4:1841 5:1 252:256] | SILVER: map[0:6436 2:Triky313 3:true 5:1550115 252:256] (0: ObjectId, 1: LootedBody, 2: Looter, 4: ItemId, 5: Quantity)
SiegeCampClaimStart = 265,
SiegeCampClaimCancel,
SiegeCampClaimFinished,
SiegeCampScheduleResult,
Expand Down Expand Up @@ -368,23 +368,23 @@ public enum EventCodes
TutorialUpdate,
TriggerHintBox,
RandomDungeonPositionInfo,
NewLootChest = 376, // map[0:23 1:[20.5 177.5] 2:423 3:KEEPER_SOLO_BOOKCHEST_STANDARD 4:FOREST_GREEN_LOOTCHEST_KEEPER_SOLO_BOOKCHEST_STANDARD 5:4 6:637734315213820408 7:[] 8:[] 13:true 252:367] // map[0:4399 1:[165 -263] 3:TREASURE_SOLO_UNCOMMON 4:SWAMP_DEAD_LOOTCHEST_TREASURE_SOLO_UNCOMMON 5:4 6:637926439332719127 7:[] 8:[] 13:true 14:SWAMP_DEAD_TREASURE_SOLO 16:31ff503a-ded6-53d6-974a-7e32e3126457 252:370]
UpdateLootChest = 377, // 0=ObjectId, 3=PlayerGuid, 4=PlayerGuid, 7=Free4All map[0:4769 1:5 2:637927794424868192 3:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101]] 4:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101]] 6:true 7:true 8:2.6 9:true 252:371]
LootChestOpened = 378, // map[0:23 252:369]
NewLootChest = 377, // map[0:23 1:[20.5 177.5] 2:423 3:KEEPER_SOLO_BOOKCHEST_STANDARD 4:FOREST_GREEN_LOOTCHEST_KEEPER_SOLO_BOOKCHEST_STANDARD 5:4 6:637734315213820408 7:[] 8:[] 13:true 252:367] // map[0:4399 1:[165 -263] 3:TREASURE_SOLO_UNCOMMON 4:SWAMP_DEAD_LOOTCHEST_TREASURE_SOLO_UNCOMMON 5:4 6:637926439332719127 7:[] 8:[] 13:true 14:SWAMP_DEAD_TREASURE_SOLO 16:31ff503a-ded6-53d6-974a-7e32e3126457 252:370]
UpdateLootChest = 378, // 0=ObjectId, 3=PlayerGuid, 4=PlayerGuid, 7=Free4All map[0:4769 1:5 2:637927794424868192 3:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101]] 4:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101]] 6:true 7:true 8:2.6 9:true 252:371]
LootChestOpened = 379, // map[0:23 252:369]
EventCode379,
NewShrine = 380, // map[0:19 1:[-89 90] 2:180 3:GENERAL_SHRINE_COMBAT_BUFF 4:SHRINE_NON_COMBAT_BUFF 5:1 6:637734312344532502 252:371]
UpdateShrine = 381, // map[0:19 1:2 2:637734313445294913 252:372]
NewShrine = 381, // map[0:19 1:[-89 90] 2:180 3:GENERAL_SHRINE_COMBAT_BUFF 4:SHRINE_NON_COMBAT_BUFF 5:1 6:637734312344532502 252:371]
UpdateShrine = 382, // map[0:19 1:2 2:637734313445294913 252:372]
MutePlayerUpdate,
ShopTileUpdate,
ShopUpdate,
EasyAntiCheatKick,
UnlockVanityUnlock,
AvatarUnlocked,
CustomizationChanged,
GuildVaultInfo = 394,
BaseVaultInfo = 395,
GuildVaultInfo = 395,
BaseVaultInfo = 396,
BankVaultInfo, // map[0:6 1:6466931c-65a1-4c5d-870b-8724cf2611dc@3007 2:[] 3:[] 4:[] 5:[] 6:[] 7:[] 8:[] 252:390]
RecoveryVaultPlayerInfo = 397,
RecoveryVaultPlayerInfo = 398,
RecoveryVaultGuildInfo,
UpdateWardrobe,
CastlePhaseChanged,
Expand Down Expand Up @@ -431,5 +431,5 @@ public enum EventCodes
Unknown420,
Unknown421,
Unknown422,
MightFavorPoints = 476 // map[0:63063 2:21021 3:16617 5:5539 6:349680 8:0 252:470] (0: Might, 2: Premium of might, 3: Favor, 5: Premium of favor, 6: Total favor, 8: ???)
MightFavorPoints = 477 // map[0:63063 2:21021 3:16617 5:5539 6:349680 8:0 252:470] (0: Might, 2: Premium of might, 3: Favor, 5: Premium of favor, 6: Total favor, 8: ???)
}
4 changes: 2 additions & 2 deletions src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.17.4.*")]
[assembly: AssemblyFileVersion("5.17.4.0")]
[assembly: AssemblyVersion("5.17.5.*")]
[assembly: AssemblyFileVersion("5.17.5.0")]
5 changes: 4 additions & 1 deletion src/StatisticsAnalysisTool/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/StatisticsAnalysisTool/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<Setting Name="ModifiedMobDataFileName" Type="System.String" Scope="Application">
<Value Profile="(Default)">mobs-modified.json</Value>
</Setting>
<Setting Name="IsDebugMode" Type="System.Boolean" Scope="Application">
<Setting Name="IsDebugMode" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
Expand Down

0 comments on commit cd91b99

Please sign in to comment.