Merge pull request #255 from dpogue/riven24-shirt

Riven (2024) shirt
H-uru · Sep 23, 2024 · 49472da · 49472da
2 parents 376bc35 + a6cb4ee
commit 49472da
Show file tree

Hide file tree

Showing 12 changed files with 120 additions and 10 deletions.
diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp
diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp
diff --git a/sources/avatar/UTorso_xSleeve-Template.xcf b/sources/avatar/UTorso_xSleeve-Template.xcf
diff --git a/...hing_fan02/FTorso_xSleeve_GoInst_base.png → ...hing_fan02/FTorso_xSleeve_GoInst_Base.png b/...hing_fan02/FTorso_xSleeve_GoInst_base.png → ...hing_fan02/FTorso_xSleeve_GoInst_Base.png
diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Base.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Base.png
diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Tint.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Tint.png
diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json
@@ -70,13 +70,17 @@
         "MTorso_xSleeve_MTP_Tint1.png",
         "MTorso_HoodSweatMTP_Base.png",
         "MTorso_HoodSweatMTP_Tint1.png",
-        
+
         "Icon_MLegs_shortstrydye.png",
         "MLegs_Shorts_TransDye_Base.png",
-        
+
         "Icon_UTorso_Shirt_Kalamee.png",
         "MTorso_ShortSleeve_Kalamee_Base.png",
-        "MTorso_ShortSleeve_Kalamee_Tint1.png"
+        "MTorso_ShortSleeve_Kalamee_Tint1.png",
+
+        "Icon_UTorso_Shirt_Riven2024.png",
+        "MTorso_xSleeve_Riven2024_Base.png",
+        "MTorso_xSleeve_Riven2024_Tint.png"
       ],
       "clItems": [
         {
@@ -989,6 +993,47 @@
               }
             }
           ]
+        },
+        {
+          "name": "MTorso_ShortSleeve_Riven2024",
+          "type": "Shirt",
+          "group": "Male",
+          "icon": "Icon_UTorso_Shirt_Riven2024.png",
+          "tint1": [0.0, 0.0, 0.0],
+          "tint2": [0.0, 0.0, 0.0],
+          "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=02_MTorso12_01; GroupName=ShortSleeve",
+          "text": "Short Sleeve T-Shirt - Riven: Moiety Hive",
+          "meshes": [
+            {
+                "name": "MHTorso08_SMsh",
+                "page": "Male01"
+            },
+            {
+                "name": "MMTorso_SMsh",
+                "page": "Male01"
+            },
+            {
+                "name": "MLTorso_SMsh",
+                "page": "Male01"
+            }
+          ],
+          "elements": [
+            {
+              "name": "Chest",
+              "layers": {
+                "0": "MTorso_xSleeve_Riven2024_Base.png",
+                "8": "MTorso_xSleeve_Riven2024_Tint.png"
+              }
+            },
+            {
+              "name": "Arm",
+              "layers": {
+                "0": "mtorso_shortsleevearm_base*0#0.hsm",
+                "1": "mtorso_shortsleevearm_skin*0#0.hsm",
+                "8": "mtorso_shortsleevearm_tint1*0#0.hsm"
+              }
+            }
+          ]
         }
       ]
     },
@@ -1064,13 +1109,17 @@
         "FTorso_LongSleeve_MTP_Tint1.png",
         "FTorso_HoodSweatMTP_Base.png",
         "FTorso_HoodSweatMTP_Tint1.png",
-        
+
         "Icon_FLegs_shortstrydye.png",
         "FLegs_Shorts_TransDye_Base.png",
-        
+
         "Icon_UTorso_Shirt_Kalamee.png",
         "FTorso_ShortSleeve_Kalamee_Base.png",
-        "FTorso_ShortSleeve_Kalamee_Tint1.png"
+        "FTorso_ShortSleeve_Kalamee_Tint1.png",
+
+        "Icon_UTorso_Shirt_Riven2024.png",
+        "FTorso_xSleeve_Riven2024_Base.png",
+        "FTorso_xSleeve_Riven2024_Tint.png"
       ],
       "clItems": [
         {
@@ -1939,6 +1988,46 @@
               }
             }
           ]
+        },
+        {
+          "name": "FTorso_ShortSleeve_Riven2024",
+          "type": "Shirt",
+          "group": "Female",
+          "icon": "Icon_UTorso_Shirt_Riven2024.png",
+          "tint1": [0.0, 0.0, 0.0],
+          "tint2": [0.0, 0.0, 0.0],
+          "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=02_FTorso12_01; GroupName=ShortSleeve",
+          "text": "Short Sleeve T-Shirt - Riven: Moiety Hive",
+          "meshes": [
+            {
+                "name": "FHTorso12_SMsh",
+                "page": "Female01"
+            },
+            {
+                "name": "FMTorso12_SMsh",
+                "page": "Female01"
+            },
+            {
+                "name": "FLTorso12_SMsh",
+                "page": "Female01"
+            }
+          ],
+          "elements": [
+            {
+              "name": "Chest",
+              "layers": {
+                "0": "FTorso_xSleeve_Riven2024_Base.png",
+                "8": "FTorso_xSleeve_Riven2024_Tint.png"
+              }
+            },
+            {
+              "name": "Arm",
+              "layers": {
+                "1": "mtorso_shortsleevearm_skin*0#0.hsm",
+                "8": "fsleeve04t02l1*0#0.hsm"
+              }
+            }
+          ]
         }
       ]
     }

diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Riven2024.png b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Riven2024.png
diff --git a/...hing_fan02/MTorso_xSleeve_GoInst_base.png → ...hing_fan02/MTorso_xSleeve_GoInst_Base.png b/...hing_fan02/MTorso_xSleeve_GoInst_base.png → ...hing_fan02/MTorso_xSleeve_GoInst_Base.png
diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Base.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Base.png
diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Tint.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Tint.png
diff --git a/sources/avatar/clothing_fan02/UTorso_xSleeve_Riven2024.xcf b/sources/avatar/clothing_fan02/UTorso_xSleeve_Riven2024.xcf