diff --git a/ReallifeGamemode.Client/Gui/blips.ts b/ReallifeGamemode.Client/Gui/blips.ts index 5809ce1f..8751646d 100644 --- a/ReallifeGamemode.Client/Gui/blips.ts +++ b/ReallifeGamemode.Client/Gui/blips.ts @@ -8,6 +8,7 @@ export default function playerBlips() { mp.events.add("entityStreamIn", (entity) => { if (entity.type === "player") { + console.log(entity.id); let color = parseInt(entity.getVariable("blipColor")); if (entity.blip == 0) entity.createBlip(1); entity.setBlipColor(isNaN(color) ? 0 : color); diff --git a/ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts b/ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts index 5182952e..c3089c9d 100644 --- a/ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts +++ b/ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts @@ -6,6 +6,12 @@ import maleUndershirts from "./male_undershirts.json"; import maleAccessoires from "./male_accessories.json"; import male_combination from "./male_torso_top_combination.json"; +import femaleTops from "./female_tops.json"; +import femaleShoes from "./female_shoes.json"; +import femaleLegs from "./female_legs.json"; +import femaleUndershirts from "./female_undershirts.json"; +import femaleAccessoires from "./female_accessories.json"; +import female_combination from "./female_torso_top_combination.json"; const UIMenu = NativeUI.Menu; const UIMenuItem = NativeUI.UIMenuItem; @@ -53,21 +59,44 @@ export default function clotheShopList(globalData: GlobalData) { let menuTransition = false; // workaround for ItemSelect event being called twice between menu transitions let lastClothing = null; - function getClothingName(key, ClotheId) { + function getClothingName(key, ClotheId, gender) { var textures = [] + var comb; + var tops; + var undersh; + var shoes; + var legs; + var acces; + + if (!gender) { + comb = male_combination; + tops = maleTops; + undersh = maleUndershirts; + shoes = maleShoes; + legs = maleLegs; + acces = maleAccessoires; + } else { + comb = female_combination; + tops = femaleTops; + undersh = femaleUndershirts; + shoes = femaleShoes; + legs = femaleLegs; + acces = femaleAccessoires; + } + switch (key) { case 11: - for (var i = 0; i < Object.keys(maleTops[ClotheId]).length; i++) { - if (maleTops[ClotheId][i].Localized != "NULL") { - for (var x = 0; x < Object.keys(male_combination.combination).length; x++) { - if (male_combination.combination[x].Top == ClotheId) { - for (var y = 0; y < Object.keys(maleUndershirts[male_combination.combination[x].Undershirt]).length; y++) { - if (maleUndershirts[male_combination.combination[x].Undershirt][y].Localized != "NULL") { + for (var i = 0; i < Object.keys(tops[ClotheId]).length; i++) { + if (tops[ClotheId][i].Localized != "NULL") { + for (var x = 0; x < Object.keys(comb.combination).length; x++) { + if (comb.combination[x].Top == ClotheId) { + for (var y = 0; y < Object.keys(undersh[comb.combination[x].Undershirt]).length; y++) { + if (undersh[comb.combination[x].Undershirt][y].Localized != "NULL") { const newData = { id: i, - data: [maleTops[ClotheId][i]], - torso: [male_combination.combination[x].Torso], - undershirt: [male_combination.combination[x].Undershirt, maleUndershirts[male_combination.combination[x].Undershirt][y], y] + data: [tops[ClotheId][i]], + torso: [comb.combination[x].Torso], + undershirt: [comb.combination[x].Undershirt, undersh[comb.combination[x].Undershirt][y], y] } textures.push(newData); } @@ -78,33 +107,33 @@ export default function clotheShopList(globalData: GlobalData) { } break; case 6: - for (var i = 0; i < Object.keys(maleShoes[ClotheId]).length; i++) { - if (maleShoes[ClotheId][i].Localized != "NULL") { + for (var i = 0; i < Object.keys(shoes[ClotheId]).length; i++) { + if (shoes[ClotheId][i].Localized != "NULL") { const newData = { id: i, - data: [maleShoes[ClotheId][i]] + data: [shoes[ClotheId][i]] } textures.push(newData); } } break; case 4: - for (var i = 0; i < Object.keys(maleLegs[ClotheId]).length; i++) { - if (maleLegs[ClotheId][i].Localized != "NULL") { + for (var i = 0; i < Object.keys(legs[ClotheId]).length; i++) { + if (legs[ClotheId][i].Localized != "NULL") { const newData = { id: i, - data: [maleLegs[ClotheId][i]] + data: [legs[ClotheId][i]] } textures.push(newData); } } break; case 7: - for (var i = 0; i < Object.keys(maleAccessoires[ClotheId]).length; i++) { - if (maleAccessoires[ClotheId][i].Localized != "NULL") { + for (var i = 0; i < Object.keys(acces[ClotheId]).length; i++) { + if (acces[ClotheId][i].Localized != "NULL") { const newData = { id: i, - data: [maleAccessoires[ClotheId][i]] + data: [acces[ClotheId][i]] } textures.push(newData); } @@ -114,7 +143,7 @@ export default function clotheShopList(globalData: GlobalData) { return textures; } - function addClothingItems(type, bannerSprite, key, value) { + function addClothingItems(type, bannerSprite, key, value, gender) { var categoryMenu; var cloth = []; var tx = []; @@ -142,7 +171,7 @@ export default function clotheShopList(globalData: GlobalData) { for (const item of value) { if (item.ComponentId == key) { - var txData = getClothingName(key, item.ClotheId); + var txData = getClothingName(key, item.ClotheId, gender); for (const x of txData) { var itemDescription = (key === 11 ? mp.game.ui.getLabelText(x.undershirt[1].GXT) : "Clothing item."); @@ -234,7 +263,7 @@ export default function clotheShopList(globalData: GlobalData) { } - mp.events.add("clothesMenu:updateData", (jsonBannerSprite, jsonData) => { + mp.events.add("clothesMenu:updateData", (jsonBannerSprite, jsonData, gender) => { if (!globalData.InMenu) { globalData.InMenu = true; playerPos = localPlayer.position; @@ -281,10 +310,10 @@ export default function clotheShopList(globalData: GlobalData) { // Add clothes - addClothingItems("clothes", bannerSprite, 11, data[0]); - addClothingItems("clothes", bannerSprite, 4, data[1]); - addClothingItems("clothes", bannerSprite, 6, data[2]); - addClothingItems("clothes", bannerSprite, 7, data[3]); + addClothingItems("clothes", bannerSprite, 11, data[0], gender); + addClothingItems("clothes", bannerSprite, 4, data[1], gender); + addClothingItems("clothes", bannerSprite, 6, data[2], gender); + addClothingItems("clothes", bannerSprite, 7, data[3], gender); myVar = setInterval(myTimer, 100); // Add props // for (const [key, value] of Object.entries(clothingData.props)) addClothingItems("props", bannerSprite, key, value); diff --git a/ReallifeGamemode.Client/Interaction/clothes/female_torso_top_combination.json b/ReallifeGamemode.Client/Interaction/clothes/female_torso_top_combination.json new file mode 100644 index 00000000..515c94eb --- /dev/null +++ b/ReallifeGamemode.Client/Interaction/clothes/female_torso_top_combination.json @@ -0,0 +1,1504 @@ +{ + "combination": [ + { + "_id": 1, + "Top": 1, + "Torso": 5, + "Undershirt": 59 + }, + { + "_id": 2, + "Top": 3, + "Torso": 3, + "Undershirt": 96 + }, + { + "_id": 3, + "Top": 2, + "Torso": 2, + "Undershirt": 9 + }, + { + "_id": 4, + "Top": 5, + "Torso": 4, + "Undershirt": 17 + }, + { + "_id": 5, + "Top": 6, + "Torso": 5, + "Undershirt": 39 + }, + { + "_id": 6, + "Top": 7, + "Torso": 5, + "Undershirt": 39 + }, + { + "_id": 7, + "Top": 8, + "Torso": 5, + "Undershirt": 38 + }, + { + "_id": 8, + "Top": 9, + "Torso": 0, + "Undershirt": 34 + }, + { + "_id": 9, + "Top": 10, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 10, + "Top": 13, + "Torso": 15, + "Undershirt": 152 + }, + { + "_id": 12, + "Top": 14, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 13, + "Top": 15, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 14, + "Top": 16, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 15, + "Top": 17, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 16, + "Top": 18, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 17, + "Top": 19, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 18, + "Top": 20, + "Torso": 5, + "Undershirt": 64 + }, + { + "_id": 19, + "Top": 21, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 20, + "Top": 22, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 21, + "Top": 23, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 22, + "Top": 24, + "Torso": 5, + "Undershirt": 37 + }, + { + "_id": 23, + "Top": 25, + "Torso": 5, + "Undershirt": 39 + }, + { + "_id": 24, + "Top": 26, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 25, + "Top": 27, + "Torso": 0, + "Undershirt": 34 + }, + { + "_id": 26, + "Top": 30, + "Torso": 2, + "Undershirt": 34 + }, + { + "_id": 27, + "Top": 31, + "Torso": 9, + "Undershirt": 59 + }, + { + "_id": 28, + "Top": 32, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 29, + "Top": 33, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 30, + "Top": 34, + "Torso": 7, + "Undershirt": 141 + }, + { + "_id": 31, + "Top": 35, + "Torso": 5, + "Undershirt": 20 + }, + { + "_id": 32, + "Top": 35, + "Torso": 5, + "Undershirt": 21 + }, + { + "_id": 33, + "Top": 36, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 34, + "Top": 37, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 35, + "Top": 38, + "Torso": 2, + "Undershirt": 34 + }, + { + "_id": 36, + "Top": 40, + "Torso": 2, + "Undershirt": 34 + }, + { + "_id": 37, + "Top": 41, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 38, + "Top": 41, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 39, + "Top": 42, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 40, + "Top": 43, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 41, + "Top": 44, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 42, + "Top": 45, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 43, + "Top": 46, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 44, + "Top": 47, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 45, + "Top": 48, + "Torso": 14, + "Undershirt": 35 + }, + { + "_id": 46, + "Top": 49, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 47, + "Top": 50, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 48, + "Top": 51, + "Torso": 14, + "Undershirt": 41 + }, + { + "_id": 49, + "Top": 52, + "Torso": 14, + "Undershirt": 39 + }, + { + "_id": 50, + "Top": 53, + "Torso": 14, + "Undershirt": 38 + }, + { + "_id": 51, + "Top": 54, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 52, + "Top": 55, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 53, + "Top": 56, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 54, + "Top": 57, + "Torso": 14, + "Undershirt": 39 + }, + { + "_id": 55, + "Top": 58, + "Torso": 9, + "Undershirt": 39 + }, + { + "_id": 56, + "Top": 59, + "Torso": 2, + "Undershirt": 34 + }, + { + "_id": 57, + "Top": 61, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 58, + "Top": 62, + "Torso": 5, + "Undershirt": 34 + }, + { + "_id": 59, + "Top": 63, + "Torso": 5, + "Undershirt": 34 + }, + { + "_id": 60, + "Top": 64, + "Torso": 5, + "Undershirt": 40 + }, + { + "_id": 61, + "Top": 65, + "Torso": 6, + "Undershirt": 34 + }, + { + "_id": 62, + "Top": 66, + "Torso": 6, + "Undershirt": 34 + }, + { + "_id": 63, + "Top": 67, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 64, + "Top": 68, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 65, + "Top": 69, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 66, + "Top": 70, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 67, + "Top": 71, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 68, + "Top": 72, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 69, + "Top": 73, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 70, + "Top": 74, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 71, + "Top": 75, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 72, + "Top": 76, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 73, + "Top": 77, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 74, + "Top": 78, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 75, + "Top": 79, + "Torso": 1, + "Undershirt": 34 + }, + { + "_id": 76, + "Top": 80, + "Torso": 1, + "Undershirt": 34 + }, + { + "_id": 77, + "Top": 81, + "Torso": 1, + "Undershirt": 34 + }, + { + "_id": 78, + "Top": 83, + "Torso": 1, + "Undershirt": 34 + }, + { + "_id": 79, + "Top": 84, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 80, + "Top": 85, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 81, + "Top": 86, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 82, + "Top": 87, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 83, + "Top": 88, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 84, + "Top": 89, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 85, + "Top": 90, + "Torso": 14, + "Undershirt": 37 + }, + { + "_id": 86, + "Top": 91, + "Torso": 14, + "Undershirt": 39 + }, + { + "_id": 87, + "Top": 92, + "Torso": 14, + "Undershirt": 37 + }, + { + "_id": 88, + "Top": 93, + "Torso": 14, + "Undershirt": 38 + }, + { + "_id": 89, + "Top": 94, + "Torso": 14, + "Undershirt": 38 + }, + { + "_id": 90, + "Top": 95, + "Torso": 14, + "Undershirt": 38 + }, + { + "_id": 91, + "Top": 96, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 92, + "Top": 98, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 93, + "Top": 99, + "Torso": 5, + "Undershirt": 37 + }, + { + "_id": 94, + "Top": 101, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 95, + "Top": 102, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 97, + "Top": 104, + "Torso": 5, + "Undershirt": 34 + }, + { + "_id": 98, + "Top": 105, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 99, + "Top": 106, + "Torso": 6, + "Undershirt": 34 + }, + { + "_id": 100, + "Top": 107, + "Torso": 6, + "Undershirt": 64 + }, + { + "_id": 103, + "Top": 109, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 104, + "Top": 110, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 105, + "Top": 111, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 111, + "Top": 117, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 112, + "Top": 118, + "Torso": 12, + "Undershirt": 34 + }, + { + "_id": 114, + "Top": 121, + "Torso": 12, + "Undershirt": 29 + }, + { + "_id": 115, + "Top": 112, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 116, + "Top": 113, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 117, + "Top": 114, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 118, + "Top": 115, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 119, + "Top": 116, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 120, + "Top": 119, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 121, + "Top": 121, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 122, + "Top": 122, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 123, + "Top": 123, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 124, + "Top": 125, + "Torso": 14, + "Undershirt": 1 + }, + { + "_id": 125, + "Top": 125, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 126, + "Top": 126, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 127, + "Top": 127, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 128, + "Top": 128, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 129, + "Top": 129, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 130, + "Top": 130, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 131, + "Top": 131, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 132, + "Top": 132, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 133, + "Top": 133, + "Torso": 9, + "Undershirt": 37 + }, + { + "_id": 134, + "Top": 135, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 135, + "Top": 137, + "Torso": 6, + "Undershirt": 34 + }, + { + "_id": 136, + "Top": 138, + "Torso": 6, + "Undershirt": 34 + }, + { + "_id": 137, + "Top": 139, + "Torso": 6, + "Undershirt": 37 + }, + { + "_id": 138, + "Top": 140, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 139, + "Top": 141, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 140, + "Top": 142, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 141, + "Top": 143, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 142, + "Top": 144, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 143, + "Top": 145, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 144, + "Top": 146, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 145, + "Top": 147, + "Torso": 5, + "Undershirt": 34 + }, + { + "_id": 146, + "Top": 148, + "Torso": 5, + "Undershirt": 51 + }, + { + "_id": 147, + "Top": 149, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 148, + "Top": 150, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 149, + "Top": 151, + "Torso": 3, + "Undershirt": 34 + }, + { + "_id": 150, + "Top": 152, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 151, + "Top": 153, + "Torso": 6, + "Undershirt": 64 + }, + { + "_id": 152, + "Top": 154, + "Torso": 12, + "Undershirt": 29 + }, + { + "_id": 153, + "Top": 155, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 154, + "Top": 156, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 155, + "Top": 157, + "Torso": 4, + "Undershirt": 47 + }, + { + "_id": 156, + "Top": 158, + "Torso": 4, + "Undershirt": 37 + }, + { + "_id": 157, + "Top": 159, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 158, + "Top": 160, + "Torso": 4, + "Undershirt": 39 + }, + { + "_id": 159, + "Top": 161, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 160, + "Top": 162, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 161, + "Top": 163, + "Torso": 12, + "Undershirt": 20 + }, + { + "_id": 162, + "Top": 164, + "Torso": 12, + "Undershirt": 52 + }, + { + "_id": 163, + "Top": 165, + "Torso": 9, + "Undershirt": 51 + }, + { + "_id": 164, + "Top": 166, + "Torso": 9, + "Undershirt": 57 + }, + { + "_id": 165, + "Top": 167, + "Torso": 11, + "Undershirt": 72 + }, + { + "_id": 166, + "Top": 168, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 167, + "Top": 169, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 168, + "Top": 170, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 169, + "Top": 171, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 170, + "Top": 172, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 171, + "Top": 173, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 172, + "Top": 174, + "Torso": 15, + "Undershirt": 29 + }, + { + "_id": 173, + "Top": 175, + "Torso": 15, + "Undershirt": 51 + }, + { + "_id": 174, + "Top": 176, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 175, + "Top": 177, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 176, + "Top": 178, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 177, + "Top": 179, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 178, + "Top": 180, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 179, + "Top": 181, + "Torso": 12, + "Undershirt": 51 + }, + { + "_id": 180, + "Top": 182, + "Torso": 12, + "Undershirt": 34 + }, + { + "_id": 181, + "Top": 183, + "Torso": 7, + "Undershirt": 59 + }, + { + "_id": 182, + "Top": 184, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 183, + "Top": 185, + "Torso": 9, + "Undershirt": 38 + }, + { + "_id": 184, + "Top": 186, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 185, + "Top": 187, + "Torso": 11, + "Undershirt": 41 + }, + { + "_id": 186, + "Top": 188, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 187, + "Top": 189, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 188, + "Top": 190, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 189, + "Top": 191, + "Torso": 7, + "Undershirt": 37 + }, + { + "_id": 190, + "Top": 192, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 191, + "Top": 193, + "Torso": 9, + "Undershirt": 108 + }, + { + "_id": 192, + "Top": 194, + "Torso": 7, + "Undershirt": 39 + }, + { + "_id": 193, + "Top": 195, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 194, + "Top": 196, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 195, + "Top": 198, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 196, + "Top": 199, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 197, + "Top": 200, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 198, + "Top": 201, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 199, + "Top": 202, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 200, + "Top": 203, + "Torso": 13, + "Undershirt": 34 + }, + { + "_id": 201, + "Top": 204, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 202, + "Top": 205, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 203, + "Top": 206, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 204, + "Top": 207, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 205, + "Top": 208, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 206, + "Top": 209, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 207, + "Top": 210, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 208, + "Top": 211, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 209, + "Top": 212, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 210, + "Top": 213, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 211, + "Top": 214, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 212, + "Top": 215, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 213, + "Top": 216, + "Torso": 14, + "Undershirt": 118 + }, + { + "_id": 214, + "Top": 217, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 215, + "Top": 218, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 216, + "Top": 219, + "Torso": 9, + "Undershirt": 136 + }, + { + "_id": 217, + "Top": 220, + "Torso": 0, + "Undershirt": 118 + }, + { + "_id": 218, + "Top": 221, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 219, + "Top": 222, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 220, + "Top": 223, + "Torso": 4, + "Undershirt": 34 + }, + { + "_id": 221, + "Top": 224, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 222, + "Top": 225, + "Torso": 12, + "Undershirt": 34 + }, + { + "_id": 223, + "Top": 226, + "Torso": 12, + "Undershirt": 34 + }, + { + "_id": 224, + "Top": 227, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 225, + "Top": 228, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 226, + "Top": 229, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 227, + "Top": 230, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 228, + "Top": 231, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 229, + "Top": 232, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 230, + "Top": 233, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 231, + "Top": 234, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 232, + "Top": 235, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 233, + "Top": 236, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 234, + "Top": 237, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 235, + "Top": 238, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 236, + "Top": 239, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 237, + "Top": 240, + "Torso": 14, + "Undershirt": 39 + }, + { + "_id": 238, + "Top": 241, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 239, + "Top": 242, + "Torso": 14, + "Undershirt": 37 + }, + { + "_id": 240, + "Top": 243, + "Torso": 14, + "Undershirt": 37 + }, + { + "_id": 241, + "Top": 244, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 242, + "Top": 245, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 243, + "Top": 246, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 244, + "Top": 247, + "Torso": 15, + "Undershirt": 34 + }, + { + "_id": 245, + "Top": 248, + "Torso": 5, + "Undershirt": 34 + }, + { + "_id": 246, + "Top": 249, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 247, + "Top": 250, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 248, + "Top": 251, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 249, + "Top": 252, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 250, + "Top": 253, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 251, + "Top": 254, + "Torso": 13, + "Undershirt": 34 + }, + { + "_id": 252, + "Top": 255, + "Torso": 12, + "Undershirt": 34 + }, + { + "_id": 253, + "Top": 256, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 254, + "Top": 257, + "Torso": 7, + "Undershirt": 34 + }, + { + "_id": 255, + "Top": 258, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 256, + "Top": 259, + "Torso": 9, + "Undershirt": 34 + }, + { + "_id": 257, + "Top": 261, + "Torso": 11, + "Undershirt": 34 + }, + { + "_id": 258, + "Top": 262, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 259, + "Top": 263, + "Torso": 14, + "Undershirt": 34 + }, + { + "_id": 260, + "Top": 264, + "Torso": 14, + "Undershirt": 34 + } + ] +} \ No newline at end of file diff --git a/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs b/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs index df355fa9..09b7ace0 100644 --- a/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs +++ b/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs @@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Shop.Clothing accessoires.ToArray() }; - client.TriggerEvent("clothesMenu:updateData", JsonConvert.SerializeObject(category), JsonConvert.SerializeObject(clothes.ToArray())); + client.TriggerEvent("clothesMenu:updateData", JsonConvert.SerializeObject(category), JsonConvert.SerializeObject(clothes.ToArray()), gender); } } }