Version 0.9.9

Author: Sven Braune

AboutForm.Designer.cs

@@ -121,8 +121,8 @@
   <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDgAA
-        Cw4BQL7hQQAACRhJREFUWEelV2tQk+kV1g7b27rtrFVWVC4Kcr+GAAkJuXxJSCBcEgghhIRAwkUBEQmX
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
+        Cw0B7QfALAAACRhJREFUWEelV2tQk+kV1g7b27rtrFVWVC4Kcr+GAAkJuXxJSCBcEgghhIRAwkUBEQmX
         QLijiNYVR7B4v9bFrpfdyuw4Ha9Tp451Rtdxf/hDnXHsOqhbta52ti11n573Y7HbGUbYysyZN1/yvuc8
         5znPOe/H3Dk/4E+tVi+l7afJDpIdOHv27F9/wPG330oANlRUVKC0tBT0+QnZz97e6yw9UDAfsvFLly7h
         2bNnOHr06EN6zp7l8bffRsF+bDabB27fvo07d+7gwoULKC8v7317zz/AA4GwDg4Ovnj+/DmePn0KAsRK

AboutForm.resx

@@ -13,7 +13,7 @@ internal static class Data
 	{
 		static readonly Dictionary<string, Image> images = new Dictionary<string, Image>();
 		public static readonly ImageList list = new ImageList(){ ColorDepth = ColorDepth.Depth32Bit };
-		public static readonly Dictionary<short, Item> items = new Dictionary<short, Item>();
+		public static readonly Items items = new Items();
 		public static readonly Dictionary<string, Group> groups = new Dictionary<string, Group>();
 		public static Image unknown;
 		public static int version = int.MinValue;
@@ -22,6 +22,7 @@ public static void Init(string path)
 		{
 			ResourceManager resources = new ResourceManager("INVedit.Resources", typeof(Data).Assembly);
 			unknown = (Image)resources.GetObject("unknown");
+			list.Images.Add(unknown);
 
 			string[] lines = File.ReadAllLines(path);
 			for (int i = 1; i <= lines.Length; ++i) {
@@ -50,14 +51,14 @@ public static void Init(string path)
 						try { icon = short.Parse(split[2]); }
 						catch (Exception e) { throw new DataException("Failed to parse column 'ICON' at line "+i+" in file '"+path+"'.", e); }
 						if (!items.ContainsKey(icon)) throw new DataException("Invalid item id '"+icon+"' in column 'ICON' at line "+i+" in file '"+path+"'.");
-						int imageIndex = items[icon].imageIndex;
+						int imageIndex = items[icon][0].imageIndex;
 						string[] l = split[3].Split(new char[]{','}, StringSplitOptions.RemoveEmptyEntries);
 						Group group = new Group(name, imageIndex);
 						foreach (string n in l) {
 							short s;
 							try { s = short.Parse(n); }
 							catch (Exception e) { throw new DataException("Failed to parse column 'ITEMS' at line "+i+" in file '"+path+"'.", e); }
-							if (items.ContainsKey(s)) group.Add(items[s]);
+							if (items.ContainsKey(s)) foreach (Item item in items[s].Values) group.Add(item);
 							else MessageBox.Show("Invalid item id '"+s+"' in column 'ITEMS' at line "+i+" in file '"+path+"'.",
 							                     "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 						}
@@ -78,15 +79,36 @@ public static void Init(string path)
 						} catch (Exception e) { throw new DataException("Failed to parse column 'CORDS' at line "+i+" in file '"+path+"'.", e); }
 						if (x < 0 || y < 0 || x*16+16 > image.Width || y*16+16 > image.Height)
 							throw new DataException("Invalid image cords "+x+","+y+" at line "+i+" in file '"+path+"'.");
-						bool stackable = true;
+						byte stack = 64;
+						short damage = 0;
 						short maxDamage = 0;
 						if (split.Length == 5) {
-							stackable = false;
-							try { maxDamage = short.Parse(split[4]); }
+							string str = split[4];
+							char chr = ' ';
+							if (str[0]=='+' || str[0]=='x') {
+								chr = str[0];
+								str = str.Substring(1, str.Length-1);
+							}
+							short val;
+							try { val = short.Parse(str); }
 							catch (Exception e) { throw new DataException("Failed to parse column 'DAMAGE' at line "+i+" in file '"+path+"'.", e); }
-							if (maxDamage < 0) throw new DataException("Failed to parse column 'DAMAGE' at line "+i+" in file '"+path+"'.");
+							switch (chr) {
+								case '+':
+									if (val <= 0) throw new DataException("Failed to parse column 'DAMAGE' at line "+i+" in file '"+path+"'.");
+									stack = 1;
+									maxDamage = val;
+									break;
+								case 'x':
+									if (val <= 0) throw new DataException("Failed to parse column 'DAMAGE' at line "+i+" in file '"+path+"'.");
+									if (val > 255) throw new DataException("Failed to parse column 'DAMAGE' at line "+i+" in file '"+path+"'.");
+									stack = (byte)val;
+									break;
+								default:
+									damage = val;
+									break;
+							}
 						}
-						items.Add(id, new Item(id, name, stackable, maxDamage, image, x, y));
+						items.Add(new Item(id, name, stack, damage, maxDamage, image, x, y));
 					}
 				} catch (Exception e) {
 					if (MessageBox.Show(e.Message, "Warning", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.Cancel)
@@ -105,19 +127,32 @@ static Image LoadImage(string path)
 			}
 		}
 
+		internal class Items : Dictionary<short, Dictionary<short, Item>>
+		{
+			public void Add(Item item)
+			{
+				Dictionary<short, Item> list;
+				if (ContainsKey(item.id)) list = this[item.id];
+				else { list = new Dictionary<short, Item>(); Add(item.id, list); }
+				list.Add(item.damage, item);
+			}
+		}
+		
 		internal class Item
 		{
 			public readonly short id;
 			public readonly string name;
-			public readonly bool stackable;
+			public readonly byte stack;
+			public readonly short damage;
 			public readonly short maxDamage;
 			public readonly int imageIndex;
 
-			internal Item(short id, string name, bool stackable, short maxDamage, Image image, int x, int y)
+			internal Item(short id, string name, byte stack, short damage, short maxDamage, Image image, int x, int y)
 			{
 				this.id = id;
 				this.name = name;
-				this.stackable = stackable;
+				this.stack = stack;
+				this.damage = damage;
 				this.maxDamage = maxDamage;
 
 				Bitmap b = new Bitmap(16, 16);

Data.cs

@@ -10,7 +10,7 @@ public static class Inventory
 		public static void Load(Tag inventory, Dictionary<byte, ItemSlot> slots)
 		{
 			try {
-				foreach (ItemSlot slot in slots.Values) slot.Clear();
+				foreach (ItemSlot slot in slots.Values) slot.Item = null;
 				foreach (Tag tag in inventory) {
 					short id = (short)tag["id"];
 					byte slot = (byte)tag["Slot"];

Inventory.cs

@@ -5,16 +5,52 @@ namespace INVedit
 {
 	public class Item
 	{
+		Data.Item item {
+			get {
+				if (Data.items.ContainsKey(ID)) {
+					if (Data.items[ID].ContainsKey(Damage))
+						return Data.items[ID][Damage];
+					else return Data.items[ID][0];
+				} else return null;
+			}
+		}
+		
 		public short ID { get; set; }
 		public byte Count { get; set; }
 		public byte Slot { get; set; }
 		public short Damage { get; set; }
 
-		public bool Known { get; set; }
-		public string Name { get; set; }
-		public bool Stackable { get; set; }
-		public short MaxDamage { get; set; }
-		public Image Image { get; set; }
+		public bool Known { get { return (item != null); } }
+		public bool Alternative {
+			get {
+				if (!Known) return false;
+				return (Data.items[ID].Count > 1);
+			}
+		}
+		public string Name {
+			get {
+				if (!Known) return "Unknown item "+ID;
+				return item.name;
+			}
+		}
+		public byte Stack {
+			get {
+				if (!Known) return 64;
+				return item.stack;
+			}
+		}
+		public short MaxDamage {
+			get {
+				if (!Known) return 0;
+				return item.maxDamage;
+			}
+		}
+		public Image Image {
+			get {
+				if (!Known) return Data.unknown;
+				return Data.list.Images[item.imageIndex];
+			}
+		}
 
 		public Item(short id)
 			: this(id, 1, 0, 0) {  }
@@ -28,21 +64,6 @@ public Item(short id, byte count, byte slot, short damage)
 			Count = count;
 			Slot = slot;
 			Damage = damage;
-			
-			if (Data.items.ContainsKey(id)) {
-				Data.Item item = Data.items[id];
-				Known = true;
-				Name = item.name;
-				Stackable = item.stackable;
-				MaxDamage = item.maxDamage;
-				Image = Data.list.Images[item.imageIndex];
-			} else {
-				Name = "Unknown item "+id;
-				Known = false;
-				Stackable = false;
-				MaxDamage = 0;
-				Image = Data.unknown;
-			}
 		}
 	}
 }

Item.cs

@@ -3,6 +3,7 @@
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
+using System.Collections.Generic;
 
 namespace INVedit
 {
@@ -11,7 +12,6 @@ public class ItemSlot : CheckBox
 		static Font font1 = new Font(FontFamily.GenericMonospace, 8, FontStyle.Bold);
 		static Font font2 = new Font(FontFamily.GenericMonospace, 10, FontStyle.Bold);
 		protected static Item other = null;
-		ToolTip toolTip = new ToolTip(){ AutomaticDelay = 300 };
 
 		protected static event Action<ItemSlot> DragBegin = delegate {  };
 		protected static event Action<ItemSlot> DragEnd = delegate {  };
@@ -22,6 +22,7 @@ public class ItemSlot : CheckBox
 		public Image Default { get; set; }
 
 		public event Action<ItemSlot> DragDone = delegate {  };
+		public event Action<ItemSlot> Changed = delegate {  };
 
 		public ItemSlot(byte slot)
 		{
@@ -63,15 +64,17 @@ protected override void OnDragOver(DragEventArgs e)
 				Item item = (Item)e.Data.GetData(typeof(Item));
 				if (Item != item) {
 					if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) {
-						if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;
-						else if ((e.KeyState & 32) == 32 && item.Count > 1) {
+						if ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+							e.Effect = DragDropEffects.Copy;
+						else if ((Control.ModifierKeys & Keys.Alt) == Keys.Alt && item.Count > 1) {
 							if (Item != null) {
-								if (Item.ID == item.ID && item.Stackable && Item.Count < 64)
+								if (Item.ID == item.ID && Item.Count < item.Stack)
 									e.Effect = DragDropEffects.Link;
 								else e.Effect = DragDropEffects.None;
 							} else e.Effect = DragDropEffects.Link;
 						} else if (Item != null && Item.ID == item.ID &&
-						           Item.Count >= (item.Stackable ? 64 : 1)) {
+						           Item.Damage == item.Damage &&
+						           Item.Count + item.Count >= item.Stack) {
 							e.Effect = DragDropEffects.None;
 						} else e.Effect = DragDropEffects.Move;
 					} else e.Effect = DragDropEffects.Copy;
@@ -93,34 +96,46 @@ protected override void OnDragDrop(DragEventArgs e)
 					Item.Count = Math.Min((byte)(count+item.Count/2), (byte)64);
 					item.Count -= (byte)(Item.Count-count);
 				}
-			} else if (e.Effect == DragDropEffects.Move && Item != null && item.ID == Item.ID) {
-				byte count = (byte)Math.Min((int)Item.Count + item.Count, item.Stackable ? 64 : 1);
-				byte over = (byte)Math.Max((int)Item.Count + item.Count - (item.Stackable ? 64 : 1), 0);
+			} else if (e.Effect == DragDropEffects.Move && Item != null && item.ID == Item.ID && Item.Damage == item.Damage) {
+				byte count = (byte)Math.Min((int)Item.Count + item.Count, item.Stack);
+				byte over = (byte)Math.Max((int)Item.Count + item.Count - item.Stack, 0);
 				Item = new Item(Item.ID, count, Slot, Item.Damage);
-				other = over>0 ? new Item(Item.ID, over) : null;
+				other = (over>0) ? new Item(Item.ID, over) : null;
 			} else {
 				other = Item; Item = item;
 				if (e.Effect == DragDropEffects.Copy)
 					Item = new Item(Item.ID, Item.Count, Slot, Item.Damage);
 				else Item.Slot = Slot;
-				toolTip.SetToolTip(this, Item.Name);
-				toolTip.Active = true;
 			}
 			LostFocus += OnLostFocus;
 			Select();
 		}
 
-		public void Set(short id, byte count, short damage)
+		protected override void OnMouseWheel(MouseEventArgs e)
 		{
-			Item = new Item(id, count, Slot, damage);
-			toolTip.SetToolTip(this, Item.Name);
-			toolTip.Active = true;
-		}
-		
-		public void Clear()
-		{
-			Item = null;
-			toolTip.Active = false;
+			if (Item == null) return;
+			int count = (((Control.ModifierKeys & Keys.Control) == Keys.Control) ? 4 : 1) * Math.Sign(e.Delta);
+			if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) {
+				int before = Item.Damage;
+				if (Item.MaxDamage > 0)
+					Item.Damage = (short)Math.Min(Math.Max((int)Item.Damage + Math.Max(Math.Abs(count*(int)Item.MaxDamage/32), 1) * -Math.Sign(count), 0), Item.MaxDamage);
+				else if (Item.Alternative) {
+					Dictionary<short, Data.Item> items = Data.items[Item.ID];
+					List<short> list = new List<short>(items.Keys);
+					int index = list.IndexOf(Item.Damage);
+					if (index == -1) return;
+					if (count > 0) { if (index < list.Count-1) Item.Damage = list[index+1]; }
+					else { if (index > 0) Item.Damage = list[index-1]; }
+				} if (before == Item.Damage) return;
+			} else {
+				if (Item.Stack==1) return;
+				int before = Item.Count;
+				if (Item.Count == 1 && count == 4) count = 3;
+				Item.Count = (byte)Math.Min(Math.Max((int)Item.Count + count, 1), Item.Stack);
+				if (before == Item.Count) return;
+			}
+			Refresh();
+			Changed(this);
 		}
 
 		protected override void OnPaint(PaintEventArgs e)
@@ -159,9 +174,8 @@ protected override void OnPaint(PaintEventArgs e)
 				string value = Item.Count.ToString();
 				Color color1 = Color.Black;
 				Color color2 = Color.White;
-				if (Item.Count > (Item.Stackable ? 64 : 1)) {
+				if (Item.Count > Item.Stack)
 					color1 = Color.FromArgb(172, 0, 0);
-				}
 				DrawString2(g, color1, 3, 1, value);
 				DrawString2(g, color1, 4, 1, value);
 				DrawString2(g, color1, 2, 2, value);
@@ -171,7 +185,7 @@ protected override void OnPaint(PaintEventArgs e)
 				DrawString2(g, color2, 3, 2, value);
 				DrawString2(g, color2, 4, 2, value);
 			}
-			if (Item.Damage != 0) {
+			if (!Data.items[Item.ID].ContainsKey(Item.Damage)) {
 				if (Item.Damage > 0 && Item.Damage <= Item.MaxDamage && Item.MaxDamage > 0) {
 					Rectangle rect = new Rectangle(5, ClientSize.Height-8, ClientSize.Width-10, 3);
 					g.FillRectangle(new SolidBrush(Color.Black), rect);