Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@andanteyk
andanteyk committed Jan 17, 2021
2 parents c29b9eb + 8d8670e commit d8dd328
Show file tree
Hide file tree
Showing 13 changed files with 1,014 additions and 664 deletions.
1 change: 1 addition & 0 deletions Browser/FormBrowser.Designer.cs
View file

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

Binary file modified ElectronicObserver/Assets.zip
View file
Binary file not shown.
Binary file added ElectronicObserver/Assets/Equipment/HeavyBomber.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
212 changes: 208 additions & 4 deletions ElectronicObserver/Assets/Record/EnemyFleetRecord.csv
View file

Large diffs are not rendered by default.

1,338 changes: 697 additions & 641 deletions ElectronicObserver/Assets/Record/ShipParameterRecord.csv
View file

Large diffs are not rendered by default.

46 changes: 41 additions & 5 deletions ElectronicObserver/Data/Quest/ProgressSpecialBattle.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,9 @@ public override void Increment(string rank, int areaID, bool isBoss)
case 875:
isAccepted =
members.Any(s => s?.ShipID == 543) &&
members.Any(s => {
switch(s?.MasterShip?.NameReading)
members.Any(s =>
{
switch (s?.MasterShip?.NameReading)
{
case "たかなみ":
case "おきなみ":
Expand Down Expand Up @@ -224,8 +225,9 @@ public override void Increment(string rank, int areaID, bool isBoss)

case 903: // |903|季|拡張「六水戦」、最前線へ！|5-1・5-4・6-4・6-5ボスS勝利各1|要旗艦夕張改二(|特|丁), 由良改二or(睦月/如月/弥生/卯月/菊月/望月2)|進捗3/4で80%
isAccepted = members[0]?.MasterShip?.NameReading == "ゆうばり" && members[0]?.MasterShip?.RemodelTier >= 2 &&
(members.Any(s => s?.ShipID == 488) || members.Count(s => {
switch(s?.MasterShip?.NameReading)
(members.Any(s => s?.ShipID == 488) || members.Count(s =>
{
switch (s?.MasterShip?.NameReading)
{
case "むつき":
case "きさらぎ":
Expand All @@ -249,7 +251,7 @@ public override void Increment(string rank, int areaID, bool isBoss)
break;

case 912: // |912|年(3月)|工作艦「明石」護衛任務|1-3・2-1・2-2・2-3ボスA勝利各1/1-6終点到達1|要明石旗艦, 駆逐艦3
isAccepted = members.FirstOrDefault()?.MasterShip?.NameReading == "あかし" &&
isAccepted = members.FirstOrDefault()?.MasterShip?.NameReading == "あかし" &&
memberstype.Count(t => t == ShipTypes.Destroyer) >= 3;
break;

Expand All @@ -274,6 +276,40 @@ public override void Increment(string rank, int areaID, bool isBoss)
}
}) >= 2 && CheckGaugeIndex72(bm.Compass) && CheckGaugeIndex73(bm.Compass);
break;


case 840: //|840|週|【節分任務】令和三年節分作戦|2-(1~3)ボスA勝利各1|要(軽母or軽巡or雷巡or練巡)旗艦/(駆逐or海防)3, 期間限定(2021/01/13～????/??/??)
isAccepted =
new[] {
ShipTypes.LightAircraftCarrier,
ShipTypes.LightCruiser,
ShipTypes.TorpedoCruiser,
ShipTypes.TrainingCruiser }
.Contains(memberstype.FirstOrDefault()) &&
memberstype.Count(t => t == ShipTypes.Destroyer || t == ShipTypes.Escort) >= 3;
break;

case 841: //|841|週|【節分任務】令和三年西方海域節分作戦|4-(1~3)ボスS勝利各1|要(水母2or航巡2or重巡2)旗艦, 期間限定(2021/01/13～????/??/??)
isAccepted =
new[] {
ShipTypes.SeaplaneTender,
ShipTypes.HeavyCruiser,
ShipTypes.AviationCruiser
}.Contains(memberstype.FirstOrDefault()) &&
memberstype.Count(t => t == memberstype.FirstOrDefault()) >= 2;
break;
case 843: //|843|週|【節分拡張任務】令和三年節分作戦、全力出撃！|5-2・5-5・6-4ボスS勝利各1|要(戦艦系or空母系)旗艦/駆逐2, 期間限定(2021/01/13～????/??/??)
isAccepted =
new[] {
ShipTypes.Battlecruiser,
ShipTypes.Battleship,
ShipTypes.AviationBattleship,
ShipTypes.LightAircraftCarrier,
ShipTypes.AircraftCarrier,
ShipTypes.ArmoredAircraftCarrier,
}.Contains(memberstype.FirstOrDefault()) &&
memberstype.Count(t => t == ShipTypes.Destroyer) >= 2;
break;
}

// 第二ゲージでも第一ボスに行ける場合があるので、個別対応が必要
Expand Down
43 changes: 43 additions & 0 deletions ElectronicObserver/Data/Quest/QuestProgressManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,37 @@ void QuestUpdated(string apiname, dynamic data)
}));
break;

case 840: //|840|週|【節分任務】令和三年節分作戦|2-(1~3)ボスA勝利各1|要(軽母or軽巡or雷巡or練巡)旗艦/(駆逐or海防)3, 期間限定(2021/01/13～????/??/??)
if (DateTime.Now < new DateTime(2021, 4, 1))
{
Progresses.Add(new ProgressMultiBattle(q, new[] {
new ProgressSpecialBattle(q, 1, "A", new[] { 21 }, true),
new ProgressSpecialBattle(q, 1, "A", new[] { 22 }, true),
new ProgressSpecialBattle(q, 1, "A", new[] { 23 }, true),
}));
}
break;
case 841: //|841|841|週|【節分任務】令和三年西方海域節分作戦|4-(1~3)ボスS勝利各1|要(水母2or航巡2or重巡2)旗艦, 期間限定(2021/01/13～????/??/??)
if (DateTime.Now < new DateTime(2021, 4, 1))
{
Progresses.Add(new ProgressMultiBattle(q, new[] {
new ProgressSpecialBattle(q, 1, "S", new[] { 41 }, true),
new ProgressSpecialBattle(q, 1, "S", new[] { 42 }, true),
new ProgressSpecialBattle(q, 1, "S", new[] { 43 }, true),
}));
}
break;
case 843: //|843|週|【節分拡張任務】令和三年節分作戦、全力出撃！|5-2・5-5・6-4ボスS勝利各1|要(戦艦系or空母系)旗艦/駆逐2, 期間限定(2021/01/13～????/??/??)
if (DateTime.Now < new DateTime(2021, 4, 1))
{
Progresses.Add(new ProgressMultiBattle(q, new[] {
new ProgressSpecialBattle(q, 1, "S", new[] { 52 }, true),
new ProgressSpecialBattle(q, 1, "S", new[] { 55 }, true),
new ProgressSpecialBattle(q, 1, "S", new[] { 64 }, true),
}));
}
break;

case 303: //|303|「演習」で練度向上！|演習3
Progresses.Add(new ProgressPractice(q, 3, false));
break;
Expand Down Expand Up @@ -655,6 +686,18 @@ void QuestUpdated(string apiname, dynamic data)
new ProgressDiscard(q, 5, true, new[]{ 10 }),
}));
break;
case 654: //|654|10|精鋭複葉機飛行隊の編成|(Swordfishx1, Fulmarx2)廃棄, 秘書艦Ark Royalの第一スロットにSwordfish★10装備, (熟練搭乗員x1, 弾薬x1500, ボーキx1500)保有
Progresses.Add(new ProgressMultiDiscard(q, new[]{
new ProgressDiscard(q, 1, true, new[]{ 242 }, -1),
new ProgressDiscard(q, 2, true, new[]{ 249 }, -1),
}));
break;
case 681: //|681|１|航空戦力の再編増強準備|(艦上爆撃機x4, 艦上攻撃機x4)廃棄, (開発資材20, ボーキ1600)保有
Progresses.Add(new ProgressMultiDiscard(q, new[]{
new ProgressDiscard(q, 4, true, new[]{ 7 }),
new ProgressDiscard(q, 4, true, new[]{ 8 }),
}));
break;

case 702: //|702|艦の「近代化改修」を実施せよ！|改修成功2
Progresses.Add(new ProgressModernization(q, 2));
Expand Down
4 changes: 2 additions & 2 deletions ElectronicObserver/Data/ShipData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1475,8 +1475,8 @@ public bool CanAttackAtNight
if (master.ShipType != ShipTypes.ArmoredAircraftCarrier && HPRate <= 0.5)
return false;

// Saratoga Mk.II/赤城改二戊 は不要
bool hasNightPersonnel = master.ShipID == 545 || master.ShipID == 599 ||
// Saratoga Mk.II/赤城改二戊/加賀改二戊 は不要
bool hasNightPersonnel = master.ShipID == 545 || master.ShipID == 599 || master.ShipID == 610 ||
AllSlotInstanceMaster.Any(eq => eq != null && eq.IsNightAviationPersonnel);

bool hasNightAircraft = AllSlotInstanceMaster.Any(eq => eq != null && eq.IsNightAircraft);
Expand Down
19 changes: 12 additions & 7 deletions ElectronicObserver/Other/Information/kcmemo.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1464,6 +1464,9 @@ Bismarck dreiに対する魚雷装備・試製51cm連装砲といったものの
|243|週|南方海域珊瑚諸島沖の制空権を握れ！|5-2ボスS勝利2
|261|週|海上輸送路の安全確保に努めよ！|1-5ボスA勝利3
|241|週|敵北方艦隊主力を撃滅せよ！|3-(3~5)ボス勝利5
|840|週|【節分任務】令和三年節分作戦|2-(1~3)ボスA勝利各1|要(軽母or軽巡or雷巡or練巡)旗艦/(駆逐or海防)3, 期間限定(2021/01/13～????/??/??)
|841|週|【節分任務】令和三年西方海域節分作戦|4-(1~3)ボスS勝利各1|要(水母2or航巡2or重巡2)旗艦, 期間限定(2021/01/13～????/??/??)
|843|週|【節分拡張任務】令和三年節分作戦、全力出撃！|5-2・5-5・6-4ボスS勝利各1|要(戦艦系or空母系)旗艦/駆逐2, 期間限定(2021/01/13～????/??/??)
|249|月|「第五戦隊」出撃せよ！|2-5ボスS勝利1|要「那智」「妙高」「羽黒」
|256|月|「潜水艦隊」出撃せよ！|6-1ボスS勝利3
|257|月|「水雷戦隊」南西へ！|1-4ボスS勝利1|要軽巡旗艦、軽巡3隻まで、他駆逐艦　他艦種禁止
Expand All @@ -1484,21 +1487,22 @@ Bismarck dreiに対する魚雷装備・試製51cm連装砲といったものの
|893|季|泊地周辺海域の安全確保を徹底せよ！|1-5・7-1・7-2(第一＆第二)ボスS勝利各3|3エリア達成時点で80%
|894|季|空母戦力の投入による兵站線戦闘哨戒|1-3・1-4・2-1・2-2・2-3ボスS勝利各1|要空母系
|284|季|南西諸島方面「海上警備行動」発令！|1-4・2-1・2-2・2-3ボスS勝利各1|要(軽母or軽巡or雷巡or練巡)1/(駆逐or海防)3
|903|季|拡張「六水戦」、最前線へ！|5-1・5-4・6-4・6-5ボスS勝利各1|要旗艦夕張改二(|特|丁), 由良改二or(睦月/如月/弥生/卯月/菊月/望月2)|進捗3/4で80%
|903|季|拡張「六水戦」、最前線へ！|5-1・5-4・6-4・6-5ボスS勝利各1|要旗艦夕張改二(/特/丁), 由良改二or(睦月/如月/弥生/卯月/菊月/望月2); 進捗3/4で80%
|904|２|精鋭「十九駆」、躍り出る！|2-5・3-4・4-5・5-3ボスS勝利各1|要綾波改二/敷波改二
|905|２|「海防艦」、海を護る！|1-1・1-2・1-3・1-5ボスA勝利各1/1-6終点到達1|要海防艦3, 5隻以下の編成
|912|３|工作艦「明石」護衛任務|1-3・2-1・2-2・2-3ボスA勝利各1/1-6終点到達1|要明石旗艦, 駆逐艦3
|914|３|重巡戦隊、西へ！|4-1・4-2・4-3・4-4ボスA勝利各1|要重巡3/駆逐1
|928|９|歴戦「第十方面艦隊」、全力出撃！|4-2・7-2(第二)・7-3(第二)ボスS勝利各2|要(羽黒/足柄/妙高/高雄/神風)2
|303|日|「演習」で練度向上！|演習3
|304|日|「演習」で他提督を圧倒せよ！|演習勝利5
|329|日|【節分任務】節分演習！|演習S勝利3|要(駆逐or海防)2, 期間限定(2021/01/13～????/??/??); 進捗は2/5開始(1/3で50%, 2/3で80%)
|302|週|大規模演習|演習勝利20
|311|月|精鋭艦隊演習|演習勝利7|デイリー扱い
|318|月|給糧艦「伊良湖」の支援|演習勝利3, 秘書艦に戦闘糧食x2装備|要軽巡2以上, 戦闘糧食を装備するまで進捗表示0|
|330|季|空母機動部隊、演習始め！|演習勝利4|要空母系2/駆逐2, 要空母旗艦, デイリー扱い|
|337|季|「十八駆」演習！|演習S勝利3|要(霞/霰/陽炎/不知火)4, デイリー扱い|
|339|季|「十九駆」演習！|演習S勝利3|要磯波/浦波/綾波/敷波, デイリー扱い|進捗は2/5開始(1/3で50%, 2/3で80%)
|342|季|小艦艇群演習強化任務|演習A勝利4|要(駆逐+海防+min(軽巡級, 1))4, デイリー扱い|進捗は1/5開始(3/4で80%)
|318|月|給糧艦「伊良湖」の支援|演習勝利3, 秘書艦に戦闘糧食x2装備|要軽巡2以上, 戦闘糧食を装備するまで進捗表示0
|330|季|空母機動部隊、演習始め！|演習勝利4|要空母系2/駆逐2, 要空母旗艦, デイリー扱い
|337|季|「十八駆」演習！|演習S勝利3|要(霞/霰/陽炎/不知火)4, デイリー扱い
|339|季|「十九駆」演習！|演習S勝利3|要磯波/浦波/綾波/敷波, デイリー扱い; 進捗は2/5開始(1/3で50%, 2/3で80%)
|342|季|小艦艇群演習強化任務|演習A勝利4|要(駆逐+海防+min(軽巡級, 1))4, デイリー扱い; 進捗は1/5開始(3/4で80%)
|345|10|演習ティータイム！|演習A勝利4|要(Warspite/金剛/Ark Royal/Nelson/J級駆逐艦)4, デイリー扱い
|346|10|最精鋭！主力オブ主力、演習開始！|演習S勝利4|要夕雲改二/巻雲改二/風雲改二/秋雲改二, デイリー扱い
|402|日|「遠征」を3回成功させよう！|遠征成功3
Expand Down Expand Up @@ -1544,6 +1548,7 @@ Bismarck dreiに対する魚雷装備・試製51cm連装砲といったものの
|657|９|新型兵装開発整備の強化|(小口径主砲x6, 中口径主砲x5, 魚雷x4)廃棄, 鋼材4000保有|
|654|10|精鋭複葉機飛行隊の編成|(Swordfishx1, Fulmarx2)廃棄, 秘書艦Ark Royalの第一スロットにSwordfish★10装備, (熟練搭乗員x1, 弾薬x1500, ボーキx1500)保有
|655|11|工廠フル稼働！新兵装を開発せよ！|(小口径主砲x5, 中口径主砲x5, 大口径主砲x5, 水上偵察機x5, 艦上攻撃機x5)廃棄, (燃料x1500, 鋼材x1500, ボーキx1500)保有
|681|１|航空戦力の再編増強準備|(艦上爆撃機x4, 艦上攻撃機x4)廃棄, (開発資材20, ボーキ1600)保有
|702|日|艦の「近代化改修」を実施せよ！|近代化改修成功2
|703|週|「近代化改修」を進め、戦備を整えよ！|近代化改修成功15
|714|11|「駆逐艦」の改修工事を実施せよ！|駆逐に対して駆逐3を用いた近代化改修成功2, (鋼材600, ボーキ300)保有
Expand Down Expand Up @@ -1627,7 +1632,7 @@ Bismarck dreiに対する魚雷装備・試製51cm連装砲といったものの
|578|深海15inch連装砲後期型|190|38.1cm Mk.I連装砲|
|579|深海14inch海峡連装砲|7|35.6cm連装砲|
|580|深海待伏魚雷|58|61cm五連装(酸素)魚雷|
|584深海14inch連装砲改||7|35.6cm連装砲|
|584|深海14inch連装砲改|7|35.6cm連装砲|
|585|深海16inch三連装砲改|161|16inch三連装砲 Mk.7|
|587|深海16inch三連装砲改二|298|16inch Mk.I三連装砲|
|588|深海5inch連装砲C型|266|12.7cm連装砲C型改二|
Expand Down
4 changes: 4 additions & 0 deletions ElectronicObserver/Resource/ResourceManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ public enum EquipmentContent
NightFighter,
NightAttacker,
LandASPatrol,
Reserved48, // 艦これ本体側が未実装
HeavyBomber,
Locked,
Unknown,
}
Expand Down Expand Up @@ -460,6 +462,8 @@ private void LoadFromArchive(string path)
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/NightFighter.png", "Equipment_NightFighter");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/NightAttacker.png", "Equipment_NightAttacker");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/LandASPatrol.png", "Equipment_LandASPatrol");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/Unknown.png", "Equipment_Reserved48"); // 艦これ本体側が未実装
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/HeavyBomber.png", "Equipment_HeavyBomber");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/Locked.png", "Equipment_Locked");
LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/Unknown.png", "Equipment_Unknown");

