diff --git a/botw-toolset/Color.cs b/botw-toolset/Color.cs index eede5ec..58e0873 100644 --- a/botw-toolset/Color.cs +++ b/botw-toolset/Color.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BOTWToolset +namespace BOTWToolset { struct Color { diff --git a/botw-toolset/Control/TabTSCB.xaml.cs b/botw-toolset/Control/TabTSCB.xaml.cs index 9c4213f..dbf6351 100644 --- a/botw-toolset/Control/TabTSCB.xaml.cs +++ b/botw-toolset/Control/TabTSCB.xaml.cs @@ -1,7 +1,7 @@ -using BOTWToolset.IO.TSCB; +using BOTWToolset.Debugging; +using BOTWToolset.IO.TSCB; using Microsoft.Win32; using System.Windows.Controls; -using BOTWToolset.Debugging; namespace BOTWToolset { diff --git a/botw-toolset/Dashboard.xaml.cs b/botw-toolset/Dashboard.xaml.cs index a166d7e..ef308d0 100644 --- a/botw-toolset/Dashboard.xaml.cs +++ b/botw-toolset/Dashboard.xaml.cs @@ -1,6 +1,5 @@ -using BOTWToolset.IO.TSCB; +using BOTWToolset.Debugging; using System.Windows; -using BOTWToolset.Debugging; namespace BOTWToolset { diff --git a/botw-toolset/IO/EXTM/Grass.cs b/botw-toolset/IO/EXTM/Grass.cs index 6ac80eb..e62eb9a 100644 --- a/botw-toolset/IO/EXTM/Grass.cs +++ b/botw-toolset/IO/EXTM/Grass.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BOTWToolset.IO.EXTM +namespace BOTWToolset.IO.EXTM { /// /// Stores info on grass data in an .extm file diff --git a/botw-toolset/IO/EXTM/GrassColor.cs b/botw-toolset/IO/EXTM/GrassColor.cs index 2546e35..678c159 100644 --- a/botw-toolset/IO/EXTM/GrassColor.cs +++ b/botw-toolset/IO/EXTM/GrassColor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BOTWToolset.IO.EXTM +namespace BOTWToolset.IO.EXTM { class GrassColor { diff --git a/botw-toolset/IO/EXTM/Water.cs b/botw-toolset/IO/EXTM/Water.cs index 1fcef08..814f7dc 100644 --- a/botw-toolset/IO/EXTM/Water.cs +++ b/botw-toolset/IO/EXTM/Water.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BOTWToolset.IO.EXTM +namespace BOTWToolset.IO.EXTM { /// /// Stores info on water data in an .extm file @@ -23,8 +17,10 @@ namespace BOTWToolset.IO.EXTM public byte MaterialIndex { get => _matIndex; set => _matIndex = value; } private byte _matIndex; - public byte MaterialIndexChecksum { - get { + public byte MaterialIndexChecksum + { + get + { if (_matIndex != 0) return (byte)(_matIndex + 3); return _matIndex; diff --git a/botw-toolset/IO/EXTM/WaterColor.cs b/botw-toolset/IO/EXTM/WaterColor.cs index 533472d..4320a14 100644 --- a/botw-toolset/IO/EXTM/WaterColor.cs +++ b/botw-toolset/IO/EXTM/WaterColor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BOTWToolset.IO.EXTM +namespace BOTWToolset.IO.EXTM { class WaterColor { diff --git a/botw-toolset/IO/TSCB/TSCB.cs b/botw-toolset/IO/TSCB/TSCB.cs index f485d12..0fb6475 100644 --- a/botw-toolset/IO/TSCB/TSCB.cs +++ b/botw-toolset/IO/TSCB/TSCB.cs @@ -2,7 +2,6 @@ using System; using System.IO; using System.Linq; -using System.Windows; namespace BOTWToolset.IO.TSCB { @@ -72,8 +71,9 @@ namespace BOTWToolset.IO.TSCB if (next_val == 1) //if the next value is extra unneeded info { - - } else //else, if the value is valid + + } + else //else, if the value is valid { r.BaseStream.Seek(-4, SeekOrigin.Current); } @@ -91,7 +91,8 @@ namespace BOTWToolset.IO.TSCB uint extra_info_len = BitConverter.ToUInt32(r.ReadBytes(4).Reverse().ToArray(), 0); //Usually 0, 4, or 8 - if (ref_extra == 4) { + if (ref_extra == 4) + { if (extra_info_len == 8) { //Skip the extra "20" after the 8, as well as the extra info areaInfo.HasGrass = true; @@ -106,7 +107,8 @@ namespace BOTWToolset.IO.TSCB else //Else if the 2nd byte should be anything else (should always be 1) areaInfo.HasWater = true; } - } else //If the extra info flags aren't set, go back 4 + } + else //If the extra info flags aren't set, go back 4 { r.BaseStream.Seek(-4, SeekOrigin.Current); }