• R/O
  • HTTP
  • SSH
  • HTTPS

KancolleSniffer: Commit


Commit MetaInfo

Revisão0cfdc97f2a8b60eade5531c4d40ce642240e32a1 (tree)
Hora2021-01-23 17:03:27
AutorKazuhiro Fujieda <fujieda@user...>
CommiterKazuhiro Fujieda

Mensagem de Log

航空戦力の再編増強準備のカウンターを実装する

Mudança Sumário

Diff

--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -1985,10 +1985,11 @@ namespace KancolleSniffer.Test
19851985 /// 677: 継戦支援能力の整備
19861986 /// 678: 主力艦上戦闘機の更新
19871987 /// 680: 対空兵装の整備拡充
1988+ /// 681: 航空戦力の再編増強準備
19881989 /// 688: 航空戦力の強化
19891990 /// </summary>
19901991 [TestMethod]
1991- public void DestroyItem_613_638_643_645_653_654_655_657_663_673_674_675_676_677_678_680_686_688()
1992+ public void DestroyItem_613_638_643_645_653_654_655_657_663_673_674_675_676_677_678_680_681_686_688()
19921993 {
19931994 InjectItems(new[]
19941995 {
@@ -2012,7 +2013,7 @@ namespace KancolleSniffer.Test
20122013 new ItemSpec {Id = 242, Name = "Swordfish", Type = 8},
20132014 new ItemSpec {Id = 249, Name = "Fulmar", Type = 6}
20142015 });
2015- var questList = new[] {613, 638, 643, 645, 655, 653, 654, 657, 663, 673, 674, 675, 676, 677, 678, 680, 686, 688};
2016+ var questList = new[] {613, 638, 643, 645, 655, 653, 654, 657, 663, 673, 674, 675, 676, 677, 678, 680, 681, 686, 688};
20162017 InjectQuestList(questList);
20172018 _questCounter.InspectDestroyItem(
20182019 $"api%5Fslotitem%5Fids={string.Join("%2C", Enumerable.Range(1, _itemInventory.Count))}&api%5Fverno=1");
@@ -2034,6 +2035,7 @@ namespace KancolleSniffer.Test
20342035 new {Id = 675, NowArray = new[] {3, 1}}, new {Id = 676, NowArray = new[] {1, 1, 1}},
20352036 new {Id = 677, NowArray = new[] {1, 1, 1}}, new {Id = 678, NowArray = new[] {1, 1}},
20362037 new {Id = 680, NowArray = new[] {1, 2}}, new {Id = 686, NowArray = new[] {1, 1}},
2038+ new {Id = 681, NowArray = new[] {1, 2}},
20372039 new {Id = 688, NowArray = new[] {3, 1, 2, 1}}
20382040 };
20392041 foreach (var e in array)
--- a/KancolleSniffer/Model/QuestCountList.cs
+++ b/KancolleSniffer/Model/QuestCountList.cs
@@ -23,6 +23,7 @@ namespace KancolleSniffer.Model
2323 private const QuestInterval Weekly = QuestInterval.Weekly;
2424 private const QuestInterval Monthly = QuestInterval.Monthly;
2525 private const QuestInterval Quarterly = QuestInterval.Quarterly;
26+ private const QuestInterval Yearly1 = QuestInterval.Yearly1;
2627 private const QuestInterval Yearly2 = QuestInterval.Yearly2;
2728 private const QuestInterval Yearly3 = QuestInterval.Yearly3;
2829 private const QuestInterval Yearly5 = QuestInterval.Yearly5;
@@ -139,6 +140,7 @@ namespace KancolleSniffer.Model
139140 {677, new QuestDestroyItem {Interval = Weekly, MaxArray = new[] {4, 2, 3}, Types = new[] {3, 10, 5}, Material = new[] {0, 5, 0, 0}}}, // 677: 継戦支援能力の整備
140141 {678, new QuestDestroyItem {Interval = Quarterly, MaxArray = new[] {3, 5}, Ids = new[] {19, 20}, Material = new[] {0, 0, 8, 0}}}, // 678: 主力艦上戦闘機の更新
141142 {680, new QuestSpec {Interval = Quarterly, MaxArray = new[] {4, 4}, Material = new[] {0, 0, 6, 0}}}, // 680: 対空兵装の整備拡充
143+ {681, new QuestDestroyItem {Interval = Yearly1, MaxArray = new[] {4, 4}, Types = new[] {7, 8}, Material = new[] {0, 0, 0, 4}}}, // 681: 航空戦力の再編増強準備
142144 {686, new QuestDestroyItem {Interval = Quarterly, MaxArray = new[] {4, 1}, Ids = new[] {3, 121}, Material = new[] {0, 0, 0, 0}}}, // 686: 戦時改修A型高角砲の量産
143145 {688, new QuestDestroyItem {Interval = Quarterly, MaxArray = new[] {3, 3, 3, 3}, Types = new[] {6, 7, 8, 10}, Material = new[] {0, 0, 0, 0}}}, // 688: 航空戦力の強化
144146
--- a/KancolleSniffer/Model/QuestInfo.cs
+++ b/KancolleSniffer/Model/QuestInfo.cs
@@ -62,6 +62,7 @@ namespace KancolleSniffer.Model
6262 Weekly,
6363 Monthly,
6464 Quarterly,
65+ Yearly1,
6566 Yearly2,
6667 Yearly3,
6768 Yearly5,
@@ -198,6 +199,7 @@ namespace KancolleSniffer.Model
198199 QuestInterval.Weekly => CrossBoundary(LastMonday.AddHours(5)),
199200 QuestInterval.Monthly => CrossBoundary(new DateTime(_now.Year, _now.Month, 1, 5, 0, 0)),
200201 QuestInterval.Quarterly => CrossBoundary(QuarterlyBoundary.AddHours(5)),
202+ QuestInterval.Yearly1 => CrossBoundary(new DateTime(_now.Year, 1, 1, 5, 0, 0)),
201203 QuestInterval.Yearly2 => CrossBoundary(new DateTime(_now.Year, 2, 1, 5, 0, 0)),
202204 QuestInterval.Yearly3 => CrossBoundary(new DateTime(_now.Year, 3, 1, 5, 0, 0)),
203205 QuestInterval.Yearly5 => CrossBoundary(new DateTime(_now.Year, 5, 1, 5, 0, 0)),
Show on old repository browser