From 37a58557cedd1902b0960e0832fd9e7e8751b91a Mon Sep 17 00:00:00 2001 From: Edmond Mondor Date: Fri, 12 Nov 2021 21:14:54 -0800 Subject: [PATCH] Changed "Plain Vest" to be acquired same time as "DRC Vest" [Fe]maleFan02 rebuilt - Includes PR#74 philRelto_District_PhilsRelto.prp [Scene Object - DRC Vest] Added to Modifiers - Python File Mod "cPythTakeablePlainVest" [Python FIle Mod - cPythTakeablePlainVest] Duplicate of "cPythTakeableClothing", but with clothing set to plain vest [Logic Modifier - cClickDRCVest] Added Python File Mod "cPythTakeablePlainVest" to Receivers above "cPythTakeableClothing" --- .../GlobalClothing_District_FemaleFan02.prp | 4 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- .../dat/philRelto_District_PhilsRelto.prp | 4 +- sources/avatar/clothing_fan02/Fan02.json | 153 ++++++++++++++++-- 4 files changed, 145 insertions(+), 20 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index 093ff0eb..391baf4b 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:3bede934e75aed676e9e9407c37d625a45ea44857fdae36b8a25a77e8f6a08f6 -size 3974423 +oid sha256:2c22592ecaaf5c09549afea545615f939188a325173af838e0e7a0083818ef94 +size 3799010 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 5c4d1584..e9053556 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:6f914a206a32e6b1fbe6576f5dbb7df331352200321a4c20e3a69ce55a8812d7 -size 3711838 +oid sha256:0d9381101377acdf2776988eb070394104174e92e703304d9de1e81e564d4478 +size 3711851 diff --git a/compiled/dat/philRelto_District_PhilsRelto.prp b/compiled/dat/philRelto_District_PhilsRelto.prp index 87c91c0f..78a0b4c4 100644 --- a/compiled/dat/philRelto_District_PhilsRelto.prp +++ b/compiled/dat/philRelto_District_PhilsRelto.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ca7ad3f40b878807b3f1d417d8e4f29ab35113303fca8c9bad5e1c3b56b75ac -size 4138289 +oid sha256:1da04022f9f5637e046f033c443dac92414cee2fbab011cd252e127fd09a9b56 +size 3940865 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index a831677a..9b3433ff 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -14,6 +14,10 @@ "MTorso_xSleeve_GayZero_Base.png", "MTorso_xSleeve_GayZero_Tint.png", + "Icon_UTorso_Shirt_CvrnTr.png", + "MTorso_xSleeve_CvrnTr_Base.png", + "MTorso_xSleeve_CvrnTr_Tint.png", + "Icon_MLegs_Cargo5.png", "MLegs_Cargo05_Tint1.png", "MLegs_Cargo05_Tint2.png", @@ -53,9 +57,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=02_MTorso12_01; GroupName=ShortSleeve; nonStandard", "text": "Short Sleeve T-Shirt - Mysterium 2021", "meshes": [ - "MHTorso08_SMsh", - "MMTorso_SMsh", - "MLTorso_SMsh" + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } ], "elements": [ { @@ -115,9 +128,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=02_MTorso12_01; GroupName=ShortSleeve", "text": "Short Sleeve T-Shirt - GZ Pride", "meshes": [ - "MHTorso08_SMsh", - "MMTorso_SMsh", - "MLTorso_SMsh" + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } ], "elements": [ { @@ -167,6 +189,47 @@ } ] }, + { + "name": "MTorso_ShortSleeve_CvrnTrT", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_CvrnTr.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 - Cavern Tour", + "meshes": [ + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_CvrnTr_Base.png", + "8": "MTorso_xSleeve_CvrnTr_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": "MLegs_CargoPants_TwoToned", "type": "pants", @@ -335,7 +398,7 @@ "icon": "Icon_U_NoPrint.png", "tint1": [1, 1, 1], "tint2": [1, 1, 1], - "desc": "ColorLabel1= Shirt ; ColorLabel2= Vest; isLogoFor=MReward_DRCVest; GroupName=DRCVest", + "desc": "ColorLabel1= Shirt ; ColorLabel2= Vest; isLogoFor=MReward_DRCVest; GroupName=DRCVest; nonStandard", "text": "Plain Vest", "meshes": [ "MHTorsoDRCVest_SMsh", @@ -416,6 +479,10 @@ "FTorso_xSleeve_GayZero_Base.png", "FTorso_xSleeve_GayZero_Tint.png", + "Icon_UTorso_Shirt_CvrnTr.png", + "FTorso_xSleeve_CvrnTr_Base.png", + "FTorso_xSleeve_CvrnTr_Tint.png", + "Icon_MLegs_Cargo5.png", "MLegs_Cargo05_Tint1.png", "MLegs_Cargo05_Tint2.png", @@ -455,9 +522,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=02_FTorso12_01; GroupName=ShortSleeve; nonStandard", "text": "Short Sleeve T-Shirt - Mysterium 2021", "meshes": [ - "FHTorso12_SMsh", - "FMTorso12_SMsh", - "FLTorso12_SMsh" + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } ], "elements": [ { @@ -516,9 +592,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=02_FTorso12_01; GroupName=ShortSleeve", "text": "Short Sleeve T-Shirt - GZ Pride", "meshes": [ - "FHTorso12_SMsh", - "FMTorso12_SMsh", - "FLTorso12_SMsh" + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } ], "elements": [ { @@ -567,6 +652,46 @@ } ] }, + { + "name": "FTorso_ShortSleeve_CvrnTrT", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_CvrnTr.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 - Cavern Tour", + "meshes": [ + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_xSleeve_CvrnTr_Base.png", + "8": "FTorso_xSleeve_CvrnTr_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] + }, { "name": "FLegs_CargoPants_TwoToned", "type": "pants", @@ -735,7 +860,7 @@ "icon": "Icon_U_NoPrint.png", "tint1": [1, 1, 1], "tint2": [1, 1, 1], - "desc": "ColorLabel1= Shirt ; ColorLabel2= Vest; isLogoFor=FReward_DRCVest; GroupName=DRCVest", + "desc": "ColorLabel1= Shirt ; ColorLabel2= Vest; isLogoFor=FReward_DRCVest; GroupName=DRCVest; nonStandard", "text": "Plain Vest", "meshes": [ "FHTorsoDRCVest_SMsh",