From 23b65e3cfd7e450442080baa3ecadf19496d8470 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 5 Jun 2021 18:35:39 -0400 Subject: [PATCH] Add Gay Zero shirt JSON and regenerate clothing. --- .../GlobalClothing_District_FemaleFan02.prp | 4 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- sources/avatar/clothing_fan02/Fan02.json | 135 +++++++++++++++++- 3 files changed, 137 insertions(+), 6 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index 557a931e..6396d3b7 100644 --- a/compiled/dat/GlobalClothing_District_FemaleFan02.prp +++ b/compiled/dat/GlobalClothing_District_FemaleFan02.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16f9dab198787b2882888753b8d898c9e51678add3480c821aedc5722fb572a0 -size 275130 +oid sha256:5efee991c8b3d831765163dafca80524d2a0f60e60e644deaebd1d07315a6da1 +size 549889 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 7c5c162a..27cf35fc 100644 --- a/compiled/dat/GlobalClothing_District_MaleFan02.prp +++ b/compiled/dat/GlobalClothing_District_MaleFan02.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c22cc095e4f52b787dfa53677e913a01dcb0b536962aef8f54dc41b5ffe8eb4 -size 275184 +oid sha256:d1953c008315ad62ccd3f605da6386aab280f0e2c1b18c78a6c6727579194d92 +size 550003 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index e653e35e..b6aaf472 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -8,7 +8,11 @@ "mipmaps": [ "Icon_UTorso_Shirt_Mysterium2021.png", "MTorso_xSleeve_Mysterium2021_Base.png", - "MTorso_xSleeve_Mysterium2021_Tint.png" + "MTorso_xSleeve_Mysterium2021_Tint.png", + + "Icon_UTorso_Shirt_GayZero.png", + "MTorso_xSleeve_GayZero_Base.png", + "MTorso_xSleeve_GayZero_Tint.png" ], "clItems": [ { @@ -72,6 +76,68 @@ } } ] + }, + { + "name": "MTorso_ShortSleeve_GayZero", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_GayZero.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 - Gay Zero", + "meshes": [ + "MHTorso08_SMsh", + "MMTorso_SMsh", + "MLTorso_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_GayZero_Base.png", + "8": "MTorso_xSleeve_GayZero_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" + } + } + ] + }, + { + "name": "MTorso_LongSleeve_GayZero", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_GayZero.png", + "tint1": [0.0, 0.0, 0.0], + "tint2": [0.0, 0.0, 0.0], + "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01", + "text": "Long Sleeve T-Shirt - Gay Zero", + "meshes": [ + "MHTorso_SMsh", + "MMTorso_SMsh", + "MLTorso_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_GayZero_Base.png", + "8": "MTorso_xSleeve_GayZero_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "mtorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] } ] }, @@ -83,7 +149,11 @@ "mipmaps": [ "Icon_UTorso_Shirt_Mysterium2021.png", "FTorso_xSleeve_Mysterium2021_Base.png", - "FTorso_xSleeve_Mysterium2021_Tint.png" + "FTorso_xSleeve_Mysterium2021_Tint.png", + + "Icon_UTorso_Shirt_GayZero.png", + "FTorso_xSleeve_GayZero_Base.png", + "FTorso_xSleeve_GayZero_Tint.png" ], "clItems": [ { @@ -146,6 +216,67 @@ } } ] + }, + { + "name": "FTorso_ShortSleeve_GayZero", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_GayZero.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 - Gay Zero", + "meshes": [ + "FHTorso12_SMsh", + "FMTorso12_SMsh", + "FLTorso12_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_xSleeve_GayZero_Base.png", + "8": "FTorso_xSleeve_GayZero_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] + }, + { + "name": "FTorso_LongSleeve_GayZero", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_GayZero.png", + "tint1": [0.2863, 0.2863, 0.2863], + "tint2": [0.2863, 0.2863, 0.2863], + "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01", + "text": "Long Sleeve T-Shirt - Gay Zero", + "meshes": [ + "FHTorso_SMsh", + "FMTorso_SMsh", + "FLTorso_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_xSleeve_GayZero_Base.png", + "8": "FTorso_xSleeve_GayZero_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "ftorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] } ] }