Expand Down
2 changes: 1 addition & 1 deletion ElectronicObserver/Utility/Data/Calculator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ public static NightAttackKind GetNightAttackKind(int[] slot, int attackerShipID,

}

if (attackerShipID == 545 || attackerShipID == 599) // Saratoga Mk.II/赤城改二戊
if (attackerShipID == 545 || attackerShipID == 599 || attackerShipID == 610) // Saratoga Mk.II/赤城改二戊/加賀改二戊
nightPersonnelCount++;


Expand Down
6 changes: 3 additions & 3 deletions ElectronicObserver/Utility/SoftwareInformation.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ public static class SoftwareInformation
/// <summary>
/// バージョン(日本語, ソフトウェア名を含みます)
/// </summary>
public static string VersionJapanese => SoftwareNameJapanese + "四六型改四";
public static string VersionJapanese => SoftwareNameJapanese + "四六型改五";


/// <summary>
/// バージョン(英語)
/// </summary>
public static string VersionEnglish => "4.6.4";
public static string VersionEnglish => "4.6.5";



/// <summary>
/// 更新日時
/// </summary>
public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2020/11/28 15:00:00");
public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2021/01/17 20:00:00");



Expand Down
3 changes: 2 additions & 1 deletion ElectronicObserver/Window/FormFleetOverview.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,15 @@ private void Updated(string apiname, dynamic data)
var landing = members.Select(s => s.AllSlotInstanceMaster.Count(eq => eq?.CategoryType == EquipmentTypes.LandingCraft || eq?.CategoryType == EquipmentTypes.SpecialAmphibiousTank));


