Skip to content

Commit 3234ce4

Browse files
authored
Merge pull request WolvenKit#2829 from WolvenKit/cvm-descriptorvalue
cvm descriptors and values for quest stuff
2 parents 5884e09 + 088f3fe commit 3234ce4

File tree

2 files changed

+135
-87
lines changed

2 files changed

+135
-87
lines changed

WolvenKit.App/ViewModels/Tools/ChunkViewModelExtended/ChunkViewModel.Descriptor.cs

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,33 @@ public void CalculateDescriptor()
182182
Descriptor = $"{startTime}{eventType}";
183183
return;
184184
}
185+
case scnScenesVersionsSceneChanges scn when scn.Scene.DepotPath.GetResolvedText() is string s && s != string.Empty:
186+
{
187+
Descriptor = s;
188+
return;
189+
}
190+
191+
case scnDynamicAnimSetSRRef animSet
192+
when animSet.AsyncAnimSet.DepotPath.GetResolvedText() is string s && s != string.Empty:
193+
Descriptor = s;
194+
return;
195+
case scnPerformerSymbol performerSymbol when performerSymbol.PerformerId.Id != 0:
196+
Descriptor = $"{performerSymbol.PerformerId.Id.ToString()}";
197+
return;
185198

199+
case scnReferencePointDef refDef:
200+
Descriptor = $"{refDef.Id}";
201+
return;
202+
case scnSectionInternalsActorBehavior actorBehavior:
203+
Descriptor = $"{actorBehavior.ActorId.Id}";
204+
return;
186205
case worldStreamingSectorDescriptor:
187206
// handled by default name resolution below
188207
break;
189208
case worldNodeData sst when Parent?.Parent?.ResolvedData is worldStreamingSector wss && sst.NodeIndex < wss.Nodes.Count:
190209
Descriptor = $"[{sst.NodeIndex}] {StringHelper.Stringify(wss.Nodes[sst.NodeIndex].Chunk)}";
191210
return;
192-
case worldNode worldNode when StringHelper.Stringify(worldNode) is string s && s != "":
211+
case worldNode worldNode when StringHelper.Stringify(worldNode) is string s && s != string.Empty:
193212
Descriptor = s;
194213
return;
195214
case worldNode:
@@ -200,7 +219,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
200219

201220
Descriptor = StringHelper.Stringify(animAry
202221
.Select((animPoseLink) => GetNodeName(animPoseLink.Node) ?? "").ToArray());
203-
if (Descriptor != "")
222+
if (Descriptor != string.Empty)
204223
{
205224
return;
206225
}
@@ -286,7 +305,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
286305
}
287306

288307
Descriptor = $"{csvAry[nameIndex]}";
289-
if (Descriptor != "")
308+
if (Descriptor != string.Empty)
290309
{
291310
return;
292311
}
@@ -302,7 +321,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
302321
case appearanceAppearancePart part:
303322
{
304323
Descriptor = part.Resource.DepotPath.GetResolvedText() ?? "";
305-
if (Descriptor != "")
324+
if (Descriptor != string.Empty)
306325
{
307326
return;
308327
}
@@ -312,7 +331,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
312331
case locVoLineEntry voLineEntry:
313332
{
314333
Descriptor = voLineEntry.StringId.ToString();
315-
if (Descriptor != "")
334+
if (Descriptor != string.Empty)
316335
{
317336
return;
318337
}
@@ -322,7 +341,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
322341
case animAnimEvent animEvent:
323342
{
324343
Descriptor = animEvent.EventName.GetResolvedText();
325-
if (Descriptor != "")
344+
if (Descriptor != string.Empty)
326345
{
327346
return;
328347
}
@@ -332,7 +351,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
332351
case locVoLengthEntry voLengthEntry:
333352
{
334353
Descriptor = voLengthEntry.StringId.ToString();
335-
if (Descriptor != "")
354+
if (Descriptor != string.Empty)
336355
{
337356
return;
338357
}
@@ -351,7 +370,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
351370
Descriptor = ResourcePathPool.ResolveHash(result);
352371
}
353372

354-
if (Descriptor != "")
373+
if (Descriptor != string.Empty)
355374
{
356375
return;
357376
}
@@ -407,7 +426,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
407426
case scnPropDef propDef:
408427
{
409428
Descriptor = $"{propDef.PropName}";
410-
if (propDef.SpecPropRecordId.GetResolvedText() is string s && s != "")
429+
if (propDef.SpecPropRecordId.GetResolvedText() is string s && s != string.Empty)
411430
{
412431
Descriptor = $"{Descriptor} ID: {s}";
413432
}
@@ -417,7 +436,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
417436
case scnSpawnDespawnEntityParams spawnDespawnParams:
418437
{
419438
Descriptor = $"{spawnDespawnParams.DynamicEntityUniqueName.GetResolvedText()}";
420-
if (spawnDespawnParams.SpawnMarkerNodeRef.GetResolvedText() is string s && s != "")
439+
if (spawnDespawnParams.SpawnMarkerNodeRef.GetResolvedText() is string s && s != string.Empty)
421440
{
422441
Descriptor = $"{Descriptor} ID: {s}";
423442
}
@@ -442,7 +461,7 @@ when handle.Chunk.GetProperty("InputNodes") is CArray<animPoseLink> animAry:
442461
case scnLipsyncAnimSetSRRef lipsyncAnim:
443462
Descriptor = StringHelper.StringifyOrNull(lipsyncAnim.LipsyncAnimSet.DepotPath)
444463
?? StringHelper.StringifyOrNull(lipsyncAnim.AsyncRefLipsyncAnimSet.DepotPath) ?? "";
445-
if (Descriptor != "")
464+
if (Descriptor != string.Empty)
446465
{
447466
return;
448467
}
@@ -619,7 +638,7 @@ when NodeIdxInParent > -1
619638
break;
620639
}
621640
case IRedMeshComponent meshComponent
622-
when meshComponent.Name.GetResolvedText() is string name && name != "":
641+
when meshComponent.Name.GetResolvedText() is string name && name != string.Empty:
623642
{
624643
IsDefault = name == "Component";
625644
Descriptor = name;

0 commit comments

Comments
 (0)