diff --git a/FModel/Help.Designer.cs b/FModel/Help.Designer.cs index c63142b3..de26b9b6 100644 --- a/FModel/Help.Designer.cs +++ b/FModel/Help.Designer.cs @@ -40,6 +40,31 @@ this.label9 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); + this.label21 = new System.Windows.Forms.Label(); + this.label22 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.label24 = new System.Windows.Forms.Label(); + this.label25 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.label29 = new System.Windows.Forms.Label(); + this.label30 = new System.Windows.Forms.Label(); + this.label31 = new System.Windows.Forms.Label(); + this.label32 = new System.Windows.Forms.Label(); + this.label33 = new System.Windows.Forms.Label(); + this.label34 = new System.Windows.Forms.Label(); + this.label35 = new System.Windows.Forms.Label(); + this.label36 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // label1 @@ -55,120 +80,429 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.label2.Location = new System.Drawing.Point(12, 73); + this.label2.Location = new System.Drawing.Point(12, 58); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(157, 16); + this.label2.Size = new System.Drawing.Size(660, 29); this.label2.TabIndex = 1; this.label2.Text = "pakchunk0_s1-WindowsClient"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label3 // - this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label3.Location = new System.Drawing.Point(175, 73); + this.label3.Location = new System.Drawing.Point(12, 91); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(52, 16); + this.label3.Size = new System.Drawing.Size(663, 19); this.label3.TabIndex = 2; this.label3.Text = "BR Items"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label4 // - this.label4.AutoSize = true; + this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - this.label4.Location = new System.Drawing.Point(270, 73); + this.label4.Location = new System.Drawing.Point(170, 91); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(141, 16); + this.label4.Size = new System.Drawing.Size(502, 19); this.label4.TabIndex = 3; this.label4.Text = "\\Athena\\Items\\Cosmetics\\"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label5 // - this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - this.label5.Location = new System.Drawing.Point(461, 73); + this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label5.Location = new System.Drawing.Point(343, 91); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(150, 16); + this.label5.Size = new System.Drawing.Size(329, 19); this.label5.TabIndex = 4; this.label5.Text = "Name, Description, Rarity, ..."; - this.label5.Click += new System.EventHandler(this.label5_Click); + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label6 // - this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label6.Location = new System.Drawing.Point(175, 89); + this.label6.Location = new System.Drawing.Point(12, 129); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(59, 16); + this.label6.Size = new System.Drawing.Size(660, 19); this.label6.TabIndex = 5; this.label6.Text = "BR Quests"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label7 // - this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - this.label7.Location = new System.Drawing.Point(270, 89); + this.label7.Location = new System.Drawing.Point(170, 129); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(124, 16); + this.label7.Size = new System.Drawing.Size(502, 19); this.label7.TabIndex = 6; this.label7.Text = "\\Athena\\Items\\Quests\\"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label8 // - this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - this.label8.Location = new System.Drawing.Point(461, 89); + this.label8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label8.Location = new System.Drawing.Point(339, 129); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(211, 16); + this.label8.Size = new System.Drawing.Size(333, 19); this.label8.TabIndex = 7; this.label8.Text = "Description, Difficulty, Reward, Count, ..."; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label9 // - this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label9.Location = new System.Drawing.Point(175, 105); + this.label9.Location = new System.Drawing.Point(12, 148); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(88, 16); + this.label9.Size = new System.Drawing.Size(660, 19); this.label9.TabIndex = 8; this.label9.Text = "BR Game Modes"; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label10 // - this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - this.label10.Location = new System.Drawing.Point(270, 105); + this.label10.Location = new System.Drawing.Point(170, 148); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(100, 16); + this.label10.Size = new System.Drawing.Size(502, 19); this.label10.TabIndex = 9; this.label10.Text = "\\Athena\\Playlists\\"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label11 // - this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - this.label11.Location = new System.Drawing.Point(461, 105); + this.label11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label11.Location = new System.Drawing.Point(339, 148); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(206, 16); + this.label11.Size = new System.Drawing.Size(333, 19); this.label11.TabIndex = 10; this.label11.Text = "Title, Description, Type, Max Players, ..."; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label12 + // + this.label12.BackColor = System.Drawing.Color.Transparent; + this.label12.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label12.Location = new System.Drawing.Point(12, 110); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(660, 19); + this.label12.TabIndex = 11; + this.label12.Text = "BR Items Variants"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label13 + // + this.label13.BackColor = System.Drawing.Color.Transparent; + this.label13.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.label13.Location = new System.Drawing.Point(170, 110); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(502, 19); + this.label13.TabIndex = 12; + this.label13.Text = "\\Athena\\Items\\CosmeticVariantTokens\\"; + this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label14 + // + this.label14.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label14.Location = new System.Drawing.Point(428, 110); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(244, 19); + this.label14.TabIndex = 13; + this.label14.Text = "Name, Description, Rarity, ..."; + this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label15 + // + this.label15.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label15.Location = new System.Drawing.Point(12, 186); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(660, 19); + this.label15.TabIndex = 14; + this.label15.Text = "BR Music Packs Sound"; + this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label16 + // + this.label16.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.label16.Location = new System.Drawing.Point(170, 186); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(502, 19); + this.label16.TabIndex = 15; + this.label16.Text = "\\Athena\\Sounds\\MusicPacks\\"; + this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label17 + // + this.label17.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label17.Location = new System.Drawing.Point(391, 186); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(281, 19); + this.label17.TabIndex = 16; + this.label17.Text = "Sound Files"; + this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label18 + // + this.label18.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label18.Location = new System.Drawing.Point(12, 167); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(660, 19); + this.label18.TabIndex = 17; + this.label18.Text = "BR Emotes Sound"; + this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label19 + // + this.label19.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label19.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.label19.Location = new System.Drawing.Point(170, 167); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(502, 19); + this.label19.TabIndex = 18; + this.label19.Text = "\\Athena\\Sounds\\Emotes\\"; + this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label20 + // + this.label20.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label20.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label20.Location = new System.Drawing.Point(391, 167); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(281, 19); + this.label20.TabIndex = 19; + this.label20.Text = "Sound Files"; + this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label21 + // + this.label21.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label21.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label21.Location = new System.Drawing.Point(12, 205); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(660, 19); + this.label21.TabIndex = 20; + this.label21.Text = "BR Latest Event Files"; + this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label22 + // + this.label22.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label22.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.label22.Location = new System.Drawing.Point(170, 205); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(502, 19); + this.label22.TabIndex = 21; + this.label22.Text = "\\Athena\\Environments\\Blueprints\\Events\\"; + this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label23 + // + this.label23.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label23.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label23.Location = new System.Drawing.Point(489, 205); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(183, 19); + this.label23.TabIndex = 22; + this.label23.Text = "Textures"; + this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label24 + // + this.label24.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label24.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.label24.Location = new System.Drawing.Point(12, 253); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(660, 29); + this.label24.TabIndex = 23; + this.label24.Text = "pakchunk0_s7-WindowsClient"; + this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label25 + // + this.label25.BackColor = System.Drawing.Color.Transparent; + this.label25.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label25.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label25.Location = new System.Drawing.Point(12, 286); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(663, 19); + this.label25.TabIndex = 24; + this.label25.Text = "BR Items Icons"; + this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label26 + // + this.label26.BackColor = System.Drawing.Color.Transparent; + this.label26.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label26.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.label26.Location = new System.Drawing.Point(170, 286); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(502, 19); + this.label26.TabIndex = 25; + this.label26.Text = "\\UI\\Foundation\\Textures\\Icons\\"; + this.label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label27 + // + this.label27.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label27.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label27.Location = new System.Drawing.Point(489, 286); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(183, 19); + this.label27.TabIndex = 26; + this.label27.Text = "Textures"; + this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label28 + // + this.label28.BackColor = System.Drawing.Color.Transparent; + this.label28.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label28.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label28.Location = new System.Drawing.Point(12, 305); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(663, 19); + this.label28.TabIndex = 27; + this.label28.Text = "BR Items Featured Icons"; + this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label29 + // + this.label29.BackColor = System.Drawing.Color.Transparent; + this.label29.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label29.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.label29.Location = new System.Drawing.Point(170, 305); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(502, 19); + this.label29.TabIndex = 28; + this.label29.Text = "\\UI\\Foundation\\Textures\\BattleRoyale\\FeaturedItems\\"; + this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label30 + // + this.label30.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label30.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label30.Location = new System.Drawing.Point(539, 305); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(133, 19); + this.label30.TabIndex = 29; + this.label30.Text = "Textures"; + this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label31 + // + this.label31.BackColor = System.Drawing.Color.Transparent; + this.label31.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label31.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label31.Location = new System.Drawing.Point(12, 324); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(663, 19); + this.label31.TabIndex = 30; + this.label31.Text = "Old Menu Sounds"; + this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label32 + // + this.label32.BackColor = System.Drawing.Color.Transparent; + this.label32.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label32.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.label32.Location = new System.Drawing.Point(170, 324); + this.label32.Name = "label32"; + this.label32.Size = new System.Drawing.Size(502, 19); + this.label32.TabIndex = 31; + this.label32.Text = "\\Sounds\\Fort_Music\\Menu\\"; + this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label33 + // + this.label33.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label33.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label33.Location = new System.Drawing.Point(391, 324); + this.label33.Name = "label33"; + this.label33.Size = new System.Drawing.Size(281, 19); + this.label33.TabIndex = 32; + this.label33.Text = "Sound Files"; + this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label34 + // + this.label34.BackColor = System.Drawing.Color.Transparent; + this.label34.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label34.Location = new System.Drawing.Point(12, 343); + this.label34.Name = "label34"; + this.label34.Size = new System.Drawing.Size(663, 19); + this.label34.TabIndex = 33; + this.label34.Text = "New Menu Sounds"; + this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label35 + // + this.label35.BackColor = System.Drawing.Color.Transparent; + this.label35.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.label35.Location = new System.Drawing.Point(170, 343); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(502, 19); + this.label35.TabIndex = 34; + this.label35.Text = "\\Sounds\\Fort_Music\\Orchestral_Score\\Orch_Menu_Frontend\\"; + this.label35.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label36 + // + this.label36.Font = new System.Drawing.Font("Burbank Big Cd Bd", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label36.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))); + this.label36.Location = new System.Drawing.Point(539, 343); + this.label36.Name = "label36"; + this.label36.Size = new System.Drawing.Size(132, 19); + this.label36.TabIndex = 35; + this.label36.Text = "Sound Files"; + this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // HelpWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(684, 211); + this.ClientSize = new System.Drawing.Size(684, 374); + this.Controls.Add(this.label36); + this.Controls.Add(this.label35); + this.Controls.Add(this.label34); + this.Controls.Add(this.label33); + this.Controls.Add(this.label32); + this.Controls.Add(this.label31); + this.Controls.Add(this.label30); + this.Controls.Add(this.label29); + this.Controls.Add(this.label28); + this.Controls.Add(this.label27); + this.Controls.Add(this.label26); + this.Controls.Add(this.label25); + this.Controls.Add(this.label24); + this.Controls.Add(this.label23); + this.Controls.Add(this.label22); + this.Controls.Add(this.label21); + this.Controls.Add(this.label20); + this.Controls.Add(this.label19); + this.Controls.Add(this.label18); + this.Controls.Add(this.label17); + this.Controls.Add(this.label16); + this.Controls.Add(this.label15); + this.Controls.Add(this.label14); this.Controls.Add(this.label11); this.Controls.Add(this.label10); this.Controls.Add(this.label9); @@ -177,9 +511,11 @@ this.Controls.Add(this.label6); this.Controls.Add(this.label5); this.Controls.Add(this.label4); - this.Controls.Add(this.label3); this.Controls.Add(this.label2); this.Controls.Add(this.label1); + this.Controls.Add(this.label3); + this.Controls.Add(this.label13); + this.Controls.Add(this.label12); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; @@ -188,7 +524,6 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FModel Help"; this.ResumeLayout(false); - this.PerformLayout(); } @@ -205,5 +540,30 @@ private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.Label label25; + private System.Windows.Forms.Label label26; + private System.Windows.Forms.Label label27; + private System.Windows.Forms.Label label28; + private System.Windows.Forms.Label label29; + private System.Windows.Forms.Label label30; + private System.Windows.Forms.Label label31; + private System.Windows.Forms.Label label32; + private System.Windows.Forms.Label label33; + private System.Windows.Forms.Label label34; + private System.Windows.Forms.Label label35; + private System.Windows.Forms.Label label36; } } \ No newline at end of file diff --git a/FModel/Help.cs b/FModel/Help.cs index 7db1c7bf..c51e4a4d 100644 --- a/FModel/Help.cs +++ b/FModel/Help.cs @@ -16,10 +16,5 @@ namespace FModel { InitializeComponent(); } - - private void label5_Click(object sender, EventArgs e) - { - - } } } diff --git a/FModel/PAKWindow.Designer.cs b/FModel/PAKWindow.Designer.cs index 58a35acc..67972596 100644 --- a/FModel/PAKWindow.Designer.cs +++ b/FModel/PAKWindow.Designer.cs @@ -96,19 +96,19 @@ this.optionsToolStripMenuItem, this.helpToolStripMenuItem}); this.LoadContext.Name = "LoadContext"; - this.LoadContext.Size = new System.Drawing.Size(117, 48); + this.LoadContext.Size = new System.Drawing.Size(128, 52); // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(116, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(127, 24); this.optionsToolStripMenuItem.Text = "Options"; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // // helpToolStripMenuItem // this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(116, 22); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(127, 24); this.helpToolStripMenuItem.Text = "Help"; this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); // @@ -218,13 +218,13 @@ this.ImageContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.OpenImageTS}); this.ImageContext.Name = "ImageContext"; - this.ImageContext.Size = new System.Drawing.Size(140, 26); + this.ImageContext.Size = new System.Drawing.Size(155, 28); // // OpenImageTS // this.OpenImageTS.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.OpenImageTS.Name = "OpenImageTS"; - this.OpenImageTS.Size = new System.Drawing.Size(139, 22); + this.OpenImageTS.Size = new System.Drawing.Size(154, 24); this.OpenImageTS.Text = "Open Image"; this.OpenImageTS.Click += new System.EventHandler(this.OpenImageTS_Click); // @@ -249,7 +249,7 @@ this.toolStripSeparator1, this.mergeGeneratedImagesToolStripMenuItem}); this.ExtractAsset.Name = "ExtractAsset"; - this.ExtractAsset.Size = new System.Drawing.Size(223, 76); + this.ExtractAsset.Size = new System.Drawing.Size(252, 107); // // LoadDataTS // @@ -259,7 +259,7 @@ this.LoadDataTS.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.LoadDataTS.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LoadDataTS.Name = "LoadDataTS"; - this.LoadDataTS.Size = new System.Drawing.Size(222, 22); + this.LoadDataTS.Size = new System.Drawing.Size(251, 24); this.LoadDataTS.Text = "Load Data After Serialization"; // // SaveImageTS @@ -267,18 +267,18 @@ this.SaveImageTS.CheckOnClick = true; this.SaveImageTS.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.SaveImageTS.Name = "SaveImageTS"; - this.SaveImageTS.Size = new System.Drawing.Size(222, 22); - this.SaveImageTS.Text = "Save Generated Image"; + this.SaveImageTS.Size = new System.Drawing.Size(251, 24); + this.SaveImageTS.Text = "Auto Save Generated Image"; // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(219, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(248, 6); // // mergeGeneratedImagesToolStripMenuItem // this.mergeGeneratedImagesToolStripMenuItem.Name = "mergeGeneratedImagesToolStripMenuItem"; - this.mergeGeneratedImagesToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.mergeGeneratedImagesToolStripMenuItem.Size = new System.Drawing.Size(251, 24); this.mergeGeneratedImagesToolStripMenuItem.Text = "Merge Generated Images"; this.mergeGeneratedImagesToolStripMenuItem.Click += new System.EventHandler(this.mergeGeneratedImagesToolStripMenuItem_Click); // diff --git a/FModel/PAKWindow.cs b/FModel/PAKWindow.cs index e4e4b332..c6cfaa10 100644 --- a/FModel/PAKWindow.cs +++ b/FModel/PAKWindow.cs @@ -712,18 +712,19 @@ namespace FModel AppendText("Auto loading data set to ", Color.Black); AppendText("True", Color.Green, true); - if (filesJSON.Contains("Athena\\Items\\Cosmetics")) //ASSET IS AN ID => CREATE ICON + if (filesJSON.Contains("Athena\\Items\\Cosmetics") || filesJSON.Contains("Athena\\Items\\CosmeticVariantTokens") || filesJSON.Contains("Athena\\Items\\Weapons")) //ASSET IS AN ID => CREATE ICON { - AppendText("✔ ", Color.Green); - AppendText(currentItem, Color.DarkRed); - AppendText(" is an ", Color.Black); - AppendText("ID file", Color.SteelBlue, true); - AppendText("Parsing...", Color.Black, true); - for (int iii = 0; iii < IDParser.Length; iii++) { + AppendText("Parsing...", Color.Black, true); + if (IDParser[iii].ExportType.Contains("Item") && IDParser[iii].ExportType.Contains("Definition")) { + AppendText("✔ ", Color.Green); + AppendText(currentItem, Color.DarkRed); + AppendText(" is an ", Color.Black); + AppendText("ID file", Color.SteelBlue, true); + ItemName = IDParser[iii].DisplayName; Bitmap bmp = new Bitmap(522, 522); Graphics g = Graphics.FromImage(bmp); @@ -1160,16 +1161,263 @@ namespace FModel } catch (IndexOutOfRangeException) { - AppendText("[IndexOutOfRangeException] ", Color.Red); - AppendText("No ", Color.Black); - AppendText("GameplayTags as Cosmetics.Source ", Color.SteelBlue); - AppendText("found", Color.Black, true); + try + { + g.DrawString(IDParser[iii].GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(IDParser[iii].GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Weapon.Ranged."))].Substring(14), new Font(pfc.Families[0], 13), new SolidBrush(Color.White), new Point(522 - 5, 500), rightString); + } + catch (NullReferenceException) + { + AppendText("[NullReferenceException] ", Color.Red); + AppendText("No ", Color.Black); + AppendText("GameplayTags ", Color.SteelBlue); + AppendText("found", Color.Black, true); + } + catch (IndexOutOfRangeException) + { + AppendText("[IndexOutOfRangeException] ", Color.Red); + AppendText("No ", Color.Black); + AppendText("GameplayTags ", Color.SteelBlue); + AppendText("as ", Color.Black); + AppendText("Cosmetics.Source ", Color.SteelBlue); + AppendText("or ", Color.Black); + AppendText("Weapon.Ranged ", Color.SteelBlue); + AppendText("found", Color.Black, true); + } } //COSMETIC SOURCE ItemIconPictureBox.Image = bmp; if (((ToolStripMenuItem)ExtractAsset.Items[1]).Checked == true) { - AppendText("Auto saving icon set to ", Color.Black); + AppendText("Auto saving icons set to ", Color.Black); + AppendText("True", Color.Green, true); + ItemIconPictureBox.Image.Save(docPath + "\\Generated Icons\\" + ItemName + ".png", ImageFormat.Png); + + AppendText("✔ ", Color.Green); + AppendText(ItemName, Color.DarkRed); + AppendText(" successfully saved to ", Color.Black); + AppendText(docPath + "\\Generated Icons\\" + ItemName + ".png", Color.SteelBlue, true); + } + } + if (IDParser[iii].ExportType == "FortVariantTokenType") + { + AppendText("✔ ", Color.Green); + AppendText(currentItem, Color.DarkRed); + AppendText(" is an ", Color.Black); + AppendText("Cosmetic Variant file", Color.SteelBlue, true); + + ItemName = IDParser[iii].DisplayName; + Bitmap bmp = new Bitmap(522, 522); + Graphics g = Graphics.FromImage(bmp); + g.TextRenderingHint = TextRenderingHint.AntiAlias; + + getItemRarity(IDParser[iii], g); + + string itemIconPath = string.Empty; + + if (IDParser[iii].LargePreviewImage != null) + { + string textureFile = Path.GetFileName(IDParser[iii].LargePreviewImage.AssetPathName).Substring(0, Path.GetFileName(IDParser[iii].LargePreviewImage.AssetPathName).LastIndexOf('.')); + AppendText("✔ ", Color.Green); + AppendText(textureFile, Color.DarkRed); + AppendText(" detected as a ", Color.Black); + AppendText("Texture2D file", Color.SteelBlue, true); + + var filesPath = Directory.GetFiles(docPath + "\\Extracted", textureFile + ".*", SearchOption.AllDirectories).FirstOrDefault(); + if (!File.Exists(filesPath)) + { + if (currentGUID != "0-0-0-0") //DYNAMIC PAK + { + await Task.Run(() => { + jwpmProcess("extract \"" + Properties.Settings.Default.FortnitePAKs + "\\" + currentPAK + "\" \"" + textureFile + "\" \"" + docPath + "\""); + }); + filesPath = Directory.GetFiles(docPath + "\\Extracted", textureFile + ".*", SearchOption.AllDirectories).FirstOrDefault(); + } + else //NORMAL PAK + { + await Task.Run(() => { + if (IDParser[iii].LargePreviewImage.AssetPathName.Contains("/Game/2dAssets/")) + { + jwpmProcess("extract \"" + Properties.Settings.Default.FortnitePAKs + "\\pakchunk0-WindowsClient.pak" + "\" \"" + textureFile + "\" \"" + docPath + "\""); + } + else if (IDParser[iii].LargePreviewImage.AssetPathName.Contains("/Game/Athena/TestAssets/") || IDParser[iii].LargePreviewImage.AssetPathName.Contains("/Game/Athena/Prototype/")) + { + jwpmProcess("extract \"" + Properties.Settings.Default.FortnitePAKs + "\\" + currentPAK + "\" \"" + textureFile + "\" \"" + docPath + "\""); + } + else + { + jwpmProcess("extract \"" + Properties.Settings.Default.FortnitePAKs + "\\pakchunk0_s7-WindowsClient.pak" + "\" \"" + textureFile + "\" \"" + docPath + "\""); + } + }); + filesPath = Directory.GetFiles(docPath + "\\Extracted", textureFile + ".*", SearchOption.AllDirectories).FirstOrDefault(); + } + } + try + { + if (filesPath != null) + { + AppendText("✔ ", Color.Green); + AppendText(textureFile, Color.DarkRed); + AppendText(" successfully extracted to ", Color.Black); + AppendText(filesPath.Substring(0, filesPath.LastIndexOf('.')), Color.SteelBlue, true); + + itemIconPath = filesPath.Substring(0, filesPath.LastIndexOf('.')) + ".png"; + if (!File.Exists(itemIconPath)) + { + await Task.Run(() => { + jwpmProcess("texture \"" + filesPath.Substring(0, filesPath.LastIndexOf('.')) + "\""); + }); + itemIconPath = filesPath.Substring(0, filesPath.LastIndexOf('.')) + ".png"; + } + + AppendText("✔ ", Color.Green); + AppendText(textureFile, Color.DarkRed); + AppendText(" successfully converted to a PNG image with path ", Color.Black); + AppendText(itemIconPath, Color.SteelBlue, true); + } + } + catch (IndexOutOfRangeException) + { + AppendText("[IndexOutOfRangeException] ", Color.Red); + AppendText("Can't extract ", Color.Black); + AppendText(textureFile, Color.SteelBlue); + AppendText(" in ", Color.Black); + AppendText("pakchunk0_s7-WindowsClient.pak", Color.DarkRed, true); + } + } + else if (IDParser[iii].SmallPreviewImage != null) + { + string textureFile = Path.GetFileName(IDParser[iii].SmallPreviewImage.AssetPathName).Substring(0, Path.GetFileName(IDParser[iii].SmallPreviewImage.AssetPathName).LastIndexOf('.')); + AppendText("✔ ", Color.Green); + AppendText(textureFile, Color.DarkRed); + AppendText(" detected as a ", Color.Black); + AppendText("Texture2D file", Color.SteelBlue, true); + + var filesPath = Directory.GetFiles(docPath + "\\Extracted", textureFile + ".*", SearchOption.AllDirectories).FirstOrDefault(); + if (!File.Exists(filesPath)) + { + if (currentGUID != "0-0-0-0") + { + await Task.Run(() => { + jwpmProcess("extract \"" + Properties.Settings.Default.FortnitePAKs + "\\" + currentPAK + "\" \"" + textureFile + "\" \"" + docPath + "\""); + }); + filesPath = Directory.GetFiles(docPath + "\\Extracted", textureFile + ".*", SearchOption.AllDirectories).FirstOrDefault(); + } + else + { + await Task.Run(() => { + if (IDParser[iii].SmallPreviewImage.AssetPathName.Contains("/Game/2dAssets/")) + { + jwpmProcess("extract \"" + Properties.Settings.Default.FortnitePAKs + "\\pakchunk0-WindowsClient.pak" + "\" \"" + textureFile + "\" \"" + docPath + "\""); + } + else if (IDParser[iii].SmallPreviewImage.AssetPathName.Contains("/Game/Athena/TestAssets/") || IDParser[iii].SmallPreviewImage.AssetPathName.Contains("/Game/Athena/Prototype/")) + { + jwpmProcess("extract \"" + Properties.Settings.Default.FortnitePAKs + "\\" + currentPAK + "\" \"" + textureFile + "\" \"" + docPath + "\""); + } + else + { + jwpmProcess("extract \"" + Properties.Settings.Default.FortnitePAKs + "\\pakchunk0_s7-WindowsClient.pak" + "\" \"" + textureFile + "\" \"" + docPath + "\""); + } + }); + filesPath = Directory.GetFiles(docPath + "\\Extracted", textureFile + ".*", SearchOption.AllDirectories).FirstOrDefault(); + } + } + try + { + if (filesPath != null) + { + AppendText("✔ ", Color.Green); + AppendText(textureFile, Color.DarkRed); + AppendText(" successfully extracted to ", Color.Black); + AppendText(filesPath.Substring(0, filesPath.LastIndexOf('.')), Color.SteelBlue, true); + + itemIconPath = filesPath.Substring(0, filesPath.LastIndexOf('.')) + ".png"; + if (!File.Exists(itemIconPath)) + { + await Task.Run(() => { + jwpmProcess("texture \"" + filesPath.Substring(0, filesPath.LastIndexOf('.')) + "\""); + }); + itemIconPath = filesPath.Substring(0, filesPath.LastIndexOf('.')) + ".png"; + } + + AppendText("✔ ", Color.Green); + AppendText(textureFile, Color.DarkRed); + AppendText(" successfully converted to a PNG image with path ", Color.Black); + AppendText(itemIconPath, Color.SteelBlue, true); + } + } + catch (IndexOutOfRangeException) + { + AppendText("[IndexOutOfRangeException] ", Color.Red); + AppendText("Can't extract ", Color.Black); + AppendText(textureFile, Color.SteelBlue); + AppendText(" in ", Color.Black); + AppendText("pakchunk0_s7-WindowsClient.pak", Color.DarkRed, true); + } + } + + if (File.Exists(itemIconPath)) + { + Image ItemIcon = Image.FromFile(itemIconPath); + g.DrawImage(ItemIcon, new Point(5, 5)); + } + else + { + Image ItemIcon = Properties.Resources.unknown512; + g.DrawImage(ItemIcon, new Point(0, 0)); + } + + Image bg512 = Properties.Resources.BG512; + g.DrawImage(bg512, new Point(5, 383)); + + try + { + g.DrawString(ItemName, new Font(pfc.Families[0], 35), new SolidBrush(Color.White), new Point(522 / 2, 395), centeredString); + } + catch (NullReferenceException) + { + AppendText("[NullReferenceException] ", Color.Red); + AppendText("No ", Color.Black); + AppendText("DisplayName ", Color.SteelBlue); + AppendText("found", Color.Black, true); + } //NAME + try + { + g.DrawString(IDParser[iii].Description, new Font("Arial", 10), new SolidBrush(Color.White), new Point(522 / 2, 465), centeredStringLine); + } + catch (NullReferenceException) + { + AppendText("[NullReferenceException] ", Color.Red); + AppendText("No ", Color.Black); + AppendText("Description ", Color.SteelBlue); + AppendText("found", Color.Black, true); + } //DESCRIPTION + try + { + g.DrawString(IDParser[iii].ShortDescription, new Font(pfc.Families[0], 13), new SolidBrush(Color.White), new Point(5, 500)); + } + catch (NullReferenceException) + { + AppendText("[NullReferenceException] ", Color.Red); + AppendText("No ", Color.Black); + AppendText("ShortDescription ", Color.SteelBlue); + AppendText("found", Color.Black, true); + } //TYPE + try + { + g.DrawString(IDParser[iii].cosmetic_item, new Font(pfc.Families[0], 13), new SolidBrush(Color.White), new Point(522 - 5, 500), rightString); + } + catch (NullReferenceException) + { + AppendText("[NullReferenceException] ", Color.Red); + AppendText("No ", Color.Black); + AppendText("Cosmetic Item ", Color.SteelBlue); + AppendText("found", Color.Black, true); + } //COSMETIC ITEM + + ItemIconPictureBox.Image = bmp; + if (((ToolStripMenuItem)ExtractAsset.Items[1]).Checked == true) + { + AppendText("Auto saving icons set to ", Color.Black); AppendText("True", Color.Green, true); ItemIconPictureBox.Image.Save(docPath + "\\Generated Icons\\" + ItemName + ".png", ImageFormat.Png); @@ -1247,7 +1495,7 @@ namespace FModel if (((ToolStripMenuItem)ExtractAsset.Items[1]).Checked == true) { - AppendText("Auto saving icon set to ", Color.Black); + AppendText("Auto saving images set to ", Color.Black); AppendText("True", Color.Green, true); ItemIconPictureBox.Image.Save(docPath + "\\Generated Icons\\" + ItemName + ".png", ImageFormat.Png); diff --git a/FModel/PAKWindow.resx b/FModel/PAKWindow.resx index 913151e6..eae54970 100644 --- a/FModel/PAKWindow.resx +++ b/FModel/PAKWindow.resx @@ -131,7 +131,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACc - BwAAAk1TRnQBSQFMAgEBAgEAASgBAAEoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + BwAAAk1TRnQBSQFMAgEBAgEAATABAAEwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/FModel/Parser/ItemsIDParser.cs b/FModel/Parser/ItemsIDParser.cs index 9e90b424..0f124617 100644 --- a/FModel/Parser/ItemsIDParser.cs +++ b/FModel/Parser/ItemsIDParser.cs @@ -20,6 +20,9 @@ namespace FModel [JsonProperty("export_type")] public string ExportType { get; set; } + [JsonProperty("cosmetic_item")] + public string cosmetic_item { get; set; } + [JsonProperty("CharacterParts")] public string[] CharacterParts { get; set; } diff --git a/FModel/Properties/AssemblyInfo.cs b/FModel/Properties/AssemblyInfo.cs index f2a8f717..642d2716 100644 --- a/FModel/Properties/AssemblyInfo.cs +++ b/FModel/Properties/AssemblyInfo.cs @@ -1,4 +1,5 @@ -using System.Reflection; +using System.Resources; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -32,5 +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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] +[assembly: NeutralResourcesLanguage("en")] + diff --git a/README.md b/README.md index 1de7a10c..73bd888a 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ ### What i'm using - [Fortnite Asset Parser](https://github.com/SirWaddles/JohnWickParse) - Modded Version With Output Control - [JSON Parser](https://app.quicktype.io/) +- [ScintillaNET](https://www.nuget.org/packages/jacobslusser.ScintillaNET) - [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) ### Why FModel This project is mainly based on what [UModel](https://github.com/gildor2/UModel) can do, in a personalized way, in case UModel doesn't work, as a temporary rescue solution.