further clean up stuff
This commit is contained in:
parent
5d216840db
commit
d44ae82757
1 changed files with 3 additions and 9 deletions
|
@ -89,7 +89,6 @@ namespace USTConverter
|
||||||
int[] CyberRosettaInvertedBits = { 2, 181, 41, 59, 58, 151, 163, 26, 35, 31 };
|
int[] CyberRosettaInvertedBits = { 2, 181, 41, 59, 58, 151, 163, 26, 35, 31 };
|
||||||
int[] RAE3stAPSDescrambleTable = { 10, 11, 0, 1, 2, 3, 4, 12, 13, 5, 6, 7, 8, 9, 14, 15};
|
int[] RAE3stAPSDescrambleTable = { 10, 11, 0, 1, 2, 3, 4, 12, 13, 5, 6, 7, 8, 9, 14, 15};
|
||||||
|
|
||||||
bool FullStage = false;
|
|
||||||
bool Rosetta = false;
|
bool Rosetta = false;
|
||||||
const int USTVersion = 2;
|
const int USTVersion = 2;
|
||||||
|
|
||||||
|
@ -248,7 +247,7 @@ namespace USTConverter
|
||||||
|
|
||||||
SaveFileDialog fileDialog = new SaveFileDialog();
|
SaveFileDialog fileDialog = new SaveFileDialog();
|
||||||
fileDialog.Filters.Add(new FileFilter("UST Files (.ust)", new string[]{".ust"}));
|
fileDialog.Filters.Add(new FileFilter("UST Files (.ust)", new string[]{".ust"}));
|
||||||
fileDialog.Title = "Select Show File.";
|
fileDialog.Title = "Select Output File.";
|
||||||
fileDialog.ShowDialog(this);
|
fileDialog.ShowDialog(this);
|
||||||
if (fileDialog.FileName.Trim() == "") return;
|
if (fileDialog.FileName.Trim() == "") return;
|
||||||
string outFilePath = fileDialog.FileName;
|
string outFilePath = fileDialog.FileName;
|
||||||
|
@ -297,25 +296,20 @@ namespace USTConverter
|
||||||
}
|
}
|
||||||
|
|
||||||
// pick which target bits to use and how many bytes the output should be
|
// pick which target bits to use and how many bytes the output should be
|
||||||
int bitsCount = 0;
|
|
||||||
int[] targetBits = { 0 };
|
int[] targetBits = { 0 };
|
||||||
switch (outputType)
|
switch (outputType)
|
||||||
{
|
{
|
||||||
case "UST (Rock-afire Explosion/3-Stage)":
|
case "UST (Rock-afire Explosion/3-Stage)":
|
||||||
bitsCount = 256;
|
|
||||||
targetBits = RAE3stBitMap;
|
targetBits = RAE3stBitMap;
|
||||||
break;
|
break;
|
||||||
case "UST (Cyberamics Rosetta)":
|
case "UST (Cyberamics Rosetta)":
|
||||||
bitsCount = 256;
|
|
||||||
targetBits = CyberBitMapRosetta;
|
targetBits = CyberBitMapRosetta;
|
||||||
Rosetta = true;
|
Rosetta = true;
|
||||||
break;
|
break;
|
||||||
case "UST (Cyberamics)":
|
case "UST (Cyberamics)":
|
||||||
bitsCount = 256;
|
|
||||||
targetBits = CyberBitMap;
|
targetBits = CyberBitMap;
|
||||||
break;
|
break;
|
||||||
case "UST (Studio C)":
|
case "UST (Studio C)":
|
||||||
bitsCount = 256;
|
|
||||||
targetBits = StudioCBitMap;
|
targetBits = StudioCBitMap;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -332,9 +326,9 @@ namespace USTConverter
|
||||||
}
|
}
|
||||||
else { if (bits.Get(targetBits[i])) frameByte += BigInteger.Pow(2, i); }
|
else { if (bits.Get(targetBits[i])) frameByte += BigInteger.Pow(2, i); }
|
||||||
}
|
}
|
||||||
writeOut.Add(frameByte.ToString($"X{(bitsCount/4).ToString()}"));
|
writeOut.Add(frameByte.ToString($"X{(64).ToString()}"));
|
||||||
}
|
}
|
||||||
writeOut[0] = (0).ToString($"X{(bitsCount/4).ToString()}");
|
writeOut[0] = (0).ToString($"X{(64).ToString()}");
|
||||||
|
|
||||||
byte[] audioOut = file.audioData;
|
byte[] audioOut = file.audioData;
|
||||||
if ((bool)CompressAudioCheckBox.Checked)
|
if ((bool)CompressAudioCheckBox.Checked)
|
||||||
|
|
Loading…
Add table
Reference in a new issue