From 96a0ca125942c1e2266889409bd4fc36f9c81500 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Tue, 30 Jul 2024 00:38:35 -0700 Subject: [PATCH] Add Explorer's Emporium reward clothing Also involved adding an icon to the existing Pub reward jacket in the (fe)male04 files. --- .../dat/GlobalClothing_District_Female04.prp | 4 +- .../GlobalClothing_District_FemaleFan02.prp | 4 +- .../dat/GlobalClothing_District_Male04.prp | 4 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- sources/avatar/clothing/Avatar_Male04.max | 4 +- sources/avatar/clothing/Icon_UTorso_Pub.tga | 3 + .../avatar/clothing/bas.avatar.female.04.max | 4 +- .../clothing_fan02/FTorso_ExpEmp_base.png | 3 + sources/avatar/clothing_fan02/Fan02.json | 88 ++++++++++++++++++- .../clothing_fan02/Icon_UTorso_ExpEmp.png | 3 + .../clothing_fan02/MTorso_ExpEmp_base.png | 3 + .../UTorso_ExpEmpSleeve_base.png | 3 + 12 files changed, 113 insertions(+), 14 deletions(-) create mode 100644 sources/avatar/clothing/Icon_UTorso_Pub.tga create mode 100644 sources/avatar/clothing_fan02/FTorso_ExpEmp_base.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_ExpEmp.png create mode 100644 sources/avatar/clothing_fan02/MTorso_ExpEmp_base.png create mode 100644 sources/avatar/clothing_fan02/UTorso_ExpEmpSleeve_base.png diff --git a/compiled/dat/GlobalClothing_District_Female04.prp b/compiled/dat/GlobalClothing_District_Female04.prp index e9994689c..c83399e1b 100644 --- a/compiled/dat/GlobalClothing_District_Female04.prp +++ b/compiled/dat/GlobalClothing_District_Female04.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b60a987bb33c69f4548ed33bfb1c989f9b00b12b69e6b7b5d2c50f5af6325f9e -size 3713491 +oid sha256:176513d44ddc9ca50f51ffcc1b4c469606299d74f20ff24d1985e01db4d4e791 +size 4252556 diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index b7da39860..96b171aa5 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:992ba6db89e27f69e08c7c1c84a9605edbfeac9a6f11cc114e6d68fad6e18f3a +size 6838969 diff --git a/compiled/dat/GlobalClothing_District_Male04.prp b/compiled/dat/GlobalClothing_District_Male04.prp index 59e86f38c..eb4fb60a0 100644 --- a/compiled/dat/GlobalClothing_District_Male04.prp +++ b/compiled/dat/GlobalClothing_District_Male04.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa8a57382858dd257935ddf9ccee7bb68000d75c409e2fcb74c0b504a247bfad -size 4469809 +oid sha256:7bed01e086cae650325c1e30357e301ab1716476edf5159d158cf73dc228244b +size 4800975 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 8d0876f4b..d5a1698ac 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:976fa5b22d0d558c2dec46bdb0bf6b34582c60c9c8764dcb34c5cb556d8f1d48 +size 6577702 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 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/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index fadaf6bdb..bd622e5a6 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -80,7 +80,11 @@ "Icon_UTorso_Shirt_Riven2024.png", "MTorso_xSleeve_Riven2024_Base.png", - "MTorso_xSleeve_Riven2024_Tint.png" + "MTorso_xSleeve_Riven2024_Tint.png", + + "Icon_UTorso_ExpEmp.png", + "MTorso_ExpEmp_base.png", + "UTorso_ExpEmpSleeve_base.png" ], "clItems": [ { @@ -1034,6 +1038,44 @@ } } ] + }, + { + "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 +1161,11 @@ "Icon_UTorso_Shirt_Riven2024.png", "FTorso_xSleeve_Riven2024_Base.png", - "FTorso_xSleeve_Riven2024_Tint.png" + "FTorso_xSleeve_Riven2024_Tint.png", + + "Icon_UTorso_ExpEmp.png", + "FTorso_ExpEmp_base.png", + "UTorso_ExpEmpSleeve_base.png" ], "clItems": [ { @@ -2028,6 +2074,44 @@ } } ] + }, + { + "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/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/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