diff --git a/FModel/Forms/Settings.Designer.cs b/FModel/Forms/Settings.Designer.cs index c4a419f5..28db5017 100644 --- a/FModel/Forms/Settings.Designer.cs +++ b/FModel/Forms/Settings.Designer.cs @@ -176,7 +176,16 @@ namespace FModel.Forms "German", "Italian", "Spanish", - "Spanish (LA)"}); + "Spanish (LA)", + "Arabic", + "Japanese", + "Korean", + "Polish", + "Portuguese (Brazil)", + "Russian", + "Turkish", + "Chinese (S)", + "Traditional Chinese"}); this.comboBox1.Location = new System.Drawing.Point(70, 161); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(309, 21); diff --git a/FModel/MainWindow.Designer.cs b/FModel/MainWindow.Designer.cs index 40f9c13b..074fdedc 100644 --- a/FModel/MainWindow.Designer.cs +++ b/FModel/MainWindow.Designer.cs @@ -47,6 +47,9 @@ this.filesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copySelectedFilePathToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.locResToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveCurrentLocResToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.imageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoSaveImagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -71,10 +74,6 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker(); - this.locResToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveCurrentLocResToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.getDifferenceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -151,26 +150,26 @@ // loadOneToolStripMenuItem // this.loadOneToolStripMenuItem.Name = "loadOneToolStripMenuItem"; - this.loadOneToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadOneToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.loadOneToolStripMenuItem.Text = "Load One PAK"; this.loadOneToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.loadOneToolStripMenuItem_DropDownItemClicked); // // loadAllToolStripMenuItem // this.loadAllToolStripMenuItem.Name = "loadAllToolStripMenuItem"; - this.loadAllToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadAllToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.loadAllToolStripMenuItem.Text = "Load All PAKs"; this.loadAllToolStripMenuItem.Click += new System.EventHandler(this.loadAllToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(159, 6); // // backupPAKsToolStripMenuItem // this.backupPAKsToolStripMenuItem.Name = "backupPAKsToolStripMenuItem"; - this.backupPAKsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.backupPAKsToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.backupPAKsToolStripMenuItem.Text = "Backup PAKs"; this.backupPAKsToolStripMenuItem.Click += new System.EventHandler(this.backupPAKsToolStripMenuItem_Click); // @@ -178,7 +177,7 @@ // this.differenceModeToolStripMenuItem.CheckOnClick = true; this.differenceModeToolStripMenuItem.Name = "differenceModeToolStripMenuItem"; - this.differenceModeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.differenceModeToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.differenceModeToolStripMenuItem.Text = "Difference Mode"; this.differenceModeToolStripMenuItem.CheckedChanged += new System.EventHandler(this.differenceModeToolStripMenuItem_CheckedChanged); // @@ -187,21 +186,21 @@ this.updateModeToolStripMenuItem.CheckOnClick = true; this.updateModeToolStripMenuItem.Enabled = false; this.updateModeToolStripMenuItem.Name = "updateModeToolStripMenuItem"; - this.updateModeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.updateModeToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.updateModeToolStripMenuItem.Text = "Update Mode"; this.updateModeToolStripMenuItem.CheckedChanged += new System.EventHandler(this.updateModeToolStripMenuItem_CheckedChanged); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(159, 6); // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.Image = global::FModel.Properties.Resources.properties_16xLG; this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; this.settingsToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.settingsToolStripMenuItem.Text = "Settings"; this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); // @@ -232,6 +231,26 @@ this.copySelectedFilePathToolStripMenuItem.Text = "Copy Selected File Path"; this.copySelectedFilePathToolStripMenuItem.Click += new System.EventHandler(this.CopySelectedFilePathToolStripMenuItem_Click); // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(213, 6); + // + // locResToolStripMenuItem + // + this.locResToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveCurrentLocResToolStripMenuItem}); + this.locResToolStripMenuItem.Name = "locResToolStripMenuItem"; + this.locResToolStripMenuItem.Size = new System.Drawing.Size(216, 22); + this.locResToolStripMenuItem.Text = "LocRes"; + // + // saveCurrentLocResToolStripMenuItem + // + this.saveCurrentLocResToolStripMenuItem.Name = "saveCurrentLocResToolStripMenuItem"; + this.saveCurrentLocResToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.saveCurrentLocResToolStripMenuItem.Text = "Save Current LocRes"; + this.saveCurrentLocResToolStripMenuItem.Click += new System.EventHandler(this.SaveCurrentLocResToolStripMenuItem_Click); + // // imageToolStripMenuItem // this.imageToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -478,34 +497,6 @@ this.backgroundWorker2.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker2_DoWork); this.backgroundWorker2.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker2_RunWorkerCompleted); // - // locResToolStripMenuItem - // - this.locResToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveCurrentLocResToolStripMenuItem, - this.getDifferenceToolStripMenuItem}); - this.locResToolStripMenuItem.Name = "locResToolStripMenuItem"; - this.locResToolStripMenuItem.Size = new System.Drawing.Size(216, 22); - this.locResToolStripMenuItem.Text = "LocRes"; - // - // saveCurrentLocResToolStripMenuItem - // - this.saveCurrentLocResToolStripMenuItem.Name = "saveCurrentLocResToolStripMenuItem"; - this.saveCurrentLocResToolStripMenuItem.Size = new System.Drawing.Size(181, 22); - this.saveCurrentLocResToolStripMenuItem.Text = "Save Current LocRes"; - this.saveCurrentLocResToolStripMenuItem.Click += new System.EventHandler(this.SaveCurrentLocResToolStripMenuItem_Click); - // - // getDifferenceToolStripMenuItem - // - this.getDifferenceToolStripMenuItem.Name = "getDifferenceToolStripMenuItem"; - this.getDifferenceToolStripMenuItem.Size = new System.Drawing.Size(181, 22); - this.getDifferenceToolStripMenuItem.Text = "Get Difference"; - this.getDifferenceToolStripMenuItem.Click += new System.EventHandler(this.GetDifferenceToolStripMenuItem_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(213, 6); - // // MainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -582,7 +573,6 @@ private System.Windows.Forms.ToolStripMenuItem copySelectedFilePathToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem locResToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveCurrentLocResToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem getDifferenceToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; } } diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index d5ede3f8..0c4cac2a 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -1319,7 +1319,7 @@ namespace FModel AppendText(" successfully saved", Color.Black, true); } } - + g.Dispose(); return bmp; } @@ -1658,9 +1658,5 @@ namespace FModel AppendText(@"FortniteGame\Content\Localization\ - pakchunk0-WindowsClient.pak", Color.DarkRed, true); } } - private void GetDifferenceToolStripMenuItem_Click(object sender, EventArgs e) - { - - } } } diff --git a/FModel/MainWindow.resx b/FModel/MainWindow.resx index bf9a299a..a3b28eb8 100644 --- a/FModel/MainWindow.resx +++ b/FModel/MainWindow.resx @@ -131,7 +131,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa - CAAAAk1TRnQBSQFMAgEBAgEAAUABAQFAAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAUgBAQFIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/FModel/Methods/ChallengeGenerator/BundleDesign.cs b/FModel/Methods/ChallengeGenerator/BundleDesign.cs index c69fef45..f94833b1 100644 --- a/FModel/Methods/ChallengeGenerator/BundleDesign.cs +++ b/FModel/Methods/ChallengeGenerator/BundleDesign.cs @@ -179,6 +179,42 @@ namespace FModel all = "Completa LOS DESAFÍOS para conseguir el objeto de recompensa"; any = "Completa " + count + " DE LOS DESAFÍOS para conseguir el objeto de recompensa"; goto default; + case "Arabic": + all = "أكمل جميع التحديات لتربح عنصر المكافأة"; + any = "أكمل أيًا " + count + " من التحديات للحصول على عنصر المكافأة"; + goto default; + case "Japanese": + all = "全個のチャレンジをクリアして報酬アイテムを獲得する"; + any = "いずれか" + count + "個のチャレンジをクリアして、報酬アイテムを獲得する"; + goto default; + case "Korean": + all = "개의 도전을 모두 완료하고 보상 아이템을 얻으세요."; + any = count + "개의 도전 완료"; + goto default; + case "Polish": + all = "Ukończ wszystkie wyzwań, by otrzymać tę nagrodę"; + any = "Ukończ " + count + " dowolnych wyzwań, by otrzymać tę nagrodę"; + goto default; + case "Portuguese (Brazil)": + all = "Conclua TODOS OS DESAFIOS para receber o item de recompensa"; + any = "Conclua " + count + " DESAFIO(S) para receber o item de recompensa"; + goto default; + case "Russian": + all = "Выполните все испытания, чтобы получить награду"; + any = "Выполните не менее " + count + " любых испытаний для награды"; + goto default; + case "Turkish": + all = "Ödülü kazanmak için GÖREVI DE tamamla."; + any = "Ödülü kazanmak için herhangi " + count + " GÖREVI tamamla."; + goto default; + case "Chinese (S)": + all = "完成所有个挑战以赢得奖励物品"; + any = "完成任意" + count + "个挑战以赢得奖励物品"; + goto default; + case "Traditional Chinese": + all = "完成所有個挑戰以贏得獎勵物品"; + any = "完成任意" + count + "個挑戰以贏得獎勵物品"; + goto default; default: if (count == "-1") { @@ -190,15 +226,6 @@ namespace FModel } break; } - - if (count == "-1") - { - toDrawOn.DrawString(all, new Font(FontUtilities.pfc.Families[1], 50), new SolidBrush(Color.White), new Point(100, theY + 22)); - } - else - { - toDrawOn.DrawString(any, new Font(FontUtilities.pfc.Families[1], 50), new SolidBrush(Color.White), new Point(100, theY + 22)); - } } /// diff --git a/FModel/Methods/IconGenerator/DrawText.cs b/FModel/Methods/IconGenerator/DrawText.cs index 67f8751a..6b7b5311 100644 --- a/FModel/Methods/IconGenerator/DrawText.cs +++ b/FModel/Methods/IconGenerator/DrawText.cs @@ -1,4 +1,4 @@ -using csharp_wick; +using csharp_wick; using FModel.Parser.Items; using FModel.Properties; using Newtonsoft.Json; @@ -25,49 +25,52 @@ namespace FModel public static void DrawTexts(ItemsIdParser theItem, Graphics myGraphic, string mode) { - DrawDisplayName(theItem, myGraphic); - DrawDescription(theItem, myGraphic); - - SetTexts(theItem); - - switch (mode) + using (myGraphic) { - case "athIteDef": - DrawToLeft(ShortDescription, myGraphic); - DrawToRight(CosmeticSource, myGraphic); - break; - case "consAndWeap": - DrawToRight(ItemAction, myGraphic); - if (MainWindow.ExtractedFilePath.Contains("Items\\Consumables\\")) - { - DrawToLeft(MaxStackSize, myGraphic); - } - break; - case "variant": - DrawToLeft(ShortDescription, myGraphic); - DrawToRight(CosmeticId, myGraphic); - break; - case "stwHeroes": - DrawToRight(HeroType, myGraphic); - DrawPower(myGraphic); - break; - case "stwDefenders": - DrawToRight(DefenderType, myGraphic); - DrawPower(myGraphic); - break; - } + DrawDisplayName(theItem, myGraphic); + DrawDescription(theItem, myGraphic); - if (theItem.ExportType == "AthenaItemWrapDefinition" && Checking.WasFeatured && ItemIcon.ItemIconPath.Contains("WeaponRenders")) - { - DrawAdditionalImage(theItem, myGraphic); - } - if (theItem.AmmoData != null && theItem.AmmoData.AssetPathName.Contains("Ammo")) //TO AVOID TRIGGERING CONSUMABLES, NAME SHOULD CONTAIN "AMMO" - { - ItemIcon.GetAmmoData(theItem.AmmoData.AssetPathName, myGraphic); - DrawWeaponStat(WeaponRowName, myGraphic); - } + SetTexts(theItem); - DrawCosmeticUff(theItem, myGraphic); + switch (mode) + { + case "athIteDef": + DrawToLeft(ShortDescription, myGraphic); + DrawToRight(CosmeticSource, myGraphic); + break; + case "consAndWeap": + DrawToRight(ItemAction, myGraphic); + if (MainWindow.ExtractedFilePath.Contains("Items\\Consumables\\")) + { + DrawToLeft(MaxStackSize, myGraphic); + } + break; + case "variant": + DrawToLeft(ShortDescription, myGraphic); + DrawToRight(CosmeticId, myGraphic); + break; + case "stwHeroes": + DrawToRight(HeroType, myGraphic); + DrawPower(myGraphic); + break; + case "stwDefenders": + DrawToRight(DefenderType, myGraphic); + DrawPower(myGraphic); + break; + } + + if (theItem.ExportType == "AthenaItemWrapDefinition" && Checking.WasFeatured && ItemIcon.ItemIconPath.Contains("WeaponRenders")) + { + DrawAdditionalImage(theItem, myGraphic); + } + if (theItem.AmmoData != null && theItem.AmmoData.AssetPathName.Contains("Ammo")) //TO AVOID TRIGGERING CONSUMABLES, NAME SHOULD CONTAIN "AMMO" + { + ItemIcon.GetAmmoData(theItem.AmmoData.AssetPathName, myGraphic); + DrawWeaponStat(WeaponRowName, myGraphic); + } + + DrawCosmeticUff(theItem, myGraphic); + } } /// @@ -96,6 +99,15 @@ namespace FModel case "Italian": case "Spanish": case "Spanish (LA)": + case "Arabic": + case "Japanese": + case "Korean": + case "Polish": + case "Portuguese (Brazil)": + case "Russian": + case "Turkish": + case "Chinese (S)": + case "Traditional Chinese": ShortDescription = theItem.ShortDescription != null ? SearchResource.getTextByKey(theItem.ShortDescription.Key, theItem.ShortDescription.SourceString) : ""; break; default: @@ -372,6 +384,24 @@ namespace FModel case "Spanish": case "Spanish (LA)": return " segundos"; + case "Arabic": + return " الثواني"; //todo: right to left + case "Japanese": + return " 秒"; //todo: right to left? + case "Korean": + return " 초"; //todo: right to left? + case "Polish": + return " s"; + case "Portuguese (Brazil)": + return " segundo(s)"; + case "Russian": + return " сек"; + case "Turkish": + return " saniye"; + case "Chinese (S)": + return " 秒"; //todo: right to left? + case "Traditional Chinese": + return " 秒"; //todo: right to left? default: return " seconds"; } diff --git a/FModel/Methods/IconGenerator/Translations/LoadLocRes.cs b/FModel/Methods/IconGenerator/Translations/LoadLocRes.cs index b8c2c81e..98c5a104 100644 --- a/FModel/Methods/IconGenerator/Translations/LoadLocRes.cs +++ b/FModel/Methods/IconGenerator/Translations/LoadLocRes.cs @@ -1,5 +1,3 @@ -using System; - namespace FModel { static class LoadLocRes @@ -25,6 +23,33 @@ namespace FModel case "Spanish (LA)": myLocRes = getMyLocRes("es-419"); break; + case "Arabic": + myLocRes = getMyLocRes("ar"); + break; + case "Japanese": + myLocRes = getMyLocRes("ja"); + break; + case "Korean": + myLocRes = getMyLocRes("ko"); + break; + case "Polish": + myLocRes = getMyLocRes("pl"); + break; + case "Portuguese (Brazil)": + myLocRes = getMyLocRes("pt-BR"); + break; + case "Russian": + myLocRes = getMyLocRes("ru"); + break; + case "Turkish": + myLocRes = getMyLocRes("tr"); + break; + case "Chinese (S)": + myLocRes = getMyLocRes("zh-CN"); + break; + case "Traditional Chinese": + myLocRes = getMyLocRes("zh-Hant"); + break; default: break; }