From 4ef450c8d310de41beb3457a7201e3c0612c9930 Mon Sep 17 00:00:00 2001 From: Asval Date: Mon, 3 Jun 2019 22:04:48 +0200 Subject: [PATCH] added clipsize icon + text --- FModel/FModel.csproj | 1 + FModel/Methods/IconGenerator/DrawText.cs | 11 ++++++----- FModel/Properties/AssemblyInfo.cs | 4 ++-- FModel/Properties/Resources.Designer.cs | 12 +++++++++++- FModel/Properties/Resources.resx | 3 +++ FModel/Resources/clipSize64.png | Bin 0 -> 2249 bytes 6 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 FModel/Resources/clipSize64.png diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index aa692ef6..7436c148 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -234,6 +234,7 @@ + diff --git a/FModel/Methods/IconGenerator/DrawText.cs b/FModel/Methods/IconGenerator/DrawText.cs index ec5a6e11..43ef3b6c 100644 --- a/FModel/Methods/IconGenerator/DrawText.cs +++ b/FModel/Methods/IconGenerator/DrawText.cs @@ -307,11 +307,12 @@ namespace FModel Image bulletImage = Resources.dmg64; myGraphic.DrawImage(ImageUtilities.ResizeImage(bulletImage, 15, 15), new Point(5, 500)); - if (statParsed.DmgPb != 0 && statParsed.ClipSize != 0) - { - DrawToRight("Reload Time: " + statParsed.ReloadTime + " seconds", myGraphic); - DrawToLeft(" " + statParsed.DmgPb, myGraphic); //damage per bullet - } + Image clipSizeImage = Resources.clipSize64; + myGraphic.DrawImage(ImageUtilities.ResizeImage(clipSizeImage, 15, 15), new Point(52, 500)); + + DrawToRight("Reload Time: " + statParsed.ReloadTime + " seconds", myGraphic); + DrawToLeft(" " + statParsed.DmgPb, myGraphic); //damage per bullet + myGraphic.DrawString(" " + statParsed.ClipSize, new Font(FontUtilities.pfc.Families[0], 13), new SolidBrush(Color.White), new Point(50, 500)); } } } diff --git a/FModel/Properties/AssemblyInfo.cs b/FModel/Properties/AssemblyInfo.cs index d7f6da7a..13d72f84 100644 --- a/FModel/Properties/AssemblyInfo.cs +++ b/FModel/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // en utilisant '*', comme indiqué ci-dessous : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.3.2.0")] -[assembly: AssemblyFileVersion("2.3.2.0")] +[assembly: AssemblyVersion("2.3.3.0")] +[assembly: AssemblyFileVersion("2.3.3.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index 59ddb2bd..0629a9b4 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace FModel.Properties { // à l'aide d'un outil, tel que ResGen ou Visual Studio. // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen // avec l'option /str ou régénérez votre projet VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -110,6 +110,16 @@ namespace FModel.Properties { } } + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap clipSize64 { + get { + object obj = ResourceManager.GetObject("clipSize64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index 8e6cd81b..3061a705 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -214,4 +214,7 @@ ..\Resources\LBolt64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\clipSize64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/FModel/Resources/clipSize64.png b/FModel/Resources/clipSize64.png new file mode 100644 index 0000000000000000000000000000000000000000..9cbffb0b1fcf3150c6f4c235e580b4283b6333b5 GIT binary patch literal 2249 zcmV;)2sZbLP)1 zYi!g-5TCm%SZG0n3W(GPC|CitP*FmNiGmN}0}?)|pot1v!3QAvK~M+@F@7+75Fz1% z(nO=C2r4mRG>Vb<06_!+K?q1NiVsAH&~mqC&)?R$>FnPBdjD%1ndG0{o0N*QPoCpR z`Pwa0l($bM5tRvCM&S$L{wAVk4__4JiP3z@JMi^|gq&7Gz1l(QA+JHn+qFZ+Bt?*MaHLr65km@9-u0nIl%yExa+D(&o$FzFFGc+_PhVQTdRhpN z!vGhudej-f!9bMN49EM|ozXZCm)Dnw2B1EO(Q{^sq;P-t^1-(2-2xXNn#+!byurfR zMAQ#;Tb47K&PaX1=XjhPZlr2q3XFd8M1H=+91g2tr)2nQ^*?PEX7DY1doH9Ajp#)-iZtXh+)6KM13p~od&H75$z$O z%@}WkfzN>UJrVsHQF#~X%UEY^y({Xxe_Y`%@RE}vm*~QHx>7FumzyZ_vc(NmvH;67 zLBVgqJ6jamTsB9C=6;@sRI&Fn#+XVm&)fPS#&eYA8$6e|n(^!vIf>&-_=2GQaz6{J z*+{yPT7#SJK2>PGC>{!e!-WhtmGS=7vAP{DLs%OQMzMN-76)?EWhK*cxb@;|P6fVM z;G2P;rg*?MCNEzmXrFRp%pM`*JK$a4dK+Vo2%e41JM7cn7;{4Kysc!6tujHL3~d)* zVl2v?0$+wX|C81Zke#E?Wxqplz~F0NB4pIS`<#c^%&$uDj1kk}L>5RL+y-yuajjJ* zm|^SX%}OK0f+2_TM07yGTeu;D@_gB<0sk<@!^7WgR_G^KVDx5!3D&?SA;68zb&Bv? zP;OIbH?exYIMC!#j)P_Z!LYu)l8A^lYriz1%r|!TA!$dKXHwf}L@Ual!R$j{# z;SZu*rO>8CSQn7+KB-^`k z*Cp{qH6uxdH3K9WK5r1@jmW4!7iFW;$Wui0lV>$Khsp2sL6FCRHA0X}h!!c0%tJX_ zq1oi+0n|Hv5R`G?s1SBP5$#a6&ML7B+vu6om$1%i9_Ld|Dxv{5l3e`}mg+K?dV?Sd zoOJj3LLm+-P=7+9^&z5X*zc%8kVBL}sTrwEeC%uxbmsygVG2reY$t%JQw& z+zRWESY53L{xxM4cp$JswD6H$hhd_|E8V@xlPl2h>B zK@a_2)^^kllelpdMR{k@Dn*F~(B4sKr$8I#F@S|?&xuXDD9=40-%HL58WknFVUt3G z<#=zohrX+T4U>}K3f-@(Rg`!Wv{yVz)`I?vhyJ=}zpgzD(qe$9TUM6u3y&)&JPQ7f z_l9`r78bYhAhl>*q3&mS$0-VY4caV^f^UFcA27nB%Iz|;A1JQ)vtA5(63zzCZV zbW7z81qVTGDC}1{?q-GS0?O@SGQJA%tyFUQ4h@2GD2(uQd>QDo1Iis>ho5T{y2~MM zHpZ;Qu#43j;t&)HdNV+OF<^v0j4?IfTOw$6!2gEd$BZ#EV~h=L3WC0&@VQ69@u05` z7{S71@J+_=xA1$Z!n>6P+YSqYawzmP#vJ!3Hyk|g=P`myiEANuWPrCmhM`bY5Y&dk zXisPD#mkE$8eu#0s>2?h&tk|Jv${v!6O4Mn$(|ffRkpxV*hC$K!_w6XkAssa7vVar z2Gf|_w)Q!@Cm844%HzR2&zEb$tU;J1BxFFV4tU54G4?w=2x>#YJ_`d%xWG6^;N61C zmmHl!f)!hKSgJ*blk1xvEldZGyLh!ZLf$Yd?qsNxD=zYUWe!WhGZK4_0|UH2ion<5 znP4F~!kq!db~CK`LZP5iRs6e+n0)PnKY)7IZosC(hj--wV7wB;D^Z zz}ylkU(o4rsc~s^#tw_eiRgUL_p?7b6qE9HiXfN|=k5oT<3^diN%ADF=afqMEH0b1 zb+GadCvSR{^2&00000NkvXXu0mjf{Y5Iv literal 0 HcmV?d00001