ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-11-27 01:12:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from Lucas7yoshi/fix/cutscenes

Browse Source 
Correct cutscene breaking metaname additions
This commit is contained in:
dexyfex 2021-12-01 17:41:12 +11:00 committed by GitHub
commit 06f24af091
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CodeWalker.Core/GameFiles/FileTypes/CutFile.cs
View File

@ -276,9 +276,9 @@ namespace CodeWalker.GameFiles
case "rage__cutfTriggerLightEffectEventArgs": return new CutTriggerLightEffectEventArgs(); case "rage__cutfTriggerLightEffectEventArgs": return new CutTriggerLightEffectEventArgs();
case "rage__cutfVehicleExtraEventArgs": return new CutVehicleExtraEventArgs(); case "rage__cutfVehicleExtraEventArgs": return new CutVehicleExtraEventArgs();
case "rage__cutfFixupModelObject": return new CutFixupModelObject(); case "rage__cutfFixupModelObject": return new CutFixupModelObject();
case "hash_63D1D732": return new Cut_1674696498(); case "cutf_float": return new CutFloat();
case "hash_60F51ABE": return new Cut_1626675902(); case "cutf_int": return new CutInt();
case "hash_2139D1CA": return new Cut_557437386(); case "cutf_string": return new CutString();
default: return null; default: return null;
} }
} }
@ -355,7 +355,7 @@ namespace CodeWalker.GameFiles
return (Items?.Length ?? 0).ToString() + " items"; return (Items?.Length ?? 0).ToString() + " items";
} }
} }
[TC(typeof(EXP))] public class Cut_1626675902 : CutBase [TC(typeof(EXP))] public class CutInt : CutBase
{ {
public MetaHash Name { get; set; } // PsoDataType.String, 8, 8, 0), public MetaHash Name { get; set; } // PsoDataType.String, 8, 8, 0),
public int Value { get; set; } // PsoDataType.SInt, 16, 0, 0) public int Value { get; set; } // PsoDataType.SInt, 16, 0, 0)
@ -371,7 +371,7 @@ namespace CodeWalker.GameFiles
return Name.ToString() + ": " + Value.ToString(); return Name.ToString() + ": " + Value.ToString();
} }
} }
[TC(typeof(EXP))] public class Cut_1674696498 : CutBase [TC(typeof(EXP))] public class CutFloat : CutBase
{ {
public MetaHash Name { get; set; } // PsoDataType.String, 8, 8, 0), public MetaHash Name { get; set; } // PsoDataType.String, 8, 8, 0),
public float Value { get; set; } // PsoDataType.Float, 16, 0, 0) public float Value { get; set; } // PsoDataType.Float, 16, 0, 0)
@ -387,7 +387,7 @@ namespace CodeWalker.GameFiles
return Name.ToString() + ": " + Value.ToString(); return Name.ToString() + ": " + Value.ToString();
} }
} }
[TC(typeof(EXP))] public class Cut_557437386 : CutBase [TC(typeof(EXP))] public class CutString : CutBase
{ {
public MetaHash Name { get; set; } // PsoDataType.String, 8, 8, 0), public MetaHash Name { get; set; } // PsoDataType.String, 8, 8, 0),
public string Value { get; set; } // PsoDataType.String, 16, 3, 0) public string Value { get; set; } // PsoDataType.String, 16, 3, 0)

12
CodeWalker.Core/GameFiles/MetaTypes/PsoTypes.cs
View File

@ -13568,13 +13568,13 @@ namespace CodeWalker.GameFiles
new PsoStructureEntryInfo((MetaName)MetaTypeName.ARRAYINFO, PsoDataType.Structure, 0, 3, 0), new PsoStructureEntryInfo((MetaName)MetaTypeName.ARRAYINFO, PsoDataType.Structure, 0, 3, 0),
new PsoStructureEntryInfo(MetaName.Items, PsoDataType.Array, 0, 0, 0) new PsoStructureEntryInfo(MetaName.Items, PsoDataType.Array, 0, 0, 0)
); );
case (MetaName)1626675902: case MetaName.cutf_int:
return new PsoStructureInfo((MetaName)1626675902, 0, 0, 24, return new PsoStructureInfo(MetaName.cutf_int, 0, 0, 24,
new PsoStructureEntryInfo(MetaName.Name, PsoDataType.String, 8, 8, 0), new PsoStructureEntryInfo(MetaName.Name, PsoDataType.String, 8, 8, 0),
new PsoStructureEntryInfo(MetaName.Value, PsoDataType.SInt, 16, 0, 0) new PsoStructureEntryInfo(MetaName.Value, PsoDataType.SInt, 16, 0, 0)
); );
case (MetaName)1674696498: case MetaName.cutf_float:
return new PsoStructureInfo((MetaName)1674696498, 0, 0, 24, return new PsoStructureInfo(MetaName.cutf_float, 0, 0, 24,
new PsoStructureEntryInfo(MetaName.Name, PsoDataType.String, 8, 8, 0), new PsoStructureEntryInfo(MetaName.Name, PsoDataType.String, 8, 8, 0),
new PsoStructureEntryInfo(MetaName.Value, PsoDataType.Float, 16, 0, 0) new PsoStructureEntryInfo(MetaName.Value, PsoDataType.Float, 16, 0, 0)
); );
@ -13827,8 +13827,8 @@ namespace CodeWalker.GameFiles
new PsoStructureEntryInfo(MetaName.iLivery2, PsoDataType.SInt, 64, 0, 0), new PsoStructureEntryInfo(MetaName.iLivery2, PsoDataType.SInt, 64, 0, 0),
new PsoStructureEntryInfo(MetaName.fDirtLevel, PsoDataType.Float, 68, 0, 0) new PsoStructureEntryInfo(MetaName.fDirtLevel, PsoDataType.Float, 68, 0, 0)
); );
case (MetaName)557437386: case MetaName.cutf_string:
return new PsoStructureInfo((MetaName)557437386, 0, 0, 32, return new PsoStructureInfo(MetaName.cutf_string, 0, 0, 32,
new PsoStructureEntryInfo(MetaName.Name, PsoDataType.String, 8, 8, 0), new PsoStructureEntryInfo(MetaName.Name, PsoDataType.String, 8, 8, 0),
new PsoStructureEntryInfo(MetaName.Value, PsoDataType.String, 16, 3, 0) new PsoStructureEntryInfo(MetaName.Value, PsoDataType.String, 16, 3, 0)
); );