Skip to content

Commit 589b44a

Browse files
monkeyman192monkeyman192
committed
few minor fixes to some rewards
also fixed TkMaterialMetadata which is probably only an internal struct anyway....
1 parent 07fdcb9 commit 589b44a

File tree

4 files changed

+73
-60
lines changed

4 files changed

+73
-60
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,3 +255,4 @@ paket-files/
255255
# CodeRush
256256
.cr/
257257
/MBINCompilerTests/app.config
258+
*.manifest

‎MBINCompiler/Models/Structs/GcRewardSpecificSubstance.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ public class GcRewardSpecificSubstance : NMSTemplate
77
public int AmountMin;
88
public int AmountMax;
99
public float HardModeMultiplier;
10+
public bool DisableMultiplier;
11+
[NMS(Size = 0x3, Ignore = true)]
12+
public byte[] EndPadding;
1013
}
1114
}

‎MBINCompiler/Models/Structs/GcRewardSubstance.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ public class GcRewardSubstance : NMSTemplate
88
public int AmountMin;
99
public int AmountMax;
1010
public float HardModeMultiplier;
11+
public bool DisableMultiplier;
1112
}
1213
}

‎MBINCompiler/Models/Structs/TkMaterialMetaData.cs‎

Lines changed: 68 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace MBINCompiler.Models.Structs
44
{
5-
public class TkMaterialMetaData : NMSTemplate
5+
public class TkMaterialMetaData : NMSTemplate // size: 0x420;
66
{
77
[NMS(Size = 0x80)]
88
/* 0x000 */ public string ExternalMaterial;
@@ -28,76 +28,84 @@ public class TkMaterialMetaData : NMSTemplate
2828
/* 0x09C */ public bool ParallaxMapped;
2929
/* 0x09D */ public bool RefractionMap;
3030
[NMS(Size = 0x80)]
31-
/* 0x09E */ public string DetailDiffuse;
31+
/* 0x09E */ public string ForceDiffuse;
3232
[NMS(Size = 0x80)]
33-
/* 0x11E */ public string DetailNormal;
34-
/* 0x1A0 */ public float DetailTiling;
35-
/* 0x1A4 */ public float MultiplyDetailTiling;
36-
/* 0x1A8 */ public int DetailImages;
37-
/* 0x1AC */ public int MultiplyDetailImages;
38-
/* 0x1B0 */ public bool A0Map;
39-
/* 0x1B1 */ public bool MultiplySecondUVSet;
40-
/* 0x1B4 */ public float NormalTiling;
41-
/* 0x1B8 */ public bool SpaceObject;
42-
/* 0x1BC */ public float Glow;
43-
/* 0x1C0 */ public bool GlowMask;
44-
/* 0x1C1 */ public bool CameraRelative;
45-
/* 0x1C2 */ public bool Colourisable;
46-
/* 0x1C3 */ public bool ColourMask;
47-
/* 0x1C4 */ public bool AlphaCutout;
48-
/* 0x1C5 */ public bool Wind;
49-
/* 0x1C6 */ public bool Grass;
50-
/* 0x1C7 */ public bool Leaf;
51-
/* 0x1C8 */ public bool DecalDiffuse;
33+
/* 0x11E */ public string ForceNormal;
34+
[NMS(Size = 0x80)]
35+
/* 0x19E */ public string ForceMask;
36+
[NMS(Size = 0x80)]
37+
/* 0x21E */ public string DetailDiffuse;
38+
[NMS(Size = 0x80)]
39+
/* 0x29E */ public string DetailNormal;
40+
[NMS(Size = 0x2, Ignore = true)]
41+
/* 0x31E */ public byte[] Padding31E;
42+
/* 0x320 */ public float DetailTiling;
43+
/* 0x324 */ public float MultiplyDetailTiling;
44+
/* 0x328 */ public int DetailImages;
45+
/* 0x32C */ public int MultiplyDetailImages;
46+
/* 0x330 */ public bool A0Map;
47+
/* 0x331 */ public bool MultiplySecondUVSet;
48+
/* 0x334 */ public float NormalTiling;
49+
/* 0x338 */ public bool SpaceObject;
50+
/* 0x33C */ public float Glow;
51+
/* 0x340 */ public bool GlowMask;
52+
/* 0x341 */ public bool CameraRelative;
53+
/* 0x342 */ public bool Colourisable;
54+
/* 0x343 */ public bool ColourMask;
55+
/* 0x344 */ public bool AlphaCutout;
56+
/* 0x345 */ public bool Wind;
57+
/* 0x346 */ public bool Grass;
58+
/* 0x347 */ public bool Leaf;
59+
/* 0x348 */ public bool DecalDiffuse;
5260
[NMS(Size = 0x3, Ignore = true)]
53-
/* 0x1C9 */ public byte[] Padding1C9;
61+
/* 0x349 */ public byte[] Padding1C9;
5462
public int DecalNormal;
55-
/* 0x1CC */ public string[] DecalNormalValues()
63+
/* 0x34C */ public string[] DecalNormalValues()
5664
{
5765
return new[] { "None", "Decal", "Vertex" };
5866
}
59-
/* 0x1D0 */ public bool DoubleSided;
60-
/* 0x1D1 */ public bool Billboard;
61-
/* 0x1D2 */ public bool RotateAroundAt;
62-
/* 0x1D3 */ public bool MergedMeshBillboard;
63-
/* 0x1D4 */ public float BillboardSphereFactor;
64-
/* 0x1D8 */ public bool Imposter;
65-
/* 0x1D9 */ public bool ScanEffect;
66-
/* 0x1DA */ public bool WriteLogZ;
67+
/* 0x350 */ public bool DoubleSided;
68+
/* 0x351 */ public bool Billboard;
69+
/* 0x352 */ public bool RotateAroundAt;
70+
/* 0x353 */ public bool MergedMeshBillboard;
71+
/* 0x354 */ public float BillboardSphereFactor;
72+
/* 0x358 */ public bool Imposter;
73+
/* 0x359 */ public bool ScanEffect;
74+
/* 0x35A */ public bool WriteLogZ;
6775

68-
/* 0x1DB */ public bool DisableAmbient;
69-
/* 0x1DC */ public bool DisablePostProcess;
70-
/* 0x1DD */ public bool WarpedDiffuseLighting;
76+
/* 0x35B */ public bool DisableAmbient;
77+
/* 0x35C */ public bool DisablePostProcess;
78+
/* 0x35D */ public bool WarpedDiffuseLighting;
7179
[NMS(Size = 0x20)]
72-
/* 0x1DE */ public string MaterialClass;
73-
/* 0x1FE */ public bool AnisotropicFilter;
74-
/* 0x1FF */ public bool StretchyParticle;
75-
/* 0x200 */ public bool UVScrolling;
76-
/* 0x204 */ public float UVScrollX;
77-
/* 0x208 */ public float UVScrollY;
78-
/* 0x20C */ public float UVScrollNormalX;
79-
/* 0x210 */ public float UVScrollNormalY;
80-
/* 0x214 */ public float UVFrameTime;
81-
/* 0x218 */ public bool UVAnimation;
82-
/* 0x219 */ public bool UVTileAlts;
80+
/* 0x35E */ public string MaterialClass;
81+
/* 0x37E */ public bool AnisotropicFilter;
82+
/* 0x37F */ public bool StretchyParticle;
83+
/* 0x380 */ public bool UVScrolling;
84+
/* 0x384 */ public float UVScrollX;
85+
/* 0x388 */ public float UVScrollY;
86+
/* 0x38C */ public float UVScrollNormalX;
87+
/* 0x390 */ public float UVScrollNormalY;
88+
/* 0x394 */ public float UVFrameTime;
89+
/* 0x398 */ public bool UVAnimation;
90+
/* 0x399 */ public bool UVTileAlts;
8391
[NMS(Size = 0x2, Ignore = true)]
84-
/* 0x21A */ public byte[] Padding21A;
85-
/* 0x21C */ public float UVNumTilesX;
86-
/* 0x220 */ public float UVNumTilesY;
87-
/* 0x224 */ public bool DisplacementWave;
92+
/* 0x39A */ public byte[] Padding3A;
93+
/* 0x39C */ public float UVNumTilesX;
94+
/* 0x3A0 */ public float UVNumTilesY;
95+
/* 0x3A4 */ public bool DisplacementWave;
8896
[NMS(Size = 0x3, Ignore = true)]
89-
/* 0x225 */ public byte[] Padding225;
90-
/* 0x228 */ public float WaveOneSpeed;
97+
/* 0x3A5 */ public byte[] Padding3A5;
98+
/* 0x3A8 */ public float WaveOneSpeed;
9199
[NMS(Size = 0x4, Ignore = true)]
92-
/* 0x22C */ public byte[] Padding22C;
93-
/* 0x230 */ public Vector4f WaveOneAmplitude;
94-
/* 0x240 */ public Vector4f WaveOneFrequency;
95-
/* 0x250 */ public Vector4f WaveOneFallOff;
96-
/* 0x260 */ public float WaveTwoSpeed;
100+
/* 0x3AC */ public byte[] Padding3AC;
101+
/* 0x3B0 */ public Vector4f WaveOneAmplitude;
102+
/* 0x3C0 */ public Vector4f WaveOneFrequency;
103+
/* 0x3D0 */ public Vector4f WaveOneFallOff;
104+
/* 0x3E0 */ public float WaveTwoSpeed;
97105
[NMS(Size = 0xC, Ignore = true)]
98-
/* 0x264 */ public byte[] Padding264;
99-
/* 0x270 */ public Vector4f WaveTwoAmplitude;
100-
/* 0x280 */ public Vector4f WaveTwoFrequency;
101-
/* 0x290 */ public Vector4f WaveTwoFallOff;
106+
/* 0x3E4 */ public byte[] Padding3E4;
107+
/* 0x3F0 */ public Vector4f WaveTwoAmplitude;
108+
/* 0x400 */ public Vector4f WaveTwoFrequency;
109+
/* 0x410 */ public Vector4f WaveTwoFallOff;
102110
}
103111
}

0 commit comments

Comments
 (0)