ToolTipInfo.SetToolTip(CombinedTag, string.Format("ドラム缶搭載: {0}個\r\n大発動艇搭載: {1}個\r\n輸送量(TP): S {2} / A {3}\r\n\r\n制空戦力合計: {4}\r\n索敵能力合計: {5:f2}\r\n新判定式(33):\r\n　分岐点係数1: {6:f2}\r\n　分岐点係数3: {7:f2}\r\n　分岐点係数4: {8:f2}",
ToolTipInfo.SetToolTip(CombinedTag, string.Format("ドラム缶搭載: {0}個\r\n大発動艇搭載: {1}個\r\n輸送量(TP): S {2} / A {3}\r\n\r\n制空戦力合計: {4}\r\n索敵能力合計: {5:f2}\r\n新判定式(33):\r\n　分岐点係数1: {6:f2}\r\n　分岐点係数2: {7:f2}\r\n　分岐点係数3: {8:f2}\r\n　分岐点係数4: {9:f2}",
transport.Sum(),
landing.Sum(),
tp,
(int)Math.Floor(tp * 0.7),
Calculator.GetAirSuperiority(fleet1) + Calculator.GetAirSuperiority(fleet2),
Math.Floor(fleet1.GetSearchingAbility() * 100) / 100 + Math.Floor(fleet2.GetSearchingAbility() * 100) / 100,
Math.Floor(Calculator.GetSearchingAbility_New33(fleet1, 1) * 100) / 100 + Math.Floor(Calculator.GetSearchingAbility_New33(fleet2, 1) * 100) / 100,
Math.Floor(Calculator.GetSearchingAbility_New33(fleet1, 2) * 100) / 100 + Math.Floor(Calculator.GetSearchingAbility_New33(fleet2, 2) * 100) / 100,
Math.Floor(Calculator.GetSearchingAbility_New33(fleet1, 3) * 100) / 100 + Math.Floor(Calculator.GetSearchingAbility_New33(fleet2, 3) * 100) / 100,
Math.Floor(Calculator.GetSearchingAbility_New33(fleet1, 4) * 100) / 100 + Math.Floor(Calculator.GetSearchingAbility_New33(fleet2, 4) * 100) / 100
));
Expand Down

0 comments on commit d8dd328

Please sign in to comment.