More merging fixes

Author: CGarrison89

ESPSharp/ESPSharp.csproj

@@ -516,7 +516,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>BodyModel.tt</DependentUpon>
     </Compile>
-<<<<<<< HEAD
     <Compile Include="SubrecordCollections\GeneratedCode\RegionArea.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -526,7 +525,7 @@
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>RegionDataEntry.tt</DependentUpon>
-=======
+    </Compile>
     <Compile Include="SubrecordCollections\GeneratedCode\QuestLogEntry.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -546,7 +545,6 @@
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>SharedInfo.tt</DependentUpon>
->>>>>>> 02d80a1718f2288c77352352b478e5cac40e01b4
     </Compile>
     <Compile Include="Subrecords\GeneratedCode\ClimateTiming.cs">
       <AutoGen>True</AutoGen>
@@ -825,15 +823,14 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Weather.cs</LastGenOutput>
     </None>
-<<<<<<< HEAD
     <None Include="SubrecordCollections\GeneratedCode\RegionArea.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>RegionArea.cs</LastGenOutput>
     </None>
     <None Include="SubrecordCollections\GeneratedCode\RegionDataEntry.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>RegionDataEntry.cs</LastGenOutput>
-=======
+    </None>
     <None Include="SubrecordCollections\GeneratedCode\AddedQuest.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>AddedQuest.cs</LastGenOutput>
@@ -853,7 +850,6 @@
     <None Include="SubrecordCollections\GeneratedCode\SharedInfo.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>SharedInfo.cs</LastGenOutput>
->>>>>>> 02d80a1718f2288c77352352b478e5cac40e01b4
     </None>
     <None Include="Subrecords\GeneratedCode\ClimateTiming.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
@@ -1390,15 +1386,13 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>ProjectileData.cs</LastGenOutput>
     </None>
-<<<<<<< HEAD
     <None Include="Subrecords\GeneratedCode\RegionDataHeader.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>RegionDataHeader.cs</LastGenOutput>
-=======
+    </None>
     <None Include="Subrecords\GeneratedCode\QuestTargetData.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>QuestTargetData.cs</LastGenOutput>
->>>>>>> 02d80a1718f2288c77352352b478e5cac40e01b4
     </None>
     <None Include="Subrecords\GeneratedCode\TerminalData.tt">
       <Generator>TextTemplatingFileGenerator</Generator>

ESPSharp/Records/GeneratedCode/AcousticSpace.cs

@@ -115,7 +115,7 @@ public override void WriteDataXML(XElement ele, ElderScrollsPlugin master)
 			}
 			if (Sounds != null)		
 			{		
-				ele.TryPathTo("Weathers", true, out subEle);
+				ele.TryPathTo("Sounds", true, out subEle);
 				List<string> xmlNames = new List<string>{"DawnOrDefaultLoop", "Afternoon", "Dusk", "Night", "Walla"};
 				int i = 0;
 				foreach (var entry in Sounds)
@@ -167,7 +167,7 @@ public override void ReadDataXML(XElement ele, ElderScrollsPlugin master)
 
 				ObjectBounds.ReadXML(subEle, master);
 			}
-			if (ele.TryPathTo("Weathers", false, out subEle))
+			if (ele.TryPathTo("Sounds", false, out subEle))
 			{
 				if (Sounds == null)
 					Sounds = new List<RecordReference>();

ESPSharp/Records/GeneratedCode/Weather.cs

@@ -317,7 +317,7 @@ public override void WriteDataXML(XElement ele, ElderScrollsPlugin master)
 			}
 			if (Sounds != null)		
 			{		
-				ele.TryPathTo("Weathers", true, out subEle);
+				ele.TryPathTo("Sounds", true, out subEle);
 				List<string> xmlNames = new List<string>{"Sound"};
 				int i = 0;
 				foreach (var entry in Sounds)
@@ -468,7 +468,7 @@ public override void ReadDataXML(XElement ele, ElderScrollsPlugin master)
 
 				Data.ReadXML(subEle, master);
 			}
-			if (ele.TryPathTo("Weathers", false, out subEle))
+			if (ele.TryPathTo("Sounds", false, out subEle))
 			{
 				if (Sounds == null)
 					Sounds = new List<WeatherSound>();

ESPSharp/SubrecordCollections/GeneratedCode/CreatureSoundData.cs

@@ -89,7 +89,7 @@ public override void WriteXML(XElement ele, ElderScrollsPlugin master)
 			}
 			if (Sounds != null)		
 			{		
-				ele.TryPathTo("Weathers", true, out subEle);
+				ele.TryPathTo("Sounds", true, out subEle);
 				foreach (var entry in Sounds)
 				{
 					XElement newEle = new XElement("Sound");
@@ -110,7 +110,7 @@ public override void ReadXML(XElement ele, ElderScrollsPlugin master)
 
 				SoundType.ReadXML(subEle, master);
 			}
-			if (ele.TryPathTo("Weathers", false, out subEle))
+			if (ele.TryPathTo("Sounds", false, out subEle))
 			{
 				if (Sounds == null)
 					Sounds = new List<CreatureSound>();

ESPSharp/SubrecordCollections/GeneratedCode/RegionDataEntry.cs

@@ -122,8 +122,8 @@ public override void ReadBinary(ESPReader reader)
 
 						Music.ReadBinary(reader);
 						break;
-					case "RDSI":
-						if (readTags.Contains("RDSI"))
+					case "RDSO":
+						if (readTags.Contains("RDSO"))
 							return;
 						if (IncidentalMediaSet == null)
 							IncidentalMediaSet = new RecordReference();