Skip to content
This repository has been archived by the owner on Jun 13, 2020. It is now read-only.

2018 09 24 #3

Merged
merged 11 commits into from Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
469 changes: 236 additions & 233 deletions App/App.csproj

Large diffs are not rendered by default.

1,406 changes: 712 additions & 694 deletions App/Form/MainForm.Designer.cs

Large diffs are not rendered by default.

43 changes: 31 additions & 12 deletions App/Form/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private void MainForm_Load(object sender, EventArgs e)
comboBox_Language.SelectedValueChanged += comboBox_Language_SelectedValueChanged;

checkBox_StartupShow.Checked = Settings.StartupShowMainForm;
checkBox_AutoOverlayHide.Checked = Settings.AutoOverlayHide;
// checkBox_AutoOverlayHide.Checked = Settings.AutoOverlayHide;
checkBox_FlashWindow.Checked = Settings.FlashWindow;
SetCheatRoulleteCheckBox(Settings.CheatRoulette);

Expand Down Expand Up @@ -230,14 +230,14 @@ private void checkBox_Twitter_CheckedChanged(object sender, EventArgs e)
textBox_Twitter.Enabled = checkBox_Twitter.Checked;
Settings.TwitterEnabled = checkBox_Twitter.Checked;
Settings.Save();
}

private void checkBox_AutoOverlayHide_CheckedChanged(object sender, EventArgs e)
{
Settings.AutoOverlayHide = checkBox_AutoOverlayHide.Checked;
Settings.Save();
}

}
/* private void checkBox_AutoOverlayHide_CheckedChanged(object sender, EventArgs e)
{
Settings.AutoOverlayHide = checkBox_AutoOverlayHide.Checked;
Settings.Save();
}
*/
private void checkBox_FlashWindow_CheckedChanged(object sender, EventArgs e)
{
Settings.FlashWindow = checkBox_FlashWindow.Checked;
Expand Down Expand Up @@ -411,6 +411,18 @@ private void TamamoToolStripMenuItem_Click(object sender, EventArgs e)
{
int[] arr = { 1106, 1107, 1108, 1109, 1110, 1111 };
PresetAccept(arr);
}

private void anemosToolStripMenuItem_Click(object sender, EventArgs e)
{
int[] arr = { 1328, 1329, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348 };
PresetAccept(arr);
}

private void pagosToolStripMenuItem_Click(object sender, EventArgs e)
{
int[] arr = { 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, 1364, 1365, 1366, 1367, 1368, 1369 };
PresetAccept(arr);
}

private void SetCheatRoulleteCheckBox(bool @checked)
Expand Down Expand Up @@ -514,7 +526,7 @@ private void ApplyLanguage()
toolTip.SetToolTip(checkBox_Overlay, Localization.GetText("ui-settings-overlay-tooltip"));
button_ResetOverlayPosition.Text = Localization.GetText("ui-settings-overlay-reset");
checkBox_StartupShow.Text = Localization.GetText("ui-settings-startupshow");
checkBox_AutoOverlayHide.Text = Localization.GetText("ui-settings-autohide");
// checkBox_AutoOverlayHide.Text = Localization.GetText("ui-settings-autohide");
checkBox_FlashWindow.Text = Localization.GetText("ui-settings-iconflash");
checkBox_CheatRoullete.Text = Localization.GetText("ui-settings-cheatroulette");
groupBox_TwitterSet.Text = Localization.GetText("ui-settings-tweet-title");
Expand All @@ -533,13 +545,20 @@ private void ApplyLanguage()
bookOfSkywindIIToolStripMenuItem.Text = Localization.GetText("fate-preset-animus-SkywindII");
bookOfSkyearthIToolStripMenuItem.Text = Localization.GetText("fate-preset-animus-SkyearthI");
IxionToolStripMenuItem.Text = Localization.GetText("fate-preset-Ixion");
TamamoToolStripMenuItem.Text = Localization.GetText("fate-preset-Tamamo");
TamamoToolStripMenuItem.Text = Localization.GetText("fate-preset-Tamamo");
anemosToolStripMenuItem.Text = Localization.GetText("fate-preset-anemos");
pagosToolStripMenuItem.Text = Localization.GetText("fate-preset-pagos");
toolStripMenuItem_SelectApply.Text = Localization.GetText("ui-fate-apply");
label_FATEAbout.Text = Localization.GetText("ui-fate-about");
toolStripMenuItem_LogCopy.Text = Localization.GetText("ui-logs-copy");
toolStripMenuItem_LogClear.Text = Localization.GetText("ui-logs-clear");
label_About.Text = Localization.GetText("ui-info-about");

}
}

