From 004b46ebed8ba55725fb60475fee12359076299e Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 8 Oct 2017 13:13:33 -0500 Subject: [PATCH] add 75 compatible male uniforms --- Sources/epoch_config/Configs/CfgPricing.hpp | 305 ++++++++++++++++++ .../configs/CfgLootTable.h | 82 ++++- .../configs/CfgLootTable_CUP.h | 79 ++++- .../configs/CfgLootTable_MAD.h | 79 ++++- .../configs/CfgLootTable_MADCUP.h | 79 ++++- Tools/SQF/getMaleUniforms.sqf | 79 +++++ changelog.md | 5 +- 7 files changed, 701 insertions(+), 7 deletions(-) create mode 100644 Tools/SQF/getMaleUniforms.sqf diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index 45145fe4..a169a1a8 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -4927,6 +4927,311 @@ class CfgPricing { price = 450; }; + + // new male start + class U_C_Commoner1_1 + { + price = 7; + }; + class U_C_Poor_2 + { + price = 7; + }; + class U_C_HunterBody_grn + { + price = 7; + }; + class U_C_Poor_shorts_1 + { + price = 7; + }; + class U_C_Commoner_shorts + { + price = 7; + }; + class U_C_ShirtSurfer_shorts + { + price = 7; + }; + class U_C_TeeSurfer_shorts_1 + { + price = 7; + }; + class U_C_TeeSurfer_shorts_2 + { + price = 7; + }; + class U_NikosBody + { + price = 7; + }; + class U_NikosAgedBody + { + price = 7; + }; + class U_IG_Guerilla1_1 + { + price = 7; + }; + class U_IG_leader + { + price = 7; + }; + class U_IG_Guerilla2_1 + { + price = 7; + }; + class U_IG_Guerilla2_3 + { + price = 7; + }; + class U_IG_Guerilla2_2 + { + price = 7; + }; + class U_IG_Guerilla3_1 + { + price = 7; + }; + class U_IG_Guerrilla_6_1 + { + price = 7; + }; + class U_OG_Guerrilla_6_1 + { + price = 7; + }; + class U_I_CombatUniform + { + price = 7; + }; + class U_I_CombatUniform_shortsleeve + { + price = 7; + }; + class U_I_HeliPilotCoveralls + { + price = 7; + }; + class U_I_pilotCoveralls + { + price = 7; + }; + class U_I_OfficerUniform + { + price = 7; + }; + class U_I_Wetsuit + { + price = 7; + }; + class U_I_GhillieSuit + { + price = 7; + }; + class U_I_CombatUniform_tshirt + { + price = 7; + }; + class U_O_OfficerUniform_ocamo + { + price = 7; + }; + class U_O_SpecopsUniform_ocamo + { + price = 7; + }; + class U_O_CombatUniform_oucamo + { + price = 7; + }; + class U_Marshal + { + price = 7; + }; + class U_B_Protagonist_VR + { + price = 7; + }; + class U_O_Protagonist_VR + { + price = 7; + }; + class U_I_Protagonist_VR + { + price = 7; + }; + class U_I_FullGhillie_lsh + { + price = 7; + }; + class U_I_FullGhillie_sard + { + price = 7; + }; + class U_I_FullGhillie_ard + { + price = 7; + }; + class U_I_C_Soldier_Para_1_F + { + price = 7; + }; + class U_I_C_Soldier_Para_2_F + { + price = 7; + }; + class U_I_C_Soldier_Para_3_F + { + price = 7; + }; + class U_I_C_Soldier_Para_4_F + { + price = 7; + }; + class U_I_C_Soldier_Para_5_F + { + price = 7; + }; + class U_I_C_Soldier_Bandit_1_F + { + price = 7; + }; + class U_I_C_Soldier_Bandit_2_F + { + price = 7; + }; + class U_I_C_Soldier_Bandit_3_F + { + price = 7; + }; + class U_I_C_Soldier_Bandit_4_F + { + price = 7; + }; + class U_I_C_Soldier_Bandit_5_F + { + price = 7; + }; + class U_I_C_Soldier_Camo_F + { + price = 7; + }; + class U_O_T_Soldier_F + { + price = 7; + }; + class U_O_T_Officer_F + { + price = 7; + }; + class U_O_T_Sniper_F + { + price = 7; + }; + class U_O_T_FullGhillie_tna_F + { + price = 7; + }; + class U_O_V_Soldier_Viper_F + { + price = 7; + }; + class U_O_V_Soldier_Viper_hex_F + { + price = 7; + }; + class U_C_man_sport_1_F + { + price = 7; + }; + class U_C_man_sport_2_F + { + price = 7; + }; + class U_C_man_sport_3_F + { + price = 7; + }; + class U_C_Man_casual_1_F + { + price = 7; + }; + class U_C_Man_casual_2_F + { + price = 7; + }; + class U_C_Man_casual_3_F + { + price = 7; + }; + class U_C_Man_casual_4_F + { + price = 7; + }; + class U_C_Man_casual_5_F + { + price = 7; + }; + class U_C_Man_casual_6_F + { + price = 7; + }; + class U_C_IDAP_Man_cargo_F + { + price = 7; + }; + class U_C_IDAP_Man_jeans_F + { + price = 7; + }; + class U_C_IDAP_Man_TeeShorts_F + { + price = 7; + }; + class U_C_IDAP_Man_Tee_F + { + price = 7; + }; + class U_C_IDAP_Man_casual_F + { + price = 7; + }; + class U_C_IDAP_Man_shorts_F + { + price = 7; + }; + class U_C_ConstructionCoverall_Red_F + { + price = 7; + }; + class U_C_ConstructionCoverall_vrana_F + { + price = 7; + }; + class U_C_ConstructionCoverall_Black_F + { + price = 7; + }; + class U_C_ConstructionCoverall_Blue_F + { + price = 7; + }; + class U_C_Paramedic_01_F + { + price = 7; + }; + class U_C_IDAP_Man_Casual_F + { + price = 7; + }; + class U_C_Mechanic_01_F + { + price = 7; + }; + + // new male stop + class U_JeansPatched1_uniform { price = 5; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index 88b3e5a3..7bbd6cfa 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -1088,10 +1088,89 @@ class CfgLootTable { { "U_C_Scientist", "item" }, 1 }, { { "U_OrestesBody", "item" }, 1 }, { { "DLCUniforms", "CfgLootTable" }, 1 }, - { { "MaleUniforms_FullGhillieMarkDLC", "CfgLootTable" }, 1 } + { { "MaleUniforms_FullGhillieMarkDLC", "CfgLootTable" }, 1 }, + + // new uniforms + { { "U_C_Commoner1_1", "item" }, 1 }, + { { "U_C_Poor_2", "item" }, 1 }, + { { "U_C_HunterBody_grn", "item" }, 1 }, + { { "U_C_Poor_shorts_1", "item" }, 1 }, + { { "U_C_Commoner_shorts", "item" }, 1 }, + { { "U_C_ShirtSurfer_shorts", "item" }, 1 }, + { { "U_C_TeeSurfer_shorts_1", "item" }, 1 }, + { { "U_C_TeeSurfer_shorts_2", "item" }, 1 }, + { { "U_NikosBody", "item" }, 1 }, + { { "U_NikosAgedBody", "item" }, 1 }, + { { "U_IG_Guerilla1_1", "item" }, 1 }, + { { "U_IG_leader", "item" }, 1 }, + { { "U_IG_Guerilla2_1", "item" }, 1 }, + { { "U_IG_Guerilla2_3", "item" }, 1 }, + { { "U_IG_Guerilla2_2", "item" }, 1 }, + { { "U_IG_Guerilla3_1", "item" }, 1 }, + { { "U_IG_Guerrilla_6_1", "item" }, 1 }, + { { "U_OG_Guerrilla_6_1", "item" }, 1 }, + { { "U_I_CombatUniform", "item" }, 1 }, + { { "U_I_CombatUniform_shortsleeve", "item" }, 1 }, + { { "U_I_HeliPilotCoveralls", "item" }, 1 }, + { { "U_I_pilotCoveralls", "item" }, 1 }, + { { "U_I_OfficerUniform", "item" }, 1 }, + { { "U_I_Wetsuit", "item" }, 1 }, + { { "U_I_GhillieSuit", "item" }, 1 }, + { { "U_I_CombatUniform_tshirt", "item" }, 1 }, + { { "U_O_OfficerUniform_ocamo", "item" }, 1 }, + { { "U_O_SpecopsUniform_ocamo", "item" }, 1 }, + { { "U_O_CombatUniform_oucamo", "item" }, 1 }, + { { "U_Marshal", "item" }, 1 }, + { { "U_B_Protagonist_VR", "item" }, 1 }, + { { "U_O_Protagonist_VR", "item" }, 1 }, + { { "U_I_Protagonist_VR", "item" }, 1 }, + { { "U_I_FullGhillie_lsh", "item" }, 1 }, + { { "U_I_FullGhillie_sard", "item" }, 1 }, + { { "U_I_FullGhillie_ard", "item" }, 1 }, + { { "U_I_C_Soldier_Para_1_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_2_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_3_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_4_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_5_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_1_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_2_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_3_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_4_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_5_F", "item" }, 1 }, + { { "U_I_C_Soldier_Camo_F", "item" }, 1 }, + { { "U_O_T_Soldier_F", "item" }, 1 }, + { { "U_O_T_Officer_F", "item" }, 1 }, + { { "U_O_T_Sniper_F", "item" }, 1 }, + { { "U_O_T_FullGhillie_tna_F", "item" }, 1 }, + { { "U_O_V_Soldier_Viper_F", "item" }, 1 }, + { { "U_O_V_Soldier_Viper_hex_F", "item" }, 1 }, + { { "U_C_man_sport_1_F", "item" }, 1 }, + { { "U_C_man_sport_2_F", "item" }, 1 }, + { { "U_C_man_sport_3_F", "item" }, 1 }, + { { "U_C_Man_casual_1_F", "item" }, 1 }, + { { "U_C_Man_casual_2_F", "item" }, 1 }, + { { "U_C_Man_casual_3_F", "item" }, 1 }, + { { "U_C_Man_casual_4_F", "item" }, 1 }, + { { "U_C_Man_casual_5_F", "item" }, 1 }, + { { "U_C_Man_casual_6_F", "item" }, 1 }, + { { "U_C_IDAP_Man_cargo_F", "item" }, 1 }, + { { "U_C_IDAP_Man_jeans_F", "item" }, 1 }, + { { "U_C_IDAP_Man_TeeShorts_F", "item" }, 1 }, + { { "U_C_IDAP_Man_Tee_F", "item" }, 1 }, + { { "U_C_IDAP_Man_casual_F", "item" }, 1 }, + { { "U_C_IDAP_Man_shorts_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Red_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_vrana_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Black_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Blue_F", "item" }, 1 }, + { { "U_C_Paramedic_01_F", "item" }, 1 }, + { { "U_C_IDAP_Man_Casual_F", "item" }, 1 }, + { { "U_C_Mechanic_01_F", "item" }, 1 } + }; }; + class MaleUniforms_FullGhillieMarkDLC { items[] = { @@ -1121,7 +1200,6 @@ class CfgLootTable { { "U_OG_Guerilla2_2", "item" }, 1 }, { { "U_OG_Guerilla2_3", "item" }, 1 }, { { "U_OG_Guerilla3_1", "item" }, 1 }, - { { "U_OG_Guerilla3_2", "item" }, 1 }, { { "U_OG_leader", "item" }, 1 } }; }; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h index 89714b69..ccbcfefd 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h @@ -1651,7 +1651,84 @@ class CfgLootTable_CUP { { "U_C_Scientist", "item" }, 1 }, { { "U_OrestesBody", "item" }, 1 }, { { "DLCUniforms", "CfgLootTable" }, 1 }, - { { "MaleUniforms_FullGhillieMarkDLC", "CfgLootTable" }, 1 } + { { "MaleUniforms_FullGhillieMarkDLC", "CfgLootTable" }, 1 }, + + // new uniforms + { { "U_C_Commoner1_1", "item" }, 1 }, + { { "U_C_Poor_2", "item" }, 1 }, + { { "U_C_HunterBody_grn", "item" }, 1 }, + { { "U_C_Poor_shorts_1", "item" }, 1 }, + { { "U_C_Commoner_shorts", "item" }, 1 }, + { { "U_C_ShirtSurfer_shorts", "item" }, 1 }, + { { "U_C_TeeSurfer_shorts_1", "item" }, 1 }, + { { "U_C_TeeSurfer_shorts_2", "item" }, 1 }, + { { "U_NikosBody", "item" }, 1 }, + { { "U_NikosAgedBody", "item" }, 1 }, + { { "U_IG_Guerilla1_1", "item" }, 1 }, + { { "U_IG_leader", "item" }, 1 }, + { { "U_IG_Guerilla2_1", "item" }, 1 }, + { { "U_IG_Guerilla2_3", "item" }, 1 }, + { { "U_IG_Guerilla2_2", "item" }, 1 }, + { { "U_IG_Guerilla3_1", "item" }, 1 }, + { { "U_IG_Guerrilla_6_1", "item" }, 1 }, + { { "U_OG_Guerrilla_6_1", "item" }, 1 }, + { { "U_I_CombatUniform", "item" }, 1 }, + { { "U_I_CombatUniform_shortsleeve", "item" }, 1 }, + { { "U_I_HeliPilotCoveralls", "item" }, 1 }, + { { "U_I_pilotCoveralls", "item" }, 1 }, + { { "U_I_OfficerUniform", "item" }, 1 }, + { { "U_I_Wetsuit", "item" }, 1 }, + { { "U_I_GhillieSuit", "item" }, 1 }, + { { "U_I_CombatUniform_tshirt", "item" }, 1 }, + { { "U_O_OfficerUniform_ocamo", "item" }, 1 }, + { { "U_O_SpecopsUniform_ocamo", "item" }, 1 }, + { { "U_O_CombatUniform_oucamo", "item" }, 1 }, + { { "U_Marshal", "item" }, 1 }, + { { "U_B_Protagonist_VR", "item" }, 1 }, + { { "U_O_Protagonist_VR", "item" }, 1 }, + { { "U_I_Protagonist_VR", "item" }, 1 }, + { { "U_I_FullGhillie_lsh", "item" }, 1 }, + { { "U_I_FullGhillie_sard", "item" }, 1 }, + { { "U_I_FullGhillie_ard", "item" }, 1 }, + { { "U_I_C_Soldier_Para_1_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_2_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_3_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_4_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_5_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_1_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_2_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_3_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_4_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_5_F", "item" }, 1 }, + { { "U_I_C_Soldier_Camo_F", "item" }, 1 }, + { { "U_O_T_Soldier_F", "item" }, 1 }, + { { "U_O_T_Officer_F", "item" }, 1 }, + { { "U_O_T_Sniper_F", "item" }, 1 }, + { { "U_O_T_FullGhillie_tna_F", "item" }, 1 }, + { { "U_O_V_Soldier_Viper_F", "item" }, 1 }, + { { "U_O_V_Soldier_Viper_hex_F", "item" }, 1 }, + { { "U_C_man_sport_1_F", "item" }, 1 }, + { { "U_C_man_sport_2_F", "item" }, 1 }, + { { "U_C_man_sport_3_F", "item" }, 1 }, + { { "U_C_Man_casual_1_F", "item" }, 1 }, + { { "U_C_Man_casual_2_F", "item" }, 1 }, + { { "U_C_Man_casual_3_F", "item" }, 1 }, + { { "U_C_Man_casual_4_F", "item" }, 1 }, + { { "U_C_Man_casual_5_F", "item" }, 1 }, + { { "U_C_Man_casual_6_F", "item" }, 1 }, + { { "U_C_IDAP_Man_cargo_F", "item" }, 1 }, + { { "U_C_IDAP_Man_jeans_F", "item" }, 1 }, + { { "U_C_IDAP_Man_TeeShorts_F", "item" }, 1 }, + { { "U_C_IDAP_Man_Tee_F", "item" }, 1 }, + { { "U_C_IDAP_Man_casual_F", "item" }, 1 }, + { { "U_C_IDAP_Man_shorts_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Red_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_vrana_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Black_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Blue_F", "item" }, 1 }, + { { "U_C_Paramedic_01_F", "item" }, 1 }, + { { "U_C_IDAP_Man_Casual_F", "item" }, 1 }, + { { "U_C_Mechanic_01_F", "item" }, 1 } }; }; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h index 58045a45..c037b5de 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h @@ -1093,7 +1093,84 @@ class CfgLootTable_MAD { { "U_C_Scientist", "item" }, 1 }, { { "U_OrestesBody", "item" }, 1 }, { { "DLCUniforms", "CfgLootTable" }, 1 }, - { { "MaleUniforms_FullGhillieMarkDLC", "CfgLootTable" }, 1 } + { { "MaleUniforms_FullGhillieMarkDLC", "CfgLootTable" }, 1 }, + + // new uniforms + { { "U_C_Commoner1_1", "item" }, 1 }, + { { "U_C_Poor_2", "item" }, 1 }, + { { "U_C_HunterBody_grn", "item" }, 1 }, + { { "U_C_Poor_shorts_1", "item" }, 1 }, + { { "U_C_Commoner_shorts", "item" }, 1 }, + { { "U_C_ShirtSurfer_shorts", "item" }, 1 }, + { { "U_C_TeeSurfer_shorts_1", "item" }, 1 }, + { { "U_C_TeeSurfer_shorts_2", "item" }, 1 }, + { { "U_NikosBody", "item" }, 1 }, + { { "U_NikosAgedBody", "item" }, 1 }, + { { "U_IG_Guerilla1_1", "item" }, 1 }, + { { "U_IG_leader", "item" }, 1 }, + { { "U_IG_Guerilla2_1", "item" }, 1 }, + { { "U_IG_Guerilla2_3", "item" }, 1 }, + { { "U_IG_Guerilla2_2", "item" }, 1 }, + { { "U_IG_Guerilla3_1", "item" }, 1 }, + { { "U_IG_Guerrilla_6_1", "item" }, 1 }, + { { "U_OG_Guerrilla_6_1", "item" }, 1 }, + { { "U_I_CombatUniform", "item" }, 1 }, + { { "U_I_CombatUniform_shortsleeve", "item" }, 1 }, + { { "U_I_HeliPilotCoveralls", "item" }, 1 }, + { { "U_I_pilotCoveralls", "item" }, 1 }, + { { "U_I_OfficerUniform", "item" }, 1 }, + { { "U_I_Wetsuit", "item" }, 1 }, + { { "U_I_GhillieSuit", "item" }, 1 }, + { { "U_I_CombatUniform_tshirt", "item" }, 1 }, + { { "U_O_OfficerUniform_ocamo", "item" }, 1 }, + { { "U_O_SpecopsUniform_ocamo", "item" }, 1 }, + { { "U_O_CombatUniform_oucamo", "item" }, 1 }, + { { "U_Marshal", "item" }, 1 }, + { { "U_B_Protagonist_VR", "item" }, 1 }, + { { "U_O_Protagonist_VR", "item" }, 1 }, + { { "U_I_Protagonist_VR", "item" }, 1 }, + { { "U_I_FullGhillie_lsh", "item" }, 1 }, + { { "U_I_FullGhillie_sard", "item" }, 1 }, + { { "U_I_FullGhillie_ard", "item" }, 1 }, + { { "U_I_C_Soldier_Para_1_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_2_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_3_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_4_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_5_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_1_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_2_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_3_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_4_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_5_F", "item" }, 1 }, + { { "U_I_C_Soldier_Camo_F", "item" }, 1 }, + { { "U_O_T_Soldier_F", "item" }, 1 }, + { { "U_O_T_Officer_F", "item" }, 1 }, + { { "U_O_T_Sniper_F", "item" }, 1 }, + { { "U_O_T_FullGhillie_tna_F", "item" }, 1 }, + { { "U_O_V_Soldier_Viper_F", "item" }, 1 }, + { { "U_O_V_Soldier_Viper_hex_F", "item" }, 1 }, + { { "U_C_man_sport_1_F", "item" }, 1 }, + { { "U_C_man_sport_2_F", "item" }, 1 }, + { { "U_C_man_sport_3_F", "item" }, 1 }, + { { "U_C_Man_casual_1_F", "item" }, 1 }, + { { "U_C_Man_casual_2_F", "item" }, 1 }, + { { "U_C_Man_casual_3_F", "item" }, 1 }, + { { "U_C_Man_casual_4_F", "item" }, 1 }, + { { "U_C_Man_casual_5_F", "item" }, 1 }, + { { "U_C_Man_casual_6_F", "item" }, 1 }, + { { "U_C_IDAP_Man_cargo_F", "item" }, 1 }, + { { "U_C_IDAP_Man_jeans_F", "item" }, 1 }, + { { "U_C_IDAP_Man_TeeShorts_F", "item" }, 1 }, + { { "U_C_IDAP_Man_Tee_F", "item" }, 1 }, + { { "U_C_IDAP_Man_casual_F", "item" }, 1 }, + { { "U_C_IDAP_Man_shorts_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Red_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_vrana_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Black_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Blue_F", "item" }, 1 }, + { { "U_C_Paramedic_01_F", "item" }, 1 }, + { { "U_C_IDAP_Man_Casual_F", "item" }, 1 }, + { { "U_C_Mechanic_01_F", "item" }, 1 } }; }; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h index f3376aca..c1571f64 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h @@ -1656,7 +1656,84 @@ class CfgLootTable_MADCUP { { "U_C_Scientist", "item" }, 1 }, { { "U_OrestesBody", "item" }, 1 }, { { "DLCUniforms", "CfgLootTable" }, 1 }, - { { "MaleUniforms_FullGhillieMarkDLC", "CfgLootTable" }, 1 } + { { "MaleUniforms_FullGhillieMarkDLC", "CfgLootTable" }, 1 }, + + // new uniforms + { { "U_C_Commoner1_1", "item" }, 1 }, + { { "U_C_Poor_2", "item" }, 1 }, + { { "U_C_HunterBody_grn", "item" }, 1 }, + { { "U_C_Poor_shorts_1", "item" }, 1 }, + { { "U_C_Commoner_shorts", "item" }, 1 }, + { { "U_C_ShirtSurfer_shorts", "item" }, 1 }, + { { "U_C_TeeSurfer_shorts_1", "item" }, 1 }, + { { "U_C_TeeSurfer_shorts_2", "item" }, 1 }, + { { "U_NikosBody", "item" }, 1 }, + { { "U_NikosAgedBody", "item" }, 1 }, + { { "U_IG_Guerilla1_1", "item" }, 1 }, + { { "U_IG_leader", "item" }, 1 }, + { { "U_IG_Guerilla2_1", "item" }, 1 }, + { { "U_IG_Guerilla2_3", "item" }, 1 }, + { { "U_IG_Guerilla2_2", "item" }, 1 }, + { { "U_IG_Guerilla3_1", "item" }, 1 }, + { { "U_IG_Guerrilla_6_1", "item" }, 1 }, + { { "U_OG_Guerrilla_6_1", "item" }, 1 }, + { { "U_I_CombatUniform", "item" }, 1 }, + { { "U_I_CombatUniform_shortsleeve", "item" }, 1 }, + { { "U_I_HeliPilotCoveralls", "item" }, 1 }, + { { "U_I_pilotCoveralls", "item" }, 1 }, + { { "U_I_OfficerUniform", "item" }, 1 }, + { { "U_I_Wetsuit", "item" }, 1 }, + { { "U_I_GhillieSuit", "item" }, 1 }, + { { "U_I_CombatUniform_tshirt", "item" }, 1 }, + { { "U_O_OfficerUniform_ocamo", "item" }, 1 }, + { { "U_O_SpecopsUniform_ocamo", "item" }, 1 }, + { { "U_O_CombatUniform_oucamo", "item" }, 1 }, + { { "U_Marshal", "item" }, 1 }, + { { "U_B_Protagonist_VR", "item" }, 1 }, + { { "U_O_Protagonist_VR", "item" }, 1 }, + { { "U_I_Protagonist_VR", "item" }, 1 }, + { { "U_I_FullGhillie_lsh", "item" }, 1 }, + { { "U_I_FullGhillie_sard", "item" }, 1 }, + { { "U_I_FullGhillie_ard", "item" }, 1 }, + { { "U_I_C_Soldier_Para_1_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_2_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_3_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_4_F", "item" }, 1 }, + { { "U_I_C_Soldier_Para_5_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_1_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_2_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_3_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_4_F", "item" }, 1 }, + { { "U_I_C_Soldier_Bandit_5_F", "item" }, 1 }, + { { "U_I_C_Soldier_Camo_F", "item" }, 1 }, + { { "U_O_T_Soldier_F", "item" }, 1 }, + { { "U_O_T_Officer_F", "item" }, 1 }, + { { "U_O_T_Sniper_F", "item" }, 1 }, + { { "U_O_T_FullGhillie_tna_F", "item" }, 1 }, + { { "U_O_V_Soldier_Viper_F", "item" }, 1 }, + { { "U_O_V_Soldier_Viper_hex_F", "item" }, 1 }, + { { "U_C_man_sport_1_F", "item" }, 1 }, + { { "U_C_man_sport_2_F", "item" }, 1 }, + { { "U_C_man_sport_3_F", "item" }, 1 }, + { { "U_C_Man_casual_1_F", "item" }, 1 }, + { { "U_C_Man_casual_2_F", "item" }, 1 }, + { { "U_C_Man_casual_3_F", "item" }, 1 }, + { { "U_C_Man_casual_4_F", "item" }, 1 }, + { { "U_C_Man_casual_5_F", "item" }, 1 }, + { { "U_C_Man_casual_6_F", "item" }, 1 }, + { { "U_C_IDAP_Man_cargo_F", "item" }, 1 }, + { { "U_C_IDAP_Man_jeans_F", "item" }, 1 }, + { { "U_C_IDAP_Man_TeeShorts_F", "item" }, 1 }, + { { "U_C_IDAP_Man_Tee_F", "item" }, 1 }, + { { "U_C_IDAP_Man_casual_F", "item" }, 1 }, + { { "U_C_IDAP_Man_shorts_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Red_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_vrana_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Black_F", "item" }, 1 }, + { { "U_C_ConstructionCoverall_Blue_F", "item" }, 1 }, + { { "U_C_Paramedic_01_F", "item" }, 1 }, + { { "U_C_IDAP_Man_Casual_F", "item" }, 1 }, + { { "U_C_Mechanic_01_F", "item" }, 1 } }; }; diff --git a/Tools/SQF/getMaleUniforms.sqf b/Tools/SQF/getMaleUniforms.sqf new file mode 100644 index 00000000..b3d10724 --- /dev/null +++ b/Tools/SQF/getMaleUniforms.sqf @@ -0,0 +1,79 @@ +// makes loot and price configs for missing compatible items. + +// get all model classes +EP = (configProperties [configFile >> "CfgVehicles", "isClass _x" , true]); + +// list existing uniforms +_existing = ["U_O_CombatUniform_ocamo", +"U_O_GhillieSuit", +"U_O_PilotCoveralls", +"U_O_Wetsuit", +"U_C_Poor_1", +"U_C_WorkerCoveralls", +"U_C_Journalist", +"U_C_Scientist", +"U_OrestesBody", +"U_O_FullGhillie_lsh", +"U_O_FullGhillie_sard", +"U_O_FullGhillie_ard", +"U_C_Poloshirt_stripped", +"U_C_Poloshirt_blue", +"U_C_Poloshirt_burgundy", +"U_C_Poloshirt_tricolour", +"U_C_Poloshirt_salmon", +"U_C_Poloshirt_redwhite", +"U_OG_Guerilla1_1", +"U_OG_Guerilla2_1", +"U_OG_Guerilla2_2", +"U_OG_Guerilla2_3", +"U_OG_Guerilla3_1", +"U_OG_Guerilla3_2", +"U_OG_leader", +"U_C_Driver_1", +"U_C_Driver_2", +"U_C_Driver_3", +"U_C_Driver_4", +"U_C_Driver_1_black", +"U_C_Driver_1_blue", +"U_C_Driver_1_green", +"U_C_Driver_1_red", +"U_C_Driver_1_white", +"U_C_Driver_1_yellow", +"U_C_Driver_1_orange", +"U_C_Driver_1_red"]; + +_compatibleUniformClasses = EP select {(3 in getArray(_x >> "modelSides")) && !(1 in getArray(_x >> "modelSides"))}; +_compatibleUniforms = []; +{ + _uniform = getText(_x >> "uniformClass"); + if (_uniform != "") then { + _compatibleUniforms pushBackUnique _uniform; + }; +} forEach _compatibleUniformClasses; + +_badUniforms = []; +{ + if !(_x in _compatibleUniforms) then { + _badUniforms pushBackUnique _x; + }; +} forEach _existing; + +// remove +_finalUniforms = _compatibleUniforms - _existing; + +_configStr = ""; +{ + _configStr = _configStr + format[' +{ { "%1", "item" }, 1 },',_x]; +} forEach _finalUniforms; + + +{ + _configStr = _configStr + format[' +class %1 +{ + price = 7; +};',_x]; +} forEach _finalUniforms; + +copyToClipboard _configStr; diff --git a/changelog.md b/changelog.md index e62be793..16f9463b 100644 --- a/changelog.md +++ b/changelog.md @@ -15,6 +15,7 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a - Medical items: Adrenaline Shot (adrenaline_epoch), Caffeine Pills (caffeinepills_epoch). Orlistat Pills (orlistat_epoch) by @Helion4 and configs by @DirtySanchez - Food items: ItemCereals, ItemPowderMilk_F, ItemRiceBox, ItemVitamins. @DirtySanchez - 84 new Female outfits based on 20 top designs and 4 new pairs of jeans(Blue Patched, Arid Brown, Black/Brown, Black). @DirtySanchez, @ComatoseBadger +- Pricing and loot table additions for 75 additional male uniforms. - Vehicle Ammo Reloading from Inventory and Vehicle Ammo. @DirtySanchez - Radiation System with radioactive out of bounds, locations, and random crashed satellites. Model @Helion4 - Digital Geiger Counter - used to detect Radiation. (Sounds @vbawol, Model @Helion4, and UI + digital font @raymix) @@ -36,7 +37,7 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a - Map support for Chernarus Redux. @xDrokZ and @morgoth0 ### Changed -- Male players can wear nearly all uniforms now. @Ignatz-Heman +- Male players can wear civilian compatible uniforms. Note that West (side = 1) is still reserved for females. @Ignatz-Heman - Crafting recipes can now have item requirements and Crafting metal bars now require Smelting Tools. - Player save and login optimized to use get|setUnitLoadout. - Karma now persists death and moved to community stats. @@ -63,7 +64,7 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a - Zombie falsely triggers Mission success. @Ignatz-Heman - Base Building 90° and 270° Snap was broken. - Sometimes snapped Base Building elements rotated back on save. -- BE kick since 1.70. +- BE kicks since 1.76. ## [0.5.0.0] - 2017-03-17 ### Added