From 7469339b2968d356a702b5a71500bdf39198fca6 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 16 Nov 2022 22:56:32 -0500 Subject: [PATCH 1/6] Add TCT clothing items. New clothing items include male and female: - Long sleeve shirt: [M|F]Torso_LongSleeve_TCT - Short sleeve shirt: [M|F]Torso_ShortSleeve_TCT - Hooded sweatshirt: [M|F]Torso_SweatTCT - Fleece pullover: [M|F]Torso_FleeceTCT All items are currently hidden by default - a pickup mechanism is to be added later. Co-authored-by: Patrick "Maurus" Mauro Co-authored-by: Tim Miles Keller --- .../GlobalClothing_District_FemaleFan02.prp | 4 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- .../FTorso_HoodSweatCavernToday_Base.png | 3 + .../FTorso_HoodSweatCavernToday_Tint1.png | 3 + .../FTorso_HoodSweatCavernToday_Tint2.png | 3 + .../FTorso_xSleeve_CavernToday_Base.png | 3 + .../FTorso_xSleeve_CavernToday_Tint1.png | 3 + .../FTorso_xSleeve_CavernToday_Tint2.png | 3 + sources/avatar/clothing_fan02/Fan02.json | 316 +++++++++++++++++- .../Icon_UTorso_Fleece_CavernToday.png | 3 + .../Icon_UTorso_Shirt_CavernToday.png | 3 + .../MTorso_Fleece_CavernToday_Base.png | 3 + .../MTorso_Fleece_CavernToday_Tint1.png | 3 + .../MTorso_HoodSweatCavernToday_Base.png | 3 + .../MTorso_HoodSweatCavernToday_Tint1.png | 3 + .../MTorso_HoodSweatCavernToday_Tint2.png | 3 + .../MTorso_xSleeve_CavernToday_Base.png | 3 + .../MTorso_xSleeve_CavernToday_Tint1.png | 3 + .../MTorso_xSleeve_CavernToday_Tint2.png | 3 + 19 files changed, 366 insertions(+), 6 deletions(-) create mode 100644 sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Tint1.png create mode 100644 sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Tint2.png create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Tint1.png create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Tint2.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Fleece_CavernToday.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Shirt_CavernToday.png create mode 100644 sources/avatar/clothing_fan02/MTorso_Fleece_CavernToday_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_Fleece_CavernToday_Tint1.png create mode 100644 sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Tint1.png create mode 100644 sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Tint2.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Tint1.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Tint2.png diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index d5a48067..73854f4e 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:0287c788f4b6d5ff12cc993709ca848e9e086caf8f94e66ca8ee399751721e00 -size 4195344 +oid sha256:8e06399c649a09a61c2d8b3bceac9cdfa32c8c68722e8cdd5dffac5c10222e0c +size 5375534 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 64970b67..7837caf2 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:28fb0653e484631eca4c0cdd99ad9562aa35a75974a478042e0dfe86cd849941 -size 4108240 +oid sha256:959bc3076b6607fa62a99300328acfc5591475c4f3409c0b7bff9a83dff387c6 +size 5288439 diff --git a/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Base.png b/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Base.png new file mode 100644 index 00000000..d59909dd --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b616caf46ebb8a7780642f170db0c5a29fd7dc4ce066853522522fee5c848df +size 154552 diff --git a/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Tint1.png b/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Tint1.png new file mode 100644 index 00000000..651f721a --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a9a2364ac86ff1154d03e9da6f56d1f16ac7b6ac6d3e369cd9f1c2fd4a28327 +size 165600 diff --git a/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Tint2.png b/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Tint2.png new file mode 100644 index 00000000..d52efa45 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_HoodSweatCavernToday_Tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32a1ecc308a85bd18719402812a0606accd7366ca9b255312e073b33410f463b +size 19274 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Base.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Base.png new file mode 100644 index 00000000..a988d865 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbb92e6974bddde31ff68343098158a4e4c3656e99e69a01d67f3b356122c2cc +size 86266 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Tint1.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Tint1.png new file mode 100644 index 00000000..a1434795 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f4bb7c12312a3b1e616908564048e29157fe1d84fcbda3153e5f4bb24c74c1f +size 90456 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Tint2.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Tint2.png new file mode 100644 index 00000000..a35f768d --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_CavernToday_Tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d41e5623917fd1ad478054946813327ba1bbb271aa869ca26a7b85db27a50cea +size 16537 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index 59b11080..fbe063cc 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -52,7 +52,18 @@ "Icon_UTorso_Shirt_GoInst.png", "MTorso_xSleeve_GoInst_Base.png", - "MTorso_xSleeve_GoInst_Tint1.png" + "MTorso_xSleeve_GoInst_Tint1.png", + + "Icon_UTorso_Shirt_CavernToday.png", + "MTorso_HoodSweatCavernToday_Base.png", + "MTorso_HoodSweatCavernToday_Tint1.png", + "MTorso_HoodSweatCavernToday_Tint2.png", + "MTorso_xSleeve_CavernToday_Base.png", + "MTorso_xSleeve_CavernToday_Tint1.png", + "MTorso_xSleeve_CavernToday_Tint2.png", + "Icon_UTorso_Fleece_CavernToday.png", + "MTorso_Fleece_CavernToday_Base.png", + "MTorso_Fleece_CavernToday_Tint1.png" ], "clItems": [ { @@ -579,6 +590,160 @@ } } ] + }, + { + "name": "MTorso_Sweat_TCT", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_CavernToday.png", + "tint1": [0.067, 0.067, 0.067], + "tint2": [0.671, 0.655, 0.506], + "desc": "ColorLabel1=Sweatshirt ; ColorLabel2=Logo; isLogoFor=03_MSweatshirt_Blank; GroupName=Hooded; nonStandard;", + "text": "Hooded Sweatshirt - The Cavern Today", + "meshes": [ + { + "name": "MH_Sweatshirt_SMsh", + "page": "Male02" + }, + { + "name": "MMTorso12_SMsh", + "page": "Male02" + }, + { + "name": "MLTorso_SMsh", + "page": "Male02" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_HoodSweatCavernToday_Base.png", + "8": "MTorso_HoodSweatCavernToday_Tint1.png", + "9": "MTorso_HoodSweatCavernToday_Tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "mtorso_hoodsweat01arm_base*0#0.hsm", + "8": "mtorso_hoodsweat01arm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "MTorso_ShortSleeve_TCT", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_CavernToday.png", + "tint1": [0.067, 0.067, 0.067], + "tint2": [0.671, 0.655, 0.506], + "desc": "ColorLabel1=Shirt; ColorLabel2=Logo; isLogoFor=02_MTorso12_01; GroupName=ShortSleeve; nonStandard;", + "text": "Short Sleeve T-Shirt - The Cavern Today", + "meshes": [ + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_CavernToday_Base.png", + "8": "MTorso_xSleeve_CavernToday_Tint1.png", + "9": "MTorso_xSleeve_CavernToday_Tint2.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_TCT", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_CavernToday.png", + "tint1": [0.067, 0.067, 0.067], + "tint2": [0.671, 0.655, 0.506], + "desc": "ColorLabel1=Shirt; ColorLabel2=Logo; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01; nonStandard;", + "text": "Long Sleeve T-Shirt - Guild of Instructors", + "meshes": [ + "MHTorso_SMsh", + "MMTorso_SMsh", + "MLTorso_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_CavernToday_Base.png", + "8": "MTorso_xSleeve_CavernToday_Tint1.png", + "9": "MTorso_xSleeve_CavernToday_Tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "mtorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "MTorso_Fleece_TCT", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Fleece_CavernToday.png", + "tint1": [0.067, 0.067, 0.067], + "tint2": [0.671, 0.655, 0.506], + "desc": "ColorLabel1=Pullover; ColorLabel2=; isLogoFor=02_MTorso06_01; GroupName=Fleece; nonStandard;", + "text": "The Cavern Today Fleece Pullover", + "meshes": [ + { + "name": "MHTorso06_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_Fleece_CavernToday_Base.png", + "8": "MTorso_Fleece_CavernToday_Tint1.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "mtorso_fleece01arm_base*0#0.hsm", + "8": "mtorso_fleece01arm_tint1*0#0.hsm" + } + } + ] } ] }, @@ -634,7 +799,18 @@ "Icon_UTorso_Shirt_GoInst.png", "FTorso_xSleeve_GoInst_Base.png", - "FTorso_xSleeve_GoInst_Tint1.png" + "FTorso_xSleeve_GoInst_Tint1.png", + + "Icon_UTorso_Shirt_CavernToday.png", + "FTorso_HoodSweatCavernToday_Base.png", + "FTorso_HoodSweatCavernToday_Tint1.png", + "FTorso_HoodSweatCavernToday_Tint2.png", + "FTorso_xSleeve_CavernToday_Base.png", + "FTorso_xSleeve_CavernToday_Tint1.png", + "FTorso_xSleeve_CavernToday_Tint2.png", + "Icon_UTorso_Fleece_CavernToday.png", + "MTorso_Fleece_CavernToday_Base.png", + "MTorso_Fleece_CavernToday_Tint1.png" ], "clItems": [ { @@ -1148,6 +1324,142 @@ } } ] + }, + { + "name": "FTorso_Sweat_TCT", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_CavernToday.png", + "tint1": [0.067, 0.067, 0.067], + "tint2": [0.671, 0.655, 0.506], + "desc": "ColorLabel1= Sweatshirt ; ColorLabel2=Logo; isLogoFor=FTorso_Sweatshirt_Blank; GroupName=Hooded; nonStandard;", + "text": "Hooded Sweatshirt - The Cavern Today", + "meshes": [ + "FHTorso16_SMsh", + "FMTorso16_SMsh", + "FLTorso16_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_HoodSweatCavernToday_Base.png", + "8": "FTorso_HoodSweatCavernToday_Tint1.png", + "9": "FTorso_HoodSweatCavernToday_Tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "mtorso_hoodsweat01arm_base*0#0.hsm", + "8": "mtorso_hoodsweat01arm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "FTorso_ShortSleeve_TCT", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_CavernToday.png", + "tint1": [0.067, 0.067, 0.067], + "tint2": [0.671, 0.655, 0.506], + "desc": "ColorLabel1=Shirt; ColorLabel2=Logo; isLogoFor=02_FTorso12_01; GroupName=ShortSleeve; nonStandard;", + "text": "Short Sleeve T-Shirt - The Cavern Today", + "meshes": [ + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_xSleeve_CavernToday_Base.png", + "8": "FTorso_xSleeve_CavernToday_Tint1.png", + "9": "FTorso_xSleeve_CavernToday_Tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] + }, + { + "name": "FTorso_LongSleeve_TCT", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_CavernToday.png", + "tint1": [0.067, 0.067, 0.067], + "tint2": [0.671, 0.655, 0.506], + "desc": "ColorLabel1=Shirt; ColorLabel2=Logo; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01; nonStandard;", + "text": "Long Sleeve T-Shirt - The Cavern Today", + "meshes": [ + "FHTorso_SMsh", + "FMTorso_SMsh", + "FLTorso_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_xSleeve_CavernToday_Base.png", + "8": "FTorso_xSleeve_CavernToday_Tint1.png", + "9": "FTorso_xSleeve_CavernToday_Tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "ftorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "FTorso_Fleece_TCT", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Fleece_CavernToday.png", + "tint1": [0.067, 0.067, 0.067], + "tint2": [0.671, 0.655, 0.506], + "desc": "ColorLabel1=Pullover; ColorLabel2=; isLogoFor=03_FTorso06_01; GroupName=Fleece; nonStandard;", + "text": "The Cavern Today Fleece Pullover", + "meshes": [ + "FHTorso06_SMsh", + "FMTorso06_SMsh", + "FLTorso06_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_Fleece_CavernToday_Base.png", + "8": "MTorso_Fleece_CavernToday_Tint1.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "mtorso_fleece01arm_base*0#0.hsm", + "8": "mtorso_fleece01arm_tint1*0#0.hsm", + "9": "mtorso_fleece01arm_tint2*0#0.hsm" + } + } + ] } ] } diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Fleece_CavernToday.png b/sources/avatar/clothing_fan02/Icon_UTorso_Fleece_CavernToday.png new file mode 100644 index 00000000..b81580a1 --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Fleece_CavernToday.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69fbc2fd7a90fc7706ab1df4caf022a77453066644a0af5d17d300f8087ec4ea +size 36697 diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_CavernToday.png b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_CavernToday.png new file mode 100644 index 00000000..47b35396 --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_CavernToday.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa217828a8b8f8f070c06ded0a5167bb434620dfc5f07b9052e3ce776de9ce80 +size 26555 diff --git a/sources/avatar/clothing_fan02/MTorso_Fleece_CavernToday_Base.png b/sources/avatar/clothing_fan02/MTorso_Fleece_CavernToday_Base.png new file mode 100644 index 00000000..9e8631fc --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_Fleece_CavernToday_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a65ddec42ab0f025017025e2d7bfaebf45ed575d441ea9bd03bd2ab712c7988 +size 118200 diff --git a/sources/avatar/clothing_fan02/MTorso_Fleece_CavernToday_Tint1.png b/sources/avatar/clothing_fan02/MTorso_Fleece_CavernToday_Tint1.png new file mode 100644 index 00000000..eeea41cd --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_Fleece_CavernToday_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:320ea5a879b722189e192d02da5f18dcf1ae7e814a47cd5d0c8fba16a15c7125 +size 91757 diff --git a/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Base.png b/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Base.png new file mode 100644 index 00000000..97750cac --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28e04c0b586d26ab7ca1712426eb138938b3ca705869737dea642911d28d8c51 +size 128090 diff --git a/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Tint1.png b/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Tint1.png new file mode 100644 index 00000000..07f4d9a8 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d066a65935574da63401cfde83a589e592b531d186a94a3f5ee5fe0aee1b86f +size 155689 diff --git a/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Tint2.png b/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Tint2.png new file mode 100644 index 00000000..d19a7731 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_HoodSweatCavernToday_Tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c3664cc5bf62e1e37fe0a6940930d6740e8a353ba6c2cba0725b791f6c9f6d8 +size 19970 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Base.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Base.png new file mode 100644 index 00000000..9f6b3090 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3afbadb279548a242751cfdf3a51e3e28c48448d18690f6ceab6d31128bcff8e +size 84618 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Tint1.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Tint1.png new file mode 100644 index 00000000..a4ab5b25 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:190946488753fbb92f4616235d0565e6c36a858a0bff70992515c4342f0b1f42 +size 88557 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Tint2.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Tint2.png new file mode 100644 index 00000000..3703b05b --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_CavernToday_Tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:754abef32b98ebd48e57c6c846a61a388ae2ed5161f7e463f161492a65fe9585 +size 16146 From 4fadabd33e037eeb6dce08b280ccde1ce484366b Mon Sep 17 00:00:00 2001 From: Edmond Mondor Date: Mon, 19 Dec 2022 16:17:57 -0800 Subject: [PATCH 2/6] Mystitech clothing Items and bug fixes Bug fix for longsleeve shirts disappearing at long range from player New Mystitech clothing items include male and female: - Long sleeve shirt: [M|F]HoodLS_MTP - Short sleeve shirt: [M|F]Hood_MTP - Hooded sweatshirt: [M|F]MHoodSweat_MTP All items are currently hidden by default - a pickup mechanism is to be added later. Co-authored-by: Korovev Co-authored-by: Larry LeDeay --- .../GlobalClothing_District_FemaleFan02.prp | 4 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- .../FTorso_HoodSweatMTP_Base.png | 3 + .../FTorso_HoodSweatMTP_Tint1.png | 3 + .../FTorso_LongSleeve_MTP_Base.png | 3 + .../FTorso_LongSleeve_MTP_Tint1.png | 3 + .../FTorso_ShortSleeve_MTP_Base.png | 3 + .../FTorso_ShortSleeve_MTP_Tint1.png | 3 + sources/avatar/clothing_fan02/Fan02.json | 422 +++++++++++++++--- .../Icon_UTorso_Shirt_Mystitech.png | 3 + .../MTorso_HoodSweatMTP_Base.png | 3 + .../MTorso_HoodSweatMTP_Tint1.png | 3 + .../MTorso_xSleeve_MTP_Base.png | 3 + .../MTorso_xSleeve_MTP_Tint1.png | 3 + 14 files changed, 407 insertions(+), 56 deletions(-) create mode 100644 sources/avatar/clothing_fan02/FTorso_HoodSweatMTP_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_HoodSweatMTP_Tint1.png create mode 100644 sources/avatar/clothing_fan02/FTorso_LongSleeve_MTP_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_LongSleeve_MTP_Tint1.png create mode 100644 sources/avatar/clothing_fan02/FTorso_ShortSleeve_MTP_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_ShortSleeve_MTP_Tint1.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mystitech.png create mode 100644 sources/avatar/clothing_fan02/MTorso_HoodSweatMTP_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_HoodSweatMTP_Tint1.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_MTP_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_MTP_Tint1.png diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index 73854f4e..3ce884c4 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:8e06399c649a09a61c2d8b3bceac9cdfa32c8c68722e8cdd5dffac5c10222e0c -size 5375534 +oid sha256:f89da7066e2c6bb860c36af297b7b348a2a32846306adf8fcaa4c02168d5ed95 +size 5915201 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 7837caf2..8c2b0d7b 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:959bc3076b6607fa62a99300328acfc5591475c4f3409c0b7bff9a83dff387c6 -size 5288439 +oid sha256:7c9d91f73ff2a95355a1b26b5c60ae8f2830e01f446f8c7185b3323a3578f3ad +size 5652963 diff --git a/sources/avatar/clothing_fan02/FTorso_HoodSweatMTP_Base.png b/sources/avatar/clothing_fan02/FTorso_HoodSweatMTP_Base.png new file mode 100644 index 00000000..82cebb1e --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_HoodSweatMTP_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:075ce8fa0427e5a98530e6c338dabbdc14a84b6dc642c6c5a72aeb2eaff6dedb +size 184029 diff --git a/sources/avatar/clothing_fan02/FTorso_HoodSweatMTP_Tint1.png b/sources/avatar/clothing_fan02/FTorso_HoodSweatMTP_Tint1.png new file mode 100644 index 00000000..cac03ce9 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_HoodSweatMTP_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f7f5d521c413b539c1ff50d883e0321ee686d47c6851702399fbe6e0f1fc8f6 +size 168019 diff --git a/sources/avatar/clothing_fan02/FTorso_LongSleeve_MTP_Base.png b/sources/avatar/clothing_fan02/FTorso_LongSleeve_MTP_Base.png new file mode 100644 index 00000000..153b456d --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_LongSleeve_MTP_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a0dfa2fb4741ded659b9df3d52fd55c17e383d1b16370cef2bd8d35a60d43bb +size 129350 diff --git a/sources/avatar/clothing_fan02/FTorso_LongSleeve_MTP_Tint1.png b/sources/avatar/clothing_fan02/FTorso_LongSleeve_MTP_Tint1.png new file mode 100644 index 00000000..e60ba72c --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_LongSleeve_MTP_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf09dee26f240389c1671fbc104d8549d108f1dd0efd29e0fa8a2f6e24fdc71a +size 65809 diff --git a/sources/avatar/clothing_fan02/FTorso_ShortSleeve_MTP_Base.png b/sources/avatar/clothing_fan02/FTorso_ShortSleeve_MTP_Base.png new file mode 100644 index 00000000..4b624da2 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_ShortSleeve_MTP_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d024933fe4a3a59ecf37315a1d53180659293d7c1f0882f9ab64fccfb211ac3 +size 128659 diff --git a/sources/avatar/clothing_fan02/FTorso_ShortSleeve_MTP_Tint1.png b/sources/avatar/clothing_fan02/FTorso_ShortSleeve_MTP_Tint1.png new file mode 100644 index 00000000..cbafa3df --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_ShortSleeve_MTP_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c11eb4f5ebf40f1460265cb18f4dd8c9c3b3a739719b8c6ff8dd2e7a7f7794c0 +size 66071 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index fbe063cc..03dd474a 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -13,43 +13,43 @@ "Icon_UTorso_Shirt_GayZero.png", "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", - + "FLegs_Shorts05_Tint1.png", "FLegs_Shorts05_Tint2.png", - + "Icon_UTorso_Shirt_PodReward.png", "MTorso_HoodSweatRewardPodMaze_Base.png", "MTorso_HoodSweatRewardPodMaze_Tint1.png", - + "Icon_UTorso_Fleece_GardenSpiralReward.png", "MTorso_Fleece-GardenSpiralReward-base.png", "MTorso_Fleece-GardenSpiralReward-tint1.png", "MTorso_Fleece-GardenSpiralReward-tint2.png", "MTorso_FleeceBlueFlowerArm_base.png", - + "Icon_UTorso_Vest_ShellReward.png", "MTorso_ShellVest_base.png", - + "Icon_U_NoPrint.png", "MTorso_PlainVest_base.png", "MTorso_PlainVest_tint2.png", - + "Icon_UTorso_LeatherJacket_Minkata.png", "UTorso_LeatherJacketMinkata_Tint1.png", "UTorso_LeatherJacketMinkataArm_tint1.png", - + "Icon_UTorse_Fleece_KelsReward.png", "UTorso_Fleece_KelsReward_Base.png", - "UTorso_Fleece_KelsRewardArm_Base.png", - + "UTorso_Fleece_KelsRewardArm_Base.png", + "Icon_UTorso_Shirt_GoInst.png", "MTorso_xSleeve_GoInst_Base.png", "MTorso_xSleeve_GoInst_Tint1.png", @@ -63,7 +63,13 @@ "MTorso_xSleeve_CavernToday_Tint2.png", "Icon_UTorso_Fleece_CavernToday.png", "MTorso_Fleece_CavernToday_Base.png", - "MTorso_Fleece_CavernToday_Tint1.png" + "MTorso_Fleece_CavernToday_Tint1.png", + + "Icon_UTorso_Shirt_Mystitech.png", + "MTorso_xSleeve_MTP_Base.png", + "MTorso_xSleeve_MTP_Tint1.png", + "MTorso_HoodSweatMTP_Base.png", + "MTorso_HoodSweatMTP_Tint1.png" ], "clItems": [ { @@ -117,9 +123,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01; nonStandard", "text": "Long Sleeve T-Shirt - Mysterium 2021", "meshes": [ - "MHTorso_SMsh", - "MMTorso_SMsh", - "MLTorso_SMsh" + { + "name": "MHTorso_SMsh", + "page": "Male" + }, + { + "name": "MMTorso_SMsh", + "page": "Male" + }, + { + "name": "MLTorso_SMsh", + "page": "Male" + } ], "elements": [ { @@ -188,9 +203,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01", "text": "Long Sleeve T-Shirt - GZ Pride", "meshes": [ - "MHTorso_SMsh", - "MMTorso_SMsh", - "MLTorso_SMsh" + { + "name": "MHTorso_SMsh", + "page": "Male" + }, + { + "name": "MMTorso_SMsh", + "page": "Male" + }, + { + "name": "MLTorso_SMsh", + "page": "Male" + } ], "elements": [ { @@ -334,8 +358,8 @@ { "name": "Arm", "layers": { - "0": "mtorso_hoodsweat01arm_base*0#0.hsm", - "8": "mtorso_hoodsweat01arm_tint1*0#0.hsm" + "0": "mtorso_sweatsleeve_base*0#0.hsm", + "8": "mtorso_sweatsleeve_tint1*0#0.hsm" } } ] @@ -350,7 +374,10 @@ "desc": "ColorLabel1= Pullover ; ColorLabel2= Spiral ; isLogoFor=02_MTorso06_01; GroupName=Fleece; nonStandard", "text": "Door Runner's Fleece Jacket", "meshes": [ - "MHTorso06_SMsh", + { + "name": "MHTorso06_SMsh", + "page": "Male01" + }, { "name": "MMTorso_SMsh", "page": "Male01" @@ -571,9 +598,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01", "text": "Long Sleeve T-Shirt - Guild of Instructors", "meshes": [ - "MHTorso_SMsh", - "MMTorso_SMsh", - "MLTorso_SMsh" + { + "name": "MHTorso_SMsh", + "page": "Male" + }, + { + "name": "MMTorso_SMsh", + "page": "Male" + }, + { + "name": "MLTorso_SMsh", + "page": "Male" + } ], "elements": [ { @@ -626,8 +662,8 @@ { "name": "Arm", "layers": { - "0": "mtorso_hoodsweat01arm_base*0#0.hsm", - "8": "mtorso_hoodsweat01arm_tint1*0#0.hsm" + "0": "mtorso_sweatsleeve_base*0#0.hsm", + "8": "mtorso_sweatsleeve_tint1*0#0.hsm" } } ] @@ -684,9 +720,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=Logo; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01; nonStandard;", "text": "Long Sleeve T-Shirt - Guild of Instructors", "meshes": [ - "MHTorso_SMsh", - "MMTorso_SMsh", - "MLTorso_SMsh" + { + "name": "MHTorso_SMsh", + "page": "Male" + }, + { + "name": "MMTorso_SMsh", + "page": "Male" + }, + { + "name": "MLTorso_SMsh", + "page": "Male" + } ], "elements": [ { @@ -744,6 +789,125 @@ } } ] + }, + { + "name": "MHood_MTP", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Mystitech.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2= ; isLogoFor=02_MTorso12_01; GroupName=ShortSleeve; nonStandard;", + "text": "Mystitech Productions T-Shirt, logo by Larry LeDeay", + "meshes": [ + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_MTP_Base.png", + "8": "MTorso_xSleeve_MTP_Tint1.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "mtorso_shortsleevearm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "MHoodLS_MTP", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Mystitech.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2= ; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01; nonStandard;", + "text": "Mystitech Productions T-Shirt, logo by Larry LeDeay", + "meshes": [ + { + "name": "MHTorso_SMsh", + "page": "Male" + }, + { + "name": "MMTorso_SMsh", + "page": "Male" + }, + { + "name": "MLTorso_SMsh", + "page": "Male" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_MTP_Base.png", + "8": "MTorso_xSleeve_MTP_Tint1.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "mtorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "MHoodSweat_MTP", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Mystitech.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Sweatshirt ; ColorLabel2= ; isLogoFor=03_MSweatshirt_Blank; GroupName=Hooded; nonStandard;", + "text": "Mystitech Productions Hoodie, logo by Larry LeDeay", + "meshes": [ + { + "name": "MH_Sweatshirt_SMsh", + "page": "Male02" + }, + { + "name": "MMTorso12_SMsh", + "page": "Male02" + }, + { + "name": "MLTorso_SMsh", + "page": "Male02" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_HoodSweatMTP_Base.png", + "8": "MTorso_HoodSweatMTP_Tint1.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "mtorso_sweatsleeve_base*0#0.hsm", + "8": "mtorso_sweatsleeve_tint1*0#0.hsm" + } + } + ] } ] }, @@ -760,43 +924,43 @@ "Icon_UTorso_Shirt_GayZero.png", "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", - + "FLegs_Shorts05_Tint1.png", "FLegs_Shorts05_Tint2.png", - + "Icon_UTorso_Shirt_PodReward.png", "ftorso_sweaterRewardPodMaze_base.png", "ftorso_sweaterRewardPodMaze_tint1.png", - + "Icon_UTorso_Fleece_GardenSpiralReward.png", "MTorso_Fleece-GardenSpiralReward-base.png", "MTorso_Fleece-GardenSpiralReward-tint1.png", "MTorso_Fleece-GardenSpiralReward-tint2.png", "MTorso_FleeceBlueFlowerArm_base.png", - + "Icon_UTorso_Vest_ShellReward.png", "FTorso_ShellVest_base.png", - + "Icon_U_NoPrint.png", "FTorso_PlainVest_base.png", "FTorso_PlainVest_Tint2.png", - + "Icon_UTorso_LeatherJacket_Minkata.png", "UTorso_LeatherJacketMinkata_Tint1.png", "UTorso_LeatherJacketMinkataArm_tint1.png", - + "Icon_UTorse_Fleece_KelsReward.png", "UTorso_Fleece_KelsReward_Base.png", "UTorso_Fleece_KelsRewardArm_Base.png", - + "Icon_UTorso_Shirt_GoInst.png", "FTorso_xSleeve_GoInst_Base.png", "FTorso_xSleeve_GoInst_Tint1.png", @@ -810,7 +974,15 @@ "FTorso_xSleeve_CavernToday_Tint2.png", "Icon_UTorso_Fleece_CavernToday.png", "MTorso_Fleece_CavernToday_Base.png", - "MTorso_Fleece_CavernToday_Tint1.png" + "MTorso_Fleece_CavernToday_Tint1.png", + + "Icon_UTorso_Shirt_Mystitech.png", + "FTorso_ShortSleeve_MTP_Base.png", + "FTorso_ShortSleeve_MTP_Tint1.png", + "FTorso_LongSleeve_MTP_Base.png", + "FTorso_LongSleeve_MTP_Tint1.png", + "FTorso_HoodSweatMTP_Base.png", + "FTorso_HoodSweatMTP_Tint1.png" ], "clItems": [ { @@ -863,9 +1035,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01; nonStandard", "text": "Long Sleeve T-Shirt - Mysterium 2021", "meshes": [ - "FHTorso_SMsh", - "FMTorso_SMsh", - "FLTorso_SMsh" + { + "name": "FHTorso_SMsh", + "page": "Female" + }, + { + "name": "FMTorso_SMsh", + "page": "Female" + }, + { + "name": "FLTorso_SMsh", + "page": "Female" + } ], "elements": [ { @@ -933,9 +1114,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01", "text": "Long Sleeve T-Shirt - GZ Pride", "meshes": [ - "FHTorso_SMsh", - "FMTorso_SMsh", - "FLTorso_SMsh" + { + "name": "FHTorso_SMsh", + "page": "Female" + }, + { + "name": "FMTorso_SMsh", + "page": "Female" + }, + { + "name": "FLTorso_SMsh", + "page": "Female" + } ], "elements": [ { @@ -1305,9 +1495,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01", "text": "Long Sleeve T-Shirt - Guild of Instructors", "meshes": [ - "FHTorso_SMsh", - "FMTorso_SMsh", - "FLTorso_SMsh" + { + "name": "FHTorso_SMsh", + "page": "Female" + }, + { + "name": "FMTorso_SMsh", + "page": "Female" + }, + { + "name": "FLTorso_SMsh", + "page": "Female" + } ], "elements": [ { @@ -1408,9 +1607,18 @@ "desc": "ColorLabel1=Shirt; ColorLabel2=Logo; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01; nonStandard;", "text": "Long Sleeve T-Shirt - The Cavern Today", "meshes": [ - "FHTorso_SMsh", - "FMTorso_SMsh", - "FLTorso_SMsh" + { + "name": "FHTorso_SMsh", + "page": "Female" + }, + { + "name": "FMTorso_SMsh", + "page": "Female" + }, + { + "name": "FLTorso_SMsh", + "page": "Female" + } ], "elements": [ { @@ -1460,6 +1668,116 @@ } } ] + }, + { + "name": "FHood_MTP", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Mystitech.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2= ; isLogoFor=02_FTorso12_01; GroupName=ShortSleeve; nonStandard;", + "text": "Mystitech Productions T-Shirt, logo by Larry LeDeay", + "meshes": [ + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_ShortSleeve_MTP_Base.png", + "8": "FTorso_ShortSleeve_MTP_Tint1.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] + }, + { + "name": "FHoodLS_MTP", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Mystitech.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2= ; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01; nonStandard;", + "text": "Mystitech Productions T-Shirt, logo by Larry LeDeay", + "meshes": [ + { + "name": "FHTorso_SMsh", + "page": "Female" + }, + { + "name": "FMTorso_SMsh", + "page": "Female" + }, + { + "name": "FLTorso_SMsh", + "page": "Female" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_LongSleeve_MTP_Base.png", + "8": "FTorso_LongSleeve_MTP_Tint1.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "ftorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "FHoodSweat_MTP", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Mystitech.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1= Sweatshirt ; ColorLabel2= ; isLogoFor=FTorso_Sweatshirt_Blank; GroupName=Hooded; nonStandard;", + "text": "Mystitech Productions Hoodie, logo by Larry LeDeay", + "meshes": [ + "FHTorso16_SMsh", + "FMTorso16_SMsh", + "FLTorso16_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_HoodSweatMTP_Base.png", + "8": "FTorso_HoodSweatMTP_Tint1.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "mtorso_hoodsweat01arm_base*0#0.hsm", + "8": "mtorso_hoodsweat01arm_tint1*0#0.hsm" + } + } + ] } ] } diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mystitech.png b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mystitech.png new file mode 100644 index 00000000..c3bbc40b --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mystitech.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32974139378e1dbb910318df7aa72520c9b81cb08bd3100c892a2cf6562995e9 +size 12766 diff --git a/sources/avatar/clothing_fan02/MTorso_HoodSweatMTP_Base.png b/sources/avatar/clothing_fan02/MTorso_HoodSweatMTP_Base.png new file mode 100644 index 00000000..2dc386dd --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_HoodSweatMTP_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8384476780d647ec4835692d05577b86bbe00ca99a260c75aab5d7f0169d1550 +size 177436 diff --git a/sources/avatar/clothing_fan02/MTorso_HoodSweatMTP_Tint1.png b/sources/avatar/clothing_fan02/MTorso_HoodSweatMTP_Tint1.png new file mode 100644 index 00000000..92145d92 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_HoodSweatMTP_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cccd08b48a5d3e3d701a1e26f2aa032ce3d74aac584ff8685a2538d5fc6f8aef +size 161198 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_MTP_Base.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_MTP_Base.png new file mode 100644 index 00000000..0f61ae8e --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_MTP_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f46c8b1ced079ea50b74f0e4aa822f66627a39410d75cce0eb8d1e73c416557 +size 109518 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_MTP_Tint1.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_MTP_Tint1.png new file mode 100644 index 00000000..4a2e7e26 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_MTP_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63981438f8d1af869a8d31b7483e261b06deb44bfef30c62bc2cf388f076d748 +size 53106 From 998dc5b0d836d4826081a80ff22a3c23e7f90ef1 Mon Sep 17 00:00:00 2001 From: Edmond Mondor Date: Tue, 20 Dec 2022 09:14:40 -0800 Subject: [PATCH 3/6] Add Swimtrunks by Calum Traveler and adjust Guild of Instructors Shirt texture Co-authored-by: Traveler263 <87665301+Traveler263@users.noreply.github.com> --- .../GlobalClothing_District_FemaleFan02.prp | 4 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- .../FLegs_Shorts_TransDye_Base.png | 3 + .../FTorso_xSleeve_GoInst_Tint1.png | 4 +- .../FTorso_xSleeve_GoInst_base.png | 4 +- sources/avatar/clothing_fan02/Fan02.json | 76 ++++++++++++++++++- .../Icon_FLegs_shortstrydye.png | 3 + .../Icon_MLegs_shortstrydye.png | 3 + .../MLegs_Shorts_TransDye_Base.png | 3 + .../MTorso_xSleeve_GoInst_Tint1.png | 4 +- .../MTorso_xSleeve_GoInst_base.png | 4 +- 11 files changed, 98 insertions(+), 14 deletions(-) create mode 100644 sources/avatar/clothing_fan02/FLegs_Shorts_TransDye_Base.png create mode 100644 sources/avatar/clothing_fan02/Icon_FLegs_shortstrydye.png create mode 100644 sources/avatar/clothing_fan02/Icon_MLegs_shortstrydye.png create mode 100644 sources/avatar/clothing_fan02/MLegs_Shorts_TransDye_Base.png diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index 3ce884c4..c15aec06 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:f89da7066e2c6bb860c36af297b7b348a2a32846306adf8fcaa4c02168d5ed95 -size 5915201 +oid sha256:8f5428e36def9c9e4dcab73ea7f61c87d5a6a5d772b20d08c2f842136ae1614d +size 6116088 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 8c2b0d7b..68a582cb 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:7c9d91f73ff2a95355a1b26b5c60ae8f2830e01f446f8c7185b3323a3578f3ad -size 5652963 +oid sha256:7e2fa1267bc5c368956cc87fa570bd22df15b693cfeb9e5d8485ec59ff44daa6 +size 5854705 diff --git a/sources/avatar/clothing_fan02/FLegs_Shorts_TransDye_Base.png b/sources/avatar/clothing_fan02/FLegs_Shorts_TransDye_Base.png new file mode 100644 index 00000000..80a043a4 --- /dev/null +++ b/sources/avatar/clothing_fan02/FLegs_Shorts_TransDye_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c16b6db3611de90ab983efea6aba6d763b015e742e3eebb5710418adef48cc13 +size 178130 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_Tint1.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_Tint1.png index 01794265..3f5191aa 100644 --- a/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_Tint1.png +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_Tint1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e691017d85e6d6f07108e2bc79e3155738b61996f5c9cb6b1b061dbba7b6241 -size 75330 +oid sha256:47364d760bee4096996a27dc835c62f97e26b4a836fa403e54a9cfb71874261a +size 84761 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_base.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_base.png index 0e55cd77..e64a98ef 100644 --- a/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_base.png +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5e2489243e21045ada62cfb53d34035e408f5b9df1744da7216c83f2bea560e -size 91374 +oid sha256:30341c5d4ed0dbe809396a12c5c1f4e67f61ccfe087b047bfbe2c3447194e052 +size 99850 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index 03dd474a..59e1a964 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -69,7 +69,10 @@ "MTorso_xSleeve_MTP_Base.png", "MTorso_xSleeve_MTP_Tint1.png", "MTorso_HoodSweatMTP_Base.png", - "MTorso_HoodSweatMTP_Tint1.png" + "MTorso_HoodSweatMTP_Tint1.png", + + "Icon_MLegs_shortstrydye.png", + "MLegs_Shorts_TransDye_Base.png" ], "clItems": [ { @@ -908,6 +911,39 @@ } } ] + }, + { + "name": "MLegs_Shorts_TransDye", + "type": "pants", + "group": "Male", + "icon": "Icon_MLegs_shortstrydye.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1 = ; ColorLabel2 = ; GroupName = Shorts; SinglePlayer ; isLogoFor = 02_MLegs01_01; nonStandard;", + "text": "Swimtrunks", + "meshes": [ + { + "name": "MHLegs01_SMsh", + "page": "Male01" + }, + { + "name": "MMLegs01_SMsh", + "page": "Male01" + }, + { + "name": "MLLegs_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Legs", + "layers": { + "0": "MLegs_Shorts_TransDye_Base.png", + "1": "mlegs_shorts01_skin*0#0.hsm" + } + } + ] } ] }, @@ -982,7 +1018,10 @@ "FTorso_LongSleeve_MTP_Base.png", "FTorso_LongSleeve_MTP_Tint1.png", "FTorso_HoodSweatMTP_Base.png", - "FTorso_HoodSweatMTP_Tint1.png" + "FTorso_HoodSweatMTP_Tint1.png", + + "Icon_FLegs_shortstrydye.png", + "FLegs_Shorts_TransDye_Base.png" ], "clItems": [ { @@ -1778,6 +1817,39 @@ } } ] + }, + { + "name": "FLegs_Shorts_TransDye", + "type": "pants", + "group": "Female", + "icon": "Icon_FLegs_shortstrydye.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1 = ; ColorLabel2 = ; GroupName = Shorts01; SinglePlayer; isLogoFor=02_FLegs01_02; nonStandard;", + "text": "Swimtrunks", + "meshes": [ + { + "name": "FHLegs01_SMsh", + "page": "Female01" + }, + { + "name": "FMShorts_SMsh", + "page": "Female01" + }, + { + "name": "FLLegs_SMsh", + "page": "Female01" + } + ], + "elements": [ + { + "name": "Legs", + "layers": { + "0": "FLegs_Shorts_TransDye_Base.png", + "1": "flegsshorts01_skin*0#0.hsm" + } + } + ] } ] } diff --git a/sources/avatar/clothing_fan02/Icon_FLegs_shortstrydye.png b/sources/avatar/clothing_fan02/Icon_FLegs_shortstrydye.png new file mode 100644 index 00000000..12168a05 --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_FLegs_shortstrydye.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53f55e252f054ac13ea19f977e488a847874d00d0163f6dd2821002636c81d57 +size 25243 diff --git a/sources/avatar/clothing_fan02/Icon_MLegs_shortstrydye.png b/sources/avatar/clothing_fan02/Icon_MLegs_shortstrydye.png new file mode 100644 index 00000000..b2a7b533 --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_MLegs_shortstrydye.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3921b6023fe15d04e10828df00ee04c90acf5f8318e4270fe6fe4067c9efdc0 +size 26016 diff --git a/sources/avatar/clothing_fan02/MLegs_Shorts_TransDye_Base.png b/sources/avatar/clothing_fan02/MLegs_Shorts_TransDye_Base.png new file mode 100644 index 00000000..077483fe --- /dev/null +++ b/sources/avatar/clothing_fan02/MLegs_Shorts_TransDye_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f436c81a65b18327c162161f6dfdfd34bb5817ba54584eec074ec83202917d6 +size 198253 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_Tint1.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_Tint1.png index a32e98f6..172f7177 100644 --- a/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_Tint1.png +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_Tint1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:befbd56714f7d68d683f7c7ea7cdfe9f495a2972f5a0f7081e1895294390a189 -size 73941 +oid sha256:1e3aef0ae33d135264d47a8ea8ea680e6f02c717427f20d1b8e1f05e6e7a7ed7 +size 82266 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_base.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_base.png index 627b2104..b093eb13 100644 --- a/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_base.png +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b63abd414ec017375214d3349a99ea93502bc92ab4810979631a7021f21a98e -size 88705 +oid sha256:981eee071f2593495a9783b9064c3daec7af0765a0b74adcdd372d796bfe0958 +size 95724 From 0a3c9c1297efac4e93d09293167074e38a99994d Mon Sep 17 00:00:00 2001 From: Edmond Mondor Date: Wed, 21 Dec 2022 13:58:52 -0800 Subject: [PATCH 4/6] Fix Male TCT shirt and MTP LS Shirt description text --- compiled/dat/GlobalClothing_District_FemaleFan02.prp | 4 ++-- compiled/dat/GlobalClothing_District_MaleFan02.prp | 4 ++-- sources/avatar/clothing_fan02/Fan02.json | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index c15aec06..fb4430a3 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:8f5428e36def9c9e4dcab73ea7f61c87d5a6a5d772b20d08c2f842136ae1614d -size 6116088 +oid sha256:4bb0741bd61d5bff10e4f4dc69e69612767c741daebfd3153a277e2502271f05 +size 6116100 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 68a582cb..61f66afb 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:7e2fa1267bc5c368956cc87fa570bd22df15b693cfeb9e5d8485ec59ff44daa6 -size 5854705 +oid sha256:dc19a2775bd1125bce43b84c98b3f3fcbc84fdb668ea571fed00fadbbac6f7e4 +size 5854713 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index 59e1a964..37be638a 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -721,7 +721,7 @@ "tint1": [0.067, 0.067, 0.067], "tint2": [0.671, 0.655, 0.506], "desc": "ColorLabel1=Shirt; ColorLabel2=Logo; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01; nonStandard;", - "text": "Long Sleeve T-Shirt - Guild of Instructors", + "text": "Long Sleeve T-Shirt - The Cavern Today", "meshes": [ { "name": "MHTorso_SMsh", @@ -841,7 +841,7 @@ "tint1": [1, 1, 1], "tint2": [1, 1, 1], "desc": "ColorLabel1=Shirt; ColorLabel2= ; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01; nonStandard;", - "text": "Mystitech Productions T-Shirt, logo by Larry LeDeay", + "text": "Mystitech Productions Long Sleeve T-Shirt, logo by Larry LeDeay", "meshes": [ { "name": "MHTorso_SMsh", @@ -1756,7 +1756,7 @@ "tint1": [1, 1, 1], "tint2": [1, 1, 1], "desc": "ColorLabel1=Shirt; ColorLabel2= ; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01; nonStandard;", - "text": "Mystitech Productions T-Shirt, logo by Larry LeDeay", + "text": "Mystitech Productions Long Sleeve T-Shirt, logo by Larry LeDeay", "meshes": [ { "name": "FHTorso_SMsh", From 4491582974f57393a128bae97df5fb9c976b819f Mon Sep 17 00:00:00 2001 From: Edmond Mondor Date: Thu, 2 Feb 2023 16:01:19 -0800 Subject: [PATCH 5/6] Add Mysterium 2023 SS shirt and Kalamee Shirt --- .../GlobalClothing_District_FemaleFan02.prp | 4 +- ...lobalClothing_District_FemaleMysterium.prp | 4 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- .../GlobalClothing_District_MaleMysterium.prp | 4 +- .../FTorso_ShortSleeve_Kalamee_Base.png | 3 + .../FTorso_ShortSleeve_Kalamee_Tint1.png | 3 + sources/avatar/clothing_fan02/Fan02.json | 93 +++++++++++++++++- .../Icon_UTorso_Shirt_Kalamee.png | 3 + .../MTorso_ShortSleeve_Kalamee_Base.png | 3 + .../MTorso_ShortSleeve_Kalamee_Tint1.png | 3 + .../FTorso_ShortSleeve_Mysterium2023_Base.png | 3 + ...FTorso_ShortSleeve_Mysterium2023_Tint1.png | 3 + ...FTorso_ShortSleeve_Mysterium2023_Tint2.png | 3 + .../clothing_mysterium/FemaleSSMysterium.xcf | 4 +- .../Icon_UTorso_Shirt_Mysterium2023.png | 3 + .../MTorso_ShortSleeve_Mysterium2023_Base.png | 3 + ...MTorso_ShortSleeve_Mysterium2023_Tint1.png | 3 + ...MTorso_ShortSleeve_Mysterium2023_Tint2.png | 3 + .../clothing_mysterium/MaleSSMysterium.xcf | 4 +- .../2023 MOULA shirt Female.png | 3 + .../2023 MOULA shirt Male.png | 3 + .../avatar/clothing_mysterium/mysterium.json | 95 ++++++++++++++++++- 22 files changed, 238 insertions(+), 16 deletions(-) create mode 100644 sources/avatar/clothing_fan02/FTorso_ShortSleeve_Kalamee_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_ShortSleeve_Kalamee_Tint1.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Kalamee.png create mode 100644 sources/avatar/clothing_fan02/MTorso_ShortSleeve_Kalamee_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_ShortSleeve_Kalamee_Tint1.png create mode 100644 sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Base.png create mode 100644 sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Tint1.png create mode 100644 sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Tint2.png create mode 100644 sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2023.png create mode 100644 sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Base.png create mode 100644 sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Tint1.png create mode 100644 sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Tint2.png create mode 100644 sources/avatar/clothing_mysterium/Mysterium Shirts/2023 MOULA shirt Female.png create mode 100644 sources/avatar/clothing_mysterium/Mysterium Shirts/2023 MOULA shirt Male.png diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index fb4430a3..b40ab805 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:4bb0741bd61d5bff10e4f4dc69e69612767c741daebfd3153a277e2502271f05 -size 6116100 +oid sha256:9d8d5384e4168f73d11d29c783d5cfd9b5ce8bfe4242c95066bf05568a44767d +size 6398518 diff --git a/compiled/dat/GlobalClothing_District_FemaleMysterium.prp b/compiled/dat/GlobalClothing_District_FemaleMysterium.prp index 087681b4..8ee3cb71 100644 --- a/compiled/dat/GlobalClothing_District_FemaleMysterium.prp +++ b/compiled/dat/GlobalClothing_District_FemaleMysterium.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72bdaf5a3c5636e92ef48f23be7850623bb667498668e87ab88289194f48ddfa -size 7624728 +oid sha256:d723f8d7539c41d8fbcf8f19f5f43d304055e854b66090fc9efc1e6f04a80e3d +size 8066123 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 61f66afb..f872e594 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:dc19a2775bd1125bce43b84c98b3f3fcbc84fdb668ea571fed00fadbbac6f7e4 -size 5854713 +oid sha256:85d93b84293fa4351c9f2304b4b09b89d1bf122a7dfa09b96ac3c8473ff26c06 +size 6137191 diff --git a/compiled/dat/GlobalClothing_District_MaleMysterium.prp b/compiled/dat/GlobalClothing_District_MaleMysterium.prp index 6fd32899..9763b464 100644 --- a/compiled/dat/GlobalClothing_District_MaleMysterium.prp +++ b/compiled/dat/GlobalClothing_District_MaleMysterium.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad2433d476bed6475a519d63178dadefcd30dc9f69aa7b2c3ae2bd56aca2e445 -size 7626342 +oid sha256:3ef3ee672999de2df55506975bb9e23b2b1fe25022eb166ad8d2018fa5844c92 +size 8067797 diff --git a/sources/avatar/clothing_fan02/FTorso_ShortSleeve_Kalamee_Base.png b/sources/avatar/clothing_fan02/FTorso_ShortSleeve_Kalamee_Base.png new file mode 100644 index 00000000..60612f4c --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_ShortSleeve_Kalamee_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8a4a0e04e68f305d16d0a93088b4875b10d77e06b4579b4b61917c86fa8c11c +size 121606 diff --git a/sources/avatar/clothing_fan02/FTorso_ShortSleeve_Kalamee_Tint1.png b/sources/avatar/clothing_fan02/FTorso_ShortSleeve_Kalamee_Tint1.png new file mode 100644 index 00000000..46fb5e9f --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_ShortSleeve_Kalamee_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3aed5319db8c5a10810f24874a14ca7216ad7e824e6c49021ac35699b53e9e1 +size 114111 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index 37be638a..7eafcee1 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -72,7 +72,11 @@ "MTorso_HoodSweatMTP_Tint1.png", "Icon_MLegs_shortstrydye.png", - "MLegs_Shorts_TransDye_Base.png" + "MLegs_Shorts_TransDye_Base.png", + + "Icon_UTorso_Shirt_Kalamee.png", + "MTorso_ShortSleeve_Kalamee_Base.png", + "MTorso_ShortSleeve_Kalamee_Tint1.png" ], "clItems": [ { @@ -944,6 +948,47 @@ } } ] + }, + { + "name": "MTorso_ShortSleeve_Kalamee", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Kalamee.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; nonStandard;", + "text": "Short Sleeve T-Shirt - Kalamee", + "meshes": [ + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_ShortSleeve_Kalamee_Base.png", + "8": "MTorso_ShortSleeve_Kalamee_Tint1.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" + } + } + ] } ] }, @@ -1021,7 +1066,11 @@ "FTorso_HoodSweatMTP_Tint1.png", "Icon_FLegs_shortstrydye.png", - "FLegs_Shorts_TransDye_Base.png" + "FLegs_Shorts_TransDye_Base.png", + + "Icon_UTorso_Shirt_Kalamee.png", + "FTorso_ShortSleeve_Kalamee_Base.png", + "FTorso_ShortSleeve_Kalamee_Tint1.png" ], "clItems": [ { @@ -1850,6 +1899,46 @@ } } ] + }, + { + "name": "FTorso_ShortSleeve_Kalamee", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Kalamee.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; nonStandard;", + "text": "Short Sleeve T-Shirt - Kalamee", + "meshes": [ + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_ShortSleeve_Kalamee_Base.png", + "8": "FTorso_ShortSleeve_Kalamee_Tint1.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_Kalamee.png b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Kalamee.png new file mode 100644 index 00000000..978afd4e --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Kalamee.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbe7914a1959865f2ed9cdcf47c3326ab588b5115c71ea6e150d98ecd59f4bbf +size 34106 diff --git a/sources/avatar/clothing_fan02/MTorso_ShortSleeve_Kalamee_Base.png b/sources/avatar/clothing_fan02/MTorso_ShortSleeve_Kalamee_Base.png new file mode 100644 index 00000000..de03c04c --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_ShortSleeve_Kalamee_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da7f37a2f762943164fcb04b1f9d08ad584966b417537e05025c783a085ff259 +size 97676 diff --git a/sources/avatar/clothing_fan02/MTorso_ShortSleeve_Kalamee_Tint1.png b/sources/avatar/clothing_fan02/MTorso_ShortSleeve_Kalamee_Tint1.png new file mode 100644 index 00000000..b179596d --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_ShortSleeve_Kalamee_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6bf48f7488b1e452e78caeb9b8e2e17ed0ae45d851f7598ddd6bf304ce1b337 +size 89006 diff --git a/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Base.png b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Base.png new file mode 100644 index 00000000..53efa978 --- /dev/null +++ b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77978e7076476d8b2ab074b3417a2e6f8b710233be400afba5ea96c5e1fa3fdc +size 101164 diff --git a/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Tint1.png b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Tint1.png new file mode 100644 index 00000000..97439c4d --- /dev/null +++ b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9ea1f7d2d5205b3cc56942d476ff3d85f5be14602a4ca62ddb0f033a7d595b3 +size 77973 diff --git a/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Tint2.png b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Tint2.png new file mode 100644 index 00000000..02155007 --- /dev/null +++ b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2023_Tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68cd016b48d064af5fa80ef138ac75448a6883de2fc25204b78f83e0ec0590b0 +size 3158 diff --git a/sources/avatar/clothing_mysterium/FemaleSSMysterium.xcf b/sources/avatar/clothing_mysterium/FemaleSSMysterium.xcf index a9f7498e..53a485ae 100644 --- a/sources/avatar/clothing_mysterium/FemaleSSMysterium.xcf +++ b/sources/avatar/clothing_mysterium/FemaleSSMysterium.xcf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:908cb251d11d40a2ee3f16f3eb6908e89db49a403a3f7d1ade8873d37603ac41 -size 4814716 +oid sha256:b31e5c74679adf0f84a20be9a4d253e7f9dc7e3618eb05880cf854e820ef9cb4 +size 4861229 diff --git a/sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2023.png b/sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2023.png new file mode 100644 index 00000000..7532fe74 --- /dev/null +++ b/sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2023.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b243d6322a64b3257c90e9eade4a473335d61e62ec2f06f772eaaa1cec158c9b +size 8479 diff --git a/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Base.png b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Base.png new file mode 100644 index 00000000..f335edf0 --- /dev/null +++ b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d725be8038efccc694d18ac7ed348e85387041b23a7b5e79825444e46ef37b3 +size 99116 diff --git a/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Tint1.png b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Tint1.png new file mode 100644 index 00000000..9dc30617 --- /dev/null +++ b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:752fe07d6e92bfc8190697c1ba23b3090ddacc9df722945ad474fe0f57379b96 +size 76321 diff --git a/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Tint2.png b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Tint2.png new file mode 100644 index 00000000..129f7d7c --- /dev/null +++ b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2023_Tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c671f9b5a28919db0130713afa2960c8e9496642a99d78b2e1479afc175e851b +size 3159 diff --git a/sources/avatar/clothing_mysterium/MaleSSMysterium.xcf b/sources/avatar/clothing_mysterium/MaleSSMysterium.xcf index b97e8032..d66fc191 100644 --- a/sources/avatar/clothing_mysterium/MaleSSMysterium.xcf +++ b/sources/avatar/clothing_mysterium/MaleSSMysterium.xcf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3df90e6a6c493813bf5416f82eb391e3bd5209ab4105d8f9a29d845b1078bf29 -size 3639581 +oid sha256:b585a2a872233cda29fc6b605756d8d9b2865605de5170ef8980101e6bd366aa +size 3736257 diff --git a/sources/avatar/clothing_mysterium/Mysterium Shirts/2023 MOULA shirt Female.png b/sources/avatar/clothing_mysterium/Mysterium Shirts/2023 MOULA shirt Female.png new file mode 100644 index 00000000..e02bd4be --- /dev/null +++ b/sources/avatar/clothing_mysterium/Mysterium Shirts/2023 MOULA shirt Female.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39f5c2de73e8c79fbc725ba4e2f2cd10ec5bd99b72fb8b269abb61146e0ab7ef +size 47235 diff --git a/sources/avatar/clothing_mysterium/Mysterium Shirts/2023 MOULA shirt Male.png b/sources/avatar/clothing_mysterium/Mysterium Shirts/2023 MOULA shirt Male.png new file mode 100644 index 00000000..4d993bd6 --- /dev/null +++ b/sources/avatar/clothing_mysterium/Mysterium Shirts/2023 MOULA shirt Male.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3f6566f32103b63faae696db9cc64a6f92c8ad5401773fb824676461f615415 +size 47251 diff --git a/sources/avatar/clothing_mysterium/mysterium.json b/sources/avatar/clothing_mysterium/mysterium.json index 5e2ef86e..5ecb8b5c 100644 --- a/sources/avatar/clothing_mysterium/mysterium.json +++ b/sources/avatar/clothing_mysterium/mysterium.json @@ -89,7 +89,11 @@ "MTorso_ShortSleeve_Mysterium2020_Tint1.png", "Icon_UTorso_Shirt_Mysterium2022.png", "MTorso_ShortSleeve_Mysterium2022_Base.png", - "MTorso_ShortSleeve_Mysterium2022_Tint1.png" + "MTorso_ShortSleeve_Mysterium2022_Tint1.png", + "Icon_UTorso_Shirt_Mysterium2023.png", + "MTorso_ShortSleeve_Mysterium2023_Base.png", + "MTorso_ShortSleeve_Mysterium2023_Tint1.png", + "MTorso_ShortSleeve_Mysterium2023_Tint2.png" ], "clItems": [ { @@ -1212,6 +1216,48 @@ } } ] + }, + { + "name": "MReward_SSMysterium2023", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Mysterium2023.png", + "tint1": [0, 0, 0], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2=Back Logo; isLogoFor=MReward_SSMysterium2000; GroupName = Mysterium; nonStandard", + "text": "Mysterium 2023 T-Shirt", + "meshes": [ + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_ShortSleeve_Mysterium2023_Base.png", + "8": "MTorso_ShortSleeve_Mysterium2023_Tint1.png", + "9": "MTorso_ShortSleeve_Mysterium2023_Tint2.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" + } + } + ] } ] }, @@ -1304,7 +1350,11 @@ "FTorso_ShortSleeve_Mysterium2020_Tint1.png", "Icon_UTorso_Shirt_Mysterium2022.png", "FTorso_ShortSleeve_Mysterium2022_Base.png", - "FTorso_ShortSleeve_Mysterium2022_Tint1.png" + "FTorso_ShortSleeve_Mysterium2022_Tint1.png", + "Icon_UTorso_Shirt_Mysterium2023.png", + "FTorso_ShortSleeve_Mysterium2023_Base.png", + "FTorso_ShortSleeve_Mysterium2023_Tint1.png", + "FTorso_ShortSleeve_Mysterium2023_Tint2.png" ], "clItems": [ { @@ -2400,6 +2450,47 @@ } } ] + }, + { + "name": "FReward_SSMysterium2023", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Mysterium2023.png", + "tint1": [0, 0, 0], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2=Back Logo; isLogoFor=FReward_SSMysterium2000; GroupName = Mysterium; nonStandard", + "text": "Mysterium 2023 T-Shirt", + "meshes": [ + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_ShortSleeve_Mysterium2023_Base.png", + "8": "FTorso_ShortSleeve_Mysterium2023_Tint1.png", + "9": "FTorso_ShortSleeve_Mysterium2023_Tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] } ] } From 68bcda7cc0a5a619d3b27ffa89c7834654aa97f8 Mon Sep 17 00:00:00 2001 From: Edmond Mondor Date: Tue, 21 Feb 2023 08:25:48 -0800 Subject: [PATCH 6/6] Resave in PRPshop due to fd80114 --- compiled/dat/GlobalClothing_District_FemaleFan02.prp | 2 +- compiled/dat/GlobalClothing_District_MaleFan02.prp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index b40ab805..584b635a 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:9d8d5384e4168f73d11d29c783d5cfd9b5ce8bfe4242c95066bf05568a44767d +oid sha256:2b413c4977c0395b93dcec581e3a10daf9c8437fb02e63254aa970a909b58d9b size 6398518 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index f872e594..840a9724 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:85d93b84293fa4351c9f2304b4b09b89d1bf122a7dfa09b96ac3c8473ff26c06 +oid sha256:c1996a2a15c7305b7400e49f2f19c9f7f2419598c0dcca9d30946e5f27b71c16 size 6137191