Merge branch 'master' of https://github.com/DurtyFree/altv-cloth-tool

DurtyFree · Apr 16, 2021 · 52f5c0f · 52f5c0f
2 parents 88964ef + bad15c1
commit 52f5c0f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,18 @@ feet ydd needs to be imported with _r
 lowr ydd needs to be imported with _r
 teef ydd needs to be imported with _u
 everything else imported with _u for .ydd
+lowr ytd needs to be imported with _whi
+feet ytd needs to be imported with _uni
+```
+## from `Nicoo#3630`
+```
+berd ydd needs to be imported with _r
+berd ytd needs to be imported with _whi
+```
+## from `Nicoo#3630`
+```
+berd ydd needs to be imported with _r
+berd ytd needs to be imported with _whi
 ```
 ## from `DurtyFree#3216`
 #### peds .ymt postfixes for models & textures
@@ -49,4 +61,4 @@ For textures (`texIds` = `_postfix`)
 ### - [Tuxick](https://github.com/emcifuntik) for initial version of this tool :)
 ### - [GiZz (indilo53)](https://github.com/indilo53) for various fixes and improvements
 ### - [DurtyFree](https://github.com/durtyfree) for various fixes and improvements
-### - [alt:V](https://altv.mp/) for the icon, branding and being the superior GTA 5 mp platform
+### - [alt:V](https://altv.mp/) for the icon, branding and being the superior GTA 5 mp platform
diff --git a/altClothTool.App/Builders/Base/ResourceBuilderBase.cs b/altClothTool.App/Builders/Base/ResourceBuilderBase.cs
@@ -56,9 +56,18 @@ protected static MUnk_94549140 GenerateYmtPedPropItem(YmtPedDefinitionFile ymt,
 
             for (int i = 0; i < clothData.Textures.Count; i++)
             {
+                byte texId = (byte)i;
+                if (clothData.DrawableType == ClothNameResolver.DrawableTypes.Legs)
+                {
+                    texId = 1;
+                }
+                else if (clothData.DrawableType == ClothNameResolver.DrawableTypes.Shoes)
+                {
+                    texId = 0;
+                }
                 var texture = new MUnk_254518642
                 {
-                    TexId = (byte) i
+                    TexId = texId
                 };
                 item.TexData.Add(texture);
             }
@@ -88,8 +97,12 @@ protected void GetClothPostfixes(ClothData clothData, out string ytdPostfix, out
             yddPostfix = clothData.MainPath.EndsWith("_u.ydd") ? "u" : "r";
             ytdPostfix = clothData.MainPath.EndsWith("_u.ydd") ? "uni" : "whi";
 
-            if (clothData.DrawableType == ClothNameResolver.DrawableTypes.Shoes ||
-                clothData.DrawableType == ClothNameResolver.DrawableTypes.Legs)
+            if (clothData.DrawableType == ClothNameResolver.DrawableTypes.Legs)
+            {
+                yddPostfix = "r";
+                ytdPostfix = "whi";
+            }
+            else if (clothData.DrawableType == ClothNameResolver.DrawableTypes.Shoes)
             {
                 yddPostfix = "r";
                 ytdPostfix = "uni";