Skip to content

Commit 389da9e

Browse files
committed
More cleanup on dye structure.
1 parent a8838d4 commit 389da9e

File tree

1 file changed

+21
-22
lines changed
  • xivModdingFramework/Materials/FileTypes

1 file changed

+21
-22
lines changed

xivModdingFramework/Materials/FileTypes/STM.cs

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -186,33 +186,32 @@ public StainingTemplateEntry(byte[] data, int offset)
186186
if(type == StainingTemplateArrayType.Indexed)
187187
{
188188
var nArray = new List<Half[]>();
189+
var indexes = new byte[128];
189190
for (int i = 0; i < 128; i++)
190191
{
191-
var index = data[indexStart + i];
192-
var entry = new Half[3];
193-
if (index == 255)
192+
try
194193
{
195-
nArray.Add(new Half[] { new Half(), new Half(), new Half() } );
196-
continue;
197-
}
198-
199-
if(index == 0)
200-
{
201-
nArray.Add(new Half[] { new Half(), new Half(), new Half() });
202-
continue;
203-
}
204-
205-
// Seriously, wtf SE?
206-
if(x == 1 && index == 1 && (i <= 110 && i != 91))
207-
{
208-
index = 0;
209-
}
210-
211-
if(index >= halfData.Count)
194+
var index = data[indexStart + i + 1];
195+
var entry = new Half[3];
196+
if (index > halfData.Count)
197+
{
198+
nArray.Add(new Half[] { new Half(), new Half(), new Half() });
199+
continue;
200+
}
201+
202+
if (index == 0)
203+
{
204+
nArray.Add(new Half[] { new Half(), new Half(), new Half() });
205+
continue;
206+
}
207+
208+
index -= 1;
209+
210+
nArray.Add(halfData[index]);
211+
} catch(Exception ex)
212212
{
213-
index = 0;
213+
throw;
214214
}
215-
nArray.Add(halfData[index]);
216215
}
217216

218217
halfData = nArray;

0 commit comments

Comments
 (0)