From ca4fdd08b7e7d9cd7f72f8ac86d1b2692a2231fd Mon Sep 17 00:00:00 2001 From: Patrick Dulebohn Date: Mon, 23 Sep 2024 20:16:28 -0400 Subject: [PATCH 1/2] Add Riven 2024, Radio Free D'ni, ExpEmp, and Mysterium 2024 Shirts * Add Riven 2024 shirt and sources (dpogue) * Add Radio Free D'ni shirt and sources (AlanD, et al.) * Add Explorers' Emporium reward shirt and sources (Semjay) * Add Mysterium 2024 shirt and sources (Doobes) * Update Fan02 and Mysterium JSON files with new clothing defintions --- .../dat/GlobalClothing_District_Female.prp | 2 +- .../GlobalClothing_District_FemaleFan02.prp | 4 +- ...lobalClothing_District_FemaleMysterium.prp | 4 +- compiled/dat/GlobalClothing_District_Male.prp | 2 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- .../GlobalClothing_District_MaleMysterium.prp | 4 +- .../clothing_fan02/FTorso_ExpEmp_base.png | 3 + .../FTorso_LongSleeve_RFD_Base.png | 3 + .../FTorso_LongSleeve_RFD_Tint1.png | 3 + .../FTorso_longsleeve_RFD_tint2.png | 3 + .../FTorso_shortsleeve_RFD_base.png | 3 + .../FTorso_shortsleeve_RFD_tint1.png | 3 + .../FTorso_shortsleeve_RFD_tint2.png | 3 + sources/avatar/clothing_fan02/Fan02.json | 265 +++++++++++++++++- .../clothing_fan02/Icon_UTorso_ExpEmp.png | 3 + .../clothing_fan02/Icon_UTorso_Shirt_RFD.png | 3 + .../clothing_fan02/MTorso_ExpEmp_base.png | 3 + .../MTorso_Xsleeve_RFD_Base.png | 3 + .../MTorso_Xsleeve_RFD_tint1.png | 3 + .../MTorso_Xsleeve_RFD_tint2.png | 3 + .../UTorso_ExpEmpSleeve_base.png | 3 + .../FTorso_ShortSleeve_Mysterium2024_Base.png | 3 + ...FTorso_ShortSleeve_Mysterium2024_Tint1.png | 3 + ...FTorso_ShortSleeve_Mysterium2024_Tint2.png | 3 + .../Icon_UTorso_Shirt_Mysterium2024.png | 3 + .../MTorso_ShortSleeve_Mysterium2024_Base.png | 3 + ...MTorso_ShortSleeve_Mysterium2024_Tint1.png | 3 + ...MTorso_ShortSleeve_Mysterium2024_Tint2.png | 3 + .../avatar/clothing_mysterium/mysterium.json | 95 ++++++- 29 files changed, 429 insertions(+), 14 deletions(-) create mode 100644 sources/avatar/clothing_fan02/FTorso_ExpEmp_base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Tint1.png create mode 100644 sources/avatar/clothing_fan02/FTorso_longsleeve_RFD_tint2.png create mode 100644 sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint1.png create mode 100644 sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint2.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_ExpEmp.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Shirt_RFD.png create mode 100644 sources/avatar/clothing_fan02/MTorso_ExpEmp_base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint1.png create mode 100644 sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint2.png create mode 100644 sources/avatar/clothing_fan02/UTorso_ExpEmpSleeve_base.png create mode 100644 sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Base.png create mode 100644 sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint1.png create mode 100644 sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint2.png create mode 100644 sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2024.png create mode 100644 sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Base.png create mode 100644 sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint1.png create mode 100644 sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint2.png diff --git a/compiled/dat/GlobalClothing_District_Female.prp b/compiled/dat/GlobalClothing_District_Female.prp index dfa1c93bc..f974097a3 100644 --- a/compiled/dat/GlobalClothing_District_Female.prp +++ b/compiled/dat/GlobalClothing_District_Female.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eddd63e47d6dc28a1e6b669f55be7d3dd825ce0f9bfe265f075e0e7139a5b9ea +oid sha256:fd6fdd1b75c6a255a8d2d0063f8e47edf4903bb63eb48dc233713e65ff66fd26 size 4731529 diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index b7da39860..d6247f91c 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:5b411efe1dd09d6fd2f463d3614eddd13db65d5ac238eb131080ed04fd3c63dc -size 6685935 +oid sha256:c303ca2c64ff06b08013ae80b032d31d4d62c6a0f8663387ae2de7d4a8f2de27 +size 7813481 diff --git a/compiled/dat/GlobalClothing_District_FemaleMysterium.prp b/compiled/dat/GlobalClothing_District_FemaleMysterium.prp index 8ee3cb710..a33261bba 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:d723f8d7539c41d8fbcf8f19f5f43d304055e854b66090fc9efc1e6f04a80e3d -size 8066123 +oid sha256:968be0ad2b880787a29026389cdadd6d3eda0140584995a71b5a019e2ca1b158 +size 8520973 diff --git a/compiled/dat/GlobalClothing_District_Male.prp b/compiled/dat/GlobalClothing_District_Male.prp index 3526a8b16..35bb97a2f 100644 --- a/compiled/dat/GlobalClothing_District_Male.prp +++ b/compiled/dat/GlobalClothing_District_Male.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55c6892e8a7d9c598615636e0b5df2614457fb681bdf669e0f30e8bf718c2d2f +oid sha256:dca2896416253971b4af485d26d8a8daaa92115245ff2bafa647571546968083 size 7248147 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 8d0876f4b..12a13663b 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:b6685f94c4bfc909e5a240a6d5d95eebf1673a2e7b48242aa597bb664e1ff6d5 -size 6424668 +oid sha256:0334671bd2721e4d9abd1eaa103b53a1566df045616fb385a70cafe6fc59cb8a +size 7114902 diff --git a/compiled/dat/GlobalClothing_District_MaleMysterium.prp b/compiled/dat/GlobalClothing_District_MaleMysterium.prp index 9763b4646..1ee5a4b94 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:3ef3ee672999de2df55506975bb9e23b2b1fe25022eb166ad8d2018fa5844c92 -size 8067797 +oid sha256:8ebbe9aad55d18c48c47e75a0527e56ff25f55de8d41a8505c8eec8eea246e23 +size 8522707 diff --git a/sources/avatar/clothing_fan02/FTorso_ExpEmp_base.png b/sources/avatar/clothing_fan02/FTorso_ExpEmp_base.png new file mode 100644 index 000000000..9ff7ee0ea --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_ExpEmp_base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8a487b8e241064f2a17b08e5ffe370326b2dd0102846e069e393b7548a2ebf0 +size 268355 diff --git a/sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Base.png b/sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Base.png new file mode 100644 index 000000000..0f6bc57ce --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d91520140090f1ac4f16178bba13e3cd68e36468ccffdcf7f41c8d756d6af530 +size 172987 diff --git a/sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Tint1.png b/sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Tint1.png new file mode 100644 index 000000000..24582ae1c --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68f2d34527f38178aeec67f293da5662df55f60fa98082007a25497bdb40b83d +size 167616 diff --git a/sources/avatar/clothing_fan02/FTorso_longsleeve_RFD_tint2.png b/sources/avatar/clothing_fan02/FTorso_longsleeve_RFD_tint2.png new file mode 100644 index 000000000..8e585bb3e --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_longsleeve_RFD_tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66735c7bc1d8236ee0b37c5489e5b3e97ace50b71f23ead6c95d4c6c704a88ae +size 10011 diff --git a/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_base.png b/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_base.png new file mode 100644 index 000000000..d5a131238 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e0bb72567c1fcddb169d8d2b87f2064e49389edc9d77dc405054da604ff60a4 +size 123577 diff --git a/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint1.png b/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint1.png new file mode 100644 index 000000000..2bb94e817 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdde7fe32e15b49af2118943a2a7be3655177221c957dcbce06a8818a8ac612b +size 116997 diff --git a/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint2.png b/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint2.png new file mode 100644 index 000000000..3db115dbe --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e1d4b23804b879763ec8081eb49e36f66131d1b5afba63ea649e95e8cd67f7c +size 10097 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index fadaf6bdb..04d5fc7ab 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -80,7 +80,16 @@ "Icon_UTorso_Shirt_Riven2024.png", "MTorso_xSleeve_Riven2024_Base.png", - "MTorso_xSleeve_Riven2024_Tint.png" + "MTorso_xSleeve_Riven2024_Tint.png", + + "Icon_UTorso_Shirt_RFD.png", + "MTorso_Xsleeve_RFD_Base.png", + "MTorso_Xsleeve_RFD_tint1.png", + "MTorso_Xsleeve_RFD_tint2.png", + + "Icon_UTorso_ExpEmp.png", + "MTorso_ExpEmp_base.png", + "UTorso_ExpEmpSleeve_base.png" ], "clItems": [ { @@ -1034,6 +1043,126 @@ } } ] + }, + { + "name": "MTorso_LongSleeve_RFD", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_RFD.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2=Text; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01", + "text": "Long-Sleeved Shirt - Radio Free D'ni", + "meshes": [ + { + "name": "MHTorso_SMsh", + "page": "Male" + }, + { + "name": "MMTorso_SMsh", + "page": "Male" + }, + { + "name": "MLTorso_SMsh", + "page": "Male" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_Xsleeve_RFD_Base.png", + "8": "MTorso_Xsleeve_RFD_tint1.png", + "9": "MTorso_Xsleeve_RFD_tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "mtorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "MTorso_ShortSleeve_RFD", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_RFD.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2=Text; isLogoFor=02_MTorso12_01; GroupName=ShortSleeve", + "text": "Short-Sleeved Shirt - Radio Free D'ni", + "meshes": [ + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_Xsleeve_RFD_Base.png", + "8": "MTorso_Xsleeve_RFD_tint1.png", + "9": "MTorso_Xsleeve_RFD_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": "MReward_ExpEmp", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_ExpEmp.png", + "tint1": [1.0, 1.0, 1.0], + "tint2": [1.0, 1.0, 1.0], + "desc": "ColorLabel1=; ColorLabel2=; GroupName=Pub; isLogoFor=MReward_PubJacket; nonStandard", + "text": "Explorer's Emporium Jacket", + "meshes": [ + { + "name": "MHTorso_Pub_SMsh", + "page": "Male04" + }, + { + "name": "MMTorso_Pub_SMsh", + "page": "Male04" + }, + { + "name": "MLTorso_Pub_SMsh", + "page": "Male04" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_ExpEmp_base.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "UTorso_ExpEmpSleeve_base.png" + } + } + ] } ] }, @@ -1119,7 +1248,20 @@ "Icon_UTorso_Shirt_Riven2024.png", "FTorso_xSleeve_Riven2024_Base.png", - "FTorso_xSleeve_Riven2024_Tint.png" + "FTorso_xSleeve_Riven2024_Tint.png", + + "Icon_UTorso_Shirt_RFD.png", + "FTorso_longsleeve_RFD_base.png", + "FTorso_longsleeve_RFD_tint1.png", + "FTorso_longsleeve_RFD_tint2.png", + + "FTorso_shortsleeve_RFD_base.png", + "FTorso_shortsleeve_RFD_tint1.png", + "FTorso_shortsleeve_RFD_tint2.png", + + "Icon_UTorso_ExpEmp.png", + "FTorso_ExpEmp_base.png", + "UTorso_ExpEmpSleeve_base.png" ], "clItems": [ { @@ -2028,6 +2170,125 @@ } } ] + }, + { + "name": "FTorso_ShortSleeve_RFD", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_RFD.png", + "tint1": [0.0, 0.0, 0.0], + "tint2": [0.0, 0.0, 0.0], + "desc": "ColorLabel1=Shirt; ColorLabel2=Text; isLogoFor=02_FTorso12_01; GroupName=ShortSleeve", + "text": "Short Sleeve T-Shirt - Radio Free D'ni", + "meshes": [ + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_shortsleeve_RFD_base.png", + "8": "FTorso_shortsleeve_RFD_tint1.png", + "9": "FTorso_shortsleeve_RFD_tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] + }, + { + "name": "FTorso_LongSleeve_RFD", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_RFD.png", + "tint1": [1, 1, 1], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2=Text; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01", + "text": "Long-Sleeved Shirt - Radio Free D'ni", + "meshes": [ + { + "name": "FHTorso_SMsh", + "page": "Female" + }, + { + "name": "FMTorso_SMsh", + "page": "Female" + }, + { + "name": "FLTorso_SMsh", + "page": "Female" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_longsleeve_RFD_base.png", + "8": "FTorso_longsleeve_RFD_tint1.png", + "9": "FTorso_longsleeve_RFD_tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "8": "ftorso_longsleeve01arm_tint1*0#0.hsm" + } + } + ] + }, + { + "name": "FReward_ExpEmp", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_ExpEmp.png", + "tint1": [1.0, 1.0, 1.0], + "tint2": [1.0, 1.0, 1.0], + "desc": "ColorLabel1=; ColorLabel2=; GroupName=Pub; isLogoFor=FReward_PubJacket; nonStandard", + "text": "Explorer's Emporium Jacket", + "meshes": [ + { + "name": "FHTorso_Pub_SMsh", + "page": "Female04" + }, + { + "name": "FMTorso_Pub_SMsh", + "page": "Female04" + }, + { + "name": "FLTorso_Pub_SMsh", + "page": "Female04" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_ExpEmp_base.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "UTorso_ExpEmpSleeve_base.png" + } + } + ] } ] } diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_ExpEmp.png b/sources/avatar/clothing_fan02/Icon_UTorso_ExpEmp.png new file mode 100644 index 000000000..12dedf01e --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_ExpEmp.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ef0a1afbf5555292960fe4b8e4fdc6f295144dfb4cfcb4ada0578235fdacbbb +size 46127 diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_RFD.png b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_RFD.png new file mode 100644 index 000000000..5f4610a79 --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_RFD.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:118438cb3b0b2071408536f9538380bb6753ce811a9cc8d90cff6dfa75c95c20 +size 12466 diff --git a/sources/avatar/clothing_fan02/MTorso_ExpEmp_base.png b/sources/avatar/clothing_fan02/MTorso_ExpEmp_base.png new file mode 100644 index 000000000..fc8e1ef3a --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_ExpEmp_base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f10f2f7155b087a82da786f19df1afda2a98199a2aa2b5b5312df1deab17dec +size 265493 diff --git a/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_Base.png b/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_Base.png new file mode 100644 index 000000000..f0ce74841 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fe35920489a75ddf512ce2ccc4bf619ba31f3c66dd1600374e423095e38e9fd +size 112800 diff --git a/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint1.png b/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint1.png new file mode 100644 index 000000000..929a62862 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23781cd15bf0a18a29184778727bb028a7fbf774cc7391997412cfb918b280d7 +size 114637 diff --git a/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint2.png b/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint2.png new file mode 100644 index 000000000..5fefe9368 --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75bedda0518f13e81cf87395be00bf82ea551022a9d7142df224fa5d56a8f856 +size 10216 diff --git a/sources/avatar/clothing_fan02/UTorso_ExpEmpSleeve_base.png b/sources/avatar/clothing_fan02/UTorso_ExpEmpSleeve_base.png new file mode 100644 index 000000000..0a489fd1f --- /dev/null +++ b/sources/avatar/clothing_fan02/UTorso_ExpEmpSleeve_base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26f4fe9b91054e0e3039532767531dc24b9c659c083329a7e2b9e25cc41cbb82 +size 57502 diff --git a/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Base.png b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Base.png new file mode 100644 index 000000000..6e0cb6a91 --- /dev/null +++ b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69bf6e1d919cff151dbcf368fd6892ce22d93311d320d5ed4562b198ac357643 +size 173298 diff --git a/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint1.png b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint1.png new file mode 100644 index 000000000..853bdf9ad --- /dev/null +++ b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d20869c1dec98b296bf49d947295134935d6e77e385b2c54cec07f87bb1c84f3 +size 174964 diff --git a/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint2.png b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint2.png new file mode 100644 index 000000000..8606747a0 --- /dev/null +++ b/sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a44797d12a7a506ac79db7b0a5035ec8d2de2e224c0664cfbca216ad47cd66b +size 10704 diff --git a/sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2024.png b/sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2024.png new file mode 100644 index 000000000..e8077fdaa --- /dev/null +++ b/sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2024.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4c663cb84244aa1af3378a659ed5a61c561e86d4f93cfdc8c00fcff590100cf +size 18962 diff --git a/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Base.png b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Base.png new file mode 100644 index 000000000..3922e5e0b --- /dev/null +++ b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef87a65d5ce8e90a114247fd69fada2984780c1d537c56601d33a780d555b075 +size 153143 diff --git a/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint1.png b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint1.png new file mode 100644 index 000000000..0fa0d3801 --- /dev/null +++ b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02c34cc012e30f4dc31d8bbd102e986bdc3ae7f0b458cca99d21d4bc4814604d +size 154764 diff --git a/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint2.png b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint2.png new file mode 100644 index 000000000..6f0da9c6d --- /dev/null +++ b/sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa527800e51abe73788ad193fb23d5d4f72d9f518a2124af3b74df63c7beac2b +size 10850 diff --git a/sources/avatar/clothing_mysterium/mysterium.json b/sources/avatar/clothing_mysterium/mysterium.json index 5ecb8b5ca..bc1c2397f 100644 --- a/sources/avatar/clothing_mysterium/mysterium.json +++ b/sources/avatar/clothing_mysterium/mysterium.json @@ -93,7 +93,11 @@ "Icon_UTorso_Shirt_Mysterium2023.png", "MTorso_ShortSleeve_Mysterium2023_Base.png", "MTorso_ShortSleeve_Mysterium2023_Tint1.png", - "MTorso_ShortSleeve_Mysterium2023_Tint2.png" + "MTorso_ShortSleeve_Mysterium2023_Tint2.png", + "Icon_UTorso_Shirt_Mysterium2024.png", + "MTorso_ShortSleeve_Mysterium2024_Base.png", + "MTorso_ShortSleeve_Mysterium2024_Tint1.png", + "MTorso_ShortSleeve_Mysterium2024_Tint2.png" ], "clItems": [ { @@ -1258,6 +1262,48 @@ } } ] + }, + { + "name": "MReward_SSMysterium2024", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Mysterium2024.png", + "tint1": [0, 0, 0], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2=Back Logo; isLogoFor=MReward_SSMysterium2000; GroupName = Mysterium; nonStandard", + "text": "Mysterium 2024 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_Mysterium2024_Base.png", + "8": "MTorso_ShortSleeve_Mysterium2024_Tint1.png", + "9": "MTorso_ShortSleeve_Mysterium2024_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" + } + } + ] } ] }, @@ -1354,7 +1400,11 @@ "Icon_UTorso_Shirt_Mysterium2023.png", "FTorso_ShortSleeve_Mysterium2023_Base.png", "FTorso_ShortSleeve_Mysterium2023_Tint1.png", - "FTorso_ShortSleeve_Mysterium2023_Tint2.png" + "FTorso_ShortSleeve_Mysterium2023_Tint2.png", + "Icon_UTorso_Shirt_Mysterium2024.png", + "FTorso_ShortSleeve_Mysterium2024_Base.png", + "FTorso_ShortSleeve_Mysterium2024_Tint1.png", + "FTorso_ShortSleeve_Mysterium2024_Tint2.png" ], "clItems": [ { @@ -2491,6 +2541,47 @@ } } ] + }, + { + "name": "FReward_SSMysterium2024", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Mysterium2024.png", + "tint1": [0, 0, 0], + "tint2": [1, 1, 1], + "desc": "ColorLabel1=Shirt; ColorLabel2=Back Logo; isLogoFor=FReward_SSMysterium2000; GroupName = Mysterium; nonStandard", + "text": "Mysterium 2024 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_Mysterium2024_Base.png", + "8": "FTorso_ShortSleeve_Mysterium2024_Tint1.png", + "9": "FTorso_ShortSleeve_Mysterium2024_Tint2.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] } ] } From 9c1e1a0871ddac4eb3a2bf79169dfea5f6a07fed Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 23 Sep 2024 17:39:28 -0700 Subject: [PATCH 2/2] Add an icon to the existing Pub reward jacket This is needed to support selecting between the existing Pub jacket and the ExpEmp reward jacket. --- sources/avatar/clothing/Avatar_Male04.max | 4 ++-- sources/avatar/clothing/Icon_UTorso_Pub.tga | 3 +++ sources/avatar/clothing/bas.avatar.female.04.max | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 sources/avatar/clothing/Icon_UTorso_Pub.tga diff --git a/sources/avatar/clothing/Avatar_Male04.max b/sources/avatar/clothing/Avatar_Male04.max index b1ba0ec9b..3bda73707 100644 --- a/sources/avatar/clothing/Avatar_Male04.max +++ b/sources/avatar/clothing/Avatar_Male04.max @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f8ddf0990620f2370fb9bf2a3716fb117b73eee27c21822fb5bba1ad0fdfdec -size 11137024 +oid sha256:508c887ee480dbbb15ccde6291c39ce7e2df34715d5c81cb07eb67063afbc2dd +size 11444224 diff --git a/sources/avatar/clothing/Icon_UTorso_Pub.tga b/sources/avatar/clothing/Icon_UTorso_Pub.tga new file mode 100644 index 000000000..11684d0bf --- /dev/null +++ b/sources/avatar/clothing/Icon_UTorso_Pub.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad83896e1d0ad769b572fa44e4436cd329a36d0563c78eb2f1cab5ba08cd6668 +size 63764 diff --git a/sources/avatar/clothing/bas.avatar.female.04.max b/sources/avatar/clothing/bas.avatar.female.04.max index d31d551fa..2e7a74a20 100644 --- a/sources/avatar/clothing/bas.avatar.female.04.max +++ b/sources/avatar/clothing/bas.avatar.female.04.max @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0351fc7ba550c4cd4ce47e252b4cce21bfb52b9449c3106ad860679375930eab -size 7802880 +oid sha256:fa2d9cde88ff569f0639e896a333b907dc1b8fdeaa925fcb308d489f38361eb1 +size 8126464