Skip to content

Commit 79583d6

Browse files
committed
remove move heroes from extract-npc-voice
1 parent 3bcd2ce commit 79583d6

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

DataTool/ToolLogic/Extract/ExtractNPCVoice.cs

+20-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using DataTool.Flag;
55
using DataTool.Helper;
66
using DataTool.JSON;
7+
using TankLib;
78
using TankLib.STU.Types;
89
using static DataTool.Helper.STUHelper;
910
using static DataTool.Helper.IO;
@@ -22,23 +23,37 @@ public void Parse(ICLIFlags toolFlags) {
2223

2324
var heroes = Helpers.GetHeroes();
2425
var npcHeroVoiceSets = new Dictionary<ulong, string>();
25-
var heroMainVoiceSets = new HashSet<ulong>();
26+
var heroVoiceSets = new HashSet<ulong>();
2627

2728
foreach (var (key, hero) in heroes) {
2829
var voiceSet = GetInstance<STUVoiceSetComponent>(hero.STU?.m_gameplayEntity)?.m_voiceDefinition;
30+
if (voiceSet == 0) continue;
2931

3032
if (hero.IsHero) {
31-
heroMainVoiceSets.Add(voiceSet);
33+
heroVoiceSets.Add(voiceSet);
3234
continue;
3335
}
3436

35-
if (voiceSet > 0) {
36-
npcHeroVoiceSets.TryAdd(voiceSet, hero.Name);
37+
npcHeroVoiceSets.TryAdd(voiceSet, hero.Name);
38+
}
39+
40+
foreach (var skinThemeGUID in Program.TrackedFiles[0xA6]) {
41+
var skinTheme = GetInstance<STUSkinBase>(skinThemeGUID);
42+
if (skinTheme == null) continue;
43+
if (skinTheme.m_runtimeOverrides == null) continue;
44+
45+
foreach (var runtimeOverride in skinTheme.m_runtimeOverrides) {
46+
var overrideGUID = runtimeOverride.Value.m_3D884507;
47+
48+
if (teResourceGUID.Type(overrideGUID) != 0x5F) continue;
49+
// this skin overrides a voice set.
50+
// its not an npc, dont need it
51+
heroVoiceSets.Add(overrideGUID);
3752
}
3853
}
3954

4055
foreach (var guid in Program.TrackedFiles[0x5F]) {
41-
if (heroMainVoiceSets.Contains(guid)) continue;
56+
if (heroVoiceSets.Contains(guid)) continue;
4257

4358
var voiceSet = GetInstance<STUVoiceSet>(guid);
4459
if (voiceSet == null) continue;

0 commit comments

Comments
 (0)