private void comboBox_Language_SelectedIndexChanged(object sender, EventArgs e)
{

}
}
}
836 changes: 415 additions & 421 deletions App/Form/MainForm.resx

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion App/Global.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
internal class Global
{
public const string VERSION = "v20180923.2";
public const string VERSION = "v20180924.1";

public const string APPNAME = "DFAssist";
public const string SETTINGS_FILEPATH = @"config.ini";
Expand Down
3 changes: 2 additions & 1 deletion App/Network/Network.Analyser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private void HandleMessage(byte[] message)
{
Log.I("l-field-instance-left");
}

/*
if (Settings.ShowOverlay && Settings.AutoOverlayHide)
{
mainForm.overlayForm.Invoke(() =>
Expand All @@ -176,6 +176,7 @@ private void HandleMessage(byte[] message)
}
});
}
*/
}
else if (opcode == 0x0143)
{
Expand Down
107 changes: 56 additions & 51 deletions App/Resources/Data/en-us.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
// Version
"version": "20180922.1",
"version": "20180924.1",

// Duty
"instances": {
Expand Down Expand Up @@ -2560,55 +2560,6 @@
"901": "Do Spinners Dream of Electric Rooks"
}
},
"999": {
"name": "Eureka - Anemos",
"fates": {
"1328": "The Swarm Never Sets",
"1329": "Wall in the Willows",
"1331": "Wine and Honey",
"1332": "Unsafety Dance",
"1333": "Teles House",
"1334": "Prove Your Amemettle",
"1335": "Caym What May",
"1336": "The Killing of a Sacred Bombardier",
"1337": "Sing, Muse",
"1338": "Drama Lamashtu",
"1339": "Short Serket 2",
"1340": "I Amarok",
"1341": "To the Mat",
"1342": "Simurghasbord",
"1343": "When You Ride Alone",
"1344": "One Missed Callisto",
"1345": "Disinherit the Wind",
"1346": "Don't Judge Me, Morbol",
"1347": "By Numbers",
"1348": "The Shadow over Anemos"
}
},
"998": {
"name": "Eureka - Pagos",
"fates": {
"1351": "Eternity",
"1352": "Cows for Concern",
"1353": "Ash the Magic Dragon",
"1354": "Conqueror Worm",
"1355": "Melting Point",
"1356": "Disorder in the Court",
"1357": "Does It Have to Be a Snowman",
"1358": "Brothers",
"1359": "Eye of Horus",
"1360": "Morte Arthro",
"1361": "Apocalypse Cow",
"1362": "Third Impact",
"1363": "Eye Scream for Ice Cream",
"1364": "Louhi on Ice",
"1365": "Cassie and the Copycats",
"1366": "The Wobbler in Darkness",
"1367": "Down the Rabbit Hole",
"1368": "Curiouser and Curiouser",
"1369": "Cairn Blight 451"
}
},
"612": {
"name": "Stormblood and Events",
"fates": {
Expand Down Expand Up @@ -2981,7 +2932,12 @@
"1321": "The Summer of Ultros",
"1322": "To Bait a Baiter",
"1323": "Snippers Gonna Snip",
"1324": "Adopt a Beach",
"1324": "Adopt a Beach"
}
},
"988": {
"name": "StormBlood After v4.1~",
"fates": {
"1325": "Bad Luck Comes in Trees",
"961": "Who Let the Hounds Out",
"962": "Who Let the Hounds Out",
Expand All @@ -3000,6 +2956,55 @@
"1405": "Counter-imperial Training: A Pinch of Assault",
"1406": "Counter-fiend Training: Less Is Morbol"
}
},
"999": {
"name": "Eureka - Anemos",
"fates": {
"1328": "The Swarm Never Sets",
"1329": "Wall in the Willows",
"1331": "Wine and Honey",
"1332": "Unsafety Dance",
"1333": "Teles House",
"1334": "Prove Your Amemettle",
"1335": "Caym What May",
"1336": "The Killing of a Sacred Bombardier",
"1337": "Sing, Muse",
"1338": "Drama Lamashtu",
"1339": "Short Serket 2",
"1340": "I Amarok",
"1341": "To the Mat",
"1342": "Simurghasbord",
"1343": "When You Ride Alone",
"1344": "One Missed Callisto",
"1345": "Disinherit the Wind",
"1346": "Don't Judge Me, Morbol",
"1347": "By Numbers",
"1348": "The Shadow over Anemos"
}
},
"998": {
"name": "Eureka - Pagos",
"fates": {
"1351": "Eternity",
"1352": "Cows for Concern",
"1353": "Ash the Magic Dragon",
"1354": "Conqueror Worm",
"1355": "Melting Point",
"1356": "Disorder in the Court",
"1357": "Does It Have to Be a Snowman",
"1358": "Brothers",
"1359": "Eye of Horus",
"1360": "Morte Arthro",
"1361": "Apocalypse Cow",
"1362": "Third Impact",
"1363": "Eye Scream for Ice Cream",
"1364": "Louhi on Ice",
"1365": "Cassie and the Copycats",
"1366": "The Wobbler in Darkness",
"1367": "Down the Rabbit Hole",
"1368": "Curiouser and Curiouser",
"1369": "Cairn Blight 451"
}
}
}
}
4 changes: 2 additions & 2 deletions App/Resources/Data/fr-fr.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
// Version
"version": "20180922.1",
"version": "20180924.1",

// Duty
"instances": {
Expand Down Expand Up @@ -2936,7 +2936,7 @@
}
},
"988": {
"name": "StormBlood v4.1~",
"name": "StormBlood After v4.1~",
"fates": {
"1325": "Bad Luck Comes in Trees",
"961": "Who Let the Hounds Out",
Expand Down
7 changes: 4 additions & 3 deletions App/Resources/Data/ja-jp.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
// Version
"version": "20180922.1",
"version": "20180924.1",

// Duty
"instances": {
Expand Down Expand Up @@ -2937,7 +2937,7 @@
}
},
"988": {
"name": "StormBlood v4.1~",
"name": "StormBlood After v4.1~",
"fates": {
"1325": "Bad Luck Comes in Trees",
"961": "Who Let the Hounds Out",
Expand All @@ -2958,7 +2958,8 @@
"1406": "Counter-fiend Training: Less Is Morbol"
}
},
"990": {"name": "アネモス",
"990": {
"name": "アネモス",
"fates": {
"1328": "The Swarm Never Sets",
"1329": "Wall in the Willows",
Expand Down
Loading