diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3fc029b2d..491abf6c7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -10,7 +10,7 @@ "rollForward": false }, "csharpier": { - "version": "0.28.2", + "version": "0.29.1", "commands": [ "dotnet-csharpier" ], diff --git a/Directory.Packages.props b/Directory.Packages.props index c8f08b852..3642c3c47 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,7 @@ - + @@ -31,7 +31,8 @@ - + + @@ -40,7 +41,7 @@ - + @@ -59,7 +60,7 @@ - + @@ -80,7 +81,7 @@ - + \ No newline at end of file diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/DragaliaAPI.Database.Test.csproj b/DragaliaAPI/DragaliaAPI.Database.Test/DragaliaAPI.Database.Test.csproj index 761e97d52..f20c806b7 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/DragaliaAPI.Database.Test.csproj +++ b/DragaliaAPI/DragaliaAPI.Database.Test/DragaliaAPI.Database.Test.csproj @@ -5,6 +5,7 @@ + diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/Entities/DbFortBuildTest.cs b/DragaliaAPI/DragaliaAPI.Database.Test/Entities/DbFortBuildTest.cs index 746408adb..825eda51a 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/Entities/DbFortBuildTest.cs +++ b/DragaliaAPI/DragaliaAPI.Database.Test/Entities/DbFortBuildTest.cs @@ -20,7 +20,7 @@ public void FortPlantDetailId_IsCorrect(FortPlants plantId, int level, int expec { ViewerId = 1, PlantId = plantId, - Level = level + Level = level, }; entity.FortPlantDetailId.Should().Be(expectedDetailId); @@ -34,7 +34,7 @@ public void BuildStatus_BothDatesEpoch_IsNeutral() { ViewerId = 1, BuildStartDate = DateTimeOffset.UnixEpoch, - BuildEndDate = DateTimeOffset.UnixEpoch + BuildEndDate = DateTimeOffset.UnixEpoch, }; entity.BuildStatus.Should().Be(FortBuildStatus.Neutral); @@ -56,7 +56,7 @@ FortBuildStatus expected ViewerId = 1, Level = level, BuildStartDate = DateTimeOffset.UtcNow + TimeSpan.FromSeconds(startOffsetSec), - BuildEndDate = DateTimeOffset.UtcNow + TimeSpan.FromSeconds(endOffsetSec) + BuildEndDate = DateTimeOffset.UtcNow + TimeSpan.FromSeconds(endOffsetSec), }; entity.BuildStatus.Should().Be(expected); @@ -73,7 +73,7 @@ public void RemainTime_CalculatedCorrectly(int endOffsetSec, int expectedSec) new() { ViewerId = 1, - BuildEndDate = DateTimeOffset.UtcNow + TimeSpan.FromSeconds(endOffsetSec) + BuildEndDate = DateTimeOffset.UtcNow + TimeSpan.FromSeconds(endOffsetSec), }; entity.RemainTime.Should().BeCloseTo(TimeSpan.FromSeconds(expectedSec), AssertionTolerance); @@ -89,7 +89,7 @@ public void LastIncomeTime_CalculatedCorrectly(int incomeOffsetSec) new() { ViewerId = 1, - LastIncomeDate = DateTimeOffset.UtcNow + TimeSpan.FromSeconds(incomeOffsetSec) + LastIncomeDate = DateTimeOffset.UtcNow + TimeSpan.FromSeconds(incomeOffsetSec), }; entity diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/Entities/DbWeaponBodyTest.cs b/DragaliaAPI/DragaliaAPI.Database.Test/Entities/DbWeaponBodyTest.cs index 44cbda856..c763c9c70 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/Entities/DbWeaponBodyTest.cs +++ b/DragaliaAPI/DragaliaAPI.Database.Test/Entities/DbWeaponBodyTest.cs @@ -21,7 +21,7 @@ public void AbilityOneResolver_ReturnsExpectedLevel( int expectedLevel ) { - DbWeaponBody weapon = new() { WeaponBodyId = id, LimitOverCount = limitOverCount, }; + DbWeaponBody weapon = new() { WeaponBodyId = id, LimitOverCount = limitOverCount }; weapon.Ability1Level.Should().Be(expectedLevel); } @@ -42,7 +42,7 @@ public void AbilityTwoResolver_ReturnsExpectedLevel( int expectedLevel ) { - DbWeaponBody weapon = new() { WeaponBodyId = id, LimitOverCount = limitOverCount, }; + DbWeaponBody weapon = new() { WeaponBodyId = id, LimitOverCount = limitOverCount }; weapon.Ability2Level.Should().Be(expectedLevel); } diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/FortRepositoryTest.cs b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/FortRepositoryTest.cs index 6d7e92591..39d040bcf 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/FortRepositoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/FortRepositoryTest.cs @@ -42,7 +42,7 @@ await this.fixture.AddToDatabase( { ViewerId = DbTestFixture.ViewerId, PlantId = FortPlants.Dragonata, - Level = 10 + Level = 10, } ); @@ -57,7 +57,7 @@ await this.fixture.AddToDatabase( { ViewerId = DbTestFixture.ViewerId, PlantId = FortPlants.BroadleafTree, - Level = 3 + Level = 3, } ); @@ -124,7 +124,7 @@ public async Task GetBuilding_GetsBuilding() BuildStartDate = DateTimeOffset.MinValue, LastIncomeDate = DateTimeOffset.UnixEpoch, PositionX = 3, - PositionZ = 4 + PositionZ = 4, }; await this.fixture.AddToDatabase(build); @@ -147,7 +147,7 @@ public async Task GetBuilding_NotFound_Throws() BuildStartDate = DateTimeOffset.MinValue, LastIncomeDate = DateTimeOffset.UnixEpoch, PositionX = 3, - PositionZ = 4 + PositionZ = 4, }; await this.fixture.AddToDatabase(build); @@ -199,36 +199,36 @@ await this.fixture.AddRangeToDatabase( ViewerId = DbTestFixture.ViewerId, PlantId = FortPlants.PalmTree, BuildStartDate = DateTimeOffset.MinValue, - BuildEndDate = DateTimeOffset.MaxValue + BuildEndDate = DateTimeOffset.MaxValue, }, new() { ViewerId = DbTestFixture.ViewerId, PlantId = FortPlants.Lectern, BuildStartDate = DateTimeOffset.MinValue, - BuildEndDate = DateTimeOffset.MaxValue + BuildEndDate = DateTimeOffset.MaxValue, }, new() { ViewerId = DbTestFixture.ViewerId, PlantId = FortPlants.Snowdrake, BuildStartDate = DateTimeOffset.MinValue, - BuildEndDate = DateTimeOffset.UtcNow - TimeSpan.FromSeconds(22) + BuildEndDate = DateTimeOffset.UtcNow - TimeSpan.FromSeconds(22), }, new() { ViewerId = DbTestFixture.ViewerId, PlantId = FortPlants.Wishmill, BuildStartDate = DateTimeOffset.UnixEpoch, - BuildEndDate = DateTimeOffset.UnixEpoch + BuildEndDate = DateTimeOffset.UnixEpoch, }, new() { ViewerId = DbTestFixture.ViewerId + 1, PlantId = FortPlants.FafnirStatueFlame, BuildStartDate = DateTimeOffset.UnixEpoch, - BuildEndDate = DateTimeOffset.MaxValue - } + BuildEndDate = DateTimeOffset.MaxValue, + }, } ); @@ -281,7 +281,7 @@ public async Task AddDojos_AddsDojos() FortPlants.LanceDojo, FortPlants.ManacasterDojo, FortPlants.StaffDojo, - FortPlants.WandDojo + FortPlants.WandDojo, }; foreach (FortPlants plant in plants) @@ -309,7 +309,7 @@ public async Task AddToStorage_IsTotalQuantity_AddsBuilds() { ViewerId = DbTestFixture.ViewerId + 1, PlantId = FortPlants.FlameDracolith, - } + }, } ); await this.fixture.ApiContext.SaveChangesAsync(); @@ -337,7 +337,7 @@ public async Task AddToStorage_IsTotalQuantity_AlreadyOwned_DoesNotAddBuilds() this.fixture.ApiContext.PlayerFortBuilds.AddRange( new List() { - new() { ViewerId = DbTestFixture.ViewerId, PlantId = FortPlants.WindDracolith, } + new() { ViewerId = DbTestFixture.ViewerId, PlantId = FortPlants.WindDracolith }, } ); await this.fixture.ApiContext.SaveChangesAsync(); diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/InventoryRepositoryTest.cs b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/InventoryRepositoryTest.cs index 73b986bf0..652c6596d 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/InventoryRepositoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/InventoryRepositoryTest.cs @@ -48,7 +48,7 @@ await this.fixture.ApiContext.AddAsync( { ViewerId = ViewerId, MaterialId = Materials.FirestormPrism, - Quantity = 0 + Quantity = 0, } ); @@ -98,14 +98,14 @@ await this.fixture.ApiContext.PlayerMaterials.AddRangeAsync( { ViewerId = ViewerId + 2, MaterialId = Materials.AbaddonOrb, - Quantity = 5 + Quantity = 5, }, new() { ViewerId = ViewerId, MaterialId = Materials.AbaddonOrb, Quantity = 50, - } + }, } ); @@ -119,7 +119,7 @@ await this.fixture.ApiContext.PlayerMaterials.AddRangeAsync( { ViewerId = ViewerId, MaterialId = Materials.AbaddonOrb, - Quantity = 50 + Quantity = 50, }, opts => opts.Excluding(x => x.Owner) ); @@ -135,7 +135,7 @@ await this.fixture.ApiContext.PlayerMaterials.AddRangeAsync( { ViewerId = ViewerId + 4, MaterialId = Materials.AbaddonOrb, - Quantity = 5 + Quantity = 5, }, new() { @@ -148,7 +148,7 @@ await this.fixture.ApiContext.PlayerMaterials.AddRangeAsync( ViewerId = ViewerId, MaterialId = Materials.InfernoOrb, Quantity = 50, - } + }, } ); @@ -161,7 +161,7 @@ await this.fixture.ApiContext.PlayerMaterials.AddRangeAsync( { ViewerId = ViewerId, MaterialId = Materials.TsunamiOrb, - Quantity = 50 + Quantity = 50, }, opts => opts.Excluding(x => x.Owner) ) @@ -170,7 +170,7 @@ await this.fixture.ApiContext.PlayerMaterials.AddRangeAsync( { ViewerId = ViewerId, MaterialId = Materials.InfernoOrb, - Quantity = 50 + Quantity = 50, }, opts => opts.Excluding(x => x.Owner) ) @@ -187,14 +187,14 @@ await this.fixture.AddRangeToDatabase( { ViewerId = IdentityTestUtils.ViewerId, MaterialId = Materials.Valor, - Quantity = 5 + Quantity = 5, }, new() { ViewerId = IdentityTestUtils.ViewerId, MaterialId = Materials.Acclaim, - Quantity = 5 - } + Quantity = 5, + }, } ); @@ -227,7 +227,7 @@ await this.fixture.AddRangeToDatabase( { ViewerId = IdentityTestUtils.ViewerId, MaterialId = Materials.SummerEstelleSkin, - Quantity = 5 + Quantity = 5, }, } ); @@ -259,7 +259,7 @@ await this.fixture.AddToDatabase( { ViewerId = IdentityTestUtils.ViewerId, Quantity = 5, - MaterialId = Materials.Dragonfruit + MaterialId = Materials.Dragonfruit, } ); @@ -274,7 +274,7 @@ await this.fixture.AddToDatabase( { ViewerId = IdentityTestUtils.ViewerId, Quantity = 5, - MaterialId = Materials.FafnirMedal + MaterialId = Materials.FafnirMedal, } ); @@ -291,14 +291,14 @@ await this.fixture.AddRangeToDatabase( { ViewerId = IdentityTestUtils.ViewerId, MaterialId = Materials.ValentinesGift, - Quantity = 5 + Quantity = 5, }, new() { ViewerId = IdentityTestUtils.ViewerId, MaterialId = Materials.QuantumCog, - Quantity = 5 - } + Quantity = 5, + }, } ); @@ -307,7 +307,7 @@ await this.inventoryRepository.CheckQuantity( new Dictionary() { { Materials.ValentinesGift, 5 }, - { Materials.QuantumCog, 5 } + { Materials.QuantumCog, 5 }, } ) ) @@ -325,8 +325,8 @@ await this.fixture.AddRangeToDatabase( { ViewerId = IdentityTestUtils.ViewerId, MaterialId = Materials.ValeriosConviction, - Quantity = 5 - } + Quantity = 5, + }, } ); @@ -335,7 +335,7 @@ await this.inventoryRepository.CheckQuantity( new Dictionary() { { Materials.ValeriosConviction, 5 }, - { Materials.ValeriosDevotion, 5 } + { Materials.ValeriosDevotion, 5 }, } ) ) diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/PartyRepositoryTest.cs b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/PartyRepositoryTest.cs index 9cbecc740..5530012a5 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/PartyRepositoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/PartyRepositoryTest.cs @@ -48,8 +48,8 @@ public async Task SetParty_UpdatesDatabase() PartyNo = 3, Units = new List() { - new() { UnitNo = 1, CharaId = Charas.Ieyasu } - } + new() { UnitNo = 1, CharaId = Charas.Ieyasu }, + }, }; await this.partyRepository.SetParty(toAdd); @@ -84,7 +84,7 @@ public async Task SetParty_HandlesOverfilledUnitList() new() { UnitNo = 3, CharaId = Charas.Nobunaga }, new() { UnitNo = 4, CharaId = Charas.Chitose }, new() { UnitNo = 4, CharaId = Charas.Hanabusa }, - } + }, }; await this.partyRepository.SetParty(toAdd); @@ -104,7 +104,7 @@ public async Task SetParty_HandlesOverfilledUnitList() new(1, Charas.Ieyasu), new(2, Charas.Botan), new(3, Charas.Mitsuhide), - new(4, Charas.Chitose) + new(4, Charas.Chitose), } ); } diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/QuestRepositoryTest.cs b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/QuestRepositoryTest.cs index 70af47cd8..8b8385440 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/QuestRepositoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/QuestRepositoryTest.cs @@ -30,7 +30,7 @@ await this.fixture.AddRangeToDatabase( new List() { new() { ViewerId = ViewerId, QuestId = 1 }, - new() { ViewerId = ViewerId + 1, QuestId = 2 } + new() { ViewerId = ViewerId + 1, QuestId = 2 }, } ); diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/WeaponRepositoryTest.cs b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/WeaponRepositoryTest.cs index d8d1b8732..4addc06aa 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/WeaponRepositoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Database.Test/Repositories/WeaponRepositoryTest.cs @@ -34,7 +34,7 @@ await this.fixture.AddRangeToDatabase( new List() { new() { ViewerId = 2, WeaponBodyId = WeaponBodies.SoldiersBrand }, - new() { ViewerId = 1, WeaponBodyId = WeaponBodies.AbsoluteAqua } + new() { ViewerId = 1, WeaponBodyId = WeaponBodies.AbsoluteAqua }, } ); @@ -50,7 +50,7 @@ await this.fixture.AddRangeToDatabase( new List() { new() { ViewerId = 1, WeaponPassiveAbilityId = 1010107 }, - new() { ViewerId = 1, WeaponPassiveAbilityId = 1010108 } + new() { ViewerId = 1, WeaponPassiveAbilityId = 1010108 }, } ); @@ -73,7 +73,7 @@ public async Task Add_AddsToDatabase() new DbWeaponBody() { ViewerId = IdentityTestUtils.ViewerId, - WeaponBodyId = WeaponBodies.Arondight + WeaponBodyId = WeaponBodies.Arondight, } ); } @@ -86,11 +86,11 @@ await this.fixture.AddRangeToDatabase( { WeaponBodies.Abyssbringer, WeaponBodies.Blitzfang, - WeaponBodies.Camelot + WeaponBodies.Camelot, }.Select(x => new DbWeaponBody() { ViewerId = IdentityTestUtils.ViewerId, - WeaponBodyId = x + WeaponBodyId = x, }) ); @@ -112,7 +112,7 @@ await this.fixture.AddToDatabase( new DbWeaponBody() { ViewerId = IdentityTestUtils.ViewerId, - WeaponBodyId = WeaponBodies.Nothung + WeaponBodyId = WeaponBodies.Nothung, } ); @@ -134,7 +134,7 @@ await this.fixture.AddToDatabase( new DbWeaponBody() { ViewerId = IdentityTestUtils.ViewerId, - WeaponBodyId = WeaponBodies.InfernoApogee + WeaponBodyId = WeaponBodies.InfernoApogee, } ); @@ -156,7 +156,7 @@ await this.fixture.AddToDatabase( new DbWeaponPassiveAbility() { ViewerId = IdentityTestUtils.ViewerId, - WeaponPassiveAbilityId = passiveId + WeaponPassiveAbilityId = passiveId, } ); } @@ -168,7 +168,7 @@ await this.fixture.AddToDatabase( new DbWeaponBody() { ViewerId = IdentityTestUtils.ViewerId, - WeaponBodyId = WeaponBodies.RoaringWeald + WeaponBodyId = WeaponBodies.RoaringWeald, } ); @@ -198,7 +198,7 @@ public async Task AddSkin_AddsSkin() ViewerId = IdentityTestUtils.ViewerId, WeaponSkinId = 4, IsNew = false, - GetTime = DateTimeOffset.UtcNow + GetTime = DateTimeOffset.UtcNow, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Database.Test/Utils/TutorialFlagUtilTest.cs b/DragaliaAPI/DragaliaAPI.Database.Test/Utils/TutorialFlagUtilTest.cs index e5d57c19e..bd00c429d 100644 --- a/DragaliaAPI/DragaliaAPI.Database.Test/Utils/TutorialFlagUtilTest.cs +++ b/DragaliaAPI/DragaliaAPI.Database.Test/Utils/TutorialFlagUtilTest.cs @@ -17,7 +17,7 @@ public void ConvertIntToFlagList() { (int)TutorialFlags.GrowthDragon, (int)TutorialFlags.GuildTutorial, - (int)TutorialFlags.SagaTutorial + (int)TutorialFlags.SagaTutorial, } ); } @@ -31,7 +31,7 @@ public void ConvertFlagIntListToInt() { (int)TutorialFlags.GrowthDragon, (int)TutorialFlags.GuildTutorial, - (int)TutorialFlags.SagaTutorial + (int)TutorialFlags.SagaTutorial, } ) .Should() @@ -47,7 +47,7 @@ public void ConvertFlagIntListToInt_AddOverload() { (int)TutorialFlags.GrowthDragon, (int)TutorialFlags.GuildTutorial, - (int)TutorialFlags.SagaTutorial + (int)TutorialFlags.SagaTutorial, }, 1 << 3 ) diff --git a/DragaliaAPI/DragaliaAPI.Database/Entities/DbNewsItem.cs b/DragaliaAPI/DragaliaAPI.Database/Entities/DbNewsItem.cs index f7a202820..7f67910f9 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Entities/DbNewsItem.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Entities/DbNewsItem.cs @@ -73,7 +73,7 @@ public void Configure(EntityTypeBuilder builder) Description = "The below infographic shows the endeavour rewards available for the progressing the Mercurial Gauntlet.", BodyImagePath = "/dawnshard/news/mg-endeavours.webp", - Date = new DateTimeOffset(2024, 06, 02, 16, 07, 00, TimeSpan.FromHours(1)) + Date = new DateTimeOffset(2024, 06, 02, 16, 07, 00, TimeSpan.FromHours(1)), } ); } diff --git a/DragaliaAPI/DragaliaAPI.Database/Entities/DbWeaponBody.cs b/DragaliaAPI/DragaliaAPI.Database/Entities/DbWeaponBody.cs index 1ebc3513a..e4a701dcc 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Entities/DbWeaponBody.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Entities/DbWeaponBody.cs @@ -126,7 +126,7 @@ public int SkillNo { weaponData.ChangeSkillId1, weaponData.ChangeSkillId2, - weaponData.ChangeSkillId3 + weaponData.ChangeSkillId3, }; return GetCurrentSkillNo(skillIds); diff --git a/DragaliaAPI/DragaliaAPI.Database/Repositories/InventoryRepository.cs b/DragaliaAPI/DragaliaAPI.Database/Repositories/InventoryRepository.cs index 47a9141ae..f8b059133 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Repositories/InventoryRepository.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Repositories/InventoryRepository.cs @@ -36,7 +36,7 @@ public DbPlayerMaterial AddMaterial(Materials type) { ViewerId = this.playerIdentityService.ViewerId, MaterialId = type, - Quantity = 0 + Quantity = 0, } ) .Entity; @@ -72,7 +72,7 @@ await this.apiContext.AddAsync( { ViewerId = this.playerIdentityService.ViewerId, MaterialId = item, - Quantity = 0 + Quantity = 0, } ) ).Entity; diff --git a/DragaliaAPI/DragaliaAPI.Database/Repositories/PartyRepository.cs b/DragaliaAPI/DragaliaAPI.Database/Repositories/PartyRepository.cs index 7fc332bd2..16e735ec8 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Repositories/PartyRepository.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Repositories/PartyRepository.cs @@ -84,7 +84,7 @@ private static List CleanUnitList(ICollection original ViewerId = original.First().ViewerId, PartyNo = original.First().PartyNo, UnitNo = i, - CharaId = 0 + CharaId = 0, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Database/Repositories/QuestRepository.cs b/DragaliaAPI/DragaliaAPI.Database/Repositories/QuestRepository.cs index 4973dfea0..0ea2d9f8b 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Repositories/QuestRepository.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Repositories/QuestRepository.cs @@ -55,7 +55,7 @@ public async Task GetQuestEventAsync(int questEventId) new DbQuestEvent { ViewerId = playerIdentityService.ViewerId, - QuestEventId = questEventId + QuestEventId = questEventId, } ) .Entity; diff --git a/DragaliaAPI/DragaliaAPI.Database/Repositories/UnitRepository.cs b/DragaliaAPI/DragaliaAPI.Database/Repositories/UnitRepository.cs index ab2649caa..b76e034ac 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Repositories/UnitRepository.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Repositories/UnitRepository.cs @@ -83,7 +83,7 @@ public DbSetUnit AddCharaSetData(Charas charaId, int setNo) ViewerId = this.playerIdentityService.ViewerId, CharaId = charaId, UnitSetNo = setNo, - UnitSetName = $"Set {setNo}" + UnitSetName = $"Set {setNo}", } ) .Entity; @@ -128,7 +128,7 @@ int additionalAttack TalismanAbilityId3 = abilityId3, AdditionalHp = additionalHp, AdditionalAttack = additionalAttack, - GetTime = DateTimeOffset.UtcNow + GetTime = DateTimeOffset.UtcNow, } ) .Entity; diff --git a/DragaliaAPI/DragaliaAPI.Database/Repositories/WeaponRepository.cs b/DragaliaAPI/DragaliaAPI.Database/Repositories/WeaponRepository.cs index 8ffef53b8..50d316c0d 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Repositories/WeaponRepository.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Repositories/WeaponRepository.cs @@ -73,7 +73,7 @@ await this.apiContext.PlayerWeapons.AddAsync( new DbWeaponBody() { ViewerId = this.playerIdentityService.ViewerId, - WeaponBodyId = weaponBodyId + WeaponBodyId = weaponBodyId, } ); } @@ -99,7 +99,7 @@ await this.apiContext.PlayerWeaponSkins.AddAsync( { ViewerId = this.playerIdentityService.ViewerId, WeaponSkinId = weaponSkinId, - GetTime = DateTimeOffset.UtcNow + GetTime = DateTimeOffset.UtcNow, } ); } @@ -142,7 +142,7 @@ await this.apiContext.PlayerPassiveAbilities.AddAsync( new() { ViewerId = this.playerIdentityService.ViewerId, - WeaponPassiveAbilityId = passiveAbility.Id + WeaponPassiveAbilityId = passiveAbility.Id, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Database/Utils/CharaConstants.cs b/DragaliaAPI/DragaliaAPI.Database/Utils/CharaConstants.cs index 6dddbbcf0..6ba6b2567 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Utils/CharaConstants.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Utils/CharaConstants.cs @@ -121,6 +121,6 @@ public static byte GetMaxLevelFor(int rarity) 6961950, 7551950, 8186950, - 8866950 + 8866950, }.ToImmutableList(); } diff --git a/DragaliaAPI/DragaliaAPI.Database/Utils/CharaUtils.cs b/DragaliaAPI/DragaliaAPI.Database/Utils/CharaUtils.cs index aa222430a..444d0ee9f 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Utils/CharaUtils.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Utils/CharaUtils.cs @@ -31,7 +31,7 @@ public static int CalculateBaseHp(CharaData adventurer, int level, int rarity) 3 => adventurer.MinHp3, 4 => adventurer.MinHp4, 5 => adventurer.MinHp5, - _ => throw new ArgumentException("Invalid rarity!") + _ => throw new ArgumentException("Invalid rarity!"), }; lvlBase = MinLevel; } @@ -59,7 +59,7 @@ public static int CalculateBaseAttack(CharaData adventurer, int level, int rarit 3 => adventurer.MinAtk3, 4 => adventurer.MinAtk4, 5 => adventurer.MinAtk5, - _ => throw new ArgumentException("Invalid rarity!") + _ => throw new ArgumentException("Invalid rarity!"), }; lvlBase = MinLevel; } diff --git a/DragaliaAPI/DragaliaAPI.Database/Utils/DragonConstants.cs b/DragaliaAPI/DragaliaAPI.Database/Utils/DragonConstants.cs index c94443a93..2799cf0c1 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Utils/DragonConstants.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Utils/DragonConstants.cs @@ -158,7 +158,7 @@ public static byte GetMaxLevelFor(int rarity, int limitBreak) 2732280, 2925060, 3135840, - 3365620 + 3365620, }.ToImmutableArray(); public const int MaxRelLevel = 30; @@ -171,7 +171,7 @@ public static byte GetMaxLevelFor(int rarity, int limitBreak) DragonGifts.FloralCirclet, DragonGifts.CompellingBook, DragonGifts.ManaEssence, - DragonGifts.GoldenChalice + DragonGifts.GoldenChalice, }.ToImmutableArray(); public static readonly ImmutableDictionary FavorVals = new Dictionary< @@ -192,7 +192,7 @@ public static byte GetMaxLevelFor(int rarity, int limitBreak) { DragonGifts.FourLeafClover, 1000 }, { DragonGifts.DragonyuleCake, 1000 }, { DragonGifts.ValentinesCard, 1000 }, - { DragonGifts.PupGrub, 200 } + { DragonGifts.PupGrub, 200 }, }.ToImmutableDictionary(); public static readonly ImmutableDictionary BuyGiftPrices = new Dictionary< @@ -209,7 +209,7 @@ public static byte GetMaxLevelFor(int rarity, int limitBreak) { DragonGifts.FloralCirclet, 12000 }, { DragonGifts.CompellingBook, 12000 }, { DragonGifts.ManaEssence, 12000 }, - { DragonGifts.GoldenChalice, 15000 } + { DragonGifts.GoldenChalice, 15000 }, }.ToImmutableDictionary(); public const float FavMulti = 1.5f; @@ -245,7 +245,7 @@ public static byte GetMaxLevelFor(int rarity, int limitBreak) 27300, 30100, 33100, - 36300 + 36300, }.ToImmutableArray(); public static readonly ImmutableArray BondXpLimitsPuppy = new[] @@ -279,7 +279,7 @@ public static byte GetMaxLevelFor(int rarity, int limitBreak) 2600, 2700, 2800, - 2900 + 2900, }.ToImmutableArray(); public static readonly IImmutableSet UnsummonableDragons = new HashSet @@ -297,6 +297,6 @@ public static byte GetMaxLevelFor(int rarity, int limitBreak) Dragons.MiniMercs, Dragons.MiniJupi, Dragons.MiniZodi, - Dragons.Puppy + Dragons.Puppy, }.ToImmutableHashSet(); } diff --git a/DragaliaAPI/DragaliaAPI.Database/Utils/MissionState.cs b/DragaliaAPI/DragaliaAPI.Database/Utils/MissionState.cs index c6e3687bf..80266e574 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Utils/MissionState.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Utils/MissionState.cs @@ -5,5 +5,5 @@ public enum MissionState Invalid = -1, InProgress, Completed, - Claimed + Claimed, } diff --git a/DragaliaAPI/DragaliaAPI.Database/Utils/TutorialFlagUtil.cs b/DragaliaAPI/DragaliaAPI.Database/Utils/TutorialFlagUtil.cs index 5f04ad749..15f5b86d7 100644 --- a/DragaliaAPI/DragaliaAPI.Database/Utils/TutorialFlagUtil.cs +++ b/DragaliaAPI/DragaliaAPI.Database/Utils/TutorialFlagUtil.cs @@ -33,7 +33,7 @@ public enum TutorialFlags AlbumTutorial = 1027, ServerMostDefinitelyDiabolos = 1028, SagaTutorial = 1029, - ServerClearSixteenthChapter = 1030 + ServerClearSixteenthChapter = 1030, } public static class TutorialFlagUtil diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/CustomWebApplicationFactory.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/CustomWebApplicationFactory.cs index cb130b10e..2d6defc7f 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/CustomWebApplicationFactory.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/CustomWebApplicationFactory.cs @@ -67,8 +67,8 @@ public async Task InitializeAsync() { EndPoints = new EndPointCollection { - { this.testContainersHelper.RedisHost, this.testContainersHelper.RedisPort } - } + { this.testContainersHelper.RedisHost, this.testContainersHelper.RedisPort }, + }, } ); } @@ -104,8 +104,11 @@ protected override void ConfigureWebHost(IWebHostBuilder builder) { EndPoints = new() { - { this.testContainersHelper.RedisHost, this.testContainersHelper.RedisPort } - } + { + this.testContainersHelper.RedisHost, + this.testContainersHelper.RedisPort + }, + }, }; options.InstanceName = "RedisInstance"; }); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/CastleStoryTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/CastleStoryTest.cs index 92657c7c8..97c303495 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/CastleStoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/CastleStoryTest.cs @@ -29,8 +29,8 @@ await this.Client.PostMsgpack( { EntityType = EntityTypes.Wyrmite, EntityQuantity = 50, - EntityId = 0 - } + EntityId = 0, + }, } ); @@ -39,7 +39,7 @@ await this.Client.PostMsgpack( .BeEquivalentTo( new List() { - new() { CastleStoryId = 1, IsRead = true, } + new() { CastleStoryId = 1, IsRead = true }, } ); } @@ -53,7 +53,7 @@ public async Task ReadStory_StoryRead_ResponseHasNoRewards() ViewerId = ViewerId, State = StoryState.Read, StoryId = 2, - StoryType = StoryTypes.Castle + StoryType = StoryTypes.Castle, } ); await this.ApiContext.SaveChangesAsync(); @@ -107,7 +107,7 @@ await this.Client.PostMsgpack( ViewerId = ViewerId, State = StoryState.Read, StoryId = 3, - StoryType = StoryTypes.Castle + StoryType = StoryTypes.Castle, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/CharaTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/CharaTest.cs index 5e0b41a39..09f108c7c 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/CharaTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/CharaTest.cs @@ -86,7 +86,7 @@ await this.Client.PostMsgpack( Charas.Celliera, new List() { - new AtgenEnemyPiece() { Id = Materials.GoldCrystal, Quantity = 300 } + new AtgenEnemyPiece() { Id = Materials.GoldCrystal, Quantity = 300 }, } ) ) @@ -199,7 +199,7 @@ await this.AddToDatabase( ViewerId = ViewerId, StoryId = storyId, State = StoryState.Read, - StoryType = StoryTypes.Chara + StoryType = StoryTypes.Chara, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/DragonTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/DragonTest.cs index ed1d3573c..be11334c5 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/DragonTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/DragonTest.cs @@ -34,7 +34,7 @@ public DragonBuildUpTheoryData() #region GarudaDragonSacrifice List setupDragons = new List { - new DbPlayerDragonData(0, Dragons.Garuda) + new DbPlayerDragonData(0, Dragons.Garuda), }; DbPlayerDragonData dragon = new DbPlayerDragonData(0, Dragons.Garuda); dragon.AttackPlusCount = 25; @@ -83,9 +83,9 @@ public async Task DragonBuildUp_ReturnsUpgradedDragonData(DragonBuildUpTestCase testCase.MatType == EntityTypes.Dragon ? (int)dbDragonSacrifice.DragonKeyId : testCase.UpgradeMat, - Quantity = testCase.UsedQuantity - } - } + Quantity = testCase.UsedQuantity, + }, + }, }; DragonBuildupResponse response = ( @@ -125,9 +125,9 @@ public async Task DragonBuildUp_ReturnsDragonDataWithAugments() { Type = EntityTypes.Material, Id = (int)Materials.AmplifyingDragonscale, - Quantity = 25 - } - } + Quantity = 25, + }, + }, }; DragonBuildupResponse? response = ( @@ -169,7 +169,7 @@ await this.ApiContext.PlayerMaterials.FindAsync( DragonResetPlusCountRequest request = new DragonResetPlusCountRequest() { DragonKeyId = (ulong)dragon.DragonKeyId, - PlusCountType = PlusCountType.Atk + PlusCountType = PlusCountType.Atk, }; DragonSetLockResponse? response = ( @@ -228,8 +228,8 @@ public async Task DragonBuyGiftToSendMultiple_IncreasesReliabilityAndReturnsGift DragonGiftIdList = new List() { DragonGifts.FreshBread, - DragonGifts.TastyMilk - } + DragonGifts.TastyMilk, + }, }; DragonBuyGiftToSendMultipleResponse? response = ( @@ -270,7 +270,7 @@ await this.AddToDatabase( DragonBuyGiftToSendRequest request = new DragonBuyGiftToSendRequest() { DragonId = Dragons.HighJupiter, - DragonGiftId = DragonGifts.HeartyStew + DragonGiftId = DragonGifts.HeartyStew, }; DragonBuyGiftToSendResponse? response = ( @@ -307,7 +307,7 @@ public async Task DragonSendGiftMultiple_IncreasesReliabilityAndReturnsGifts() { DragonId = Dragons.HighMercury, DragonGiftId = DragonGifts.FourLeafClover, - Quantity = 10 + Quantity = 10, }; DragonSendGiftMultipleResponse? response = ( @@ -335,7 +335,7 @@ public async Task DragonGiftSendMultiple_ReachLevel5_ReturnsExpectedRewardReliab { DragonId = Dragons.HighMercury, DragonGiftId = DragonGifts.FourLeafClover, - Quantity = 1 + Quantity = 1, }; DragonSendGiftMultipleResponse? response = ( @@ -354,8 +354,8 @@ await this.Client.PostMsgpack( { Level = 5, IsReleaseStory = true, - LevelupEntityList = [] - } + LevelupEntityList = [], + }, } ); } @@ -370,14 +370,14 @@ await this.AddToDatabase( { Type = MissionType.Drill, Id = missionId, - State = MissionState.InProgress + State = MissionState.InProgress, } ); await this.AddRangeToDatabase( [ - new DbPlayerDragonReliability() { DragonId = Dragons.Apollo, }, - new DbPlayerDragonReliability() { DragonId = Dragons.Kagutsuchi } + new DbPlayerDragonReliability() { DragonId = Dragons.Apollo }, + new DbPlayerDragonReliability() { DragonId = Dragons.Kagutsuchi }, ] ); @@ -437,7 +437,7 @@ await this.Client.PostMsgpack( Id = missionId, Type = MissionType.Drill, Progress = 30, - State = MissionState.Completed + State = MissionState.Completed, } ); } @@ -450,7 +450,7 @@ public async Task DragonSendGift_IncreasesReliabilityAndReturnsGifts() DragonSendGiftRequest request = new DragonSendGiftRequest() { DragonId = Dragons.Puppy, - DragonGiftId = DragonGifts.PupGrub + DragonGiftId = DragonGifts.PupGrub, }; DragonSendGiftResponse? response = ( @@ -478,7 +478,7 @@ await this.AddToDatabase( ViewerId = ViewerId, StoryId = storyId, State = StoryState.Read, - StoryType = StoryTypes.Dragon + StoryType = StoryTypes.Dragon, } ); } @@ -488,7 +488,7 @@ await this.AddToDatabase( { DragonId = Dragons.MidgardsormrZero, DragonGiftId = DragonGifts.FourLeafClover, - Quantity = 100 + Quantity = 100, }; DragaliaResponse? response = ( @@ -517,7 +517,7 @@ public DragonLimitBreakTheoryData() new List() { new DbPlayerDragonData(0, Dragons.Juggernaut), - new DbPlayerDragonData(0, Dragons.Juggernaut) + new DbPlayerDragonData(0, Dragons.Juggernaut), }, 1, DragonLimitBreakMatTypes.Dupe @@ -529,7 +529,7 @@ public DragonLimitBreakTheoryData() new DragonLimitBreakTestCase( new List() { - new DbPlayerDragonData(0, Dragons.Midgardsormr) + new DbPlayerDragonData(0, Dragons.Midgardsormr), }, 1, DragonLimitBreakMatTypes.Stone @@ -550,7 +550,7 @@ public DragonLimitBreakTheoryData() new DragonLimitBreakTestCase( new List() { - new DbPlayerDragonData(0, Dragons.HighBrunhilda) + new DbPlayerDragonData(0, Dragons.HighBrunhilda), }, 5, DragonLimitBreakMatTypes.SpheresLB5 @@ -584,9 +584,9 @@ public async Task DragonLimitBreak_LimitBreaks(DragonLimitBreakTestCase testCase TargetId = testCase.LbMatType == DragonLimitBreakMatTypes.Dupe ? (ulong)dbDragonSacrifice!.DragonKeyId - : 0 - } - } + : 0, + }, + }, }; DragonBuildupResponse? response = ( @@ -624,7 +624,7 @@ public async Task DragonSetLock_ReturnsLockDragonData() DragonSetLockRequest request = new DragonSetLockRequest() { DragonKeyId = (ulong)dragon.DragonKeyId, - IsLock = true + IsLock = true, }; DragonSetLockResponse? response = ( @@ -659,7 +659,7 @@ public async Task DragonSell_SuccessfulSale() DragonSellRequest request = new DragonSellRequest() { - DragonKeyIdList = new List() { (ulong)dragon.DragonKeyId } + DragonKeyIdList = new List() { (ulong)dragon.DragonKeyId }, }; DragonSellResponse? response = ( @@ -705,8 +705,8 @@ public async Task DragonSell_Multi_SuccessfulSale() DragonKeyIdList = new List() { (ulong)dragonSimurgh.DragonKeyId, - (ulong)dragonStribog.DragonKeyId - } + (ulong)dragonStribog.DragonKeyId, + }, }; DragonSellResponse? response = ( diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/DungeonTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/DungeonTest.cs index ef4058ceb..e5ceef28c 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/DungeonTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/DungeonTest.cs @@ -14,7 +14,7 @@ await this.Client.PostMsgpack( new DungeonStartStartRequest() { PartyNoList = new List() { 2 }, - QuestId = 100010306 + QuestId = 100010306, } ) ).Data.IngameData.DungeonKey; @@ -39,7 +39,7 @@ await this.Client.PostMsgpack( new DungeonStartStartRequest() { PartyNoList = new List() { 1 }, - QuestId = 100010207 + QuestId = 100010207, } ) ).Data.IngameData.DungeonKey; @@ -59,7 +59,7 @@ await this.Client.PostMsgpack( IsHost = true, QuestId = 100010207, WallId = 0, - WallLevel = 0 + WallLevel = 0, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/EulaTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/EulaTest.cs index a4a303f3e..420137ec2 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/EulaTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/EulaTest.cs @@ -23,7 +23,7 @@ await this.Client.PostMsgpack("eula/get_version_list new("gb", "en_us", 1, 1), new("gb", "en_eu", 1, 1), new("us", "en_us", 1, 6), - new("us", "en_eu", 1, 6) + new("us", "en_eu", 1, 6), } ); } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/FriendTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/FriendTest.cs index 351e9f88e..ef5e5a36e 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/FriendTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/FriendTest.cs @@ -50,7 +50,7 @@ await this.Client.PostMsgpack( ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -64,7 +64,7 @@ await this.Client.PostMsgpack( Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -75,14 +75,14 @@ await this.Client.PostMsgpack( EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaEmile, AdditionalAttack = 100, - AdditionalHp = 100 + AdditionalHp = 100, }, SupportCrestSlotType1List = new List() { @@ -93,7 +93,7 @@ await this.Client.PostMsgpack( LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -102,7 +102,7 @@ await this.Client.PostMsgpack( LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -111,7 +111,7 @@ await this.Client.PostMsgpack( LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -123,7 +123,7 @@ await this.Client.PostMsgpack( LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -132,7 +132,7 @@ await this.Client.PostMsgpack( LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -144,7 +144,7 @@ await this.Client.PostMsgpack( LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -153,10 +153,10 @@ await this.Client.PostMsgpack( LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, o => o.Excluding(x => x.LastLoginDate) ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/MatchingTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/MatchingTest.cs index e59ed9f9e..7fe50001a 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/MatchingTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/MatchingTest.cs @@ -30,8 +30,8 @@ public async Task GetRoomList_ReturnsRoomList() { ActorNr = 1, ViewerId = ViewerId, - PartyNoList = new List() { 1 } - } + PartyNoList = new List() { 1 }, + }, }, StartEntryTime = DateTimeOffset.FromUnixTimeSeconds(1662160789), EntryConditions = new() @@ -42,7 +42,7 @@ public async Task GetRoomList_ReturnsRoomList() ObjectiveTextId = 2, }, MatchingCompatibleId = 36, - } + }, } ); @@ -79,7 +79,7 @@ await this.Client.PostMsgpack( QuestType = QuestTypes.Dungeon, RoomMemberList = new List() { - new() { ViewerId = (ulong)ViewerId, } + new() { ViewerId = (ulong)ViewerId }, }, StartEntryTime = DateTimeOffset.FromUnixTimeSeconds(1662160789), EntryConditions = new() @@ -87,12 +87,12 @@ await this.Client.PostMsgpack( UnacceptedElementTypeList = new List() { 1, 2, 3, 4, 5 }, UnacceptedWeaponTypeList = new List() { 1, 2 }, RequiredPartyPower = 100, - ObjectiveTextId = 2 + ObjectiveTextId = 2, }, CompatibleId = 36, MemberNum = 1, - } - } + }, + }, } ); } @@ -115,8 +115,8 @@ public async Task GetRoomListByQuestId_ReturnsRoomList() { ActorNr = 1, ViewerId = ViewerId, - PartyNoList = new List() { 1 } - } + PartyNoList = new List() { 1 }, + }, }, StartEntryTime = DateTimeOffset.FromUnixTimeSeconds(1662160789), EntryConditions = new() @@ -127,7 +127,7 @@ public async Task GetRoomListByQuestId_ReturnsRoomList() ObjectiveTextId = 2, }, MatchingCompatibleId = 36, - } + }, } ); @@ -164,7 +164,7 @@ await this.Client.PostMsgpack( QuestType = QuestTypes.Dungeon, RoomMemberList = new List() { - new() { ViewerId = (ulong)ViewerId, } + new() { ViewerId = (ulong)ViewerId }, }, StartEntryTime = DateTimeOffset.FromUnixTimeSeconds(1662160789), EntryConditions = new() @@ -172,12 +172,12 @@ await this.Client.PostMsgpack( UnacceptedElementTypeList = new List() { 1, 2, 3, 4, 5 }, UnacceptedWeaponTypeList = new List() { 1, 2 }, RequiredPartyPower = 100, - ObjectiveTextId = 2 + ObjectiveTextId = 2, }, CompatibleId = 36, MemberNum = 1, - } - } + }, + }, } ); } @@ -198,8 +198,8 @@ public async Task GetRoomName_ReturnsRoom() { ActorNr = 1, ViewerId = ViewerId, - PartyNoList = new List() { 1 } - } + PartyNoList = new List() { 1 }, + }, }, StartEntryTime = DateTimeOffset.FromUnixTimeSeconds(1662160789), EntryConditions = new() @@ -244,7 +244,7 @@ await this.Client.PostMsgpack( QuestType = QuestTypes.Dungeon, RoomMemberList = new List() { - new() { ViewerId = (ulong)ViewerId, } + new() { ViewerId = (ulong)ViewerId }, }, StartEntryTime = DateTimeOffset.FromUnixTimeSeconds(1662160789), EntryConditions = new() @@ -252,7 +252,7 @@ await this.Client.PostMsgpack( UnacceptedElementTypeList = new List() { 1, 2, 3, 4, 5 }, UnacceptedWeaponTypeList = new List() { 1, 2 }, RequiredPartyPower = 100, - ObjectiveTextId = 2 + ObjectiveTextId = 2, }, CompatibleId = 36, MemberNum = 1, @@ -260,7 +260,7 @@ await this.Client.PostMsgpack( ClusterName = "jp", IsFriend = false, QuestId = 204550501, - RoomName = "7942ce2a-c0ac-4e41-8472-0cf5918f3953" + RoomName = "7942ce2a-c0ac-4e41-8472-0cf5918f3953", } ); } @@ -281,8 +281,8 @@ public async Task GetRoomName_UnrecognizedViewerId_UsesDefault() { ActorNr = 1, ViewerId = 40000, - PartyNoList = new List() { 1 } - } + PartyNoList = new List() { 1 }, + }, }, StartEntryTime = DateTimeOffset.FromUnixTimeSeconds(1662160789), EntryConditions = new() @@ -327,7 +327,7 @@ await this.Client.PostMsgpack( QuestType = QuestTypes.Dungeon, RoomMemberList = new List() { - new() { ViewerId = 40000, } + new() { ViewerId = 40000 }, }, StartEntryTime = DateTimeOffset.FromUnixTimeSeconds(1662160789), EntryConditions = new() @@ -335,7 +335,7 @@ await this.Client.PostMsgpack( UnacceptedElementTypeList = new List() { 1, 2, 3, 4, 5 }, UnacceptedWeaponTypeList = new List() { 1, 2 }, RequiredPartyPower = 100, - ObjectiveTextId = 2 + ObjectiveTextId = 2, }, CompatibleId = 36, MemberNum = 1, @@ -343,7 +343,7 @@ await this.Client.PostMsgpack( ClusterName = "jp", IsFriend = false, QuestId = 204550501, - RoomName = "7942ce2a-c0ac-4e41-8472-0cf5918f3953" + RoomName = "7942ce2a-c0ac-4e41-8472-0cf5918f3953", } ); } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/PartyTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/PartyTest.cs index 15470d2c2..81516da78 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/PartyTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/PartyTest.cs @@ -34,8 +34,8 @@ await this.Client.PostMsgpack( UnitNo = 1, CharaId = Charas.Ilia, EquipWeaponBodyId = WeaponBodies.DivineTrigger, - EquipCrestSlotType1CrestId1 = AbilityCrestId.ADragonyuleforIlia - } + EquipCrestSlotType1CrestId1 = AbilityCrestId.ADragonyuleforIlia, + }, }, "My New Party", false, @@ -118,7 +118,7 @@ await this.Client.PostMsgpack( 1, new List() { - new() { UnitNo = 1, CharaId = storyZethia, } + new() { UnitNo = 1, CharaId = storyZethia }, }, "My New Party", false, @@ -136,7 +136,7 @@ public async Task SetPartySetting_InvalidRequest_NotOwnedCharacter_ReturnsResult 1, new List() { - new(1, Charas.GalaGatov, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + new(1, Charas.GalaGatov, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), }, "My New Party", false, @@ -167,7 +167,7 @@ public async Task SetPartySetting_InvalidRequest_NotOwnedDragonKeyId_ReturnsResu 1, new List() { - new(1, Charas.ThePrince, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + new(1, Charas.ThePrince, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), }, "My New Party", false, diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/UpdateTest.cs index 686198a1f..61c0d1c2e 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/UpdateTest.cs @@ -46,8 +46,8 @@ await this.Client.PostMsgpack( { TargetList = new List() { - new AtgenTargetList() { TargetName = "emblem", TargetIdList = null, } - } + new AtgenTargetList() { TargetName = "emblem", TargetIdList = null }, + }, } ) ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/UserTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/UserTest.cs index ea4d42a39..14661f7fd 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/UserTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/UserTest.cs @@ -24,7 +24,7 @@ public async Task LinkedNAccount_ReturnsExpectedResponse() .BeEquivalentTo( new UserLinkedNAccountResponse() { - UpdateDataList = new() { UserData = expectedUserData } + UpdateDataList = new() { UserData = expectedUserData }, }, opts => opts.Excluding(x => x.UpdateDataList.UserData.Crystal) ); @@ -41,9 +41,9 @@ public async Task GetNAccountInfo_ReturnsExpectedResponse() NAccountInfo = new() { Email = "placeholder@email.com", - Nickname = "placeholder nickname" + Nickname = "placeholder nickname", }, - UpdateDataList = new() + UpdateDataList = new(), }, opts => opts.Excluding(x => x.UpdateDataList.UserData.Crystal) ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/WeaponBodyTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/WeaponBodyTest.cs index db443c97e..233360294 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/WeaponBodyTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Dragalia/WeaponBodyTest.cs @@ -54,7 +54,7 @@ await this.Client.PostMsgpack( UnlockWeaponPassiveAbilityNoList = Enumerable.Repeat(0, 15), IsNew = false, GetTime = DateTimeOffset.UtcNow, - } + }, } ); @@ -114,7 +114,7 @@ WeaponUpgradeTestCase testCase new() { WeaponBodyId = testCase.InitialState.WeaponBodyId, - BuildupWeaponBodyPieceList = testCase.StepList + BuildupWeaponBodyPieceList = testCase.StepList, }; WeaponBodyBuildupPieceResponse response = ( @@ -225,7 +225,7 @@ await this.AddToDatabase( { ViewerId = 0, WeaponBodyId = WeaponBodies.ChanzelianCaster, - BuildupCount = 4 + BuildupCount = 4, } ); @@ -237,8 +237,8 @@ await this.Client.PostMsgpack( WeaponBodyId = WeaponBodies.ChanzelianCaster, BuildupWeaponBodyPieceList = new List() { - new() { BuildupPieceType = BuildupPieceTypes.Stats, Step = 40 } - } + new() { BuildupPieceType = BuildupPieceTypes.Stats, Step = 40 }, + }, }, ensureSuccessHeader: false ) @@ -279,7 +279,7 @@ public WeaponUpgradeTheoryData() { { Materials.PrimalWaterwyrmsSphere, 40 }, { Materials.PrimalWaterwyrmsGreatsphere, 30 }, - { Materials.TwinklingSand, 2 } + { Materials.TwinklingSand, 2 }, }, 4_000_000, new() @@ -307,16 +307,16 @@ public WeaponUpgradeTheoryData() { BuildupPieceType = BuildupPieceTypes.Unbind, Step = 1, - IsUseDedicatedMaterial = true + IsUseDedicatedMaterial = true, }, new() { BuildupPieceType = BuildupPieceTypes.Unbind, Step = 2, - IsUseDedicatedMaterial = true + IsUseDedicatedMaterial = true, }, }, - new() { { Materials.AdamantiteIngot, 2 }, }, + new() { { Materials.AdamantiteIngot, 2 } }, 0, new() { @@ -335,14 +335,14 @@ public WeaponUpgradeTheoryData() { ViewerId = 0, WeaponBodyId = WeaponBodies.ChimeratechAnomalocaris, - BuildupCount = 0 + BuildupCount = 0, }, Enumerable .Range(1, 55) .Select(x => new AtgenBuildupWeaponBodyPieceList() { BuildupPieceType = BuildupPieceTypes.Stats, - Step = x + Step = x, }) .ToList(), new() { { Materials.BronzeWhetstone, 275 }, { Materials.GoldWhetstone, 5 } }, @@ -390,7 +390,7 @@ public WeaponUpgradeTheoryData() { Materials.StreamOrb, 16 }, { Materials.OldCloth, 30 }, { Materials.FloatingYellowCloth, 7 }, - { Materials.UnearthlyLantern, 1 } + { Materials.UnearthlyLantern, 1 }, }, 160_000, new DbWeaponBody() @@ -415,16 +415,16 @@ public WeaponUpgradeTheoryData() 0, 0, 0, - } + }, }, ExpPassiveAbilities: new List() { new() { ViewerId = 0, WeaponPassiveAbilityId = 1060203 }, - new() { ViewerId = 0, WeaponPassiveAbilityId = 1060204 } + new() { ViewerId = 0, WeaponPassiveAbilityId = 1060204 }, }, ExpNewSkins: new List() { - new() { ViewerId = 0, WeaponSkinId = 30640203 } + new() { ViewerId = 0, WeaponSkinId = 30640203 }, } ) ); @@ -437,11 +437,11 @@ public WeaponUpgradeTheoryData() { ViewerId = 0, WeaponBodyId = WeaponBodies.Ydalir, - LimitOverCount = 1 + LimitOverCount = 1, }, new() { - new() { BuildupPieceType = BuildupPieceTypes.Refine, Step = 2, } + new() { BuildupPieceType = BuildupPieceTypes.Refine, Step = 2 }, }, new() { @@ -449,7 +449,7 @@ public WeaponUpgradeTheoryData() { Materials.PlaguedOnesMaskFragment, 30 }, { Materials.RebelliousOnesInsanity, 10 }, { Materials.RebelliousWolfsGale, 10 }, - { Materials.Orichalcum, 10 } + { Materials.Orichalcum, 10 }, }, 2_500_000, new() @@ -460,7 +460,7 @@ public WeaponUpgradeTheoryData() }, ExpNewSkins: new() { - new() { ViewerId = 0, WeaponSkinId = 30660103 } + new() { ViewerId = 0, WeaponSkinId = 30660103 }, } ) ); @@ -475,7 +475,7 @@ public WeaponUpgradeTheoryData() WeaponBodyId = WeaponBodies.ChimeratechProcyon, EquipableCount = 1, LimitBreakCount = 8, - LimitOverCount = 1 + LimitOverCount = 1, }, new() { @@ -489,7 +489,7 @@ public WeaponUpgradeTheoryData() { Materials.BewitchingWings, 30 }, { Materials.LuminousMane, 750 }, { Materials.LuminousClaw, 200 }, - { Materials.LuminousHorn, 30 } + { Materials.LuminousHorn, 30 }, }, 10_000_000, new() @@ -498,7 +498,7 @@ public WeaponUpgradeTheoryData() WeaponBodyId = WeaponBodies.ChimeratechProcyon, EquipableCount = 3, LimitBreakCount = 8, - LimitOverCount = 1 + LimitOverCount = 1, } ) ); @@ -525,7 +525,7 @@ public WeaponUpgradeTheoryData() { Materials.UprootingOnesMaskFragment, 10 }, { Materials.Orichalcum, 1 }, { Materials.BlindingShard, 50 }, - { Materials.BlindingPrism, 30 } + { Materials.BlindingPrism, 30 }, }, 4_500_000, new() @@ -534,7 +534,7 @@ public WeaponUpgradeTheoryData() WeaponBodyId = WeaponBodies.QinghongJian, LimitBreakCount = 8, AdditionalCrestSlotType1Count = 1, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, } ) ); @@ -559,7 +559,7 @@ public WeaponUpgradeTheoryData() { Materials.PrimalWindwyrmsSphere, 25 }, { Materials.PrimalWindwyrmsGreatsphere, 25 }, { Materials.PrimalWindwyrmsEmerald, 14 }, - { Materials.Orichalcum, 15 } + { Materials.Orichalcum, 15 }, }, 5_000_000, new() @@ -568,7 +568,7 @@ public WeaponUpgradeTheoryData() WeaponBodyId = WeaponBodies.WindrulersFang, LimitBreakCount = 8, LimitOverCount = 1, - FortPassiveCharaWeaponBuildupCount = 1 + FortPassiveCharaWeaponBuildupCount = 1, } ) ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/AbilityCrests/AbilityCrestTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/AbilityCrests/AbilityCrestTest.cs index e157dea53..21e6677fd 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/AbilityCrests/AbilityCrestTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/AbilityCrests/AbilityCrestTest.cs @@ -19,7 +19,7 @@ public async Task SetFavorite_SetsCorrespondingAbilityCrestToFavorite() new DbAbilityCrest() { ViewerId = ViewerId, - AbilityCrestId = AbilityCrestId.FromWhenceHeComes + AbilityCrestId = AbilityCrestId.FromWhenceHeComes, } ); @@ -31,7 +31,7 @@ await this.Client.PostMsgpack( new AbilityCrestSetFavoriteRequest() { AbilityCrestId = AbilityCrestId.FromWhenceHeComes, - IsFavorite = true + IsFavorite = true, } ) ).Data; @@ -58,7 +58,7 @@ await this.Client.PostMsgpack( new AbilityCrestSetFavoriteRequest() { AbilityCrestId = AbilityCrestId.SweetSurprise, - IsFavorite = true + IsFavorite = true, }, ensureSuccessHeader: false ) @@ -82,9 +82,9 @@ await this.Client.PostMsgpack( { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = true, - Step = 1 - } - } + Step = 1, + }, + }, }, ensureSuccessHeader: false ) @@ -102,7 +102,7 @@ public async Task BuildupPiece_InvalidStepsReturnsErrorAndDoesntAffectDatabase() new DbAbilityCrest() { ViewerId = ViewerId, - AbilityCrestId = AbilityCrestId.HappyNewYear + AbilityCrestId = AbilityCrestId.HappyNewYear, } ); @@ -120,15 +120,15 @@ await this.Client.PostMsgpack( { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = true, - Step = 1 + Step = 1, }, new() { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = true, - Step = 4 - } - } + Step = 4, + }, + }, }, ensureSuccessHeader: false ) @@ -154,7 +154,7 @@ public async Task BuildupPiece_SuccessDecreasesMaterialsAndUpdatesDatabase() new DbAbilityCrest() { ViewerId = ViewerId, - AbilityCrestId = AbilityCrestId.WorthyRivals + AbilityCrestId = AbilityCrestId.WorthyRivals, } ); @@ -177,33 +177,33 @@ await this.Client.PostMsgpack( { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = true, - Step = 2 + Step = 2, }, new() { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = false, - Step = 1 + Step = 1, }, new() { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = 3 + Step = 3, }, new() { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = 2 + Step = 2, }, new() { BuildupPieceType = BuildupPieceTypes.Copies, IsUseDedicatedMaterial = false, - Step = 2 - } - } + Step = 2, + }, + }, } ); @@ -241,7 +241,7 @@ public async Task BuildupPiece_DoesNotMutateGlobalProperty() new DbAbilityCrest() { ViewerId = ViewerId, - AbilityCrestId = AbilityCrestId.MaskofDeterminationLancesBoon + AbilityCrestId = AbilityCrestId.MaskofDeterminationLancesBoon, } ); @@ -258,9 +258,9 @@ await this.Client.PostMsgpack( { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = 2 + Step = 2, }, - ] + ], } ); @@ -280,9 +280,9 @@ await this.Client.PostMsgpack( { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = 2 + Step = 2, }, - ] + ], } ); } @@ -298,8 +298,8 @@ await this.Client.PostMsgpack( AbilityCrestId = AbilityCrestId.InanUnendingWorld, PlusCountParamsList = new List() { - new() { PlusCount = 50, PlusCountType = PlusCountType.Hp, } - } + new() { PlusCount = 50, PlusCountType = PlusCountType.Hp }, + }, }, ensureSuccessHeader: false ) @@ -319,7 +319,7 @@ public async Task BuildupPlusCount_InvalidStepsReturnsErrorAndDoesntAffectDataba { ViewerId = ViewerId, AbilityCrestId = AbilityCrestId.TwinfoldBonds, - AttackPlusCount = 26 + AttackPlusCount = 26, } ); @@ -334,8 +334,8 @@ await this.Client.PostMsgpack( PlusCountParamsList = new List() { new() { PlusCount = 50, PlusCountType = PlusCountType.Hp }, - new() { PlusCount = 25, PlusCountType = PlusCountType.Atk } - } + new() { PlusCount = 25, PlusCountType = PlusCountType.Atk }, + }, }, ensureSuccessHeader: false ) @@ -367,7 +367,7 @@ public async Task BuildupPlusCount_SuccessDecreasesMaterialsAndUpdatesDatabase() { ViewerId = ViewerId, AbilityCrestId = AbilityCrestId.EndlessWaltz, - AttackPlusCount = 26 + AttackPlusCount = 26, } ); @@ -381,8 +381,8 @@ await this.Client.PostMsgpack( PlusCountParamsList = new List() { new() { PlusCount = 1, PlusCountType = PlusCountType.Hp }, - new() { PlusCount = 50, PlusCountType = PlusCountType.Atk, } - } + new() { PlusCount = 50, PlusCountType = PlusCountType.Atk }, + }, } ); @@ -412,8 +412,8 @@ await this.Client.PostMsgpack( PlusCountTypeList = new List() { PlusCountType.Hp, - PlusCountType.Atk - } + PlusCountType.Atk, + }, }, ensureSuccessHeader: false ) @@ -432,7 +432,7 @@ public async Task ResetPlusCount_InvalidStepsReturnsErrorAndDoesntAffectDatabase { ViewerId = ViewerId, AbilityCrestId = AbilityCrestId.TutelarysDestinyWolfsBoon, - HpPlusCount = 40 + HpPlusCount = 40, } ); @@ -444,7 +444,7 @@ await this.Client.PostMsgpack( new AbilityCrestResetPlusCountRequest() { AbilityCrestId = AbilityCrestId.TutelarysDestinyWolfsBoon, - PlusCountTypeList = new List() { PlusCountType.Hp, 0 } + PlusCountTypeList = new List() { PlusCountType.Hp, 0 }, }, ensureSuccessHeader: false ) @@ -477,7 +477,7 @@ public async Task ResetPlusCount_SuccessRefundsMaterialsAndUpdatesDatabase() ViewerId = ViewerId, AbilityCrestId = AbilityCrestId.TheGeniusTacticianBowsBoon, HpPlusCount = 40, - AttackPlusCount = 1 + AttackPlusCount = 1, } ); @@ -491,8 +491,8 @@ await this.Client.PostMsgpack( PlusCountTypeList = new List() { PlusCountType.Hp, - PlusCountType.Atk - } + PlusCountType.Atk, + }, } ); @@ -526,7 +526,7 @@ public async Task GetAbilityCrestSetList_SuccessfullyReturnsAbilityCrestSets() ViewerId = ViewerId, AbilityCrestSetNo = setNo, AbilityCrestSetName = "test", - CrestSlotType1CrestId1 = AbilityCrestId.WorthyRivals + CrestSlotType1CrestId1 = AbilityCrestId.WorthyRivals, } ); @@ -553,7 +553,7 @@ await this.Client.PostMsgpack( ViewerId = ViewerId, AbilityCrestSetNo = setNo, AbilityCrestSetName = "test", - CrestSlotType1CrestId1 = AbilityCrestId.WorthyRivals + CrestSlotType1CrestId1 = AbilityCrestId.WorthyRivals, } ) ); @@ -605,7 +605,7 @@ await this.Client.PostMsgpack( { AbilityCrestSetNo = setNo, AbilityCrestSetName = "", - RequestAbilityCrestSetData = new() { TalismanKeyId = 1 } + RequestAbilityCrestSetData = new() { TalismanKeyId = 1 }, } ); @@ -638,8 +638,8 @@ await this.Client.PostMsgpack( AbilityCrestSetName = "", RequestAbilityCrestSetData = new() { - CrestSlotType2CrestId2 = AbilityCrestId.DragonsNest - } + CrestSlotType2CrestId2 = AbilityCrestId.DragonsNest, + }, } ); @@ -659,7 +659,7 @@ await this.Client.PostMsgpack( new AbilityCrestUpdateAbilityCrestSetNameRequest() { AbilityCrestSetNo = setNo, - AbilityCrestSetName = "test" + AbilityCrestSetName = "test", } ); @@ -689,7 +689,7 @@ await this.Client.PostMsgpack( new AbilityCrestUpdateAbilityCrestSetNameRequest() { AbilityCrestSetNo = setNo, - AbilityCrestSetName = "test" + AbilityCrestSetName = "test", } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dmode/DmodeTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dmode/DmodeTest.cs index ee7e0cfca..4ee7826a7 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dmode/DmodeTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dmode/DmodeTest.cs @@ -48,7 +48,7 @@ await Client.PostMsgpack( { EntityType = EntityTypes.Wyrmite, EntityId = 0, - EntityQuantity = 25 + EntityQuantity = 25, }, new() { @@ -61,7 +61,7 @@ await Client.PostMsgpack( EntityType = EntityTypes.DmodePoint, EntityId = (int)DmodePoint.Point2, EntityQuantity = 1000, - } + }, } ); resp.Data.UpdateDataList.UserData.Crystal.Should().Be(oldWyrmite + 25); @@ -82,19 +82,19 @@ await Client.PostMsgpack( new() { PassiveNo = DmodeServitorPassiveType.BurstDamage, - PassiveLevel = 2 + PassiveLevel = 2, }, new() { PassiveNo = DmodeServitorPassiveType.ResistUndead, - PassiveLevel = 10 + PassiveLevel = 10, }, new() { PassiveNo = DmodeServitorPassiveType.ResistNatural, - PassiveLevel = 2 - } - } + PassiveLevel = 2, + }, + }, } ); @@ -119,7 +119,7 @@ await Client.PostMsgpack( { ViewerId = ViewerId, PassiveId = DmodeServitorPassiveType.ResistNatural, - Level = 2 + Level = 2, } ); ApiContext @@ -130,7 +130,7 @@ await Client.PostMsgpack( { ViewerId = ViewerId, PassiveId = DmodeServitorPassiveType.ResistUndead, - Level = 10 + Level = 10, } ); ApiContext @@ -141,7 +141,7 @@ await Client.PostMsgpack( { ViewerId = ViewerId, PassiveId = DmodeServitorPassiveType.BurstDamage, - Level = 2 + Level = 2, } ); } @@ -159,9 +159,9 @@ await this.Client.PostMsgpack( Charas.HunterBerserker, Charas.Empty, Charas.Empty, - Charas.Empty + Charas.Empty, }, - TargetFloorNum = 30 + TargetFloorNum = 30, } ); @@ -175,7 +175,7 @@ await this.Client.PostMsgpack( CharaId4 = Charas.Empty, TargetFloorNum = 30, State = ExpeditionState.Playing, - StartTime = DateTimeOffset.UtcNow + StartTime = DateTimeOffset.UtcNow, } ); @@ -195,7 +195,7 @@ await this.Client.PostMsgpack( CharaId4 = Charas.Empty, TargetFloorNum = 30, State = ExpeditionState.Waiting, - StartTime = resp.Data.DmodeExpedition.StartTime + StartTime = resp.Data.DmodeExpedition.StartTime, } ); finishResp @@ -223,9 +223,9 @@ await this.Client.PostMsgpack( Charas.HunterBerserker, Charas.Chrom, Charas.Cassandra, - Charas.GalaMym + Charas.GalaMym, }, - TargetFloorNum = 30 + TargetFloorNum = 30, } ); @@ -239,7 +239,7 @@ await this.Client.PostMsgpack( CharaId4 = Charas.GalaMym, TargetFloorNum = 30, State = ExpeditionState.Playing, - StartTime = startTime + StartTime = startTime, } ); @@ -259,7 +259,7 @@ await this.Client.PostMsgpack( CharaId4 = Charas.GalaMym, TargetFloorNum = 30, State = ExpeditionState.Waiting, - StartTime = startTime + StartTime = startTime, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/DmodeDungeon/DmodeDungeonTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/DmodeDungeon/DmodeDungeonTest.cs index 376c857d4..fe8d7bb55 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/DmodeDungeon/DmodeDungeonTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/DmodeDungeon/DmodeDungeonTest.cs @@ -24,8 +24,8 @@ await this.Client.PostMsgpack( BringEditSkillCharaIdList = new List() { Charas.Ranzal, - Charas.GalaCleo - } + Charas.GalaCleo, + }, } ); @@ -59,7 +59,7 @@ await this.Client.PostMsgpack( CharaId = Charas.Shingen, StartFloorNum = 30, ServitorId = 1, - BringEditSkillCharaIdList = new List() { Charas.Ranzal, Charas.GalaCleo } + BringEditSkillCharaIdList = new List() { Charas.Ranzal, Charas.GalaCleo }, } ); @@ -107,7 +107,7 @@ await this.Client.PostMsgpack( CharaId = Charas.Shingen, StartFloorNum = 1, ServitorId = 1, - BringEditSkillCharaIdList = new List() { Charas.Ranzal, Charas.GalaCleo } + BringEditSkillCharaIdList = new List() { Charas.Ranzal, Charas.GalaCleo }, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/AutoRepeatTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/AutoRepeatTest.cs index c37b19ce8..f748ecf1a 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/AutoRepeatTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/AutoRepeatTest.cs @@ -23,8 +23,8 @@ await Client.PostMsgpack( { RepeatCount = 45, RepeatType = RepeatSettingType.Specified, - UseItemList = [UseItem.Honey] - } + UseItemList = [UseItem.Honey], + }, } ) ).Data; @@ -93,8 +93,8 @@ await Client.PostMsgpack( { RepeatCount = 45, RepeatType = RepeatSettingType.Specified, - UseItemList = [UseItem.Honey] - } + UseItemList = [UseItem.Honey], + }, } ) ).Data; @@ -138,8 +138,8 @@ await Client.PostMsgpack( { RepeatCount = 45, RepeatType = RepeatSettingType.Specified, - UseItemList = [UseItem.Honey] - } + UseItemList = [UseItem.Honey], + }, } ) ).Data; @@ -216,7 +216,7 @@ await AddToDatabase( { QuestId = questId, State = 0, - ViewerId = ViewerId + ViewerId = ViewerId, } ); @@ -235,8 +235,8 @@ await Client.PostMsgpack( { RepeatCount = 45, RepeatType = RepeatSettingType.Specified, - UseItemList = [UseItem.Honey] - } + UseItemList = [UseItem.Honey], + }, } ) ).Data; @@ -308,7 +308,7 @@ await Client.PostMsgpack("repeat/end") new AtgenUserBuildEventItemList() { UserBuildEventItem = (int)BuildEventItemType.BuildEventPoint, - EventItemValue = expectedPoints + expectedBoostPoints + EventItemValue = expectedPoints + expectedBoostPoints, } ); } @@ -327,8 +327,8 @@ await Client.PostMsgpack( { RepeatCount = 45, RepeatType = RepeatSettingType.Specified, - UseItemList = [UseItem.Honey] - } + UseItemList = [UseItem.Honey], + }, } ) ).Data; diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonRecordTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonRecordTest.cs index a8f82c95c..85ff1c764 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonRecordTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonRecordTest.cs @@ -39,7 +39,7 @@ await AddToDatabase( { QuestId = questId, State = 0, - ViewerId = ViewerId + ViewerId = ViewerId, } ); @@ -73,11 +73,11 @@ await AddToDatabase( { Type = EntityTypes.Material, Id = (int)Materials.Squishums, - Quantity = 1 - } - } - } - } + Quantity = 1, + }, + }, + }, + }, }, new() { @@ -94,15 +94,15 @@ await AddToDatabase( { Type = EntityTypes.Material, Id = (int)Materials.ImitationSquish, - Quantity = 1 - } - } - } - } - } + Quantity = 1, + }, + }, + }, + }, + }, } - } - } + }, + }, }; string key = await this.StartDungeon(mockSession); @@ -121,14 +121,14 @@ await Client.PostMsgpack( new() { AreaIdx = 1, - Enemy = new List() { 1, 0 } - } + Enemy = new List() { 1, 0 }, + }, }, LiveUnitNoList = new List(), DamageRecord = new List(), DragonDamageRecord = new List(), - BattleRoyalRecord = new AtgenBattleRoyalRecord() - } + BattleRoyalRecord = new AtgenBattleRoyalRecord(), + }, } ) ).Data; @@ -145,8 +145,8 @@ await Client.PostMsgpack( { Type = EntityTypes.Material, Id = (int)Materials.Squishums, - Quantity = 1 - } + Quantity = 1, + }, } ); response.IngameResultData.RewardRecord.TakeCoin.Should().Be(10); @@ -178,7 +178,7 @@ await Client.PostMsgpack( IsMissionClear3 = true, BestClearTime = 10, LastDailyResetTime = DateTimeOffset.UtcNow, - LastWeeklyResetTime = DateTimeOffset.UtcNow + LastWeeklyResetTime = DateTimeOffset.UtcNow, } ); @@ -196,7 +196,7 @@ await AddToDatabase( { QuestId = questId, State = 0, - ViewerId = ViewerId + ViewerId = ViewerId, } ); @@ -221,14 +221,14 @@ await Client.PostMsgpack( new() { CharaId = Charas.ThePrince, - EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut - } + EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, + }, }, QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -247,8 +247,8 @@ await Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ) ).Data; @@ -264,7 +264,7 @@ await Client.PostMsgpack( [InlineData(22223, 222230404, 5)] // Shadow of the Mukuroshu - Defensive Battle EX public async Task Record_CombatEvent_GrantsScore(int eventId, int questId, int wave) { - await AddToDatabase(new DbQuest() { QuestId = questId, State = 0, }); + await AddToDatabase(new DbQuest() { QuestId = questId, State = 0 }); await Client.PostMsgpack( "/memory_event/activate", @@ -278,8 +278,8 @@ await Client.PostMsgpack( QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -298,7 +298,7 @@ await Client.PostMsgpack( DamageRecord = [], DragonDamageRecord = [], Wave = wave, - } + }, } ) ).Data; @@ -316,7 +316,7 @@ public async Task Record_Event_BossBattle_CompletesMissions() await this.AddRangeToDatabase( [ new DbAbilityCrest() { AbilityCrestId = AbilityCrestId.HavingaSummerBall }, - new DbAbilityCrest() { AbilityCrestId = AbilityCrestId.SuperSoakingAndroids } + new DbAbilityCrest() { AbilityCrestId = AbilityCrestId.SuperSoakingAndroids }, ] ); @@ -335,13 +335,13 @@ await Client.PostMsgpack( CharaId = Charas.ThePrince, EquipCrestSlotType1CrestId1 = AbilityCrestId.SuperSoakingAndroids, EquipCrestSlotType2CrestId1 = AbilityCrestId.HavingaSummerBall, - } + }, }, QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -360,8 +360,8 @@ await Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ) ).Data; @@ -400,12 +400,12 @@ await Client.PostMsgpack( DungeonSession mockSession = new() { - Party = new List() { new() { CharaId = Charas.ThePrince, } }, + Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -424,8 +424,8 @@ await Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ) ).Data; @@ -433,7 +433,7 @@ await Client.PostMsgpack( response .UpdateDataList.QuestList!.Should() .ContainEquivalentOf( - new QuestList() { QuestId = exQuestId, IsAppear = true, }, + new QuestList() { QuestId = exQuestId, IsAppear = true }, opts => opts.Including(x => x.QuestId).Including(x => x.IsAppear) ); } @@ -445,7 +445,7 @@ public async Task Record_Event_BossBattle_NoExBattleForEvent_DoesNotUnlockExBatt int exQuestId = 208450401; // Not a valid quest int eventId = 20845; // Toll of the Deep - await this.AddToDatabase(new DbQuest() { QuestId = questId, PlayCount = 2, }); + await this.AddToDatabase(new DbQuest() { QuestId = questId, PlayCount = 2 }); await Client.PostMsgpack( "/memory_event/activate", @@ -455,12 +455,12 @@ await Client.PostMsgpack( DungeonSession mockSession = new() { - Party = new List() { new() { CharaId = Charas.ThePrince, } }, + Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -479,8 +479,8 @@ await Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ) ).Data; @@ -502,12 +502,12 @@ await Client.PostMsgpack( DungeonSession mockSession = new() { - Party = new List() { new() { CharaId = Charas.ThePrince, } }, + Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(exQuestId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -526,8 +526,8 @@ await Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ) ).Data; @@ -535,7 +535,7 @@ await Client.PostMsgpack( response .UpdateDataList.QuestList!.Should() .ContainEquivalentOf( - new QuestList() { QuestId = exQuestId, IsAppear = false, }, + new QuestList() { QuestId = exQuestId, IsAppear = false }, opts => opts.Including(x => x.QuestId).Including(x => x.IsAppear) ); } @@ -558,8 +558,8 @@ await Client.PostMsgpack( QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -578,8 +578,10 @@ await Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 5 // Final wave - } + Wave = + 5 // Final wave + , + }, } ) ).Data; @@ -611,8 +613,8 @@ await Client.PostMsgpack( QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -632,15 +634,15 @@ await Client.PostMsgpack( { AreaIdx = 0, Enemy = [], - EnemySmash = [] - } + EnemySmash = [], + }, ], LiveUnitNoList = new List(), DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 2 - } + Wave = 2, + }, } ) ).Data; @@ -672,8 +674,8 @@ await Client.PostMsgpack( QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -692,8 +694,8 @@ await Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ) ).Data; @@ -721,8 +723,8 @@ await Client.PostMsgpack( QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -743,15 +745,15 @@ await Client.PostMsgpack( AreaIdx = 0, DropObj = [], Enemy = [], - EnemySmash = [] - } + EnemySmash = [], + }, ], LiveUnitNoList = new List(), DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ) ).Data; @@ -791,23 +793,23 @@ await Client.PostMsgpack( { ParamId = 229030211, EnemyIdx = 0, // Meadow Rat (10 points) - EnemyDropList = [] + EnemyDropList = [], }, new() { ParamId = 229030217, EnemyIdx = 1, // Wind Manticore (200 points) - EnemyDropList = [] + EnemyDropList = [], }, new() { ParamId = 229030215, EnemyIdx = 2, // Arrow Raptor (40 points) - EnemyDropList = [] - } + EnemyDropList = [], + }, ] - } - } + }, + }, }; string key = await this.StartDungeon(mockSession); @@ -830,16 +832,16 @@ await Client.PostMsgpack( [ new() { Count = 1 }, new() { Count = 2 }, - new() { Count = 3 } - ] - } + new() { Count = 3 }, + ], + }, ], LiveUnitNoList = new List(), DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ) ).Data; @@ -858,12 +860,12 @@ public async Task Record_HandlesNonExistentQuestData() DungeonSession mockSession = new() { - Party = new List() { new() { CharaId = Charas.ThePrince, } }, + Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), EnemyList = new Dictionary>() { - { 1, Enumerable.Empty() } - } + { 1, Enumerable.Empty() }, + }, }; string key = await this.StartDungeon(mockSession); @@ -882,8 +884,8 @@ await Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ); @@ -909,7 +911,7 @@ await this.AddToDatabase( { QuestId = questId, State = 0, - ViewerId = ViewerId + ViewerId = ViewerId, } ); @@ -919,7 +921,7 @@ await this.Client.PostMsgpack( new DungeonStartStartMultiRequest() { PartyNoList = new[] { 4 }, // Flame team - QuestId = questId + QuestId = questId, } ) ).Data; @@ -940,8 +942,8 @@ await this.Client.PostMsgpack( DamageRecord = new List(), DragonDamageRecord = new List(), BattleRoyalRecord = new AtgenBattleRoyalRecord(), - Wave = 3 - } + Wave = 3, + }, } ); @@ -971,7 +973,7 @@ await AddToDatabase( { QuestId = questId, State = 3, - ViewerId = ViewerId + ViewerId = ViewerId, } ); @@ -984,7 +986,7 @@ await AddToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), - EnemyList = new Dictionary>() + EnemyList = new Dictionary>(), }; string key = await this.StartDungeon(mockSession); @@ -1003,14 +1005,14 @@ await Client.PostMsgpack( new() { AreaIdx = 1, - Enemy = new List() { 1, 0 } - } + Enemy = new List() { 1, 0 }, + }, }, LiveUnitNoList = new List(), DamageRecord = new List(), DragonDamageRecord = new List(), - BattleRoyalRecord = new AtgenBattleRoyalRecord() - } + BattleRoyalRecord = new AtgenBattleRoyalRecord(), + }, }, ensureSuccessHeader: false ) @@ -1026,7 +1028,7 @@ await AddToDatabase( { QuestId = questId, State = 0, - ViewerId = ViewerId + ViewerId = ViewerId, } ); @@ -1039,7 +1041,7 @@ await AddToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), - EnemyList = new Dictionary>() + EnemyList = new Dictionary>(), }; string key = await this.StartDungeon(mockSession); @@ -1058,14 +1060,14 @@ await Client.PostMsgpack( new() { AreaIdx = 1, - Enemy = new List() { 1, 0 } - } + Enemy = new List() { 1, 0 }, + }, }, LiveUnitNoList = new List(), DamageRecord = new List(), DragonDamageRecord = new List(), - BattleRoyalRecord = new AtgenBattleRoyalRecord() - } + BattleRoyalRecord = new AtgenBattleRoyalRecord(), + }, }, ensureSuccessHeader: false ) @@ -1091,7 +1093,7 @@ await this.AddToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), - EnemyList = new Dictionary>() + EnemyList = new Dictionary>(), } ); @@ -1104,13 +1106,13 @@ await this.AddToDatabase( Time = 10, TreasureRecord = new List() { - new() { AreaIdx = 1, Enemy = [] } + new() { AreaIdx = 1, Enemy = [] }, }, LiveUnitNoList = new List(), DamageRecord = [], DragonDamageRecord = [], - BattleRoyalRecord = new AtgenBattleRoyalRecord() - } + BattleRoyalRecord = new AtgenBattleRoyalRecord(), + }, }; DungeonRecordRecordResponse response = ( @@ -1125,15 +1127,15 @@ await Client.PostMsgpack("/dungeon_record/record", { Type = EntityTypes.Material, Id = (int)Materials.DestituteOnesMaskFragment, - Quantity = 80 + Quantity = 80, }, new AtgenFirstClearSet() { Type = EntityTypes.Material, Id = (int)Materials.PlaguedOnesMaskFragment, - Quantity = 30 + Quantity = 30, }, - new AtgenFirstClearSet() { Type = EntityTypes.Wyrmite, Quantity = 5 } + new AtgenFirstClearSet() { Type = EntityTypes.Wyrmite, Quantity = 5 }, ] ); @@ -1142,7 +1144,7 @@ await Client.PostMsgpack("/dungeon_record/record", { Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), - EnemyList = new Dictionary>() + EnemyList = new Dictionary>(), } ); @@ -1178,7 +1180,7 @@ await this.AddToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), - EnemyList = new Dictionary>() + EnemyList = new Dictionary>(), } ); @@ -1191,13 +1193,13 @@ await this.AddToDatabase( Time = 10, TreasureRecord = new List() { - new() { AreaIdx = 1, Enemy = [] } + new() { AreaIdx = 1, Enemy = [] }, }, LiveUnitNoList = new List(), DamageRecord = [], DragonDamageRecord = [], - BattleRoyalRecord = new AtgenBattleRoyalRecord() - } + BattleRoyalRecord = new AtgenBattleRoyalRecord(), + }, }; DungeonRecordRecordResponse response = ( @@ -1227,7 +1229,7 @@ await this.AddToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, QuestData = MasterAsset.QuestData.Get(questId), - EnemyList = new Dictionary>() + EnemyList = new Dictionary>(), } ); @@ -1240,14 +1242,14 @@ await this.AddToDatabase( Time = 10, TreasureRecord = new List() { - new() { AreaIdx = 1, Enemy = [] } + new() { AreaIdx = 1, Enemy = [] }, }, LiveUnitNoList = new List(), DamageRecord = [], DragonDamageRecord = [], BattleRoyalRecord = new AtgenBattleRoyalRecord(), }, - ConnectingViewerIdList = [1, 2] + ConnectingViewerIdList = [1, 2], }; DungeonRecordRecordMultiResponse response = ( @@ -1265,7 +1267,7 @@ await Client.PostMsgpack( Headcount = 2, Id = 0, TotalQuantity = 200, - Type = EntityTypes.FreeDiamantium + Type = EntityTypes.FreeDiamantium, } ); response.UpdateDataList.PresentNotice.PresentCount.Should().Be(1); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonSkipTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonSkipTest.cs index ad51518e0..bdb77ec2d 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonSkipTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonSkipTest.cs @@ -28,7 +28,7 @@ await this.AddToDatabase( { ViewerId = ViewerId, QuestId = questId, - State = 3 + State = 3, } ); @@ -44,7 +44,7 @@ await this.Client.PostMsgpack( PartyNo = 1, PlayCount = playCount, SupportViewerId = 1000, - QuestId = questId + QuestId = questId, } ); @@ -89,7 +89,7 @@ await this.AddToDatabase( { ViewerId = ViewerId, QuestId = questId, - State = 3 + State = 3, } ); @@ -107,8 +107,8 @@ await this.Client.PostMsgpack( QuestId = questId, RequestPartySettingList = new List() { - new() { CharaId = Shared.Definitions.Enums.Charas.ThePrince, } - } + new() { CharaId = Shared.Definitions.Enums.Charas.ThePrince }, + }, } ); @@ -165,12 +165,12 @@ await this.Client.PostMsgpack( PartyNo = 1, RequestQuestMultipleList = new List { - new() { QuestId = atpMaster, PlayCount = 1, }, - new() { QuestId = flameRuinsExpert, PlayCount = 1, }, - new() { QuestId = atfMaster, PlayCount = 1, }, - new() { QuestId = brunhildaMaster, PlayCount = 1, }, - new() { QuestId = flameIoStandard, PlayCount = 1, }, - } + new() { QuestId = atpMaster, PlayCount = 1 }, + new() { QuestId = flameRuinsExpert, PlayCount = 1 }, + new() { QuestId = atfMaster, PlayCount = 1 }, + new() { QuestId = brunhildaMaster, PlayCount = 1 }, + new() { QuestId = flameIoStandard, PlayCount = 1 }, + }, } ); @@ -197,7 +197,7 @@ await this.Client.PostMsgpack( flameRuinsExpert, atfMaster, brunhildaMaster, - flameIoStandard + flameIoStandard, } ); response @@ -248,7 +248,7 @@ await this.Client.PostMsgpack( PartyNo = 1, PlayCount = playCount, SupportViewerId = 1000, - QuestId = questId + QuestId = questId, } ); @@ -266,7 +266,7 @@ await this.Client.PostMsgpack( QuestBonusReserveCount = 3, QuestBonusReserveTime = response.Data.IngameResultData.EndTime, QuestBonusStackCount = 0, - QuestBonusStackTime = DateTimeOffset.UnixEpoch + QuestBonusStackTime = DateTimeOffset.UnixEpoch, } ); } @@ -284,14 +284,14 @@ await this.AddRangeToDatabase( { ViewerId = ViewerId, QuestId = questId, - State = 3 + State = 3, }, new DbPlayerMission() { Id = clear5QuestsMission, Type = MissionType.Daily, State = MissionState.InProgress, - } + }, ] ); @@ -303,7 +303,7 @@ await this.Client.PostMsgpack( PartyNo = 1, PlayCount = playCount, SupportViewerId = 1000, - QuestId = questId + QuestId = questId, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonStartTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonStartTest.cs index 846e35666..1b7f54e7e 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonStartTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Dungeon/DungeonStartTest.cs @@ -29,7 +29,7 @@ await Client.PostMsgpack( new DungeonStartStartRequest() { PartyNoList = new List() { 1 }, - QuestId = 100010103 + QuestId = 100010103, } ) ).Data; @@ -51,7 +51,7 @@ await Client.PostMsgpack( new DungeonStartStartRequest() { PartyNoList = new List() { 37, 38 }, - QuestId = 100010103 + QuestId = 100010103, } ) ).Data; @@ -73,7 +73,7 @@ await Client.PostMsgpack( new DungeonStartStartRequest() { PartyNoList = new List() { 38 }, - QuestId = 100010103 + QuestId = 100010103, } ) ).Data; @@ -126,8 +126,8 @@ public async Task StartAssignUnit_HasExpectedPartyList() EquipTalismanKeyId = (ulong)GetTalismanKeyId(Talismans.GalaMym), EquipCrestSlotType3CrestId1 = AbilityCrestId.TutelarysDestinyWolfsBoon, EquipCrestSlotType3CrestId2 = AbilityCrestId.TestamentofEternityFishsBoon, - } - } + }, + }, }; DungeonStartStartAssignUnitResponse response = ( @@ -255,7 +255,7 @@ await this.Client.PostMsgpack( new DungeonStartStartRequest() { QuestId = TutorialService.TutorialQuestIds.AvenueToPowerBeginner, - PartyNoList = [1] + PartyNoList = [1], } ); @@ -280,7 +280,7 @@ await this.Client.PostMsgpack( new DungeonStartStartRequest() { QuestId = TutorialService.TutorialQuestIds.AvenueToPowerBeginner, - PartyNoList = [1] + PartyNoList = [1], } ); @@ -312,7 +312,7 @@ await this.Client.PostMsgpack( new DungeonStartStartRequest() { QuestId = TutorialService.TutorialQuestIds.AvenueToPowerBeginner, - PartyNoList = [1] + PartyNoList = [1], } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Event/CombatEventTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Event/CombatEventTest.cs index c9ab63760..fbcf1b682 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Event/CombatEventTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Event/CombatEventTest.cs @@ -86,7 +86,7 @@ public async Task ReceiveEventLocationRewards_ReturnsEventLocationRewards() { ViewerId = ViewerId, QuestId = 222130103, - State = 3 + State = 3, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Event/EarnEventTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Event/EarnEventTest.cs index 253554884..85e12034c 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Event/EarnEventTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Event/EarnEventTest.cs @@ -105,7 +105,7 @@ await Client.PostMsgpack( EventPoint = 0, ExchangeItem01 = 0, ExchangeItem02 = 0, - AdventItemQuantity01 = 0 + AdventItemQuantity01 = 0, } ); evtData.Data.EventRewardList.Should().BeEmpty(); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Fort/FortTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Fort/FortTest.cs index 4e046aa82..ce4b53210 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Fort/FortTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Fort/FortTest.cs @@ -53,7 +53,7 @@ public async Task GetData_ReturnsBuildingData() BuildEndDate = end, FortPlantDetailId = 10050411, BuildStatus = FortBuildStatus.LevelUp, - IsNew = false + IsNew = false, }, opts => opts.Excluding(x => x.BuildId) @@ -121,7 +121,7 @@ public async Task BuildAtOnce_ReturnsValidResult() BuildStartDate = DateTimeOffset.FromUnixTimeSeconds(1887924543), BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(1888924543), IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ) .Entity; @@ -157,7 +157,7 @@ public async Task BuildCancel_ReturnsValidResult() BuildStartDate = DateTimeOffset.FromUnixTimeSeconds(1887924543), BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(1888924543), IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ) .Entity; @@ -187,7 +187,7 @@ public async Task BuildEnd_ReturnsValidResult() BuildStartDate = DateTimeOffset.FromUnixTimeSeconds(1682110410), BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(1682110411), IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, }; await this.AddToDatabase(build); @@ -248,7 +248,7 @@ public async Task LevelupAtOnce_ReturnsValidResult() BuildStartDate = DateTimeOffset.FromUnixTimeSeconds(1887924543), BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(1888924543), IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ) .Entity; @@ -330,7 +330,7 @@ public async Task LevelUpCancel_ReturnsValidResult() BuildStartDate = DateTimeOffset.FromUnixTimeSeconds(1887924543), BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(1888924543), IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ) .Entity; @@ -366,7 +366,7 @@ public async Task LevelUpEnd_ReturnsValidResult() BuildStartDate = DateTimeOffset.FromUnixTimeSeconds(1287924543), BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(1388924543), IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ) .Entity; @@ -448,7 +448,7 @@ public async Task LevelUpStart_ReturnsValidResult() BuildStartDate = DateTimeOffset.UnixEpoch, BuildEndDate = DateTimeOffset.UnixEpoch, IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ) .Entity; @@ -485,7 +485,7 @@ public async Task Move_ReturnsValidResult() BuildStartDate = DateTimeOffset.FromUnixTimeSeconds(1887924543), BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(1888924543), IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ) .Entity; @@ -522,7 +522,7 @@ public async Task GetMultiIncome_ReturnsExpectedResponse() ViewerId = ViewerId, PlantId = FortPlants.RupieMine, LastIncomeDate = lastIncome, - Level = 10 + Level = 10, }; DbFortBuild dragonTree = new() @@ -530,7 +530,7 @@ public async Task GetMultiIncome_ReturnsExpectedResponse() ViewerId = ViewerId, PlantId = FortPlants.Dragontree, LastIncomeDate = lastIncome, - Level = 13 + Level = 13, }; this.ApiContext.PlayerFortBuilds.Add(rupieMine); @@ -548,7 +548,7 @@ await this.Client.PostMsgpack( "/fort/get_multi_income", new FortGetMultiIncomeRequest() { - BuildIdList = new[] { rupieMine.BuildId, dragonTree.BuildId, halidom.BuildId } + BuildIdList = new[] { rupieMine.BuildId, dragonTree.BuildId, halidom.BuildId }, } ); @@ -580,7 +580,7 @@ public async Task GetMultiIncome_CompletesMission() ViewerId = ViewerId, PlantId = FortPlants.RupieMine, LastIncomeDate = DateTimeOffset.UnixEpoch, - Level = 10 + Level = 10, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/GraphQL/GraphQlTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/GraphQL/GraphQlTest.cs index 91119f1eb..c2b300825 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/GraphQL/GraphQlTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/GraphQL/GraphQlTest.cs @@ -44,7 +44,7 @@ public async Task Query_PlayerCharacters_ReturnsExpectedResult() } } } - """ + """, } ); @@ -73,7 +73,7 @@ await this level } } - """ + """, } ); @@ -101,7 +101,7 @@ await this.GraphQlHttpClient.SendQueryAsync( presentId } } - """ + """, } ); @@ -143,7 +143,7 @@ await this.GraphQlHttpClient.SendQueryAsync( tutorialStatus } } - """ + """, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Item/ItemTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Item/ItemTest.cs index 86b7466f5..567b8dd73 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Item/ItemTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Item/ItemTest.cs @@ -13,7 +13,7 @@ public ItemTest(CustomWebApplicationFactory factory, ITestOutputHelper outputHel { ViewerId = ViewerId, ItemId = UseItem.Honey, - Quantity = 50 + Quantity = 50, } ) .Wait(); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Login/LoginTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Login/LoginTest.cs index e662f413a..6850358fe 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Login/LoginTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Login/LoginTest.cs @@ -164,7 +164,9 @@ await this.AddToDatabase( { ViewerId = ViewerId, CurrentDay = 4, - Id = 17 // Standard daily login bonus + Id = + 17 // Standard daily login bonus + , } ); @@ -202,7 +204,9 @@ await this.AddToDatabase( { ViewerId = ViewerId, CurrentDay = 10, - Id = 17 // Standard daily login bonus + Id = + 17 // Standard daily login bonus + , } ); @@ -238,7 +242,9 @@ await this.AddToDatabase( { ViewerId = ViewerId, CurrentDay = 6, - Id = 2 // Launch Celebration Daily Bonus + Id = + 2 // Launch Celebration Daily Bonus + , } ); @@ -318,7 +324,7 @@ await this.Client.PostMsgpack( EntityLimitBreakCount = 0, LoginBonusId = 17, RewardDay = 8, - TotalLoginDay = 8 + TotalLoginDay = 8, } ); @@ -342,7 +348,7 @@ await this.AddToDatabase( { ViewerId = this.ViewerId, Id = oldMissionId, - Type = MissionType.Daily + Type = MissionType.Daily, } ); await this.AddToDatabase( @@ -416,7 +422,7 @@ await this.AddToDatabase( { ViewerId = this.ViewerId, Id = oldMissionId, - Type = MissionType.Daily + Type = MissionType.Daily, } ); @@ -468,8 +474,8 @@ public async Task LoginIndex_WallInitialized_Eligible_SendsRewardAvailable() { await this.AddRangeToDatabase( [ - new DbPlayerQuestWall() { WallId = WallService.FlameWallId, WallLevel = 10, }, - new DbWallRewardDate() { LastClaimDate = DateTimeOffset.UnixEpoch } + new DbPlayerQuestWall() { WallId = WallService.FlameWallId, WallLevel = 10 }, + new DbWallRewardDate() { LastClaimDate = DateTimeOffset.UnixEpoch }, ] ); @@ -498,8 +504,8 @@ public async Task LoginIndex_WallInitialized_Claimed_SendsRewardReceived() { await this.AddRangeToDatabase( [ - new DbPlayerQuestWall() { WallId = WallService.FlameWallId, WallLevel = 10, }, - new DbWallRewardDate() { LastClaimDate = DateTimeOffset.UtcNow } + new DbPlayerQuestWall() { WallId = WallService.FlameWallId, WallLevel = 10 }, + new DbWallRewardDate() { LastClaimDate = DateTimeOffset.UtcNow }, ] ); @@ -531,7 +537,7 @@ await this.AddToDatabase( { ViewerId = this.ViewerId, SummonBannerId = 1020121, - DailyLimitedSummonCount = 1 + DailyLimitedSummonCount = 1, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Maintenance/MaintenanceTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Maintenance/MaintenanceTest.cs index 2a218b4c1..3cff2aaa2 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Maintenance/MaintenanceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Maintenance/MaintenanceTest.cs @@ -52,7 +52,7 @@ public async Task MaintenanceActive_GetText_ReturnsText() Enabled = true, Title = "Title", Body = "Body", - End = DateTimeOffset.UnixEpoch + End = DateTimeOffset.UnixEpoch, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Missions/MissionTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Missions/MissionTest.cs index fc929c82f..f72235c6e 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Missions/MissionTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Missions/MissionTest.cs @@ -135,8 +135,8 @@ await this.Client.PostMsgpack( .Select(x => new AtgenBuildupAbilityCrestPieceList() { BuildupPieceType = BuildupPieceTypes.Stats, - Step = x - }) + Step = x, + }), } ); @@ -215,7 +215,7 @@ await this.AddToDatabase( ViewerId = this.ViewerId, Id = missionId2, Date = yesterday, - } + }, ] ); @@ -228,7 +228,7 @@ await this.AddToDatabase( Type = MissionType.Daily, State = MissionState.Completed, Start = timeProvider.GetLastDailyReset(), - End = timeProvider.GetLastDailyReset().AddDays(1) + End = timeProvider.GetLastDailyReset().AddDays(1), }, new DbPlayerMission() { @@ -237,8 +237,8 @@ await this.AddToDatabase( Type = MissionType.Daily, State = MissionState.Completed, Start = timeProvider.GetLastDailyReset(), - End = timeProvider.GetLastDailyReset().AddDays(1) - } + End = timeProvider.GetLastDailyReset().AddDays(1), + }, ] ); @@ -249,10 +249,10 @@ await this.Client.PostMsgpack( { MissionParamsList = [ - new() { DailyMissionId = missionId1, DayNo = today, }, - new() { DailyMissionId = missionId2, DayNo = today, }, - new() { DailyMissionId = missionId1, DayNo = yesterday, }, - ] + new() { DailyMissionId = missionId1, DayNo = today }, + new() { DailyMissionId = missionId2, DayNo = today }, + new() { DailyMissionId = missionId1, DayNo = yesterday }, + ], } ); @@ -302,7 +302,7 @@ await this.AddToDatabase( Id = missionId, Type = MissionType.MemoryEvent, State = MissionState.Completed, - Progress = 5 + Progress = 5, } ); @@ -366,14 +366,14 @@ await this.Client.PostMsgpack( { DailyMissionId = missionId, DayNo = today, - State = MissionState.Completed + State = MissionState.Completed, }, new DailyMissionList() { DailyMissionId = missionId, DayNo = yesterday, - State = MissionState.Completed - } + State = MissionState.Completed, + }, ], opts => opts.Including(x => x.DailyMissionId) @@ -429,7 +429,7 @@ DbPlayerMission ToDbMission(DrillMission mission) ViewerId = this.ViewerId, Id = mission.Id, State = MissionState.Claimed, - Type = MissionType.Drill + Type = MissionType.Drill, }; } @@ -489,7 +489,7 @@ await this.Client.PostMsgpack( [ new DrillMissionGroupList(1), new DrillMissionGroupList(2), - new DrillMissionGroupList(3) + new DrillMissionGroupList(3), ] ); } @@ -505,7 +505,7 @@ await this.AddRangeToDatabase( ViewerId = this.ViewerId, Id = x.Id, State = MissionState.Claimed, - Type = MissionType.Drill + Type = MissionType.Drill, }) ); @@ -584,7 +584,7 @@ public async Task GetMissionList_DoesNotReturnPreviousMainStoryMissions() GroupId = 1, ViewerId = this.ViewerId, Type = MissionType.MainStory, - State = MissionState.Claimed + State = MissionState.Claimed, }); await this.AddRangeToDatabase(completedMissions); @@ -632,7 +632,7 @@ await this.Client.PostMsgpack( { MainStoryMissionId = x.Id, State = (int)MissionState.InProgress, - }) + }), } ); } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Present/PresentTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Present/PresentTest.cs index 1f2d1eeac..807833b43 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Present/PresentTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Present/PresentTest.cs @@ -39,8 +39,8 @@ await this.AddRangeToDatabase( ViewerId = ViewerId, EntityType = EntityTypes.Dew, EntityQuantity = 200, - MessageId = PresentMessage.Chapter10Clear - } + MessageId = PresentMessage.Chapter10Clear, + }, } ); @@ -72,12 +72,12 @@ await this.Client.PostMsgpack( MessageId = PresentMessage.Chapter10Clear, CreateTime = DateTimeOffset.UtcNow, ReceiveLimitTime = DateTimeOffset.UnixEpoch, - } + }, }, UpdateDataList = new UpdateDataList() { - PresentNotice = new() { PresentCount = 2, PresentLimitCount = 0 } - } + PresentNotice = new() { PresentCount = 2, PresentLimitCount = 0 }, + }, } ); @@ -105,8 +105,8 @@ await this.AddRangeToDatabase( ViewerId = ViewerId, EntityType = EntityTypes.Dew, EntityQuantity = 200, - MessageId = PresentMessage.Chapter10Clear - } + MessageId = PresentMessage.Chapter10Clear, + }, } ); @@ -130,12 +130,12 @@ await this.Client.PostMsgpack( MessageId = PresentMessage.Maintenance, CreateTime = DateTimeOffset.UtcNow, ReceiveLimitTime = expireDate, - } + }, }, UpdateDataList = new UpdateDataList() { - PresentNotice = new() { PresentCount = 1, PresentLimitCount = 1 } - } + PresentNotice = new() { PresentCount = 1, PresentLimitCount = 1 }, + }, } ); @@ -174,7 +174,7 @@ await this.Client.PostMsgpack( new PresentGetPresentListRequest() { IsLimit = false, - PresentId = firstResponse.Data.PresentList.Last().PresentId + PresentId = firstResponse.Data.PresentList.Last().PresentId, } ); @@ -255,7 +255,7 @@ public async Task Receive_ReceiveAllPresents_ClaimsAll() EntityType = EntityTypes.Title, EntityId = (int)Emblems.SupremeBogfish, EntityQuantity = 1, - } + }, }; await this.AddRangeToDatabase(presents); @@ -285,7 +285,7 @@ await this.Client.PostMsgpack( new MaterialList() { MaterialId = Materials.Squishums, - Quantity = oldSquishums.Quantity + 100 + Quantity = oldSquishums.Quantity + 100, } ); @@ -302,7 +302,7 @@ await this.Client.PostMsgpack( response .Data.UpdateDataList.PresentNotice.Should() - .BeEquivalentTo(new PresentNotice() { PresentCount = 0, PresentLimitCount = 0, }); + .BeEquivalentTo(new PresentNotice() { PresentCount = 0, PresentLimitCount = 0 }); // Not sure if entity_result is correct so won't test that } @@ -324,7 +324,7 @@ public async Task Receive_ReceiveSinglePresent_ClaimsOne() ViewerId = ViewerId, EntityType = EntityTypes.Wyrmite, EntityQuantity = 100, - ReceiveLimitTime = DateTimeOffset.UtcNow + TimeSpan.FromDays(1) + ReceiveLimitTime = DateTimeOffset.UtcNow + TimeSpan.FromDays(1), }, new() { @@ -357,7 +357,7 @@ await this.Client.PostMsgpack( response .Data.UpdateDataList.PresentNotice.Should() - .BeEquivalentTo(new PresentNotice() { PresentCount = 1, PresentLimitCount = 1, }); + .BeEquivalentTo(new PresentNotice() { PresentCount = 1, PresentLimitCount = 1 }); } [Fact] @@ -519,7 +519,7 @@ public async Task Receive_SummonTickets_StacksCorrectly() EntityType = EntityTypes.SummonTicket, EntityId = (int)SummonTickets.AdventurerSummon, EntityQuantity = 2, - } + }, ]; await this.AddRangeToDatabase(presents); @@ -541,7 +541,7 @@ await this.Client.PostMsgpack( { ViewerId = this.ViewerId, SummonTicketId = SummonTickets.AdventurerSummon, - Quantity = 4 + Quantity = 4, }, ], opts => opts.Excluding(x => x.KeyId) @@ -570,7 +570,7 @@ public async Task Receive_DragonGifts_HandlesCorrectly() EntityType = EntityTypes.DragonGift, EntityId = (int)DragonGifts.DragonyuleCake, EntityQuantity = 1, - } + }, ]; await this.ApiContext.PlayerDragonGifts.ExecuteDeleteAsync(); @@ -580,9 +580,9 @@ await this.AddRangeToDatabase( new DbPlayerDragonGift() { DragonGiftId = DragonGifts.FourLeafClover, - Quantity = 4 + Quantity = 4, }, - .. presents + .. presents, ] ); @@ -598,8 +598,8 @@ await this.Client.PostMsgpack( .Data.UpdateDataList.DragonGiftList.Should() .BeEquivalentTo( [ - new() { DragonGiftId = DragonGifts.FourLeafClover, Quantity = 6, }, - new() { DragonGiftId = DragonGifts.DragonyuleCake, Quantity = 2, }, + new() { DragonGiftId = DragonGifts.FourLeafClover, Quantity = 6 }, + new() { DragonGiftId = DragonGifts.DragonyuleCake, Quantity = 2 }, ] ); @@ -610,13 +610,13 @@ await this.Client.PostMsgpack( { ViewerId = this.ViewerId, DragonGiftId = DragonGifts.FourLeafClover, - Quantity = 6 + Quantity = 6, }, new DbPlayerDragonGift() { ViewerId = this.ViewerId, DragonGiftId = DragonGifts.DragonyuleCake, - Quantity = 2 + Quantity = 2, }, ] ); @@ -656,7 +656,7 @@ await this.Client.PostMsgpack( $"{Controller}/get_history_list", new PresentGetHistoryListRequest() { - PresentHistoryId = (ulong)presentHistories[99].Id + PresentHistoryId = (ulong)presentHistories[99].Id, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Quest/QuestClearPartyTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Quest/QuestClearPartyTest.cs index 91039219c..b43a94862 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Quest/QuestClearPartyTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Quest/QuestClearPartyTest.cs @@ -63,7 +63,7 @@ await this.Client.PostMsgpack( new QuestSetQuestClearPartyRequest() { QuestId = questId, - RequestPartySettingList = this.MultiPartySettingLists + RequestPartySettingList = this.MultiPartySettingLists, } ); @@ -118,20 +118,20 @@ await this.Client.PostMsgpack( { UnitNo = 4, EntityType = EntityTypes.WeaponSkin, - EntityId = 1000 + EntityId = 1000, }, new() { UnitNo = 5, EntityType = EntityTypes.Dragon, - EntityId = (int)Dragons.Ifrit + EntityId = (int)Dragons.Ifrit, }, new() { UnitNo = 6, EntityType = EntityTypes.Talisman, - EntityId = (int)Talismans.Raemond - } + EntityId = (int)Talismans.Raemond, + }, } ); @@ -158,7 +158,7 @@ await this.Client.PostMsgpack( new QuestSetQuestClearPartyRequest() { QuestId = 3, - RequestPartySettingList = this.SoloPartySettingLists + RequestPartySettingList = this.SoloPartySettingLists, } ); @@ -187,7 +187,7 @@ await this.Client.PostMsgpack( new QuestSetQuestClearPartyRequest() { QuestId = 4, - RequestPartySettingList = this.MultiPartySettingLists + RequestPartySettingList = this.MultiPartySettingLists, } ); @@ -252,8 +252,8 @@ await this.Client.PostMsgpack( EditSkill1CharaId = Charas.TemplarHope, EditSkill2CharaId = Charas.Zena, EquippedDragonEntityId = Dragons.Pazuzu, - EquippedTalismanEntityId = Talismans.GalaMym - } + EquippedTalismanEntityId = Talismans.GalaMym, + }, }; private List SoloPartySettingLists => @@ -294,7 +294,7 @@ await this.Client.PostMsgpack( EquipWeaponSkinId = 30129901, EditSkill1CharaId = Charas.TemplarHope, EditSkill2CharaId = Charas.Zena, - } + }, }; private List MultiDbEntities => @@ -321,7 +321,7 @@ await this.Client.PostMsgpack( EditSkill1CharaId = Charas.Empty, EditSkill2CharaId = Charas.GalaMym, EquippedDragonEntityId = Dragons.Leviathan, - EquippedTalismanEntityId = Talismans.GalaMym + EquippedTalismanEntityId = Talismans.GalaMym, }, new() { @@ -344,8 +344,8 @@ await this.Client.PostMsgpack( EditSkill1CharaId = Charas.ShaWujing, EditSkill2CharaId = Charas.Ranzal, EquippedDragonEntityId = Dragons.Phoenix, - EquippedTalismanEntityId = Talismans.GalaMym - } + EquippedTalismanEntityId = Talismans.GalaMym, + }, }; private List MultiPartySettingLists => @@ -386,7 +386,7 @@ await this.Client.PostMsgpack( EquipWeaponSkinId = 0, EditSkill1CharaId = Charas.ShaWujing, EditSkill2CharaId = Charas.Ranzal, - } + }, }; private List MissingItemDbEntities => @@ -407,7 +407,7 @@ await this.Client.PostMsgpack( QuestId = 6, IsMulti = false, CharaId = Charas.Cecile, - EquipCrestSlotType1CrestId1 = AbilityCrestId.InanUnendingWorld + EquipCrestSlotType1CrestId1 = AbilityCrestId.InanUnendingWorld, }, new() { @@ -445,7 +445,7 @@ await this.Client.PostMsgpack( IsMulti = false, EquipTalismanKeyId = 3000, CharaId = Charas.Raemond, - EquippedTalismanEntityId = Talismans.Raemond + EquippedTalismanEntityId = Talismans.Raemond, }, new() { @@ -455,7 +455,7 @@ await this.Client.PostMsgpack( IsMulti = false, CharaId = Charas.Edward, EditSkill1CharaId = Charas.Yue, - EditSkill2CharaId = Charas.Marty - } + EditSkill2CharaId = Charas.Marty, + }, }; } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Quest/QuestReadStoryTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Quest/QuestReadStoryTest.cs index b11f306b0..81f1a0769 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Quest/QuestReadStoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Quest/QuestReadStoryTest.cs @@ -164,7 +164,7 @@ await this.Client.PostMsgpack( new QuestStoryList() { QuestStoryId = theLonePaladynStoryId, - State = StoryState.Read + State = StoryState.Read, } ); @@ -192,7 +192,7 @@ await this.Client.PostMsgpack( .BeEquivalentTo( new List() { - new() { QuestStoryId = 1001009, State = StoryState.Read } + new() { QuestStoryId = 1001009, State = StoryState.Read }, } ); data.UpdateDataList.UserData.Exp.Should().BeGreaterThanOrEqualTo(88980); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/QuestBonusTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/QuestBonusTest.cs index c6e9d96f8..3f0ab5864 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/QuestBonusTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/QuestBonusTest.cs @@ -41,7 +41,7 @@ public async Task QuestBonus_CanClaimWeeklyAgitoBonus() LastDailyResetTime = response.Data.IngameResultData.EndTime, LastWeeklyResetTime = response.Data.IngameResultData.EndTime, DailyPlayCount = 1, - WeeklyPlayCount = 1 + WeeklyPlayCount = 1, } ); @@ -52,7 +52,7 @@ await this.Client.PostMsgpack( { QuestEventId = questEventId, IsReceive = true, - ReceiveBonusCount = 1 + ReceiveBonusCount = 1, } ); @@ -89,7 +89,7 @@ await this.Client.PostMsgpack( { EntityType = EntityTypes.Material, EntityId = (int)Materials.TwinklingSand, - } + }, }, opts => opts.Excluding(x => x.EntityQuantity) ); @@ -109,7 +109,7 @@ await this.Client.PostMsgpack( LastDailyResetTime = response.Data.IngameResultData.EndTime, LastWeeklyResetTime = response.Data.IngameResultData.EndTime, DailyPlayCount = 1, - WeeklyPlayCount = 1 + WeeklyPlayCount = 1, } ); } @@ -151,7 +151,7 @@ await this.AddToDatabase( LastDailyResetTime = resetTime, LastWeeklyResetTime = resetTime, DailyPlayCount = 11, - WeeklyPlayCount = 21 + WeeklyPlayCount = 21, } ); } @@ -190,7 +190,7 @@ await this.AddToDatabase( LastDailyResetTime = response.Data.IngameResultData.EndTime, LastWeeklyResetTime = response.Data.IngameResultData.EndTime, DailyPlayCount = 1, - WeeklyPlayCount = 1 + WeeklyPlayCount = 1, } ); @@ -201,7 +201,7 @@ await this.Client.PostMsgpack( { QuestEventId = questEventId, IsReceive = true, - ReceiveBonusCount = 1 + ReceiveBonusCount = 1, } ); @@ -235,7 +235,7 @@ public async Task QuestBonus_NotClaiming_SetsReserveCountToZero() LastDailyResetTime = response.Data.IngameResultData.EndTime, LastWeeklyResetTime = response.Data.IngameResultData.EndTime, DailyPlayCount = 1, - WeeklyPlayCount = 1 + WeeklyPlayCount = 1, } ); @@ -246,7 +246,7 @@ await this.Client.PostMsgpack( { QuestEventId = questEventId, IsReceive = false, - ReceiveBonusCount = 0 + ReceiveBonusCount = 0, } ); @@ -268,7 +268,7 @@ await this.Client.PostMsgpack( LastDailyResetTime = response.Data.IngameResultData.EndTime, LastWeeklyResetTime = response.Data.IngameResultData.EndTime, DailyPlayCount = 1, - WeeklyPlayCount = 1 + WeeklyPlayCount = 1, } ); } @@ -295,7 +295,7 @@ public async Task QuestBonus_PartiallyClaiming_SetsReserveCountToZero() LastDailyResetTime = response.Data.IngameResultData.EndTime, LastWeeklyResetTime = response.Data.IngameResultData.EndTime, DailyPlayCount = 1, - WeeklyPlayCount = 1 + WeeklyPlayCount = 1, } ); @@ -306,7 +306,7 @@ await this.Client.PostMsgpack( { QuestEventId = questEventId, IsReceive = false, - ReceiveBonusCount = 1 + ReceiveBonusCount = 1, } ); @@ -328,7 +328,7 @@ await this.Client.PostMsgpack( LastDailyResetTime = response.Data.IngameResultData.EndTime, LastWeeklyResetTime = response.Data.IngameResultData.EndTime, DailyPlayCount = 1, - WeeklyPlayCount = 1 + WeeklyPlayCount = 1, } ); } @@ -354,8 +354,8 @@ await this.Client.PostMsgpack( LiveUnitNoList = new List(), DamageRecord = new List(), DragonDamageRecord = new List(), - BattleRoyalRecord = new AtgenBattleRoyalRecord() - } + BattleRoyalRecord = new AtgenBattleRoyalRecord(), + }, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Reward/RewardServiceTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Reward/RewardServiceTest.cs index 3f6b8a7aa..cb83a41ea 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Reward/RewardServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Reward/RewardServiceTest.cs @@ -24,13 +24,13 @@ public async Task GrantSummoningTickets_Stackable_IncrementsExistingRow( SummonTickets ticketType ) { - DbSummonTicket ticket = new() { SummonTicketId = ticketType, Quantity = 1, }; + DbSummonTicket ticket = new() { SummonTicketId = ticketType, Quantity = 1 }; DbPlayerPresent present = new() { EntityType = EntityTypes.SummonTicket, EntityQuantity = 5, - EntityId = (int)ticketType + EntityId = (int)ticketType, }; await this.AddRangeToDatabase([ticket, present]); @@ -49,7 +49,7 @@ await this.Client.PostMsgpack( ViewerId = this.ViewerId, SummonTicketId = ticketType, Quantity = 6, - } + }, ] ); } @@ -68,7 +68,7 @@ public async Task GrantSummoningTickets_Stackable_NoRow_CreatesNewRow(SummonTick { EntityType = EntityTypes.SummonTicket, EntityQuantity = 5, - EntityId = (int)ticketType + EntityId = (int)ticketType, }; await this.AddToDatabase(present); @@ -86,7 +86,7 @@ await this.Client.PostMsgpack( ViewerId = this.ViewerId, SummonTicketId = ticketType, Quantity = 5, - } + }, ], opts => opts.Excluding(x => x.KeyId) ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V14UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V14UpdateTest.cs index fccbe8dad..30711f048 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V14UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V14UpdateTest.cs @@ -25,7 +25,7 @@ await this.AddToDatabase( { StoryId = cellieraCh5, StoryType = StoryTypes.Chara, - State = StoryState.Read + State = StoryState.Read, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V17UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V17UpdateTest.cs index 2f54e2584..d272bdde5 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V17UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V17UpdateTest.cs @@ -11,7 +11,7 @@ public V17UpdateTest(CustomWebApplicationFactory factory, ITestOutputHelper outp [Fact] public async Task V17Update_AddsMissingReliabilities() { - await this.AddToDatabase(new DbPlayerDragonData() { DragonId = Dragons.Arsene, }); + await this.AddToDatabase(new DbPlayerDragonData() { DragonId = Dragons.Arsene }); this.ApiContext.PlayerDragonReliability.AsNoTracking() .Should() diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V18UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V18UpdateTest.cs index 54b86e525..a5c24be41 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V18UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V18UpdateTest.cs @@ -17,11 +17,11 @@ public async Task Update_ExistingWallData_CompletesWallMissions() await this.AddRangeToDatabase( new List() { - new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 2, }, - new() { WallId = (int)QuestWallTypes.Water, WallLevel = 2, }, - new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 3, }, - new() { WallId = (int)QuestWallTypes.Light, WallLevel = 4, }, - new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 3, }, + new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 2 }, + new() { WallId = (int)QuestWallTypes.Water, WallLevel = 2 }, + new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 3 }, + new() { WallId = (int)QuestWallTypes.Light, WallLevel = 4 }, + new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 3 }, } ); @@ -144,11 +144,11 @@ public async Task Update_MaxLevelWall_DoesNotAddNonExistentMission() await this.AddRangeToDatabase( new List() { - new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Water, WallLevel = 0, }, - new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 0, }, - new() { WallId = (int)QuestWallTypes.Light, WallLevel = 0, }, - new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 0, }, + new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Water, WallLevel = 0 }, + new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 0 }, + new() { WallId = (int)QuestWallTypes.Light, WallLevel = 0 }, + new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 0 }, } ); @@ -218,11 +218,11 @@ public async Task Update_MaxLevelWallEveryElement_DoesNotAddNonExistentMission() await this.AddRangeToDatabase( new List() { - new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Water, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Light, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 80, }, + new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Water, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Light, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 80 }, } ); @@ -248,11 +248,11 @@ public async Task Update_NoWallProgress_AddsBaseMissions() await this.AddRangeToDatabase( new List() { - new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 0, }, - new() { WallId = (int)QuestWallTypes.Water, WallLevel = 0, }, - new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 0, }, - new() { WallId = (int)QuestWallTypes.Light, WallLevel = 0, }, - new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 0, }, + new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 0 }, + new() { WallId = (int)QuestWallTypes.Water, WallLevel = 0 }, + new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 0 }, + new() { WallId = (int)QuestWallTypes.Light, WallLevel = 0 }, + new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 0 }, } ); @@ -312,7 +312,7 @@ await this.AddToDatabase( Id = 10010601, // Clear The Mercurial Gauntlet (Shadow): Lv. 1 Type = MissionType.Normal, State = MissionState.InProgress, - } + }, ], opts => opts.Excluding(x => x.ViewerId).Excluding(x => x.GroupId) ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V19UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V19UpdateTest.cs index d3188e0a3..52a245a70 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V19UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V19UpdateTest.cs @@ -22,7 +22,7 @@ await this.AddRangeToDatabase( new DbSummonTicket() { SummonTicketId = SummonTickets.TenfoldSummon, Quantity = 1 }, new DbSummonTicket() { SummonTicketId = SummonTickets.TenfoldSummon, Quantity = 1 }, new DbSummonTicket() { SummonTicketId = SummonTickets.DragonSummon, Quantity = 1 }, - new DbSummonTicket() { SummonTicketId = SummonTickets.DragonSummon, Quantity = 1 } + new DbSummonTicket() { SummonTicketId = SummonTickets.DragonSummon, Quantity = 1 }, ] ); @@ -35,20 +35,20 @@ await this.AddRangeToDatabase( { ViewerId = this.ViewerId, SummonTicketId = SummonTickets.SingleSummon, - Quantity = 8 + Quantity = 8, }, new() { ViewerId = this.ViewerId, SummonTicketId = SummonTickets.TenfoldSummon, - Quantity = 9 + Quantity = 9, }, new() { ViewerId = this.ViewerId, SummonTicketId = SummonTickets.DragonSummon, - Quantity = 2 - } + Quantity = 2, + }, ], opts => opts.Excluding(x => x.KeyId) ); @@ -75,14 +75,14 @@ public async Task V19Update_DoesNothingIfTicketsAlreadyStacked() KeyId = tickets[0].KeyId, ViewerId = this.ViewerId, SummonTicketId = SummonTickets.SingleSummon, - Quantity = 5 + Quantity = 5, }, new() { KeyId = tickets[1].KeyId, ViewerId = this.ViewerId, SummonTicketId = SummonTickets.TenfoldSummon, - Quantity = 7 + Quantity = 7, }, ] ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V1UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V1UpdateTest.cs index a23f5e7c8..760fc3f5c 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V1UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V1UpdateTest.cs @@ -19,7 +19,7 @@ await this.AddToDatabase( ViewerId = ViewerId, StoryType = StoryTypes.Quest, State = StoryState.Read, - StoryId = TutorialService.TutorialStoryIds.Halidom + StoryId = TutorialService.TutorialStoryIds.Halidom, } ); @@ -44,7 +44,7 @@ await this.AddToDatabase( ViewerId = ViewerId, StoryType = StoryTypes.Quest, State = StoryState.Read, - StoryId = TutorialService.TutorialStoryIds.Smithy + StoryId = TutorialService.TutorialStoryIds.Smithy, } ); @@ -69,7 +69,7 @@ await this.AddToDatabase( ViewerId = ViewerId, StoryType = StoryTypes.Quest, State = StoryState.Read, - StoryId = 1000808 + StoryId = 1000808, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V20UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V20UpdateTest.cs index e714a1dd7..b30e98b18 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V20UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V20UpdateTest.cs @@ -23,15 +23,15 @@ await this.AddRangeToDatabase( ViewerId = this.ViewerId, StoryId = HarleStoryId, StoryType = StoryTypes.Quest, - State = StoryState.Read + State = StoryState.Read, }, new DbPlayerStoryState() { ViewerId = this.ViewerId, StoryId = OrigaStoryId, StoryType = StoryTypes.Quest, - State = StoryState.Read - } + State = StoryState.Read, + }, ] ); @@ -55,15 +55,15 @@ public async Task V20Update_StoriesNotCompleted_DoesNotAddCharacters() Owner = new DbPlayer() { AccountId = "other player" }, StoryId = HarleStoryId, StoryType = StoryTypes.Quest, - State = StoryState.Read + State = StoryState.Read, }, new DbPlayerStoryState() { ViewerId = this.ViewerId, StoryId = OrigaStoryId, StoryType = StoryTypes.Quest, - State = StoryState.Unlocked - } + State = StoryState.Unlocked, + }, ] ); await this.ApiContext.SaveChangesAsync(); @@ -87,14 +87,14 @@ await this.AddRangeToDatabase( ViewerId = this.ViewerId, StoryId = HarleStoryId, StoryType = StoryTypes.Quest, - State = StoryState.Read + State = StoryState.Read, }, new DbPlayerStoryState() { ViewerId = this.ViewerId, StoryId = OrigaStoryId, StoryType = StoryTypes.Quest, - State = StoryState.Read + State = StoryState.Read, }, new DbPlayerCharaData(this.ViewerId, Charas.Harle), new DbPlayerCharaData(this.ViewerId, Charas.Origa), diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V21UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V21UpdateTest.cs index 750f03abc..8c3e3b2e8 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V21UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V21UpdateTest.cs @@ -43,7 +43,7 @@ public async Task V21Update_WallInitialized_AlreadyHasRewardDate_DoesNotAddRewar await this.AddRangeToDatabase( [ new DbPlayerQuestWall() { WallId = WallService.FlameWallId, WallLevel = 2 }, - new DbWallRewardDate() { LastClaimDate = DateTimeOffset.UnixEpoch.AddDays(1) } + new DbWallRewardDate() { LastClaimDate = DateTimeOffset.UnixEpoch.AddDays(1) }, ] ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V22UpdateTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V22UpdateTest.cs index ea82c6074..3f662b901 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V22UpdateTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/SavefileUpdate/V22UpdateTest.cs @@ -32,7 +32,7 @@ await this.AddToDatabase( ViewerId = this.ViewerId, StoryId = Chapter10LastStoryId, StoryType = StoryTypes.Quest, - State = StoryState.Read + State = StoryState.Read, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Stamp/StampTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Stamp/StampTest.cs index 7c39262c9..ca03b6295 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Stamp/StampTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Stamp/StampTest.cs @@ -56,7 +56,7 @@ public async Task SetEquipStamp_UpdatesDatabase() new() { Slot = 29, StampId = 10029 }, new() { Slot = 30, StampId = 10030 }, new() { Slot = 31, StampId = 10031 }, - new() { Slot = 32, StampId = 10201 } + new() { Slot = 32, StampId = 10201 }, }; await this.Client.PostMsgpack( @@ -114,7 +114,7 @@ public async Task SetEquipStamp_ReturnsCorrectResponse() new() { Slot = 29, StampId = 10029 }, new() { Slot = 30, StampId = 10030 }, new() { Slot = 31, StampId = 10031 }, - new() { Slot = 32, StampId = 10201 } + new() { Slot = 32, StampId = 10201 }, }; StampSetEquipStampResponse data = ( diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Story/StoryTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Story/StoryTest.cs index 4ce4fb026..f0ce16272 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Story/StoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Story/StoryTest.cs @@ -30,8 +30,8 @@ await this.Client.PostMsgpack( { EntityType = EntityTypes.Wyrmite, EntityQuantity = 25, - EntityId = 0 - } + EntityId = 0, + }, } ); @@ -40,7 +40,7 @@ await this.Client.PostMsgpack( .BeEquivalentTo( new List() { - new() { UnitStoryId = 100001141, IsRead = true, } + new() { UnitStoryId = 100001141, IsRead = true }, } ); } @@ -54,14 +54,14 @@ await this.AddToDatabase( ViewerId = this.ViewerId, State = StoryState.Read, StoryId = 100001121, - StoryType = StoryTypes.Chara + StoryType = StoryTypes.Chara, }, new DbPlayerStoryState() { ViewerId = this.ViewerId, State = StoryState.Read, StoryId = 100001122, - StoryType = StoryTypes.Chara + StoryType = StoryTypes.Chara, } ); await this.ApiContext.SaveChangesAsync(); @@ -115,7 +115,7 @@ await this.Client.PostMsgpack( ViewerId = this.ViewerId, State = StoryState.Read, StoryId = 100002011, - StoryType = StoryTypes.Chara + StoryType = StoryTypes.Chara, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Summoning/SummonTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Summoning/SummonTest.cs index 0f57a9b4f..dabfd4f92 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Summoning/SummonTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Summoning/SummonTest.cs @@ -75,7 +75,7 @@ await this.Client.PostMsgpack( CharaRate = "1.00%", DragonRate = "0.80%", Pickup = true, - TotalRate = "1.80%" + TotalRate = "1.80%", }, new AtgenRarityGroupList { @@ -83,7 +83,7 @@ await this.Client.PostMsgpack( CharaRate = "1.10%", DragonRate = "1.10%", Pickup = false, - TotalRate = "2.20%" + TotalRate = "2.20%", }, new AtgenRarityGroupList { @@ -91,7 +91,7 @@ await this.Client.PostMsgpack( CharaRate = "8.55%", DragonRate = "7.45%", Pickup = false, - TotalRate = "16.00%" + TotalRate = "16.00%", }, new AtgenRarityGroupList { @@ -99,8 +99,8 @@ await this.Client.PostMsgpack( CharaRate = "48.00%", DragonRate = "32.00%", Pickup = false, - TotalRate = "80.00%" - } + TotalRate = "80.00%", + }, ] ); @@ -114,7 +114,7 @@ await this.Client.PostMsgpack( CharaRate = "1.00%", DragonRate = "0.80%", Pickup = true, - TotalRate = "1.80%" + TotalRate = "1.80%", }, new AtgenRarityGroupList { @@ -122,7 +122,7 @@ await this.Client.PostMsgpack( CharaRate = "1.10%", DragonRate = "1.10%", Pickup = false, - TotalRate = "2.20%" + TotalRate = "2.20%", }, new AtgenRarityGroupList { @@ -130,8 +130,8 @@ await this.Client.PostMsgpack( CharaRate = "51.30%", DragonRate = "44.70%", Pickup = false, - TotalRate = "96.00%" - } + TotalRate = "96.00%", + }, ] ); @@ -143,7 +143,7 @@ await this.Client.PostMsgpack( .BeEquivalentTo( [ new AtgenUnitList { Id = (int)Charas.Joker, Rate = "0.500%" }, - new AtgenUnitList { Id = (int)Charas.Mona, Rate = "0.500%" } + new AtgenUnitList { Id = (int)Charas.Mona, Rate = "0.500%" }, ] ); normalOdds @@ -187,11 +187,11 @@ await this.Client.PostMsgpack( Charas.Julietta, Charas.Lucretia, Charas.Hildegarde, - Charas.Nefaria - }.Select(x => new AtgenUnitList() { Id = (int)x, Rate = "7.692%" }) + Charas.Nefaria, + }.Select(x => new AtgenUnitList() { Id = (int)x, Rate = "7.692%" }), }, - new() { Rarity = 4, UnitList = [], }, - new() { Rarity = 3, UnitList = [], } + new() { Rarity = 4, UnitList = [] }, + new() { Rarity = 3, UnitList = [] }, } ); } @@ -309,7 +309,7 @@ await this.AddToDatabase( { SummonBannerId = TestBannerId, DailyLimitedSummonCount = dailyCount, - SummonCount = summonCount + SummonCount = summonCount, } ); @@ -319,7 +319,7 @@ await this.AddToDatabase( SummonTicketId = SummonTickets.SingleSummon, KeyId = 2, Quantity = 1, - UseLimitTime = DateTimeOffset.UnixEpoch + UseLimitTime = DateTimeOffset.UnixEpoch, } ); @@ -372,7 +372,7 @@ await this.Client.PostMsgpack("summon/get_summon_li SummonTicketId = SummonTickets.SingleSummon, KeyId = 2, Quantity = 1, - UseLimitTime = DateTimeOffset.UnixEpoch + UseLimitTime = DateTimeOffset.UnixEpoch, } ); } @@ -469,19 +469,19 @@ await this.Client.PostMsgpack( { TradeId = int.Parse($"{TestBannerId}100"), EntityId = (int)Charas.Mona, - EntityType = EntityTypes.Chara + EntityType = EntityTypes.Chara, }, new() { TradeId = int.Parse($"{TestBannerId}700"), EntityId = (int)Dragons.Arsene, - EntityType = EntityTypes.Dragon - } + EntityType = EntityTypes.Dragon, + }, ], - SummonPointList = [new() { SummonPointId = TestBannerId, SummonPoint = 0, }], + SummonPointList = [new() { SummonPointId = TestBannerId, SummonPoint = 0 }], UpdateDataList = new() { - SummonPointList = [new() { SummonPointId = TestBannerId, SummonPoint = 0, }] + SummonPointList = [new() { SummonPointId = TestBannerId, SummonPoint = 0 }], }, EntityResult = new(), }, @@ -496,7 +496,7 @@ await this.Client.PostMsgpack( public async Task SummonGetSummonPointTrade_ExistingBannerData_ReturnsData() { await this.AddToDatabase( - new DbPlayerBannerData() { SummonBannerId = TestBannerId, SummonPoints = 400, } + new DbPlayerBannerData() { SummonBannerId = TestBannerId, SummonPoints = 400 } ); SummonGetSummonPointTradeResponse response = ( @@ -517,16 +517,16 @@ await this.Client.PostMsgpack( { TradeId = int.Parse($"{TestBannerId}100"), EntityId = (int)Charas.Mona, - EntityType = EntityTypes.Chara + EntityType = EntityTypes.Chara, }, new() { TradeId = int.Parse($"{TestBannerId}700"), EntityId = (int)Dragons.Arsene, - EntityType = EntityTypes.Dragon - } + EntityType = EntityTypes.Dragon, + }, ], - SummonPointList = [new() { SummonPointId = TestBannerId, SummonPoint = 400, }], + SummonPointList = [new() { SummonPointId = TestBannerId, SummonPoint = 400 }], UpdateDataList = new(), EntityResult = new(), }, @@ -597,13 +597,13 @@ await this.AddToDatabase( { SummonTicketId = SummonTickets.SingleSummon, KeyId = 1, - Quantity = 1 + Quantity = 1, }, new DbSummonTicket() { SummonTicketId = SummonTickets.SingleSummon, KeyId = 2, - Quantity = 1 + Quantity = 1, } ); @@ -631,7 +631,7 @@ await this.AddToDatabase( { SummonTicketId = SummonTickets.SingleSummon, KeyId = 1, - Quantity = 5 + Quantity = 5, } ); @@ -731,7 +731,7 @@ SummonExecTypes types ) { await this.AddToDatabase( - new DbSummonTicket() { SummonTicketId = SummonTickets.TenfoldSummon, KeyId = 1, } + new DbSummonTicket() { SummonTicketId = SummonTickets.TenfoldSummon, KeyId = 1 } ); DragaliaResponse response = @@ -757,7 +757,7 @@ await this.Client.PostMsgpack( [InlineData(SummonTickets.DragonSummonPlus, SummonConstants.DragonSummonPlusBannerId)] public async Task SummonRequest_SpecialTicket_Success(SummonTickets ticket, int bannerId) { - await this.AddToDatabase(new DbSummonTicket() { SummonTicketId = ticket, Quantity = 1, }); + await this.AddToDatabase(new DbSummonTicket() { SummonTicketId = ticket, Quantity = 1 }); SummonRequestResponse response = ( await this.Client.PostMsgpack( @@ -1031,7 +1031,7 @@ public async Task SummonPointTrade_Chara_Success_ReturnsData() int monaTradeId = int.Parse($"{TestBannerId}100"); await this.AddToDatabase( - new DbPlayerBannerData() { SummonBannerId = TestBannerId, SummonPoints = 400, } + new DbPlayerBannerData() { SummonBannerId = TestBannerId, SummonPoints = 400 } ); SummonSummonPointTradeResponse response = ( @@ -1064,7 +1064,7 @@ public async Task SummonPointTrade_Dragon_Success_ReturnsData() int arseneTradeId = int.Parse($"{TestBannerId}700"); await this.AddToDatabase( - new DbPlayerBannerData() { SummonBannerId = TestBannerId, SummonPoints = 400, } + new DbPlayerBannerData() { SummonBannerId = TestBannerId, SummonPoints = 400 } ); SummonSummonPointTradeResponse response = ( diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/TimeAttack/TimeAttackRankingTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/TimeAttack/TimeAttackRankingTest.cs index 24595d01d..e8833d1a8 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/TimeAttack/TimeAttackRankingTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/TimeAttack/TimeAttackRankingTest.cs @@ -37,7 +37,7 @@ public async Task ReceiveTierReward_GrantsRewardsOnce() { ViewerId = ViewerId, BestClearTime = 200f, - QuestId = questId + QuestId = questId, } ); @@ -59,7 +59,7 @@ await this.Client.PostMsgpack( { EntityId = 0, EntityType = EntityTypes.Dew, - EntityQuantity = 7000 + EntityQuantity = 7000, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Trade/AbilityCrestTradeTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Trade/AbilityCrestTradeTest.cs index 3b8293008..348157edf 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Trade/AbilityCrestTradeTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Trade/AbilityCrestTradeTest.cs @@ -28,7 +28,7 @@ await Client.PostMsgpack( new AbilityCrestTradeTradeRequest() { AbilityCrestTradeId = tradeId, - TradeCount = 1 + TradeCount = 1, } ) ).Data; diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Trade/TreasureTradeTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Trade/TreasureTradeTest.cs index 774b7b0a0..d0b273976 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Trade/TreasureTradeTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Trade/TreasureTradeTest.cs @@ -35,7 +35,7 @@ await this.AddToDatabase( Id = 1000, Count = 1, Type = TradeType.Treasure, - LastTradeTime = DateTimeOffset.UnixEpoch + LastTradeTime = DateTimeOffset.UnixEpoch, } ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallRecordTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallRecordTest.cs index fe44de6e8..54a403c6b 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallRecordTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallRecordTest.cs @@ -39,7 +39,7 @@ public async Task Record_ReceivesRewards() new() { MaterialId = Materials.GoldCrystal, - Quantity = oldPlayerGoldCrystals.Quantity + expectedGoldCrystalsAmount + Quantity = oldPlayerGoldCrystals.Quantity + expectedGoldCrystalsAmount, }; await this.AddRangeToDatabase( @@ -49,8 +49,8 @@ await this.AddRangeToDatabase( { ViewerId = ViewerId, WallId = wallId, - WallLevel = wallLevel - } + WallLevel = wallLevel, + }, } ); @@ -59,7 +59,10 @@ await this.AddRangeToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, WallId = wallId, - WallLevel = wallLevel + 1 // Client passes (db wall level + 1) + WallLevel = + wallLevel + + 1 // Client passes (db wall level + 1) + , }; string key = await this.StartDungeon(mockSession); @@ -86,7 +89,7 @@ await Client.PostMsgpack( { WallId = wallId, BeforeWallLevel = wallLevel, - AfterWallLevel = wallLevel + 1 + AfterWallLevel = wallLevel + 1, } ); @@ -97,7 +100,7 @@ await Client.PostMsgpack( { EntityType = EntityTypes.Wyrmite, EntityId = 0, - EntityQuantity = expectedWyrmites + EntityQuantity = expectedWyrmites, } ); @@ -112,11 +115,11 @@ await Client.PostMsgpack( { EntityType = EntityTypes.Material, EntityId = (int)Materials.GoldCrystal, - EntityQuantity = expectedGoldCrystalsAmount - } + EntityQuantity = expectedGoldCrystalsAmount, + }, }, TakeCoin = expectedCoin, - TakeMana = expectedMana + TakeMana = expectedMana, } ); @@ -127,7 +130,7 @@ await Client.PostMsgpack( { QuestPartySettingList = mockSession.Party, HelperList = new List(), - HelperDetailList = new List() + HelperDetailList = new List(), } ); } @@ -147,8 +150,8 @@ await this.AddRangeToDatabase( { ViewerId = ViewerId, WallId = wallId, - WallLevel = wallLevel - } + WallLevel = wallLevel, + }, } ); @@ -157,7 +160,7 @@ await this.AddRangeToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, WallId = wallId, - WallLevel = wallLevel + WallLevel = wallLevel, }; string key = await this.StartDungeon(mockSession); @@ -176,7 +179,7 @@ await Client.PostMsgpack( { EntityType = EntityTypes.Wyrmite, EntityId = 0, - EntityQuantity = notExpectedWyrmites + EntityQuantity = notExpectedWyrmites, } ); @@ -188,7 +191,7 @@ await Client.PostMsgpack( { WallId = wallId, BeforeWallLevel = wallLevel, - AfterWallLevel = wallLevel + AfterWallLevel = wallLevel, } ); } @@ -204,11 +207,11 @@ public async Task Record_CompletesMissionsAndStartsNext() await this.AddRangeToDatabase( new List() { - new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 5, }, - new() { WallId = (int)QuestWallTypes.Water, WallLevel = 6, }, - new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 6, }, - new() { WallId = (int)QuestWallTypes.Light, WallLevel = 6, }, - new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 6, } + new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 5 }, + new() { WallId = (int)QuestWallTypes.Water, WallLevel = 6 }, + new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 6 }, + new() { WallId = (int)QuestWallTypes.Light, WallLevel = 6 }, + new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 6 }, } ); @@ -219,7 +222,7 @@ await this.AddRangeToDatabase( { Id = flameLv6MissionId, State = MissionState.InProgress, - Type = MissionType.Normal + Type = MissionType.Normal, }, new() { @@ -236,7 +239,7 @@ await this.AddRangeToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, WallId = (int)QuestWallTypes.Flame, - WallLevel = 6 + WallLevel = 6, }; string key = await this.StartDungeon(mockSession); @@ -247,7 +250,7 @@ await Client.PostMsgpack( new WallRecordRecordRequest() { WallId = (int)QuestWallTypes.Flame, - DungeonKey = key + DungeonKey = key, } ) ).Data; @@ -280,11 +283,11 @@ public async Task Record_ClearingAlreadyClearedLevel_DoesNotProgressMission() await this.AddRangeToDatabase( new List() { - new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Water, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Light, WallLevel = 80, }, - new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 79, } + new() { WallId = (int)QuestWallTypes.Flame, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Water, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Wind, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Light, WallLevel = 80 }, + new() { WallId = (int)QuestWallTypes.Shadow, WallLevel = 79 }, } ); @@ -306,7 +309,7 @@ await this.AddRangeToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, WallId = (int)QuestWallTypes.Flame, - WallLevel = 80 + WallLevel = 80, }; string key = await this.StartDungeon(mockSession); @@ -317,7 +320,7 @@ await Client.PostMsgpack( new WallRecordRecordRequest() { WallId = (int)QuestWallTypes.Flame, - DungeonKey = key + DungeonKey = key, } ) ).Data; diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallStartTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallStartTest.cs index 7d47382b6..9ce093ead 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallStartTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallStartTest.cs @@ -26,8 +26,8 @@ await this.AddRangeToDatabase( { ViewerId = ViewerId, WallId = wallId, - WallLevel = wallLevel - } + WallLevel = wallLevel, + }, } ); @@ -38,7 +38,7 @@ await Client.PostMsgpack( { WallId = wallId, WallLevel = wallLevel, - PartyNo = 1 + PartyNo = 1, } ) ).Data; @@ -66,8 +66,8 @@ await this.AddRangeToDatabase( { ViewerId = ViewerId, WallId = wallId, - WallLevel = wallLevel - } + WallLevel = wallLevel, + }, } ); @@ -78,7 +78,7 @@ await Client.PostMsgpack( { WallId = wallId, WallLevel = wallLevel, - RequestPartySettingList = new List() + RequestPartySettingList = new List(), } ) ).Data; diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallTest.cs index 5109a67fb..3e075ff8e 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Wall/WallTest.cs @@ -26,7 +26,7 @@ await AddToDatabase( { QuestId = questId, State = 0, - ViewerId = ViewerId + ViewerId = ViewerId, } ); @@ -35,7 +35,7 @@ await AddToDatabase( { Party = new List() { new() { CharaId = Charas.ThePrince } }, WallId = expectedWallId, - WallLevel = expectedWallLevel + WallLevel = expectedWallLevel, }; string key = await this.StartDungeon(mockSession); @@ -54,7 +54,7 @@ await Client.PostMsgpack( { WallId = expectedWallId, WallLevel = expectedWallLevel, - IsHost = true + IsHost = true, } ); } @@ -64,7 +64,7 @@ public async Task GetMonthlyReward_ReturnsExpectedResponse() { await this.AddRangeToDatabase( [ - new DbWallRewardDate() { LastClaimDate = DateTimeOffset.UnixEpoch, }, + new DbWallRewardDate() { LastClaimDate = DateTimeOffset.UnixEpoch }, new DbPlayerQuestWall() { ViewerId = ViewerId, @@ -94,7 +94,7 @@ await this.AddRangeToDatabase( ViewerId = ViewerId, WallId = 216010005, WallLevel = 5, - } + }, ] ); @@ -113,7 +113,7 @@ await this.Client.PostMsgpack( QuestGroupId = 21601, SumWallLevel = 1 + 2 + 3 + 4 + 5, LastRewardDate = DateTimeOffset.UnixEpoch, - RewardStatus = RewardStatus.Available + RewardStatus = RewardStatus.Available, } ); } @@ -171,7 +171,7 @@ await this.AddRangeToDatabase( ViewerId = ViewerId, WallId = 216010005, WallLevel = 5, - } + }, } ); @@ -190,7 +190,7 @@ await this.Client.PostMsgpack( QuestGroupId = 21601, SumWallLevel = 5 * 5, LastRewardDate = DateTimeOffset.UnixEpoch, - RewardStatus = RewardStatus.Available + RewardStatus = RewardStatus.Available, } ); @@ -212,7 +212,7 @@ await this.Client.PostMsgpack( new MaterialList() { MaterialId = Materials.TwinklingSand, - Quantity = oldTwinklingSand + expectedTwinklingSand + Quantity = oldTwinklingSand + expectedTwinklingSand, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/News/NewsTests.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/News/NewsTests.cs index 8220bb063..6957d009b 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/News/NewsTests.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/News/NewsTests.cs @@ -37,7 +37,7 @@ public async Task GetNewsItems_Returns200PagedResponse() .BeEquivalentTo( new OffsetPagedResponse() { - Pagination = new() { TotalCount = 6, }, + Pagination = new() { TotalCount = 6 }, Data = Enumerable .Range(1, 5) .Select(x => new NewsItem() @@ -45,7 +45,7 @@ public async Task GetNewsItems_Returns200PagedResponse() Headline = $"News Item {x}", Description = $"News Item Description {x}", }) - .ToList() + .ToList(), }, opts => opts.For(x => x.Data).Exclude(x => x.Id) ); @@ -61,15 +61,15 @@ public async Task GetNewsItems_Returns200PagedResponse() .BeEquivalentTo( new OffsetPagedResponse() { - Pagination = new() { TotalCount = 6, }, + Pagination = new() { TotalCount = 6 }, Data = [ new() { Headline = $"News Item 6", Description = $"News Item Description 6", - } - ] + }, + ], }, opts => opts.For(x => x.Data).Exclude(x => x.Id) ); @@ -83,7 +83,7 @@ public async Task GetNewsItems_DoesNotShowHiddenItem() { Hidden = true, Headline = "hidden", - Description = "hidden" + Description = "hidden", }; this.ApiContext.NewsItems.Add(hiddenItem); @@ -106,7 +106,7 @@ public async Task GetNewsItem_CanViewHiddenItem() { Hidden = true, Headline = "hidden", - Description = "hidden" + Description = "hidden", }; this.ApiContext.NewsItems.Add(hiddenItem); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/Users/UserTests.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/Users/UserTests.cs index 0bffe59ef..31b609b34 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/Users/UserTests.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Features/Web/Users/UserTests.cs @@ -50,7 +50,7 @@ public async Task UserMe_Authenticated_Returns200() (await resp.Content.ReadFromJsonAsync()) .Should() - .BeEquivalentTo(new User() { Name = "Euden", ViewerId = this.ViewerId, }); + .BeEquivalentTo(new User() { Name = "Euden", ViewerId = this.ViewerId }); } [Fact] diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Other/GlobalQueryFilterTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Other/GlobalQueryFilterTest.cs index 5dc4b725e..0567ea735 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Other/GlobalQueryFilterTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Other/GlobalQueryFilterTest.cs @@ -81,12 +81,12 @@ public async Task DbPlayerPresentHistory_HasGlobalQueryFilter() // This entity uses a non-auto-incrementing integer primary key :/ this.ApiContext.PlayerPresentHistory.AddRange( [ - new() { Id = 1, ViewerId = this.ViewerId, }, + new() { Id = 1, ViewerId = this.ViewerId }, new() { Id = 2, - Owner = new() { ViewerId = this.ViewerId + 1, AccountId = "otherhist" } - } + Owner = new() { ViewerId = this.ViewerId + 1, AccountId = "otherhist" }, + }, ] ); await this.ApiContext.SaveChangesAsync(); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Other/SavefileImportTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Other/SavefileImportTest.cs index 585badc22..1cae0cd13 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Other/SavefileImportTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Other/SavefileImportTest.cs @@ -214,7 +214,7 @@ public async Task Import_DoesNotDeleteBuyableDragonGifts() public async Task Import_DeletesDailyMissions() { this.ApiContext.CompletedDailyMissions.Add( - new() { ViewerId = this.ViewerId, Progress = 1, } + new() { ViewerId = this.ViewerId, Progress = 1 } ); HttpContent content = PrepareSavefileRequest("endgame_savefile.json"); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/Other/SummonHistoryJobTest.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/Other/SummonHistoryJobTest.cs index 9348f536f..4b3727f35 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/Other/SummonHistoryJobTest.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/Other/SummonHistoryJobTest.cs @@ -23,7 +23,7 @@ public async Task SummonHistoryJob_PurgesOlderThan14Days() await this.AddRangeToDatabase( [ new DbPlayerSummonHistory() { ExecDate = DateTimeOffset.UtcNow }, - new DbPlayerSummonHistory() { ExecDate = DateTimeOffset.UtcNow.AddDays(-20) } + new DbPlayerSummonHistory() { ExecDate = DateTimeOffset.UtcNow.AddDays(-20) }, ] ); diff --git a/DragaliaAPI/DragaliaAPI.Integration.Test/TestFixture.cs b/DragaliaAPI/DragaliaAPI.Integration.Test/TestFixture.cs index a0dfac54b..cf390c1e0 100644 --- a/DragaliaAPI/DragaliaAPI.Integration.Test/TestFixture.cs +++ b/DragaliaAPI/DragaliaAPI.Integration.Test/TestFixture.cs @@ -261,7 +261,7 @@ private async Task SeedDatabase() { ViewerId = newPlayer.ViewerId, MaterialId = x, - Quantity = 99999999 + Quantity = 99999999, }) ); @@ -271,7 +271,7 @@ private async Task SeedDatabase() { ViewerId = newPlayer.ViewerId, DragonGiftId = x, - Quantity = x < DragonGifts.FourLeafClover ? 1 : 999 + Quantity = x < DragonGifts.FourLeafClover ? 1 : 999, }) ); @@ -283,7 +283,7 @@ private async Task SeedDatabase() { ViewerId = newPlayer.ViewerId, PlantId = FortPlants.Smithy, - Level = 9 + Level = 9, } ); @@ -305,7 +305,7 @@ await apiContext.PlayerUserData.FindAsync(newPlayer.ViewerId) { ViewerId = newPlayer.ViewerId, Point1Quantity = 100_000_000, - Point2Quantity = 100_000_000 + Point2Quantity = 100_000_000, } ); diff --git a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/Daily/PermanentDailies.cs b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/Daily/PermanentDailies.cs index efe8e97c3..c734c878b 100644 --- a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/Daily/PermanentDailies.cs +++ b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/Daily/PermanentDailies.cs @@ -16,38 +16,38 @@ public static class PermanentDailies new ItemSummonMission() { MissionId = 15070101, - ProgressionGroupId = ProgressionGroupId + ProgressionGroupId = ProgressionGroupId, }, // Collect Rupies from a Facility new FortIncomeCollectedMission() { MissionId = 15070201, EntityType = EntityTypes.Rupies, - ProgressionGroupId = ProgressionGroupId + ProgressionGroupId = ProgressionGroupId, }, // Clear a Quest new ClearQuestMission() { MissionId = 15070301, - ProgressionGroupId = ProgressionGroupId + ProgressionGroupId = ProgressionGroupId, }, // Clear Three Quests new ClearQuestMission() { MissionId = 15070401, - ProgressionGroupId = ProgressionGroupId + ProgressionGroupId = ProgressionGroupId, }, // Clear Five Quests new ClearQuestMission() { MissionId = 15070501, - ProgressionGroupId = ProgressionGroupId + ProgressionGroupId = ProgressionGroupId, }, // Clear All Standard Daily Endeavors new ClearProgressionGroupMission() { MissionId = 15070601, - ProgressionGroupToClear = ProgressionGroupId - } + ProgressionGroupToClear = ProgressionGroupId, + }, ]; } diff --git a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/AccursedArchives.cs b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/AccursedArchives.cs index 17b82a8a5..b78638ffd 100644 --- a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/AccursedArchives.cs +++ b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/AccursedArchives.cs @@ -23,7 +23,7 @@ public static class AccursedArchives new EventQuestClearWithCrestMission() { MissionId = 10100401, - Crest = AbilityCrestId.HittingtheBooks + Crest = AbilityCrestId.HittingtheBooks, }, // Collect 100 Forbidden Knowledge in One Go new EventPointCollectionRecordMission() { MissionId = 10100501 }, diff --git a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/DivineDeception.cs b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/DivineDeception.cs index 72fbba205..fe833e85b 100644 --- a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/DivineDeception.cs +++ b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/DivineDeception.cs @@ -21,7 +21,7 @@ public static class DivineDeception new EventQuestClearWithCrestMission() { MissionId = 10210401, - Crest = AbilityCrestId.ExtremeTeamwork + Crest = AbilityCrestId.ExtremeTeamwork, }, // Collect 100 Intelligence in One Go new EventPointCollectionRecordMission() { MissionId = 10210501 }, @@ -62,26 +62,26 @@ public static class DivineDeception { MissionId = 10210901, FullClear = true, - VariationType = VariationTypes.VeryHard + VariationType = VariationTypes.VeryHard, }, // Completely Clear a Challenge Battle on Master new EventChallengeBattleClearMission() { MissionId = 10211001, FullClear = true, - VariationType = VariationTypes.Extreme + VariationType = VariationTypes.Extreme, }, // Clear a "Divine Deception" Trial on Standard new EventTrialClearMission() { MissionId = 10211101, - VariationType = VariationTypes.Hell + VariationType = VariationTypes.Hell, }, // Clear a "Divine Deception" Trial on Expert new EventTrialClearMission() { MissionId = 10211201, - VariationType = VariationTypes.Variation6 + VariationType = VariationTypes.Variation6, }, // Earn the "Fate Fighter" Epithet // Earned from "Completely Clear a Challenge Battle on Master" @@ -89,7 +89,7 @@ public static class DivineDeception { MissionId = 10211301, FullClear = true, - VariationType = VariationTypes.Extreme + VariationType = VariationTypes.Extreme, }, ]; } diff --git a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/MiracleOfDragonyule.cs b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/MiracleOfDragonyule.cs index fc8784c3b..71d56af50 100644 --- a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/MiracleOfDragonyule.cs +++ b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/MiracleOfDragonyule.cs @@ -28,7 +28,7 @@ public static class MiracleOfDragonyule new EventQuestClearWithCrestMission() { MissionId = 10020201, - Crest = AbilityCrestId.ASliceofDragonyule + Crest = AbilityCrestId.ASliceofDragonyule, }, // Collect 500 Holiday Cheer in One Go new EventPointCollectionRecordMission() { MissionId = 10020302 }, @@ -67,21 +67,21 @@ public static class MiracleOfDragonyule { MissionId = 10020801, VariationType = VariationTypes.Normal, - FullClear = true + FullClear = true, }, // Completely Clear a Challenge Battle on Master new EventChallengeBattleClearMission() { MissionId = 10020901, VariationType = VariationTypes.Extreme, - FullClear = true + FullClear = true, }, // Earn the "The True Saint Starfall" Epithet new EventChallengeBattleClearMission() { MissionId = 10021001, VariationType = VariationTypes.Extreme, - FullClear = true + FullClear = true, }, ]; } diff --git a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/TollOfTheDeep.cs b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/TollOfTheDeep.cs index e4e669ff8..b51474b56 100644 --- a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/TollOfTheDeep.cs +++ b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/TollOfTheDeep.cs @@ -15,14 +15,14 @@ public static class TollOfTheDeep new() { // Participate In The Event - new EventParticipationMission { MissionId = 10220101, }, + new EventParticipationMission { MissionId = 10220101 }, // Clear a Boss Battle new EventRegularBattleClearMission { MissionId = 10220201 }, // Clear a "Toll of the Deep" Quest with Having a Summer Ball Equipped new EventQuestClearWithCrestMission() { MissionId = 10220401, - Crest = AbilityCrestId.HavingaSummerBall + Crest = AbilityCrestId.HavingaSummerBall, }, // Collect 100 Oceanic Resonance in One Go new EventPointCollectionRecordMission() { MissionId = 10220501 }, diff --git a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/TrickOrTreasure.cs b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/TrickOrTreasure.cs index d24ee74c2..f575654fa 100644 --- a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/TrickOrTreasure.cs +++ b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/MemoryEvent/TrickOrTreasure.cs @@ -23,7 +23,7 @@ public static class TrickOrTreasure new EventQuestClearWithCrestMission() { MissionId = 10060201, - Crest = AbilityCrestId.PlunderPals + Crest = AbilityCrestId.PlunderPals, }, // Collect 100 Tricker Treats in One Go new EventPointCollectionRecordMission() { MissionId = 10060301 }, @@ -52,13 +52,13 @@ public static class TrickOrTreasure // Clear 15 Extra Boss Battles new ClearQuestMission() { MissionId = 10060504, QuestId = ExBossBattleQuestId }, // Clear Three Challenge Battles - new EventChallengeBattleClearMission() { MissionId = 10060601, }, + new EventChallengeBattleClearMission() { MissionId = 10060601 }, // Clear Six Challenge Battles - new EventChallengeBattleClearMission() { MissionId = 10060602, }, + new EventChallengeBattleClearMission() { MissionId = 10060602 }, // Clear 10 Challenge Battles - new EventChallengeBattleClearMission() { MissionId = 10060603, }, + new EventChallengeBattleClearMission() { MissionId = 10060603 }, // Clear 15 Challenge Battles - new EventChallengeBattleClearMission() { MissionId = 10060604, }, + new EventChallengeBattleClearMission() { MissionId = 10060604 }, // Completely Clear a Challenge Battle on Expert new EventChallengeBattleClearMission() { diff --git a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/Period/StarryDragonyule.cs b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/Period/StarryDragonyule.cs index 370949f8d..dda02431a 100644 --- a/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/Period/StarryDragonyule.cs +++ b/DragaliaAPI/DragaliaAPI.MissionDesigner/Missions/Period/StarryDragonyule.cs @@ -21,7 +21,9 @@ public static class StarryDragonyule new ReadQuestStoryMission() { MissionId = 11650201, - QuestStoryId = 2290306 // Final story ID; cannot progress with all 5 as _CompleteValue = 1 + QuestStoryId = + 2290306 // Final story ID; cannot progress with all 5 as _CompleteValue = 1 + , }, // Collect 1,000 Heroism in One Invasion new EventPointCollectionRecordMission() { MissionId = 11650301 }, @@ -30,15 +32,15 @@ public static class StarryDragonyule // Collect 3,000 Heroism in One Invasion new EventPointCollectionRecordMission() { MissionId = 11650303 }, // Collect 4,000 Heroism in One Invasion - new EventPointCollectionRecordMission() { MissionId = 11650304, }, + new EventPointCollectionRecordMission() { MissionId = 11650304 }, // Collect 5,000 Heroism in One Invasion - new EventPointCollectionRecordMission() { MissionId = 11650305, }, + new EventPointCollectionRecordMission() { MissionId = 11650305 }, // Defeat 1,000 Enemies in Invasions - new EarnEnemiesKilledMission() { MissionId = 11650401, }, + new EarnEnemiesKilledMission() { MissionId = 11650401 }, // Defeat 2,000 Enemies in Invasions - new EarnEnemiesKilledMission() { MissionId = 11650402, }, + new EarnEnemiesKilledMission() { MissionId = 11650402 }, // Defeat 5,000 Enemies in Invasions - new EarnEnemiesKilledMission() { MissionId = 11650403, }, + new EarnEnemiesKilledMission() { MissionId = 11650403 }, // Defeat 7,500 Enemies in Invasions new EarnEnemiesKilledMission() { MissionId = 11650404 }, // Defeat 10,000 Enemies in Invasions @@ -59,40 +61,40 @@ public static class StarryDragonyule new EventRegularBattleClearMission() { MissionId = 11650501, - VariationType = VariationTypes.Normal + VariationType = VariationTypes.Normal, }, // Clear an Invasion on Expert new EventRegularBattleClearMission() { MissionId = 11650601, - VariationType = VariationTypes.Hard + VariationType = VariationTypes.Hard, }, // Collect 7,500 Heroism in One Invasion on Master new EventPointCollectionRecordMission() { MissionId = 11650701, - VariationType = VariationTypes.VeryHard + VariationType = VariationTypes.VeryHard, }, // Clear a "One Starry Dragonyule" Trial on Standard new EventTrialClearMission() { MissionId = 11650801, - VariationType = VariationTypes.Normal + VariationType = VariationTypes.Normal, }, // Clear a "One Starry Dragonyule" Trial on Expert new EventTrialClearMission() { MissionId = 11650901, - VariationType = VariationTypes.Hard + VariationType = VariationTypes.Hard, }, // Clear a "One Starry Dragonyule" Trial on Master new EventTrialClearMission() { MissionId = 11651001, - VariationType = VariationTypes.VeryHard + VariationType = VariationTypes.VeryHard, }, // Clear A Dragonyule Miracle - new ClearQuestMission() { MissionId = 11651101, QuestId = 229030401, } + new ClearQuestMission() { MissionId = 11651101, QuestId = 229030401 }, ]; [MissionType(MissionType.Daily)] @@ -103,49 +105,49 @@ public static class StarryDragonyule new EventPointCollectionMission() { MissionId = 11190101, - ProgressionGroupId = DailyProgressionGroupId + ProgressionGroupId = DailyProgressionGroupId, }, // Collect 1,500 Heroism new EventPointCollectionMission() { MissionId = 11190102, - ProgressionGroupId = DailyProgressionGroupId + ProgressionGroupId = DailyProgressionGroupId, }, // Collect 2,000 Heroism new EventPointCollectionMission() { MissionId = 11190103, - ProgressionGroupId = DailyProgressionGroupId + ProgressionGroupId = DailyProgressionGroupId, }, // Collect 2,500 Heroism new EventPointCollectionMission() { MissionId = 11190104, - ProgressionGroupId = DailyProgressionGroupId + ProgressionGroupId = DailyProgressionGroupId, }, // Collect 3,000 Heroism new EventPointCollectionMission() { MissionId = 11190105, - ProgressionGroupId = DailyProgressionGroupId + ProgressionGroupId = DailyProgressionGroupId, }, // Clear an Invasion new EventRegularBattleClearMission() { MissionId = 11190201, - ProgressionGroupId = DailyProgressionGroupId + ProgressionGroupId = DailyProgressionGroupId, }, // Clear Five Invasions new EventRegularBattleClearMission() { MissionId = 11190202, - ProgressionGroupId = DailyProgressionGroupId + ProgressionGroupId = DailyProgressionGroupId, }, // Clear All Daily Event Endeavours new ClearProgressionGroupMission() { MissionId = 11190301, ProgressionGroupToClear = DailyProgressionGroupId, - } + }, ]; } diff --git a/DragaliaAPI/DragaliaAPI.MissionDesigner/Program.cs b/DragaliaAPI/DragaliaAPI.MissionDesigner/Program.cs index 249b4adaa..d77bc642d 100644 --- a/DragaliaAPI/DragaliaAPI.MissionDesigner/Program.cs +++ b/DragaliaAPI/DragaliaAPI.MissionDesigner/Program.cs @@ -41,7 +41,7 @@ new(MasterAssetJsonOptions.Instance) { WriteIndented = true, - DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, }; #pragma warning restore CA1869 @@ -71,7 +71,11 @@ await JsonSerializer.DeserializeAsync>(readNormalMissionFs, missions[requiredMissionId] = missions[requiredMissionId] with { - UnlockedOnComplete = [.. missions[requiredMissionId].UnlockedOnComplete, progInfo.MissionId] + UnlockedOnComplete = + [ + .. missions[requiredMissionId].UnlockedOnComplete, + progInfo.MissionId, + ], }; } diff --git a/DragaliaAPI/DragaliaAPI.Shared.SourceGenerator.Test/MasterAssetGeneratorTest.cs b/DragaliaAPI/DragaliaAPI.Shared.SourceGenerator.Test/MasterAssetGeneratorTest.cs index db95ae270..bba368992 100644 --- a/DragaliaAPI/DragaliaAPI.Shared.SourceGenerator.Test/MasterAssetGeneratorTest.cs +++ b/DragaliaAPI/DragaliaAPI.Shared.SourceGenerator.Test/MasterAssetGeneratorTest.cs @@ -51,7 +51,7 @@ private static GeneratorDriver GetDriver(string source) { SyntaxTree syntaxTree = CSharpSyntaxTree.ParseText(source); - List references = [.. ReferenceAssemblies.Net80,]; + List references = [.. ReferenceAssemblies.Net80]; CSharpCompilation compilation = CSharpCompilation.Create( assemblyName: "Tests", diff --git a/DragaliaAPI/DragaliaAPI.Shared.Test/Unit/MasterAssetTest.cs b/DragaliaAPI/DragaliaAPI.Shared.Test/Unit/MasterAssetTest.cs index f9dbb0da3..cd6be9237 100644 --- a/DragaliaAPI/DragaliaAPI.Shared.Test/Unit/MasterAssetTest.cs +++ b/DragaliaAPI/DragaliaAPI.Shared.Test/Unit/MasterAssetTest.cs @@ -292,7 +292,7 @@ public void QuestData_Get_ReturnsExpectedProperties() new List() { new("Main/01/MAIN_01_0101_01", "MAIN_01_0101_01"), - new("Boss/BG001_5001_00/BG001_5001_00_00", "MAIN_01_0101_02") + new("Boss/BG001_5001_00/BG001_5001_00_00", "MAIN_01_0101_02"), } ); } @@ -563,7 +563,7 @@ public void AbilityCrestTrade_Get_ReturnsExpectedProperties() Id = 5101, AbilityCrestId = AbilityCrestId.SweetSurprise, NeedDewPoint = 4000, - Priority = 5199 + Priority = 5199, } ); } @@ -606,7 +606,7 @@ public void AbilityCrestBuildupGroup_MaterialMap_ReturnsExpectedDictionary() new Dictionary() { { Materials.AzureInsignia, 200 }, - { Materials.DyrenellAureus, 25 } + { Materials.DyrenellAureus, 25 }, } ); } @@ -670,7 +670,7 @@ public void AbilityCrestBuildupLevel_MaterialMap_ReturnsExpectedDictionary() new Dictionary() { { Materials.HolyWater, 2 }, - { Materials.ConsecratedWater, 14 } + { Materials.ConsecratedWater, 14 }, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/AbilityTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/AbilityTypes.cs index be0450440..47e0a2683 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/AbilityTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/AbilityTypes.cs @@ -112,5 +112,5 @@ public enum AbilityTypes Reserved_107, Reserved_108, Reserved_109, - Reserved_110 + Reserved_110, }; diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/BannerTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/BannerTypes.cs index bf5b532df..977684e58 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/BannerTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/BannerTypes.cs @@ -9,5 +9,5 @@ public enum BannerTypes //UNKNOWN: Presumably normal, this is from a gala banner Normal = 2, - DiamantiumMulti = 11 + DiamantiumMulti = 11, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/BuildupPieceTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/BuildupPieceTypes.cs index ac19ad70c..f6c6885a0 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/BuildupPieceTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/BuildupPieceTypes.cs @@ -9,5 +9,5 @@ public enum BuildupPieceTypes Copies = 6, Stats = 7, Passive = 8, - CrestSlotType3 = 9 + CrestSlotType3 = 9, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/CurrencyEntityIds.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/CurrencyEntityIds.cs index ea070fd45..2297a9422 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/CurrencyEntityIds.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/CurrencyEntityIds.cs @@ -2,5 +2,5 @@ public enum CurrencyEntityIds { - Wyrmite = 0 + Wyrmite = 0, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DewValues.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DewValues.cs index c8c022200..d317bd3bb 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DewValues.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DewValues.cs @@ -3,7 +3,7 @@ public enum CharaPromoteValues { ToRarity4 = 2500, - ToRarity5 = 25000 + ToRarity5 = 25000, } public enum DupeReturnBaseValues @@ -12,7 +12,7 @@ public enum DupeReturnBaseValues Rarity3 = 150, Rarity5Story = 300, Rarity4 = 2200, - Rarity5 = 8500 + Rarity5 = 8500, } public static class DewValueData @@ -26,7 +26,7 @@ public static class DewValueData { { 3, (int)DupeReturnBaseValues.Rarity3 }, { 4, (int)DupeReturnBaseValues.Rarity4 }, - { 5, (int)DupeReturnBaseValues.Rarity5 } + { 5, (int)DupeReturnBaseValues.Rarity5 }, }; /// @@ -37,7 +37,7 @@ public static class DewValueData new() { { 4, (int)DupeReturnBaseValues.Rarity4Story }, - { 5, (int)DupeReturnBaseValues.Rarity5Story } + { 5, (int)DupeReturnBaseValues.Rarity5Story }, }; } @@ -48,5 +48,5 @@ public enum AmuletReturnBaseValues Rarity3 = 150, Rarity5Story = 300, Rarity4 = 1000, - Rarity5 = 3000 + Rarity5 = 3000, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeDungeonItemState.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeDungeonItemState.cs index ebd666a07..7491def81 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeDungeonItemState.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeDungeonItemState.cs @@ -9,5 +9,5 @@ public enum DmodeDungeonItemState Bag = 11, EquipWeapon, EquipCrest, - SkillBag + SkillBag, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeDungeonItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeDungeonItemType.cs index 980c01d8f..3c22bdae0 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeDungeonItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeDungeonItemType.cs @@ -6,5 +6,5 @@ public enum DmodeDungeonItemType Dragon, Weapon, AbilityCrest, - Skill + Skill, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeEnemyLevelType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeEnemyLevelType.cs index 6abcb7eb4..ddd647c3b 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeEnemyLevelType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeEnemyLevelType.cs @@ -4,5 +4,5 @@ public enum DmodeEnemyLevelType { None, Enemy, - BossEnemy + BossEnemy, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodePoint.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodePoint.cs index 3f0c8304f..479893aa7 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodePoint.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodePoint.cs @@ -3,5 +3,5 @@ public enum DmodePoint { Point1 = 10001, - Point2 + Point2, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeServitorPassiveType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeServitorPassiveType.cs index ad0e1efee..c45dfb47d 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeServitorPassiveType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DmodeServitorPassiveType.cs @@ -19,5 +19,5 @@ public enum DmodeServitorPassiveType ResistBeast, ResistUndead, ResistDemon, - ResistDragon + ResistDragon, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Dragons.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Dragons.cs index 0a40a46ca..5cbe30eb2 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Dragons.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Dragons.cs @@ -412,7 +412,7 @@ public enum Dragons public enum DragonLimitBreakTypes { Normal = 10000, - Special = 10001 + Special = 10001, } public enum DragonLimitBreakMatTypes @@ -420,7 +420,7 @@ public enum DragonLimitBreakMatTypes Dupe = 1, Stone = 2, Spheres = 3, - SpheresLB5 = 4 + SpheresLB5 = 4, } public enum DragonGifts @@ -438,5 +438,5 @@ public enum DragonGifts FourLeafClover = 30001, DragonyuleCake = 30002, ValentinesCard = 30003, - PupGrub = 40001 + PupGrub = 40001, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DropObject.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DropObject.cs index c3679bb05..24e9a62ed 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DropObject.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DropObject.cs @@ -5,4 +5,5 @@ public enum DropObject None, TreasureChest, // Drops normal items Barrel // Drops dungeon items + , } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Dungeon/RepeatSettingType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Dungeon/RepeatSettingType.cs index 313638cb6..e224dd2f1 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Dungeon/RepeatSettingType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Dungeon/RepeatSettingType.cs @@ -4,5 +4,5 @@ public enum RepeatSettingType { None, UseAllStamina, - Specified + Specified, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DungeonItem.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DungeonItem.cs index 7594ab39e..9004c2ebf 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DungeonItem.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DungeonItem.cs @@ -8,5 +8,5 @@ public enum DungeonItem HpAndDamage = 3001, Dp25 = 4001, Dp50, - Dp100 + Dp100, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DungeonState.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DungeonState.cs index 2838712e3..705e95b44 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DungeonState.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/DungeonState.cs @@ -9,5 +9,5 @@ public enum DungeonState WaitingSkipEnd, Playing, Halting, - RestartEnd + RestartEnd, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Emblems.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Emblems.cs index 5561b5006..ccbc7569d 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Emblems.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Emblems.cs @@ -1298,5 +1298,5 @@ public enum Emblems BerserkSkipperTier3 = 51090111, SociallyDistancedTier1 = 51090112, SociallyDistancedTier2 = 51090113, - SociallyDistancedTier3 = 51090114 + SociallyDistancedTier3 = 51090114, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EntityTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EntityTypes.cs index e3143fa2a..8da64364d 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EntityTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EntityTypes.cs @@ -50,7 +50,7 @@ public enum EntityTypes EarnEventItem, Talisman, DmodePoint, - DmodeDungeonItem + DmodeDungeonItem, } public static class EntityTypesExtensions @@ -63,7 +63,7 @@ public static PaymentTypes ToPaymentType(this EntityTypes entityTypes) EntityTypes.Dew => PaymentTypes.DewPoint, EntityTypes.Mana => PaymentTypes.ManaPoint, EntityTypes.Wyrmite => PaymentTypes.Wyrmite, - _ => throw new UnreachableException("Invalid EntityType for PaymentType conversion") + _ => throw new UnreachableException("Invalid EntityType for PaymentType conversion"), }; } } @@ -75,5 +75,5 @@ public enum CurrencyTypes PaidDiamantium = EntityTypes.PaidDiamantium, Dew = EntityTypes.Dew, Mana = EntityTypes.Mana, - Wyrmite = EntityTypes.Wyrmite + Wyrmite = EntityTypes.Wyrmite, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/BattleRoyalEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/BattleRoyalEventItemType.cs index 41025b938..92c73b9b7 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/BattleRoyalEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/BattleRoyalEventItemType.cs @@ -5,5 +5,5 @@ public enum BattleRoyalEventItemType None, EventPoint = 10101, UnitUnlock = 10201, - Skin = 10301 + Skin = 10301, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/BuildEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/BuildEventItemType.cs index a2872a761..74ae4b6e3 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/BuildEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/BuildEventItemType.cs @@ -5,5 +5,5 @@ public enum BuildEventItemType None, BuildEventPoint = 10001, ExchangeItem1, - ExchangeItem2 + ExchangeItem2, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/Clb01EventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/Clb01EventItemType.cs index 7fc3df249..c284e221d 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/Clb01EventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/Clb01EventItemType.cs @@ -5,5 +5,5 @@ public enum Clb01EventItemType None, ExchangeItem1 = 10101, ExchangeItem2, - Clb01EventPoint = 10201 + Clb01EventPoint = 10201, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/CollectEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/CollectEventItemType.cs index 254bcb91a..d1118471f 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/CollectEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/CollectEventItemType.cs @@ -5,5 +5,5 @@ public enum CollectEventItemType None, EventPoint1 = 10001, EventPoint2, - EventPoint3 + EventPoint3, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/CombatEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/CombatEventItemType.cs index ef214fe7a..e5193984e 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/CombatEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/CombatEventItemType.cs @@ -7,5 +7,7 @@ public enum CombatEventItemType EventPoint = 10201, AdventItem = 10301, // Stratagem QuestUnlock = 10401, // Battle Chart - StoryUnlock = 10501 // War Chronicle + StoryUnlock = + 10501 // War Chronicle + , } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/ExHunterEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/ExHunterEventItemType.cs index b4583b07a..8a38982c2 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/ExHunterEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/ExHunterEventItemType.cs @@ -11,5 +11,5 @@ public enum ExHunterEventItemType AdventItem2, UltimateItem = 10401, ExchangeItem01 = 10501, - ExchangeItem02 + ExchangeItem02, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/ExRushEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/ExRushEventItemType.cs index 0b13d65c0..3e4863010 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/ExRushEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/ExRushEventItemType.cs @@ -4,5 +4,5 @@ public enum ExRushEventItemType { None, ExRushPoint1 = 10101, - ExRushPoint2 + ExRushPoint2, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/MazeEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/MazeEventItemType.cs index 153c7c8e9..73b75a485 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/MazeEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/MazeEventItemType.cs @@ -7,5 +7,5 @@ public enum MazeEventItemType ExchangeItem1 = 10201, ExchangeItem2, ExchangeItem3, - ExchangeItem4 + ExchangeItem4, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/RaidEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/RaidEventItemType.cs index 264d1daad..a7647fec1 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/RaidEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/RaidEventItemType.cs @@ -12,4 +12,5 @@ public enum RaidEventItemType UltimateItem1 = 10401, // Omega Key ExchangeItem1 = 10501, // Weapon exchange ExchangeItem2 // ??? Exchange + , } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/SimpleEventItemType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/SimpleEventItemType.cs index 494bc2eee..26a74a808 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/SimpleEventItemType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventItemTypes/SimpleEventItemType.cs @@ -5,5 +5,5 @@ public enum SimpleEventItemType None, ExchangeItem1 = 10101, ExchangeItem2, - ExchangeItem3 + ExchangeItem3, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventKindType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventKindType.cs index d1d1dfd76..b5373b970 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventKindType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/EventKindType.cs @@ -14,7 +14,7 @@ public enum EventKindType Simple, Combat, BattleRoyal, - Earn + Earn, } public static class EventKindTypeExtensions @@ -34,7 +34,7 @@ public static EntityTypes ToItemType(this EventKindType type) EventKindType.Combat => EntityTypes.CombatEventItem, EventKindType.BattleRoyal => EntityTypes.BattleRoyalEventItem, EventKindType.Earn => EntityTypes.EarnEventItem, - _ => EntityTypes.None + _ => EntityTypes.None, }; } } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ExpeditionState.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ExpeditionState.cs index d5923fc05..d3c44eaef 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ExpeditionState.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ExpeditionState.cs @@ -4,5 +4,5 @@ public enum ExpeditionState { None, Waiting, - Playing + Playing, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/FortBuildStatus.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/FortBuildStatus.cs index 1d5f5688e..bea3e93e5 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/FortBuildStatus.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/FortBuildStatus.cs @@ -4,5 +4,5 @@ public enum FortBuildStatus { Neutral, Building, - LevelUp + LevelUp, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/FortEffectTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/FortEffectTypes.cs index 3d1eae2ba..3b666225e 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/FortEffectTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/FortEffectTypes.cs @@ -16,5 +16,5 @@ public enum FortEffectTypes Weapon = 1, Element = 2, DragonDamage = 4, - DragonStats = 6 + DragonStats = 6, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ManaNodeTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ManaNodeTypes.cs index 620dc9d48..e50af40e9 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ManaNodeTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ManaNodeTypes.cs @@ -15,5 +15,5 @@ public enum ManaNodeTypes Ex = 10501, Mat = 10601, StdAtkUp = 10701, - MaxLvUp = 10801 + MaxLvUp = 10801, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ManaNodes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ManaNodes.cs index 90d4f2ab0..dadd02080 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ManaNodes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/ManaNodes.cs @@ -20,7 +20,7 @@ public enum ManaNodes : ushort Circle4 = 0b_0001_0000_0000_0000, Circle5 = 0b_0001_0100_0000_0000, Circle6 = 0b_0001_1000_0000_0000, - Circle7 = 0b_0001_1100_0000_0000 + Circle7 = 0b_0001_1100_0000_0000, } public static class ManaNodesUtil diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/MaterialCategory.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/MaterialCategory.cs index 5a9129028..3ecf721d8 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/MaterialCategory.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/MaterialCategory.cs @@ -27,5 +27,5 @@ public enum MaterialCategory SummonTrade, PlatinumCharacter, Treasure = 201, - LimitBreakSphereDragon = 206 + LimitBreakSphereDragon = 206, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Materials.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Materials.cs index 0f24df149..f8d91a8a2 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Materials.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Materials.cs @@ -519,13 +519,13 @@ public enum Materials ZenaSkin = 10750504, ZephyrRune = 204004002, ZephyrsEssence = 206003001, - Zest = 2081501 + Zest = 2081501, } public enum UpgradeEnhanceTypes { AtkPlus = 0, - HpPlus = 1 + HpPlus = 1, } public static class UpgradeMaterials @@ -540,7 +540,7 @@ public static class UpgradeMaterials { Materials.GoldCrystal, 3500 }, { Materials.Dragonfruit, 150 }, { Materials.RipeDragonfruit, 1000 }, - { Materials.SucculentDragonfruit, 3500 } + { Materials.SucculentDragonfruit, 3500 }, }; public static readonly Dictionary dragonBuildupXp = new Dictionary() @@ -559,7 +559,7 @@ public static class UpgradeMaterials { UnitElement.Fire, Materials.FlameOrb }, { UnitElement.Wind, Materials.WindOrb }, { UnitElement.Light, Materials.LightOrb }, - { UnitElement.Dark, Materials.ShadowOrb } + { UnitElement.Dark, Materials.ShadowOrb }, }; public static readonly Dictionary t2Orbs = new Dictionary< @@ -571,7 +571,7 @@ public static class UpgradeMaterials { UnitElement.Fire, Materials.BlazeOrb }, { UnitElement.Wind, Materials.StormOrb }, { UnitElement.Light, Materials.RadianceOrb }, - { UnitElement.Dark, Materials.NightfallOrb } + { UnitElement.Dark, Materials.NightfallOrb }, }; public static readonly Dictionary t3Orbs = new Dictionary< @@ -583,7 +583,7 @@ public static class UpgradeMaterials { UnitElement.Fire, Materials.InfernoOrb }, { UnitElement.Wind, Materials.MaelstromOrb }, { UnitElement.Light, Materials.RefulgenceOrb }, - { UnitElement.Dark, Materials.NetherOrb } + { UnitElement.Dark, Materials.NetherOrb }, }; public static readonly Dictionary t4Orbs = new Dictionary< @@ -595,7 +595,7 @@ public static class UpgradeMaterials { UnitElement.Fire, Materials.IncandescenceOrb }, { UnitElement.Wind, Materials.TempestOrb }, { UnitElement.Light, Materials.ResplendenceOrb }, - { UnitElement.Dark, Materials.AbaddonOrb } + { UnitElement.Dark, Materials.AbaddonOrb }, }; /* diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PayTargetType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PayTargetType.cs index 946ab0bfe..bb2c037a8 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PayTargetType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PayTargetType.cs @@ -5,5 +5,5 @@ public enum PayTargetType None, All, HostOnly, - AllPlusMultiItem + AllPlusMultiItem, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PaymentTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PaymentTypes.cs index 51cce925e..109f50afb 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PaymentTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PaymentTypes.cs @@ -23,7 +23,7 @@ public enum PaymentTypes ItemSummonCampaign, TutorialTicketSummon, SummonCampaignOneHundred, - Other = 99 + Other = 99, } public static class PaymentTypesExtensions @@ -39,7 +39,7 @@ public static EntityTypes ToEntityType(this PaymentTypes type) PaymentTypes.Ticket => EntityTypes.SummonTicket, PaymentTypes.HalidomHustleHammer => EntityTypes.HustleHammer, PaymentTypes.Diamantium => EntityTypes.FreeDiamantium, - _ => EntityTypes.None + _ => EntityTypes.None, }; } } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PlusCountType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PlusCountType.cs index 9255ba8e0..990a751db 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PlusCountType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PlusCountType.cs @@ -6,5 +6,5 @@ public enum PlusCountType { Hp = 1, - Atk = 2 + Atk = 2, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PurchaseShopType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PurchaseShopType.cs index f32a2fda9..07efc1df7 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PurchaseShopType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/PurchaseShopType.cs @@ -5,5 +5,5 @@ public enum PurchaseShopType None, Normal, Special, - Material + Material, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestBonusReceiveType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestBonusReceiveType.cs index 39b61bbad..859e10d88 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestBonusReceiveType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestBonusReceiveType.cs @@ -6,5 +6,5 @@ public enum QuestBonusReceiveType SelectReceive, StackReceive, StackSelectReceive, - Max + Max, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestCompleteType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestCompleteType.cs index 157e6b4b5..c021de5d1 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestCompleteType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestCompleteType.cs @@ -35,5 +35,5 @@ public enum QuestCompleteType MinAdventurersWithSameWeapon, MaxShapeshift, NoRevives, - DefeatFormaChrom + DefeatFormaChrom, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestEventType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestEventType.cs index c99fa99c9..57498e022 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestEventType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestEventType.cs @@ -28,5 +28,5 @@ public enum QuestEventType Subdue, Walker, Dmode, - Saga + Saga, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestGroupIntervalType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestGroupIntervalType.cs index 4e9b0044f..9faf7633f 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestGroupIntervalType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestGroupIntervalType.cs @@ -32,5 +32,5 @@ public enum QuestGroupIntervalType MonWedSatSun, WedFriSatSun, TueThuSatSun, - SatAndSun + SatAndSun, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestGroupType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestGroupType.cs index 486967a15..257d75819 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestGroupType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestGroupType.cs @@ -4,5 +4,5 @@ public enum QuestGroupType { None, MainStory, - Event + Event, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestPlayModeTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestPlayModeTypes.cs index 213254395..54663d09b 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestPlayModeTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestPlayModeTypes.cs @@ -7,7 +7,7 @@ public enum QuestPlayModeTypes Solo, Multi, RandomMatching, - RandomMatchingSixteen + RandomMatchingSixteen, } public enum QuestPlayType diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestResetIntervalType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestResetIntervalType.cs index 3e8a04059..af6805633 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestResetIntervalType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestResetIntervalType.cs @@ -5,5 +5,5 @@ public enum QuestResetIntervalType None, Daily, Weekly, - Total + Total, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestWallTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestWallTypes.cs index 73a16006d..0decc5ae5 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestWallTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/QuestWallTypes.cs @@ -6,5 +6,5 @@ public enum QuestWallTypes Water = 216010002, Wind = 216010003, Light = 216010004, - Shadow = 216010005 + Shadow = 216010005, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/RewardStatus.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/RewardStatus.cs index b96a688ca..6e3915745 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/RewardStatus.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/RewardStatus.cs @@ -7,5 +7,5 @@ public enum RewardStatus { None = 0, Available = 1, - Received = 2 + Received = 2, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/RoomEnums.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/RoomEnums.cs index b4f866331..e6e8584b5 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/RoomEnums.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/RoomEnums.cs @@ -6,7 +6,7 @@ public enum QuestTypes Dungeon, Story, Treasure, - Wall + Wall, } public enum RoomStatuses @@ -16,5 +16,5 @@ public enum RoomStatuses Available, Full, InvalidCompatibleId, - Error + Error, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/StoryTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/StoryTypes.cs index ba32316ac..b7e38712b 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/StoryTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/StoryTypes.cs @@ -7,5 +7,5 @@ public enum StoryTypes Quest = 3, Castle = 4, DungeonMode = 5, - Event = 6 + Event = 6, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonEffects.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonEffects.cs index 69171a649..5baa385ac 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonEffects.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonEffects.cs @@ -6,12 +6,12 @@ public enum SummonEffectsSage SingleDove = 2, MultiDoves = 3, GoldFafnirs = 4, - RainbowCrystal = 5 + RainbowCrystal = 5, } public enum SummonEffectsSky { Blue = 1, Yellow = 2, - Rainbow = 3 + Rainbow = 3, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonExecTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonExecTypes.cs index 0f9916748..4562d4298 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonExecTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonExecTypes.cs @@ -11,5 +11,5 @@ public enum SummonExecTypes : byte Invalid = 0, Single = 1, Tenfold = 2, - DailyDeal = 3 + DailyDeal = 3, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonPrizeRanks.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonPrizeRanks.cs index 3f7227230..4cb270fc8 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonPrizeRanks.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonPrizeRanks.cs @@ -8,5 +8,5 @@ public enum SummonPrizeRanks Silver = 3, Bronze = 4, Fifth = 5, - Sixth = 6 + Sixth = 6, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonTickets.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonTickets.cs index 495e1b45a..9b01726f3 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonTickets.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonTickets.cs @@ -9,5 +9,5 @@ public enum SummonTickets AdventurerSummon = 10301, DragonSummon, AdventurerSummonPlus = 10501, - DragonSummonPlus + DragonSummonPlus, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonTypes.cs index 400129c95..c4db691a6 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/Summon/SummonTypes.cs @@ -13,5 +13,5 @@ public enum SummonTypes CampaignSsr, CharaSsrUpdate, DragonSsrUpdate, - Exclude + Exclude, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/TradeType.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/TradeType.cs index 22c399e19..42123c178 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/TradeType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/TradeType.cs @@ -5,5 +5,5 @@ public enum TradeType None, Treasure, AbilityCrest, - Event + Event, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UnitAvailability.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UnitAvailability.cs index a1f2d2d77..8f4d7d14f 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UnitAvailability.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UnitAvailability.cs @@ -28,5 +28,5 @@ public enum UnitAvailability /// /// The unit can never be summoned. /// - Other + Other, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UseItem.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UseItem.cs index f8ca69211..56139fd18 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UseItem.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UseItem.cs @@ -12,5 +12,5 @@ public enum UseItem StaminaPotion, OtherworldlyLeblancCurry, EthonAshes = 100701, - BlessedEthonAshes + BlessedEthonAshes, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UseItemEffect.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UseItemEffect.cs index 01e8ad450..c715d7096 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UseItemEffect.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/UseItemEffect.cs @@ -5,5 +5,5 @@ public enum UseItemEffect None, RecoverStamina = 1006, RecoverMulti, - QuestSkip + QuestSkip, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/VariationTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/VariationTypes.cs index 8e4ceaf7f..c69b5302b 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/VariationTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/VariationTypes.cs @@ -15,5 +15,5 @@ public enum VariationTypes Hell = 5, Variation6 = 6, Variation7 = 7, - Variation8 = 8 + Variation8 = 8, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/WeaponSeries.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/WeaponSeries.cs index acd763f2a..307bb3a39 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/WeaponSeries.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/WeaponSeries.cs @@ -9,5 +9,5 @@ public enum WeaponSeries Agito, Chimeratech, Other, - PrimalDragon + PrimalDragon, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/WeaponTypes.cs b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/WeaponTypes.cs index c59073b88..698866cd4 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/WeaponTypes.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Definitions/Enums/WeaponTypes.cs @@ -29,5 +29,5 @@ public enum WeaponTypes Cane = 8, [TextLabel("Manacaster")] - Gun = 9 + Gun = 9, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/Features/StorySkip/StorySkipRewards.cs b/DragaliaAPI/DragaliaAPI.Shared/Features/StorySkip/StorySkipRewards.cs index 704113ca8..77111378c 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Features/StorySkip/StorySkipRewards.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Features/StorySkip/StorySkipRewards.cs @@ -25,7 +25,7 @@ public readonly struct FortConfig( Charas.Ranzal, Charas.Cleo, Charas.Luca, - Charas.Alex + Charas.Alex, }.ToFrozenSet(); public static FrozenSet DragonList { get; } = diff --git a/DragaliaAPI/DragaliaAPI.Shared/Features/Summoning/UnitAvailabilityExtensions.cs b/DragaliaAPI/DragaliaAPI.Shared/Features/Summoning/UnitAvailabilityExtensions.cs index 2d133bda7..8569ecc85 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/Features/Summoning/UnitAvailabilityExtensions.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/Features/Summoning/UnitAvailabilityExtensions.cs @@ -225,6 +225,6 @@ public static UnitAvailability GetAvailability(this DragonData dragonData) => // Not playable [Dragons.Puppy] = UnitAvailability.Other, - [Dragons.Empty] = UnitAvailability.Other + [Dragons.Empty] = UnitAvailability.Other, }.ToFrozenDictionary(); } diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/AbilityCrest.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/AbilityCrest.cs index 9ae08682b..84730cc0d 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/AbilityCrest.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/AbilityCrest.cs @@ -46,7 +46,7 @@ public IEnumerable GetAbilities(int level) 1 => new[] { Abilities11, Abilities21 }, 2 => new[] { Abilities12, Abilities22 }, 3 => new[] { Abilities13, Abilities23 }, - _ => Enumerable.Empty() + _ => Enumerable.Empty(), }; } }; diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/CharaData.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/CharaData.cs index a9a2657f7..a34a7202c 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/CharaData.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/CharaData.cs @@ -107,39 +107,27 @@ int VariationId [IgnoreMember] public int MaxAbility1Level = - Abilities14 != 0 - ? 4 - : Abilities13 != 0 - ? 3 - : Abilities12 != 0 - ? 2 - : Abilities11 != 0 - ? 1 - : 0; + Abilities14 != 0 ? 4 + : Abilities13 != 0 ? 3 + : Abilities12 != 0 ? 2 + : Abilities11 != 0 ? 1 + : 0; [IgnoreMember] public int MaxAbility2Level = - Abilities24 != 0 - ? 4 - : Abilities23 != 0 - ? 3 - : Abilities22 != 0 - ? 2 - : Abilities21 != 0 - ? 1 - : 0; + Abilities24 != 0 ? 4 + : Abilities23 != 0 ? 3 + : Abilities22 != 0 ? 2 + : Abilities21 != 0 ? 1 + : 0; [IgnoreMember] public int MaxAbility3Level = - Abilities34 != 0 - ? 4 - : Abilities33 != 0 - ? 3 - : Abilities32 != 0 - ? 2 - : Abilities31 != 0 - ? 1 - : 0; + Abilities34 != 0 ? 4 + : Abilities33 != 0 ? 3 + : Abilities32 != 0 ? 2 + : Abilities31 != 0 ? 1 + : 0; public ManaNode GetManaNode(int num) { @@ -166,7 +154,7 @@ public IEnumerable GetManaNodes() ExAbilityData2, ExAbilityData3, ExAbilityData4, - ExAbilityData5 + ExAbilityData5, }; [IgnoreMember] @@ -176,7 +164,7 @@ public IEnumerable GetManaNodes() ExAbility2Data2, ExAbility2Data3, ExAbility2Data4, - ExAbility2Data5 + ExAbility2Data5, }; [IgnoreMember] @@ -184,7 +172,7 @@ public IEnumerable GetManaNodes() { new[] { Abilities11, Abilities12, Abilities13, Abilities14 }, new[] { Abilities21, Abilities22, Abilities23, Abilities24 }, - new[] { Abilities31, Abilities32, Abilities33, Abilities34 } + new[] { Abilities31, Abilities32, Abilities33, Abilities34 }, }; public int GetAbility(int abilityNo, int level) diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeEnemyTheme.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeEnemyTheme.cs index b3123ba7c..8401cc193 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeEnemyTheme.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeEnemyTheme.cs @@ -69,6 +69,6 @@ int Param30 Param27, Param28, Param29, - Param30 + Param30, }; }; diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeQuestFloor.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeQuestFloor.cs index 1fa9b158b..bf6e17617 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeQuestFloor.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeQuestFloor.cs @@ -26,6 +26,6 @@ int SkipClearFloorNum DrawDungeonThemeId2, DrawDungeonThemeId3, DrawDungeonThemeId4, - DrawDungeonThemeId5 + DrawDungeonThemeId5, }; }; diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeServitorPassiveLevel.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeServitorPassiveLevel.cs index 5e3c483a3..aa17bbfb5 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeServitorPassiveLevel.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Dmode/DmodeServitorPassiveLevel.cs @@ -20,6 +20,6 @@ int ReleaseEntityQuantity2 public readonly (EntityTypes Type, int Id, int Quantity)[] NeededMaterials = { (ReleaseEntityType1, ReleaseEntityId1, ReleaseEntityQuantity1), - (ReleaseEntityType2, ReleaseEntityId2, ReleaseEntityQuantity2) + (ReleaseEntityType2, ReleaseEntityId2, ReleaseEntityQuantity2), }; }; diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/DragonData.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/DragonData.cs index 9da32b534..9fb863825 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/DragonData.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/DragonData.cs @@ -44,7 +44,7 @@ int VariationId public readonly int[][] Abilities = { new[] { Abilities11, Abilities12, Abilities13, Abilities14, Abilities15, Abilities16 }, - new[] { Abilities21, Abilities22, Abilities23, Abilities24, Abilities25, Abilities26 } + new[] { Abilities21, Abilities22, Abilities23, Abilities24, Abilities25, Abilities26 }, }; public int GetAbility(int abilityNo, int level) diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Enemy/EnemyParam.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Enemy/EnemyParam.cs index a279bcfbe..bd8d000d3 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Enemy/EnemyParam.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Enemy/EnemyParam.cs @@ -33,7 +33,7 @@ public readonly (int Param, int Num)[] Children = { (Child01Param, Child01Num), (Child02Param, Child02Num), - (Child03Param, Child03Num) + (Child03Param, Child03Num), }; [IgnoreMember] @@ -41,7 +41,7 @@ public readonly (int Param, int Num)[] Weaks = { (WeakA, WeakANum), (WeakB, WeakBNum), - (WeakC, WeakCNum) + (WeakC, WeakCNum), }; [IgnoreMember] diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/ManaCircle/ManaPieceType.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/ManaCircle/ManaPieceType.cs index 92f914883..86212a634 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/ManaCircle/ManaPieceType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/ManaCircle/ManaPieceType.cs @@ -19,6 +19,6 @@ int EntityQuantity3 { (EntityType1, EntityId1, EntityQuantity1), (EntityType2, EntityId2, EntityQuantity2), - (EntityType3, EntityId3, EntityQuantity3) + (EntityType3, EntityId3, EntityQuantity3), }; }; diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionLockRewardType.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionLockRewardType.cs index 3b8160e0a..8b177057b 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionLockRewardType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionLockRewardType.cs @@ -3,5 +3,5 @@ public enum MissionLockRewardType { None, - CharacterFriendshipPoint + CharacterFriendshipPoint, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionTransportType.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionTransportType.cs index 8bc1e5a43..911199ab6 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionTransportType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionTransportType.cs @@ -29,5 +29,5 @@ public enum MissionTransportType MenuEtcAccount, MenuGuildTop, MenuAlbumTop, - EtcDreamAdventure = 10701 + EtcDreamAdventure = 10701, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionType.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionType.cs index fae8bf29f..213da743b 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionType.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Missions/MissionType.cs @@ -11,5 +11,5 @@ public enum MissionType MainStory, MemoryEvent, Album, - Drill + Drill, } diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestData.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestData.cs index 23e8151ee..4a36a0308 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestData.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestData.cs @@ -66,7 +66,7 @@ bool IsSumUpTotalDamage EventKindType.Build => this.IdSuffix is 301 or 302 or 303 or 401, // Boss battle (or EX boss battle) EventKindType.Raid => this.IdSuffix is 201 or 202 or 203, // Boss battle EventKindType.Earn => this.IdSuffix is 201 or 202 or 203 or 401, // Invasion quest - _ => false + _ => false, }; [IgnoreMember] @@ -74,7 +74,7 @@ bool IsSumUpTotalDamage this.EventKindType switch { EventKindType.Build => this.IdSuffix is 501 or 502, - _ => false + _ => false, }; [IgnoreMember] @@ -83,7 +83,7 @@ bool IsSumUpTotalDamage { EventKindType.Build => this.IdSuffix is 701 or 702, EventKindType.Earn => this.IdSuffix is 301 or 302 or 303, - _ => false + _ => false, }; [IgnoreMember] diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestRewards/QuestRewardData.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestRewards/QuestRewardData.cs index fb2663d92..c3af29f74 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestRewards/QuestRewardData.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestRewards/QuestRewardData.cs @@ -47,7 +47,7 @@ public readonly (QuestCompleteType Type, int Value)[] Missions = { (MissionCompleteType1, MissionCompleteValues1), (MissionCompleteType2, MissionCompleteValues2), - (MissionCompleteType3, MissionCompleteValues3) + (MissionCompleteType3, MissionCompleteValues3), }; [IgnoreMember] @@ -55,7 +55,7 @@ public readonly (EntityTypes Type, int Id, int Quantity)[] Entities = { (MissionsClearSetEntityType1, MissionsClearSetEntityId1, MissionsClearSetEntityQuantity1), (MissionsClearSetEntityType2, MissionsClearSetEntityId2, MissionsClearSetEntityQuantity2), - (MissionsClearSetEntityType3, MissionsClearSetEntityId3, MissionsClearSetEntityQuantity3) + (MissionsClearSetEntityType3, MissionsClearSetEntityId3, MissionsClearSetEntityQuantity3), }; [IgnoreMember] diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestRewards/QuestScoreMissionData.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestRewards/QuestScoreMissionData.cs index ce0767358..d6703d52b 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestRewards/QuestScoreMissionData.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/QuestRewards/QuestScoreMissionData.cs @@ -29,7 +29,7 @@ int BaseScore10 BaseScore7, BaseScore8, BaseScore9, - BaseScore10 + BaseScore10, }; public int GetScore(int wave, VariationTypes variationType) diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Shop/IShop.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Shop/IShop.cs index 37f10a529..8fe54323a 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Shop/IShop.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Shop/IShop.cs @@ -91,6 +91,6 @@ public interface IShop DestinationEntityId8, DestinationEntityQuantity8, DestinationLimitBreakCount8 - ) + ), }; } diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Trade/TreasureTrade.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Trade/TreasureTrade.cs index b6f6c8e0a..1e746f2a3 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Trade/TreasureTrade.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/Trade/TreasureTrade.cs @@ -47,6 +47,6 @@ int DestinationLimitBreakCount (NeedEntityType2, NeedEntityId2, NeedEntityQuantity2, NeedLimitBreakCount2), (NeedEntityType3, NeedEntityId3, NeedEntityQuantity3, NeedLimitBreakCount3), (NeedEntityType4, NeedEntityId4, NeedEntityQuantity4, NeedLimitBreakCount4), - (NeedEntityType5, NeedEntityId5, NeedEntityQuantity5, NeedLimitBreakCount5) + (NeedEntityType5, NeedEntityId5, NeedEntityQuantity5, NeedLimitBreakCount5), }; }; diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/UnionAbility.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/UnionAbility.cs index 156e63a64..7f53b9e9d 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/UnionAbility.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/UnionAbility.cs @@ -28,6 +28,6 @@ public readonly (int Count, int AbilityId, int Power)[] Abilities = (CrestGroup1Count2, AbilityId2, PartyPower2), (CrestGroup1Count3, AbilityId3, PartyPower3), (CrestGroup1Count4, AbilityId4, PartyPower4), - (CrestGroup1Count5, AbilityId5, PartyPower5) + (CrestGroup1Count5, AbilityId5, PartyPower5), }; }; diff --git a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/WeaponBody.cs b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/WeaponBody.cs index 3ccaec0b3..acf6d9589 100644 --- a/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/WeaponBody.cs +++ b/DragaliaAPI/DragaliaAPI.Shared/MasterAsset/Models/WeaponBody.cs @@ -145,7 +145,7 @@ public int GetPassiveAbilityId(int abilityNo) => public readonly int[][] Abilities = { new[] { Abilities11, Abilities12, Abilities13 }, - new[] { Abilities21, Abilities22, Abilities23 } + new[] { Abilities21, Abilities22, Abilities23 }, }; public int GetAbility(int abilityNo, int level) diff --git a/DragaliaAPI/DragaliaAPI.Test.Utils/DragaliaAPI.Test.Utils.csproj b/DragaliaAPI/DragaliaAPI.Test.Utils/DragaliaAPI.Test.Utils.csproj index b9f2c0b91..1c989a3ea 100644 --- a/DragaliaAPI/DragaliaAPI.Test.Utils/DragaliaAPI.Test.Utils.csproj +++ b/DragaliaAPI/DragaliaAPI.Test.Utils/DragaliaAPI.Test.Utils.csproj @@ -9,6 +9,7 @@ + diff --git a/DragaliaAPI/DragaliaAPI.Test.Utils/TokenHelper.cs b/DragaliaAPI/DragaliaAPI.Test.Utils/TokenHelper.cs index 015a5429b..d5f37899d 100644 --- a/DragaliaAPI/DragaliaAPI.Test.Utils/TokenHelper.cs +++ b/DragaliaAPI/DragaliaAPI.Test.Utils/TokenHelper.cs @@ -37,7 +37,7 @@ public static string GetToken( SecurityAlgorithms.RsaSha256 ), Claims = new Dictionary() { ["sub"] = accountId }, - Expires = expiryTime.UtcDateTime + Expires = expiryTime.UtcDateTime, }; if (savefileAvailable && savefileTime is not null) diff --git a/DragaliaAPI/DragaliaAPI.Test/Controllers/AbilityCrestControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Controllers/AbilityCrestControllerTest.cs index 51cfad578..dff50c1ff 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Controllers/AbilityCrestControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Controllers/AbilityCrestControllerTest.cs @@ -8,6 +8,7 @@ using DragaliaAPI.Shared.Definitions.Enums; using DragaliaAPI.Shared.MasterAsset; using DragaliaAPI.Test.Utils; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; namespace DragaliaAPI.Test.Controllers; @@ -90,8 +91,8 @@ await this.abilityCrestController.BuildupPiece( { new(), new(), - new() - } + new(), + }, }, default ) @@ -124,8 +125,8 @@ await this.abilityCrestController.BuildupPiece( { new(), new(), - new() - } + new(), + }, }, default ) @@ -166,7 +167,7 @@ await this.abilityCrestController.BuildupPlusCount( new AbilityCrestBuildupPlusCountRequest() { AbilityCrestId = AbilityCrestId.ManaFount, - PlusCountParamsList = new List() { new(), new() } + PlusCountParamsList = new List() { new(), new() }, }, default ) @@ -196,7 +197,7 @@ await this.abilityCrestController.BuildupPlusCount( new AbilityCrestBuildupPlusCountRequest() { AbilityCrestId = AbilityCrestId.ManaFount, - PlusCountParamsList = new List() { new(), new() } + PlusCountParamsList = new List() { new(), new() }, }, default ) @@ -221,7 +222,7 @@ await this.abilityCrestController.ResetPlusCount( new AbilityCrestResetPlusCountRequest() { AbilityCrestId = AbilityCrestId.ManaFount, - PlusCountTypeList = new List() { PlusCountType.Hp, 0 } + PlusCountTypeList = new List() { PlusCountType.Hp, 0 }, }, default ) @@ -251,8 +252,8 @@ await this.abilityCrestController.ResetPlusCount( PlusCountTypeList = new List() { PlusCountType.Hp, - PlusCountType.Atk - } + PlusCountType.Atk, + }, }, default ) @@ -284,7 +285,7 @@ await this.abilityCrestController.GetAbilityCrestSetList(default) new DbAbilityCrestSet() { ViewerId = IdentityTestUtils.ViewerId, - AbilityCrestSetNo = setNo + AbilityCrestSetNo = setNo, } ) ); @@ -318,7 +319,7 @@ public async Task GetAbilityCrestSetList_CorrectlyFillsUnmappedSets(int mappedSe CrestSlotType2CrestId2 = AbilityCrestId.DragonsNest, CrestSlotType3CrestId1 = AbilityCrestId.CrownofLightSerpentsBoon, CrestSlotType3CrestId2 = AbilityCrestId.TutelarysDestinyWolfsBoon, - TalismanKeyId = 1 + TalismanKeyId = 1, }, } .AsQueryable() @@ -351,7 +352,7 @@ await this.abilityCrestController.GetAbilityCrestSetList(default) CrestSlotType2CrestId2 = AbilityCrestId.DragonsNest, CrestSlotType3CrestId1 = AbilityCrestId.CrownofLightSerpentsBoon, CrestSlotType3CrestId2 = AbilityCrestId.TutelarysDestinyWolfsBoon, - TalismanKeyId = 1 + TalismanKeyId = 1, } ) ); @@ -365,7 +366,7 @@ await this.abilityCrestController.GetAbilityCrestSetList(default) new DbAbilityCrestSet() { ViewerId = IdentityTestUtils.ViewerId, - AbilityCrestSetNo = setNo + AbilityCrestSetNo = setNo, } ) ); @@ -412,7 +413,7 @@ await this.abilityCrestController.SetAbilityCrestSet( { AbilityCrestSetName = "", AbilityCrestSetNo = setNo, - RequestAbilityCrestSetData = new() { } + RequestAbilityCrestSetData = new() { }, }, default ) @@ -448,7 +449,7 @@ await this.abilityCrestController.UpdateAbilityCrestSetName( new AbilityCrestUpdateAbilityCrestSetNameRequest() { AbilityCrestSetNo = setNo, - AbilityCrestSetName = newName + AbilityCrestSetName = newName, }, default ) @@ -470,7 +471,7 @@ public async Task UpdateAbilityCrestName_UpdatesSetIfPreviouslyDefined() new DbAbilityCrestSet() { ViewerId = IdentityTestUtils.ViewerId, - AbilityCrestSetNo = setNo + AbilityCrestSetNo = setNo, } ); @@ -482,7 +483,7 @@ await this.abilityCrestController.UpdateAbilityCrestSetName( new AbilityCrestUpdateAbilityCrestSetNameRequest() { AbilityCrestSetNo = setNo, - AbilityCrestSetName = newName + AbilityCrestSetName = newName, }, default ) diff --git a/DragaliaAPI/DragaliaAPI.Test/Controllers/DungeonControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Controllers/DungeonControllerTest.cs index 8b47969f5..4c42d3b71 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Controllers/DungeonControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Controllers/DungeonControllerTest.cs @@ -63,7 +63,7 @@ public async Task Fail_IsMultiFalse_ReturnsExpectedResponse() IsFriend = false, ViewerId = 1, GetManaPoint = 50, - } + }, }; this.mockDungeonService.Setup(x => x.GetSession("my key", CancellationToken.None)) @@ -73,7 +73,7 @@ public async Task Fail_IsMultiFalse_ReturnsExpectedResponse() Party = [], IsMulti = false, SupportViewerId = 4, - QuestData = MasterAsset.QuestData[questId] + QuestData = MasterAsset.QuestData[questId], } ); @@ -104,8 +104,8 @@ await this.dungeonController.Fail( WallId = 0, WallLevel = 0, IsHost = true, - QuestId = questId - } + QuestId = questId, + }, } ); @@ -129,7 +129,7 @@ public async Task Fail_IsMultiTrue_RespondsExpectedResponse() IsFriend = false, ViewerId = 1, GetManaPoint = 50, - } + }, }; this.mockDungeonService.Setup(x => x.GetSession("my key", CancellationToken.None)) @@ -138,7 +138,7 @@ public async Task Fail_IsMultiTrue_RespondsExpectedResponse() { Party = [], IsMulti = true, - QuestData = MasterAsset.QuestData[questId] + QuestData = MasterAsset.QuestData[questId], } ); @@ -171,8 +171,8 @@ await this.dungeonController.Fail( WallId = 0, WallLevel = 0, IsHost = false, - QuestId = questId - } + QuestId = questId, + }, } ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Controllers/FriendControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Controllers/FriendControllerTest.cs index 6b1092ab9..d7a25fbef 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Controllers/FriendControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Controllers/FriendControllerTest.cs @@ -36,8 +36,8 @@ public async Task GetSupportCharaDetailContainsCorrectInformationWhenFound() SupportUserList = new List() { TestData.SupportListEuden }, SupportUserDetailList = new List() { - new() { ViewerId = 1000, IsFriend = true, }, - } + new() { ViewerId = 1000, IsFriend = true }, + }, } ); @@ -69,7 +69,7 @@ public async Task GetSupportCharaDetailContainsDefaultInformationWhenNotFound() SupportUserDetailList = new List() { new() { ViewerId = 1000, IsFriend = true }, - } + }, } ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Controllers/PartyControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Controllers/PartyControllerTest.cs index 9225864ac..41200e70e 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Controllers/PartyControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Controllers/PartyControllerTest.cs @@ -59,8 +59,8 @@ public async Task UpdatePartyName_CallsPartyRepository() { PartyList = new List() { - new() { PartyName = "Z Team", PartyNo = 1, } - } + new() { PartyName = "Z Team", PartyNo = 1 }, + }, }; this.mockUpdateDataService.Setup(x => x.SaveChangesAsync(default)) .ReturnsAsync(updateDataList); diff --git a/DragaliaAPI/DragaliaAPI.Test/Controllers/QuestControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Controllers/QuestControllerTest.cs index 6924d1288..c92eb1981 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Controllers/QuestControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Controllers/QuestControllerTest.cs @@ -45,8 +45,8 @@ public async Task ReadStory_ProducesExpectedResponse() NewGetEntityList = new List() { new() { EntityType = EntityTypes.Dragon, EntityId = (int)Dragons.BronzeFafnir }, - new() { EntityType = EntityTypes.Chara, EntityId = (int)Charas.Ilia } - } + new() { EntityType = EntityTypes.Chara, EntityId = (int)Charas.Ilia }, + }, }; this.mockStoryService.Setup(x => x.ReadStory(StoryTypes.Quest, 1)) @@ -64,8 +64,8 @@ public async Task ReadStory_ProducesExpectedResponse() { EntityType = EntityTypes.Dragon, EntityId = (int)Dragons.BronzeFafnir, - EntityQuantity = 2 - } + EntityQuantity = 2, + }, } ); this.mockStoryService.Setup(x => x.GetEntityResult()).Returns(entityResult); @@ -88,14 +88,14 @@ await this.questController.ReadStory( UpdateDataList = new(), QuestStoryRewardList = new List() { - new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = 25, }, + new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = 25 }, new() { EntityType = EntityTypes.Dragon, EntityId = (int)Dragons.BronzeFafnir, EntityQuantity = 2, EntityLevel = 1, - EntityLimitBreakCount = 0 + EntityLimitBreakCount = 0, }, new() { @@ -103,9 +103,9 @@ await this.questController.ReadStory( EntityId = (int)Charas.Ilia, EntityQuantity = 1, EntityLevel = 1, - EntityLimitBreakCount = 0 - } - } + EntityLimitBreakCount = 0, + }, + }, } ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Controllers/ToolControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Controllers/ToolControllerTest.cs index 1af32c2d1..d032b7c60 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Controllers/ToolControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Controllers/ToolControllerTest.cs @@ -29,7 +29,7 @@ public async Task Auth_CallsAuthService() { SessionId = "session_id", ViewerId = 1, - Nonce = "placeholder nonce" + Nonce = "placeholder nonce", } ); } @@ -43,7 +43,7 @@ public async Task Signup_CallsAuthService() .GetData() .Should() .BeEquivalentTo( - new ToolSignupResponse() { ViewerId = 1, }, + new ToolSignupResponse() { ViewerId = 1 }, opts => opts.Excluding(x => x.ServerTime) ); } diff --git a/DragaliaAPI/DragaliaAPI.Test/Controllers/WeaponBodyControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Controllers/WeaponBodyControllerTest.cs index d87a86148..637b4862d 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Controllers/WeaponBodyControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Controllers/WeaponBodyControllerTest.cs @@ -40,8 +40,8 @@ public async Task Craft_ValidCreate_Creates() { WeaponBodyList = new List() { - new() { WeaponBodyId = WeaponBodies.Areadbhar } - } + new() { WeaponBodyId = WeaponBodies.Areadbhar }, + }, } ); @@ -129,7 +129,7 @@ await this.weaponBodyController.BuildupPiece( new(), new(), new(), - } + }, }, default ) @@ -156,8 +156,8 @@ public async Task BuildupPiece_AllBuildupSuccess_ReturnsSuccess() { WeaponBodyList = new List() { - new() { WeaponBodyId = WeaponBodies.Caduceus } - } + new() { WeaponBodyId = WeaponBodies.Caduceus }, + }, }; this.mockUpdateDataService.Setup(x => x.SaveChangesAsync(default)).ReturnsAsync(udl); @@ -170,8 +170,8 @@ await this.weaponBodyController.BuildupPiece( { new(), new(), - new() - } + new(), + }, }, default ) diff --git a/DragaliaAPI/DragaliaAPI.Test/DragaliaAPI.Test.csproj b/DragaliaAPI/DragaliaAPI.Test/DragaliaAPI.Test.csproj index 348a80310..4fb08c5b7 100644 --- a/DragaliaAPI/DragaliaAPI.Test/DragaliaAPI.Test.csproj +++ b/DragaliaAPI/DragaliaAPI.Test/DragaliaAPI.Test.csproj @@ -15,6 +15,7 @@ + diff --git a/DragaliaAPI/DragaliaAPI.Test/Extensions/ResetTimeProviderExtensionsTest.cs b/DragaliaAPI/DragaliaAPI.Test/Extensions/ResetTimeProviderExtensionsTest.cs index 35dec1e25..e72d67d06 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Extensions/ResetTimeProviderExtensionsTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Extensions/ResetTimeProviderExtensionsTest.cs @@ -35,7 +35,7 @@ public ResetTimeProviderExtensionsTest() { new DateTimeOffset(2023, 06, 25, 05, 01, 13, TimeSpan.Zero), new DateTimeOffset(2023, 06, 24, 06, 00, 00, TimeSpan.Zero) - } + }, }; /// @@ -61,7 +61,7 @@ public ResetTimeProviderExtensionsTest() { new DateTimeOffset(2023, 06, 25, 05, 01, 13, TimeSpan.Zero), DayOfWeek.Saturday // 2023-06-24 - } + }, }; public static ResetTheoryData WeeklyResetData { get; } = diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/AbilityCrests/AbilityCrestRepositoryTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/AbilityCrests/AbilityCrestRepositoryTest.cs index 5a7051965..3df7b5477 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/AbilityCrests/AbilityCrestRepositoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/AbilityCrests/AbilityCrestRepositoryTest.cs @@ -44,7 +44,7 @@ public async Task Add_AddsToDatabase() new DbAbilityCrest() { ViewerId = IdentityTestUtils.ViewerId, - AbilityCrestId = AbilityCrestId.ADogsDay + AbilityCrestId = AbilityCrestId.ADogsDay, } ); } @@ -88,7 +88,7 @@ public async Task FindAsync_FindsAbilityCrestAsExpected() new DbAbilityCrest() { ViewerId = IdentityTestUtils.ViewerId, - AbilityCrestId = AbilityCrestId.FlashofGenius + AbilityCrestId = AbilityCrestId.FlashofGenius, } ); @@ -116,7 +116,7 @@ await this.abilityCrestRepository.AddOrUpdateSet( { ViewerId = IdentityTestUtils.ViewerId, AbilityCrestSetNo = 54, - CrestSlotType1CrestId1 = AbilityCrestId.WorthyRivals + CrestSlotType1CrestId1 = AbilityCrestId.WorthyRivals, } ); await this.fixture.ApiContext.SaveChangesAsync(); @@ -130,7 +130,7 @@ await this.abilityCrestRepository.AddOrUpdateSet( { ViewerId = IdentityTestUtils.ViewerId, AbilityCrestSetNo = 54, - CrestSlotType1CrestId1 = AbilityCrestId.WorthyRivals + CrestSlotType1CrestId1 = AbilityCrestId.WorthyRivals, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/AbilityCrests/AbilityCrestServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/AbilityCrests/AbilityCrestServiceTest.cs index a9d221817..95ecb7795 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/AbilityCrests/AbilityCrestServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/AbilityCrests/AbilityCrestServiceTest.cs @@ -44,7 +44,7 @@ public class AbilityCrestServiceTest { { Materials.TwilightShard, 150 }, { Materials.TwilightPrism, 150 }, - { Materials.TutelarySuccessorsMemory, 40 } + { Materials.TutelarySuccessorsMemory, 40 }, }; public static IEnumerable SuccessfulUnbindData => @@ -61,7 +61,7 @@ public class AbilityCrestServiceTest 1, false, GreatwyrmMidgardsormrUnbind1Map, - 0 + 0, }, new object[] { AbilityCrestId.UnitedbyOneVision, 1, false, EmptyMap, 300 }, new object[] { AbilityCrestId.WorthyRivals, 1, false, EmptyMap, 6_000 }, @@ -72,7 +72,7 @@ public class AbilityCrestServiceTest 1, false, TutelaryUnbind1Map, - 0 + 0, }, new object[] { AbilityCrestId.TheBewitchingMagician, 1, true, SilverKey, 0 }, new object[] { AbilityCrestId.HisCleverBrother, 1, true, SilverKey, 0 }, @@ -91,7 +91,7 @@ public class AbilityCrestServiceTest 4, false, GreatwyrmMidgardsormrUnbind4Map, - 0 + 0, }, new object[] { AbilityCrestId.UnitedbyOneVision, 4, false, EmptyMap, 400 }, new object[] { AbilityCrestId.WorthyRivals, 4, false, EmptyMap, 9_000 }, @@ -102,14 +102,14 @@ public class AbilityCrestServiceTest 4, false, TutelaryUnbind4Map, - 0 + 0, }, new object[] { AbilityCrestId.TheBewitchingMagician, 4, true, SilverKey, 0 }, new object[] { AbilityCrestId.HisCleverBrother, 4, true, SilverKey, 0 }, new object[] { AbilityCrestId.GreatwyrmMidgardsormr, 4, true, SilverKey, 0 }, new object[] { AbilityCrestId.UnitedbyOneVision, 4, true, GoldenKey, 0 }, new object[] { AbilityCrestId.WorthyRivals, 4, true, GoldenKey, 0 }, - new object[] { AbilityCrestId.GloriousTempest, 4, true, GoldenKey, 0 } + new object[] { AbilityCrestId.GloriousTempest, 4, true, GoldenKey, 0 }, }; private static readonly Dictionary GreatwyrmMidgardsormrCopyMap = @@ -121,7 +121,7 @@ public class AbilityCrestServiceTest { { Materials.TwilightShard, 200 }, { Materials.TwilightPrism, 150 }, - { Materials.TutelarySuccessorsMemory, 120 } + { Materials.TutelarySuccessorsMemory, 120 }, }; public static IEnumerable SuccessfulCopiesData => @@ -136,7 +136,7 @@ public class AbilityCrestServiceTest new object[] { AbilityCrestId.UnitedbyOneVision, EmptyMap, 1_700 }, new object[] { AbilityCrestId.WorthyRivals, EmptyMap, 37_000 }, new object[] { AbilityCrestId.GloriousTempest, GloriousTempestCopyMap, 0 }, - new object[] { AbilityCrestId.TutelarysDestinyWolfsBoon, TutelarysDestinyCopyMap, 0 } + new object[] { AbilityCrestId.TutelarysDestinyWolfsBoon, TutelarysDestinyCopyMap, 0 }, }; private static readonly Dictionary Rarity2LevelMap = @@ -152,7 +152,7 @@ public class AbilityCrestServiceTest { { Materials.HolyWater, 2 }, { Materials.ConsecratedWater, 14 }, - { Materials.TutelarySuccessorsMemory, 2 } + { Materials.TutelarySuccessorsMemory, 2 }, }; public static IEnumerable SuccessfulLevelData => @@ -167,7 +167,7 @@ public class AbilityCrestServiceTest new object[] { AbilityCrestId.WorthyRivals, Rarity5LevelMap, 0, 30 }, new object[] { AbilityCrestId.WorthyRivals, Rarity5LevelMap, 4, 50 }, new object[] { AbilityCrestId.TutelarysDestinyWolfsBoon, Rarity9LevelMap, 0, 10 }, - new object[] { AbilityCrestId.TutelarysDestinyWolfsBoon, Rarity9LevelMap, 4, 30 } + new object[] { AbilityCrestId.TutelarysDestinyWolfsBoon, Rarity9LevelMap, 4, 30 }, }; public AbilityCrestServiceTest(ITestOutputHelper testOutputHelper) @@ -198,7 +198,7 @@ public async Task TryBuildup_WithInvalidBuildupPieceIdReturnsInvalidResultCode() { BuildupPieceType = BuildupPieceTypes.Refine, IsUseDedicatedMaterial = false, - Step = 1 + Step = 1, }; await this @@ -221,7 +221,7 @@ BuildupPieceTypes buildupType { BuildupPieceType = buildupType, IsUseDedicatedMaterial = false, - Step = 0 + Step = 0, }; (await this.abilityCrestService.TryBuildup(abilityCrest, pieceList)) @@ -265,7 +265,7 @@ BuildupPieceTypes buildupType { BuildupPieceType = buildupType, IsUseDedicatedMaterial = false, - Step = 1 + Step = 1, }; (await this.abilityCrestService.TryBuildup(abilityCrest, pieceList)) @@ -282,7 +282,7 @@ public async Task TryBuildup_Copies_WithDedicatedUnbindMaterialThrowsError() { BuildupPieceType = BuildupPieceTypes.Copies, IsUseDedicatedMaterial = true, - Step = 2 + Step = 2, }; try @@ -310,7 +310,7 @@ AbilityCrestId abilityCrestId { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = true, - Step = 1 + Step = 1, }; try @@ -338,7 +338,7 @@ Materials materialId { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = true, - Step = 1 + Step = 1, }; this.mockInventoryRepository.Setup(x => @@ -364,7 +364,7 @@ public async Task TryBuildup_Unbind_WithoutDedicatedMaterialWithoutMaterialRetur { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = false, - Step = 2 + Step = 2, }; Dictionary expectedMap = @@ -396,7 +396,7 @@ public async Task TryBuildup_Copies_WithoutMaterialReturnsInvalidResultCode() { BuildupPieceType = BuildupPieceTypes.Copies, IsUseDedicatedMaterial = false, - Step = 3 + Step = 3, }; this.mockInventoryRepository.Setup(x => @@ -405,7 +405,7 @@ public async Task TryBuildup_Copies_WithoutMaterialReturnsInvalidResultCode() { { Materials.TwilightShard, 200 }, { Materials.TwilightPrism, 150 }, - { Materials.TutelarySuccessorsMemory, 120 } + { Materials.TutelarySuccessorsMemory, 120 }, } ) ) @@ -427,7 +427,7 @@ public async Task TryBuildup_Unbind_WithoutDedicatedMaterialWithoutDewpointRetur { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = false, - Step = 1 + Step = 1, }; this.mockInventoryRepository.Setup(x => x.CheckQuantity(new Dictionary())) @@ -451,7 +451,7 @@ public async Task TryBuildup_Copies_WithoutDedicatedMaterialWithoutDewpointRetur { BuildupPieceType = BuildupPieceTypes.Copies, IsUseDedicatedMaterial = false, - Step = 2 + Step = 2, }; this.mockInventoryRepository.Setup(x => x.CheckQuantity(new Dictionary())) @@ -479,7 +479,7 @@ BuildupPieceTypes buildupType { BuildupPieceType = buildupType, IsUseDedicatedMaterial = false, - Step = 2 + Step = 2, }; this.mockInventoryRepository.Setup(x => x.CheckQuantity(new Dictionary())) @@ -520,7 +520,7 @@ int currLevel { BuildupPieceType = buildupType, IsUseDedicatedMaterial = false, - Step = 3 + Step = 3, }; this.mockInventoryRepository.Setup(x => x.CheckQuantity(new Dictionary())) @@ -532,7 +532,7 @@ int currLevel { ViewerId = 1, AbilityCrestId = AbilityCrestId.ManaFount, - LimitBreakCount = currLevel + LimitBreakCount = currLevel, } ); @@ -561,7 +561,7 @@ int dewpoint { BuildupPieceType = BuildupPieceTypes.Unbind, IsUseDedicatedMaterial = isDedicated, - Step = step + Step = step, }; this.mockInventoryRepository.Setup(x => @@ -579,7 +579,7 @@ int dewpoint { ViewerId = 1, AbilityCrestId = abilityCrestId, - LimitBreakCount = step - 1 + LimitBreakCount = step - 1, } ); this.mockInventoryRepository.Setup(x => @@ -616,7 +616,7 @@ int dewpoint { BuildupPieceType = BuildupPieceTypes.Copies, IsUseDedicatedMaterial = false, - Step = 2 + Step = 2, }; this.mockInventoryRepository.Setup(x => @@ -634,7 +634,7 @@ int dewpoint { ViewerId = 1, AbilityCrestId = abilityCrestId, - EquipableCount = 1 + EquipableCount = 1, } ); this.mockInventoryRepository.Setup(x => @@ -689,7 +689,7 @@ public async Task TryBuildup_Level_WithInvalidBuildupLevelIdReturnsInvalidResult { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = 1 + Step = 1, }; (await this.abilityCrestService.TryBuildup(abilityCrest, pieceList)) @@ -706,7 +706,7 @@ public async Task TryBuildup_Level_WithDedicatedUnbindMaterialThrowsError() { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = true, - Step = 15 + Step = 15, }; try @@ -731,7 +731,7 @@ public async Task TryBuildup_Level_WithoutMaterialsReturnsInvalidResultCode() { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = 15 + Step = 15, }; this.mockInventoryRepository.Setup(x => @@ -739,7 +739,7 @@ public async Task TryBuildup_Level_WithoutMaterialsReturnsInvalidResultCode() new Dictionary { { Materials.HolyWater, 7 }, - { Materials.ConsecratedWater, 2 } + { Materials.ConsecratedWater, 2 }, } ) ) @@ -761,7 +761,7 @@ public async Task TryBuildup_Level_CantFindAbilityCrestInDbThrowsError() { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = 12 + Step = 12, }; this.mockInventoryRepository.Setup(x => @@ -769,7 +769,7 @@ public async Task TryBuildup_Level_CantFindAbilityCrestInDbThrowsError() new Dictionary { { Materials.HolyWater, 7 }, - { Materials.ConsecratedWater, 2 } + { Materials.ConsecratedWater, 2 }, } ) ) @@ -808,7 +808,7 @@ public async Task TryBuildup_Level_StepNotSequentialReturnsInvalidResultCode(int { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = 5 + Step = 5, }; this.mockInventoryRepository.Setup(x => @@ -821,7 +821,7 @@ public async Task TryBuildup_Level_StepNotSequentialReturnsInvalidResultCode(int { ViewerId = 1, AbilityCrestId = AbilityCrestId.ManaFount, - BuildupCount = currLevel + BuildupCount = currLevel, } ); @@ -849,7 +849,7 @@ int step { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = step + Step = step, }; this.mockInventoryRepository.Setup(x => @@ -863,7 +863,7 @@ int step ViewerId = 1, AbilityCrestId = AbilityCrestId.ManaFount, LimitBreakCount = limitBreak, - BuildupCount = step - 1 + BuildupCount = step - 1, } ); @@ -890,7 +890,7 @@ int step { BuildupPieceType = BuildupPieceTypes.Stats, IsUseDedicatedMaterial = false, - Step = step + Step = step, }; this.mockInventoryRepository.Setup(x => x.CheckQuantity(materialMap)).ReturnsAsync(true); @@ -901,7 +901,7 @@ int step ViewerId = 1, AbilityCrestId = abilityCrestId, LimitBreakCount = limitBreak, - BuildupCount = step - 1 + BuildupCount = step - 1, } ); this.mockInventoryRepository.Setup(x => x.UpdateQuantity(materialMap.Invert())) @@ -998,7 +998,7 @@ public async Task TryBuildupAugments_DecreaseInAugmentsReturnsInvalidResultCode( AbilityCrestId = AbilityCrestId.TutelarysDestinyWolfsBoon, ViewerId = 1, HpPlusCount = 40, - AttackPlusCount = 38 + AttackPlusCount = 38, } ); @@ -1027,7 +1027,7 @@ public async Task TryBuildupAugments_NotEnoughMaterialsReturnsInvalidResultCode( AbilityCrestId = AbilityCrestId.TutelarysDestinyWolfsBoon, ViewerId = 1, HpPlusCount = 40, - AttackPlusCount = 31 + AttackPlusCount = 31, } ); @@ -1153,7 +1153,7 @@ public async Task TryResetAugments_NotEnoughCoinReturnsInvalidResultCode() AbilityCrestId = AbilityCrestId.WorthyRivals, ViewerId = 1, HpPlusCount = 35, - AttackPlusCount = 50 + AttackPlusCount = 50, } ); @@ -1189,7 +1189,7 @@ int amount AbilityCrestId = abilityCrestId, ViewerId = 1, HpPlusCount = amount, - AttackPlusCount = 30 + AttackPlusCount = 30, } ); @@ -1228,7 +1228,7 @@ int amount AbilityCrestId = abilityCrestId, ViewerId = 1, HpPlusCount = 25, - AttackPlusCount = amount + AttackPlusCount = amount, } ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeControllerTest.cs index 80e9c04fc..921f29895 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeControllerTest.cs @@ -7,6 +7,7 @@ using DragaliaAPI.Services; using DragaliaAPI.Shared.Definitions.Enums; using Microsoft.Extensions.Time.Testing; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; namespace DragaliaAPI.Test.Features.Dmode; @@ -61,7 +62,7 @@ public async Task GetData_ReturnsData() List charaList = new() { - new DmodeCharaList(Charas.ThePrince, 50, 1, Charas.Nadine, Charas.Nadine, 0, 1000) + new DmodeCharaList(Charas.ThePrince, 50, 1, Charas.Nadine, Charas.Nadine, 0, 1000), }; mockDmodeService.Setup(x => x.GetCharaList()).ReturnsAsync(charaList); @@ -83,8 +84,8 @@ public async Task GetData_ReturnsData() ViewerId = UnitTestUtils.ViewerId, StoryId = 1000, StoryType = StoryTypes.DungeonMode, - State = StoryState.Read - } + State = StoryState.Read, + }, } .AsQueryable() .BuildMock() @@ -128,7 +129,7 @@ public async Task Entry_InitializesData() List charaList = new() { - new DmodeCharaList(Charas.ThePrince, 50, 1, Charas.Nadine, Charas.Nadine, 0, 1000) + new DmodeCharaList(Charas.ThePrince, 50, 1, Charas.Nadine, Charas.Nadine, 0, 1000), }; mockDmodeService.Setup(x => x.GetCharaList()).ReturnsAsync(charaList); @@ -150,8 +151,8 @@ public async Task Entry_InitializesData() ViewerId = UnitTestUtils.ViewerId, StoryId = 1000, StoryType = StoryTypes.DungeonMode, - State = StoryState.Read - } + State = StoryState.Read, + }, } .AsQueryable() .BuildMock() diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeDungeonControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeDungeonControllerTest.cs index 1be535465..af8b286dd 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeDungeonControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeDungeonControllerTest.cs @@ -94,8 +94,8 @@ public async Task Floor_GeneratesFloor() { FloorNum = 50, CurrentAreaId = 10, - CurrentAreaThemeId = 100 - } + CurrentAreaThemeId = 100, + }, }; DmodePlayRecord playRecord = new(); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeServiceTest.cs index 4f698e4ff..cea5f1df4 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Dmode/DmodeServiceTest.cs @@ -10,6 +10,7 @@ using DragaliaAPI.Shared.MasterAsset.Models.Dmode; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Time.Testing; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; using DbPlayerDmodeDungeon = DragaliaAPI.Database.Entities.DbPlayerDmodeDungeon; @@ -74,8 +75,8 @@ public async Task GetInfo_ReturnsInfo() Point1Quantity = point1Quantity, Point2Quantity = point2Quantity, RecoveryCount = recoveryCount, - RecoveryTime = this.fixedTime - } + RecoveryTime = this.fixedTime, + }, } .AsQueryable() .BuildMock() @@ -133,7 +134,7 @@ public async Task GetDungeonInfo_ReturnsDungeonInfo() Floor = floor, QuestTime = 0, DungeonScore = dungeonScore, - IsPlayEnd = isPlayEnd + IsPlayEnd = isPlayEnd, }; mockDmodeRepository @@ -189,8 +190,8 @@ public async Task GetServitorPassiveList_ReturnsList() { ViewerId = UnitTestUtils.ViewerId, PassiveId = DmodeServitorPassiveType.Exp, - Level = 5 - } + Level = 5, + }, } .AsQueryable() .BuildMock() @@ -219,7 +220,7 @@ public async Task GetExpedition_ReturnsExpedition() CharaId4 = 0, StartTime = this.fixedTime, State = ExpeditionState.Playing, - TargetFloor = 30 + TargetFloor = 30, }; mockDmodeRepository @@ -257,7 +258,7 @@ public async Task GetCharaList_ReturnsList() SelectEditSkillCharaId1 = Charas.Tobias, SelectEditSkillCharaId2 = 0, SelectEditSkillCharaId3 = 0, - SelectedServitorId = 2 + SelectedServitorId = 2, }; mockDmodeRepository @@ -292,7 +293,7 @@ public async Task UseRecovery_UsesRecovery() { ViewerId = UnitTestUtils.ViewerId, RecoveryCount = 0, - RecoveryTime = DateTimeOffset.UnixEpoch + RecoveryTime = DateTimeOffset.UnixEpoch, }; mockDmodeRepository.Setup(x => x.GetInfoAsync()).ReturnsAsync(dbInfo); @@ -313,7 +314,7 @@ public async Task UseRecovery_MaxAmount_Throws() { ViewerId = UnitTestUtils.ViewerId, RecoveryCount = 10, - RecoveryTime = DateTimeOffset.UnixEpoch + RecoveryTime = DateTimeOffset.UnixEpoch, }; mockDmodeRepository.Setup(x => x.GetInfoAsync()).ReturnsAsync(dbInfo); @@ -331,7 +332,7 @@ public async Task UseSkip_UsesSkip() { ViewerId = UnitTestUtils.ViewerId, FloorSkipCount = 0, - FloorSkipTime = DateTimeOffset.UnixEpoch + FloorSkipTime = DateTimeOffset.UnixEpoch, }; mockDmodeRepository.Setup(x => x.GetInfoAsync()).ReturnsAsync(dbInfo); @@ -352,7 +353,7 @@ public async Task UseSkip_MaxAmount_Throws() { ViewerId = UnitTestUtils.ViewerId, FloorSkipCount = 3, - FloorSkipTime = DateTimeOffset.UnixEpoch + FloorSkipTime = DateTimeOffset.UnixEpoch, }; mockDmodeRepository.Setup(x => x.GetInfoAsync()).ReturnsAsync(dbInfo); @@ -374,8 +375,8 @@ public async Task BuildupServitorPassive_BuildsUpServitor() { ViewerId = UnitTestUtils.ViewerId, PassiveId = DmodeServitorPassiveType.Exp, - Level = 1 - } + Level = 1, + }, }; mockDmodeRepository @@ -410,7 +411,7 @@ public async Task BuildupServitorPassive_LevelOne_AddsServitor() { ViewerId = UnitTestUtils.ViewerId, PassiveId = DmodeServitorPassiveType.Exp, - Level = 0 + Level = 0, }; mockDmodeRepository @@ -448,8 +449,8 @@ public async Task BuildupServitorPassive_MultipleLevels_BuildsUpServitor() { ViewerId = UnitTestUtils.ViewerId, PassiveId = DmodeServitorPassiveType.Exp, - Level = 1 - } + Level = 1, + }, }; List inputList = new(); @@ -491,7 +492,7 @@ public async Task StartExpedition_StartsExpedition() CharaId4 = 0, State = ExpeditionState.Waiting, StartTime = DateTimeOffset.UnixEpoch, - TargetFloor = 0 + TargetFloor = 0, }; mockDmodeRepository.Setup(x => x.GetExpeditionAsync()).ReturnsAsync(dbExpedition); @@ -524,7 +525,7 @@ public async Task FinishExpedition_FinishesExpedition() CharaId4 = 0, State = ExpeditionState.Playing, StartTime = DateTimeOffset.UnixEpoch, - TargetFloor = 30 + TargetFloor = 30, }; mockDmodeRepository.Setup(x => x.GetExpeditionAsync()).ReturnsAsync(dbExpedition); @@ -549,7 +550,7 @@ public async Task FinishExpedition_FinishesExpedition() new DbTalisman() { ViewerId = UnitTestUtils.ViewerId, - TalismanId = Talismans.ThePrince + TalismanId = Talismans.ThePrince, } ) ); @@ -592,7 +593,7 @@ public async Task FinishExpedition_NotEnoughTimePassed_Throws() CharaId4 = 0, State = ExpeditionState.Playing, StartTime = this.fixedTime, - TargetFloor = 30 + TargetFloor = 30, }; mockDmodeRepository.Setup(x => x.GetExpeditionAsync()).ReturnsAsync(dbExpedition); @@ -618,7 +619,7 @@ public async Task FinishExpedition_ForceFinish_FinishesWithoutRewards() CharaId4 = 0, State = ExpeditionState.Playing, StartTime = this.fixedTime, - TargetFloor = 30 + TargetFloor = 30, }; mockDmodeRepository.Setup(x => x.GetExpeditionAsync()).ReturnsAsync(dbExpedition); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/AbilityCrestMultiplierServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/AbilityCrestMultiplierServiceTest.cs index ea1546ebd..2bf861e75 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/AbilityCrestMultiplierServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/AbilityCrestMultiplierServiceTest.cs @@ -5,6 +5,7 @@ using DragaliaAPI.Models.Generated; using DragaliaAPI.Shared.Definitions.Enums; using Microsoft.Extensions.Logging.Abstractions; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; namespace DragaliaAPI.Test.Features.Dungeon; @@ -37,14 +38,14 @@ public async Task GetFacilityEventMultiplier_ReturnsExpectedResult() { ViewerId = 1, AbilityCrestId = AbilityCrestId.SistersDayOut, - LimitBreakCount = 4 + LimitBreakCount = 4, }, new() { ViewerId = 1, AbilityCrestId = AbilityCrestId.TheDragonSmiths, - LimitBreakCount = 4 - } + LimitBreakCount = 4, + }, } .AsQueryable() .BuildMock() @@ -56,22 +57,22 @@ public async Task GetFacilityEventMultiplier_ReturnsExpectedResult() new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, - EquipCrestSlotType1CrestId2 = AbilityCrestId.TheDragonSmiths + EquipCrestSlotType1CrestId2 = AbilityCrestId.TheDragonSmiths, }, new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, - EquipCrestSlotType1CrestId2 = AbilityCrestId.TheDragonSmiths + EquipCrestSlotType1CrestId2 = AbilityCrestId.TheDragonSmiths, }, new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, - EquipCrestSlotType1CrestId2 = AbilityCrestId.TheDragonSmiths + EquipCrestSlotType1CrestId2 = AbilityCrestId.TheDragonSmiths, }, new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, - EquipCrestSlotType1CrestId2 = AbilityCrestId.TheDragonSmiths + EquipCrestSlotType1CrestId2 = AbilityCrestId.TheDragonSmiths, }, }; @@ -99,14 +100,14 @@ public async Task GetFacilityEventMultiplier_UnitOverCap_ReturnsBoostCap() { ViewerId = 1, AbilityCrestId = AbilityCrestId.SistersDayOut, - LimitBreakCount = 4 + LimitBreakCount = 4, }, new() { ViewerId = 1, AbilityCrestId = AbilityCrestId.TotheExtreme, - LimitBreakCount = 4 - } + LimitBreakCount = 4, + }, } .AsQueryable() .BuildMock() @@ -118,7 +119,9 @@ public async Task GetFacilityEventMultiplier_UnitOverCap_ReturnsBoostCap() new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, // +150% - EquipCrestSlotType2CrestId1 = AbilityCrestId.TotheExtreme // +100% + EquipCrestSlotType2CrestId1 = + AbilityCrestId.TotheExtreme // +100% + , }, }; @@ -146,14 +149,14 @@ public async Task GetFacilityEventMultiplier_MultipleUnitsOverCap_CapsPerUnit() { ViewerId = 1, AbilityCrestId = AbilityCrestId.SistersDayOut, - LimitBreakCount = 4 + LimitBreakCount = 4, }, new() { ViewerId = 1, AbilityCrestId = AbilityCrestId.TotheExtreme, - LimitBreakCount = 4 - } + LimitBreakCount = 4, + }, } .AsQueryable() .BuildMock() @@ -165,12 +168,16 @@ public async Task GetFacilityEventMultiplier_MultipleUnitsOverCap_CapsPerUnit() new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, // +150% - EquipCrestSlotType2CrestId1 = AbilityCrestId.TotheExtreme // +100% + EquipCrestSlotType2CrestId1 = + AbilityCrestId.TotheExtreme // +100% + , }, new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, // +150% - EquipCrestSlotType2CrestId1 = AbilityCrestId.TotheExtreme // +100% + EquipCrestSlotType2CrestId1 = + AbilityCrestId.TotheExtreme // +100% + , }, }; @@ -198,13 +205,13 @@ public async Task GetFacilityEventMultiplier_AbilityCrestNotMaxed_UsesCorrectVal { ViewerId = 1, AbilityCrestId = AbilityCrestId.SistersDayOut, - LimitBreakCount = 0 + LimitBreakCount = 0, }, new() { ViewerId = 1, AbilityCrestId = AbilityCrestId.TheDragonSmiths, - LimitBreakCount = 0 + LimitBreakCount = 0, }, } .AsQueryable() @@ -245,8 +252,8 @@ public async Task GetFacilityEventMultiplier_NoneEquippedForEvent_ReturnsNoMulti { ViewerId = 1, AbilityCrestId = AbilityCrestId.SistersDayOut, - LimitBreakCount = 4 - } + LimitBreakCount = 4, + }, } .AsQueryable() .BuildMock() @@ -255,10 +262,10 @@ public async Task GetFacilityEventMultiplier_NoneEquippedForEvent_ReturnsNoMulti List party = new() { - new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, }, - new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, }, - new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, }, - new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut, }, + new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut }, + new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut }, + new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut }, + new() { EquipCrestSlotType1CrestId1 = AbilityCrestId.SistersDayOut }, }; (double material, double point) = ( diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/DungeonRepositoryTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/DungeonRepositoryTest.cs index 7cfdbb8e8..06350fb4e 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/DungeonRepositoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/DungeonRepositoryTest.cs @@ -95,16 +95,20 @@ private async Task SeedDatabase() new() { ViewerId = ViewerId, - AbilityCrestId = AbilityCrestId.ThePrinceofDragonyule + AbilityCrestId = AbilityCrestId.ThePrinceofDragonyule, }, new() { ViewerId = ViewerId, AbilityCrestId = AbilityCrestId.TaikoTandem }, new() { ViewerId = ViewerId, AbilityCrestId = AbilityCrestId.AChoiceBlend }, new() { ViewerId = ViewerId, - AbilityCrestId = AbilityCrestId.CrownofLightSerpentsBoon + AbilityCrestId = AbilityCrestId.CrownofLightSerpentsBoon, + }, + new() + { + ViewerId = ViewerId, + AbilityCrestId = AbilityCrestId.AKingsPrideSwordsBoon, }, - new() { ViewerId = ViewerId, AbilityCrestId = AbilityCrestId.AKingsPrideSwordsBoon } }; DbTalisman talisman = @@ -112,7 +116,7 @@ private async Task SeedDatabase() { ViewerId = ViewerId, TalismanId = Talismans.GalaNedrick, - TalismanKeyId = 44444 + TalismanKeyId = 44444, }; DbPartyUnit unit = @@ -171,8 +175,8 @@ private async Task SeedDatabase() CrestSlotType2CrestList = crests.GetRange(3, 2), CrestSlotType3CrestList = crests.GetRange(5, 2), DragonReliabilityLevel = 15, - EditSkill1CharaData = new() { CharaId = Charas.GalaMym, EditSkillLevel = 3, }, - EditSkill2CharaData = new() { CharaId = Charas.SummerCleo, EditSkillLevel = 2, } + EditSkill1CharaData = new() { CharaId = Charas.GalaMym, EditSkillLevel = 3 }, + EditSkill2CharaData = new() { CharaId = Charas.SummerCleo, EditSkillLevel = 2 }, }; } } diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/DungeonServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/DungeonServiceTest.cs index 551c86914..1b31656fd 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/DungeonServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/DungeonServiceTest.cs @@ -48,8 +48,8 @@ public async Task StartDungeon_CanGetAfterwards() QuestData = MasterAsset.QuestData.Get(100010303), Party = new List() { - new() { CharaId = Shared.Definitions.Enums.Charas.Addis } - } + new() { CharaId = Shared.Definitions.Enums.Charas.Addis }, + }, }; string key = dungeonService.CreateSession(session); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/Record/DungeonRecordRewardServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/Record/DungeonRecordRewardServiceTest.cs index 04adb0938..3ce7e8611 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/Record/DungeonRecordRewardServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/Record/DungeonRecordRewardServiceTest.cs @@ -72,8 +72,8 @@ public async Task ProcessQuestMissionCompletion_SetsEntityProperties() { Id = 0, Quantity = 2, - Type = EntityTypes.Wyrmite - } + Type = EntityTypes.Wyrmite, + }, }; PlayRecord playRecord = new(); @@ -115,14 +115,14 @@ public async Task ProcessEnemyDrops_RewardsCorrectDrops() new() { AreaIdx = 0, - Enemy = new List() { 1, 0, 1 } + Enemy = new List() { 1, 0, 1 }, }, new() { AreaIdx = 1, - Enemy = new List() { 0, 1, 0 } - } - } + Enemy = new List() { 0, 1, 0 }, + }, + }, }; DungeonSession session = @@ -147,10 +147,14 @@ public async Task ProcessEnemyDrops_RewardsCorrectDrops() DropList = new List() { new() { Type = EntityTypes.Dew, Quantity = 10 }, - new() { Type = EntityTypes.HustleHammer, Quantity = 10 } - } + new() + { + Type = EntityTypes.HustleHammer, + Quantity = 10, + }, + }, }, - } + }, }, new() { @@ -162,10 +166,10 @@ public async Task ProcessEnemyDrops_RewardsCorrectDrops() Coin = 10, DropList = new List() { - new() { Type = EntityTypes.AstralItem, Quantity = 10 } - } + new() { Type = EntityTypes.AstralItem, Quantity = 10 }, + }, }, - } + }, }, new() { @@ -177,8 +181,8 @@ public async Task ProcessEnemyDrops_RewardsCorrectDrops() Coin = 10, DropList = new List() { - new() { Type = EntityTypes.Wyrmite, Quantity = 10 } - } + new() { Type = EntityTypes.Wyrmite, Quantity = 10 }, + }, }, new() { @@ -186,11 +190,11 @@ public async Task ProcessEnemyDrops_RewardsCorrectDrops() Coin = 10, DropList = new List() { - new() { Type = EntityTypes.FafnirMedal, Quantity = 10 } - } + new() { Type = EntityTypes.FafnirMedal, Quantity = 10 }, + }, }, - } - } + }, + }, } }, { @@ -202,12 +206,12 @@ public async Task ProcessEnemyDrops_RewardsCorrectDrops() { EnemyDropList = new List() { - new() { Coin = 10, Mana = 10, } - } - } + new() { Coin = 10, Mana = 10 }, + }, + }, } - } - } + }, + }, }; this.mockRewardService.Setup(x => x.GrantRewards(It.IsAny>())) @@ -230,7 +234,7 @@ public async Task ProcessEnemyDrops_RewardsCorrectDrops() new() { Type = EntityTypes.Dew, Quantity = 10 }, new() { Type = EntityTypes.HustleHammer, Quantity = 10 }, new() { Type = EntityTypes.FafnirMedal, Quantity = 10 }, - new() { Type = EntityTypes.Wyrmite, Quantity = 10 } + new() { Type = EntityTypes.Wyrmite, Quantity = 10 }, }, 40, 40 @@ -245,7 +249,7 @@ public async Task ProcessEventRewards_CallsExpectedMethods() { List party = new(); DungeonSession session = - new() { QuestData = MasterAsset.QuestData[100010101], Party = party, }; + new() { QuestData = MasterAsset.QuestData[100010101], Party = party }; PlayRecord playRecord = new(); List scoreMissionSuccessLists = @@ -255,19 +259,19 @@ public async Task ProcessEventRewards_CallsExpectedMethods() { ScoreMissionCompleteType = QuestCompleteType.DragonElementLocked, ScoreTargetValue = 2, - } + }, }; List passiveUpLists = new() { - new() { PassiveId = 3, Progress = 10 } + new() { PassiveId = 3, Progress = 10 }, }; List eventDrops = new() { - new() { Type = EntityTypes.Clb01EventItem, Quantity = 100 } + new() { Type = EntityTypes.Clb01EventItem, Quantity = 100 }, }; List enemyScoring = @@ -276,8 +280,8 @@ public async Task ProcessEventRewards_CallsExpectedMethods() { ScoringEnemyId = 100, Point = 1, - SmashCount = 2 - } + SmashCount = 2, + }, ]; int materialMultiplier = 2; diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/Record/DungeonRecordServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/Record/DungeonRecordServiceTest.cs index 8704f141d..55becf5e2 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/Record/DungeonRecordServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Dungeon/Record/DungeonRecordServiceTest.cs @@ -63,9 +63,9 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() { QuestData = MasterAsset.QuestData[lSurtrSoloId], Party = new List(), - StartTime = DateTimeOffset.UtcNow + StartTime = DateTimeOffset.UtcNow, }; - PlayRecord playRecord = new() { Time = 10, }; + PlayRecord playRecord = new() { Time = 10 }; DbQuest mockQuest = new() @@ -73,7 +73,7 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() ViewerId = 1, QuestId = lSurtrSoloId, State = 0, - BestClearTime = 999 + BestClearTime = 999, }; List dropList = @@ -83,8 +83,8 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() { Id = (int)Materials.FirestormRuby, Quantity = 10, - Type = EntityTypes.Material - } + Type = EntityTypes.Material, + }, }; List eventDrops = @@ -94,8 +94,8 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() { Id = (int)Materials.WoodlandHerbs, Quantity = 20, - Type = EntityTypes.Material - } + Type = EntityTypes.Material, + }, }; List scoreMissionSuccessLists = @@ -105,13 +105,13 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() { ScoreMissionCompleteType = QuestCompleteType.LimitFall, ScoreTargetValue = 100, - } + }, }; List passiveUpLists = new() { - new() { PassiveId = 1, Progress = 2 } + new() { PassiveId = 1, Progress = 2 }, }; List missionsClearSets = new List() @@ -120,8 +120,8 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() { Type = EntityTypes.CollectEventItem, Id = 1, - Quantity = 2 - } + Quantity = 2, + }, }; List missionCompleteSets = @@ -131,8 +131,8 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() { Type = EntityTypes.ExchangeTicket, Id = 2, - Quantity = 3 - } + Quantity = 3, + }, }; List firstClearSets = @@ -142,8 +142,8 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() { Type = EntityTypes.RaidEventItem, Id = 4, - Quantity = 5 - } + Quantity = 5, + }, }; List enemyScoring = @@ -152,8 +152,8 @@ public async Task GenerateIngameResultData_CallsExpectedMethods() { ScoringEnemyId = 100, Point = 1, - SmashCount = 2 - } + SmashCount = 2, + }, ]; QuestMissionStatus missionStatus = new([], missionsClearSets, missionCompleteSets); @@ -237,14 +237,14 @@ await this.dungeonRecordService.GenerateIngameResultData( TakeCharaExp = 0, BonusFactor = 1, ManaBonusFactor = 1, - CharaGrowRecord = new List() + CharaGrowRecord = new List(), }, EventPassiveUpList = passiveUpLists, ScoreMissionSuccessList = scoreMissionSuccessLists, ScoringEnemyPointList = enemyScoring, IsBestClearTime = true, ClearTime = playRecord.Time, - ConvertedEntityList = new List() + ConvertedEntityList = new List(), } ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Fort/FortControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Fort/FortControllerTest.cs index 5a14afa4f..c5d504cbb 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Fort/FortControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Fort/FortControllerTest.cs @@ -42,7 +42,7 @@ public async Task GetData_ReturnsData() { CarpenterNum = 1, MaxCarpenterCount = 2, - WorkingCarpenterNum = 3 + WorkingCarpenterNum = 3, }; List buildList = new() { new() { FortPlantDetailId = 4 } }; FortBonusList bonusList = new() { AllBonus = new(2, 3) }; @@ -144,7 +144,7 @@ await fortController.BuildAtOnce( new FortBuildAtOnceRequest() { PaymentType = PaymentTypes.HalidomHustleHammer, - BuildId = 8 + BuildId = 8, }, default ) @@ -255,7 +255,7 @@ await fortController.BuildStart( { FortPlantId = FortPlants.BroadleafTree, PositionX = 2, - PositionZ = 3 + PositionZ = 3, }, default ) @@ -307,7 +307,7 @@ await fortController.LevelupAtOnce( new FortLevelupAtOnceRequest() { PaymentType = PaymentTypes.HalidomHustleHammer, - BuildId = 8 + BuildId = 8, }, default ) @@ -471,7 +471,7 @@ await fortController.Move( { BuildId = 1, AfterPositionX = 2, - AfterPositionZ = 3 + AfterPositionZ = 3, }, default ) diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Fort/FortServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Fort/FortServiceTest.cs index 4265f1fa6..02e2edb84 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Fort/FortServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Fort/FortServiceTest.cs @@ -14,6 +14,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.Extensions.Time.Testing; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; using Range = Moq.Range; @@ -65,7 +66,7 @@ public FortServiceTest() { Normal = 100, Ripe = 0, - Succulent = 0 + Succulent = 0, } }, { @@ -74,7 +75,7 @@ public FortServiceTest() { Normal = 0, Ripe = 100, - Succulent = 0 + Succulent = 0, } }, { @@ -83,10 +84,10 @@ public FortServiceTest() { Normal = 0, Ripe = 0, - Succulent = 100 + Succulent = 100, } - } - } + }, + }, } ); @@ -126,7 +127,7 @@ public async Task GetBuildList_ReturnsBuildList() BuildStartDate = new(2023, 04, 18, 18, 32, 34, TimeSpan.Zero), Level = 5, PlantId = FortPlants.Dragontree, - } + }, } .AsQueryable() .BuildMock() @@ -231,7 +232,7 @@ public async Task LevelupAtOnce_UpgradesBuilding() ViewerId = 1, Level = 2, BuildStartDate = FixedTime, - BuildEndDate = FixedTime + TimeSpan.FromSeconds(5) + BuildEndDate = FixedTime + TimeSpan.FromSeconds(5), }; mockFortMissionProgressionService @@ -400,7 +401,7 @@ public async Task BuildStart_StartsBuilding() BuildStartDate = DateTimeOffset.UnixEpoch, BuildEndDate = DateTimeOffset.UnixEpoch, IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ) ); @@ -448,7 +449,7 @@ public async Task LevelupStart_StartsBuilding() { ViewerId = 1, Level = 20, - PlantId = FortPlants.Dragonata + PlantId = FortPlants.Dragonata, }; mockUserDataRepository @@ -498,7 +499,7 @@ public async Task LevelupStart_InsufficientCarpenters_Throws() { ViewerId = 1, Level = 20, - PlantId = FortPlants.Dragonata + PlantId = FortPlants.Dragonata, }; mockFortRepository @@ -555,7 +556,7 @@ public async Task LevelupAtOnce_Wyrmite_ConsumesPayment() Level = 5, PlantId = FortPlants.Smithy, BuildStartDate = FixedTime, - BuildEndDate = FixedTime + TimeSpan.FromDays(7) + BuildEndDate = FixedTime + TimeSpan.FromDays(7), }; mockFortRepository.Setup(x => x.GetBuilding(444)).ReturnsAsync(build); @@ -591,7 +592,7 @@ public async Task LevelupAtOnce_PartialWyrmite_ConsumesPayment() Level = 5, PlantId = FortPlants.Smithy, BuildStartDate = FixedTime - TimeSpan.FromDays(1), - BuildEndDate = FixedTime + TimeSpan.FromDays(6) + BuildEndDate = FixedTime + TimeSpan.FromDays(6), }; const int wyrmiteDifference = 24 * 60 / 12; @@ -629,7 +630,7 @@ public async Task LevelupAtOnce_HustleHammers_ConsumesPayment() Level = 5, PlantId = FortPlants.Smithy, BuildStartDate = FixedTime, - BuildEndDate = FixedTime + TimeSpan.FromDays(7) + BuildEndDate = FixedTime + TimeSpan.FromDays(7), }; mockFortRepository.Setup(x => x.GetBuilding(446)).ReturnsAsync(build); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Missions/MissionControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Missions/MissionControllerTest.cs index d931be690..5308acc31 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Missions/MissionControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Missions/MissionControllerTest.cs @@ -7,6 +7,7 @@ using DragaliaAPI.Shared.Definitions.Enums; using DragaliaAPI.Shared.MasterAsset.Models.Missions; using DragaliaAPI.Test.Utils; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; namespace DragaliaAPI.Test.Features.Missions; @@ -45,8 +46,8 @@ public async Task GetMissionList_ReturnsMissionList() NormalMissionNotice = new AtgenNormalMissionNotice() { IsUpdate = true, - AllMissionCount = 420 - } + AllMissionCount = 420, + }, }; CurrentMainStoryMission mainStoryMission = @@ -62,7 +63,7 @@ public async Task GetMissionList_ReturnsMissionList() { NormalMissionList = [], MissionNotice = notice, - CurrentMainStoryMission = mainStoryMission + CurrentMainStoryMission = mainStoryMission, } ); @@ -89,8 +90,8 @@ public async Task GetDrillMissionList_ReturnsDrillMissionList() NormalMissionNotice = new AtgenNormalMissionNotice() { IsUpdate = true, - AllMissionCount = 420 - } + AllMissionCount = 420, + }, }; this.mockMissionService.Setup(x => x.GetMissionNotice(null)).ReturnsAsync(notice); @@ -108,8 +109,8 @@ public async Task GetDrillMissionList_ReturnsDrillMissionList() Id = 500, State = MissionState.InProgress, Start = DateTimeOffset.UnixEpoch, - End = DateTimeOffset.UnixEpoch - } + End = DateTimeOffset.UnixEpoch, + }, } .AsQueryable() .BuildMock() @@ -148,8 +149,8 @@ public async Task UnlockDrillMissionGroup_UnlocksGroup() State = MissionState.Completed, Type = MissionType.Drill, Start = DateTimeOffset.UnixEpoch, - End = DateTimeOffset.UnixEpoch - } + End = DateTimeOffset.UnixEpoch, + }, } ); @@ -185,7 +186,7 @@ public async Task UnlockMainMissionGroup_UnlocksGroupAndRewards() State = MissionState.Completed, Type = MissionType.MainStory, Start = DateTimeOffset.UnixEpoch, - End = DateTimeOffset.UnixEpoch + End = DateTimeOffset.UnixEpoch, }; MainStoryMissionGroupReward fakeReward = new(EntityTypes.FortPlant, 10, 500); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Summon/SummonOddsLogicTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Summon/SummonOddsLogicTest.cs index efb70b974..218a87eb4 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Summon/SummonOddsLogicTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Summon/SummonOddsLogicTest.cs @@ -37,7 +37,7 @@ public void GetUnitRates_FiveStarPickup_ProducesExpectedRates() .BeEquivalentTo( [ new UnitRate(Charas.FaeblessedTobias, 0.005m), - new UnitRate(Dragons.Simurgh, 0.008m) + new UnitRate(Dragons.Simurgh, 0.008m), ] ); @@ -99,7 +99,7 @@ public void GetUnitRates_MultiFiveStarCharaPickup_ProducesExpectedRates() [ new UnitRate(Charas.GalaNedrick, 0.005m), new UnitRate(Charas.Akasha, 0.005m), - new UnitRate(Charas.Eirene, 0.005m) + new UnitRate(Charas.Eirene, 0.005m), ] ); @@ -125,7 +125,7 @@ public void GetUnitRates_Gala_ProducesExpectedRates() Id = 1, IsGala = true, PickupCharas = [Charas.GalaZena, Charas.GalaRanzal], - PickupDragons = [Dragons.GalaBeastCiella] + PickupDragons = [Dragons.GalaBeastCiella], } ), numSummonsSinceLastFiveStar: 0 @@ -144,7 +144,7 @@ public void GetUnitRates_Gala_ProducesExpectedRates() [ new UnitRate(Charas.GalaZena, 0.005m), new UnitRate(Charas.GalaRanzal, 0.005m), - new UnitRate(Dragons.GalaBeastCiella, 0.008m) + new UnitRate(Dragons.GalaBeastCiella, 0.008m), ] ); @@ -180,7 +180,7 @@ public void GetUnitRates_Gala_AddsLimitedUnits() Id = 1, IsGala = true, PickupCharas = [Charas.GalaZena, Charas.GalaRanzal], - PickupDragons = [Dragons.GalaBeastCiella] + PickupDragons = [Dragons.GalaBeastCiella], } ), numSummonsSinceLastFiveStar: 0 @@ -195,7 +195,7 @@ public void GetUnitRates_Gala_AddsLimitedUnits() [ new UnitRate(Charas.GalaZena, 0.005m), new UnitRate(Charas.GalaRanzal, 0.005m), - new UnitRate(Dragons.GalaBeastCiella, 0.008m) + new UnitRate(Dragons.GalaBeastCiella, 0.008m), ] ); @@ -250,9 +250,7 @@ public void GetUnitRates_DoesNotContainRestrictedCharas() { (IEnumerable PickupRates, IEnumerable NormalRates) rates = SummonOddsLogic.GetRates( - InitializeBanner( - new Banner() { Id = 1, PickupCharas = [Charas.BeauticianZardin], } - ), + InitializeBanner(new Banner() { Id = 1, PickupCharas = [Charas.BeauticianZardin] }), numSummonsSinceLastFiveStar: 0 ); @@ -361,7 +359,7 @@ public void GetUnitRates_DoesNotContainRestrictedCharas() Charas.Mona, Charas.SophiePersona, Charas.Joker, - Charas.Panther + Charas.Panther, ]; foreach (Charas c in unexpectedCharas) @@ -375,9 +373,7 @@ public void GetUnitRates_DoesNotContainRestrictedDragons() { (IEnumerable PickupRates, IEnumerable NormalRates) rates = SummonOddsLogic.GetRates( - InitializeBanner( - new Banner() { Id = 1, PickupCharas = [Charas.BeauticianZardin], } - ), + InitializeBanner(new Banner() { Id = 1, PickupCharas = [Charas.BeauticianZardin] }), numSummonsSinceLastFiveStar: 0 ); @@ -433,7 +429,7 @@ public void GetUnitRates_DoesNotContainRestrictedDragons() Dragons.MiniZodi, Dragons.MiniHildy, Dragons.MiniMercs, - Dragons.MiniJupi + Dragons.MiniJupi, ]; foreach (Dragons d in unexpectedDragons) @@ -447,7 +443,7 @@ public void GetUnitRates_LimitedUnit_AddsToPool() { (IEnumerable PickupRates, IEnumerable NormalRates) rates = SummonOddsLogic.GetRates( - InitializeBanner(new Banner() { Id = 1, LimitedCharas = [Charas.Joker], }), + InitializeBanner(new Banner() { Id = 1, LimitedCharas = [Charas.Joker] }), numSummonsSinceLastFiveStar: 0 ); @@ -530,7 +526,7 @@ public void GetUnitRates_FourStarPickup_Gala_ProducesExpectedRates() new UnitRate(Charas.KuHai, 0.035m), new UnitRate(Charas.GalaAudric, 0.005m), new UnitRate(Dragons.Roc, 0.035m), - new UnitRate(Dragons.GalaBahamut, 0.008m) + new UnitRate(Dragons.GalaBahamut, 0.008m), ] ); @@ -603,7 +599,7 @@ public void GetUnitRates_ThreeStarPickup_ProducesExpectedRates() pickupRates .Should() .BeEquivalentTo( - [new UnitRate(Charas.Joe, 0.04m), new UnitRate(Dragons.PallidImp, 0.04m),] + [new UnitRate(Charas.Joe, 0.04m), new UnitRate(Dragons.PallidImp, 0.04m)] ); combined.SumOfRatesForRarity(5).Should().BeApproximately(0.04m, AssertionPrecision); @@ -679,7 +675,7 @@ public void GetUnitRates_ThreeStarPickup_Gala_ProducesExpectedRates() new UnitRate(Charas.Joe, 0.04m), new UnitRate(Charas.GalaZethia, 0.005m), new UnitRate(Dragons.PallidImp, 0.04m), - new UnitRate(Dragons.GalaRebornJeanne, 0.008m) + new UnitRate(Dragons.GalaRebornJeanne, 0.008m), ] ); @@ -978,7 +974,7 @@ public void GetGuaranteeUnitRates_FiveStarPickup_Gala_ProducesExpectedRates() .BeEquivalentTo( [ new UnitRate(Charas.GalaLeif, 0.005m), - new UnitRate(Dragons.GalaRebornAgni, 0.008m) + new UnitRate(Dragons.GalaRebornAgni, 0.008m), ] ); @@ -1094,7 +1090,7 @@ public void GetGuaranteeUnitRates_FourStarPickup_Gala_ProducesExpectedRates() new UnitRate(Charas.KuHai, 0.205625m), new UnitRate(Charas.GalaCleo, 0.005m), new UnitRate(Dragons.Roc, 0.205625m), - new UnitRate(Dragons.GalaChronosNyx, 0.008m) + new UnitRate(Dragons.GalaChronosNyx, 0.008m), ] ); @@ -1204,7 +1200,7 @@ public void GetGuaranteeUnitRates_ThreeStarPickup_Gala_ProducesExpectedRates() .BeEquivalentTo( [ new UnitRate(Charas.GalaZethia, 0.005m), - new UnitRate(Dragons.GalaRebornJeanne, 0.008m) + new UnitRate(Dragons.GalaRebornJeanne, 0.008m), ] ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Summon/UnitServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Summon/UnitServiceTest.cs index 19e10fb10..f5f1e8f78 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Summon/UnitServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Summon/UnitServiceTest.cs @@ -108,7 +108,7 @@ await this new List() { MasterAsset.CharaStories[(int)Charas.Addis].StoryIds[0], - MasterAsset.CharaStories[(int)Charas.Aeleen].StoryIds[0] + MasterAsset.CharaStories[(int)Charas.Aeleen].StoryIds[0], } ); } @@ -140,7 +140,7 @@ await this.fixture.AddRangeToDatabase( StoryType = StoryTypes.Chara, StoryId = catherineStoryId, State = 0, - } + }, ] ); @@ -214,7 +214,7 @@ await this.fixture.AddRangeToDatabase( this.fixture.ApiContext.PlayerDragonReliability.Should() .ContainEquivalentOf( - new DbPlayerDragonReliability() { ViewerId = ViewerId, DragonId = Dragons.Agni, }, + new DbPlayerDragonReliability() { ViewerId = ViewerId, DragonId = Dragons.Agni }, opts => opts.Including(x => x.ViewerId).Including(x => x.DragonId) ); } @@ -245,7 +245,7 @@ await this Dragons.KonohanaSakuya, Dragons.KonohanaSakuya, Dragons.Michael, - Dragons.Michael + Dragons.Michael, } ); @@ -256,6 +256,6 @@ await this .ToListAsync() ) .Should() - .Contain(new List() { Dragons.KonohanaSakuya, Dragons.Michael, }); + .Contain(new List() { Dragons.KonohanaSakuya, Dragons.Michael }); } } diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/TimeAttack/PartyInfoValidatorTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/TimeAttack/PartyInfoValidatorTest.cs index 7a33351ab..c543fe778 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/TimeAttack/PartyInfoValidatorTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/TimeAttack/PartyInfoValidatorTest.cs @@ -34,8 +34,8 @@ public void InvalidPartyData_DuplicateCharacters_ReturnsFail() PartyUnitList = new List() { new() { CharaData = new() { CharaId = Charas.GalaGatov } }, - new() { CharaData = new() { CharaId = Charas.GalaGatov } } - } + new() { CharaData = new() { CharaId = Charas.GalaGatov } }, + }, } ); @@ -55,9 +55,9 @@ public void InvalidPartyData_DuplicateSharedSkills_ReturnsFail() { CharaData = new() { CharaId = Charas.GalaGatov }, EditSkill1CharaData = new() { CharaId = Charas.ShaWujing }, - EditSkill2CharaData = new() { CharaId = Charas.ShaWujing } - } - } + EditSkill2CharaData = new() { CharaId = Charas.ShaWujing }, + }, + }, } ); @@ -79,8 +79,8 @@ public void InvalidPartyData_InvalidDragonReliability_ReturnsFail() { CharaData = new() { CharaId = Charas.GalaGatov }, DragonReliabilityLevel = 31, - } - } + }, + }, } ); @@ -105,10 +105,10 @@ public void InvalidPartyData_DuplicateCrests_ReturnsFail() }, CrestSlotType2CrestList = new List() { - new() { AbilityCrestId = AbilityCrestId.CastleCheerCorps } - } - } - } + new() { AbilityCrestId = AbilityCrestId.CastleCheerCorps }, + }, + }, + }, } ); @@ -126,8 +126,8 @@ public void InvalidPartyData_InvalidCharaId_ReturnsFail() { PartyUnitList = new List() { - new() { CharaData = new() { CharaId = (Charas)1234, }, } - } + new() { CharaData = new() { CharaId = (Charas)1234 } }, + }, } ); @@ -152,10 +152,10 @@ public void InvalidPartyData_InvalidCharaAugmentCount_ReturnsFail() { CharaId = Charas.GalaGatov, AttackPlusCount = 101, - HpPlusCount = 101 + HpPlusCount = 101, }, - } - } + }, + }, } ); @@ -172,8 +172,8 @@ public void InvalidPartyData_CharaElementLockViolation_ReturnsFail() { PartyUnitList = new List() { - new() { CharaData = new() { CharaId = Charas.SummerIeyasu }, } - } + new() { CharaData = new() { CharaId = Charas.SummerIeyasu } }, + }, } ); @@ -191,8 +191,8 @@ public void InvalidPartyData_InvalidDragonId_ReturnsFail() { PartyUnitList = new List() { - new() { DragonData = new() { DragonId = (Dragons)1234, }, } - } + new() { DragonData = new() { DragonId = (Dragons)1234 } }, + }, } ); @@ -217,10 +217,10 @@ public void InvalidPartyData_InvalidDragonAugmentCount_ReturnsFail() { DragonId = Dragons.GalaRebornAgni, AttackPlusCount = 101, - HpPlusCount = 101 + HpPlusCount = 101, }, - } - } + }, + }, } ); @@ -237,8 +237,8 @@ public void InvalidPartyData_DragonElementLockViolation_ReturnsFail() { PartyUnitList = new List() { - new() { DragonData = new() { DragonId = Dragons.SummerMarishiten }, } - } + new() { DragonData = new() { DragonId = Dragons.SummerMarishiten } }, + }, } ); @@ -260,10 +260,10 @@ public void InvalidPartyData_InvalidCrestId_ReturnsFail() { CrestSlotType1CrestList = new List() { - new() { AbilityCrestId = (AbilityCrestId)1234 } + new() { AbilityCrestId = (AbilityCrestId)1234 }, }, - } - } + }, + }, } ); @@ -283,10 +283,10 @@ public void InvalidPartyData_InvalidCrestAugments_ReturnsFail() { CrestSlotType1CrestList = new List() { - new() { AttackPlusCount = 101, HpPlusCount = 101 } + new() { AttackPlusCount = 101, HpPlusCount = 101 }, }, - } - } + }, + }, } ); @@ -303,8 +303,8 @@ public void InvalidPartyData_InvalidWeaponId_ReturnsFail() { PartyUnitList = new List() { - new() { WeaponBodyData = new() { WeaponBodyId = (WeaponBodies)1234 } } - } + new() { WeaponBodyData = new() { WeaponBodyId = (WeaponBodies)1234 } }, + }, } ); @@ -326,10 +326,10 @@ public void InvalidPartyData_InvalidTalismanStats_ReturnsFail() { TalismanId = Talismans.GalaLuca, AdditionalAttack = 101, - AdditionalHp = 101 - } - } - } + AdditionalHp = 101, + }, + }, + }, } ); @@ -346,8 +346,8 @@ public void InvalidPartyData_InvalidTalismanId_ReturnsFail() { PartyUnitList = new List() { - new() { TalismanData = new() { TalismanId = (Talismans)1234, } } - } + new() { TalismanData = new() { TalismanId = (Talismans)1234 } }, + }, } ); @@ -369,10 +369,10 @@ public void InvalidPartyData_InvalidTalismanAbility_ReturnsFail() { TalismanId = Talismans.GalaLuca, TalismanAbilityId1 = 330000569, - TalismanAbilityId2 = 3004 - } - } - } + TalismanAbilityId2 = 3004, + }, + }, + }, } ); @@ -395,10 +395,10 @@ public void InvalidPartyData_DuplicateTalismanAbility_ReturnsFail() { TalismanId = Talismans.GalaLuca, TalismanAbilityId1 = 340000029, - TalismanAbilityId2 = 340000029 - } - } - } + TalismanAbilityId2 = 340000029, + }, + }, + }, } ); @@ -424,9 +424,9 @@ public void InvalidPartyData_ThirdTalismanAbility_ReturnsFail() TalismanAbilityId1 = 340000029, TalismanAbilityId2 = 340000077, TalismanAbilityId3 = 340000118, - } - } - } + }, + }, + }, } ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/TimeAttack/TimeAttackRepositoryTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/TimeAttack/TimeAttackRepositoryTest.cs index cc67be064..5e55affd4 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/TimeAttack/TimeAttackRepositoryTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/TimeAttack/TimeAttackRepositoryTest.cs @@ -34,9 +34,9 @@ public async Task CreateOrUpdateClear_CreatesNew() { GameId = gameId, ViewerId = 1, - PartyInfo = "{}" - } - } + PartyInfo = "{}", + }, + }, }; await this.timeAttackRepository.CreateOrUpdateClear(clear); @@ -61,9 +61,9 @@ await this.timeAttackRepository.CreateOrUpdateClear( { GameId = gameId, ViewerId = 2, - PartyInfo = "{}" - } - } + PartyInfo = "{}", + }, + }, } ); @@ -80,9 +80,9 @@ await this.timeAttackRepository.CreateOrUpdateClear( { GameId = gameId, ViewerId = 3, - PartyInfo = "{}" - } - } + PartyInfo = "{}", + }, + }, } ); @@ -98,14 +98,14 @@ await this.timeAttackRepository.CreateOrUpdateClear( { GameId = gameId, ViewerId = 2, - PartyInfo = "{}" + PartyInfo = "{}", }, new() { GameId = gameId, ViewerId = 3, - PartyInfo = "{}" - } + PartyInfo = "{}", + }, }, opts => opts.Excluding(x => x.Clear).Excluding(x => x.Player) ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Tutorial/TutorialServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Tutorial/TutorialServiceTest.cs index 41eb511f4..21a30c633 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Tutorial/TutorialServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Tutorial/TutorialServiceTest.cs @@ -5,6 +5,7 @@ using DragaliaAPI.Features.Tutorial; using DragaliaAPI.Features.Wall; using Microsoft.Extensions.Logging; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; namespace DragaliaAPI.Test.Features.Tutorial; @@ -46,7 +47,7 @@ public async Task UpdateTutorialStatus_UpdatesTutorialStatus() .Returns( new List { - new() { ViewerId = 1, TutorialStatus = 1 } + new() { ViewerId = 1, TutorialStatus = 1 }, } .AsQueryable() .BuildMock() @@ -64,7 +65,7 @@ public async Task UpdateTutorialStatus_LowerStatus_DoesNotUpdateTutorialStatus() .Returns( new List { - new() { ViewerId = 1, TutorialStatus = 99999 } + new() { ViewerId = 1, TutorialStatus = 99999 }, } .AsQueryable() .BuildMock() @@ -82,7 +83,7 @@ public async Task UpdateTutorialStatus_DojoStatus_AddsDojos() .Returns( new List { - new() { ViewerId = 1, TutorialStatus = 1 } + new() { ViewerId = 1, TutorialStatus = 1 }, } .AsQueryable() .BuildMock() diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallControllerTest.cs index 01d32fa3a..1eb4d9c22 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallControllerTest.cs @@ -53,7 +53,7 @@ public async Task GetMonthlyReward_ReturnsReward() QuestGroupId = questGroupId, SumWallLevel = totalLevel, LastRewardDate = lastRewardDate, - RewardStatus = rewardStatus + RewardStatus = rewardStatus, }; mockWallService.Setup(x => x.CheckWallInitialized()).ReturnsAsync(true); @@ -82,18 +82,18 @@ public async Task ReceiveMonthlyReward_ReturnsRewards() QuestGroupId = questGroupId, SumWallLevel = totalLevel, LastRewardDate = lastRewardDate, - RewardStatus = rewardStatus + RewardStatus = rewardStatus, }; AtgenMonthlyWallReceiveList monthlyWallReceiveList = new() { QuestGroupId = WallService.WallQuestGroupId, - IsReceiveReward = RewardStatus.Received + IsReceiveReward = RewardStatus.Received, }; IEnumerable monthlyWallReceiveListList = new[] { - monthlyWallReceiveList + monthlyWallReceiveList, }; List buildEventRewardEntityList = @@ -103,14 +103,14 @@ public async Task ReceiveMonthlyReward_ReturnsRewards() { EntityType = EntityTypes.Mana, EntityId = 0, - EntityQuantity = 2500 + EntityQuantity = 2500, }, new AtgenBuildEventRewardEntityList() { EntityType = EntityTypes.Rupies, EntityId = 0, - EntityQuantity = 10000 - } + EntityQuantity = 10000, + }, }; DateTimeOffset lastClaimDate = DateTimeOffset.UtcNow.AddDays(-62); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallRecordControllerTest.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallRecordControllerTest.cs index cabb3d5ea..d9787bcc5 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallRecordControllerTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallRecordControllerTest.cs @@ -63,7 +63,7 @@ public async Task Record_ReturnsData() Party = party, WallId = wallId, WallLevel = wallLevel + 1, // Client passes (db wall level + 1) - SupportViewerId = supportViewerId + SupportViewerId = supportViewerId, }; DbPlayerQuestWall playerQuestWall = @@ -72,7 +72,7 @@ public async Task Record_ReturnsData() ViewerId = 1, IsStartNextLevel = true, WallId = wallId, - WallLevel = wallLevel + WallLevel = wallLevel, }; this.mockDungeonService.Setup(x => x.GetSession(dungeonKey, CancellationToken.None)) @@ -121,7 +121,7 @@ await wallRecordController.Record( { WallId = wallId, AfterWallLevel = wallLevel + 1, - BeforeWallLevel = wallLevel + BeforeWallLevel = wallLevel, }; AtgenWallDropReward dataWallDropReward = @@ -129,15 +129,15 @@ await wallRecordController.Record( { RewardEntityList = new[] { - WallRecordController.GoldCrystals.ToBuildEventRewardEntityList() + WallRecordController.GoldCrystals.ToBuildEventRewardEntityList(), }, TakeCoin = WallRecordController.Rupies.Quantity, - TakeMana = WallRecordController.Mana.Quantity + TakeMana = WallRecordController.Mana.Quantity, }; IEnumerable dataWallClearRewardList = new[] { - WallRecordController.Wyrmites.ToBuildEventRewardEntityList() + WallRecordController.Wyrmites.ToBuildEventRewardEntityList(), }; data.PlayWallDetail.Should().BeEquivalentTo(dataPlayWallDetail); diff --git a/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallTimeProviderExtensionsTests.cs b/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallTimeProviderExtensionsTests.cs index 73319c659..f09c64021 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallTimeProviderExtensionsTests.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Features/Wall/WallTimeProviderExtensionsTests.cs @@ -30,7 +30,7 @@ public class WallTimeProviderExtensionsTests { DateTimeOffset.Parse("2024-05-15T06:00:00Z"), DateTimeOffset.Parse("2024-05-15T06:00:00Z") - } + }, }; [Theory] diff --git a/DragaliaAPI/DragaliaAPI.Test/Helpers/BaasRequestHelperTest.cs b/DragaliaAPI/DragaliaAPI.Test/Helpers/BaasRequestHelperTest.cs index c13e2f5d2..ce7b62949 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Helpers/BaasRequestHelperTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Helpers/BaasRequestHelperTest.cs @@ -75,7 +75,7 @@ public async Task GetKeys_Success_ReturnsSecurityKey() ] } """ - ) + ), } ); @@ -124,7 +124,7 @@ public async Task GetKeys_Fail_Throws() ItExpr.IsAny() ) .ReturnsAsync( - new HttpResponseMessage() { StatusCode = System.Net.HttpStatusCode.NotFound, } + new HttpResponseMessage() { StatusCode = System.Net.HttpStatusCode.NotFound } ); await this @@ -155,7 +155,7 @@ public async Task GetSavefile_Success_ReturnsSavefile() new HttpResponseMessage() { StatusCode = System.Net.HttpStatusCode.OK, - Content = new StringContent(sampleSaveJson) + Content = new StringContent(sampleSaveJson), } ); @@ -181,7 +181,7 @@ public async Task GetSavefile_Fail_Throws() ItExpr.IsAny() ) .ReturnsAsync( - new HttpResponseMessage() { StatusCode = System.Net.HttpStatusCode.BadRequest, } + new HttpResponseMessage() { StatusCode = System.Net.HttpStatusCode.BadRequest } ); await this diff --git a/DragaliaAPI/DragaliaAPI.Test/Services/AuthServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Services/AuthServiceTest.cs index 6f380b2dc..e7c6b130e 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Services/AuthServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Services/AuthServiceTest.cs @@ -17,6 +17,7 @@ using Microsoft.Extensions.Options; using Microsoft.Extensions.Time.Testing; using Microsoft.IdentityModel.Tokens; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; namespace DragaliaAPI.Test.Services; @@ -93,7 +94,7 @@ public async Task DoAuth_LegacyAuthEnabled_UsesLegacyAuth() ); this.mockUserDataRepository.SetupGet(x => x.UserData) .Returns( - new List() { new() { ViewerId = 1, } } + new List() { new() { ViewerId = 1 } } .AsQueryable() .BuildMock() ); @@ -119,7 +120,7 @@ public async Task DoAuth_ValidToken_ReturnsViewerId() { AccountId = AccountId, ViewerId = ViewerId, - UserData = new() { Name = "Euden", } + UserData = new() { Name = "Euden" }, } ); this.apiContext.SaveChanges(); @@ -213,8 +214,8 @@ public async Task DoAuth_SavefileUploaded_IsNewer_ImportsSave() UserData = new() { Name = "Euden", - LastSaveImportTime = fixedTime - TimeSpan.FromSeconds(15) - } + LastSaveImportTime = fixedTime - TimeSpan.FromSeconds(15), + }, } ); this.apiContext.SaveChanges(); @@ -235,7 +236,7 @@ public async Task DoAuth_SavefileUploaded_IsNewer_ImportsSave() new() { UserData = new() { Name = "Euden 2" }, - FortBonusList = null! + FortBonusList = null!, }; this.mockLoginOptions.Setup(x => x.CurrentValue) @@ -275,8 +276,8 @@ public async Task DoAuth_SavefileUploaded_IsNewer_SaveInvalid_HandlesException() UserData = new() { Name = "Euden", - LastSaveImportTime = fixedTime - TimeSpan.FromSeconds(1) - } + LastSaveImportTime = fixedTime - TimeSpan.FromSeconds(1), + }, } ); this.apiContext.SaveChanges(); @@ -297,7 +298,7 @@ public async Task DoAuth_SavefileUploaded_IsNewer_SaveInvalid_HandlesException() new() { UserData = new() { Name = "Euden 2" }, - FortBonusList = null! + FortBonusList = null!, }; this.mockLoginOptions.Setup(x => x.CurrentValue) @@ -337,7 +338,7 @@ public async Task DoAuth_SavefileUploaded_IsOlder_DoesNotImportSave() ViewerId = ViewerId, Name = "Euden", LastSaveImportTime = fixedTime - TimeSpan.FromMinutes(2), - } + }, } ); this.apiContext.SaveChanges(); @@ -389,7 +390,7 @@ public async Task DoAuth_NoSavefileUploaded_DoesNotImportSave() { Name = "Euden", LastSaveImportTime = fixedTime - TimeSpan.FromMinutes(2), - } + }, } ); this.apiContext.SaveChanges(); diff --git a/DragaliaAPI/DragaliaAPI.Test/Services/BonusServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Services/BonusServiceTest.cs index 00df8ddf6..a41dff398 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Services/BonusServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Services/BonusServiceTest.cs @@ -8,6 +8,7 @@ using DragaliaAPI.Shared.Definitions.Enums; using DragaliaAPI.Shared.Serialization; using Microsoft.Extensions.Logging; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; using static DragaliaAPI.Test.Utils.IdentityTestUtils; @@ -63,7 +64,7 @@ public async Task GetBonusList_ReturnsCorrectBonuses() { ViewerId = ViewerId, PlantId = x.PlantId, - Level = x.Level + Level = x.Level, }) .AsQueryable() .BuildMock() @@ -76,7 +77,7 @@ public async Task GetBonusList_ReturnsCorrectBonuses() { ViewerId = ViewerId, WeaponBodyId = x.WeaponBodyId, - FortPassiveCharaWeaponBuildupCount = x.FortPassiveCharaWeaponBuildupCount + FortPassiveCharaWeaponBuildupCount = x.FortPassiveCharaWeaponBuildupCount, }) .AsQueryable() .BuildMock() @@ -107,7 +108,7 @@ public async Task GetEventBoost_ReturnsExpectedResult() ViewerId = ViewerId, PlantId = FortPlants.ArctosMonument, Level = 10, - } + }, } .AsQueryable() .BuildMock() @@ -119,7 +120,7 @@ public async Task GetEventBoost_ReturnsExpectedResult() new AtgenEventBoost() { EventEffect = EventEffectTypes.EventDamageBoost, - EffectValue = 50 + EffectValue = 50, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Test/Services/DeviceAccountServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Services/DeviceAccountServiceTest.cs index fcbc8e4a2..7975dbd35 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Services/DeviceAccountServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Services/DeviceAccountServiceTest.cs @@ -27,7 +27,7 @@ public DeviceAccountServiceTest() this.mockSavefileService = new(MockBehavior.Strict); this.mockPlayerIdentityService = new(MockBehavior.Strict); - Dictionary inMemoryConfiguration = new() { { "HashSalt", "dragalia" }, }; + Dictionary inMemoryConfiguration = new() { { "HashSalt", "dragalia" } }; IConfiguration configuration = new ConfigurationBuilder() .AddInMemoryCollection(inMemoryConfiguration) diff --git a/DragaliaAPI/DragaliaAPI.Test/Services/DragonServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Services/DragonServiceTest.cs index 6a4c644a1..839f93f86 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Services/DragonServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Services/DragonServiceTest.cs @@ -13,6 +13,7 @@ using DragaliaAPI.Shared.MasterAsset; using DragaliaAPI.Test.Utils; using Microsoft.Extensions.Time.Testing; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; namespace DragaliaAPI.Test.Services; @@ -100,7 +101,7 @@ await this.AddRangeToDatabase( ViewerId = 1, DragonGiftId = DragonGifts.CompellingBook, Quantity = 1, - } + }, } ); @@ -165,8 +166,8 @@ await dragonService.DoDragonBuyGiftToSendMultiple( DragonGiftIdList = new List() { DragonGifts.StrawberryTart, - DragonGifts.CompellingBook - } + DragonGifts.CompellingBook, + }, }, default ); @@ -225,7 +226,7 @@ await dragonService.DoDragonBuyGiftToSendMultiple( new DragonBuyGiftToSendMultipleRequest() { DragonId = Dragons.Garuda, - DragonGiftIdList = new List() { DragonGifts.FreshBread } + DragonGiftIdList = new List() { DragonGifts.FreshBread }, }, default ); @@ -287,7 +288,7 @@ out List stories { DragonId = dragon, DragonGiftId = gift, - Quantity = usedQuantity + Quantity = usedQuantity, }, default ); @@ -321,7 +322,7 @@ public async Task DoBuildup_AddsAugments() { ViewerId = ViewerId, MaterialId = Materials.AmplifyingDragonscale, - Quantity = 100 + Quantity = 100, }; mockInventoryRepository .SetupGet(x => x.Materials) @@ -341,9 +342,9 @@ await dragonService.DoBuildup( { Type = EntityTypes.Material, Id = (int)Materials.AmplifyingDragonscale, - Quantity = 50 - } - } + Quantity = 50, + }, + }, }, default ); @@ -385,7 +386,7 @@ byte expectedLvl { ViewerId = ViewerId, MaterialId = upgradeMat, - Quantity = usedQuantity + Quantity = usedQuantity, }; mockInventoryRepository .SetupGet(x => x.Materials) @@ -405,9 +406,9 @@ await dragonService.DoBuildup( { Type = EntityTypes.Material, Id = (int)upgradeMat, - Quantity = usedQuantity - } - } + Quantity = usedQuantity, + }, + }, }, default ); @@ -437,7 +438,7 @@ public async Task DoDragonResetPlusCount_ResetsPlusCount() { ViewerId = ViewerId, MaterialId = Materials.AmplifyingDragonscale, - Quantity = 0 + Quantity = 0, }; mockPaymentService @@ -471,7 +472,7 @@ await dragonService.DoDragonResetPlusCount( new DragonResetPlusCountRequest() { DragonKeyId = 1, - PlusCountType = PlusCountType.Atk + PlusCountType = PlusCountType.Atk, }, default ); @@ -512,7 +513,7 @@ byte expectedS1Level List dragonDataList = new List() { dragonData, - dragonDataSacrifice + dragonDataSacrifice, }; mockUnitRepository @@ -526,7 +527,7 @@ byte expectedS1Level { ViewerId = ViewerId, MaterialId = targetMat, - Quantity = 500 + Quantity = 500, }; mockInventoryRepository.Setup(x => x.GetMaterial(targetMat)).ReturnsAsync(mat); @@ -541,9 +542,9 @@ await dragonService.DoDragonLimitBreak( { LimitBreakItemType = (int)lbMatType, LimitBreakCount = limitBreakNr, - TargetId = (ulong)(lbMatType == DragonLimitBreakMatTypes.Dupe ? 2 : 0) - } - } + TargetId = (ulong)(lbMatType == DragonLimitBreakMatTypes.Dupe ? 2 : 0), + }, + }, }, default ); @@ -596,7 +597,7 @@ public async Task DoDragonSell_AddsCoinAndDew() { ViewerId = ViewerId, Coin = 0, - DewPoint = 0 + DewPoint = 0, }; IQueryable userDataList = new List() { userData } @@ -647,7 +648,7 @@ out List stories { ViewerId = ViewerId, DragonGiftId = gift, - Quantity = quantity + Quantity = quantity, } ); } @@ -658,7 +659,7 @@ out List stories { ViewerId = ViewerId, MaterialId = Materials.GarudasEssence, - Quantity = 0 + Quantity = 0, }; mockInventoryRepository @@ -694,7 +695,7 @@ out List stories ViewerId = ViewerId, State = 0, StoryId = MasterAsset.DragonStories.Get((int)Dragons.Garuda).StoryIds[0], - StoryType = StoryTypes.Dragon + StoryType = StoryTypes.Dragon, } ); } diff --git a/DragaliaAPI/DragaliaAPI.Test/Services/HelperServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Services/HelperServiceTest.cs index e4bc51d1a..3d4d1a689 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Services/HelperServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Services/HelperServiceTest.cs @@ -126,13 +126,13 @@ private static class StubData SupportUserList = new List() { TestData.SupportListEuden, - TestData.SupportListElisanne + TestData.SupportListElisanne, }, SupportUserDetailList = new List() { new() { ViewerId = 1000, IsFriend = true }, - new() { ViewerId = 1001, IsFriend = false } - } + new() { ViewerId = 1001, IsFriend = false }, + }, }; } } diff --git a/DragaliaAPI/DragaliaAPI.Test/Services/StoryServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Services/StoryServiceTest.cs index cd76a847d..b1f734d81 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Services/StoryServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Services/StoryServiceTest.cs @@ -16,6 +16,7 @@ using DragaliaAPI.Shared.Definitions.Enums; using DragaliaAPI.Shared.PlayerDetails; using Microsoft.Extensions.Logging; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; namespace DragaliaAPI.Test.Services; @@ -126,8 +127,8 @@ public async Task CheckUnitStoryEligibility_Eligible_ReturnsTrue() ViewerId = 1, StoryId = 110013012, State = StoryState.Read, - StoryType = StoryTypes.Chara - } + StoryType = StoryTypes.Chara, + }, } .AsQueryable() .BuildMock() @@ -158,7 +159,7 @@ int expectedWyrmite .BeEquivalentTo( new List() { - new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = expectedWyrmite } + new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = expectedWyrmite }, } ); @@ -214,8 +215,8 @@ int expectedEmblemId { EntityType = EntityTypes.Title, EntityId = expectedEmblemId, - EntityQuantity = 1 - } + EntityQuantity = 1, + }, } ); @@ -264,7 +265,7 @@ public async Task ReadQuestStory_DragonReward_ReceivesReward() EntityType = EntityTypes.Dragon, EntityId = (int)Dragons.Brunhilda, EntityQuantity = 1, - } + }, } ); @@ -328,7 +329,7 @@ public async Task ReadCastleStory_Unread_ReturnsExpectedReward() .BeEquivalentTo( new List() { - new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = 50 } + new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = 50 }, } ); @@ -362,7 +363,7 @@ public async Task ReadQuestStory_FortBuildReward_ReceivesReward() EntityType = EntityTypes.FortPlant, EntityId = (int)FortPlants.WindDracolith, EntityQuantity = 1, - } + }, } ); @@ -403,7 +404,7 @@ public async Task ReadQuestStory_EventGuestUnlocked_GrantsCharacterReward() EntityType = EntityTypes.Chara, EntityId = (int)Charas.Audric, EntityQuantity = 1, - } + }, } ); @@ -433,7 +434,7 @@ public UnitStoryTheoryData() ViewerId = 1, StoryId = 100004012, StoryType = StoryTypes.Chara, - State = StoryState.Unlocked + State = StoryState.Unlocked, }, 10 ); @@ -444,7 +445,7 @@ public UnitStoryTheoryData() ViewerId = 1, StoryId = 210143011, StoryType = StoryTypes.Dragon, - State = StoryState.Unlocked + State = StoryState.Unlocked, }, 25 ); @@ -455,7 +456,7 @@ public UnitStoryTheoryData() ViewerId = 1, StoryId = 210143011, StoryType = StoryTypes.Dragon, - State = StoryState.Unlocked + State = StoryState.Unlocked, }, 25 ); @@ -466,7 +467,7 @@ public UnitStoryTheoryData() ViewerId = 1, StoryId = 210143012, StoryType = StoryTypes.Dragon, - State = StoryState.Unlocked + State = StoryState.Unlocked, }, 25 ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Services/UpdateDataServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Services/UpdateDataServiceTest.cs index c709fdf1d..a0dd0673a 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Services/UpdateDataServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Services/UpdateDataServiceTest.cs @@ -81,8 +81,8 @@ public async Task SaveChangesAsync_PopulatesAll() PartyNo = 1, Units = new List() { - new() { CharaId = Charas.GalaAlex, UnitNo = 1 } - } + new() { CharaId = Charas.GalaAlex, UnitNo = 1 }, + }, }; DbPlayerStoryState questStoryState = @@ -91,7 +91,7 @@ public async Task SaveChangesAsync_PopulatesAll() ViewerId = viewerId, State = StoryState.Read, StoryId = 2, - StoryType = StoryTypes.Quest + StoryType = StoryTypes.Quest, }; DbPlayerStoryState charaStoryState = new() @@ -124,7 +124,7 @@ public async Task SaveChangesAsync_PopulatesAll() { ViewerId = viewerId, MaterialId = Materials.AlmightyOnesMaskFragment, - Quantity = 10 + Quantity = 10, }; DbQuest questData = @@ -135,7 +135,7 @@ public async Task SaveChangesAsync_PopulatesAll() IsMissionClear1 = true, IsMissionClear2 = true, IsMissionClear3 = true, - State = 3 + State = 3, }; DbFortBuild buildData = @@ -150,7 +150,7 @@ public async Task SaveChangesAsync_PopulatesAll() IsNew = true, LastIncomeDate = DateTimeOffset.FromUnixTimeSeconds(5), BuildStartDate = DateTimeOffset.FromUnixTimeSeconds(10), - BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(15) + BuildEndDate = DateTimeOffset.FromUnixTimeSeconds(15), }; this.ApiContext.AddRange( @@ -167,7 +167,7 @@ public async Task SaveChangesAsync_PopulatesAll() dragonStoryState, materialData, questData, - buildData + buildData, } ); @@ -220,7 +220,7 @@ public async Task SaveChangesAsync_RetrievesIdentityColumns() { new DbPlayerDragonData(ViewerId, Dragons.Arsene), new DbPlayerDragonData(ViewerId, Dragons.GalaBeastVolk), - new DbPlayerDragonData(ViewerId, Dragons.HighZodiark) + new DbPlayerDragonData(ViewerId, Dragons.HighZodiark), } ); diff --git a/DragaliaAPI/DragaliaAPI.Test/Services/WeaponServiceTest.cs b/DragaliaAPI/DragaliaAPI.Test/Services/WeaponServiceTest.cs index adf946d0c..ea188c726 100644 --- a/DragaliaAPI/DragaliaAPI.Test/Services/WeaponServiceTest.cs +++ b/DragaliaAPI/DragaliaAPI.Test/Services/WeaponServiceTest.cs @@ -27,7 +27,7 @@ public class WeaponServiceTest { Materials.OldCloth, 30 }, { Materials.FloatingYellowCloth, 7 }, { Materials.UnearthlyLantern, 1 }, - { Materials.BlazeOrb, 8 } + { Materials.BlazeOrb, 8 }, }; private static Dictionary MjolnirBuildup40Map = @@ -39,7 +39,7 @@ public class WeaponServiceTest { Materials.PrimalShadowwyrmsSphere, 8 }, { Materials.PrimalShadowwyrmsGreatsphere, 5 }, { Materials.PrimalShadowwyrmsAmethyst, 7 }, - { Materials.Orichalcum, 1 } + { Materials.Orichalcum, 1 }, }; private static Dictionary PrimalHexWeaponBonusMap = @@ -48,7 +48,7 @@ public class WeaponServiceTest { Materials.PrimalShadowwyrmsSphere, 25 }, { Materials.PrimalShadowwyrmsGreatsphere, 25 }, { Materials.PrimalShadowwyrmsAmethyst, 14 }, - { Materials.Orichalcum, 15 } + { Materials.Orichalcum, 15 }, }; private static Dictionary AmeNoMurakumoRefineMap = @@ -58,7 +58,7 @@ public class WeaponServiceTest { Materials.LiberatedOnesMaskFragment, 30 }, { Materials.RebelliousOnesCruelty, 10 }, { Materials.RebelliousButterfliesSearingFire, 10 }, - { Materials.Orichalcum, 10 } + { Materials.Orichalcum, 10 }, }; private readonly WeaponService weaponService; @@ -306,7 +306,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Passive, BuildupPieceNo = 4000, - Step = 1 + Step = 1, } ) ).Should().Be(ResultCode.WeaponBodyBuildupPieceUnablePiece); @@ -333,7 +333,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Passive, BuildupPieceNo = 1, - Step = 1 + Step = 1, } ) ).Should().Be(ResultCode.CommonMaterialShort); @@ -363,7 +363,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Passive, BuildupPieceNo = 1, - Step = 1 + Step = 1, } ) ).Should().Be(ResultCode.CommonMaterialShort); @@ -387,7 +387,7 @@ public async Task TryBuildup_Passive_NotEnoughLimitBreaks_ReturnsError() .ReturnsAsync(true); this.mockUserDataRepository.Setup(x => x.CheckCoin(80_000)).ReturnsAsync(true); this.mockWeaponRepository.Setup(x => x.FindAsync(WeaponBodies.InfernoApogee)) - .ReturnsAsync(new DbWeaponBody() { ViewerId = 1, LimitBreakCount = 0, }); + .ReturnsAsync(new DbWeaponBody() { ViewerId = 1, LimitBreakCount = 0 }); ( await this.weaponService.TryBuildup( @@ -396,7 +396,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Passive, BuildupPieceNo = 1, - Step = 1 + Step = 1, } ) ).Should().Be(ResultCode.WeaponBodyBuildupPieceShortLimitBreakCount); @@ -426,7 +426,7 @@ public async Task TryBuildup_Passive_Success_ReturnsSuccess() { ViewerId = 1, LimitBreakCount = 8, - WeaponBodyId = WeaponBodies.InfernoApogee + WeaponBodyId = WeaponBodies.InfernoApogee, } ); this.mockWeaponRepository.Setup(x => @@ -454,7 +454,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Passive, BuildupPieceNo = 1, - Step = 1 + Step = 1, } ) ).Should().Be(ResultCode.Success); @@ -480,7 +480,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Stats, BuildupPieceNo = 1, - Step = 222 + Step = 222, } ) ).Should().Be(ResultCode.WeaponBodyBuildupPieceUnablePiece); @@ -510,7 +510,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Stats, BuildupPieceNo = 1, - Step = 40 + Step = 40, } ) ).Should().Be(ResultCode.CommonMaterialShort); @@ -542,7 +542,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Stats, BuildupPieceNo = 1, - Step = 40 + Step = 40, } ) ).Should().Be(ResultCode.WeaponBodyBuildupPieceStepError); @@ -582,7 +582,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Stats, BuildupPieceNo = 1, - Step = 40 + Step = 40, } ) ).Should().Be(ResultCode.Success); @@ -605,7 +605,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Unbind, BuildupPieceNo = 1, - Step = 4000 + Step = 4000, } ) ).Should().Be(ResultCode.WeaponBodyBuildupPieceUnablePiece); @@ -632,7 +632,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Unbind, BuildupPieceNo = 1, - Step = 5 + Step = 5, } ) ).Should().Be(ResultCode.CommonMaterialShort); @@ -662,7 +662,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Unbind, BuildupPieceNo = 1, - Step = 5 + Step = 5, } ) ).Should().Be(ResultCode.CommonMaterialShort); @@ -686,7 +686,7 @@ public async Task TryBuildup_Generic_NotEnoughLimitBreaks_ReturnsError() .ReturnsAsync(true); this.mockUserDataRepository.Setup(x => x.CheckCoin(5_000_000)).ReturnsAsync(true); this.mockWeaponRepository.Setup(x => x.FindAsync(WeaponBodies.PrimalHex)) - .ReturnsAsync(new DbWeaponBody() { ViewerId = 1, LimitBreakCount = 0, }); + .ReturnsAsync(new DbWeaponBody() { ViewerId = 1, LimitBreakCount = 0 }); ( await this.weaponService.TryBuildup( @@ -695,7 +695,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.WeaponBonus, BuildupPieceNo = 1, - Step = 1 + Step = 1, } ) ).Should().Be(ResultCode.WeaponBodyBuildupPieceShortLimitBreakCount); @@ -731,7 +731,7 @@ int step { ViewerId = 1, WeaponBodyId = WeaponBodies.PrimalHex, - LimitBreakCount = 8 + LimitBreakCount = 8, }; Type type = mockEntity.GetType(); PropertyInfo prop = type.GetProperty(propName)!; @@ -747,7 +747,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = pieceType, BuildupPieceNo = 1, - Step = step + Step = step, } ) ).Should().Be(ResultCode.WeaponBodyBuildupPieceStepError); @@ -777,7 +777,7 @@ public async Task TryBuildup_Generic_Success_ReturnsSuccess() { ViewerId = 1, LimitBreakCount = 4, - WeaponBodyId = WeaponBodies.PrimalHex + WeaponBodyId = WeaponBodies.PrimalHex, } ); this.mockInventoryRepository.Setup(x => @@ -798,7 +798,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = BuildupPieceTypes.Unbind, BuildupPieceNo = 1, - Step = 5 + Step = 5, } ) ).Should().Be(ResultCode.Success); @@ -833,7 +833,7 @@ Materials expectedMaterial { ViewerId = 1, LimitBreakCount = 2, - WeaponBodyId = id + WeaponBodyId = id, }; this.mockWeaponRepository.Setup(x => x.FindAsync(id)).ReturnsAsync(mockEntity); @@ -855,7 +855,7 @@ await this.weaponService.TryBuildup( BuildupPieceType = BuildupPieceTypes.Unbind, BuildupPieceNo = 1, Step = 3, - IsUseDedicatedMaterial = true + IsUseDedicatedMaterial = true, } ) ).Should().Be(ResultCode.Success); @@ -905,7 +905,7 @@ int step ViewerId = 1, LimitBreakCount = 8, LimitOverCount = 1, - WeaponBodyId = WeaponBodies.PrimalHex + WeaponBodyId = WeaponBodies.PrimalHex, }; Type type = mockEntity.GetType(); PropertyInfo prop = type.GetProperty(propName)!; @@ -928,7 +928,7 @@ await this.weaponService.TryBuildup( { BuildupPieceType = pieceType, BuildupPieceNo = 1, - Step = step + Step = step, } ) ).Should().Be(ResultCode.Success); @@ -961,7 +961,7 @@ public async Task TryBuildup_Generic_Success_RewardsWeaponSkin() ViewerId = 1, LimitBreakCount = 8, LimitOverCount = 1, - WeaponBodyId = WeaponBodies.AmenoMurakumo + WeaponBodyId = WeaponBodies.AmenoMurakumo, } ); this.mockInventoryRepository.Setup(x => @@ -995,7 +995,7 @@ await this.weaponService.TryBuildup( BuildupPieceType = BuildupPieceTypes.Refine, BuildupPieceNo = 1, Step = 2, - IsUseDedicatedMaterial = true + IsUseDedicatedMaterial = true, } ) ).Should().Be(ResultCode.Success); diff --git a/DragaliaAPI/DragaliaAPI.Test/TestData.cs b/DragaliaAPI/DragaliaAPI.Test/TestData.cs index e17bea1b3..393897730 100644 --- a/DragaliaAPI/DragaliaAPI.Test/TestData.cs +++ b/DragaliaAPI/DragaliaAPI.Test/TestData.cs @@ -31,7 +31,7 @@ public static class TestData ExAbility2Level = 1, Skill1Level = 1, Skill2Level = 0, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { DragonId = Dragons.Midgardsormr }, SupportWeaponBody = new() { WeaponBodyId = WeaponBodies.SoldiersBrand }, @@ -52,7 +52,7 @@ public static class TestData new() { AbilityCrestId = 0 }, new() { AbilityCrestId = 0 }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }; public static readonly UserSupportList SupportListElisanne = @@ -81,11 +81,11 @@ public static class TestData ExAbility2Level = 1, Skill1Level = 1, Skill2Level = 0, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, - SupportDragon = new() { DragonKeyId = 0, }, - SupportWeaponBody = new() { WeaponBodyId = 0, }, - SupportTalisman = new() { TalismanKeyId = 0, }, + SupportDragon = new() { DragonKeyId = 0 }, + SupportWeaponBody = new() { WeaponBodyId = 0 }, + SupportTalisman = new() { TalismanKeyId = 0 }, SupportCrestSlotType1List = new List() { new() { AbilityCrestId = 0 }, @@ -102,6 +102,6 @@ public static class TestData new() { AbilityCrestId = 0 }, new() { AbilityCrestId = 0 }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }; } diff --git a/DragaliaAPI/DragaliaAPI.Test/UnitTestUtils.cs b/DragaliaAPI/DragaliaAPI.Test/UnitTestUtils.cs index a1ab90bbc..2a3845063 100644 --- a/DragaliaAPI/DragaliaAPI.Test/UnitTestUtils.cs +++ b/DragaliaAPI/DragaliaAPI.Test/UnitTestUtils.cs @@ -6,6 +6,7 @@ using DragaliaAPI.Shared.PlayerDetails; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using MockQueryable.EntityFrameworkCore; using MockQueryable.Moq; using Moq.Language.Flow; using Xunit.Abstractions; @@ -58,11 +59,11 @@ public static void SetupMockContext(this DragaliaControllerBase controller) new List() { new Claim(CustomClaimType.AccountId, AccountId), - new Claim(CustomClaimType.ViewerId, ViewerId.ToString()) + new Claim(CustomClaimType.ViewerId, ViewerId.ToString()), } ) - ) - } + ), + }, }; } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/CastleStoryController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/CastleStoryController.cs index 000675e56..0a2278aac 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/CastleStoryController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/CastleStoryController.cs @@ -47,7 +47,7 @@ CancellationToken cancellationToken new CastleStoryReadResponse() { CastleStoryRewardList = rewardList, - UpdateDataList = updateDataList + UpdateDataList = updateDataList, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/DragonController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/DragonController.cs index 0075280b9..a08799c26 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/DragonController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/DragonController.cs @@ -74,7 +74,7 @@ await dragonService.DoDragonBuyGiftToSendMultiple( new DragonBuyGiftToSendMultipleRequest() { DragonId = request.DragonId, - DragonGiftIdList = new List() { request.DragonGiftId } + DragonGiftIdList = new List() { request.DragonGiftId }, }, cancellationToken ); @@ -89,7 +89,7 @@ await dragonService.DoDragonBuyGiftToSendMultiple( .DragonGiftRewardList.First() .RewardReliabilityList, ShopGiftList = resultData.ShopGiftList, - UpdateDataList = resultData.UpdateDataList + UpdateDataList = resultData.UpdateDataList, } ); } @@ -116,7 +116,7 @@ CancellationToken cancellationToken { DragonId = request.DragonId, DragonGiftId = request.DragonGiftId, - Quantity = 1 + Quantity = 1, }, cancellationToken ); @@ -126,7 +126,7 @@ CancellationToken cancellationToken IsFavorite = resultData.IsFavorite, ReturnGiftList = resultData.ReturnGiftList, RewardReliabilityList = resultData.RewardReliabilityList, - UpdateDataList = resultData.UpdateDataList + UpdateDataList = resultData.UpdateDataList, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/EulaAgreeController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/EulaAgreeController.cs index 7401f412f..d2736e86b 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/EulaAgreeController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/EulaAgreeController.cs @@ -18,8 +18,8 @@ public DragaliaResult Agree(EulaAgreeAgreeRequest request) Region = request.Region, Lang = request.Lang, EulaVersion = request.EulaVersion, - PrivacyPolicyVersion = request.PrivacyPolicyVersion - } + PrivacyPolicyVersion = request.PrivacyPolicyVersion, + }, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/EulaController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/EulaController.cs index 378520c43..018efbbd9 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/EulaController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/EulaController.cs @@ -15,7 +15,7 @@ public class EulaController : DragaliaControllerBaseCore new("gb", "en_us", 1, 1), new("gb", "en_eu", 1, 1), new("us", "en_us", 1, 6), - new("us", "en_eu", 1, 6) + new("us", "en_eu", 1, 6), }; [HttpPost("get_version")] diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/FriendController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/FriendController.cs index 888a41cca..13d660103 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/FriendController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/FriendController.cs @@ -89,7 +89,7 @@ FriendGetSupportCharaDetailRequest request DragonReliabilityLevel = 30, IsFriend = helperDetail.IsFriend, ApplySendStatus = 0, - } + }, }; return Ok(response); @@ -101,7 +101,7 @@ public DragaliaResult FriendIndex() => { FriendCount = 0, EntityResult = new(), - UpdateDataList = new() + UpdateDataList = new(), }; [HttpPost("friend_list")] @@ -110,7 +110,7 @@ public DragaliaResult FriendList() => [HttpPost("auto_search")] public DragaliaResult AutoSearch() => - new FriendAutoSearchResponse() { Result = 1, SearchList = [], }; + new FriendAutoSearchResponse() { Result = 1, SearchList = [] }; [HttpPost("request_list")] public DragaliaResult RequestList() => @@ -122,7 +122,7 @@ public DragaliaResult ApplyList() => { Result = 1, NewApplyViewerIdList = [], - FriendApply = [] + FriendApply = [], }; [HttpPost("set_support_chara")] diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/MatchingController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/MatchingController.cs index f083bae31..a6ea0efea 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/MatchingController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/MatchingController.cs @@ -22,7 +22,7 @@ public async Task GetRoomList(MatchingGetRoomListRequest request return this.Ok( new MatchingGetRoomListResponse() { - RoomList = await this.matchingService.GetRoomList() + RoomList = await this.matchingService.GetRoomList(), } ); } @@ -50,7 +50,7 @@ MatchingGetRoomListByQuestIdRequest request return this.Ok( new MatchingGetRoomListByQuestIdResponse() { - RoomList = await this.matchingService.GetRoomList(request.QuestId) + RoomList = await this.matchingService.GetRoomList(request.QuestId), } ); } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/OptionController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/OptionController.cs index b4e62228a..cead1adbd 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/OptionController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/OptionController.cs @@ -21,7 +21,7 @@ private static class StubData IsAutoLockWeaponSr = false, IsAutoLockWeaponSsr = false, IsAutoLockWeaponSssr = false, - } + }, }; } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/ToolController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/ToolController.cs index b6efb6ef2..4fd3b60e2 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/ToolController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/ToolController.cs @@ -48,7 +48,7 @@ public async Task Auth([FromHeader(Name = "ID-TOKEN")] string id { SessionId = sessionId, ViewerId = (ulong)viewerId, - Nonce = "placeholder nonce" + Nonce = "placeholder nonce", } ); } @@ -63,7 +63,7 @@ public async Task Reauth([FromHeader(Name = "ID-TOKEN")] string { SessionId = sessionId, ViewerId = (ulong)viewerId, - Nonce = "placeholder nonce" + Nonce = "placeholder nonce", } ); } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/TransitionController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/TransitionController.cs index 331aacd11..232b4327f 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/TransitionController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/TransitionController.cs @@ -30,7 +30,7 @@ TransitionTransitionByNAccountRequest request { AbolishedViewerId = 0, LinkedViewerId = (ulong)viewerId, - } + }, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/UserController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/UserController.cs index 4c4bc4345..192a1b8fc 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/UserController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Dragalia/UserController.cs @@ -52,9 +52,9 @@ public DragaliaResult GetNAccountInfo() NAccountInfo = new() { Email = "placeholder@email.com", - Nickname = "placeholder nickname" + Nickname = "placeholder nickname", }, - UpdateDataList = new() + UpdateDataList = new(), } ); } diff --git a/DragaliaAPI/DragaliaAPI/Controllers/Nintendo/NintendoLoginController.cs b/DragaliaAPI/DragaliaAPI/Controllers/Nintendo/NintendoLoginController.cs index b70176bc1..95778ddaa 100644 --- a/DragaliaAPI/DragaliaAPI/Controllers/Nintendo/NintendoLoginController.cs +++ b/DragaliaAPI/DragaliaAPI/Controllers/Nintendo/NintendoLoginController.cs @@ -82,7 +82,7 @@ public async Task> Post(LoginRequest request) LoginResponse response = new(token, deviceAccount, (int)reloginTime.TotalSeconds) { - createdDeviceAccount = createdDeviceAccount + createdDeviceAccount = createdDeviceAccount, }; return Ok(response); diff --git a/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestController.cs b/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestController.cs index 295733677..21c462367 100644 --- a/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestController.cs @@ -191,7 +191,7 @@ public async Task GetAbilityCrestSetList(CancellationToken cance return this.Ok( new AbilityCrestGetAbilityCrestSetListResponse() { - AbilityCrestSetList = abilityCrestSetList + AbilityCrestSetList = abilityCrestSetList, } ); } @@ -237,7 +237,7 @@ await this.abilityCrestRepository.AddOrUpdateSet( new DbAbilityCrestSet() { AbilityCrestSetNo = request.AbilityCrestSetNo, - AbilityCrestSetName = request.AbilityCrestSetName + AbilityCrestSetName = request.AbilityCrestSetName, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestRepository.cs b/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestRepository.cs index 0b2979d4b..3f7b9ab71 100644 --- a/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestRepository.cs @@ -50,7 +50,7 @@ public async Task Add( DbAbilityCrest entity = new DbAbilityCrest() { ViewerId = this.playerIdentityService.ViewerId, - AbilityCrestId = abilityCrestId + AbilityCrestId = abilityCrestId, }; if (limitBreakCount is not null) diff --git a/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestService.cs b/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestService.cs index 19959be9a..729d595d2 100644 --- a/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/AbilityCrests/AbilityCrestService.cs @@ -46,15 +46,15 @@ AtgenBuildupAbilityCrestPieceList buildup { ResultCode result = buildup.BuildupPieceType switch { - BuildupPieceTypes.Unbind - or BuildupPieceTypes.Copies - => await this.TryBuildupGeneric(abilityCrest, buildup), + BuildupPieceTypes.Unbind or BuildupPieceTypes.Copies => await this.TryBuildupGeneric( + abilityCrest, + buildup + ), BuildupPieceTypes.Stats => await this.TryBuildupLevel(abilityCrest, buildup), - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - "Invalid buildip piece type" - ) + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + "Invalid buildip piece type" + ), }; if (result == ResultCode.Success) @@ -273,11 +273,10 @@ PlusCountType augmentType { PlusCountType.Hp => dbAbilityCrest.HpPlusCount, PlusCountType.Atk => dbAbilityCrest.AttackPlusCount, - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - "Invalid augment type" - ) + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + "Invalid augment type" + ), }; if (!await this.userDataRepository.CheckCoin(augmentTotal * 20_000)) @@ -290,7 +289,7 @@ PlusCountType augmentType { returnedAugments = new() { - { Materials.FortifyingGemstone, dbAbilityCrest.HpPlusCount } + { Materials.FortifyingGemstone, dbAbilityCrest.HpPlusCount }, }; dbAbilityCrest.HpPlusCount = 0; } @@ -298,7 +297,7 @@ PlusCountType augmentType { returnedAugments = new() { - { Materials.AmplifyingGemstone, dbAbilityCrest.AttackPlusCount } + { Materials.AmplifyingGemstone, dbAbilityCrest.AttackPlusCount }, }; dbAbilityCrest.AttackPlusCount = 0; } @@ -423,11 +422,10 @@ private static bool ValidateLevel(AbilityCrestRarity rarityInfo, int limitBreak, 2 => rarityInfo.MaxLimitLevelByLimitBreak2, 3 => rarityInfo.MaxLimitLevelByLimitBreak3, 4 => rarityInfo.MaxLimitLevelByLimitBreak4, - _ - => throw new DragaliaException( - ResultCode.AbilityCrestBuildupPieceUnablePiece, - "Limit break count invalid" - ) + _ => throw new DragaliaException( + ResultCode.AbilityCrestBuildupPieceUnablePiece, + "Limit break count invalid" + ), }; return step <= levelLimit; @@ -443,11 +441,10 @@ int amount { PlusCountType.Hp => rarityInfo.MaxHpPlusCount, PlusCountType.Atk => rarityInfo.MaxAtkPlusCount, - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - "Invalid augment type" - ) + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + "Invalid augment type" + ), }; return amount <= augmentLimit; diff --git a/DragaliaAPI/DragaliaAPI/Features/Album/AlbumController.cs b/DragaliaAPI/DragaliaAPI/Features/Album/AlbumController.cs index 37e561ef2..8a969a798 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Album/AlbumController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Album/AlbumController.cs @@ -17,7 +17,7 @@ public DragaliaResult Index() AlbumQuestPlayRecordList = Enumerable.Empty(), CharaHonorList = Enumerable.Empty(), AlbumPassiveUpdateResult = new(), - UpdateDataList = new() + UpdateDataList = new(), }; return this.Ok(stubResponse); diff --git a/DragaliaAPI/DragaliaAPI/Features/Chara/CharaController.cs b/DragaliaAPI/DragaliaAPI/Features/Chara/CharaController.cs index 0b06a7396..8e91c59f2 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Chara/CharaController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Chara/CharaController.cs @@ -379,7 +379,7 @@ public async Task GetCharaUnitSet(CharaGetCharaUnitSetRequest re resp.CharaUnitSetList = setUnitData.Select(x => new CharaUnitSetList { CharaId = x.Key, - CharaUnitSetDetailList = x.Value.Select(ToAtgenCharaUnitSetDetailList) + CharaUnitSetDetailList = x.Value.Select(ToAtgenCharaUnitSetDetailList), }); return Ok(resp); @@ -429,7 +429,7 @@ await unitRepository.GetCharaSetData(request.CharaId, request.UnitSetNo) CharaId = request.CharaId, CharaUnitSetDetailList = unitRepository .GetCharaSets(request.CharaId) - .Select(ToAtgenCharaUnitSetDetailList) + .Select(ToAtgenCharaUnitSetDetailList), }; resp.UpdateDataList = await updateDataService.SaveChangesAsync(cancellationToken); @@ -558,7 +558,7 @@ private async Task CharaManaNodeUnlock( charaData.PlusHp2, charaData.PlusHp3, charaData.PlusHp4, - charaData.PlusHp5 + charaData.PlusHp5, }; int[] atkPerCircleTotals = @@ -568,7 +568,7 @@ private async Task CharaManaNodeUnlock( charaData.PlusAtk2, charaData.PlusAtk3, charaData.PlusAtk4, - charaData.PlusAtk5 + charaData.PlusAtk5, }; SortedSet nodes = playerCharData.ManaCirclePieceIdList; @@ -832,7 +832,7 @@ private static AtgenCharaUnitSetDetailList ToAtgenCharaUnitSetDetailList(DbSetUn CrestSlotType2CrestId2 = unit.EquipCrestSlotType2CrestId2, CrestSlotType3CrestId1 = unit.EquipCrestSlotType3CrestId1, CrestSlotType3CrestId2 = unit.EquipCrestSlotType3CrestId2, - TalismanKeyId = unit.EquipTalismanKeyId + TalismanKeyId = unit.EquipTalismanKeyId, }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Dmode/DmodeRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Dmode/DmodeRepository.cs index 22572d005..cd17e0a59 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dmode/DmodeRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dmode/DmodeRepository.cs @@ -73,7 +73,7 @@ public void InitializeForPlayer() public DbPlayerDmodeChara AddChara(Charas charaId) { DbPlayerDmodeChara dmodeChara = - new() { ViewerId = playerIdentityService.ViewerId, CharaId = charaId, }; + new() { ViewerId = playerIdentityService.ViewerId, CharaId = charaId }; return apiContext.PlayerDmodeCharas.Add(dmodeChara).Entity; } @@ -89,7 +89,7 @@ public DbPlayerDmodeServitorPassive AddServitorPassive( { ViewerId = playerIdentityService.ViewerId, PassiveId = passiveId, - Level = level + Level = level, } ) .Entity; diff --git a/DragaliaAPI/DragaliaAPI/Features/Dmode/DmodeService.cs b/DragaliaAPI/DragaliaAPI/Features/Dmode/DmodeService.cs index 289a2aa22..0acdf4fdb 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dmode/DmodeService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dmode/DmodeService.cs @@ -283,7 +283,7 @@ DmodeIngameResult IngameResult expedition.CharaId1, expedition.CharaId2, expedition.CharaId3, - expedition.CharaId4 + expedition.CharaId4, }; List talismans = new(); diff --git a/DragaliaAPI/DragaliaAPI/Features/DmodeDungeon/DmodeDungeonService.cs b/DragaliaAPI/DragaliaAPI/Features/DmodeDungeon/DmodeDungeonService.cs index cdd5610dd..317534671 100644 --- a/DragaliaAPI/DragaliaAPI/Features/DmodeDungeon/DmodeDungeonService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/DmodeDungeon/DmodeDungeonService.cs @@ -189,7 +189,7 @@ bool isGameOver { < 50 => rdm.Next(1, 3), < 60 => rdm.Next(3, 5), - _ => 6 + _ => 6, }; for (int i = 0; i < talismanAmount; i++) @@ -240,7 +240,7 @@ await rewardService.GrantTalisman( { FloorNum = floorNum, IsRecordFloorNum = floorNum > await dmodeRepository.GetTotalMaxFloorAsync(), - CharaIdList = new List { ingameData.UnitData.CharaId, }, + CharaIdList = new List { ingameData.UnitData.CharaId }, QuestTime = floorData.DmodeAreaInfo.QuestTime, IsViewQuestTime = ingameData.StartFloorNum == 1, DmodeScore = floorData.DmodeAreaInfo.DmodeScore, @@ -251,7 +251,7 @@ await rewardService.GrantTalisman( Math.Ceiling(floorData.DmodeUnitInfo.TakeDmodePoint2 * pointMultiplier2), TakePlayerExp = 0, PlayerLevelUpFstone = 0, - ClearState = isGameOver ? 0 : 1 + ClearState = isGameOver ? 0 : 1, }; DbPlayerDmodeChara chara = await dmodeRepository.Charas.SingleAsync(x => @@ -342,7 +342,7 @@ IEnumerable editSkillCharaIds IsViewAreaStartEquipment = ingameData.StartFloorNum != 1, // For the first floor of skip runs DmodeAreaInfo = null, DmodeUnitInfo = null, - DmodeDungeonOdds = null + DmodeDungeonOdds = null, }; DmodeQuestFloor floor = MasterAsset.DmodeQuestFloor[ingameData.StartFloorNum]; @@ -375,7 +375,7 @@ IEnumerable editSkillCharaIds SkillBagItemNoSortList = new int[8], DmodeHoldDragonList = Enumerable.Empty(), TakeDmodePoint1 = 0, - TakeDmodePoint2 = 0 + TakeDmodePoint2 = 0, }; floorData.DmodeDungeonOdds = GenerateOddsInfo( @@ -607,7 +607,7 @@ AtgenDmodeDungeonItemOptionList optionChange in playRecord.DmodeDungeonItemOptio IsViewAreaStartEquipment = false, // This can never be true as it only applies to the first floor after skipping DmodeAreaInfo = areaInfo, DmodeUnitInfo = unitInfo, - DmodeDungeonOdds = odds + DmodeDungeonOdds = odds, }; return floorData; @@ -676,7 +676,7 @@ Charas charaId > 93 => 4, > 85 => 3, > 75 => 2, - _ => 1 + _ => 1, }; rarity = ClampRarityByFloor(dmodeAreaInfo.FloorNum, rarity); @@ -704,7 +704,7 @@ Charas charaId > 93 when remainingPool >= 2 => 4, > 85 when remainingPool >= 2 => 3, > 75 when remainingPool >= 2 => 2, - _ => 1 + _ => 1, }; rarity = ClampRarityByFloor(dmodeAreaInfo.FloorNum, rarity); @@ -958,7 +958,7 @@ private static List GenerateDrops( 1 => 1, < 5 => 2, 5 => 3, - _ => 1 + _ => 1, }; } @@ -1097,11 +1097,15 @@ int GenerateEnemyLevel(int enemyParam) return paramData.DmodeEnemyLevelType switch { DmodeEnemyLevelType.None => 1, - DmodeEnemyLevelType.Enemy - => rdm.Next(baseEnemyLevel + plusMin, baseEnemyLevel + plusMax + 1), - DmodeEnemyLevelType.BossEnemy - => rdm.Next(baseBossLevel + plusMin, baseBossLevel + plusMax + 1), - _ => 1 + DmodeEnemyLevelType.Enemy => rdm.Next( + baseEnemyLevel + plusMin, + baseEnemyLevel + plusMax + 1 + ), + DmodeEnemyLevelType.BossEnemy => rdm.Next( + baseBossLevel + plusMin, + baseBossLevel + plusMax + 1 + ), + _ => 1, }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/DmodeDungeon/TalismanHelper.cs b/DragaliaAPI/DragaliaAPI/Features/DmodeDungeon/TalismanHelper.cs index 0535c177e..5fcc9a565 100644 --- a/DragaliaAPI/DragaliaAPI/Features/DmodeDungeon/TalismanHelper.cs +++ b/DragaliaAPI/DragaliaAPI/Features/DmodeDungeon/TalismanHelper.cs @@ -28,7 +28,11 @@ private static readonly (int StartId, int Amount)[] Ability1Pool = (100, 1), // Element + Weapon specific dragon damage (111, 7), // Dragon Haste (118, 2), // Element-specific dragon haste - (120, 1) // Element + Weapon specific dragon haste + ( + 120, + 1 + ) // Element + Weapon specific dragon haste + , }; private static readonly (int StartId, int Amount)[] Ability2Pool = @@ -54,7 +58,7 @@ private static readonly (int StartId, int Amount)[] Ability2Pool = (130, 1), // Element + Weapon specific dragon time (131, 4), // Tradeoffs (Steady|Easy|Lucky|Hasty) Hitter I (131, 4), - (131, 4) + (131, 4), }; private const int TalismanIdDifference = 40_000_000; diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/AutoRepeat/AutoRepeatService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/AutoRepeat/AutoRepeatService.cs index ceba889e0..48c4f7cdc 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/AutoRepeat/AutoRepeatService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/AutoRepeat/AutoRepeatService.cs @@ -23,7 +23,7 @@ ILogger logger { SlidingExpiration = TimeSpan.FromMinutes( options.CurrentValue.AutoRepeatExpiryTimeMinutes - ) + ), }; public async Task SetRepeatSetting(RepeatSetting repeatSetting) @@ -35,7 +35,7 @@ public async Task SetRepeatSetting(RepeatSetting repeatSetting) Type = repeatSetting.RepeatType, UseItemList = repeatSetting.UseItemList, MaxCount = repeatSetting.RepeatCount, - CurrentCount = 0 + CurrentCount = 0, }; logger.LogDebug("Saving auto-repeat setting: {@info}", info); diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/AutoRepeat/RepeatController.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/AutoRepeat/RepeatController.cs index d18a6aa8d..5be34cf04 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/AutoRepeat/RepeatController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/AutoRepeat/RepeatController.cs @@ -37,7 +37,7 @@ public async Task> End() NewGetEntityList = [], OverDiscardEntityList = [], OverPresentLimitEntityList = [], - OverPresentEntityList = [] + OverPresentEntityList = [], }, RepeatData = null, }; diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonController.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonController.cs index 255b515f7..b1fc4d500 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonController.cs @@ -72,7 +72,7 @@ CancellationToken cancellationToken WallId = 0, WallLevel = 0, IsHost = true, - } + }, }; logger.LogDebug("Session is multiplayer: {IsMulti}", session.IsMulti); diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonRepository.cs index acb5b47e5..57fb124f5 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonRepository.cs @@ -120,7 +120,7 @@ from skin in this { crests11, crests12, - crests13 + crests13, }, CrestSlotType2CrestList = new List() { crests21, crests22 }, CrestSlotType3CrestList = new List() { crests31, crests32 }, @@ -141,7 +141,7 @@ from skin in this charaEs2.Skill2Level ), TalismanData = talisman, - WeaponSkinData = skin + WeaponSkinData = skin, } ).AsNoTracking(); } @@ -248,7 +248,7 @@ from skin in this { crests11, crests12, - crests13 + crests13, }, CrestSlotType2CrestList = new List() { crests21, crests22 }, CrestSlotType3CrestList = new List() { crests31, crests32 }, @@ -269,7 +269,7 @@ from skin in this charaEs2.Skill2Level ), TalismanData = talisman, - WeaponSkinData = skin + WeaponSkinData = skin, } ).AsNoTracking(); } @@ -394,7 +394,7 @@ from skin in this { crests11, crests12, - crests13 + crests13, }, CrestSlotType2CrestList = new List() { crests21, crests22 }, CrestSlotType3CrestList = new List() { crests31, crests32 }, @@ -415,7 +415,7 @@ from skin in this charaEs2.Skill2Level ), TalismanData = talisman, - WeaponSkinData = skin + WeaponSkinData = skin, } ).AsNoTracking(); @@ -440,11 +440,10 @@ from skin in this { 1 => skill1Level, 2 => skill2Level, - _ - => throw new UnreachableException( - $"Invalid EditSkillLevelNum for character {charaId}" - ) - } + _ => throw new UnreachableException( + $"Invalid EditSkillLevelNum for character {charaId}" + ), + }, }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonService.cs index 39028b2fd..cc994ad0b 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/DungeonService.cs @@ -19,7 +19,7 @@ ILogger logger private DistributedCacheEntryOptions CacheOptions => new() { - SlidingExpiration = TimeSpan.FromMinutes(options.CurrentValue.DungeonExpiryTimeMinutes) + SlidingExpiration = TimeSpan.FromMinutes(options.CurrentValue.DungeonExpiryTimeMinutes), }; private static class Schema diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Extensions.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Extensions.cs index 1ccbbf1c9..00ef8b494 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Extensions.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Extensions.cs @@ -79,7 +79,7 @@ this IEnumerable source before_entity_id = x.BeforeEntityId, before_entity_type = x.BeforeEntityType, after_entity_id = x.AfterEntityId, - after_entity_type = x.AfterEntityType + after_entity_type = x.AfterEntityType, }) .Select(group => group.Aggregate( @@ -88,7 +88,7 @@ this IEnumerable source BeforeEntityId = group.Key.before_entity_id, BeforeEntityType = group.Key.before_entity_type, AfterEntityId = group.Key.after_entity_id, - AfterEntityType = group.Key.after_entity_type + AfterEntityType = group.Key.after_entity_type, }, (acc, current) => { @@ -101,10 +101,10 @@ this IEnumerable source private static IEnumerable Merge(this IEnumerable source) => source - .GroupBy(x => new { type = x.Type, id = x.Id, }) + .GroupBy(x => new { type = x.Type, id = x.Id }) .Select(group => group.Aggregate( - new AtgenDropAll { Id = group.Key.id, Type = group.Key.type, }, + new AtgenDropAll { Id = group.Key.id, Type = group.Key.type }, (acc, current) => { acc.Quantity += current.Quantity; diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/OddsInfoService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/OddsInfoService.cs index 8cd03f70d..6d74cce7a 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/OddsInfoService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/OddsInfoService.cs @@ -47,7 +47,7 @@ private static class StubData AreaIndex = 0, ReactionObjCount = 1, DropObj = new List() { }, - Grade = new List() + Grade = new List(), }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/QuestCompletionService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/QuestCompletionService.cs index fe087eaba..265159f72 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/QuestCompletionService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/QuestCompletionService.cs @@ -62,7 +62,7 @@ int Points if (!results.TryGetValue(questScoringEnemy.Id, out AtgenScoringEnemyPointList? value)) { - value = new() { ScoringEnemyId = questScoringEnemy.Id, }; + value = new() { ScoringEnemyId = questScoringEnemy.Id }; results.Add(questScoringEnemy.Id, value); } @@ -240,98 +240,99 @@ DungeonSession session { QuestCompleteType.None => false, QuestCompleteType.LimitFall => record.DownCount <= completionValue, - QuestCompleteType.DefeatAllEnemies - => record.TreasureRecord.All(x => - x.Enemy == null - || !session.EnemyList[x.AreaIdx].Select(y => y.EnemyIdx).Except(x.Enemy).Any() - ), // (Maybe)TODO + QuestCompleteType.DefeatAllEnemies => record.TreasureRecord.All(x => + x.Enemy == null + || !session.EnemyList[x.AreaIdx].Select(y => y.EnemyIdx).Except(x.Enemy).Any() + ), // (Maybe)TODO QuestCompleteType.MaxTeamSize => party.Count() <= completionValue, - QuestCompleteType.AdventurerElementRequired - => party.All(x => - MasterAsset.CharaData[x.CharaId].ElementalType == (UnitElement)completionValue - ), - QuestCompleteType.AdventurerElementNeeded - => party.Any(x => - MasterAsset.CharaData[x.CharaId].ElementalType == (UnitElement)completionValue - ), - QuestCompleteType.AdventurerElementLocked - => party.All(x => - MasterAsset.CharaData[x.CharaId].ElementalType != (UnitElement)completionValue - ), - QuestCompleteType.DragonElementRequired - => await IsDragonConditionMet(type, completionValue, party), - QuestCompleteType.DragonElementNeeded - => await IsDragonConditionMet(type, completionValue, party), - QuestCompleteType.DragonElementLocked - => await IsDragonConditionMet(type, completionValue, party), - QuestCompleteType.WeaponRequired - => party.All(x => x.EquipWeaponBodyId == (WeaponBodies)completionValue), + QuestCompleteType.AdventurerElementRequired => party.All(x => + MasterAsset.CharaData[x.CharaId].ElementalType == (UnitElement)completionValue + ), + QuestCompleteType.AdventurerElementNeeded => party.Any(x => + MasterAsset.CharaData[x.CharaId].ElementalType == (UnitElement)completionValue + ), + QuestCompleteType.AdventurerElementLocked => party.All(x => + MasterAsset.CharaData[x.CharaId].ElementalType != (UnitElement)completionValue + ), + QuestCompleteType.DragonElementRequired => await IsDragonConditionMet( + type, + completionValue, + party + ), + QuestCompleteType.DragonElementNeeded => await IsDragonConditionMet( + type, + completionValue, + party + ), + QuestCompleteType.DragonElementLocked => await IsDragonConditionMet( + type, + completionValue, + party + ), + QuestCompleteType.WeaponRequired => party.All(x => + x.EquipWeaponBodyId == (WeaponBodies)completionValue + ), QuestCompleteType.MaxTraps => record.TrapCount <= completionValue, QuestCompleteType.MaxAfflicted => record.BadStatus <= completionValue, - QuestCompleteType.TreasureChestCount - => record.TreasureRecord.Count() >= completionValue, + QuestCompleteType.TreasureChestCount => record.TreasureRecord.Count() + >= completionValue, QuestCompleteType.AllTreasureChestsOpened => true, // TODO QuestCompleteType.NoContinues => record.PlayContinueCount == 0, - QuestCompleteType.AdventurerRequired - => party.Any(x => x.CharaId == (Charas)completionValue), + QuestCompleteType.AdventurerRequired => party.Any(x => + x.CharaId == (Charas)completionValue + ), QuestCompleteType.AllEnemyParts => true, // TODO QuestCompleteType.MaxTime => record.Time < completionValue, QuestCompleteType.MaxDamageTimes => record.DamageCount <= completionValue, QuestCompleteType.MinShapeshift => record.DragonTransformCount >= completionValue, - QuestCompleteType.DefeatImperialCommander - => record.TreasureRecord.Any(x => - x.Enemy.Any(y => - y == 500200001 /* Imperial Commander */ - ) - ), - QuestCompleteType.DefeatMinBandits - => record.TreasureRecord.Sum(x => - x.Enemy.Count(y => - y == 500210001 /* Bandit */ - ) - ) >= completionValue, - QuestCompleteType.DefeatShadowKnight - => record.TreasureRecord.Any(x => - x.Enemy.Any(y => - y == 500170001 /* Shadow Knight */ - ) - ), + QuestCompleteType.DefeatImperialCommander => record.TreasureRecord.Any(x => + x.Enemy.Any(y => + y == 500200001 /* Imperial Commander */ + ) + ), + QuestCompleteType.DefeatMinBandits => record.TreasureRecord.Sum(x => + x.Enemy.Count(y => + y == 500210001 /* Bandit */ + ) + ) >= completionValue, + QuestCompleteType.DefeatShadowKnight => record.TreasureRecord.Any(x => + x.Enemy.Any(y => + y == 500170001 /* Shadow Knight */ + ) + ), QuestCompleteType.SaveMinHouses => record.VisitPrivateHouse >= completionValue, QuestCompleteType.MinGateHp => record.ProtectionDamage >= completionValue, QuestCompleteType.MinTimeRemaining => record.RemainingTime >= completionValue, - QuestCompleteType.MinDrawbridgesLowered - => record.LowerDrawbridgeCount >= completionValue, - QuestCompleteType.FireEmblemAdventurerNeeded - => party.Any(x => - x.CharaId - is Charas.Alfonse - or Charas.Veronica - or Charas.Fjorm - or Charas.Marth - or Charas.Sharena - or Charas.Peony - or Charas.Tiki - or Charas.Chrom - ), - QuestCompleteType.MinStarsAdventurerNeeded - => party.Any(x => MasterAsset.CharaData[x.CharaId].Rarity == completionValue), - QuestCompleteType.MinAdventurersWithSameWeapon - => party - .ToLookup(x => MasterAsset.CharaData[x.CharaId].WeaponType) - .Any(x => x.Count() >= completionValue), + QuestCompleteType.MinDrawbridgesLowered => record.LowerDrawbridgeCount + >= completionValue, + QuestCompleteType.FireEmblemAdventurerNeeded => party.Any(x => + x.CharaId + is Charas.Alfonse + or Charas.Veronica + or Charas.Fjorm + or Charas.Marth + or Charas.Sharena + or Charas.Peony + or Charas.Tiki + or Charas.Chrom + ), + QuestCompleteType.MinStarsAdventurerNeeded => party.Any(x => + MasterAsset.CharaData[x.CharaId].Rarity == completionValue + ), + QuestCompleteType.MinAdventurersWithSameWeapon => party + .ToLookup(x => MasterAsset.CharaData[x.CharaId].WeaponType) + .Any(x => x.Count() >= completionValue), QuestCompleteType.MaxShapeshift => record.DragonTransformCount <= completionValue, QuestCompleteType.NoRevives => record.RebornCount == 0, - QuestCompleteType.DefeatFormaChrom - => record.TreasureRecord.Any(x => - x.Enemy.Any(y => - y == 601500002 /* Forma Chrom */ - ) - ), - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - "Invalid QuestCompleteType" + QuestCompleteType.DefeatFormaChrom => record.TreasureRecord.Any(x => + x.Enemy.Any(y => + y == 601500002 /* Forma Chrom */ ) + ), + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + "Invalid QuestCompleteType" + ), }; } @@ -350,12 +351,15 @@ IEnumerable party return type switch { - QuestCompleteType.DragonElementRequired - => dragons.Any(x => MasterAsset.DragonData[x].ElementalType == (UnitElement)value), - QuestCompleteType.DragonElementNeeded - => dragons.All(x => MasterAsset.DragonData[x].ElementalType == (UnitElement)value), - QuestCompleteType.DragonElementLocked - => dragons.All(x => MasterAsset.DragonData[x].ElementalType != (UnitElement)value), + QuestCompleteType.DragonElementRequired => dragons.Any(x => + MasterAsset.DragonData[x].ElementalType == (UnitElement)value + ), + QuestCompleteType.DragonElementNeeded => dragons.All(x => + MasterAsset.DragonData[x].ElementalType == (UnitElement)value + ), + QuestCompleteType.DragonElementLocked => dragons.All(x => + MasterAsset.DragonData[x].ElementalType != (UnitElement)value + ), _ => throw new NotImplementedException(), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/QuestEnemyService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/QuestEnemyService.cs index 3fb42f386..a37d49e3a 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/QuestEnemyService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/QuestEnemyService.cs @@ -59,7 +59,7 @@ public IEnumerable BuildQuestEnemyList(int questId, int areaNum) { Coin = 0, Mana = 0, - DropList = new List() + DropList = new List(), } ); } @@ -74,7 +74,7 @@ public IEnumerable BuildQuestEnemyList(int questId, int areaNum) { Id = drop.Id, Type = drop.EntityType, - Quantity = 1 + Quantity = 1, } ); } @@ -208,7 +208,7 @@ private AtgenEnemy[] GetEnemyList(int questId, int areaNum) IsPop = true, IsRare = false, ParamId = x.Id, - EnemyDropList = [] + EnemyDropList = [], } ) .ToArray(); @@ -226,8 +226,8 @@ private static List GetWallEnemyList(int wallId, int wallLevel) IsPop = true, IsRare = false, ParamId = questWallDetail.BossEnemyParamId, - EnemyDropList = new List() - } + EnemyDropList = new List(), + }, }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordController.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordController.cs index f77d7a6ad..1e42f52bf 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordController.cs @@ -115,7 +115,7 @@ await dungeonRecordHelperService.ProcessHelperDataMulti( UpdateDataList updateDataList = await updateDataService.SaveChangesAsync(cancellationToken); DungeonRecordRecordMultiResponse response = - new() { IngameResultData = ingameResultData, UpdateDataList = updateDataList, }; + new() { IngameResultData = ingameResultData, UpdateDataList = updateDataList }; if (session.QuestData?.IsSumUpTotalDamage ?? false) { diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordDamageService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordDamageService.cs index 366ce6e71..6d4062535 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordDamageService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordDamageService.cs @@ -19,8 +19,8 @@ public Task GetEventDamageRanking(PlayRecord playRecord, int Rank = 0, DamageValue = playRecord?.TotalPlayDamage ?? 0, IsNew = false, - } - } + }, + }, }; return Task.FromResult(damageRanking); diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordHelperService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordHelperService.cs index ef42a5c8d..7f5d15b63 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordHelperService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordHelperService.cs @@ -42,7 +42,7 @@ IEnumerable HelperDetailList ViewerId = supportList.ViewerId, IsFriend = true, ApplySendStatus = 1, - GetManaPoint = 50 + GetManaPoint = 50, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordRewardService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordRewardService.cs index 6521bf449..950d8cbea 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordRewardService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordRewardService.cs @@ -38,7 +38,7 @@ IEnumerable FirstClearRewards { questData.IsMissionClear1, questData.IsMissionClear2, - questData.IsMissionClear3 + questData.IsMissionClear3, }; QuestMissionStatus status = await questCompletionService.CompleteQuestMissions( @@ -187,7 +187,7 @@ public AtgenFirstMeeting ProcessFirstMeetingRewards(IList connectingViewer EntityQuantity: quantity ) { - MessageParamValues = [connectingViewerIdList.Count] + MessageParamValues = [connectingViewerIdList.Count], } ); diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordService.cs index c28c5ad71..e99917db8 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Record/DungeonRecordService.cs @@ -132,11 +132,9 @@ DungeonSession session // Constant for quests with no stamina usage, wip? int experience = - session.QuestData.PayStaminaSingle != 0 - ? session.QuestData.PayStaminaSingle * 10 - : session.QuestData.PayStaminaMulti != 0 - ? session.QuestData.PayStaminaMulti * 100 - : 150; + session.QuestData.PayStaminaSingle != 0 ? session.QuestData.PayStaminaSingle * 10 + : session.QuestData.PayStaminaMulti != 0 ? session.QuestData.PayStaminaMulti * 100 + : 150; experience *= session.PlayCount; diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Skip/DungeonSkipController.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Skip/DungeonSkipController.cs index 7aeca2b9c..86dcf0325 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Skip/DungeonSkipController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Skip/DungeonSkipController.cs @@ -60,7 +60,7 @@ await partyRepository { IngameResultData = ingameData, UpdateDataList = updateDataList, - EntityResult = entityResult + EntityResult = entityResult, } ); } @@ -90,7 +90,7 @@ await paymentService.ProcessPayment( { IngameResultData = ingameData, UpdateDataList = updateDataList, - EntityResult = entityResult + EntityResult = entityResult, } ); } @@ -226,8 +226,10 @@ IEnumerable party AreaIdx = x.Key, Enemy = x.Value.Select(_ => 1), DropObj = new List(), // TODO - EnemySmash = new List() // TODO - }) + EnemySmash = + new List() // TODO + , + }), }; IngameResultData ingameResultData = await dungeonRecordService.GenerateIngameResultData( diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Start/DungeonStartController.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Start/DungeonStartController.cs index 4f6a5e882..6ce1f9da4 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Start/DungeonStartController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Start/DungeonStartController.cs @@ -219,7 +219,7 @@ await dungeonService.ModifySession( IngameData = ingameData, IngameQuestData = ingameQuestData, OddsInfo = oddsInfo, - UpdateDataList = updateData + UpdateDataList = updateData, }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Start/DungeonStartService.cs b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Start/DungeonStartService.cs index abe974fb7..aea6a515e 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Dungeon/Start/DungeonStartService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Dungeon/Start/DungeonStartService.cs @@ -96,7 +96,7 @@ await partyQuery.ToListAsync(), { QuestData = questInfo, Party = party.Where(x => x.CharaId != 0), - SupportViewerId = supportViewerId + SupportViewerId = supportViewerId, } ); @@ -157,7 +157,7 @@ await detailQuery.AsNoTracking().FirstOrDefaultAsync() { QuestData = questInfo, Party = party.Where(x => x.CharaId != 0), - SupportViewerId = supportViewerId + SupportViewerId = supportViewerId, } ); @@ -190,7 +190,7 @@ public async Task GetWallIngameData( Party = party.Where(x => x.CharaId != 0), WallId = wallId, WallLevel = wallLevel, - SupportViewerId = supportViewerId + SupportViewerId = supportViewerId, } ); @@ -229,7 +229,7 @@ await detailQuery.AsNoTracking().FirstOrDefaultAsync() Party = party.Where(x => x.CharaId != 0), WallId = wallId, WallLevel = wallLevel, - SupportViewerId = supportViewerId + SupportViewerId = supportViewerId, } ); diff --git a/DragaliaAPI/DragaliaAPI/Features/Emblem/EmblemRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Emblem/EmblemRepository.cs index a9d9ebb41..f360b0d88 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Emblem/EmblemRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Emblem/EmblemRepository.cs @@ -29,7 +29,7 @@ public DbEmblem AddEmblem(Emblems emblem) ViewerId = playerIdentityService.ViewerId, EmblemId = emblem, GetTime = dateTimeProvider.GetUtcNow(), - IsNew = true + IsNew = true, } ) .Entity; diff --git a/DragaliaAPI/DragaliaAPI/Features/Event/EventDataExtensions.cs b/DragaliaAPI/DragaliaAPI/Features/Event/EventDataExtensions.cs index 2a2629e2a..2944bd0e0 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Event/EventDataExtensions.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Event/EventDataExtensions.cs @@ -12,46 +12,36 @@ internal static class EventDataExtensions return data.EventKindType switch { - EventKindType.Build - => MasterAsset - .BuildEventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), - EventKindType.Raid - => MasterAsset - .RaidEventItem.Enumerable.Where(x => x.RaidEventId == eventId) - .Select(x => (x.Id, (int)x.RaidEventItemType)), - EventKindType.Combat - => MasterAsset - .CombatEventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), - EventKindType.BattleRoyal - => MasterAsset - .BattleRoyalEventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), - EventKindType.Clb01 - => MasterAsset - .Clb01EventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), - EventKindType.Collect - => MasterAsset - .CollectEventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), - EventKindType.Earn - => MasterAsset - .EarnEventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), - EventKindType.ExHunter - => MasterAsset - .ExHunterEventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), - EventKindType.ExRush - => MasterAsset - .ExRushEventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), - EventKindType.Simple - => MasterAsset - .SimpleEventItem.Enumerable.Where(x => x.EventId == eventId) - .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.Build => MasterAsset + .BuildEventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.Raid => MasterAsset + .RaidEventItem.Enumerable.Where(x => x.RaidEventId == eventId) + .Select(x => (x.Id, (int)x.RaidEventItemType)), + EventKindType.Combat => MasterAsset + .CombatEventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.BattleRoyal => MasterAsset + .BattleRoyalEventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.Clb01 => MasterAsset + .Clb01EventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.Collect => MasterAsset + .CollectEventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.Earn => MasterAsset + .EarnEventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.ExHunter => MasterAsset + .ExHunterEventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.ExRush => MasterAsset + .ExRushEventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), + EventKindType.Simple => MasterAsset + .SimpleEventItem.Enumerable.Where(x => x.EventId == eventId) + .Select(x => (x.Id, (int)x.EventItemType)), _ => [], }; } @@ -62,19 +52,16 @@ public static Dictionary GetEventRewards(this EventData data) return data.EventKindType switch { - EventKindType.Raid - or EventKindType.ExHunter - => MasterAsset - .RaidEventReward[eventId] - .Values.Cast() - .ToDictionary(x => x.Id, x => x), + EventKindType.Raid or EventKindType.ExHunter => MasterAsset + .RaidEventReward[eventId] + .Values.Cast() + .ToDictionary(x => x.Id, x => x), // BuildEventReward is the default - _ - => MasterAsset - .BuildEventReward[eventId] - .Values.Cast() - .ToDictionary(x => x.Id, x => x) + _ => MasterAsset + .BuildEventReward[eventId] + .Values.Cast() + .ToDictionary(x => x.Id, x => x), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Event/EventDropService.cs b/DragaliaAPI/DragaliaAPI/Features/Event/EventDropService.cs index 7e8ccc3dd..57428e675 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Event/EventDropService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Event/EventDropService.cs @@ -139,7 +139,7 @@ double buildDropMultiplier EventKindType.Simple => throw new NotImplementedException(), // Only item is 'Pup Grub' lol EventKindType.BattleRoyal => throw new NotImplementedException(), EventKindType.Earn => ProcessEarnEventDrops(quest, evt, record), - _ => throw new UnreachableException() + _ => throw new UnreachableException(), }; List dropList = new(); diff --git a/DragaliaAPI/DragaliaAPI/Features/Event/EventRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Event/EventRepository.cs index f80b575db..f3a8ecac7 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Event/EventRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Event/EventRepository.cs @@ -99,7 +99,7 @@ public DbPlayerEventData CreateEventData(int eventId, bool customEventFlag = fal { ViewerId = playerIdentityService.ViewerId, EventId = eventId, - CustomEventFlag = customEventFlag + CustomEventFlag = customEventFlag, } ) .Entity; @@ -113,7 +113,7 @@ public DbPlayerEventReward CreateEventReward(int eventId, int rewardId) { ViewerId = playerIdentityService.ViewerId, EventId = eventId, - RewardId = rewardId + RewardId = rewardId, } ) .Entity; @@ -136,7 +136,7 @@ public IEnumerable CreateEventItems( ViewerId = playerIdentityService.ViewerId, EventId = eventId, Id = itemId, - Type = itemType + Type = itemType, } ) .Entity @@ -164,7 +164,7 @@ IEnumerable passiveIds { ViewerId = playerIdentityService.ViewerId, EventId = eventId, - PassiveId = passiveId + PassiveId = passiveId, } ) .Entity diff --git a/DragaliaAPI/DragaliaAPI/Features/Event/RaidEventController.cs b/DragaliaAPI/DragaliaAPI/Features/Event/RaidEventController.cs index 979ac04f0..9ad2d255e 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Event/RaidEventController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Event/RaidEventController.cs @@ -32,7 +32,7 @@ public async Task GetEventData(RaidEventGetEventDataRequest requ ); resp.EventPassiveList = new List { - await eventService.GetEventPassiveList(request.RaidEventId) + await eventService.GetEventPassiveList(request.RaidEventId), }; if ( diff --git a/DragaliaAPI/DragaliaAPI/Features/Fort/FortController.cs b/DragaliaAPI/DragaliaAPI/Features/Fort/FortController.cs index 20b37a87a..b1f2e4011 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Fort/FortController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Fort/FortController.cs @@ -51,7 +51,7 @@ public async Task GetData(CancellationToken cancellationToken) ProductionSt = await this.fortService.GetStaminaProduction(), ProductionDf = await this.fortService.GetDragonfruitProduction(), FortDetail = fortDetail, - CurrentServerTime = DateTimeOffset.UtcNow + CurrentServerTime = DateTimeOffset.UtcNow, }; await updateDataService.SaveChangesAsync(cancellationToken); @@ -74,7 +74,7 @@ CancellationToken cancellationToken { Result = 1, FortDetail = await fortService.GetFortDetail(), - UpdateDataList = updateDataList + UpdateDataList = updateDataList, }; return Ok(data); } @@ -124,7 +124,7 @@ CancellationToken cancellationToken Result = 1, BuildId = cancelledBuild.BuildId, FortDetail = fortDetail, - UpdateDataList = updateDataList + UpdateDataList = updateDataList, }; return Ok(data); } @@ -182,7 +182,9 @@ CancellationToken cancellationToken RemainTime = build.RemainTime, FortDetail = fortDetail, UpdateDataList = updateDataList, - EntityResult = new EntityResult() // What does it do? + EntityResult = + new EntityResult() // What does it do? + , }; return Ok(data); } @@ -236,7 +238,7 @@ CancellationToken cancellationToken Result = 1, BuildId = cancelledBuild.BuildId, FortDetail = fortDetail, - UpdateDataList = updateDataList + UpdateDataList = updateDataList, }; return Ok(data); } @@ -294,7 +296,7 @@ CancellationToken cancellationToken RemainTime = build.BuildEndDate - build.BuildStartDate, FortDetail = fortDetail, UpdateDataList = updateDataList, - EntityResult = this.rewardService.GetEntityResult() + EntityResult = this.rewardService.GetEntityResult(), }; return Ok(data); } @@ -323,7 +325,7 @@ CancellationToken cancellationToken ProductionRp = await this.fortService.GetRupieProduction(), ProductionSt = await this.fortService.GetStaminaProduction(), ProductionDf = await this.fortService.GetDragonfruitProduction(), - UpdateDataList = updateDataList + UpdateDataList = updateDataList, }; return Ok(data); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Fort/FortRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Fort/FortRepository.cs index 17129cc43..a4b70ed2c 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Fort/FortRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Fort/FortRepository.cs @@ -44,7 +44,7 @@ await this.apiContext.PlayerFortDetails.AddAsync( new DbFortDetail() { ViewerId = this.playerIdentityService.ViewerId, - CarpenterNum = DefaultCarpenters + CarpenterNum = DefaultCarpenters, } ); } @@ -59,7 +59,7 @@ await apiContext.PlayerFortBuilds.AddAsync( PlantId = FortPlants.TheHalidom, PositionX = 16, // Default Halidom position PositionZ = 17, - LastIncomeDate = DateTimeOffset.UtcNow + LastIncomeDate = DateTimeOffset.UtcNow, } ); } @@ -79,7 +79,7 @@ await this.apiContext.PlayerFortBuilds.AddAsync( PlantId = FortPlants.Smithy, PositionX = 21, PositionZ = 3, - Level = 1 + Level = 1, } ); } @@ -97,7 +97,7 @@ public async Task AddDojos() FortPlants.LanceDojo, FortPlants.ManacasterDojo, FortPlants.StaffDojo, - FortPlants.WandDojo + FortPlants.WandDojo, }; this.logger.LogDebug("Granting dojos."); @@ -132,7 +132,7 @@ await this.apiContext.PlayerFortDetails.AddAsync( new() { ViewerId = this.playerIdentityService.ViewerId, - CarpenterNum = DefaultCarpenters + CarpenterNum = DefaultCarpenters, } ) ).Entity; @@ -227,7 +227,7 @@ await this.apiContext.PlayerFortBuilds.AddAsync( PositionZ = -1, BuildStartDate = DateTimeOffset.UnixEpoch, BuildEndDate = DateTimeOffset.UnixEpoch, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Fort/FortService.cs b/DragaliaAPI/DragaliaAPI/Features/Fort/FortService.cs index b7be4ef6f..c1c7c8044 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Fort/FortService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Fort/FortService.cs @@ -54,11 +54,10 @@ public async Task AddCarpenter(PaymentTypes paymentType) 2 => 250, 3 => 400, 4 => 700, - _ - => throw new DragaliaException( - ResultCode.FortExtendCarpenterLimit, - $"User has reached maximum carpenter." - ) + _ => throw new DragaliaException( + ResultCode.FortExtendCarpenterLimit, + $"User has reached maximum carpenter." + ), }; if (paymentType is not (PaymentTypes.Diamantium or PaymentTypes.Wyrmite)) @@ -237,7 +236,7 @@ public async Task GetFortDetail() { MaxCarpenterCount = MaximumCarpenterNum, WorkingCarpenterNum = activeCarpenters, - CarpenterNum = dbDetail.CarpenterNum + CarpenterNum = dbDetail.CarpenterNum, }; } @@ -389,7 +388,7 @@ public async Task BuildStart(FortPlants fortPlantId, int positionX, PositionX = positionX, PositionZ = positionZ, IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, }; await SetBuildTime(build, plantDetail); diff --git a/DragaliaAPI/DragaliaAPI/Features/Login/Actions/LoginGiftResetAction.cs b/DragaliaAPI/DragaliaAPI/Features/Login/Actions/LoginGiftResetAction.cs index 1c4bf37cc..a346253ce 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Login/Actions/LoginGiftResetAction.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Login/Actions/LoginGiftResetAction.cs @@ -57,7 +57,7 @@ public Task Apply() Materials.WindTome, Materials.WaterTome, Materials.ShadowTome, - Materials.LightTome + Materials.LightTome, }.Select(x => new Present.Present( PresentMessage.DragaliaLostTeamMessage, EntityTypes.Material, diff --git a/DragaliaAPI/DragaliaAPI/Features/Login/LoginService.cs b/DragaliaAPI/DragaliaAPI/Features/Login/LoginService.cs index 6ceafb434..e02114bbb 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Login/LoginService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Login/LoginService.cs @@ -146,7 +146,7 @@ public async Task> GetWallMonthlyReceiveList( { QuestGroupId = WallService.WallQuestGroupId, IsReceiveReward = wallRewardStatus, - } + }, ]; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Maintenance/MaintenanceController.cs b/DragaliaAPI/DragaliaAPI/Features/Maintenance/MaintenanceController.cs index 9f7a2b7de..5e66f2102 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Maintenance/MaintenanceController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Maintenance/MaintenanceController.cs @@ -21,7 +21,7 @@ public DragaliaResult GetText(MaintenanceGetTextRequ return new MaintenanceGetTextResponse() { - MaintenanceText = maintenanceService.GetMaintenanceText() + MaintenanceText = maintenanceService.GetMaintenanceText(), }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Missions/InitialProgress/MissionInitialProgressionService.cs b/DragaliaAPI/DragaliaAPI/Features/Missions/InitialProgress/MissionInitialProgressionService.cs index 177b4be21..d9ed68dc3 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Missions/InitialProgress/MissionInitialProgressionService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Missions/InitialProgress/MissionInitialProgressionService.cs @@ -80,117 +80,105 @@ public async Task GetInitialMissionProgress(DbPlayerMission mission) { currentAmount = progressionInfo.CompleteType switch { - MissionCompleteType.FortPlantLevelUp - => await fortDataService.GetMaxFortPlantLevel( - (FortPlants)progressionInfo.Parameter! - ), - MissionCompleteType.FortPlantBuilt - or MissionCompleteType.FortPlantPlaced - => await fortDataService.GetFortPlantCount( - (FortPlants)progressionInfo.Parameter! - ), + MissionCompleteType.FortPlantLevelUp => await fortDataService.GetMaxFortPlantLevel( + (FortPlants)progressionInfo.Parameter! + ), + MissionCompleteType.FortPlantBuilt or MissionCompleteType.FortPlantPlaced => + await fortDataService.GetFortPlantCount((FortPlants)progressionInfo.Parameter!), MissionCompleteType.FortLevelUp => await fortDataService.GetTotalFortLevel(), - MissionCompleteType.QuestCleared - => await this.GetQuestClearedCount( - progressionInfo.Parameter, - progressionInfo.Parameter2, - (QuestPlayModeTypes?)progressionInfo.Parameter3 - ), - MissionCompleteType.QuestStoryCleared - => await storyRepository.HasReadQuestStory(progressionInfo.Parameter!.Value) - ? 1 - : 0, - MissionCompleteType.EventGroupCleared - => await this.GetQuestGroupClearedCount( - progressionInfo.Parameter, - (VariationTypes?)progressionInfo.Parameter2, - (QuestPlayModeTypes?)progressionInfo.Parameter3 - ), - MissionCompleteType.WeaponEarned - => await this.GetWeaponEarnedCount( - (WeaponBodies?)progressionInfo.Parameter, - (UnitElement?)progressionInfo.Parameter2, - progressionInfo.Parameter3, - (WeaponSeries?)progressionInfo.Parameter4 - ), - MissionCompleteType.WeaponRefined - => await this.GetWeaponRefinedCount( - (WeaponBodies?)progressionInfo.Parameter, - (UnitElement?)progressionInfo.Parameter2, - progressionInfo.Parameter3, - (WeaponSeries?)progressionInfo.Parameter4 - ), - MissionCompleteType.AbilityCrestBuildupPlusCount - => await this.GetWyrmprintBuildupCount( + MissionCompleteType.QuestCleared => await this.GetQuestClearedCount( + progressionInfo.Parameter, + progressionInfo.Parameter2, + (QuestPlayModeTypes?)progressionInfo.Parameter3 + ), + MissionCompleteType.QuestStoryCleared => await storyRepository.HasReadQuestStory( + progressionInfo.Parameter!.Value + ) + ? 1 + : 0, + MissionCompleteType.EventGroupCleared => await this.GetQuestGroupClearedCount( + progressionInfo.Parameter, + (VariationTypes?)progressionInfo.Parameter2, + (QuestPlayModeTypes?)progressionInfo.Parameter3 + ), + MissionCompleteType.WeaponEarned => await this.GetWeaponEarnedCount( + (WeaponBodies?)progressionInfo.Parameter, + (UnitElement?)progressionInfo.Parameter2, + progressionInfo.Parameter3, + (WeaponSeries?)progressionInfo.Parameter4 + ), + MissionCompleteType.WeaponRefined => await this.GetWeaponRefinedCount( + (WeaponBodies?)progressionInfo.Parameter, + (UnitElement?)progressionInfo.Parameter2, + progressionInfo.Parameter3, + (WeaponSeries?)progressionInfo.Parameter4 + ), + MissionCompleteType.AbilityCrestBuildupPlusCount => + await this.GetWyrmprintBuildupCount( (AbilityCrestId?)progressionInfo.Parameter, (PlusCountType?)progressionInfo.Parameter2 ), - MissionCompleteType.CharacterBuildupPlusCount - => await this.GetCharacterBuildupCount( + MissionCompleteType.CharacterBuildupPlusCount => + await this.GetCharacterBuildupCount( (Charas?)progressionInfo.Parameter, (UnitElement?)progressionInfo.Parameter2, (PlusCountType?)progressionInfo.Parameter3 ), - MissionCompleteType.PlayerLevelUp - => (await userDataRepository.GetUserDataAsync()).Level, - MissionCompleteType.AbilityCrestTotalPlusCountUp - => ( - await abilityCrestRepository - .AbilityCrests.Where(x => - progressionInfo.Parameter == null - || x.AbilityCrestId == (AbilityCrestId)progressionInfo.Parameter - ) - .Select(x => new { x.AttackPlusCount, x.HpPlusCount }) - .ToListAsync() - ) - .Select(x => (int?)Math.Min(x.AttackPlusCount, x.HpPlusCount)) - .Max() ?? 0, - MissionCompleteType.AbilityCrestLevelUp - => ( - await abilityCrestRepository - .AbilityCrests.Where(x => - progressionInfo.Parameter == null - || x.AbilityCrestId == (AbilityCrestId)progressionInfo.Parameter - ) - .Select(x => (int?)x.BuildupCount) - .ToListAsync() - ).Sum() ?? 0, - MissionCompleteType.CharacterLevelUp - => await this.GetCharacterMaxLevel( - (Charas?)progressionInfo.Parameter, - (UnitElement?)progressionInfo.Parameter2 - ), - MissionCompleteType.CharacterManaNodeUnlock - => await this.GetCharacterManaNodeCount( - (Charas?)progressionInfo.Parameter, - (UnitElement?)progressionInfo.Parameter2 - ), - MissionCompleteType.DragonLevelUp - => await this.GetDragonMaxLevel( - (Dragons?)progressionInfo.Parameter, - (UnitElement?)progressionInfo.Parameter2 - ), - MissionCompleteType.TreasureTrade - => await this.GetTreasureTradeCount( - progressionInfo.Parameter, - (EntityTypes?)progressionInfo.Parameter2, - progressionInfo.Parameter3 - ), - MissionCompleteType.DragonBondLevelUp - => await this.GetDragonBondLevel( - (Dragons?)progressionInfo.Parameter, - (UnitElement?)progressionInfo.Parameter2 - ), - MissionCompleteType.PartyPowerReached - => await partyPowerRepository.GetMaxPartyPowerAsync(), + MissionCompleteType.PlayerLevelUp => ( + await userDataRepository.GetUserDataAsync() + ).Level, + MissionCompleteType.AbilityCrestTotalPlusCountUp => ( + await abilityCrestRepository + .AbilityCrests.Where(x => + progressionInfo.Parameter == null + || x.AbilityCrestId == (AbilityCrestId)progressionInfo.Parameter + ) + .Select(x => new { x.AttackPlusCount, x.HpPlusCount }) + .ToListAsync() + ) + .Select(x => (int?)Math.Min(x.AttackPlusCount, x.HpPlusCount)) + .Max() ?? 0, + MissionCompleteType.AbilityCrestLevelUp => ( + await abilityCrestRepository + .AbilityCrests.Where(x => + progressionInfo.Parameter == null + || x.AbilityCrestId == (AbilityCrestId)progressionInfo.Parameter + ) + .Select(x => (int?)x.BuildupCount) + .ToListAsync() + ).Sum() ?? 0, + MissionCompleteType.CharacterLevelUp => await this.GetCharacterMaxLevel( + (Charas?)progressionInfo.Parameter, + (UnitElement?)progressionInfo.Parameter2 + ), + MissionCompleteType.CharacterManaNodeUnlock => await this.GetCharacterManaNodeCount( + (Charas?)progressionInfo.Parameter, + (UnitElement?)progressionInfo.Parameter2 + ), + MissionCompleteType.DragonLevelUp => await this.GetDragonMaxLevel( + (Dragons?)progressionInfo.Parameter, + (UnitElement?)progressionInfo.Parameter2 + ), + MissionCompleteType.TreasureTrade => await this.GetTreasureTradeCount( + progressionInfo.Parameter, + (EntityTypes?)progressionInfo.Parameter2, + progressionInfo.Parameter3 + ), + MissionCompleteType.DragonBondLevelUp => await this.GetDragonBondLevel( + (Dragons?)progressionInfo.Parameter, + (UnitElement?)progressionInfo.Parameter2 + ), + MissionCompleteType.PartyPowerReached => + await partyPowerRepository.GetMaxPartyPowerAsync(), MissionCompleteType.DragonGiftSent => 0, // Unsure about this MissionCompleteType.ItemSummon => 0, // TODO: As daily quests also use this, should we make it actually count the item summons? MissionCompleteType.AccountLinked => 0, MissionCompleteType.PartyOptimized => 0, MissionCompleteType.AbilityCrestTradeViewed => 0, MissionCompleteType.GuildCheckInRewardClaimed => amountToComplete, // TODO - MissionCompleteType.EventParticipation - => await this.GetEventParticipationProgress(progressionInfo.Parameter), + MissionCompleteType.EventParticipation => await this.GetEventParticipationProgress( + progressionInfo.Parameter + ), MissionCompleteType.EventRegularBattleClear => 0, MissionCompleteType.EventQuestClearWithCrest => 0, MissionCompleteType.EventPointCollection => 0, @@ -200,10 +188,9 @@ await abilityCrestRepository MissionCompleteType.FortIncomeCollected => 0, MissionCompleteType.EarnEnemiesKilled => 0, MissionCompleteType.UnimplementedAutoComplete => amountToComplete, - _ - => throw new UnreachableException( - $"Invalid MissionProgressType {progressionInfo.CompleteType} in initial progress handling" - ) + _ => throw new UnreachableException( + $"Invalid MissionProgressType {progressionInfo.CompleteType} in initial progress handling" + ), }; } @@ -415,11 +402,10 @@ private async Task GetCharacterBuildupCount( { PlusCountType.Hp => chara.HpPlusCount, PlusCountType.Atk => chara.AttackPlusCount, - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - $"Invalid PlusCountType for character in mission requirement, parameter: {type}" - ) + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + $"Invalid PlusCountType for character in mission requirement, parameter: {type}" + ), }; } @@ -442,13 +428,12 @@ private async Task GetCharacterBuildupCount( return type switch { PlusCountType.Hp => await charaQuery.Select(x => (int?)x.HpPlusCount).MaxAsync() ?? 0, - PlusCountType.Atk - => await charaQuery.Select(x => (int?)x.AttackPlusCount).MaxAsync() ?? 0, - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - $"Invalid PlusCountType for character in mission requirement, parameter: {type}" - ) + PlusCountType.Atk => await charaQuery.Select(x => (int?)x.AttackPlusCount).MaxAsync() + ?? 0, + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + $"Invalid PlusCountType for character in mission requirement, parameter: {type}" + ), }; } @@ -467,29 +452,25 @@ private async Task GetWyrmprintBuildupCount(AbilityCrestId? crestId, PlusCo { PlusCountType.Hp => crest.HpPlusCount, PlusCountType.Atk => crest.AttackPlusCount, - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - $"Invalid PlusCountType for wyrmprint in mission requirement, parameter: {type}" - ), + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + $"Invalid PlusCountType for wyrmprint in mission requirement, parameter: {type}" + ), }; } return type switch { - PlusCountType.Hp - => await abilityCrestRepository - .AbilityCrests.Select(x => (int?)x.HpPlusCount) - .MaxAsync() ?? 0, - PlusCountType.Atk - => await abilityCrestRepository - .AbilityCrests.Select(x => (int?)x.AttackPlusCount) - .MaxAsync() ?? 0, - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - $"Invalid PlusCountType for wyrmprint in mission requirement, parameter: {type}" - ) + PlusCountType.Hp => await abilityCrestRepository + .AbilityCrests.Select(x => (int?)x.HpPlusCount) + .MaxAsync() ?? 0, + PlusCountType.Atk => await abilityCrestRepository + .AbilityCrests.Select(x => (int?)x.AttackPlusCount) + .MaxAsync() ?? 0, + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + $"Invalid PlusCountType for wyrmprint in mission requirement, parameter: {type}" + ), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Missions/Mission.cs b/DragaliaAPI/DragaliaAPI/Features/Missions/Mission.cs index b721eef85..9fb5ff7aa 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Missions/Mission.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Missions/Mission.cs @@ -28,13 +28,15 @@ public static Mission From(MissionType type, int id) MissionType.Daily => new Mission(MasterAsset.MissionDailyData.Get(id), type), MissionType.Drill => new Mission(MasterAsset.MissionDrillData.Get(id), type), MissionType.MainStory => new Mission(MasterAsset.MissionMainStoryData.Get(id), type), - MissionType.MemoryEvent - => new Mission(MasterAsset.MissionMemoryEventData.Get(id), type), + MissionType.MemoryEvent => new Mission( + MasterAsset.MissionMemoryEventData.Get(id), + type + ), MissionType.Normal => new Mission(MasterAsset.MissionNormalData.Get(id), type), MissionType.Period => new Mission(MasterAsset.MissionPeriodData.Get(id), type), MissionType.Special => new Mission(MasterAsset.MissionSpecialData.Get(id), type), MissionType.Invalid => throw new InvalidOperationException("Invalid MissionType"), - _ => throw new UnreachableException("Unknown MissionType") + _ => throw new UnreachableException("Unknown MissionType"), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Missions/MissionRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Missions/MissionRepository.cs index 4d71ac00d..6c883e684 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Missions/MissionRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Missions/MissionRepository.cs @@ -103,7 +103,7 @@ public DbPlayerMission AddMission( End = endTime ?? DateTimeOffset.UnixEpoch, State = state, GroupId = groupId, - Progress = progress + Progress = progress, } ) .Entity; @@ -126,7 +126,7 @@ public async Task AddCompletedDailyMission(DbPlayerMission originalMission) Date = date, StartDate = originalMission.Start, EndDate = originalMission.End, - Progress = originalMission.Progress + Progress = originalMission.Progress, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Missions/MissionService.cs b/DragaliaAPI/DragaliaAPI/Features/Missions/MissionService.cs index 7d1f716d9..ebd5b0399 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Missions/MissionService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Missions/MissionService.cs @@ -455,7 +455,7 @@ await this.missionRepository.GetMissionsByType(MissionType.MainStory).ToListAsyn { MainStoryMissionId = x.Id, State = (int)x.State, - }) + }), }; } @@ -540,7 +540,7 @@ IEnumerable newCompletedMissionList ReceivableRewardCount = receivableRewardCount, NewCompleteMissionIdList = newCompletedMissionList, PickupMissionCount = type == MissionType.Daily ? allMissions.Count(x => x.Pickup) : 0, - CurrentMissionId = currentMissionId + CurrentMissionId = currentMissionId, }; } @@ -641,7 +641,7 @@ public async Task BuildNormalResponse() State = x.State, StartDate = x.Start, EndDate = x.End, - DayNo = DateOnly.FromDateTime(this.timeProvider.GetLastDailyReset().UtcDateTime) + DayNo = DateOnly.FromDateTime(this.timeProvider.GetLastDailyReset().UtcDateTime), }); response.DailyMissionList = currentDailyMissions.UnionBy( @@ -661,7 +661,7 @@ private Task> GetHistoricalDailyMissions() => State = MissionState.Completed, StartDate = x.StartDate, EndDate = x.EndDate, - DayNo = x.Date + DayNo = x.Date, }) .ToListAsync(); } diff --git a/DragaliaAPI/DragaliaAPI/Features/PartyPower/PartyPowerService.cs b/DragaliaAPI/DragaliaAPI/Features/PartyPower/PartyPowerService.cs index 4dcf556a5..53b86cf6d 100644 --- a/DragaliaAPI/DragaliaAPI/Features/PartyPower/PartyPowerService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/PartyPower/PartyPowerService.cs @@ -183,7 +183,7 @@ await unitRepository.FindWeaponBodyAsync(weaponBodyId) crestType2No1, crestType2No2, crestType3No1, - crestType3No2 + crestType3No2, }; HashSet uniqueCrests = crests.Where(x => x != 0).ToHashSet(); @@ -562,7 +562,7 @@ IEnumerable crests : weaponData.GetAbility(1, dbWeapon.Ability1Level), dbWeapon == null || weaponData == null ? 0 - : weaponData.GetAbility(2, dbWeapon.Ability2Level) + : weaponData.GetAbility(2, dbWeapon.Ability2Level), }; abilityIdList.AddRange(abilityIds); diff --git a/DragaliaAPI/DragaliaAPI/Features/Player/StaminaType.cs b/DragaliaAPI/DragaliaAPI/Features/Player/StaminaType.cs index b3e8c7be6..eede5ea5a 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Player/StaminaType.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Player/StaminaType.cs @@ -4,5 +4,5 @@ public enum StaminaType { None, Single, - Multi + Multi, } diff --git a/DragaliaAPI/DragaliaAPI/Features/Player/UserService.cs b/DragaliaAPI/DragaliaAPI/Features/Player/UserService.cs index 25e500fe0..ae0ef099d 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Player/UserService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Player/UserService.cs @@ -78,7 +78,7 @@ public async Task RemoveStamina(StaminaType type, int amount) { StaminaType.Single => ResultCode.QuestStaminaSingleShort, StaminaType.Multi => ResultCode.QuestStaminaMultiShort, - _ => throw new UnreachableException() + _ => throw new UnreachableException(), }; logger.LogError("Player did not have enough Stamina ({currentAmount})", currentStamina); diff --git a/DragaliaAPI/DragaliaAPI/Features/Present/Present.cs b/DragaliaAPI/DragaliaAPI/Features/Present/Present.cs index ce1ff009b..6fc18e6ec 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Present/Present.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Present/Present.cs @@ -45,7 +45,7 @@ public DbPlayerPresent ToEntity(long viewerId) MessageParamValue3 = this.MessageParamValues.ElementAtOrDefault(2), MessageParamValue4 = this.MessageParamValues.ElementAtOrDefault(3), CreateTime = this.CreateTime, - ReceiveLimitTime = CreateTime + ExpiryTime + ReceiveLimitTime = CreateTime + ExpiryTime, }; } @@ -55,7 +55,7 @@ public AtgenBuildEventRewardEntityList ToBuildEventRewardList() { EntityId = this.EntityId, EntityType = this.EntityType, - EntityQuantity = this.EntityQuantity + EntityQuantity = this.EntityQuantity, }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Present/PresentController.cs b/DragaliaAPI/DragaliaAPI/Features/Present/PresentController.cs index 7655f999d..437f36b43 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Present/PresentController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Present/PresentController.cs @@ -58,7 +58,7 @@ [FromBody] PresentGetPresentListRequest request data.UpdateDataList = new() { - PresentNotice = await this.presentService.GetPresentNotice() + PresentNotice = await this.presentService.GetPresentNotice(), }; return Ok(data); @@ -116,6 +116,6 @@ [FromBody] PresentGetHistoryListRequest request request.PresentHistoryId ); - return Ok(new PresentGetHistoryListResponse() { PresentHistoryList = list, }); + return Ok(new PresentGetHistoryListResponse() { PresentHistoryList = list }); } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Quest/QuestController.cs b/DragaliaAPI/DragaliaAPI/Features/Quest/QuestController.cs index 5728b7e09..e57bfb1eb 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Quest/QuestController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Quest/QuestController.cs @@ -47,7 +47,7 @@ CancellationToken cancellationToken { QuestStoryRewardList = questRewardList, EntityResult = entityResult, - UpdateDataList = updateDataList + UpdateDataList = updateDataList, } ); } @@ -76,7 +76,7 @@ CancellationToken cancellationToken new QuestGetQuestClearPartyResponse() { QuestClearPartySettingList = clearParty, - LostUnitList = lostUnitList + LostUnitList = lostUnitList, } ); } @@ -96,7 +96,7 @@ CancellationToken cancellationToken new QuestGetQuestClearPartyMultiResponse() { QuestMultiClearPartySettingList = clearParty, - LostUnitList = lostUnitList + LostUnitList = lostUnitList, } ); } @@ -164,8 +164,8 @@ public DragaliaResult DropList(QuestDropListRequest request) { EntityId = x.Id, EntityType = x.EntityType, - }) - } + }), + }, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Quest/QuestService.cs b/DragaliaAPI/DragaliaAPI/Features/Quest/QuestService.cs index 9d43fc38a..9213f815a 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Quest/QuestService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Quest/QuestService.cs @@ -120,9 +120,8 @@ public async Task GetQuestStamina(int questId, StaminaType type) StaminaType.Single => questData.PayStaminaSingle, // Want to encourage co-op play. // Also, `type` here is inferred from endpoint e.g. start_multi, but that doesn't work for time attack. - StaminaType.Multi - => 0, - _ => throw new ArgumentOutOfRangeException(nameof(type)) + StaminaType.Multi => 0, + _ => throw new ArgumentOutOfRangeException(nameof(type)), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Quest/QuestTreasureService.cs b/DragaliaAPI/DragaliaAPI/Features/Quest/QuestTreasureService.cs index c6cec7012..18baa1b42 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Quest/QuestTreasureService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Quest/QuestTreasureService.cs @@ -59,7 +59,7 @@ await rewardService.GrantReward( new DbQuestTreasureList() { ViewerId = playerIdentityService.ViewerId, - QuestTreasureId = questTreasureData.Id + QuestTreasureId = questTreasureData.Id, } ); @@ -79,7 +79,7 @@ await rewardService.GrantReward( DuplicateEntityList = duplicateEntityList, AddMaxDragonQuantity = questTreasureData.AddMaxDragonStorage, AddMaxWeaponQuantity = 0, - AddMaxAmuletQuantity = 0 + AddMaxAmuletQuantity = 0, }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Reward/ConvertedEntity.cs b/DragaliaAPI/DragaliaAPI/Features/Reward/ConvertedEntity.cs index 0d67764c7..4467b01bc 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Reward/ConvertedEntity.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Reward/ConvertedEntity.cs @@ -13,7 +13,7 @@ public ConvertedEntityList ToConvertedEntityList() BeforeEntityQuantity = Before.Quantity, AfterEntityType = After.Type, AfterEntityId = After.Id, - AfterEntityQuantity = After.Quantity + AfterEntityQuantity = After.Quantity, }; } }; diff --git a/DragaliaAPI/DragaliaAPI/Features/Reward/Entity.cs b/DragaliaAPI/DragaliaAPI/Features/Reward/Entity.cs index 0d0a40cfb..d11f0f288 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Reward/Entity.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Reward/Entity.cs @@ -20,7 +20,7 @@ public AtgenBuildEventRewardEntityList ToBuildEventRewardEntityList() { EntityId = this.Id, EntityType = this.Type, - EntityQuantity = this.Quantity + EntityQuantity = this.Quantity, }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Reward/Handlers/CharaHandler.cs b/DragaliaAPI/DragaliaAPI/Features/Reward/Handlers/CharaHandler.cs index 399172465..c05d21476 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Reward/Handlers/CharaHandler.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Reward/Handlers/CharaHandler.cs @@ -49,7 +49,7 @@ public async Task Grant(Entity entity) { ViewerId = playerIdentityService.ViewerId, StoryType = StoryTypes.Chara, - StoryId = storyData.StoryIds[0] + StoryId = storyData.StoryIds[0], } ); } @@ -114,7 +114,7 @@ IDictionary entities { ViewerId = playerIdentityService.ViewerId, StoryType = StoryTypes.Chara, - StoryId = storyData.StoryIds[0] + StoryId = storyData.StoryIds[0], } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Reward/Handlers/DragonGiftHandler.cs b/DragaliaAPI/DragaliaAPI/Features/Reward/Handlers/DragonGiftHandler.cs index a26cdc1d0..c49c7a09b 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Reward/Handlers/DragonGiftHandler.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Reward/Handlers/DragonGiftHandler.cs @@ -38,7 +38,7 @@ public async Task Grant(Entity reward) { ViewerId = playerIdentityService.ViewerId, DragonGiftId = gift, - Quantity = reward.Quantity + Quantity = reward.Quantity, }; apiContext.PlayerDragonGifts.Add(dragonGift); diff --git a/DragaliaAPI/DragaliaAPI/Features/Reward/RewardService.cs b/DragaliaAPI/DragaliaAPI/Features/Reward/RewardService.cs index dc27bfc0d..95b7e7310 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Reward/RewardService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Reward/RewardService.cs @@ -193,7 +193,7 @@ public EntityResult GetEntityResult() ConvertedEntityList = convertedEntities.Select(x => x.ToConvertedEntityList()), OverDiscardEntityList = this.discardedEntities.Select(x => x.ToBuildEventRewardEntityList() - ) + ), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V19Update.cs b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V19Update.cs index e1b683d0b..4a39fee1f 100644 --- a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V19Update.cs +++ b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V19Update.cs @@ -36,7 +36,7 @@ public async Task Apply() { ViewerId = playerIdentityService.ViewerId, SummonTicketId = ticketType, - Quantity = ticketsOfType.Sum(x => x.Quantity) + Quantity = ticketsOfType.Sum(x => x.Quantity), } ); context.RemoveRange(ticketsOfType); diff --git a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V23Update.cs b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V23Update.cs index 64e53c91f..84e80ed60 100644 --- a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V23Update.cs +++ b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V23Update.cs @@ -17,7 +17,7 @@ public async Task Apply() if (!await apiContext.PlayerDiamondData.AnyAsync()) { logger.LogInformation("PlayerDiamondData not found: adding new row"); - apiContext.PlayerDiamondData.Add(new() { ViewerId = playerIdentityService.ViewerId, }); + apiContext.PlayerDiamondData.Add(new() { ViewerId = playerIdentityService.ViewerId }); } } } diff --git a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V2Update.cs b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V2Update.cs index 566d6257b..8a5492228 100644 --- a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V2Update.cs +++ b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V2Update.cs @@ -32,7 +32,7 @@ await this.stampRepository.SetEquipStampList( { ViewerId = this.playerIdentityService.ViewerId, StampId = 0, - Slot = x + Slot = x, }) ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V4Update.cs b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V4Update.cs index 7245982bb..47abbc6c1 100644 --- a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V4Update.cs +++ b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V4Update.cs @@ -36,7 +36,7 @@ private static readonly (int StoryId, int Status)[] ChapterTutorialStatus = (1000311, 30202), (1000412, 40101), (1000509, 50201), - (1000607, 60999) + (1000607, 60999), }; public async Task Apply() diff --git a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V9Update.cs b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V9Update.cs index 2c015ceb1..db0310b13 100644 --- a/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V9Update.cs +++ b/DragaliaAPI/DragaliaAPI/Features/SavefileUpdate/V9Update.cs @@ -112,7 +112,7 @@ private void AddStory(int storyId) ViewerId = playerIdentityService.ViewerId, StoryId = storyId, State = 0, - StoryType = StoryTypes.Chara + StoryType = StoryTypes.Chara, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Shop/ItemSummonService.cs b/DragaliaAPI/DragaliaAPI/Features/Shop/ItemSummonService.cs index 1c3cd085a..b01756c90 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Shop/ItemSummonService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Shop/ItemSummonService.cs @@ -77,7 +77,10 @@ ShopItemSummonExecRequest request 3 => 100, 4 => 200, 5 => 300, - _ => throw new DragaliaException(ResultCode.ItemSummonExecCountOver, "Too many summons") + _ => throw new DragaliaException( + ResultCode.ItemSummonExecCountOver, + "Too many summons" + ), }; await this.paymentService.ProcessPayment( diff --git a/DragaliaAPI/DragaliaAPI/Features/Shop/MaterialShopType.cs b/DragaliaAPI/DragaliaAPI/Features/Shop/MaterialShopType.cs index 85182644c..194ccca97 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Shop/MaterialShopType.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Shop/MaterialShopType.cs @@ -7,7 +7,7 @@ public enum MaterialShopType None, Daily, Weekly, - Monthly + Monthly, } public static class MaterialShopTypeExtensions @@ -20,7 +20,7 @@ public static ShopType ToShopType(this MaterialShopType type) MaterialShopType.Daily => ShopType.MaterialDaily, MaterialShopType.Weekly => ShopType.MaterialWeekly, MaterialShopType.Monthly => ShopType.MaterialMonthly, - _ => throw new UnreachableException("Invalid MaterialShopType") + _ => throw new UnreachableException("Invalid MaterialShopType"), }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Shop/Shop.cs b/DragaliaAPI/DragaliaAPI/Features/Shop/Shop.cs index f9f3086bc..47c23de3c 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Shop/Shop.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Shop/Shop.cs @@ -16,7 +16,7 @@ public static IShop From(ShopType type, int goodsId) ShopType.MaterialDaily => MasterAsset.MaterialShopDaily[goodsId], ShopType.MaterialWeekly => MasterAsset.MaterialShopWeekly[goodsId], ShopType.MaterialMonthly => MasterAsset.MaterialShopMonthly[goodsId], - _ => throw new UnreachableException("Invalid ShopType") + _ => throw new UnreachableException("Invalid ShopType"), }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Shop/ShopController.cs b/DragaliaAPI/DragaliaAPI/Features/Shop/ShopController.cs index cf4ef9c2f..0ce8f0d2b 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Shop/ShopController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Shop/ShopController.cs @@ -49,7 +49,7 @@ public async Task GetList(CancellationToken cancellationToken) QuestBonus = new List(), ProductLockList = new List(), ProductList = new List(), - InfancyPaidDiamondLimit = 4800 + InfancyPaidDiamondLimit = 4800, }; response.UserItemSummon = await this.itemSummonService.GetItemSummon(); diff --git a/DragaliaAPI/DragaliaAPI/Features/Shop/ShopRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Shop/ShopRepository.cs index 88b1b57f1..6a27bcfd4 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Shop/ShopRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Shop/ShopRepository.cs @@ -35,7 +35,7 @@ public async Task GetShopInfoAsync() public void InitializeShopInfo() { this.apiContext.PlayerShopInfos.Add( - new DbPlayerShopInfo() { ViewerId = this.playerIdentityService.ViewerId, } + new DbPlayerShopInfo() { ViewerId = this.playerIdentityService.ViewerId } ); } @@ -80,7 +80,7 @@ DateTimeOffset effectEnd BuyCount = quantity, LastBuyTime = buyTime, EffectStartTime = effectStart, - EffectEndTime = effectEnd + EffectEndTime = effectEnd, } ); diff --git a/DragaliaAPI/DragaliaAPI/Features/Shop/ShopService.cs b/DragaliaAPI/DragaliaAPI/Features/Shop/ShopService.cs index 4bb4dc67e..d3aee2207 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Shop/ShopService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Shop/ShopService.cs @@ -34,7 +34,7 @@ int goodsQuantity Type = shopType, Payment = paymentType, Id = goodsId, - Quantity = goodsQuantity + Quantity = goodsQuantity, } ); @@ -170,25 +170,23 @@ public async Task> GetPurchases() { return type switch { - ShopType.MaterialDaily - => ( - timeProvider.GetLastDailyReset(), - timeProvider.GetLastDailyReset().AddDays(1).AddSeconds(-1) - ), - ShopType.MaterialWeekly - => ( - timeProvider.GetLastWeeklyReset(), - timeProvider.GetLastWeeklyReset().AddDays(7).AddSeconds(-1) - ), - ShopType.MaterialMonthly - => ( - timeProvider.GetLastMonthlyReset(), - timeProvider.GetLastMonthlyReset().AddMonths(1).AddSeconds(-1) - ), - ShopType.Normal - or ShopType.Special - => (DateTimeOffset.UnixEpoch, DateTimeOffset.UnixEpoch), - _ => throw new DragaliaException(ResultCode.CommonInvalidArgument, "Invalid ShopType") + ShopType.MaterialDaily => ( + timeProvider.GetLastDailyReset(), + timeProvider.GetLastDailyReset().AddDays(1).AddSeconds(-1) + ), + ShopType.MaterialWeekly => ( + timeProvider.GetLastWeeklyReset(), + timeProvider.GetLastWeeklyReset().AddDays(7).AddSeconds(-1) + ), + ShopType.MaterialMonthly => ( + timeProvider.GetLastMonthlyReset(), + timeProvider.GetLastMonthlyReset().AddMonths(1).AddSeconds(-1) + ), + ShopType.Normal or ShopType.Special => ( + DateTimeOffset.UnixEpoch, + DateTimeOffset.UnixEpoch + ), + _ => throw new DragaliaException(ResultCode.CommonInvalidArgument, "Invalid ShopType"), }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Shop/ShopType.cs b/DragaliaAPI/DragaliaAPI/Features/Shop/ShopType.cs index 87b6bdf88..08cfb60b9 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Shop/ShopType.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Shop/ShopType.cs @@ -10,7 +10,7 @@ public enum ShopType MaterialDaily, MaterialWeekly, MaterialMonthly, - Normal + Normal, } public static class ShopTypeExtensions @@ -24,7 +24,7 @@ public static PurchaseShopType ToPurchaseShopType(this ShopType type) ShopType.MaterialDaily => PurchaseShopType.Material, ShopType.MaterialWeekly => PurchaseShopType.Material, ShopType.MaterialMonthly => PurchaseShopType.Material, - _ => throw new UnreachableException("Invalid ShopType in repo") + _ => throw new UnreachableException("Invalid ShopType in repo"), }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Stamp/StampController.cs b/DragaliaAPI/DragaliaAPI/Features/Stamp/StampController.cs index 0c6ac088c..b914caf1c 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Stamp/StampController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Stamp/StampController.cs @@ -28,7 +28,7 @@ public async Task GetStamp() { IEnumerable list = (await this.stampService.GetStampList()).ToList(); - return this.Ok(new StampGetStampResponse() { StampList = list, }); + return this.Ok(new StampGetStampResponse() { StampList = list }); } [HttpPost("set_equip_stamp")] diff --git a/DragaliaAPI/DragaliaAPI/Features/Stamp/StampService.cs b/DragaliaAPI/DragaliaAPI/Features/Stamp/StampService.cs index 56b90e9c2..88f31c15c 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Stamp/StampService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Stamp/StampService.cs @@ -34,7 +34,7 @@ public Task> GetStampList() MasterAsset.StampData.Enumerable.Select(x => new StampList() { StampId = x.Id, - IsNew = false + IsNew = false, }) ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Story/StoryRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Story/StoryRepository.cs index b3c7895bd..d1a7d7751 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Story/StoryRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Story/StoryRepository.cs @@ -57,7 +57,7 @@ public async Task GetOrCreateStory(StoryTypes storyType, int ViewerId = this.playerIdentityService.ViewerId, StoryId = storyId, StoryType = storyType, - State = 0 + State = 0, } ) .Entity; diff --git a/DragaliaAPI/DragaliaAPI/Features/Story/StoryService.cs b/DragaliaAPI/DragaliaAPI/Features/Story/StoryService.cs index 637bb7d32..25bfb39ce 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Story/StoryService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Story/StoryService.cs @@ -62,7 +62,7 @@ public async Task CheckStoryEligibility(StoryTypes type, int storyId) StoryTypes.Castle => await this.CheckCastleStoryEligibility(storyId), StoryTypes.Quest => true, StoryTypes.Event => true, - _ => throw new NotImplementedException($"Stories of type {type} are not implemented") + _ => throw new NotImplementedException($"Stories of type {type} are not implemented"), }; } @@ -136,7 +136,7 @@ int storyId StoryTypes.Quest => await this.ReadQuestStory(storyId), StoryTypes.Event => await this.ReadEventStory(storyId), StoryTypes.DungeonMode => await this.ReadDmodeStory(storyId), - _ => throw new NotImplementedException($"Stories of type {type} are not implemented") + _ => throw new NotImplementedException($"Stories of type {type} are not implemented"), }; logger.LogDebug("Player earned story rewards: {@rewards}", rewards); @@ -188,8 +188,8 @@ private async Task> ReadCastleStory(int st { EntityType = EntityTypes.Wyrmite, EntityId = 0, - EntityQuantity = CastleStoryWyrmite - } + EntityQuantity = CastleStoryWyrmite, + }, }; return rewardList; @@ -212,7 +212,7 @@ await paymentService.ProcessPayment( List rewardList = new() { - new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = QuestStoryWyrmite } + new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = QuestStoryWyrmite }, }; if ( @@ -304,7 +304,7 @@ await rewardService.GrantReward( { EntityId = (int)eventData.EventCharaId, EntityQuantity = 1, - EntityType = EntityTypes.Chara + EntityType = EntityTypes.Chara, } ); } @@ -332,7 +332,7 @@ await paymentService.ProcessPayment( List rewardList = new() { - new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = QuestStoryWyrmite } + new() { EntityType = EntityTypes.Wyrmite, EntityQuantity = QuestStoryWyrmite }, }; // TODO(Events): ??? This is not used for compendium (maybe for collect events) @@ -359,10 +359,10 @@ private async Task> ReadDmodeStory(int sto { EntityType = EntityTypes.Wyrmite, EntityId = 0, - EntityQuantity = DmodeStoryWyrmite + EntityQuantity = DmodeStoryWyrmite, }, dmodePoint1Entity.ToBuildEventRewardEntityList(), - dmodePoint2Entity.ToBuildEventRewardEntityList() + dmodePoint2Entity.ToBuildEventRewardEntityList(), }; return rewardList; @@ -380,7 +380,7 @@ AtgenBuildEventRewardEntityList reward { EntityId = reward.EntityId, EntityType = reward.EntityType, - EntityQuantity = reward.EntityQuantity + EntityQuantity = reward.EntityQuantity, }; if (reward.EntityType is EntityTypes.Chara or EntityTypes.Dragon) diff --git a/DragaliaAPI/DragaliaAPI/Features/StorySkip/StorySkipService.cs b/DragaliaAPI/DragaliaAPI/Features/StorySkip/StorySkipService.cs index 920212f63..f86b91d9e 100644 --- a/DragaliaAPI/DragaliaAPI/Features/StorySkip/StorySkipService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/StorySkip/StorySkipService.cs @@ -84,7 +84,7 @@ public async Task IncreaseFortLevels() BuildStartDate = DateTimeOffset.UnixEpoch, BuildEndDate = DateTimeOffset.UnixEpoch, IsNew = true, - LastIncomeDate = DateTimeOffset.UnixEpoch + LastIncomeDate = DateTimeOffset.UnixEpoch, }; newUserForts.Add(newUserFort); @@ -145,7 +145,7 @@ public async Task ProcessQuestCompletions() IsAppear = true, BestClearTime = 36000, LastWeeklyResetTime = DateTimeOffset.UnixEpoch, - LastDailyResetTime = DateTimeOffset.UnixEpoch + LastDailyResetTime = DateTimeOffset.UnixEpoch, }; newUserQuests.Add(userQuest); @@ -236,7 +236,7 @@ public async Task ProcessStoryCompletions() ViewerId = playerIdentityService.ViewerId, StoryType = StoryTypes.Quest, StoryId = questStory.Id, - State = StoryState.Read + State = StoryState.Read, }; newUserStories.Add(userStory); @@ -337,7 +337,7 @@ public async Task RewardDragons() IsNew = true, Skill1Level = 1, Ability1Level = 1, - Ability2Level = 1 + Ability2Level = 1, }; newUserDragons.Add(newUserDragon); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Summoning/RedoableSummonController.cs b/DragaliaAPI/DragaliaAPI/Features/Summoning/RedoableSummonController.cs index 14c2e06a0..273460187 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Summoning/RedoableSummonController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Summoning/RedoableSummonController.cs @@ -54,8 +54,8 @@ public DragaliaResult GetData() RedoableSummonOddsRateList = new RedoableSummonOddsRateList() { Normal = normalOddsRate, - Guarantee = guaranteeRate - } + Guarantee = guaranteeRate, + }, }; } @@ -73,7 +73,7 @@ await cache.SetStringAsync( JsonSerializer.Serialize(summonResult), new DistributedCacheEntryOptions() { - AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(60) + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(60), } ); @@ -134,14 +134,14 @@ CancellationToken cancellationToken .Select(x => new AtgenDuplicateEntityList() { EntityType = EntityTypes.Chara, - EntityId = (int)x.id + EntityId = (int)x.id, }); IEnumerable newDragons = repositoryDragonOutput .Where(x => x.IsNew) .Select(x => new AtgenDuplicateEntityList() { EntityType = EntityTypes.Dragon, - EntityId = (int)x.Id + EntityId = (int)x.Id, }); return this.Ok( @@ -150,13 +150,13 @@ CancellationToken cancellationToken UserRedoableSummonData = new UserRedoableSummonData() { IsFixedResult = true, - RedoableSummonResultUnitList = cachedResult + RedoableSummonResultUnitList = cachedResult, }, UpdateDataList = updateData, EntityResult = new EntityResult() { - NewGetEntityList = newCharas.Concat(newDragons) - } + NewGetEntityList = newCharas.Concat(newDragons), + }, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonOddsLogic.cs b/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonOddsLogic.cs index 5fd89bd43..837c9b757 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonOddsLogic.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonOddsLogic.cs @@ -168,7 +168,7 @@ private static BaseRateData GetBaseRates(Banner banner) FourStarAdvRate = fourStarAdvRate, FourStarDragonRate = fourStarDragonRate, ThreeStarAdvRate = threeStarAdvRate, - ThreeStarDragonRate = threeStarDragonRate + ThreeStarDragonRate = threeStarDragonRate, }; } @@ -275,7 +275,7 @@ private static BaseRateData GetBaseGuaranteeRates(Banner banner) FourStarAdvRate = fourStarAdvRate, FourStarDragonRate = fourStarDragonRate, ThreeStarAdvRate = 0m, - ThreeStarDragonRate = 0m + ThreeStarDragonRate = 0m, }; } @@ -341,10 +341,9 @@ BaseRateData rateData 5 => rateData.FiveStarAdvRate / charaPoolData.FiveStarPoolSize, 4 => rateData.FourStarAdvRate / charaPoolData.FourStarPoolSize, 3 => rateData.ThreeStarAdvRate / charaPoolData.ThreeStarPoolSize, - _ - => throw new UnreachableException( - $"Invalid rarity {chara.Rarity} for character {chara.Id}" - ) + _ => throw new UnreachableException( + $"Invalid rarity {chara.Rarity} for character {chara.Id}" + ), }; yield return new UnitRate(chara.Id, rate); @@ -357,10 +356,9 @@ BaseRateData rateData 5 => rateData.FiveStarDragonRate / dragonPoolData.FiveStarPoolSize, 4 => rateData.FourStarDragonRate / dragonPoolData.FourStarPoolSize, 3 => rateData.ThreeStarDragonRate / dragonPoolData.ThreeStarPoolSize, - _ - => throw new UnreachableException( - $"Invalid rarity {dragon.Rarity} for dragon {dragon.Id}" - ) + _ => throw new UnreachableException( + $"Invalid rarity {dragon.Rarity} for dragon {dragon.Id}" + ), }; yield return new UnitRate(dragon.Id, rate); @@ -412,7 +410,7 @@ private static bool IsCharaInBannerRegularPool(CharaData charaData, Banner banne UnitAvailability.Permanent => true, UnitAvailability.Gala => banner.IsGala, UnitAvailability.Limited => banner.LimitedCharas.Contains(charaData.Id), - _ => false + _ => false, }; } @@ -435,7 +433,7 @@ private static bool IsDragonInBannerRegularPool(DragonData dragonData, Banner ba UnitAvailability.Permanent => true, UnitAvailability.Gala => banner.IsGala, UnitAvailability.Limited => banner.LimitedDragons.Contains(dragonData.Id), - _ => false + _ => false, }; } @@ -488,7 +486,7 @@ int numSummonsSinceLastFiveStar newPickupRateData = pickupRateData with { FiveStarAdvRate = - pickupRateData.FiveStarAdvRate + (pickupCharaProportion * fiveStarIncrease) + pickupRateData.FiveStarAdvRate + (pickupCharaProportion * fiveStarIncrease), }; // Can't work out how the remaining increase is split between characters and dragons. @@ -498,7 +496,7 @@ int numSummonsSinceLastFiveStar FiveStarAdvRate = rateData.FiveStarAdvRate + (regularProportion * fiveStarIncrease * 0.2m), FiveStarDragonRate = - rateData.FiveStarDragonRate + (regularProportion * fiveStarIncrease * 0.8m) + rateData.FiveStarDragonRate + (regularProportion * fiveStarIncrease * 0.8m), }; break; } @@ -515,7 +513,7 @@ int numSummonsSinceLastFiveStar { FiveStarDragonRate = pickupRateData.FiveStarDragonRate - + (pickupDragonProportion * fiveStarIncrease) + + (pickupDragonProportion * fiveStarIncrease), }; // Same as above empirical distribution, but inverted @@ -524,7 +522,7 @@ int numSummonsSinceLastFiveStar FiveStarAdvRate = rateData.FiveStarAdvRate + (regularProportion * fiveStarIncrease * 0.8m), FiveStarDragonRate = - rateData.FiveStarDragonRate + (regularProportion * fiveStarIncrease * 0.2m) + rateData.FiveStarDragonRate + (regularProportion * fiveStarIncrease * 0.2m), }; break; } @@ -534,7 +532,7 @@ int numSummonsSinceLastFiveStar newRateData = rateData with { FiveStarAdvRate = rateData.FiveStarAdvRate + (fiveStarIncrease / 2), - FiveStarDragonRate = rateData.FiveStarDragonRate + (fiveStarIncrease / 2) + FiveStarDragonRate = rateData.FiveStarDragonRate + (fiveStarIncrease / 2), }; break; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonOddsService.cs b/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonOddsService.cs index 06ccddfe2..672cffe2d 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonOddsService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonOddsService.cs @@ -96,7 +96,7 @@ private static OddsRate BuildOddsRate(UnitRateCollection rates, int[] rarities) List combined = [ .. pickupRarityLists.Values.Where(x => !x.IsEmpty), - .. rarityLists.Values + .. rarityLists.Values, ]; return new OddsRate() @@ -106,14 +106,14 @@ .. rarityLists.Values .Select(x => new AtgenRarityList() { Rarity = x.Key, - TotalRate = x.Sum(y => y.CharaRate + y.DragonRate).ToPercentageString2Dp() + TotalRate = x.Sum(y => y.CharaRate + y.DragonRate).ToPercentageString2Dp(), }), RarityGroupList = combined.Select(x => x.ToRarityGroupList()), Unit = new() { CharaOddsList = combined.Select(x => x.ToAdvOddsUnitDetail()), DragonOddsList = combined.Select(x => x.ToDragonOddsUnitDetail()), - } + }, }; static void PopulateRarityDict(UnitRate rate, Dictionary dict) @@ -167,7 +167,7 @@ public AtgenRarityGroupList ToRarityGroupList() => Pickup = this.Pickup, TotalRate = (this.CharaRate + this.DragonRate).ToPercentageString2Dp(), DragonRate = this.DragonRate.ToPercentageString2Dp(), - CharaRate = this.CharaRate.ToPercentageString2Dp() + CharaRate = this.CharaRate.ToPercentageString2Dp(), }; public OddsUnitDetail ToAdvOddsUnitDetail() => @@ -175,7 +175,7 @@ public OddsUnitDetail ToAdvOddsUnitDetail() => { Pickup = this.Pickup, Rarity = this.Rarity, - UnitList = this.CharaList.Select(x => x.ToAtgenUnitList()) + UnitList = this.CharaList.Select(x => x.ToAtgenUnitList()), }; public OddsUnitDetail ToDragonOddsUnitDetail() => @@ -183,7 +183,7 @@ public OddsUnitDetail ToDragonOddsUnitDetail() => { Pickup = this.Pickup, Rarity = this.Rarity, - UnitList = this.DragonList.Select(x => x.ToAtgenUnitList()) + UnitList = this.DragonList.Select(x => x.ToAtgenUnitList()), }; } } diff --git a/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonService.cs b/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonService.cs index c474d9cda..6a7113e2f 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Summoning/SummonService.cs @@ -38,16 +38,16 @@ SummonRequestInfo requestInfo ) => requestInfo.ExecType switch { - SummonExecTypes.Single - or SummonExecTypes.DailyDeal - => this.GenerateSummonResultInternal(requestInfo.SummonId, requestInfo.SummonCount), - SummonExecTypes.Tenfold - => this.GenerateTenfoldResultInternal(requestInfo.SummonId, numTenfolds: 1), - _ - => throw new ArgumentException( - $"Invalid summon exec type {requestInfo.ExecType}", - nameof(requestInfo) - ), + SummonExecTypes.Single or SummonExecTypes.DailyDeal => + this.GenerateSummonResultInternal(requestInfo.SummonId, requestInfo.SummonCount), + SummonExecTypes.Tenfold => this.GenerateTenfoldResultInternal( + requestInfo.SummonId, + numTenfolds: 1 + ), + _ => throw new ArgumentException( + $"Invalid summon exec type {requestInfo.ExecType}", + nameof(requestInfo) + ), }; public Task> GenerateRedoableSummonResult() => @@ -171,7 +171,7 @@ public async Task> GetSummonPointList() SummonPoint = x.SummonPoints, CsSummonPoint = x.ConsecutionSummonPoints, CsPointTermMinDate = x.ConsecutionSummonPointsMinDate, - CsPointTermMaxDate = x.ConsecutionSummonPointsMaxDate + CsPointTermMaxDate = x.ConsecutionSummonPointsMaxDate, }) .ToListAsync(); } @@ -191,7 +191,7 @@ public async Task> GetSummonPointList() SummonPoint = bannerData.SummonPoints, CsSummonPoint = bannerData.ConsecutionSummonPoints, CsPointTermMinDate = bannerData.ConsecutionSummonPointsMinDate, - CsPointTermMaxDate = bannerData.ConsecutionSummonPointsMaxDate + CsPointTermMaxDate = bannerData.ConsecutionSummonPointsMaxDate, }; } @@ -344,20 +344,19 @@ public async Task ProcessSummonPayment(SummonRequestInfo requestInfo, SummonList int paymentCost = (requestInfo.PaymentType, requestInfo.ExecType) switch { (PaymentTypes.Diamantium, SummonExecTypes.Tenfold) => summonList.MultiDiamond, - (PaymentTypes.Diamantium, SummonExecTypes.Single) - => summonList.SingleDiamond * requestInfo.ExecCount, + (PaymentTypes.Diamantium, SummonExecTypes.Single) => summonList.SingleDiamond + * requestInfo.ExecCount, (PaymentTypes.Wyrmite, SummonExecTypes.Tenfold) => summonList.MultiCrystal, - (PaymentTypes.Wyrmite, SummonExecTypes.Single) - => summonList.SingleCrystal * requestInfo.ExecCount, + (PaymentTypes.Wyrmite, SummonExecTypes.Single) => summonList.SingleCrystal + * requestInfo.ExecCount, (PaymentTypes.Ticket, SummonExecTypes.Tenfold) => 1, (PaymentTypes.Ticket, SummonExecTypes.Single) => requestInfo.ExecCount, (PaymentTypes.FreeDailyTenfold, SummonExecTypes.Tenfold) => 0, (PaymentTypes.Diamantium, SummonExecTypes.DailyDeal) => 30, - _ - => throw new DragaliaException( - ResultCode.SummonTypeUnexpected, - $"Failed to calculate summon cost for payment type {requestInfo.PaymentType} and exec type {requestInfo.ExecType}" - ) + _ => throw new DragaliaException( + ResultCode.SummonTypeUnexpected, + $"Failed to calculate summon cost for payment type {requestInfo.PaymentType} and exec type {requestInfo.ExecType}" + ), }; int entityId = 0; @@ -377,11 +376,10 @@ optionsMonitor.CurrentValue.BannerDict[requestInfo.SummonId] is { SummonExecTypes.Single => SummonTickets.SingleSummon, SummonExecTypes.Tenfold => SummonTickets.TenfoldSummon, - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - $"Invalid exec type {requestInfo.ExecType} for ticket summon" - ) + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + $"Invalid exec type {requestInfo.ExecType} for ticket summon" + ), }; entityId = (int)genericTicketId; @@ -455,7 +453,7 @@ EntityResult EntityResult new AtgenDuplicateEntityList { EntityType = result.EntityType, - EntityId = result.Id + EntityId = result.Id, } ); } @@ -626,12 +624,12 @@ int numTenfolds List allNormalRates = [ .. normalRateData.PickupRates, - .. normalRateData.NormalRates + .. normalRateData.NormalRates, ]; List allGuaranteeRates = [ .. guaranteeRateData.PickupRates, - .. guaranteeRateData.NormalRates + .. guaranteeRateData.NormalRates, ]; IPick normalPicker = Out.Of() diff --git a/DragaliaAPI/DragaliaAPI/Features/Summoning/SystemBanners.cs b/DragaliaAPI/DragaliaAPI/Features/Summoning/SystemBanners.cs index fd1b62140..642fe1008 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Summoning/SystemBanners.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Summoning/SystemBanners.cs @@ -52,8 +52,8 @@ public static class SystemBanners Charas.Julietta, Charas.Lucretia, Charas.Hildegarde, - Charas.Nefaria - ] + Charas.Nefaria, + ], }; /// @@ -95,8 +95,8 @@ public static class SystemBanners Dragons.PopStarSiren, Dragons.Nidhogg, Dragons.Nyarlathotep, - Dragons.Shinobi - ] + Dragons.Shinobi, + ], }; /// @@ -121,7 +121,7 @@ public static class SystemBanners return charaData.Rarity == 5 && charaData.GetAvailability() == UnitAvailability.Permanent; }) - .ToList() + .ToList(), }; /// @@ -146,6 +146,6 @@ public static class SystemBanners return dragonData.Rarity == 5 && dragonData.GetAvailability() == UnitAvailability.Permanent; }) - .ToList() + .ToList(), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Talisman/TalismanService.cs b/DragaliaAPI/DragaliaAPI/Features/Talisman/TalismanService.cs index 2e280267e..9cdac0d77 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Talisman/TalismanService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Talisman/TalismanService.cs @@ -44,7 +44,7 @@ public async Task SellTalismans(IEnumerable talismanIds) return new DeleteDataList { - DeleteTalismanList = deletedTalismanIds.Select(x => new AtgenDeleteTalismanList(x)) + DeleteTalismanList = deletedTalismanIds.Select(x => new AtgenDeleteTalismanList(x)), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/TimeAttack/TimeAttackController.cs b/DragaliaAPI/DragaliaAPI/Features/TimeAttack/TimeAttackController.cs index 05f0bd9cf..04b6e11b2 100644 --- a/DragaliaAPI/DragaliaAPI/Features/TimeAttack/TimeAttackController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/TimeAttack/TimeAttackController.cs @@ -47,7 +47,7 @@ CancellationToken cancellationToken UpdateDataList = updateDataList, EntityResult = entityResult, RankingTierRewardList = rewardList.Select(ToRankingTierRewardList), - RankingTierRewardEntityList = receivedRewards.Select(ToRewardEntityList) + RankingTierRewardEntityList = receivedRewards.Select(ToRewardEntityList), } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/TimeAttack/TimeAttackService.cs b/DragaliaAPI/DragaliaAPI/Features/TimeAttack/TimeAttackService.cs index 78e0c9d24..7628fc7d2 100644 --- a/DragaliaAPI/DragaliaAPI/Features/TimeAttack/TimeAttackService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/TimeAttack/TimeAttackService.cs @@ -78,9 +78,9 @@ await timeAttackRepository.CreateOrUpdateClear( GameId = gameId, ViewerId = playerIdentityService.ViewerId, PartyInfo = JsonSerializer.Serialize(entry.PartyInfo), - Units = clearUnits + Units = clearUnits, }, - } + }, } ); @@ -126,7 +126,7 @@ await rewardService.GrantRewards( { ViewerId = playerIdentityService.ViewerId, QuestId = questId, - RewardId = x.Id + RewardId = x.Id, }) ); @@ -140,7 +140,7 @@ private DbTimeAttackClearUnit MapTimeAttackUnit(PartyUnitList x, string roomId) { UnitNo = x.Position, ViewerId = playerIdentityService.ViewerId, - GameId = roomId + GameId = roomId, }; if (x.CharaData is not null) diff --git a/DragaliaAPI/DragaliaAPI/Features/TimeAttack/Validation/PartyUnitListValidator.cs b/DragaliaAPI/DragaliaAPI/Features/TimeAttack/Validation/PartyUnitListValidator.cs index 888f731ef..5531aacec 100644 --- a/DragaliaAPI/DragaliaAPI/Features/TimeAttack/Validation/PartyUnitListValidator.cs +++ b/DragaliaAPI/DragaliaAPI/Features/TimeAttack/Validation/PartyUnitListValidator.cs @@ -16,7 +16,7 @@ public PartyUnitListValidator(int questId) RuleFor(x => new { edit_skill_1_chara_data = x.EditSkill1CharaData, - edit_skill_2_chara_data = x.EditSkill2CharaData + edit_skill_2_chara_data = x.EditSkill2CharaData, }) .Must(x => x.edit_skill_1_chara_data!.CharaId != x.edit_skill_2_chara_data!.CharaId diff --git a/DragaliaAPI/DragaliaAPI/Features/TimeAttack/Validation/TalismanValidator.cs b/DragaliaAPI/DragaliaAPI/Features/TimeAttack/Validation/TalismanValidator.cs index 34b7615bd..610f5a747 100644 --- a/DragaliaAPI/DragaliaAPI/Features/TimeAttack/Validation/TalismanValidator.cs +++ b/DragaliaAPI/DragaliaAPI/Features/TimeAttack/Validation/TalismanValidator.cs @@ -28,7 +28,7 @@ public TalismanValidator() RuleFor(x => new { talisman_ability_id_1 = x.TalismanAbilityId1, - talisman_ability_id_2 = x.TalismanAbilityId2 + talisman_ability_id_2 = x.TalismanAbilityId2, }) .Must(x => x.talisman_ability_id_1 != x.talisman_ability_id_2) .WithMessage("Duplicate talisman abilities") diff --git a/DragaliaAPI/DragaliaAPI/Features/Trade/TradeRepository.cs b/DragaliaAPI/DragaliaAPI/Features/Trade/TradeRepository.cs index f0a645c23..fc4e8ed2e 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Trade/TradeRepository.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Trade/TradeRepository.cs @@ -51,7 +51,7 @@ public async Task AddTrade(TradeType type, int id, int count, DateTimeOffs Type = type, Id = id, Count = count, - LastTradeTime = actualTime + LastTradeTime = actualTime, } ); diff --git a/DragaliaAPI/DragaliaAPI/Features/Trade/TradeService.cs b/DragaliaAPI/DragaliaAPI/Features/Trade/TradeService.cs index 3af628bf7..50d7c609e 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Trade/TradeService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Trade/TradeService.cs @@ -48,7 +48,7 @@ public IEnumerable GetCurrentTreasureTradeList() x.Id, x.Quantity, x.LimitBreakCount - )) + )), }); } @@ -68,7 +68,7 @@ public IEnumerable GetCurrentAbilityCrestTradeList() PickupViewStartDate = trade.PickupViewStartDate, PickupViewEndDate = trade.PickupViewEndDate, NeedDewPoint = trade.NeedDewPoint, - Priority = trade.Priority + Priority = trade.Priority, }); } @@ -94,7 +94,7 @@ public IEnumerable GetEventTradeList(int tradeGroupId) .NeedEntities.Where(y => y.Type != EntityTypes.None) .Select(z => new AtgenBuildEventRewardEntityList(z.Type, z.Id, z.Quantity)), ReadStoryCount = 0, - ClearTargetQuestId = 0 + ClearTargetQuestId = 0, }); } @@ -137,19 +137,20 @@ public async Task DoTrade( TreasureTrade trade = tradeType switch { - TradeType.None - => throw new DragaliaException( - ResultCode.CommonDataValidationError, - "Invalid trade type none" - ), + TradeType.None => throw new DragaliaException( + ResultCode.CommonDataValidationError, + "Invalid trade type none" + ), TradeType.Treasure => MasterAsset.TreasureTrade[tradeId], TradeType.Event => MasterAsset.EventTreasureTradeInfo[tradeId], - TradeType.AbilityCrest - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - "Cannot process ability crest type in normal trade endpoint" - ), - _ => throw new DragaliaException(ResultCode.CommonInvalidArgument, "Invalid trade type") + TradeType.AbilityCrest => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + "Cannot process ability crest type in normal trade endpoint" + ), + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + "Invalid trade type" + ), }; foreach ( @@ -191,7 +192,7 @@ await paymentService.ProcessPayment( trade.DestinationEntityId, trade.DestinationEntityQuantity * count, trade.DestinationLimitBreakCount - ) + ), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Version/Platform.cs b/DragaliaAPI/DragaliaAPI/Features/Version/Platform.cs index 564824679..1be4822b1 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Version/Platform.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Version/Platform.cs @@ -3,5 +3,5 @@ namespace DragaliaAPI.Features.Version; public enum Platform { Ios = 1, - Android = 2 + Android = 2, } diff --git a/DragaliaAPI/DragaliaAPI/Features/Version/ResourceVersionService.cs b/DragaliaAPI/DragaliaAPI/Features/Version/ResourceVersionService.cs index 5deb5cd73..2cfd9ec6f 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Version/ResourceVersionService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Version/ResourceVersionService.cs @@ -10,10 +10,9 @@ public string GetResourceVersion(Platform platform) => { Platform.Ios => options.CurrentValue.Ios, Platform.Android => options.CurrentValue.Android, - _ - => throw new ArgumentOutOfRangeException( - nameof(platform), - "Invalid platform identifier" - ) + _ => throw new ArgumentOutOfRangeException( + nameof(platform), + "Invalid platform identifier" + ), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Wall/WallController.cs b/DragaliaAPI/DragaliaAPI/Features/Wall/WallController.cs index db02d898a..bb3c12001 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Wall/WallController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Wall/WallController.cs @@ -45,7 +45,7 @@ CancellationToken cancellationToken WallId = session.WallId, WallLevel = session.WallLevel, IsHost = true, - } + }, } ); } @@ -131,7 +131,7 @@ public async Task ReceiveMonthlyReward(CancellationToken cancell new() { QuestGroupId = WallService.WallQuestGroupId, - IsReceiveReward = RewardStatus.Received + IsReceiveReward = RewardStatus.Received, }; UpdateDataList updateDataList = await updateDataService.SaveChangesAsync(cancellationToken); @@ -143,7 +143,7 @@ public async Task ReceiveMonthlyReward(CancellationToken cancell EntityResult = entityResult, WallMonthlyRewardList = rewardEntityList, UserWallRewardList = [userWallRewardList], - MonthlyWallReceiveList = [monthlyWallReceiveList] + MonthlyWallReceiveList = [monthlyWallReceiveList], }; return Ok(data); diff --git a/DragaliaAPI/DragaliaAPI/Features/Wall/WallRecordController.cs b/DragaliaAPI/DragaliaAPI/Features/Wall/WallRecordController.cs index 3ee85d24c..f8e4cbb78 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Wall/WallRecordController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Wall/WallRecordController.cs @@ -83,7 +83,7 @@ IEnumerable helperDetailList { QuestPartySettingList = dungeonSession.Party, HelperList = helperList, - HelperDetailList = helperDetailList + HelperDetailList = helperDetailList, }; AtgenWallDropReward wallDropReward = @@ -91,7 +91,7 @@ IEnumerable helperDetailList { RewardEntityList = new[] { GoldCrystals.ToBuildEventRewardEntityList() }, TakeCoin = Rupies.Quantity, - TakeMana = Mana.Quantity + TakeMana = Mana.Quantity, }; AtgenPlayWallDetail playWallDetail = @@ -99,7 +99,7 @@ IEnumerable helperDetailList { WallId = request.WallId, BeforeWallLevel = previousLevel, - AfterWallLevel = finishedLevel + AfterWallLevel = finishedLevel, }; // Grant Rewards @@ -129,7 +129,7 @@ IEnumerable helperDetailList PlayWallDetail = playWallDetail, WallClearRewardList = wallClearRewardList, WallDropReward = wallDropReward, - WallUnitInfo = wallUnitInfo + WallUnitInfo = wallUnitInfo, }; await dungeonService.RemoveSession(request.DungeonKey, cancellationToken); diff --git a/DragaliaAPI/DragaliaAPI/Features/Wall/WallService.cs b/DragaliaAPI/DragaliaAPI/Features/Wall/WallService.cs index de77f4878..3edb36d9c 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Wall/WallService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Wall/WallService.cs @@ -189,7 +189,7 @@ public List GetMonthlyRewardEntityList(int leve { EntityType = reward.RewardEntityType, EntityId = reward.RewardEntityId, - EntityQuantity = reward.RewardEntityQuantity + EntityQuantity = reward.RewardEntityQuantity, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Wall/WallStartController.cs b/DragaliaAPI/DragaliaAPI/Features/Wall/WallStartController.cs index b2713bd91..0e471f435 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Wall/WallStartController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Wall/WallStartController.cs @@ -55,7 +55,7 @@ CancellationToken cancellationToken IngameData = ingameData, IngameWallData = ingameWallData, OddsInfo = oddsInfo, - UpdateDataList = updateDataList + UpdateDataList = updateDataList, }; return Ok(data); @@ -97,7 +97,7 @@ CancellationToken cancellationToken IngameData = ingameData, IngameWallData = ingameWallData, OddsInfo = oddsInfo, - UpdateDataList = updateDataList + UpdateDataList = updateDataList, }; return Ok(data); diff --git a/DragaliaAPI/DragaliaAPI/Features/Web/News/NewsController.cs b/DragaliaAPI/DragaliaAPI/Features/Web/News/NewsController.cs index a6ffb4009..c1f7ea78f 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Web/News/NewsController.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Web/News/NewsController.cs @@ -24,8 +24,8 @@ CancellationToken cancellationToken return new() { - Pagination = new() { TotalCount = totalCount, }, - Data = data + Pagination = new() { TotalCount = totalCount }, + Data = data, }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Web/News/NewsService.cs b/DragaliaAPI/DragaliaAPI/Features/Web/News/NewsService.cs index 8a67922a9..fed4a474c 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Web/News/NewsService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Web/News/NewsService.cs @@ -48,6 +48,6 @@ private NewsItem MapNewsItem(DbNewsItem x) => Description = x.Description, Date = x.Date, HeaderImageSrc = webOptions.Value.GetImageSrc(x.HeaderImagePath), - BodyImageSrc = webOptions.Value.GetImageSrc(x.BodyImagePath) + BodyImageSrc = webOptions.Value.GetImageSrc(x.BodyImagePath), }; } diff --git a/DragaliaAPI/DragaliaAPI/Features/Web/Users/UserService.cs b/DragaliaAPI/DragaliaAPI/Features/Web/Users/UserService.cs index 773c99e2c..f611f3538 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Web/Users/UserService.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Web/Users/UserService.cs @@ -9,7 +9,7 @@ public class UserService(IPlayerIdentityService playerIdentityService, ApiContex public Task GetUser(CancellationToken cancellationToken) => apiContext .Players.Where(x => x.ViewerId == playerIdentityService.ViewerId) - .Select(x => new User() { Name = x.UserData!.Name, ViewerId = x.ViewerId, }) + .Select(x => new User() { Name = x.UserData!.Name, ViewerId = x.ViewerId }) .FirstAsync(cancellationToken); public Task GetUserProfile(CancellationToken cancellationToken) => @@ -17,7 +17,7 @@ public Task GetUserProfile(CancellationToken cancellationToken) => .PlayerUserData.Select(x => new UserProfile() { LastSaveImportTime = x.LastSaveImportTime, - LastLoginTime = x.LastLoginTime + LastLoginTime = x.LastLoginTime, }) .FirstAsync(cancellationToken); } diff --git a/DragaliaAPI/DragaliaAPI/Features/Web/WebAuthenticationHelper.cs b/DragaliaAPI/DragaliaAPI/Features/Web/WebAuthenticationHelper.cs index 9bceb146c..e96437d09 100644 --- a/DragaliaAPI/DragaliaAPI/Features/Web/WebAuthenticationHelper.cs +++ b/DragaliaAPI/DragaliaAPI/Features/Web/WebAuthenticationHelper.cs @@ -109,7 +109,7 @@ ILogger logger var dbPlayerInfo = await dbContext .Players.IgnoreQueryFilters() .Where(x => x.AccountId == gameAccountId) - .Select(x => new { x.ViewerId, x.UserData!.Name, }) + .Select(x => new { x.ViewerId, x.UserData!.Name }) .FirstOrDefaultAsync(); logger.LogDebug( @@ -139,7 +139,7 @@ await cache.SetJsonAsync( // The ID token lasts for one hour. We may retain cached data past the expiry of the ID token, but // that should be okay, since the JWT authentication will return an unauthorized result before reaching // this code. - AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(1) + AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(1), } ); diff --git a/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/DeveloperAuthenticationHandler.cs b/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/DeveloperAuthenticationHandler.cs index fa6732df7..9a398ee81 100644 --- a/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/DeveloperAuthenticationHandler.cs +++ b/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/DeveloperAuthenticationHandler.cs @@ -65,7 +65,7 @@ out AuthenticationHeaderValue? authHeader private AuthenticateResult GetSuccessResult() { - Claim[] claims = { new(ClaimTypes.Role, "Developer"), }; + Claim[] claims = { new(ClaimTypes.Role, "Developer") }; ClaimsIdentity identity = new(claims, this.Scheme.Name); ClaimsPrincipal principal = new(identity); AuthenticationTicket ticket = new(principal, this.Scheme.Name); diff --git a/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/ResultCodeLoggingMiddleware.cs b/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/ResultCodeLoggingMiddleware.cs index dec3f3997..02a977a1e 100644 --- a/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/ResultCodeLoggingMiddleware.cs +++ b/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/ResultCodeLoggingMiddleware.cs @@ -31,9 +31,8 @@ private static LogLevel GetLogLevelFromResultCode(ResultCode? code) => or ResultCode.Success or ResultCode.CommonChangeDate or ResultCode.CommonMaintenance - or ResultCode.CommonTimeout - => LogLevel.Information, - _ => LogLevel.Error + or ResultCode.CommonTimeout => LogLevel.Information, + _ => LogLevel.Error, }; private static partial class Log diff --git a/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/SessionAuthenticationHandler.cs b/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/SessionAuthenticationHandler.cs index a5f6faf06..b7a134e0e 100644 --- a/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/SessionAuthenticationHandler.cs +++ b/DragaliaAPI/DragaliaAPI/Infrastructure/Middleware/SessionAuthenticationHandler.cs @@ -87,7 +87,7 @@ protected override async Task HandleAuthenticateAsync() new() { new(CustomClaimType.AccountId, deviceAccountId), - new(CustomClaimType.ViewerId, viewerId) + new(CustomClaimType.ViewerId, viewerId), }; ClaimsIdentity identity = new(claims, this.Scheme.Name); diff --git a/DragaliaAPI/DragaliaAPI/Mapping/Mapperly/StoryMapper.cs b/DragaliaAPI/DragaliaAPI/Mapping/Mapperly/StoryMapper.cs index 405d4edc8..dcbb0d911 100644 --- a/DragaliaAPI/DragaliaAPI/Mapping/Mapperly/StoryMapper.cs +++ b/DragaliaAPI/DragaliaAPI/Mapping/Mapperly/StoryMapper.cs @@ -9,15 +9,15 @@ namespace DragaliaAPI.Mapping.Mapperly; public static partial class StoryMapper { public static UnitStoryList ToUnitStoryList(this DbPlayerStoryState dbEntity) => - new() { UnitStoryId = dbEntity.StoryId, IsRead = dbEntity.State == StoryState.Read, }; + new() { UnitStoryId = dbEntity.StoryId, IsRead = dbEntity.State == StoryState.Read }; [MapperRequiredMapping(RequiredMappingStrategy.Target)] [MapProperty(nameof(dbEntity.StoryId), nameof(QuestStoryList.QuestStoryId))] public static partial QuestStoryList ToQuestStoryList(this DbPlayerStoryState dbEntity); public static CastleStoryList ToCastleStoryList(this DbPlayerStoryState dbEntity) => - new() { CastleStoryId = dbEntity.StoryId, IsRead = dbEntity.State == StoryState.Read, }; + new() { CastleStoryId = dbEntity.StoryId, IsRead = dbEntity.State == StoryState.Read }; public static DmodeStoryList ToDmodeStoryList(this DbPlayerStoryState dbEntity) => - new() { DmodeStoryId = dbEntity.StoryId, IsRead = dbEntity.State == StoryState.Read, }; + new() { DmodeStoryId = dbEntity.StoryId, IsRead = dbEntity.State == StoryState.Read }; } diff --git a/DragaliaAPI/DragaliaAPI/Mapping/Mapperly/SummonMapper.cs b/DragaliaAPI/DragaliaAPI/Mapping/Mapperly/SummonMapper.cs index a79dc31d3..9b2facd7f 100644 --- a/DragaliaAPI/DragaliaAPI/Mapping/Mapperly/SummonMapper.cs +++ b/DragaliaAPI/DragaliaAPI/Mapping/Mapperly/SummonMapper.cs @@ -8,7 +8,7 @@ namespace DragaliaAPI.Mapping.Mapperly; public static partial class SummonMapper { public static UserSummonList MapToUserSummonList(this DbPlayerBannerData bannerData) => - new() { SummonId = bannerData.SummonBannerId, SummonCount = bannerData.SummonCount, }; + new() { SummonId = bannerData.SummonBannerId, SummonCount = bannerData.SummonCount }; public static SummonPointList MapToSummonPointList(this DbPlayerBannerData bannerData) => new() @@ -17,7 +17,7 @@ public static SummonPointList MapToSummonPointList(this DbPlayerBannerData banne SummonPoint = bannerData.SummonPoints, CsSummonPoint = bannerData.ConsecutionSummonPoints, CsPointTermMinDate = bannerData.ConsecutionSummonPointsMinDate, - CsPointTermMaxDate = bannerData.ConsecutionSummonPointsMaxDate + CsPointTermMaxDate = bannerData.ConsecutionSummonPointsMaxDate, }; [MapperRequiredMapping(RequiredMappingStrategy.Target)] diff --git a/DragaliaAPI/DragaliaAPI/MessagePack/CustomResolver.cs b/DragaliaAPI/DragaliaAPI/MessagePack/CustomResolver.cs index 287361417..d21e0ae1b 100644 --- a/DragaliaAPI/DragaliaAPI/MessagePack/CustomResolver.cs +++ b/DragaliaAPI/DragaliaAPI/MessagePack/CustomResolver.cs @@ -15,7 +15,7 @@ public class CustomResolver : IFormatterResolver private static readonly IFormatterResolver[] Resolvers = new IFormatterResolver[] { - StandardResolver.Instance + StandardResolver.Instance, }; private CustomResolver() { } diff --git a/DragaliaAPI/DragaliaAPI/Models/Generated/PartySettingList.cs b/DragaliaAPI/DragaliaAPI/Models/Generated/PartySettingList.cs index 783c3ec93..9536b1586 100644 --- a/DragaliaAPI/DragaliaAPI/Models/Generated/PartySettingList.cs +++ b/DragaliaAPI/DragaliaAPI/Models/Generated/PartySettingList.cs @@ -30,6 +30,6 @@ public IEnumerable GetAbilityCrestList() => this.EquipCrestSlotType2CrestId1, this.EquipCrestSlotType2CrestId2, this.EquipCrestSlotType3CrestId1, - this.EquipCrestSlotType3CrestId2 + this.EquipCrestSlotType3CrestId2, }; } diff --git a/DragaliaAPI/DragaliaAPI/Models/Generated/UpdateDataList.cs b/DragaliaAPI/DragaliaAPI/Models/Generated/UpdateDataList.cs index b8906d053..3098ee09a 100644 --- a/DragaliaAPI/DragaliaAPI/Models/Generated/UpdateDataList.cs +++ b/DragaliaAPI/DragaliaAPI/Models/Generated/UpdateDataList.cs @@ -182,7 +182,7 @@ public List? PartyList { PartyName = x.PartyName, PartyNo = x.PartyNo, - PartySettingList = x.PartySettingList.OrderBy(y => y.UnitNo) + PartySettingList = x.PartySettingList.OrderBy(y => y.UnitNo), }) .ToList(); } diff --git a/DragaliaAPI/DragaliaAPI/Models/Results/DragaliaResult.cs b/DragaliaAPI/DragaliaAPI/Models/Results/DragaliaResult.cs index b26f2a940..c9e7c2320 100644 --- a/DragaliaAPI/DragaliaAPI/Models/Results/DragaliaResult.cs +++ b/DragaliaAPI/DragaliaAPI/Models/Results/DragaliaResult.cs @@ -36,7 +36,7 @@ public IActionResult Convert() return new ObjectResult(new DragaliaResponse(this.Value)) { DeclaredType = typeof(DragaliaResponse), - StatusCode = StatusCodes.Status200OK + StatusCode = StatusCodes.Status200OK, }; } } diff --git a/DragaliaAPI/DragaliaAPI/Models/Results/ResultCode.cs b/DragaliaAPI/DragaliaAPI/Models/Results/ResultCode.cs index 1da10b52d..73244b0ff 100644 --- a/DragaliaAPI/DragaliaAPI/Models/Results/ResultCode.cs +++ b/DragaliaAPI/DragaliaAPI/Models/Results/ResultCode.cs @@ -586,5 +586,5 @@ public enum ResultCode MaintenanceDmodeExpedition, MaintenanceDmodeQuest, MaintenanceDmodeStory, - SystemError = 99999 + SystemError = 99999, } diff --git a/DragaliaAPI/DragaliaAPI/Pages/OAuthCallback.cshtml.cs b/DragaliaAPI/DragaliaAPI/Pages/OAuthCallback.cshtml.cs index 388e410da..dff431e71 100644 --- a/DragaliaAPI/DragaliaAPI/Pages/OAuthCallback.cshtml.cs +++ b/DragaliaAPI/DragaliaAPI/Pages/OAuthCallback.cshtml.cs @@ -73,7 +73,7 @@ private async Task Authenticate(string sessionTokenCode) { { "client_id", options.CurrentValue.ClientId }, { "session_token_code", sessionTokenCode }, - { "session_token_code_verifier", options.CurrentValue.ChallengeString } + { "session_token_code_verifier", options.CurrentValue.ChallengeString }, }; HttpResponseMessage sessionTokenResponse = await httpClient.PostAsync( diff --git a/DragaliaAPI/DragaliaAPI/Program.cs b/DragaliaAPI/DragaliaAPI/Program.cs index 1eb98eab3..bdc87996f 100644 --- a/DragaliaAPI/DragaliaAPI/Program.cs +++ b/DragaliaAPI/DragaliaAPI/Program.cs @@ -260,7 +260,7 @@ [FromServices] IOptionsMonitor patchOptions Mode = patchOptions.CurrentValue.Mode, ConeshellKey = patchOptions.CurrentValue.ConeshellKey, CdnUrl = patchOptions.CurrentValue.CdnUrl, - UseUnifiedLogin = loginOptions.CurrentValue.UseBaasLogin + UseUnifiedLogin = loginOptions.CurrentValue.UseBaasLogin, } ); diff --git a/DragaliaAPI/DragaliaAPI/Services/Api/BaasApi.cs b/DragaliaAPI/DragaliaAPI/Services/Api/BaasApi.cs index 759c9d110..afb7de777 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Api/BaasApi.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Api/BaasApi.cs @@ -93,7 +93,7 @@ await savefileResponse.Content.ReadFromJsonAsync< HttpRequestMessage request = new(HttpMethod.Get, "/gameplay/v1/user") { - Headers = { Authorization = new AuthenticationHeaderValue("Bearer", idToken) } + Headers = { Authorization = new AuthenticationHeaderValue("Bearer", idToken) }, }; HttpResponseMessage response = await client.SendAsync(request); diff --git a/DragaliaAPI/DragaliaAPI/Services/Game/BonusService.cs b/DragaliaAPI/DragaliaAPI/Services/Game/BonusService.cs index ecb5cac38..37548e16d 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Game/BonusService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Game/BonusService.cs @@ -93,7 +93,7 @@ await fortRepository return new AtgenEventBoost() { EventEffect = detail.EventEffectType, - EffectValue = detail.EventEffectArgs + EffectValue = detail.EventEffectArgs, }; } @@ -104,7 +104,7 @@ private static IEnumerable GetFortElementBonus(IEnumerable x.ElementalType, x => x); @@ -142,7 +142,7 @@ private static IEnumerable GetFortParamBonus(IEnumerable b { WeaponType = x, Hp = 0, - Attack = 0 + Attack = 0, }) .ToDictionary(x => x.WeaponType, x => x); @@ -227,7 +227,7 @@ IEnumerable weaponBodyIds { WeaponType = x, Hp = 0, - Attack = 0 + Attack = 0, }) .ToDictionary(x => x.WeaponType, x => x); @@ -260,36 +260,32 @@ private static class StubData * 100 #endif , - Attack = 14.1f -#if CHEATING - * 100 -#endif - , + Attack = 14.1f, }, new() { ElementalType = UnitElement.Water, Hp = 13.8f, - Attack = 13.8f + Attack = 13.8f, }, new() { ElementalType = UnitElement.Wind, Hp = 13.9f, - Attack = 13.9f + Attack = 13.9f, }, new() { ElementalType = UnitElement.Light, Hp = 14.5f, - Attack = 14.5f + Attack = 14.5f, }, new() { ElementalType = UnitElement.Dark, Hp = 13.3f, - Attack = 13.3f - } + Attack = 13.3f, + }, } ); @@ -306,36 +302,32 @@ private static class StubData * 100 #endif , - Attack = 5f -#if CHEATING - * 100 -#endif - , + Attack = 5f, }, new() { ElementalType = UnitElement.Water, Hp = 5.4f, - Attack = 4.6f + Attack = 4.6f, }, new() { ElementalType = UnitElement.Wind, Hp = 6.3f, - Attack = 5.4f + Attack = 5.4f, }, new() { ElementalType = UnitElement.Light, Hp = 6.0f, - Attack = 5.2f + Attack = 5.2f, }, new() { ElementalType = UnitElement.Dark, Hp = 7.3f, - Attack = 6.4f - } + Attack = 6.4f, + }, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Services/Game/DragonService.cs b/DragaliaAPI/DragaliaAPI/Services/Game/DragonService.cs index 41125d357..69e4ed256 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Game/DragonService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Game/DragonService.cs @@ -56,7 +56,7 @@ public async Task DoDragonGetContactData() { DragonGiftId = (int)x.DragonGiftId, Price = DragonConstants.BuyGiftPrices.GetValueOrDefault(x.DragonGiftId, 0), - IsBuy = x.Quantity > 0 + IsBuy = x.Quantity > 0, }) .ToList(); return new DragonGetContactDataResponse(giftList); @@ -64,7 +64,7 @@ public async Task DoDragonGetContactData() public Task GetFreeGiftCount() { - DragonGifts[] notificationGifts = [DragonGifts.FreshBread,]; + DragonGifts[] notificationGifts = [DragonGifts.FreshBread]; return apiContext.PlayerDragonGifts.CountAsync(x => notificationGifts.Contains(x.DragonGiftId) && x.Quantity > 0 @@ -166,14 +166,14 @@ IEnumerable> giftsAndQuantity Materials.Omnicite, Materials.SucculentDragonfruit, Materials.Talonstone, - Materials.SunlightOre + Materials.SunlightOre, }.ToImmutableArray(); private static readonly int[][] DragonLevelRewardQuantity = new int[][] { new int[] { 999999, 3, 999999, 2, 5, 1 }, new int[] { 999999, 4, 999999, 3, 7, 1 }, - new int[] { 999999, 5, 999999, 4, 10, 1 } + new int[] { 999999, 5, 999999, 4, 10, 1 }, }; private static readonly ImmutableArray PuppyLevelReward = new Materials[] @@ -183,7 +183,7 @@ IEnumerable> giftsAndQuantity Materials.HalfEatenBread, Materials.HalfEatenBread, Materials.HalfEatenBread, - Materials.ImitationSquish + Materials.ImitationSquish, }.ToImmutableArray(); private static readonly int[] PuppyLevelRewardQuantity = new int[] { 1, 21, 28, 34, 40, 1 }; @@ -263,7 +263,7 @@ private async Task< Materials.FiendsEye, Materials.Granite, Materials.OldCloth, - Materials.SolidFungus + Materials.SolidFungus, }; int rewardQuantity = 5; foreach (DragonGifts gift in gifts) @@ -296,19 +296,19 @@ UnitElement dragonElement { UpgradeMaterials.t1Orbs, UpgradeMaterials.t2Orbs, - UpgradeMaterials.t3Orbs + UpgradeMaterials.t3Orbs, }; int[][] rarityQuantities = new int[][] { new int[] { 3, 4, 5 }, new int[] { 1, 2, 3 }, - new int[] { 1 } + new int[] { 1 }, }; Materials[] fruits = new Materials[] { Materials.Dragonfruit, Materials.RipeDragonfruit, - Materials.SucculentDragonfruit + Materials.SucculentDragonfruit, }; List>> giftsPerGift = new List>>(); @@ -441,7 +441,7 @@ await this.IncreaseDragonReliability( DragonConstants.RotatingGifts[(int)dragonData.FavoriteType] == gift, RewardReliabilityList = levelGifts.FirstOrDefault(x => x.Item1 == gift)?.Item2 - ?? Enumerable.Empty() + ?? Enumerable.Empty(), } ); @@ -471,7 +471,7 @@ await this.IncreaseDragonReliability( DragonGiftRewardList = rewardObjList, EntityResult = null, ShopGiftList = (await DoDragonGetContactData()).ShopGiftList, - UpdateDataList = updateDataList + UpdateDataList = updateDataList, }; } @@ -506,7 +506,7 @@ CancellationToken cancellationToken List> requestGift = new List>() { - Tuple.Create(request.DragonGiftId, request.Quantity) + Tuple.Create(request.DragonGiftId, request.Quantity), }; DragonData dragonData = MasterAsset.DragonData.Get(dragonReliability.DragonId); @@ -547,7 +547,7 @@ await RollPuppyThankYouRewards(new List() { request.DragonGiftId }) RewardReliabilityList = levelGifts.FirstOrDefault()?.Item2 ?? Enumerable.Empty(), ReturnGiftList = rewards.First().Item2, - UpdateDataList = updateDataList + UpdateDataList = updateDataList, }; } @@ -896,11 +896,11 @@ await inventoryRepository.GetMaterial(dragonData.LimitBreakMaterialId) { DeleteDragonList = deleteDragons.Select(x => new AtgenDeleteDragonList() { - DragonKeyId = x.TargetId - }) + DragonKeyId = x.TargetId, + }), }, UpdateDataList = udl, - EntityResult = null + EntityResult = null, }; } @@ -994,7 +994,7 @@ CancellationToken cancellationToken new DeleteDataList( request.DragonKeyIdList.Select(x => new AtgenDeleteDragonList() { - DragonKeyId = x + DragonKeyId = x, }), new List(), new List(), diff --git a/DragaliaAPI/DragaliaAPI/Services/Game/HelperService.cs b/DragaliaAPI/DragaliaAPI/Services/Game/HelperService.cs index 0b8197b5e..a98107220 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Game/HelperService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Game/HelperService.cs @@ -69,7 +69,7 @@ public async Task GetLeadUnit(int partyNo) Level = userData.Level, EmblemId = userData.EmblemId, MaxPartyPower = 1000, - Guild = new() { GuildId = 0, } + Guild = new() { GuildId = 0 }, }; this.mapper.Map(detailedUnit, supportList); @@ -109,7 +109,7 @@ AtgenSupportUserDetailList helperDetails CrestSlotType3CrestList = helperInfo.SupportCrestSlotType3List.Select( this.mapper.Map ), - TalismanData = this.mapper.Map(helperInfo.SupportTalisman) + TalismanData = this.mapper.Map(helperInfo.SupportTalisman), }; } @@ -145,11 +145,11 @@ internal static class StubData ExAbility2Level = 1, Skill1Level = 1, Skill2Level = 0, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, - SupportDragon = new() { DragonKeyId = 0, }, - SupportWeaponBody = new() { WeaponBodyId = 0, }, - SupportTalisman = new() { TalismanKeyId = 0, }, + SupportDragon = new() { DragonKeyId = 0 }, + SupportWeaponBody = new() { WeaponBodyId = 0 }, + SupportTalisman = new() { TalismanKeyId = 0 }, SupportCrestSlotType1List = new List() { new() { AbilityCrestId = 0 }, @@ -166,7 +166,7 @@ internal static class StubData new() { AbilityCrestId = 0 }, new() { AbilityCrestId = 0 }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -193,7 +193,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -207,7 +207,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -218,14 +218,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaEmile, AdditionalAttack = 100, - AdditionalHp = 100 + AdditionalHp = 100, }, SupportCrestSlotType1List = new List() { @@ -236,7 +236,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -245,7 +245,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -254,7 +254,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -266,7 +266,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -275,7 +275,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -287,7 +287,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -296,10 +296,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -326,7 +326,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -340,7 +340,7 @@ internal static class StubData Ability2Level = 6, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 5 + LimitBreakCount = 5, }, SupportWeaponBody = new() { @@ -351,14 +351,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Alberius, TalismanAbilityId1 = 340000030, - TalismanAbilityId2 = 340000132 + TalismanAbilityId2 = 340000132, }, SupportCrestSlotType1List = new List() { @@ -369,7 +369,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -378,7 +378,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -387,7 +387,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -399,7 +399,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -408,7 +408,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -420,7 +420,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -429,10 +429,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -459,7 +459,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -473,7 +473,7 @@ internal static class StubData Ability2Level = 6, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 5 + LimitBreakCount = 5, }, SupportWeaponBody = new() { @@ -484,14 +484,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Grace, TalismanAbilityId1 = 340000070, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -502,7 +502,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -511,7 +511,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -520,7 +520,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -532,7 +532,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -541,7 +541,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -553,7 +553,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -562,10 +562,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -592,7 +592,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -606,7 +606,7 @@ internal static class StubData Ability2Level = 6, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 5 + LimitBreakCount = 5, }, SupportWeaponBody = new() { @@ -617,14 +617,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.SummerVerica, TalismanAbilityId1 = 340000010, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -635,7 +635,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -644,7 +644,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -653,7 +653,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -665,7 +665,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -674,7 +674,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -686,7 +686,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -695,10 +695,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -725,7 +725,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -739,7 +739,7 @@ internal static class StubData Ability2Level = 0, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -750,14 +750,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.KimonoElisanne, TalismanAbilityId1 = 340000010, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -768,7 +768,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -777,7 +777,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -786,7 +786,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -798,7 +798,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -807,7 +807,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -819,7 +819,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -828,10 +828,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -858,7 +858,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -872,7 +872,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -883,14 +883,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Elisanne, TalismanAbilityId1 = 340000010, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -901,7 +901,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -910,7 +910,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -919,7 +919,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -931,7 +931,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -940,7 +940,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -952,7 +952,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -961,10 +961,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -991,7 +991,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -1005,7 +1005,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -1016,14 +1016,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Tobias, TalismanAbilityId1 = 340000010, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -1034,7 +1034,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1043,7 +1043,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1052,7 +1052,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -1064,7 +1064,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1073,7 +1073,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -1085,7 +1085,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1094,10 +1094,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -1124,7 +1124,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -1138,7 +1138,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -1149,14 +1149,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Akasha, TalismanAbilityId1 = 340000010, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -1167,7 +1167,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1176,7 +1176,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1185,7 +1185,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -1197,7 +1197,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1206,7 +1206,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -1218,7 +1218,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1227,10 +1227,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -1257,7 +1257,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -1271,7 +1271,7 @@ internal static class StubData Ability2Level = 6, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 5 + LimitBreakCount = 5, }, SupportWeaponBody = new() { @@ -1282,14 +1282,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Patia, TalismanAbilityId1 = 340000010, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -1300,7 +1300,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1309,7 +1309,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1318,7 +1318,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -1330,7 +1330,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1339,7 +1339,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -1351,7 +1351,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1360,10 +1360,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -1390,7 +1390,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -1404,7 +1404,7 @@ internal static class StubData Ability2Level = 6, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 5 + LimitBreakCount = 5, }, SupportWeaponBody = new() { @@ -1415,14 +1415,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Delphi, TalismanAbilityId1 = 340000030, - TalismanAbilityId2 = 340000132 + TalismanAbilityId2 = 340000132, }, SupportCrestSlotType1List = new List() { @@ -1433,7 +1433,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1442,7 +1442,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1451,7 +1451,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -1463,7 +1463,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1472,7 +1472,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -1484,7 +1484,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1493,10 +1493,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -1523,7 +1523,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -1537,7 +1537,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -1548,14 +1548,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Lily, TalismanAbilityId1 = 340000030, - TalismanAbilityId2 = 340000132 + TalismanAbilityId2 = 340000132, }, SupportCrestSlotType1List = new List() { @@ -1566,7 +1566,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1575,7 +1575,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1584,7 +1584,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -1596,7 +1596,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1605,7 +1605,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -1617,7 +1617,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1626,10 +1626,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -1656,7 +1656,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -1670,7 +1670,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -1681,14 +1681,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaLeif, TalismanAbilityId1 = 340000030, - TalismanAbilityId2 = 340000132 + TalismanAbilityId2 = 340000132, }, SupportCrestSlotType1List = new List() { @@ -1699,7 +1699,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1708,7 +1708,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1717,7 +1717,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -1729,7 +1729,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1738,7 +1738,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -1750,7 +1750,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1759,10 +1759,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -1789,7 +1789,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -1803,7 +1803,7 @@ internal static class StubData Ability2Level = 6, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 5 + LimitBreakCount = 5, }, SupportWeaponBody = new() { @@ -1814,14 +1814,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Delphi, TalismanAbilityId1 = 340000030, - TalismanAbilityId2 = 340000132 + TalismanAbilityId2 = 340000132, }, SupportCrestSlotType1List = new List() { @@ -1832,7 +1832,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1841,7 +1841,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1850,7 +1850,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -1862,7 +1862,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1871,7 +1871,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -1883,7 +1883,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1892,10 +1892,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -1922,7 +1922,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -1936,7 +1936,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -1947,14 +1947,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.Vixel, TalismanAbilityId1 = 340000010, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -1965,7 +1965,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1974,7 +1974,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -1983,7 +1983,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -1995,7 +1995,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2004,7 +2004,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -2016,7 +2016,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2025,10 +2025,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -2055,7 +2055,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 4, Skill2Level = 3, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -2069,7 +2069,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -2080,14 +2080,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaZena, TalismanAbilityId1 = 340000010, - TalismanAbilityId2 = 340000134 + TalismanAbilityId2 = 340000134, }, SupportCrestSlotType1List = new List() { @@ -2098,7 +2098,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2107,7 +2107,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2116,7 +2116,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -2128,7 +2128,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2137,7 +2137,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -2149,7 +2149,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2158,10 +2158,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -2188,7 +2188,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -2202,7 +2202,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -2213,14 +2213,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaNotte, TalismanAbilityId1 = 340000030, - TalismanAbilityId2 = 340000132 + TalismanAbilityId2 = 340000132, }, SupportCrestSlotType1List = new List() { @@ -2231,7 +2231,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2240,7 +2240,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2249,7 +2249,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -2261,7 +2261,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2270,7 +2270,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -2282,7 +2282,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2291,10 +2291,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -2335,7 +2335,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -2346,14 +2346,14 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaMym, TalismanAbilityId1 = 340000030, - TalismanAbilityId2 = 340000132 + TalismanAbilityId2 = 340000132, }, SupportCrestSlotType1List = new List() { @@ -2364,7 +2364,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2373,7 +2373,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2382,7 +2382,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -2394,7 +2394,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2403,7 +2403,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -2415,7 +2415,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2424,10 +2424,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -2468,7 +2468,7 @@ internal static class StubData Ability2Level = 6, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 5 + LimitBreakCount = 5, }, SupportWeaponBody = new() { @@ -2479,7 +2479,7 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { @@ -2487,7 +2487,7 @@ internal static class StubData TalismanId = Talismans.HumanoidZodiark, // Crit easy TalismanAbilityId1 = 340000030, - TalismanAbilityId2 = 340000132 + TalismanAbilityId2 = 340000132, }, SupportCrestSlotType1List = new List() { @@ -2498,7 +2498,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2507,7 +2507,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2516,7 +2516,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -2528,7 +2528,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2537,7 +2537,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -2549,7 +2549,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2558,10 +2558,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -2602,7 +2602,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -2613,14 +2613,16 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaMym, TalismanAbilityId1 = 340000030, // Critical Rate +15% - TalismanAbilityId2 = 340000132 // Easy Hitter I + TalismanAbilityId2 = + 340000132 // Easy Hitter I + , }, SupportCrestSlotType1List = new List() { @@ -2631,7 +2633,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2640,7 +2642,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2649,7 +2651,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -2661,7 +2663,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2670,7 +2672,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -2682,7 +2684,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2691,10 +2693,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -2721,7 +2723,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -2735,7 +2737,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -2746,14 +2748,16 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaMym, TalismanAbilityId1 = 340000030, // Critical Rate +15% - TalismanAbilityId2 = 340000132 // Easy Hitter I + TalismanAbilityId2 = + 340000132 // Easy Hitter I + , }, SupportCrestSlotType1List = new List() { @@ -2764,7 +2768,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2773,7 +2777,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2782,7 +2786,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -2794,7 +2798,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2803,7 +2807,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -2815,7 +2819,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2824,10 +2828,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, new() { @@ -2854,7 +2858,7 @@ internal static class StubData ExAbility2Level = 5, Skill1Level = 3, Skill2Level = 2, - IsUnlockEditSkill = true + IsUnlockEditSkill = true, }, SupportDragon = new() { @@ -2868,7 +2872,7 @@ internal static class StubData Ability2Level = 5, HpPlusCount = 50, AttackPlusCount = 50, - LimitBreakCount = 4 + LimitBreakCount = 4, }, SupportWeaponBody = new() { @@ -2879,14 +2883,16 @@ internal static class StubData EquipableCount = 4, AdditionalCrestSlotType1Count = 1, AdditionalCrestSlotType2Count = 0, - AdditionalCrestSlotType3Count = 2 + AdditionalCrestSlotType3Count = 2, }, SupportTalisman = new() { TalismanKeyId = 0, TalismanId = Talismans.GalaMym, TalismanAbilityId1 = 340000030, // Critical Rate +15% - TalismanAbilityId2 = 340000132 // Easy Hitter I + TalismanAbilityId2 = + 340000132 // Easy Hitter I + , }, SupportCrestSlotType1List = new List() { @@ -2897,7 +2903,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2906,7 +2912,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2915,7 +2921,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType2List = new List() @@ -2927,7 +2933,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2936,7 +2942,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 50, AttackPlusCount = 50, - EquipableCount = 4 + EquipableCount = 4, }, }, SupportCrestSlotType3List = new List() @@ -2948,7 +2954,7 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 + EquipableCount = 4, }, new() { @@ -2957,10 +2963,10 @@ internal static class StubData LimitBreakCount = 4, HpPlusCount = 40, AttackPlusCount = 40, - EquipableCount = 4 - } + EquipableCount = 4, + }, }, - Guild = new() { GuildId = 0, GuildName = "Guild" } + Guild = new() { GuildId = 0, GuildName = "Guild" }, }, }, SupportUserDetailList = new List() @@ -2969,135 +2975,135 @@ internal static class StubData { ViewerId = 1000, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1001, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1002, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1003, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1004, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1005, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1006, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1007, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1008, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1009, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1010, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1011, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1012, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1013, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1014, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1015, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1016, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1017, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1018, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1019, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1020, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, new() { ViewerId = 1021, GettableManaPoint = 50, - IsFriend = true + IsFriend = true, }, - } + }, }; } } diff --git a/DragaliaAPI/DragaliaAPI/Services/Game/LoadService.cs b/DragaliaAPI/DragaliaAPI/Services/Game/LoadService.cs index 2a2c0c98d..4b7dea8d8 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Game/LoadService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Game/LoadService.cs @@ -214,7 +214,7 @@ public static partial class LoadMapper public static partial IQueryable ProjectToSavefile(this IQueryable query); public static UnitStoryList MapToUnitStoryList(this GenericStory story) => - new() { UnitStoryId = story.StoryId, IsRead = story.State == StoryState.Read, }; + new() { UnitStoryId = story.StoryId, IsRead = story.State == StoryState.Read }; public static QuestStoryList MapToQuestStoryList(this GenericStory story) => new() { QuestStoryId = story.StoryId, State = story.State }; @@ -227,11 +227,11 @@ public static UserTreasureTradeList MapToUserTreasureTradeList(this GenericTrade { TreasureTradeId = trade.Id, TradeCount = trade.Count, - LastResetTime = trade.LastTradeTime + LastResetTime = trade.LastTradeTime, }; public static UserSummonList MapToUserSummonList(this BannerData bannerData) => - new() { SummonId = bannerData.SummonBannerId, SummonCount = bannerData.SummonCount, }; + new() { SummonId = bannerData.SummonBannerId, SummonCount = bannerData.SummonCount }; [MapProperty(nameof(DbPlayerDragonData.Level), nameof(DragonReliabilityList.ReliabilityLevel))] [MapProperty(nameof(DbPlayerDragonData.Exp), nameof(DragonReliabilityList.ReliabilityTotalExp))] diff --git a/DragaliaAPI/DragaliaAPI/Services/Game/SavefileService.cs b/DragaliaAPI/DragaliaAPI/Services/Game/SavefileService.cs index 9b335b62f..afdc9329b 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Game/SavefileService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Game/SavefileService.cs @@ -59,7 +59,7 @@ public static string PendingImport(string deviceAccountId) => new() { // Keys should be automatically removed, but just in case - AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(LockFailsafeExpiryMin) + AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(LockFailsafeExpiryMin), }; /// @@ -369,7 +369,7 @@ out DbTalisman? talisman { EmblemId = savefile.UserData.EmblemId, GetTime = DateTimeOffset.UnixEpoch, - IsNew = false + IsNew = false, } ); } @@ -615,27 +615,27 @@ private static void AddDefaultParties(DbPlayer player) { PartyNo = x, UnitNo = 1, - CharaId = Charas.ThePrince + CharaId = Charas.ThePrince, }, new() { PartyNo = x, UnitNo = 2, - CharaId = Charas.Empty + CharaId = Charas.Empty, }, new() { PartyNo = x, UnitNo = 3, - CharaId = Charas.Empty + CharaId = Charas.Empty, }, new() { PartyNo = x, UnitNo = 4, - CharaId = Charas.Empty - } - } + CharaId = Charas.Empty, + }, + }, }) ); } @@ -654,7 +654,7 @@ private static void AddDefaultCharacters(DbPlayer player) ViewerId = player.ViewerId, StoryType = StoryTypes.Chara, StoryId = story.StoryIds[0], - State = 0 + State = 0, } ); } @@ -682,7 +682,7 @@ private static void AddDefaultEmblem(DbPlayer player) { EmblemId = DefaultSavefileData.DefaultEmblem, GetTime = DateTimeOffset.UnixEpoch, - IsNew = false + IsNew = false, } ); } diff --git a/DragaliaAPI/DragaliaAPI/Services/Game/SessionService.cs b/DragaliaAPI/DragaliaAPI/Services/Game/SessionService.cs index c8b513ad4..be709b688 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Game/SessionService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Game/SessionService.cs @@ -30,7 +30,7 @@ public class SessionService : ISessionService private DistributedCacheEntryOptions CacheOptions => new() { - SlidingExpiration = TimeSpan.FromMinutes(options.CurrentValue.SessionExpiryTimeMinutes) + SlidingExpiration = TimeSpan.FromMinutes(options.CurrentValue.SessionExpiryTimeMinutes), }; public SessionService( diff --git a/DragaliaAPI/DragaliaAPI/Services/Game/WeaponService.cs b/DragaliaAPI/DragaliaAPI/Services/Game/WeaponService.cs index 2d2523ea5..1952b1ab6 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Game/WeaponService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Game/WeaponService.cs @@ -136,7 +136,7 @@ AtgenBuildupWeaponBodyPieceList buildup { BuildupPieceTypes.Passive => await this.TryBuildupPassive(body, buildup), BuildupPieceTypes.Stats => await this.TryBuildupStats(body, buildup), - _ => await this.TryBuildupGeneric(body, buildup) + _ => await this.TryBuildupGeneric(body, buildup), }; } @@ -424,11 +424,10 @@ ref long coin 6 => Materials.AdamantiteIngot, 5 => Materials.DamascusIngot, 4 => Materials.SteelBrick, - _ - => throw new DragaliaException( - ResultCode.CommonInvalidArgument, - "Invalid dedicated material rarity" - ) + _ => throw new DragaliaException( + ResultCode.CommonInvalidArgument, + "Invalid dedicated material rarity" + ), }; materialMap = new Dictionary() { { mat, 1 } }; diff --git a/DragaliaAPI/DragaliaAPI/Services/Photon/HeroParamService.cs b/DragaliaAPI/DragaliaAPI/Services/Photon/HeroParamService.cs index dba096d4b..9c100a2a2 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Photon/HeroParamService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Photon/HeroParamService.cs @@ -34,7 +34,7 @@ IPlayerIdentityService playerIdentityService { WeaponTypes.Bow, WeaponBodies.BattlewornBow }, { WeaponTypes.Rod, WeaponBodies.BattlewornWand }, { WeaponTypes.Cane, WeaponBodies.BattlewornStaff }, - { WeaponTypes.Gun, WeaponBodies.BattlewornManacaster } + { WeaponTypes.Gun, WeaponBodies.BattlewornManacaster }, }.ToImmutableDictionary(); public async Task> GetHeroParam(long viewerId, int partySlot) diff --git a/DragaliaAPI/DragaliaAPI/Services/Photon/MatchingService.cs b/DragaliaAPI/DragaliaAPI/Services/Photon/MatchingService.cs index fa332182d..9df6d3bc7 100644 --- a/DragaliaAPI/DragaliaAPI/Services/Photon/MatchingService.cs +++ b/DragaliaAPI/DragaliaAPI/Services/Photon/MatchingService.cs @@ -178,7 +178,7 @@ private async Task MapRoomList(ApiGame game) Status = game.MemberNum >= 4 ? RoomStatuses.Full : RoomStatuses.Available, RoomMemberList = game.Players.Select(x => new AtgenRoomMemberList() { - ViewerId = (ulong)x.ViewerId + ViewerId = (ulong)x.ViewerId, }), EntryType = 1, StartEntryTime = game.StartEntryTime, diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin.Test/MemberCountTableTest.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin.Test/MemberCountTableTest.cs index e7655f0d7..5faa5bb5e 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin.Test/MemberCountTableTest.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin.Test/MemberCountTableTest.cs @@ -30,7 +30,7 @@ public BuildMemberCountTableData() { 1, 1 }, { 2, 1 }, { 3, 1 }, - { 4, 1 } + { 4, 1 }, } ); @@ -55,7 +55,7 @@ public BuildMemberCountTableData() { { 1, 1 }, { 2, 1 }, - { 3, 2 } + { 3, 2 }, } ); @@ -70,7 +70,7 @@ public BuildMemberCountTableData() { { 1, 1 }, { 2, 1 }, - { 3, 1 } + { 3, 1 }, } ); } diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/Discord/DiscordPlugin.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/Discord/DiscordPlugin.cs index 7d0f14037..3c0f6da3b 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/Discord/DiscordPlugin.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/Discord/DiscordPlugin.cs @@ -19,7 +19,7 @@ public class DiscordPlugin : PluginBase private static readonly JsonSerializerOptions JsonOptions = new JsonSerializerOptions() { - PropertyNamingPolicy = JsonNamingPolicy.CamelCase + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, }; private readonly PluginConfiguration configuration; @@ -42,7 +42,7 @@ public override void OnCreateGame(ICreateGameCallInfo info) this.PluginHost.GameId, info.Request.GameProperties ), - Player = DtoHelpers.CreatePlayer(actorNr, info.Request.ActorProperties) + Player = DtoHelpers.CreatePlayer(actorNr, info.Request.ActorProperties), } ); @@ -60,7 +60,7 @@ public override void OnSetProperties(ISetPropertiesCallInfo info) { GameName = this.PluginHost.GameId, NewEntryConditions = DtoHelpers.CreateEntryConditions(info.Request.Properties), - Player = null + Player = null, } ); @@ -98,7 +98,7 @@ private HttpRequest CreateRequest(Uri endpoint, object request) CustomHeaders = new Dictionary() { { "Authorization", $"Bearer {this.configuration.DiscordBearerToken}" }, - } + }, }; } } diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/DebugInspectionRequest.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/DebugInspectionRequest.cs index ec2c14b94..982095027 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/DebugInspectionRequest.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/DebugInspectionRequest.cs @@ -12,7 +12,7 @@ public enum RequestTypes AutoFailTimeout, PlayQuestStartProcTime, ChangedCharaOwner, - AiCheckReport + AiCheckReport, } [Key(1)] diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/FailQuestRequest.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/FailQuestRequest.cs index 44ccfa465..586b617e5 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/FailQuestRequest.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/FailQuestRequest.cs @@ -8,7 +8,7 @@ public class FailQuestRequest : EventBase public enum FailTypes { Timeup, - AllDead + AllDead, } [Key(1)] diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/FailQuestResponse.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/FailQuestResponse.cs index 221a9bed1..ba370dcc2 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/FailQuestResponse.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/FailQuestResponse.cs @@ -8,7 +8,7 @@ public class FailQuestResponse : EventBase public enum ResultTypes { Timeup, - Clear + Clear, } [Key(1)] diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/RoomBroken.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/RoomBroken.cs index 9dd4ab648..2293853d9 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/RoomBroken.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/Events/RoomBroken.cs @@ -10,7 +10,7 @@ public enum RoomBrokenType VerifySessionError, HostDisconnected, TimeExpired, - FailedToRegisterRanking + FailedToRegisterRanking, } [Key(1)] diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/GameLogicPlugin.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/GameLogicPlugin.cs index a55d08b42..0cf0e7c52 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/GameLogicPlugin.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/GameLogicPlugin.cs @@ -382,7 +382,7 @@ private void OnFailQuestRequest(IRaiseEventCallInfo info) this.PluginHost.SetProperties( info.ActorNr, - new Hashtable() { { ActorPropertyKeys.GoToIngameState, 0 }, }, + new Hashtable() { { ActorPropertyKeys.GoToIngameState, 0 } }, null, false ); @@ -399,7 +399,7 @@ private void OnFailQuestRequest(IRaiseEventCallInfo info) ResultType = request.FailType == FailQuestRequest.FailTypes.Timeup ? FailQuestResponse.ResultTypes.Timeup - : FailQuestResponse.ResultTypes.Clear + : FailQuestResponse.ResultTypes.Clear, }; this.PluginHost.RaiseEvent(Event.FailQuestResponse, response, info.ActorNr); @@ -418,7 +418,7 @@ private void OnFailQuestRequest(IRaiseEventCallInfo info) new Hashtable() { { GamePropertyKeys.GoToIngameInfo, null }, - { GamePropertyKeys.RoomId, -1 } + { GamePropertyKeys.RoomId, -1 }, }, null, true @@ -493,7 +493,7 @@ private void OnClearQuestRequest(IRaiseEventCallInfo info) new Hashtable() { { GamePropertyKeys.GoToIngameInfo, null }, - { GamePropertyKeys.RoomId, -this.GenerateRoomId() } + { GamePropertyKeys.RoomId, -this.GenerateRoomId() }, }, null, true @@ -629,8 +629,8 @@ private void PostApiRequest( { "RoomId", this.PluginHost.GameProperties.GetInt(GamePropertyKeys.RoomId).ToString() - } - } + }, + }, }; this.PluginHost.HttpRequest(req, info); diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/GoToIngameStateManager.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/GoToIngameStateManager.cs index d82b830ed..3c274de8a 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/GoToIngameStateManager.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/GameLogic/GoToIngameStateManager.cs @@ -22,7 +22,7 @@ internal sealed class GoToIngameStateManager private static readonly JsonSerializerOptions JsonOptions = new JsonSerializerOptions() { - PropertyNamingPolicy = JsonNamingPolicy.CamelCase + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, }; private readonly IPluginHost pluginHost; @@ -154,7 +154,7 @@ public void SetGoToIngameInfo() GoToIngameState data = new GoToIngameState() { elements = actorData, - brInitData = null + brInitData = null, }; byte[] msgpack = MessagePackSerializer.Serialize(data, MessagePackOptions); @@ -178,7 +178,7 @@ private void RequestHeroParam(ICallInfo info) { ActorNr = x.ActorNr, ViewerId = x.GetViewerId(), - PartySlots = x.GetPartySlots() + PartySlots = x.GetPartySlots(), } ); @@ -305,10 +305,10 @@ private void RaiseCharacterDataEvent() .Select(x => new HeroParamExData() { limitOverCount = x.ExAbilityLv, - sequenceNumber = x.Position + sequenceNumber = x.Position, }) .ToArray(), - heroParams = heroParams.Take(state.UsedMemberCount).ToArray() + heroParams = heroParams.Take(state.UsedMemberCount).ToArray(), }; this.pluginHost.RaiseEvent(Event.CharacterData, evt); diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/StateManager/StateManagerPlugin.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/StateManager/StateManagerPlugin.cs index 0d5f8a346..bd07b0140 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/StateManager/StateManagerPlugin.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Plugins/StateManager/StateManagerPlugin.cs @@ -110,7 +110,7 @@ public override void OnCreateGame(ICreateGameCallInfo info) this.PluginHost.GameId, info.Request.GameProperties ), - Player = DtoHelpers.CreatePlayer(actorNr, info.Request.ActorProperties) + Player = DtoHelpers.CreatePlayer(actorNr, info.Request.ActorProperties), } ); @@ -124,7 +124,7 @@ public override void OnJoin(IJoinGameCallInfo info) new GameModifyRequest { GameName = this.PluginHost.GameId, - Player = DtoHelpers.CreatePlayer(info.ActorNr, info.Request.ActorProperties) + Player = DtoHelpers.CreatePlayer(info.ActorNr, info.Request.ActorProperties), } ); @@ -157,7 +157,10 @@ public override void OnLeave(ILeaveGameCallInfo info) new GameModifyRequest { GameName = this.PluginHost.GameId, - Player = DtoHelpers.CreatePlayer(info.ActorNr, actor.Properties.GetProperties()) + Player = DtoHelpers.CreatePlayer( + info.ActorNr, + actor.Properties.GetProperties() + ), } ); @@ -205,7 +208,7 @@ private void OnGameSucceed(IRaiseEventCallInfo info) { NewVisibility = true, GameName = this.PluginHost.GameId, - Player = null + Player = null, } ); @@ -225,7 +228,7 @@ private void OnSetMatchingType(ISetPropertiesCallInfo info) { GameName = this.PluginHost.GameId, NewMatchingType = newType, - Player = null + Player = null, } ); @@ -247,7 +250,7 @@ private void OnSetEntryConditions(ISetPropertiesCallInfo info) { GameName = this.PluginHost.GameId, NewEntryConditions = newEntryConditions, - Player = null + Player = null, } ); @@ -271,7 +274,7 @@ private void OnSetGoToIngameState(ISetPropertiesCallInfo info) { NewVisibility = false, GameName = this.PluginHost.GameId, - Player = null + Player = null, } ); @@ -290,7 +293,7 @@ private void OnSetRoomId(IRaiseEventCallInfo info) { NewRoomId = roomId, GameName = this.PluginHost.GameId, - Player = null + Player = null, } ); @@ -316,7 +319,7 @@ private HttpRequest CreateRequest(Uri endpoint, object request) CustomHeaders = new Dictionary() { { "Authorization", $"Bearer {this.BearerToken}" }, - } + }, }; } } diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Shared/Helpers/DtoHelpers.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Shared/Helpers/DtoHelpers.cs index e0b82a37a..60dc53b17 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Shared/Helpers/DtoHelpers.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Shared/Helpers/DtoHelpers.cs @@ -18,7 +18,7 @@ public static Player CreatePlayer(int actorNr, Hashtable actorProperties) { ActorNr = actorNr, ViewerId = actorProperties.GetInt(ActorPropertyKeys.PlayerId), - PartyNoList = (int[])actorProperties[ActorPropertyKeys.UsePartySlot] + PartyNoList = (int[])actorProperties[ActorPropertyKeys.UsePartySlot], }; } @@ -72,7 +72,7 @@ out object entryConditionObj UnacceptedElementTypeList = deserialized.UnacceptedElementals, UnacceptedWeaponTypeList = deserialized.UnacceptedWeapons, ObjectiveTextId = deserialized.Objective.TextId, - RequiredPartyPower = deserialized.RequiredPower + RequiredPartyPower = deserialized.RequiredPower, }; } } diff --git a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Shared/Helpers/PluginHostExtensions.cs b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Shared/Helpers/PluginHostExtensions.cs index fab6d9aaf..bea89da97 100644 --- a/PhotonPlugin/DragaliaAPI.Photon.Plugin/Shared/Helpers/PluginHostExtensions.cs +++ b/PhotonPlugin/DragaliaAPI.Photon.Plugin/Shared/Helpers/PluginHostExtensions.cs @@ -33,7 +33,7 @@ public static void RaiseEvent( Dictionary props = new Dictionary() { { EventDataKey, serializedEvent }, - { EventActorNrKey, 0 } + { EventActorNrKey, 0 }, }; pluginHost.LogInfo($"Raising event {eventCode} (0x{eventCode:X})"); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/CustomWebApplicationFactory.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/CustomWebApplicationFactory.cs index 2e2ce982f..4229b03d6 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/CustomWebApplicationFactory.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/CustomWebApplicationFactory.cs @@ -20,7 +20,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder) => { ["PhotonOptions:Token"] = "photontoken", ["RedisOptions:Hostname"] = this.testContainersHelper.RedisHost, - ["RedisOptions:Port"] = this.testContainersHelper.RedisPort.ToString() + ["RedisOptions:Port"] = this.testContainersHelper.RedisPort.ToString(), } ) ); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/EntryConditionsTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/EntryConditionsTest.cs index 6d87edfa7..80388beaf 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/EntryConditionsTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/EntryConditionsTest.cs @@ -48,7 +48,7 @@ public async Task EntryConditions_UpdatesEntryConditions() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; EntryConditions newConditions = new() diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameCloseTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameCloseTest.cs index 899bdbbdc..6cd912020 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameCloseTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameCloseTest.cs @@ -45,14 +45,14 @@ public async Task GameClose_RemovesGame() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; await this.RedisConnectionProvider.RedisCollection().InsertAsync(game); HttpResponseMessage response = await this.Client.PostAsJsonAsync( Endpoint, - new() { GameName = game.Name, } + new() { GameName = game.Name } ); response.StatusCode.Should().Be(HttpStatusCode.OK); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameCreateTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameCreateTest.cs index 3d0b9e4a1..b5d895e99 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameCreateTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameCreateTest.cs @@ -48,7 +48,7 @@ public async Task GameCreate_AddsHostAndStoresInRedis() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [] + Players = [], }; RedisGame expectedGame = @@ -67,7 +67,7 @@ public async Task GameCreate_AddsHostAndStoresInRedis() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; HttpResponseMessage response = await this.Client.PostAsJsonAsync( @@ -75,7 +75,7 @@ public async Task GameCreate_AddsHostAndStoresInRedis() new() { Game = game, - Player = new() { ViewerId = 2, PartyNoList = [40] } + Player = new() { ViewerId = 2, PartyNoList = [40] }, } ); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameJoinTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameJoinTest.cs index 774a376f3..6a9f42bd2 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameJoinTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameJoinTest.cs @@ -45,7 +45,7 @@ public async Task GameJoin_AddsPlayerToList() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; await this.RedisConnectionProvider.RedisCollection().InsertAsync(game); @@ -55,7 +55,7 @@ public async Task GameJoin_AddsPlayerToList() new() { GameName = game.Name, - Player = new() { ViewerId = 22, PartyNoList = [1, 2] } + Player = new() { ViewerId = 22, PartyNoList = [1, 2] }, } ); @@ -69,7 +69,7 @@ public async Task GameJoin_AddsPlayerToList() new List() { new() { ViewerId = 2, PartyNoList = [40] }, - new() { ViewerId = 22, PartyNoList = [1, 2] } + new() { ViewerId = 22, PartyNoList = [1, 2] }, } ); } diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameLeaveTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameLeaveTest.cs index ee734dc9b..017990e7a 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameLeaveTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/GameLeaveTest.cs @@ -48,8 +48,8 @@ public async Task GameLeave_RemovesPlayerFromGame() Players = [ new() { ViewerId = 2, PartyNoList = [40] }, - new() { ViewerId = 5, PartyNoList = [20] } - ] + new() { ViewerId = 5, PartyNoList = [20] }, + ], }; await this.RedisConnectionProvider.RedisCollection().InsertAsync(game); @@ -59,7 +59,7 @@ await this.Client.PostAsJsonAsync( new() { GameName = game.Name, - Player = new() { ViewerId = 5 } + Player = new() { ViewerId = 5 }, } ); @@ -70,7 +70,7 @@ await this.Client.PostAsJsonAsync( .BeEquivalentTo( new List() { - new() { ViewerId = 2, PartyNoList = [40] } + new() { ViewerId = 2, PartyNoList = [40] }, } ); storedGame!.MatchingType.Should().Be(MatchingTypes.Anyone); @@ -95,7 +95,7 @@ public async Task GameLeave_LastPlayer_RemovesPlayerFromGame_SetsVisibleFalse() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 5, PartyNoList = [20] }] + Players = [new() { ViewerId = 5, PartyNoList = [20] }], }; await this.RedisConnectionProvider.RedisCollection().InsertAsync(game); @@ -105,7 +105,7 @@ await this.Client.PostAsJsonAsync( new() { GameName = game.Name, - Player = new() { ViewerId = 5 } + Player = new() { ViewerId = 5 }, } ); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/MatchingTypeTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/MatchingTypeTest.cs index add58c7bf..e76c4d9ed 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/MatchingTypeTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/MatchingTypeTest.cs @@ -45,7 +45,7 @@ public async Task MatchingType_UpdatesMatchingType() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; MatchingTypes newMatchingType = MatchingTypes.ById; diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/RoomIdTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/RoomIdTest.cs index 20cd58937..87b767870 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/RoomIdTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/RoomIdTest.cs @@ -35,7 +35,7 @@ public async Task RoomId_SetsRoomId() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; await this.RedisConnectionProvider.RedisCollection().InsertAsync(game); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/VisibleTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/VisibleTest.cs index 75e32df41..58178d7e7 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/VisibleTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Event/VisibleTest.cs @@ -37,7 +37,7 @@ public async Task Visible_SetsGameVisible(bool visibility) RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; await this.RedisConnectionProvider.RedisCollection().InsertAsync(game); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/ByIdTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/ByIdTest.cs index 3b9aa75ae..02ba7f985 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/ByIdTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/ByIdTest.cs @@ -33,7 +33,7 @@ public async Task ById_ReturnsGame() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; this.RedisConnectionProvider.RedisCollection().Insert(game); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/ByViewerIdTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/ByViewerIdTest.cs index 24e3cae0e..e5f9848cc 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/ByViewerIdTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/ByViewerIdTest.cs @@ -33,7 +33,7 @@ public async Task ByViewerId_Found_ReturnsGame() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; this.RedisConnectionProvider.RedisCollection().Insert(game); @@ -65,7 +65,7 @@ public async Task ByViewerId_NotFound_Returns404() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }; this.RedisConnectionProvider.RedisCollection().Insert(game); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/GameListTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/GameListTest.cs index 6bb1abf8e..44dbcd254 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/GameListTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/GameListTest.cs @@ -34,7 +34,7 @@ public async Task GameList_GetsVisibleAndOpenGames() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = (List)[new() { ViewerId = 2, PartyNoList = [40] }] + Players = (List)[new() { ViewerId = 2, PartyNoList = [40] }], }, // Non-public matching @@ -53,7 +53,7 @@ public async Task GameList_GetsVisibleAndOpenGames() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 3, PartyNoList = [40] }] + Players = [new() { ViewerId = 3, PartyNoList = [40] }], }, // Visible = false @@ -75,7 +75,7 @@ public async Task GameList_GetsVisibleAndOpenGames() }, Players = (List)[new() { ViewerId = 3, PartyNoList = [40] }], Visible = false, - } + }, ]; await this.RedisConnectionProvider.RedisCollection().InsertAsync(games); @@ -109,7 +109,7 @@ public async Task GameList_QuestIdSpecified_FiltersByQuest() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 2, PartyNoList = [40] }] + Players = [new() { ViewerId = 2, PartyNoList = [40] }], }, new() { @@ -126,8 +126,8 @@ public async Task GameList_QuestIdSpecified_FiltersByQuest() RequiredPartyPower = 11700, ObjectiveTextId = 1, }, - Players = [new() { ViewerId = 3, PartyNoList = [40] }] - } + Players = [new() { ViewerId = 3, PartyNoList = [40] }], + }, ]; await this.RedisConnectionProvider.RedisCollection().InsertAsync(games); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/IsHostTest.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/IsHostTest.cs index 16f241ae7..eee66e237 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/IsHostTest.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager.Test/Get/IsHostTest.cs @@ -28,15 +28,15 @@ public async Task IsHost_HostFound_ReturnsTrue() { ViewerId = 2, ActorNr = 1, - PartyNoList = [40] + PartyNoList = [40], }, new() { ViewerId = 3, ActorNr = 2, - PartyNoList = [40] - } - ] + PartyNoList = [40], + }, + ], }; this.RedisConnectionProvider.RedisCollection().Insert(game); @@ -62,15 +62,15 @@ public async Task IsHost_IngameButNotHost_ReturnsFalse() { ViewerId = 2, ActorNr = 1, - PartyNoList = [40] + PartyNoList = [40], }, new() { ViewerId = 3, ActorNr = 2, - PartyNoList = [40] - } - ] + PartyNoList = [40], + }, + ], }; this.RedisConnectionProvider.RedisCollection().Insert(game); @@ -100,9 +100,9 @@ public async Task IsHost_NotInGame_ReturnsFalse() { ViewerId = 2, ActorNr = 1, - PartyNoList = [40] - } - ] + PartyNoList = [40], + }, + ], }; this.RedisConnectionProvider.RedisCollection().Insert(game); diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager/Models/RedisGame.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager/Models/RedisGame.cs index ee0c077db..f14159e25 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager/Models/RedisGame.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager/Models/RedisGame.cs @@ -101,6 +101,6 @@ public ApiGame ToApiGame() => QuestId = this.QuestId, StartEntryTime = this.StartEntryTime, EntryConditions = this.EntryConditions, - Players = this.Players.Select(x => x.ToPlayer()).ToList() + Players = this.Players.Select(x => x.ToPlayer()).ToList(), }; } diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager/Models/RedisPlayer.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager/Models/RedisPlayer.cs index 3513f21ce..6eadc8ab1 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager/Models/RedisPlayer.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager/Models/RedisPlayer.cs @@ -35,6 +35,6 @@ public Player ToPlayer() => { ViewerId = this.ViewerId, ActorNr = this.ActorNr, - PartyNoList = this.PartyNoList + PartyNoList = this.PartyNoList, }; } diff --git a/PhotonStateManager/DragaliaAPI.Photon.StateManager/Program.cs b/PhotonStateManager/DragaliaAPI.Photon.StateManager/Program.cs index 05789bee5..4c778dd86 100644 --- a/PhotonStateManager/DragaliaAPI.Photon.StateManager/Program.cs +++ b/PhotonStateManager/DragaliaAPI.Photon.StateManager/Program.cs @@ -62,7 +62,7 @@ { Version = "v1", Title = "Photon State Manager", - Description = "API for storing room state received from Photon webhooks." + Description = "API for storing room state received from Photon webhooks.", } ); }); diff --git a/Shared/DragaliaAPI.Photon.Shared/Enums/DungeonTypes.cs b/Shared/DragaliaAPI.Photon.Shared/Enums/DungeonTypes.cs index fd5ccb78e..86516212b 100644 --- a/Shared/DragaliaAPI.Photon.Shared/Enums/DungeonTypes.cs +++ b/Shared/DragaliaAPI.Photon.Shared/Enums/DungeonTypes.cs @@ -20,5 +20,5 @@ public enum DungeonTypes Walker, Scoring, RaidSixteen, - Dmode + Dmode, }