ValueDelete test and bugfix

Author: Swamp Ig

Tests/ValueDelete.cfg

@@ -0,0 +1,41 @@
+
+MMTEST
+{
+	name = valueDelete
+	MODULE
+	{
+		name = module1
+		multiVal = one
+		multiVal = two
+		multiVal2 = one
+		multiVal2 = two
+		numeric = 0
+	}
+}
+
+// Adds value to module2
+@MMTEST[valueDelete]
+{
+	// Copy new module 2
+	@MODULE[module1]
+	{
+		// Unindexed (remove all)
+		-multiVal = dummy
+		// Indexed
+		-multiVal2,0 = dummy
+	}
+}
+
+MMTEST_EXPECT
+{
+	MMTEST 
+	{
+		name = valueDelete
+		MODULE
+		{
+			name = module1
+			multiVal2 = two
+			numeric = 0
+		}
+	}
+}	

moduleManager.cs

@@ -488,7 +488,8 @@ public void ApplyPatch(List<String> excludePaths, string Stage)
         public ConfigNode ModifyNode(ConfigNode original, ConfigNode mod)
         {
             ConfigNode newNode = DeepCopy(original);
-            
+
+            #region Values
             string vals = "[ModuleManager] modding values";
             foreach (ConfigNode.Value modVal in mod.values)
             {
@@ -586,7 +587,7 @@ public ConfigNode ModifyNode(ConfigNode original, ConfigNode mod)
                             // If there is an index, use it.
                             ConfigNode.Value v = FindValueIn(newNode, valName, index);
                             if (v != null)
-                                newNode.values.Remove(modVal);
+                                newNode.values.Remove(v);
                         }
                         else
                         {
@@ -597,7 +598,9 @@ public ConfigNode ModifyNode(ConfigNode original, ConfigNode mod)
                 }
             }
             //print(vals);
+            #endregion
 
+            #region Nodes
             foreach (ConfigNode subMod in mod.nodes)
             {
                 subMod.name = RemoveWS(subMod.name);
@@ -751,6 +754,8 @@ public ConfigNode ModifyNode(ConfigNode original, ConfigNode mod)
                     //print(msg);
                 }
             }
+            #endregion
+
             return newNode;
         }
 
@@ -1077,13 +1082,12 @@ public static ConfigNode FindConfigNodeIn(ConfigNode src, string nodeType,
         private static ConfigNode.Value FindValueIn(ConfigNode newNode, string valName, int index)
         {
             ConfigNode.Value v = null;
-            int upto = 0;
             for (int i = 0; i < newNode.values.Count; ++i)
                 if (WildcardMatch(newNode.values[i].name, valName))
                 {
                     v = newNode.values[i];
-                    if (upto++ == index)
-                        break;
+                    if (--index < 0)
+                        return v;
                 }
             return v;
         }