From 998dc5b0d836d4826081a80ff22a3c23e7f90ef1 Mon Sep 17 00:00:00 2001 From: Edmond Mondor Date: Tue, 20 Dec 2022 09:14:40 -0800 Subject: [PATCH] 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