Update 2.2.1 release

WalterCouto · Apr 4, 2023 · f9fee61 · f9fee61
1 parent 88c8b1d
commit f9fee61
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/D2Editor.exe b/D2Editor.exe
diff --git a/D2EditorPadFile.xml b/D2EditorPadFile.xml
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>Diablo II Character Editor</Program_Name>
-		<Program_Version>2.1.9</Program_Version>
-		<Program_Release_Month>10</Program_Release_Month>
-		<Program_Release_Day>03</Program_Release_Day>
-		<Program_Release_Year>2022</Program_Release_Year>
+		<Program_Version>2.2.1</Program_Version>
+		<Program_Release_Month>04</Program_Release_Month>
+		<Program_Release_Day>04</Program_Release_Day>
+		<Program_Release_Year>2023</Program_Release_Year>
 		<Program_Cost_Dollars>0</Program_Cost_Dollars>
 		<Program_Cost_Other_Code>CAD</Program_Cost_Other_Code>
 		<Program_Cost_Other />
@@ -51,9 +51,9 @@
 		<Program_Category_Class />
 		<Program_System_Requirements />
 		<File_Info>
-			<File_Size_Bytes>19676672</File_Size_Bytes>
-			<File_Size_K>19215</File_Size_K>
-			<File_Size_MB>18.7</File_Size_MB>
+			<File_Size_Bytes>21084160</File_Size_Bytes>
+			<File_Size_K>20590</File_Size_K>
+			<File_Size_MB>20.1</File_Size_MB>
 		</File_Info>
 		<Expire_Info>
 			<Has_Expire_Info>N</Has_Expire_Info>
@@ -72,7 +72,7 @@
 			<Char_Desc_80 />
 			<Char_Desc_250 />
 			<Char_Desc_450 />
-			<Char_Desc_2000>The Diablo II Character Editor is an updated release of the original Diablo 2 Character Editor v1.97 by Burton Tsan. It has been tested with Diablo II: Resurrected (Patch 2.4 included) as well as Diablo II Classic v1.14d is this simple application designed to offer individuals the possibility to alter their Diablo II character's particularities through its simple settings and menus. The following stats can be edited:
+			<Char_Desc_2000>The Diablo II Character Editor is an updated release of the original Diablo 2 Character Editor v1.97 by Burton Tsan. It has been tested with Diablo II: Resurrected (PTR 2.6 included) as well as Diablo II Classic v1.14d is this simple application designed to offer individuals the possibility to alter their Diablo II character's particularities through its simple settings and menus. The following stats can be edited:
 
   - Character class
   - Character name

diff --git a/d2s_File_Format.md b/d2s_File_Format.md
@@ -623,7 +623,7 @@ Each item starts with a basic 14-byte structure. Many fields in this structure a
 |        |211     |  5   | ? 0x00 to pad to 216 bits                                                      |
 
 |Bit<br>`87` - `96`|Bit      | Size | Desc                                                           |
-|-----------|---------|------ |----------------------------------------------------------------|
+|-----------|---------|------|----------------------------------------------------------------|
 |           | 32      |  3   | ? 0x00                                                         |
 | 48        |         | 10   | ? 0x00                                                         |
 | 58        | 35      |  3   | [Parent](#parent)                                              |
@@ -758,7 +758,7 @@ Item quality is encoded as a 4-bit integer. For version `87`+, except for Normal
 | Value | Size | Desc                                                                        |
 |-------|------|-----------------------------------------------------------------------------|
 | 1     |  3   | [Inferior](#inferior)                                                       |
-| 2     |  0   | Normal                                                                      |
+| 2     | 0/12 | Normal (12 bits if it is a Charm, otherwise 0)                              |
 | 3     |  3   | Superior (bits that follow are set to 0)                                    |
 | 4     | 22   | [Magically Enhanced](#magically-enhanced)                                   |
 | 5     | 12   | Part of a Set (bit that follow are the Set Id from the `Sets.txt` file)     |

diff --git a/readme.md b/readme.md
@@ -37,6 +37,9 @@ You can do the following:<br>
 - Tested with Diablo II: Resurrected v1.5.73090 (PTR 2.6) and Diablo II Classic v1.14d **(It has unit tests confirming it supports all versions of the d2s file format, but the files used in testing, other than v1.14d and D2R files, have not been tested in a real game)**
 - Starting with Diablo II Classic V1.13c the maximum gold in your stash no longer depends on your character's level, and is now a flat cap of 2,500,000 instead.  The editor will now use this value when editing Resurrected files or Classic files marked as v1.10 or higher when determining the limit for your gold in your stash.
 - For changes to take effect, you must not have Diablo II running and you should close the character file before playing Diablo II.
+- To open a d2s from a D2R Mod, the D2R Mod must be properly installed on the system and you must open the file from it's mod location i.e. \Saved Games\Diablo II Resurrected\mods\btdiablo.
+- A json export file that contains the D2R Mod name can be opened from any location and will work properly if the D2R Mod is properly installed on the system.
+- An item that has an unknown image, will display with a default image.
 
 ### Distribution
 
@@ -56,9 +59,14 @@ Check the following site for updates at https://github.com/WalterCouto/D2CE<br>
 * [d2s Binary File Format](d2s_File_Format.md)<br>
 
 ### Revision History
-**Version 2.21 (February 16, 2023)**
+**Version 2.21 (April 4, 2023)**
 - Updated: Fix error message from bad character file<br>
 - Updated: Support added PTR 2.6<br>
+- Updated: Layout of Items Form to take into account possible sizes  of inventories in D2R mods.<br>
+- Updated: Json export now adds the D2R mod name if applicable.<br>
+<br>
+
+- Added: Support to read D2R standard mod character files, for example BTDiablo and Rebirth.<br>
 <br>
 
 **Version 2.20 (January 5, 2023)**

diff --git a/source/D2Editor.cpp b/source/D2Editor.cpp
@@ -18,9 +18,15 @@
 
 Revision History
 ================
-Version 2.21 (February 16, 2023)
+Version 2.21 (April 4, 2023)
    - Updated: Fix error message from bad character file
    - Updated: Support added PTR 2.6
+   - Updated: Layout of Items Form to take into account possible sizes 
+              of inventories in D2R mods.
+   - Updated: Json export now adds the D2R mod name if applicable.
+
+   - Added: Support to read D2R standard mod character files, for example
+            BTDiablo and Rebirth.
 
 Version 2.20 (January 5, 2023)
    - Updated: Item tooltip to display red for unmet requirements and blue

diff --git a/source/d2ceTests/D2EditorTests.vcxproj b/source/d2ceTests/D2EditorTests.vcxproj
@@ -139,6 +139,7 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -161,6 +162,7 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>