diff --git a/Data/DcDuty-German.json b/Data/DcDuty-German.json index 969e655..faa055b 100644 --- a/Data/DcDuty-German.json +++ b/Data/DcDuty-German.json @@ -1,8 +1,8 @@ { "version": "202106061", - "language": "German", + "language": "Deutsch", "roulettes": { - "1": "Stufensteigerung", + "1": "Stufensteigerung", "2": "Stufe 50/60/70 Dungeons", "3": "Hauptszenario", "4": "Gildengeheiß", diff --git a/DcControl.cs b/DcControl.cs index 9e5909f..22d0495 100644 --- a/DcControl.cs +++ b/DcControl.cs @@ -32,6 +32,11 @@ namespace DutyContent private bool _game_active; private string _game_zone; + // + private const int IntervalGameActive = 50; + private const int IntervalGameExist = 300; + private const int IntervalGameNone = 500; + // public DcControl() { @@ -116,11 +121,12 @@ namespace DutyContent _save_timer.Enabled = false; }; - _update_timer = new System.Timers.Timer() { Interval = 300 }; + _update_timer = new System.Timers.Timer() { Interval = IntervalGameExist }; _update_timer.Elapsed += (sender, e) => { UpdateAndCheckProc(); - _update_timer.Interval = _game_exist ? _game_active ? 50 : 300 : 500; + _update_timer.Interval = _game_exist ? _game_active ? + IntervalGameActive : IntervalGameExist : IntervalGameNone; }; _update_timer.Start(); } diff --git a/DutyContent.csproj b/DutyContent.csproj index e07cc03..1bcdf58 100644 --- a/DutyContent.csproj +++ b/DutyContent.csproj @@ -191,6 +191,8 @@ if exist "%25APPDATA%25\Advanced Combat Tracker\Plugins\DutyContent" copy $(TargetPath) "%25APPDATA%25\Advanced Combat Tracker\Plugins\DutyContent" /y +rem if exist "D:\FF14K\actk\Plugins\DutyContent" copy $(TargetPath) "D:\FF14K\actk\Plugins\DutyContent" /y + \ No newline at end of file diff --git a/Tab/DutyForm.cs b/Tab/DutyForm.cs index 4c7a927..c3360fe 100644 --- a/Tab/DutyForm.cs +++ b/Tab/DutyForm.cs @@ -386,6 +386,7 @@ namespace DutyContent.Tab _stq_type = (zone_id == 920) ? DcContent.SaveTheQueenType.Bozja : + (zone_id == 921) ? DcContent.SaveTheQueenType.Zadnor : DcContent.SaveTheQueenType.No; if (chkShowDebug.Checked)