- added an ItemXmlNodeIdx property to Item, so that it always selects the correct xmlnode when writing item changes.

AnthonyZJiang · AnthonyZJiang · commit 4ef8ff31e94c · 2018-05-28T20:39:30.000+01:00
diff --git a/D-OS Save Editor/MainWindow.xaml.cs b/D-OS Save Editor/MainWindow.xaml.cs
@@ -474,11 +474,12 @@ private async void LoadButton_OnClick(object sender, RoutedEventArgs e)
             while (_getMetaBackgroundWorker.IsBusy)
                 await Task.Delay(5);
 
+            // TODO DNSA (Do Not Show Again) message box 
             // version check
             if (MainWindowData.Meta.IsOutdatedVersion)
             {
                 var dlgResult = MessageBox.Show(this,
-                    $"It appears that the version of your game is different from what this SE is purposely created for (ver. {DataTable.SupportedGameVersion}). As a result, changes made to your savegame may corrupt the savegame. Make sure you make a backup before continuing.",
+                    $"It appears that the version of your game is different from what this SE is purposely created for (ver. {DataTable.SupportedGameVersion}). As a result, changes made to your savegame may corrupt the savegame.\n\nMake sure you make a backup before continuing.",
                     "Game version incompatible", MessageBoxButton.OKCancel, MessageBoxImage.Warning);
                 if (dlgResult == MessageBoxResult.Cancel)
                 {
@@ -491,7 +492,7 @@ private async void LoadButton_OnClick(object sender, RoutedEventArgs e)
             if (MainWindowData.Meta.IsModWarning)
             {
                 var dlgResult = MessageBox.Show(this,
-                    "It appears that you have used mods. As a result, changes made to your savegame may corrupt the savegame. Make sure you make a backup before continuing.",
+                    "It appears that you have used mods. As a result, changes made to your savegame may corrupt the savegame.\n\nMake sure you make a backup before continuing.",
                     "Mods found", MessageBoxButton.OKCancel, MessageBoxImage.Warning);
                 if (dlgResult == MessageBoxResult.Cancel)
                 {
diff --git a/D-OS Save Editor/SE/InventoryTab.xaml.cs b/D-OS Save Editor/SE/InventoryTab.xaml.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -299,13 +298,12 @@ private void ApplyChangesButton_OnClick(object sender, RoutedEventArgs e)
                 // add changes
                 if (Player.ItemChanges.ContainsKey(item.Slot))
                 {
-                    Player.ItemChanges[item.Slot] = new ItemChange(item, Player.ItemChanges[item.Slot].ChangeType,
-                        ItemsListBox.SelectedIndex);
+                    Player.ItemChanges[item.Slot] = new ItemChange(item, Player.ItemChanges[item.Slot].ChangeType);
                 }
                 else
                 {
                     Player.ItemChanges.Add(item.Slot,
-                        new ItemChange(item, ChangeType.Modify, ItemsListBox.SelectedIndex));
+                        new ItemChange(item, ChangeType.Modify));
                 }
 
                 // apply changes to the original item
diff --git a/D-OS Save Editor/savegame/Item.cs b/D-OS Save Editor/savegame/Item.cs
@@ -38,6 +38,11 @@ public enum ItemRarityType { Common = 0, Uncommon, Rare, Epic, Legendary, Divine
         /// </summary>
         public string Xml { get; set; }
 
+        /// <summary>
+        /// The index of the item in xml inventory node list.
+        /// </summary>
+        public int ItemXmlNodeIdx { get; set; }
+
         /// <summary>
         /// Item category
         /// </summary>
@@ -499,15 +504,13 @@ public class ItemChange
     {
         public Item Item { get; }
         public ChangeType ChangeType { get;}
-        public int ItemIndex { get; set; }
 
         public ItemChange() { }
 
-        public ItemChange(Item item, ChangeType changeType, int itemIndex)
+        public ItemChange(Item item, ChangeType changeType)
         {
             Item = item.DeepClone();
             ChangeType = changeType;
-            ItemIndex = itemIndex;
         }
     }
 
diff --git a/D-OS Save Editor/savegame/LsxParser.cs b/D-OS Save Editor/savegame/LsxParser.cs
@@ -54,6 +54,7 @@ public static Player[] ParsePlayer(XmlDocument doc)
                     try
                     {
                         item = ParseItem(inventoryData[j].ParentNode);
+                        item.ItemXmlNodeIdx = j;
                     }
                     catch (ObjectNullException)
                     {
@@ -65,12 +66,6 @@ public static Player[] ParsePlayer(XmlDocument doc)
                         throw new ItemParserException(e, inventoryData[j].ParentNode);
                     }
 
-                    if (item == null)
-                    {
-                        notAnItemIdx.Enqueue(j);
-                        return;
-                    }
-
                     players[i].Items[j] = item;
                     players[i].SlotsOccupation[int.Parse(item.Slot)] = true;
                 });
@@ -411,7 +406,7 @@ public static XmlDocument WriteItemChanges(XmlDocument doc, Player player)
             // find item data
             var inventoryData = doc.DocumentElement.SelectNodes($"//attribute [@id='Parent'] [@value='{player.InventoryId}']");
 
-            foreach(var ic in player.ItemChanges)
+            foreach (var ic in player.ItemChanges)
             {
                 try
                 {
@@ -425,7 +420,7 @@ public static XmlDocument WriteItemChanges(XmlDocument doc, Player player)
                     }
                     else if (ic.Value.ChangeType == ChangeType.Modify)
                     {
-                        var itemNode = inventoryData[ic.Value.ItemIndex].ParentNode;
+                        var itemNode = inventoryData[ic.Value.Item.ItemXmlNodeIdx].ParentNode;
 
                         var allowedChanges = ic.Value.Item.GetAllowedChangeType();
                         if (allowedChanges.Contains(nameof(ic.Value.Item.Amount)))
diff --git a/D-OS Save Editor/savegame/Savegame.cs b/D-OS Save Editor/savegame/Savegame.cs
@@ -43,13 +43,11 @@ public async Task ParseLsxAsync(IProgress<string> progress)
             var doc = new XmlDocument();
             var metaDoc = new XmlDocument();
             doc.Load(UnpackDirectory + Path.DirectorySeparatorChar + "globals.lsx");
-            metaDoc.Load(UnpackDirectory + Path.DirectorySeparatorChar + "meta.lsx");
             // update progress
             progress.Report("Analysing savegame.");
             await Task.Delay(1);
             // parse xlml
             Players = LsxParser.ParsePlayer(doc);
-            Meta = LsxParser.ParseMeta(metaDoc);
             // update progress
             progress.Report("Loading data.");
             await Task.Delay(1);
@@ -98,10 +96,6 @@ public async Task UnpackSavegameAsync(IProgress<string> progress, bool metaOnly
             ResourceUtils.SaveResource(
                 ResourceUtils.LoadResource(UnpackDirectory + Path.DirectorySeparatorChar + "globals.lsf"),
                 UnpackDirectory + Path.DirectorySeparatorChar + "globals.lsx", ResourceFormat.LSX, outputVersion);
-            // uncompress and save meta.lsf
-            ResourceUtils.SaveResource(
-                ResourceUtils.LoadResource(UnpackDirectory + Path.DirectorySeparatorChar + "meta.lsf"),
-                UnpackDirectory + Path.DirectorySeparatorChar + "meta.lsx", ResourceFormat.LSX, outputVersion);
         }
 
         /// <summary>
@@ -124,7 +118,8 @@ public async Task PackSavegameAsync(IProgress<string> progress)
 
             // delete .lsx
             File.Delete(UnpackDirectory + Path.DirectorySeparatorChar + "globals.lsx");
-            File.Delete(UnpackDirectory + Path.DirectorySeparatorChar + "meta.lsx");
+            if (File.Exists(UnpackDirectory + Path.DirectorySeparatorChar + "meta.lsx"))
+                File.Delete(UnpackDirectory + Path.DirectorySeparatorChar + "meta.lsx");
 
             // update progress
             progress.Report("Packing savegame.");

Original file line number	Diff line number	Diff line change
`@@ -474,11 +474,12 @@ private async void LoadButton_OnClick(object sender, RoutedEventArgs e)`
`474`	`474`	`while (_getMetaBackgroundWorker.IsBusy)`
`475`	`475`	`await Task.Delay(5);`
`476`	`476`
	`477`	`+ // TODO DNSA (Do Not Show Again) message box`
`477`	`478`	`// version check`
`478`	`479`	`if (MainWindowData.Meta.IsOutdatedVersion)`
`479`	`480`	`{`
`480`	`481`	`var dlgResult = MessageBox.Show(this,`
`481`		`- $"It appears that the version of your game is different from what this SE is purposely created for (ver. {DataTable.SupportedGameVersion}). As a result, changes made to your savegame may corrupt the savegame. Make sure you make a backup before continuing.",`
	`482`	`+ $"It appears that the version of your game is different from what this SE is purposely created for (ver. {DataTable.SupportedGameVersion}). As a result, changes made to your savegame may corrupt the savegame.\n\nMake sure you make a backup before continuing.",`
`482`	`483`	`"Game version incompatible", MessageBoxButton.OKCancel, MessageBoxImage.Warning);`
`483`	`484`	`if (dlgResult == MessageBoxResult.Cancel)`
`484`	`485`	`{`
`@@ -491,7 +492,7 @@ private async void LoadButton_OnClick(object sender, RoutedEventArgs e)`
`491`	`492`	`if (MainWindowData.Meta.IsModWarning)`
`492`	`493`	`{`
`493`	`494`	`var dlgResult = MessageBox.Show(this,`
`494`		`- "It appears that you have used mods. As a result, changes made to your savegame may corrupt the savegame. Make sure you make a backup before continuing.",`
	`495`	`+ "It appears that you have used mods. As a result, changes made to your savegame may corrupt the savegame.\n\nMake sure you make a backup before continuing.",`
`495`	`496`	`"Mods found", MessageBoxButton.OKCancel, MessageBoxImage.Warning);`
`496`	`497`	`if (dlgResult == MessageBoxResult.Cancel)`
`497`	`498`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
`5`		`-using System.Text.RegularExpressions;`
`6`	`5`	`using System.Threading.Tasks;`
`7`	`6`	`using System.Windows;`
`8`	`7`	`using System.Windows.Controls;`
`@@ -299,13 +298,12 @@ private void ApplyChangesButton_OnClick(object sender, RoutedEventArgs e)`
`299`	`298`	`// add changes`
`300`	`299`	`if (Player.ItemChanges.ContainsKey(item.Slot))`
`301`	`300`	`{`
`302`		`- Player.ItemChanges[item.Slot] = new ItemChange(item, Player.ItemChanges[item.Slot].ChangeType,`
`303`		`- ItemsListBox.SelectedIndex);`
	`301`	`+ Player.ItemChanges[item.Slot] = new ItemChange(item, Player.ItemChanges[item.Slot].ChangeType);`
`304`	`302`	`}`
`305`	`303`	`else`
`306`	`304`	`{`
`307`	`305`	`Player.ItemChanges.Add(item.Slot,`
`308`		`- new ItemChange(item, ChangeType.Modify, ItemsListBox.SelectedIndex));`
	`306`	`+ new ItemChange(item, ChangeType.Modify));`
`309`	`307`	`}`
`310`	`308`
`311`	`309`	`// apply changes to the original item`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ public enum ItemRarityType { Common = 0, Uncommon, Rare, Epic, Legendary, Divine`
`38`	`38`	`/// </summary>`
`39`	`39`	`public string Xml { get; set; }`
`40`	`40`
	`41`	`+ /// <summary>`
	`42`	`+ /// The index of the item in xml inventory node list.`
	`43`	`+ /// </summary>`
	`44`	`+ public int ItemXmlNodeIdx { get; set; }`
	`45`	`+`
`41`	`46`	`/// <summary>`
`42`	`47`	`/// Item category`
`43`	`48`	`/// </summary>`
`@@ -499,15 +504,13 @@ public class ItemChange`
`499`	`504`	`{`
`500`	`505`	`public Item Item { get; }`
`501`	`506`	`public ChangeType ChangeType { get;}`
`502`		`- public int ItemIndex { get; set; }`
`503`	`507`
`504`	`508`	`public ItemChange() { }`
`505`	`509`
`506`		`- public ItemChange(Item item, ChangeType changeType, int itemIndex)`
	`510`	`+ public ItemChange(Item item, ChangeType changeType)`
`507`	`511`	`{`
`508`	`512`	`Item = item.DeepClone();`
`509`	`513`	`ChangeType = changeType;`
`510`		`- ItemIndex = itemIndex;`
`511`	`514`	`}`
`512`	`515`	`}`
`513`	`516`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public static Player[] ParsePlayer(XmlDocument doc)`
`54`	`54`	`try`
`55`	`55`	`{`
`56`	`56`	`item = ParseItem(inventoryData[j].ParentNode);`
	`57`	`+ item.ItemXmlNodeIdx = j;`
`57`	`58`	`}`
`58`	`59`	`catch (ObjectNullException)`
`59`	`60`	`{`
`@@ -65,12 +66,6 @@ public static Player[] ParsePlayer(XmlDocument doc)`
`65`	`66`	`throw new ItemParserException(e, inventoryData[j].ParentNode);`
`66`	`67`	`}`
`67`	`68`
`68`		`- if (item == null)`
`69`		`- {`
`70`		`- notAnItemIdx.Enqueue(j);`
`71`		`- return;`
`72`		`- }`
`73`		`-`
`74`	`69`	`players[i].Items[j] = item;`
`75`	`70`	`players[i].SlotsOccupation[int.Parse(item.Slot)] = true;`
`76`	`71`	`});`
`@@ -411,7 +406,7 @@ public static XmlDocument WriteItemChanges(XmlDocument doc, Player player)`
`411`	`406`	`// find item data`
`412`	`407`	`var inventoryData = doc.DocumentElement.SelectNodes($"//attribute [@id='Parent'] [@value='{player.InventoryId}']");`
`413`	`408`
`414`		`- foreach(var ic in player.ItemChanges)`
	`409`	`+ foreach (var ic in player.ItemChanges)`
`415`	`410`	`{`
`416`	`411`	`try`
`417`	`412`	`{`
`@@ -425,7 +420,7 @@ public static XmlDocument WriteItemChanges(XmlDocument doc, Player player)`
`425`	`420`	`}`
`426`	`421`	`else if (ic.Value.ChangeType == ChangeType.Modify)`
`427`	`422`	`{`
`428`		`- var itemNode = inventoryData[ic.Value.ItemIndex].ParentNode;`
	`423`	`+ var itemNode = inventoryData[ic.Value.Item.ItemXmlNodeIdx].ParentNode;`
`429`	`424`
`430`	`425`	`var allowedChanges = ic.Value.Item.GetAllowedChangeType();`
`431`	`426`	`if (allowedChanges.Contains(nameof(ic.Value.Item.Amount)))`