roavatar-renderer 1.2.6 → 1.2.7

package/dist/index.d.ts

@@ -415,6 +415,7 @@ export declare interface AvatarInventory_Result {
         };
         availabilityStatus: string;
         acquisitionTime: string;
+        headShape?: string;
         outfitDetail?: {
             assets: {
                 id: number;
@@ -1408,6 +1409,7 @@ export declare interface Look_Result {
                 id: number;
                 isIncluded: boolean;
                 supportsHeadshapes?: boolean;
+                meta?: AssetMetaJson;
             }[];
             bundleType: number | null;
             collectibleItemId: string;
@@ -1764,6 +1766,7 @@ export declare class Outfit {
     isOrderUsed(order: number, self?: Asset): boolean;
     getNextOrder(order: number): number;
     addAssetId(assetId: number, auth: Authentication): Promise<boolean>;
+    addAssetIdEconomy(assetId: number): Promise<boolean>;
     addBundleId(bundleId: number): Promise<boolean>;
     getAssetId(assetId: number): Asset | undefined;
     fromLook(look: Look_Result["look"], auth: Authentication): Promise<boolean>;

package/dist/index.js

@@ -27346,6 +27346,9 @@ const animNamesR15 = {
   ],
   toollunge: [
     { id: "http://www.roblox.com/asset/?id=522638767", weight: 10 }
+  ],
+  mood: [
+    { id: "http://www.roblox.com/asset/?id=14366558676", weight: 10 }
   ]
   /*wave: [
       { id: "http://www.roblox.com/asset/?id=507770239", weight: 10 }
@@ -31617,7 +31620,23 @@ class Outfit {
       return false;
     }
     const assetDetails = assetDetailsResponse;
-    this.addAsset(assetId, assetDetails.data[0].assetType, assetDetails.data[0].name, assetDetails.data[0].supportsHeadShapes);
+    if (assetDetails.data.length > 0) {
+      this.addAsset(assetId, assetDetails.data[0].assetType, assetDetails.data[0].name, assetDetails.data[0].supportsHeadShapes);
+    } else {
+      return this.addAssetIdEconomy(assetId);
+    }
+    return true;
+  }
+  async addAssetIdEconomy(assetId) {
+    const assetDetailsResponse = await API.Economy.GetAssetDetails(assetId);
+    if (assetDetailsResponse.status !== 200) {
+      return false;
+    }
+    const assetDetails = await assetDetailsResponse.json();
+    if (assetDetails.errors) {
+      return false;
+    }
+    this.addAsset(assetId, assetDetails.AssetTypeId, assetDetails.Name);
     return true;
   }
   async addBundleId(bundleId) {
@@ -31665,8 +31684,18 @@ class Outfit {
         this.addAsset(item.id, item.assetType, item.name);
       } else if (item.itemType === "Bundle") {
         const assetsList = [];
+        const assetMetaList = [];
+        const assetIdList = [];
         for (const asset of item.assetsInBundle) {
-          assetsList.push({ itemType: "Asset", id: asset.id });
+          if (asset.isIncluded) {
+            assetsList.push({ itemType: "Asset", id: asset.id });
+            if (asset.meta) {
+              assetMetaList.push(asset.meta);
+            } else {
+              assetMetaList.push(void 0);
+            }
+            assetIdList.push(asset.id);
+          }
         }
         const assetDetails = await API.Catalog.GetItemDetails(auth, assetsList);
         if (assetDetails instanceof Response) {
@@ -31674,6 +31703,15 @@ class Outfit {
         } else {
           for (const assetDetail of assetDetails.data) {
             this.addAsset(assetDetail.id, assetDetail.assetType, assetDetail.name, assetDetail.supportsHeadShapes);
+            const index = assetIdList.indexOf(assetDetail.id);
+            const meta = assetMetaList[index];
+            if (meta) {
+              const addedAsset = this.getAssetId(assetDetail.id);
+              if (addedAsset) {
+                addedAsset.meta = new AssetMeta();
+                addedAsset.meta.fromJson(meta);
+              }
+            }
           }
         }
       }
@@ -31799,6 +31837,17 @@ class Outfit {
     for (const assetDetail of assetDetails.data) {
       this.addAsset(assetDetail.id, assetDetail.assetType, assetDetail.name, assetDetail.supportsHeadShapes);
     }
+    for (const asset of assetsToAdd) {
+      const assetId = asset.id;
+      if (assetId && !this.getAssetId(assetId)) {
+        assetPromises.push(new Promise((resolve) => {
+          this.addAssetIdEconomy(assetId).then(() => {
+            resolve(void 0);
+          });
+        }));
+      }
+    }
+    await Promise.all(assetPromises);
     for (const assetToAdd of assetsToAdd) {
       let asset = void 0;
       for (const assetIn of this.assets) {
@@ -31810,7 +31859,6 @@ class Outfit {
         asset.meta = assetToAdd.meta;
       }
     }
-    await Promise.all(assetPromises);
     this.fixOrders();
     return this;
   }
@@ -32106,6 +32154,7 @@ const CategoryDictionary = {
     },
     "Head": {
       "Dynamic Heads": new SortInfo([new ItemSort(2, "Outfit")]),
+      "Adjustment": new SpecialInfo("HeadAdjustment"),
       "Heads": new SortInfo([new ItemSort(17)], "inventory"),
       "Faces": new SortInfo([new ItemSort(18)], "inventory")
     },
@@ -35367,7 +35416,7 @@ const API = {
         });
       }
       for (const thumbnailInfo of ThumbnailsToBatch) {
-        if (thumbnailInfo.id === id && thumbnailInfo.type === type && thumbnailInfo.size === size2) {
+        if (requestIdFromThumbnailInfo(thumbnailInfo) === requestIdFromThumbnailInfo(thisThumbnailInfo)) {
           return new Promise((resolve) => {
             thumbnailInfo.resolves.push(resolve);
           });
@@ -59584,22 +59633,17 @@ class AnimatorWrapper extends InstanceWrapper {
     for (const track of this.data.animationTracks.values()) {
       if (!this.data.moodTracks.includes(track)) continue;
       const looped = track.tick(addTime);
-      if (this.data.currentAnimationTrack === track && looped && this.data.currentAnimation) {
-        this._switchAnimation(this.data.currentAnimation);
+      if (this.data.currentMoodAnimationTrack === track && looped && this.data.currentMoodAnimation) {
+        this._switchMoodAnimation(this.data.currentMoodAnimation);
       }
     }
     for (const track of this.data.animationTracks.values()) {
       if (!this.data.toolTracks.includes(track)) continue;
       const looped = track.tick(addTime);
-      if (this.data.currentAnimationTrack === track && looped && this.data.currentAnimation) {
-        this._switchAnimation(this.data.currentAnimation);
+      if (this.data.currentToolAnimationTrack === track && looped && this.data.currentToolAnimation) {
+        this._switchToolAnimation(this.data.currentToolAnimation);
       }
     }
-    const hasMood = this.data.currentMoodAnimation && this.data.currentMoodAnimation.length > 0;
-    const isEmote = this.data.currentAnimation?.startsWith("emote.");
-    if (!hasMood && !isEmote) {
-      this.restPose(false, true);
-    }
     const rig = this.instance.parent?.parent;
     if (rig) {
       const descedants = rig.GetDescendants();
@@ -62395,11 +62439,6 @@ class OutfitRenderer {
               animatorW.playAnimation(name2);
             });
           }
-          if (this.outfit.containsAssetType("MoodAnimation") && !name2.startsWith("emote.")) {
-            animatorW.playAnimation("mood", "mood");
-          } else {
-            animatorW.stopMoodAnimation();
-          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roavatar-renderer",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "A renderer for Roblox avatars, used by the RoAvatar extension.",
   "author": "steinan",
   "type": "module",