_shipInfo = new ShipInfo(_itemInfo);\r
_conditionTimer = new ConditionTimer(_shipInfo);\r
_dockInfo = new DockInfo(_shipInfo, _materialInfo);\r
- _akashiTimer = new AkashiTimer(_shipInfo, _itemInfo, _dockInfo);\r
+ _akashiTimer = new AkashiTimer(_shipInfo, _dockInfo);\r
_battleInfo = new BattleInfo(_shipInfo, _itemInfo);\r
_logger = new Logger(_shipInfo, _itemInfo, _battleInfo);\r
_haveState = new List<IHaveState> {_achievement, _materialInfo, _conditionTimer, _exMapInfo};\r
\r
if (url.EndsWith("api_start2"))\r
{\r
- _shipInfo.InspectMaster(data);\r
- _missionInfo.InspectMaster(data.api_mst_mission);\r
- _itemInfo.InspectMaster(data);\r
- _exMapInfo.ResetIfNeeded();\r
- _start = true;\r
- return Update.Start;\r
+ return ApiStart(data);\r
}\r
if (!_start)\r
return Update.None;\r
if (url.EndsWith("api_port/port"))\r
- {\r
- _itemInfo.InspectBasic(data.api_basic);\r
- _materialInfo.InspectMaterial(data.api_material, true);\r
- _logger.InspectBasic(data.api_basic);\r
- _logger.InspectMaterial(data.api_material);\r
- _shipInfo.InspectShip(data);\r
- _conditionTimer.CalcRegenTime();\r
- _missionInfo.InspectDeck(data.api_deck_port);\r
- _dockInfo.InspectNDock(data.api_ndock);\r
- _akashiTimer.SetTimer(true);\r
- _achievement.InspectBasic(data.api_basic);\r
- if (data.api_parallel_quest_count()) // 昔のログにはないので\r
- _questInfo.QuestCount = (int)data.api_parallel_quest_count;\r
- _battleInfo.CleanupResult();\r
- _battleInfo.InBattle = false;\r
- _battleInfo.HasDamagedShip = false;\r
- _shipInfo.ClearEscapedShips();\r
- _miscTextInfo.ClearIfNeeded();\r
- SaveState();\r
- return Update.All;\r
- }\r
+ return ApiPort(data);\r
+ if (url.Contains("member"))\r
+ return ApiMember(url, json);\r
+ if (url.Contains("kousyou"))\r
+ return ApiKousyou(url, request, data);\r
+ if (url.Contains("battle"))\r
+ return ApiBattle(url, request, data);\r
+ return ApiOthers(url, request, data);\r
+ }\r
+\r
+ private Update ApiStart(dynamic data)\r
+ {\r
+ _shipInfo.InspectMaster(data);\r
+ _missionInfo.InspectMaster(data.api_mst_mission);\r
+ _itemInfo.InspectMaster(data);\r
+ _exMapInfo.ResetIfNeeded();\r
+ _start = true;\r
+ return Update.Start;\r
+ }\r
+\r
+ private Update ApiPort(dynamic data)\r
+ {\r
+ _itemInfo.InspectBasic(data.api_basic);\r
+ _materialInfo.InspectMaterial(data.api_material, true);\r
+ _logger.InspectBasic(data.api_basic);\r
+ _logger.InspectMaterial(data.api_material);\r
+ _shipInfo.InspectShip(data);\r
+ _conditionTimer.CalcRegenTime();\r
+ _missionInfo.InspectDeck(data.api_deck_port);\r
+ _dockInfo.InspectNDock(data.api_ndock);\r
+ _akashiTimer.Port();\r
+ _achievement.InspectBasic(data.api_basic);\r
+ if (data.api_parallel_quest_count()) // 昔のログにはないので\r
+ _questInfo.QuestCount = (int)data.api_parallel_quest_count;\r
+ _battleInfo.CleanupResult();\r
+ _battleInfo.InBattle = false;\r
+ _battleInfo.HasDamagedShip = false;\r
+ _shipInfo.ClearEscapedShips();\r
+ _miscTextInfo.ClearIfNeeded();\r
+ SaveState();\r
+ return Update.All;\r
+ }\r
+\r
+ private Update ApiMember(string url, dynamic json)\r
+ {\r
+ var data = json.api_data() ? json.api_data : new object();\r
+\r
if (url.EndsWith("api_get_member/basic"))\r
{\r
_itemInfo.InspectBasic(data);\r
{\r
_dockInfo.InspectNDock(data);\r
_conditionTimer.CheckCond();\r
- _akashiTimer.SetTimer();\r
+ _akashiTimer.CheckFleet();\r
return Update.NDock | Update.Timer | Update.Ship;\r
}\r
- if (url.EndsWith("api_req_hensei/change"))\r
- {\r
- _shipInfo.InspectChange(request);\r
- _akashiTimer.SetTimer();\r
- return Update.Ship;\r
- }\r
if (url.EndsWith("api_get_member/questlist"))\r
{\r
_questInfo.Inspect(data);\r
{\r
_shipInfo.InspectDeck(data);\r
_missionInfo.InspectDeck(data);\r
- _akashiTimer.SetTimer();\r
+ _akashiTimer.CheckFleet();\r
return Update.Mission | Update.Timer;\r
}\r
if (url.EndsWith("api_get_member/ship2"))\r
{\r
// ここだけjsonなので注意\r
_shipInfo.InspectShip(json);\r
- _akashiTimer.SetTimer();\r
+ _akashiTimer.CheckFleet();\r
_battleInfo.InBattle = false;\r
return Update.Item | Update.Ship | Update.Battle;\r
}\r
if (url.EndsWith("api_get_member/ship_deck"))\r
{\r
_shipInfo.InspectShip(data);\r
- _akashiTimer.SetTimer();\r
+ _akashiTimer.CheckFleet();\r
_battleInfo.InBattle = false;\r
return Update.Ship | Update.Battle;\r
}\r
if (url.EndsWith("api_get_member/ship3"))\r
{\r
_shipInfo.InspectShip(data);\r
- _akashiTimer.SetTimer();\r
+ _akashiTimer.CheckFleet();\r
_conditionTimer.CheckCond();\r
return Update.Ship;\r
}\r
_materialInfo.InspectMaterial(data);\r
return Update.Item;\r
}\r
- if (url.EndsWith("api_req_hokyu/charge"))\r
+ if (url.EndsWith("api_get_member/mapinfo"))\r
{\r
- _shipInfo.InspectCharge(data);\r
- _materialInfo.InspectCharge(data);\r
- return Update.Item | Update.Ship;\r
+ _exMapInfo.InspectMapInfo(data);\r
+ _miscTextInfo.InspectMapInfo(data);\r
+ return Update.Item;\r
+ }\r
+ if (url.EndsWith("api_req_member/get_practice_enemyinfo"))\r
+ {\r
+ _miscTextInfo.InspectPracticeEnemyInfo(data);\r
+ return Update.Item;\r
+ }\r
+ if (url.EndsWith("api_get_member/preset_deck"))\r
+ {\r
+ _shipInfo.InspectPresetDeck(data);\r
+ return Update.None;\r
}\r
+ return Update.None;\r
+ }\r
+\r
+ private Update ApiKousyou(string url, string request, dynamic data)\r
+ {\r
if (url.EndsWith("api_req_kousyou/createitem"))\r
{\r
_itemInfo.InspectCreateItem(data);\r
_shipInfo.InspectDestroyShip(request, data);\r
_materialInfo.InspectDestroyShip(data);\r
_conditionTimer.CheckCond();\r
- _akashiTimer.SetTimer();\r
+ _akashiTimer.CheckFleet();\r
return Update.Item | Update.Ship;\r
}\r
if (url.EndsWith("api_req_kousyou/destroyitem2"))\r
_dockInfo.InspectCreateShipSpeedChange(request);\r
return Update.Timer;\r
}\r
- if (url.EndsWith("api_req_kaisou/powerup"))\r
- {\r
- _shipInfo.InspectPowerup(request, data);\r
- _conditionTimer.CheckCond();\r
- _akashiTimer.SetTimer();\r
- return Update.Item | Update.Ship;\r
- }\r
- if (url.EndsWith("api_req_nyukyo/start"))\r
- {\r
- _dockInfo.InspectNyukyo(request);\r
- _conditionTimer.CheckCond();\r
- _akashiTimer.SetTimer();\r
- return Update.Item | Update.Ship;\r
- }\r
- if (url.EndsWith("api_req_nyukyo/speedchange"))\r
- {\r
- _dockInfo.InspectSpeedChange(request);\r
- _conditionTimer.CheckCond();\r
- return Update.NDock | Update.Timer | Update.Ship;\r
- }\r
+ return Update.None;\r
+ }\r
+\r
+ private Update ApiBattle(string url, string request, dynamic data)\r
+ {\r
if (IsNormalBattleAPI(url))\r
{\r
_battleInfo.InspectBattle(data);\r
}\r
if (url.EndsWith("api_req_sortie/battleresult"))\r
{\r
- _battleInfo.InspectBattleResult(json);\r
+ _battleInfo.InspectBattleResult(data);\r
_exMapInfo.InspectBattleResult(data);\r
_logger.InspectBattleResult(data);\r
return Update.Ship;\r
}\r
if (url.EndsWith("api_req_practice/battle_result"))\r
{\r
- _battleInfo.InspectPracticeResult(json);\r
+ _battleInfo.InspectPracticeResult(data);\r
return Update.Ship;\r
}\r
if (IsCombinedBattleAPI(url))\r
_battleInfo.CauseCombinedBattleEscape();\r
return Update.Ship;\r
}\r
+ return Update.None;\r
+ }\r
+\r
+ private bool IsNormalBattleAPI(string url)\r
+ {\r
+ return url.EndsWith("api_req_sortie/battle") ||\r
+ url.EndsWith("api_req_sortie/airbattle") ||\r
+ url.EndsWith("api_req_battle_midnight/battle") ||\r
+ url.EndsWith("api_req_battle_midnight/sp_midnight");\r
+ }\r
+\r
+ private bool IsCombinedBattleAPI(string url)\r
+ {\r
+ return url.EndsWith("api_req_combined_battle/battle") ||\r
+ url.EndsWith("api_req_combined_battle/airbattle") ||\r
+ url.EndsWith("api_req_combined_battle/battle_water") ||\r
+ url.EndsWith("api_req_combined_battle/midnight_battle") ||\r
+ url.EndsWith("api_req_combined_battle/sp_midnight");\r
+ }\r
+\r
+ private Update ApiOthers(string url, string request, dynamic data)\r
+ {\r
+ if (url.EndsWith("api_req_hensei/change"))\r
+ {\r
+ _shipInfo.InspectChange(request);\r
+ _akashiTimer.InspectChange(request);\r
+ return Update.Ship;\r
+ }\r
+ if (url.EndsWith("api_req_hensei/preset_select"))\r
+ {\r
+ _shipInfo.InspectDeck(new[] {data});\r
+ _akashiTimer.CheckFleet();\r
+ return Update.Ship;\r
+ }\r
+ if (url.EndsWith("api_req_hensei/preset_register"))\r
+ {\r
+ _shipInfo.InspectPresetRegister(data);\r
+ return Update.None;\r
+ }\r
+ if (url.EndsWith("api_req_hensei/combined"))\r
+ {\r
+ _shipInfo.InspectCombined(request);\r
+ }\r
+ if (url.EndsWith("api_req_hokyu/charge"))\r
+ {\r
+ _shipInfo.InspectCharge(data);\r
+ _materialInfo.InspectCharge(data);\r
+ return Update.Item | Update.Ship;\r
+ }\r
+ if (url.EndsWith("api_req_kaisou/powerup"))\r
+ {\r
+ _shipInfo.InspectPowerup(request, data);\r
+ _conditionTimer.CheckCond();\r
+ _akashiTimer.CheckFleet();\r
+ return Update.Item | Update.Ship;\r
+ }\r
+ if (url.EndsWith("api_req_kaisou/slot_exchange_index"))\r
+ {\r
+ _shipInfo.InspectSlotExchange(request, data);\r
+ return Update.Ship;\r
+ }\r
+ if (url.EndsWith("api_req_nyukyo/start"))\r
+ {\r
+ _dockInfo.InspectNyukyo(request);\r
+ _conditionTimer.CheckCond();\r
+ _akashiTimer.CheckFleet();\r
+ return Update.Item | Update.Ship;\r
+ }\r
+ if (url.EndsWith("api_req_nyukyo/speedchange"))\r
+ {\r
+ _dockInfo.InspectSpeedChange(request);\r
+ _conditionTimer.CheckCond();\r
+ return Update.NDock | Update.Timer | Update.Ship;\r
+ }\r
if (url.EndsWith("api_req_map/start"))\r
{\r
_shipInfo.StartSortie(request);\r
_logger.InspectMissionResult(data);\r
return Update.Item;\r
}\r
- if (url.EndsWith("api_get_member/mapinfo"))\r
- {\r
- _exMapInfo.InspectMapInfo(data);\r
- _miscTextInfo.InspectMapInfo(data);\r
- return Update.Item;\r
- }\r
- if (url.EndsWith("api_req_member/get_practice_enemyinfo"))\r
- {\r
- _miscTextInfo.InspectPracticeEnemyInfo(data);\r
- return Update.Item;\r
- }\r
return Update.None;\r
}\r
\r
- private bool IsNormalBattleAPI(string url)\r
- {\r
- return url.EndsWith("api_req_sortie/battle") ||\r
- url.EndsWith("api_req_sortie/airbattle") ||\r
- url.EndsWith("api_req_battle_midnight/battle") ||\r
- url.EndsWith("api_req_battle_midnight/sp_midnight");\r
- }\r
-\r
- private bool IsCombinedBattleAPI(string url)\r
- {\r
- return url.EndsWith("api_req_combined_battle/battle") ||\r
- url.EndsWith("api_req_combined_battle/airbattle") ||\r
- url.EndsWith("api_req_combined_battle/battle_water") ||\r
- url.EndsWith("api_req_combined_battle/midnight_battle") ||\r
- url.EndsWith("api_req_combined_battle/sp_midnight");\r
- }\r
-\r
public NameAndTimer[] NDock => _dockInfo.NDock;\r
\r
public RingTimer[] KDock => _dockInfo.KDock;\r
\r
public int[] GetDeck(int fleet) => _shipInfo.GetDeck(fleet);\r
\r
+ public int CombinedFleetType => _shipInfo.CombinedFleetType;\r
+\r
public ChargeStatus[] ChargeStatuses => _shipInfo.ChargeStatuses;\r
\r
public int GetFighterPower(int fleet, bool withBonus) => _shipInfo.GetFighterPower(fleet, withBonus);\r
\r
public ShipStatus[] ShipList => _shipInfo.ShipList;\r
\r
- public ItemStatus[] ItemList\r
- {\r
- get\r
- {\r
- _itemInfo.SetItemOwner(ShipList);\r
- return (from e in _itemInfo.ItemDict where e.Key != -1 select e.Value).ToArray();\r
- }\r
- }\r
+ public ItemStatus[] ItemList => _itemInfo.GetItemListWithOwner(ShipList);\r
\r
- public AkashiTimer.RepairSpan[] GetAkashiTimers(int fleet) => _akashiTimer.GetTimers(fleet);\r
-\r
- public AkashiTimer.Notice[] GetAkashiTimerNotice() => _akashiTimer.GetNotice();\r
+ public AkashiTimer AkashiTimer => _akashiTimer;\r
\r
public Achievement Achievement => _achievement;\r
\r
\r
public class RingTimer\r
{\r
- private DateTime _endTime;\r
private readonly TimeSpan _spare;\r
\r
public TimeSpan Rest { get; private set; }\r
\r
- public bool IsFinished => _endTime != DateTime.MinValue && Rest <= _spare;\r
+ public bool IsFinished => EndTime != DateTime.MinValue && Rest <= _spare;\r
+\r
+ public DateTime EndTime { get; private set; }\r
\r
public bool NeedRing { get; set; }\r
\r
\r
public void SetEndTime(DateTime time)\r
{\r
- _endTime = time;\r
+ EndTime = time;\r
}\r
\r
public void Update()\r
{\r
- if (_endTime == DateTime.MinValue)\r
+ if (EndTime == DateTime.MinValue)\r
{\r
Rest = TimeSpan.Zero;\r
return;\r
}\r
var prev = Rest;\r
- Rest = _endTime - DateTime.Now;\r
+ Rest = EndTime - DateTime.Now;\r
if (Rest < TimeSpan.Zero)\r
Rest = TimeSpan.Zero;\r
if (prev > _spare && _spare >= Rest)\r