Skip to content

Commit

Permalink
[HaRepacker] SaveForm: rename "save as 64 bit file" to "no ver number"
Browse files Browse the repository at this point in the history 
better describes it
it will be checked by default if its a 64-bit file anyway, remove the control from the user to make it a little more friendly
  • Loading branch information
@lastbattle
lastbattle committed Nov 29, 2022
1 parent ebf107e commit dc09b83
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 60 deletions.
14 changes: 7 additions & 7 deletions HaRepacker/GUI/SaveForm.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 40 additions & 28 deletions HaRepacker/GUI/SaveForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@
<data name="&gt;&gt;encryptionBox.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="saveButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="saveButton.Location" type="System.Drawing.Point, System.Drawing">
<value>1, 93</value>
</data>
Expand All @@ -164,33 +168,12 @@
<data name="&gt;&gt;saveButton.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="versionBox.Location" type="System.Drawing.Point, System.Drawing">
<value>75, 39</value>
</data>
<data name="versionBox.Size" type="System.Drawing.Size, System.Drawing">
<value>227, 22</value>
</data>
<data name="versionBox.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="versionBox.Text" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;versionBox.Name" xml:space="preserve">
<value>versionBox</value>
</data>
<data name="&gt;&gt;versionBox.Type" xml:space="preserve">
<value>HaRepacker.GUI.Input.IntegerInput, HaRepackerResurrected, Version=4.2.4.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;versionBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;versionBox.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>27, 41</value>
</data>
Expand Down Expand Up @@ -218,6 +201,9 @@
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 15</value>
</data>
Expand All @@ -242,21 +228,23 @@
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="checkBox_64BitFile.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="checkBox_64BitFile.Location" type="System.Drawing.Point, System.Drawing">
<value>29, 65</value>
<value>193, 41</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="checkBox_64BitFile.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>2, 2, 2, 2</value>
</data>
<data name="checkBox_64BitFile.Size" type="System.Drawing.Size, System.Drawing">
<value>304, 23</value>
<value>124, 23</value>
</data>
<data name="checkBox_64BitFile.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="checkBox_64BitFile.Text" xml:space="preserve">
<value>Save as 64-bit WZ file (GMS v230+, KMS v1.2.357+)</value>
<value>No version number</value>
</data>
<data name="&gt;&gt;checkBox_64BitFile.Name" xml:space="preserve">
<value>checkBox_64BitFile</value>
Expand All @@ -270,6 +258,30 @@
<data name="&gt;&gt;checkBox_64BitFile.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="versionBox.Location" type="System.Drawing.Point, System.Drawing">
<value>75, 39</value>
</data>
<data name="versionBox.Size" type="System.Drawing.Size, System.Drawing">
<value>98, 22</value>
</data>
<data name="versionBox.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="versionBox.Text" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;versionBox.Name" xml:space="preserve">
<value>versionBox</value>
</data>
<data name="&gt;&gt;versionBox.Type" xml:space="preserve">
<value>HaRepacker.GUI.Input.IntegerInput, HaRepackerResurrected, Version=4.2.4.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;versionBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;versionBox.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Expand Down
26 changes: 1 addition & 25 deletions MapleLib/WzLib/WzFile.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class WzFile : WzObject
internal WzMapleVersion maplepLocalVersion;
internal MapleStoryLocalisation mapleLocaleVersion = MapleStoryLocalisation.Not_Known;

internal bool wz_withEncryptVersionHeader = true; // KMS update after Q4 2021, ver 1.2.357
internal bool wz_withEncryptVersionHeader = true; // KMS update after Q4 2021, ver 1.2.357 does not contain any wz enc header information

internal byte[] WzIv;
#endregion
Expand Down Expand Up @@ -363,30 +363,6 @@ private bool TryDecodeWithWZVersionNumber(WzBinaryReader reader, int useWzVersio

switch (checkByte)
{
/* case 0x4: // gms v230
case 0xC1:
case 0xC2:
case 73:
case 34:
case 99:
case 66:
case 93:
case 140:
case 32:
case 141:
case 6:
case 96:
{
// temp fix, TODO: figure out what is this opcode
reader.PrintHexBytes(50); // test
// 80 EA 00 00 00 04 F7 9B 9D 9C 9D 9E 81 D9 DC D5 80 1C C7 5D 00 80 6E 95 D2 30 3F 4B ED 5A 04 F8 99 9D 9D 9F 80 C6 DD D6 80 66 FD A6 00 80 32 2E 95 56
WzDirectory directory = new WzDirectory(reader, this.name, this.versionHash, this.WzIv, this);
directory.ParseDirectory(lazyParse);
this.wzDir = directory;
return true;
}*/
case 0x73:
case 0x1b:
{
Expand Down

0 comments on commit dc09b83

Please sign in to comment.