From f517968b000c051681d26af7342aa683095f70a9 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 4 Jun 2021 23:56:18 -0400 Subject: [PATCH 1/9] Add Mysterium 2021 T-Shirt sources and PRPs. These PRPs are generated from the JSON source by the script CreateClothingPRP.py, originally by @Deledrius. The specific fork used to generate these files can be found at https://github.com/Hoikas/moul-utils. --- .../GlobalClothing_District_FemaleFan02.prp | 3 + .../dat/GlobalClothing_District_MaleFan02.prp | 3 + .../FTorso_xSleeve_Mysterium2021.xcf | 3 + .../FTorso_xSleeve_Mysterium2021_Base.png | 3 + .../FTorso_xSleeve_Mysterium2021_Tint.png | 3 + sources/avatar/clothing_fan02/Fan02.json | 153 ++++++++++++++++++ .../Icon_UTorso_Shirt_Mysterium2021.png | 3 + .../Icon_UTorso_Shirt_Mysterium2021.xcf | 3 + .../MTorso_xSleeve_Mysterium2021.xcf | 3 + .../MTorso_xSleeve_Mysterium2021_Base.png | 3 + .../MTorso_xSleeve_Mysterium2021_Tint.png | 3 + 11 files changed, 183 insertions(+) create mode 100644 compiled/dat/GlobalClothing_District_FemaleFan02.prp create mode 100644 compiled/dat/GlobalClothing_District_MaleFan02.prp create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png create mode 100644 sources/avatar/clothing_fan02/Fan02.json create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mysterium2021.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mysterium2021.xcf create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021.xcf create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021_Tint.png diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp new file mode 100644 index 00000000..557a931e --- /dev/null +++ b/compiled/dat/GlobalClothing_District_FemaleFan02.prp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16f9dab198787b2882888753b8d898c9e51678add3480c821aedc5722fb572a0 +size 275130 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp new file mode 100644 index 00000000..7c5c162a --- /dev/null +++ b/compiled/dat/GlobalClothing_District_MaleFan02.prp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c22cc095e4f52b787dfa53677e913a01dcb0b536962aef8f54dc41b5ffe8eb4 +size 275184 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf new file mode 100644 index 00000000..c835b2ef --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61cb492f4b8b6c1ea1905914b6a503a5017bcf7d19e6e07bef306850fc7115bb +size 644742 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png new file mode 100644 index 00000000..72809f43 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12b28b8e250e70d4de727ffd6488f8abe557be9379e64eb969d971ddd3a0e129 +size 92243 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png new file mode 100644 index 00000000..2f1c3e35 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cd650ddd45fa0f5319990a0777e0e58ce2ef6147c4e7759613610728b3dbc1e +size 84909 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json new file mode 100644 index 00000000..e653e35e --- /dev/null +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -0,0 +1,153 @@ +{ + "pages": [ + { + "prefix": -5, + "suffix": 12, + "agename": "GlobalClothing", + "name": "MaleFan02", + "mipmaps": [ + "Icon_UTorso_Shirt_Mysterium2021.png", + "MTorso_xSleeve_Mysterium2021_Base.png", + "MTorso_xSleeve_Mysterium2021_Tint.png" + ], + "clItems": [ + { + "name": "MReward_ShortSleeve_Mysterium2021", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Mysterium2021.png", + "tint1": [0.2863, 0.2863, 0.2863], + "tint2": [0.2863, 0.2863, 0.2863], + "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" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_Mysterium2021_Base.png", + "8": "MTorso_xSleeve_Mysterium2021_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": "MReward_LongSleeve_Mysterium2021", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Mysterium2021.png", + "tint1": [0.2863, 0.2863, 0.2863], + "tint2": [0.2863, 0.2863, 0.2863], + "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" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_Mysterium2021_Base.png", + "8": "MTorso_xSleeve_Mysterium2021_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "mtorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] + } + ] + }, + { + "prefix": -5, + "suffix": 11, + "agename": "GlobalClothing", + "name": "FemaleFan02", + "mipmaps": [ + "Icon_UTorso_Shirt_Mysterium2021.png", + "FTorso_xSleeve_Mysterium2021_Base.png", + "FTorso_xSleeve_Mysterium2021_Tint.png" + ], + "clItems": [ + { + "name": "FReward_ShortSleeve_Mysterium2021", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Mysterium2021.png", + "tint1": [0.2863, 0.2863, 0.2863], + "tint2": [0.2863, 0.2863, 0.2863], + "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" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_xSleeve_Mysterium2021_Base.png", + "8": "FTorso_xSleeve_Mysterium2021_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] + }, + { + "name": "FReward_LongSleeve_Mysterium2021", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Mysterium2021.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; nonStandard", + "text": "Long Sleeve T-Shirt - Mysterium 2021", + "meshes": [ + "FHTorso_SMsh", + "FMTorso_SMsh", + "FLTorso_SMsh" + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_xSleeve_Mysterium2021_Base.png", + "8": "FTorso_xSleeve_Mysterium2021_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "ftorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] + } + ] + } + ] +} diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mysterium2021.png b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mysterium2021.png new file mode 100644 index 00000000..ea7c4f93 --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mysterium2021.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c481300cbd70b4ee6ce072b6ef24ba73005c9b27f1422ffe1eada5abe45ad34b +size 14839 diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mysterium2021.xcf b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mysterium2021.xcf new file mode 100644 index 00000000..8b504dc8 --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Mysterium2021.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:561a3353ca387da135545df0d34e3377677f8fcf0f366533f64af65cb17ad193 +size 325105 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021.xcf b/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021.xcf new file mode 100644 index 00000000..2f88f9ef --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b3e33522150683771280c1ae508fdada49a45a57b12d5148916d0abf8baa408 +size 569397 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021_Base.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021_Base.png new file mode 100644 index 00000000..fe26e670 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a8791acec357ee2f48dd5b876db57d8bf9a66f3251c37adbe85f9fbb16d52ff +size 89893 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021_Tint.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021_Tint.png new file mode 100644 index 00000000..720f6327 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_Mysterium2021_Tint.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c477285b3a62acccf050dcc8aaa0e02c07bfa7a79204238a2952bd380425c209 +size 81871 From 8f0f1cdbede59c77731a23ea89d7cc20dbd9eaca Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sat, 5 Jun 2021 18:33:31 -0400 Subject: [PATCH 2/9] Add Gay Zero shirt sources. --- sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Base.png | 3 +++ sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Tint.png | 3 +++ sources/avatar/clothing_fan02/Icon_UTorso_Shirt_GayZero.png | 3 +++ sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Base.png | 3 +++ sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Tint.png | 3 +++ sources/avatar/clothing_fan02/UTorso_xSleeve_GayZero.xcf | 3 +++ 6 files changed, 18 insertions(+) create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Tint.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Shirt_GayZero.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Tint.png create mode 100644 sources/avatar/clothing_fan02/UTorso_xSleeve_GayZero.xcf diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Base.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Base.png new file mode 100644 index 00000000..9566759e --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0f9adab3d21c55f6a374c84c36c577f072070366010ce298c65349f8ac1e852 +size 77971 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Tint.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Tint.png new file mode 100644 index 00000000..fa745673 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_GayZero_Tint.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24b8fd32b8a4e7465483347aecd75d54fbdfe40fee40288a12d624e4613dc084 +size 77042 diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_GayZero.png b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_GayZero.png new file mode 100644 index 00000000..825a64fa --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_GayZero.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:434fdd3fafbe1a0c27985b5dee292198a78bd8b161e3d707ab0cb57c4e3a290b +size 15692 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Base.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Base.png new file mode 100644 index 00000000..6e35089f --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3ff0fd62422c61717269ee2b19ce2d6604c806dc74de49993b884ea0bdd5a8a +size 77294 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Tint.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Tint.png new file mode 100644 index 00000000..3418ec15 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_GayZero_Tint.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42580902d049f663554bc59f030aad90a92db7b31d6ca7c24ac372b5759903ef +size 76866 diff --git a/sources/avatar/clothing_fan02/UTorso_xSleeve_GayZero.xcf b/sources/avatar/clothing_fan02/UTorso_xSleeve_GayZero.xcf new file mode 100644 index 00000000..3b3df642 --- /dev/null +++ b/sources/avatar/clothing_fan02/UTorso_xSleeve_GayZero.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b07e9cfdd1eb27d9955dfac401a3a2737aa02a8aabd8fe630b7f9606cfe4c2a +size 1464573 From 23b65e3cfd7e450442080baa3ecadf19496d8470 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 5 Jun 2021 18:35:39 -0400 Subject: [PATCH 3/9] 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" + } + } + ] } ] } From e25be22ad013583c11a41babefae0064fa513b10 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 23 Jun 2021 01:24:40 -0400 Subject: [PATCH 4/9] Shorten the names of Mysterium rewards. I seem to have forgotten that SDL `STRING32` variables have a fixed length of 32 bytes. Sigh. So we must limit our names to this. Therefore, I have renamed the shirts to "LSMysterium2021" and "SSMysterium2021". The SDL string "LSMysterium2021;SSMysterium2021" will use up the entirety of the 32 byte string buffer. --- compiled/dat/GlobalClothing_District_FemaleFan02.prp | 4 ++-- compiled/dat/GlobalClothing_District_MaleFan02.prp | 4 ++-- sources/avatar/clothing_fan02/Fan02.json | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index 6396d3b7..3a16ea51 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:5efee991c8b3d831765163dafca80524d2a0f60e60e644deaebd1d07315a6da1 -size 549889 +oid sha256:c63f745646c1d762cc6b1be15bceb8a41998974cd1f001dce6e513e1694655fa +size 549813 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 27cf35fc..a63a7d4f 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:d1953c008315ad62ccd3f605da6386aab280f0e2c1b18c78a6c6727579194d92 -size 550003 +oid sha256:34e72a50422f1643867b6a9cf949bf66c99856f05262e1b91d59492129d9d1ad +size 549927 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index b6aaf472..9e8bb65b 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -16,7 +16,7 @@ ], "clItems": [ { - "name": "MReward_ShortSleeve_Mysterium2021", + "name": "MReward_SSMysterium2021", "type": "Shirt", "group": "Male", "icon": "Icon_UTorso_Shirt_Mysterium2021.png", @@ -48,7 +48,7 @@ ] }, { - "name": "MReward_LongSleeve_Mysterium2021", + "name": "MReward_LSMysterium2021", "type": "Shirt", "group": "Male", "icon": "Icon_UTorso_Shirt_Mysterium2021.png", @@ -157,7 +157,7 @@ ], "clItems": [ { - "name": "FReward_ShortSleeve_Mysterium2021", + "name": "FReward_SSMysterium2021", "type": "Shirt", "group": "Female", "icon": "Icon_UTorso_Shirt_Mysterium2021.png", @@ -188,7 +188,7 @@ ] }, { - "name": "FReward_LongSleeve_Mysterium2021", + "name": "FReward_LSMysterium2021", "type": "Shirt", "group": "Female", "icon": "Icon_UTorso_Shirt_Mysterium2021.png", From 4fd458f99ea7e03f05a82024ff7049fbe1d5f9d5 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 23 Jun 2021 13:14:00 -0400 Subject: [PATCH 5/9] Fix Mysterium female LS positioning. --- compiled/dat/GlobalClothing_District_FemaleFan02.prp | 2 +- .../avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf | 4 ++-- .../clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png | 4 ++-- .../clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index 3a16ea51..e509c2d3 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:c63f745646c1d762cc6b1be15bceb8a41998974cd1f001dce6e513e1694655fa +oid sha256:40e02a373a9c1ba7b7035be8af21e46362292a8aed25d28d8cbd36301e6f0fc6 size 549813 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf index c835b2ef..462b5d65 100644 --- a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021.xcf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61cb492f4b8b6c1ea1905914b6a503a5017bcf7d19e6e07bef306850fc7115bb -size 644742 +oid sha256:4eeb9acb00262416e66315bbbf6aec55edd8c246b90810560a392175fd04c29d +size 644748 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png index 72809f43..cc598637 100644 --- a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Base.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12b28b8e250e70d4de727ffd6488f8abe557be9379e64eb969d971ddd3a0e129 -size 92243 +oid sha256:e7e28fd11b5723b73060e668b9fc6240cc5502d8a253159cb1724390a0d08907 +size 92612 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png index 2f1c3e35..21812b33 100644 --- a/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_Mysterium2021_Tint.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cd650ddd45fa0f5319990a0777e0e58ce2ef6147c4e7759613610728b3dbc1e -size 84909 +oid sha256:29da088a6ea68a142d940f5e234ed81f456f93682e92be82c2afcfdfa679304a +size 85349 From 6a54ce87b717182c781dfb2c68d38156272f983c Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 25 Jun 2021 21:14:36 -0400 Subject: [PATCH 6/9] Correct Fan02 clothing icon/texture quality bug. This is just a re-convert with a patch to CreateClothingPRP.py that ensures icons only have one level. If there are multiple levels, changing the texture quality will cause certain assumptions in the ACA python to be invalidated, resulting in junked UI. --- compiled/dat/GlobalClothing_District_FemaleFan02.prp | 4 ++-- compiled/dat/GlobalClothing_District_MaleFan02.prp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index e509c2d3..d49fac15 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:40e02a373a9c1ba7b7035be8af21e46362292a8aed25d28d8cbd36301e6f0fc6 -size 549813 +oid sha256:fe7d44160342870cfee086e7d2e375cc4faf3a8b2a90142ff53ef8f87dd300c8 +size 558554 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index a63a7d4f..89f91cbf 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:34e72a50422f1643867b6a9cf949bf66c99856f05262e1b91d59492129d9d1ad -size 549927 +oid sha256:635bd2f17b4322f1058349928cf4829aa364d1881e7bcf738d6ceb87218d5487 +size 558668 From 0238a41d75828991ba4cbf5481a8c7fdc6c349a5 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 26 Jun 2021 06:23:00 -0400 Subject: [PATCH 7/9] Roll icons back to DXT compression (one level). --- compiled/dat/GlobalClothing_District_FemaleFan02.prp | 4 ++-- compiled/dat/GlobalClothing_District_MaleFan02.prp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index d49fac15..3e23150d 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:fe7d44160342870cfee086e7d2e375cc4faf3a8b2a90142ff53ef8f87dd300c8 -size 558554 +oid sha256:fb0eeaac17cabbeffb3cf30891d7937b4b43819231028f0fd91b4d0d3ef7649d +size 544317 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 89f91cbf..e80d6982 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:635bd2f17b4322f1058349928cf4829aa364d1881e7bcf738d6ceb87218d5487 -size 558668 +oid sha256:5c26fb32eb963179b828476b83e2aa6e901b360d8bc748d6e2d64a34ce742b6b +size 544431 From 2acf09c31f18724703e3cf4a97a63abda9c393c3 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sun, 27 Jun 2021 13:26:12 -0400 Subject: [PATCH 8/9] Change sortOrder to prevent default-clothing stomping. --- 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 3e23150d..1b35faa0 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:fb0eeaac17cabbeffb3cf30891d7937b4b43819231028f0fd91b4d0d3ef7649d +oid sha256:71d2685849c4cd092a68ddb91a7263acd1e2ebf745a5d7da50959b9a5b960a63 size 544317 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index e80d6982..16b29832 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:5c26fb32eb963179b828476b83e2aa6e901b360d8bc748d6e2d64a34ce742b6b +oid sha256:d9150f96af3c56aa5466901d22b0d59170b68165816e0a1f052e0939c3de1730 size 544431 From cfe2f3ca5abdab2f1768faa4603ec0b982e95d7b Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sun, 27 Jun 2021 15:38:31 -0400 Subject: [PATCH 9/9] s/Gay Zero/GZ Pride/ --- compiled/dat/GlobalClothing_District_FemaleFan02.prp | 2 +- compiled/dat/GlobalClothing_District_MaleFan02.prp | 2 +- sources/avatar/clothing_fan02/Fan02.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index 1b35faa0..501dbfd9 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:71d2685849c4cd092a68ddb91a7263acd1e2ebf745a5d7da50959b9a5b960a63 +oid sha256:199d07cf504aac43f659beadd96207bdc8a06990ce3666d14210db4bb01109ea size 544317 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 16b29832..12248897 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:d9150f96af3c56aa5466901d22b0d59170b68165816e0a1f052e0939c3de1730 +oid sha256:023391971be16f778aa5b97d4f7c414cf0a1d88523b427ec7872ede4832b4fcb size 544431 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index 9e8bb65b..d6b3d4c8 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -85,7 +85,7 @@ "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", + "text": "Short Sleeve T-Shirt - GZ Pride", "meshes": [ "MHTorso08_SMsh", "MMTorso_SMsh", @@ -117,7 +117,7 @@ "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", + "text": "Long Sleeve T-Shirt - GZ Pride", "meshes": [ "MHTorso_SMsh", "MMTorso_SMsh", @@ -225,7 +225,7 @@ "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", + "text": "Short Sleeve T-Shirt - GZ Pride", "meshes": [ "FHTorso12_SMsh", "FMTorso12_SMsh", @@ -256,7 +256,7 @@ "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", + "text": "Long Sleeve T-Shirt - GZ Pride", "meshes": [ "FHTorso_SMsh", "FMTorso_SMsh",