Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional STANAG compatibility request #66

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Dev Files/**/*
Images/**/*
TRYK**/**/*
To Add/**/*/
VKN_Languages/de_tabler/**/*
VKN_Languages/tabler/**/*
**.ini
**.rar
**.zip
Expand All @@ -14,3 +16,4 @@ To Add/**/*/
**.wss
**.wav
**.xcf
**.exe
2 changes: 1 addition & 1 deletion VKN_Functions/Functions/EFM/fn_handleCore.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Script name: fn_handleCore.sqf
Created on: 27 July 2021
Created on: 27 July 2021
Author: Curious

License: This file is under "Arma Public License No Derivatives (APL-ND)"
Expand Down
30 changes: 30 additions & 0 deletions VKN_Functions/Functions/VTT/fn_basicSettingsDisplay.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ _ctrl_complete_button = _VTT_Basic_Settings_Display displayCtrl 1600;
_ctrl_groups_check_Box = _VTT_Basic_Settings_Display displayCtrl 2800;
_ctrl_loadout_check_Box = _VTT_Basic_Settings_Display displayCtrl 2801;

_VTT_defaultGroups = profileNamespace getVariable [ "VKN_VTT_defaultGroups_var", true];
_VTT_defaultLoadouts = profileNamespace getVariable [ "VKN_VTT_defaultLoadouts_var", true];


//Add sides to listbox
{ _ctrl_Players_Side_Combo lbAdd str _x } forEach _sides;

Expand Down Expand Up @@ -86,6 +90,15 @@ VKN_fnc_sideChanged = {
_side_lbText = "";
_cursorIndex = lbCurSel _ctrl_Players_Side_Combo;
_side_lbText = _ctrl_Players_Side_Combo lbText _cursorIndex;

/*
_VTT_defaultSide = profileNamespace getVariable [ "VKN_VTT_defaultSide_var", "WEST"];
if (_VTT_defaultSide == "") then {
_side = toUpper _side_lbText;
} else {
_side = _VTT_defaultSide;
};
*/
_side = toUpper _side_lbText;

//get all factions in a side.
Expand All @@ -111,6 +124,15 @@ VKN_fnc_sideChanged = {
_faction_lbText = "";
private _cursorIndex = lbCurSel _ctrl_Faction_Combo;
_faction_lbText = _ctrl_Faction_Combo lbText _cursorIndex;

/*
_VTT_defaultFaction = profileNamespace getVariable [ "VKN_VTT_defaultFaction_var", "BLU_F"];
if (_VTT_defaultFaction == "") then {
_curSelFac = toUpper _faction_lbText;
} else {
_curSelFac = _VTT_defaultFaction;
};
*/
_curSelFac = toUpper _faction_lbText;

//apply group
Expand All @@ -133,6 +155,14 @@ _ctrl_Players_Side_Combo lbSetCurSel 0;
sleep 0.1;
_ctrl_Faction_Combo lbSetCurSel 0;
sleep 0.1;
/*
_VTT_defaultSquad = profileNamespace getVariable [ "VKN_VTT_defaultSquad_var", "Rifle Squad"];
if (_VTT_defaultSquad == "") then {
_ctrl_Squad_Combo lbSetCurSel 0;
} else {
_ctrl_Squad_Combo = _VTT_defaultSquad;
};
*/
_ctrl_Squad_Combo lbSetCurSel 0;
sleep 0.1;
_ctrl_Spectator_Combo lbSetCurSel 2;
Expand Down
2 changes: 1 addition & 1 deletion VKN_Functions/Functions/VTT/fn_defaultFileText.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ _ctrl_initplayerServer_edit_text = profileNamespace getVariable [ "VKN_VTT_initP
_ctrl_initServer_edit_text = profileNamespace getVariable [ "VKN_VTT_initServer_var", ""];
_ctrl_onplayerKilled_edit_text = profileNamespace getVariable [ "VKN_VTT_onPlayerKilled_var", format ["[player, [missionnamespace, 'inventory_var']] call BIS_fnc_saveinventory;%1['Initialize', %2", endl, missionNamespace getVariable ["VKN_VTT_SpectatorOptions", "[ player, [], false, false, true]] call BIS_fnc_EGSpectator;"]]];
_ctrl_onplayerRespawn_edit_text = profileNamespace getVariable [ "VKN_VTT_onPlayerRespawn_var", format ["[player, [missionnamespace, 'inventory_var']] call BIS_fnc_loadinventory;%1['Terminate', [ player]] call BIS_fnc_EGSpectator;", endl]];
_ctrl_description_edit_text = profileNamespace getVariable [ "VKN_VTT_initText_var", format ["respawnOnStart = 0;%1respawnTemplatesVirtual[] = {};", endl]];
_ctrl_description_edit_text = profileNamespace getVariable [ "VKN_VTT_descriptionText_var", format ["respawnOnStart = 0;%1respawnTemplatesVirtual[] = {};", endl]];


_returnArray = [_ctrl_init_edit_text, _ctrl_initplayerlocal_edit_text, _ctrl_initplayerServer_edit_text, _ctrl_initServer_edit_text, _ctrl_onplayerKilled_edit_text, _ctrl_onplayerRespawn_edit_text, _ctrl_description_edit_text];
Expand Down
6 changes: 4 additions & 2 deletions VKN_Functions/Functions/fn_arsenalAnimations.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_VKN_ArsenalAnimation = profileNamespace getVariable "VKN_VKN_ArsenalAnimation_var";
_VKN_ArsenalAnimation = profileNamespace getVariable ["VKN_VKN_ArsenalAnimation_var", true];

if !(_VKN_ArsenalAnimation) exitWith {};

Expand Down Expand Up @@ -91,10 +91,12 @@ if !(_VKN_ArsenalAnimation) exitWith {};
while {_isOpen} do {
{
_isOpen = profileNamespace getVariable "VKN_ArsenalOpen";
if !(_isOpen) exitWith {};
_player playMoveNow _x;
waitUntil { ((animationState _player) != _x) };
sleep random [6, 10, 20];
} forEach _animArray;
} forEach _animArray;
if !(_isOpen) exitWith {};
};
};
default {
Expand Down
2 changes: 1 addition & 1 deletion VKN_Functions/XEH_Preinit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ _strategicMapVal = profileNamespace getVariable ["VKN_strategicMapValue_var", tr
}
] call CBA_settings_fnc_init;

_VKN_ArsenalAnimation = profileNamespace getVariable ["VKN_VKN_ArsenalAnimation_var", true];
_VKN_ArsenalAnimation = profileNamespace getVariable ["VKN_VKN_ArsenalAnimation_var", false];
[
"VKN_arsenal_animations",
"CHECKBOX",
Expand Down
68 changes: 44 additions & 24 deletions VKN_Gear/cfgVehicles/uniforms.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -618,46 +618,66 @@ class VKN_Dummy_I_Shirt_DDPM_1: VKN_Dummy_Button_Up_Base {

///// Gorka

class VKN_Dummy_mntsuit_Brown_Khaki: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_BrownKhaki_co.paa"};
class VKN_Dummy_mntsuit_aor_black: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_aor_black_co.paa"};
};

class VKN_Dummy_mntsuit_Brown_Jeans: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_BrownJeans_co.paa"};
class VKN_Dummy_mntsuit_aor_green: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_aor_green_co.paa"};
};

class VKN_Dummy_mntsuit_Green_Jeans: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_GreenJeans_co.paa"};
class VKN_Dummy_mntsuit_aor_grey: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_aor_grey_co.paa"};
};

class VKN_Dummy_mntsuit_Green_Khaki: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_GreenKhaki_co.paa"};
class VKN_Dummy_mntsuit_aor2_black: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_aor2_black_co.paa"};
};

class VKN_Dummy_mntsuit_Green_Multicam: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_GreenMulticam_co.paa"};
class VKN_Dummy_mntsuit_aor2_grey: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_aor2_grey_co.paa"};
};

class VKN_Dummy_mntsuit_Blue_Jeans: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_BlueJeans_co.paa"};
class VKN_Dummy_mntsuit_multicam_black: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_multicam_black_co.paa"};
};

class VKN_Dummy_mntsuit_Blue_Khaki: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_BlueKhaki_co.paa"};
class VKN_Dummy_mntsuit_multicam_green: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_multicam_green_co.paa"};
};

class VKN_Dummy_mntsuit_Blue_Multicam: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_BlueMulticam_co.paa"};
class VKN_Dummy_mntsuit_multicam_grey: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_multicam_grey_co.paa"};
};

class VKN_Dummy_mntsuit_winter_full: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_winter_full_co.paa"};
};

class VKN_Dummy_mntsuit_winter_half: O_R_Gorka_base_F {
author = "Jonmo";
hiddenSelectionsTextures[] = {"\vkn_gear\data\uniforms\vkn_mntsuit_winter_half_co.paa"};
};

class VKN_Dummy_mntsuit_Brown_Khaki: VKN_Dummy_mntsuit_multicam_black {};
class VKN_Dummy_mntsuit_Brown_Jeans: VKN_Dummy_mntsuit_multicam_black {};
class VKN_Dummy_mntsuit_Green_Jeans: VKN_Dummy_mntsuit_multicam_black {};
class VKN_Dummy_mntsuit_Green_Khaki: VKN_Dummy_mntsuit_multicam_black {};
class VKN_Dummy_mntsuit_Green_Multicam: VKN_Dummy_mntsuit_multicam_black {};
class VKN_Dummy_mntsuit_Blue_Jeans: VKN_Dummy_mntsuit_multicam_black {};
class VKN_Dummy_mntsuit_Blue_Khaki: VKN_Dummy_mntsuit_multicam_black {};
class VKN_Dummy_mntsuit_Blue_Multicam: VKN_Dummy_mntsuit_multicam_black {};


///// civ

class VKN_Dummy_C_Shirt_White_Jeans: C_Story_Mechanic_01_F {
Expand Down
50 changes: 50 additions & 0 deletions VKN_Gear/cfgWeapons/extractNames.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
output = open("output.txt", "a")

Uniforms = open("uniforms.hpp", "rt")
unidata = Uniforms.readlines()
Vests = open("vests.hpp", "rt")
vestdata = Vests.readlines()
Headgear = open("headgear.hpp", "rt")
headdata = Headgear.readlines()

allData = []

allData.append(unidata)
allData.append(vestdata)
allData.append(headdata)

print(allData)

FilteredData = []

for line in unidata:
if "displayName =" in line:
print(line)
FilteredData.append(line)

for line in vestdata:
if "displayName =" in line:
print(line)
FilteredData.append(line)

for line in headdata:
if "displayName =" in line:
print(line)
FilteredData.append(line)


for line in FilteredData:
output.writelines(line)


output.close()
input()


# example: $STR_VKN_combatUniform_rolledM90

# needs to change [vkn] to vkn and add $STR_ to the front.
# needs to replace spaces with _
# needs to remove -
# needs to remove ()
# needs to remove /
93 changes: 93 additions & 0 deletions VKN_Gear/cfgWeapons/output.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
displayName = "[VKN] Functionary Suit (Dark Grey + Red Tie)";
displayName = "[VKN] Functionary Suit (Dark Red + Black Tie)";
displayName = "[VKN] Functionary Suit (Dark Blue + Blue Tie)";
displayName = "$STR_VKN_combatUniform_rolledM90";
displayName = "[VKN] Combat Uniform - Full (M90)";
displayName = "[VKN] Combat Uniform - Rolled (Desert M90)";
displayName = "[VKN] Combat Uniform - Full (Desert M90)";
displayName = "[VKN] Combat Uniform - Rolled (M98)";
displayName = "[VKN] Combat Uniform - Full (M98)";
displayName = "[VKN] Combat Uniform - Rolled (Black)";
displayName = "[VKN] VIS Special Purpose Suit";
displayName = "[VKN] Fleece Jacket (Blue/Forest)";
displayName = "[VKN] Fleece Jacket (Green/Khaki)";
displayName = "[VKN] Fleece Jacket (Blue/Multicam)";
displayName = "[VKN] Fleece Jacket (Dark/Khaki)";
displayName = "[VKN] Combat Uniform - Legion Forest";
displayName = "[VKN] Combat Uniform - Legion Forest + Black";
displayName = "[VKN] Combat Uniform - Legion Forest + Olive";
displayName = "[VKN] Combat Uniform - Winter Polygon";
displayName = "[VKN] Combat Uniform - Loki";
displayName = "[VKN] Combat Uniform - 3CD Black";
displayName = "[VKN] Foxcoat Dark";
displayName = "[VKN] Foxcoat Forest";
displayName = "[VKN] Combat Uniform - Black + DPM";
displayName = "[VKN] Cazador Tropical Uniform";
displayName = "[VKN] Greek Police Riot Uniform";
displayName = "[VKN] Lynx (Winter camo + Green pants)";
displayName = "[VKN] Lynx (Winter camo + White pants)";
displayName = "[VKN] Lynx (Winter camo + White pants)";
displayName = "[VKN] Lynx (Winter camo + White pants)";
displayName = "[VKN] Lynx (Winter camo + White pants)";
displayName = "[VKN] Lynx (Diamond camo + Grey pants)";
displayName = "[VKN] Overall (Loki - New)";
displayName = "[VKN] DDPM Uniform (Shirt)";
displayName = "[VKN] Tactical Sweater - Black";
displayName = "[VKN] Tactical Sweater - Blu/Tan";
displayName = "[VKN] Tactical Sweater - Green";
displayName = "[VKN] Tactical Sweater - Green/Olive";
displayName = "[VKN] Tactical Sweater - Olive";
displayName = "[VKN] Tactical Sweater - Tan";
displayName = "[VKN] Tactical Sweater - Loki";
displayName = "[VKN] DDPM Uniform (Sweater)";
displayName = "[VKN] PMC White shirt & Jeans";
displayName = "[VKN] PMC White shirt & Khaki pants";
displayName = "[VKN] PMC Black shirt & Jeans";
displayName = "[VKN] PMC Black shirt & Khaki pants";
displayName = "[VKN] PMC White shirt & Black jeans";
displayName = "[VKN] PMC Black shirt & Black jeans";
displayName = "[VKN] PMC Blue shirt & Black jeans";
displayName = "[VKN] PMC Blue shirt & Khaki jeans";
displayName = "[VKN] PMC Blue shirt & Jeans";
displayName = "[VKN] PMC Green shirt & Black jeans";
displayName = "[VKN] PMC Green shirt & Khaki jeans";
displayName = "[VKN] PMC Green shirt & Jeans";
displayName = "[VKN] PMC Hawaii Shirt (Blue/Tan)";
displayName = "[VKN] PMC Hawaii Shirt (Blue/Apple-Black)";
displayName = "[VKN] PMC Hawaii Shirt (Blue/Multicam)";
displayName = "[VKN] PMC Hawaii Shirt (Red/Tan)";
displayName = "[VKN] PMC Hawaii Shirt (Red/Apple-Black)";
displayName = "[VKN] PMC Hawaii Shirt (Red/Multicam)";
displayName = "[VKN] PMC Hawaii Shirt (Bright/Tan)";
displayName = "[VKN] PMC Hawaii Shirt (Bright/Apple-Black)";
displayName = "[VKN] PMC Hawaii Shirt (Bright/Multicam)";
displayName = "[VKN] Police Riot Vest";
displayName = "[VKN] VIS LVB Harness (Dark)";
displayName = "[VKN] Booniehat (Loki)";
displayName = "[VKN] Beret (South Africa)";
displayName = "[VKN] Beret (Viking)";
displayName = "[VKN] VIS Special Purpose Headgear";
displayName = "[VKN] Combat Helmet (Cazador)";
displayName = "[VKN] Light Combat Helmet (Cazador)";
displayName = "[VKN] Enhanced Combat Helmet (Cazador)";
displayName = "[VKN] Combat Helmet Camo (Cazador)";
displayName = "[VKN] Front Facing Cap Black (VKN Logo)";
displayName = "[VKN] Backward Facing Cap Black (VKN Logo)";
displayName = "[VKN] Front Facing Cap Black (Slov Logo)";
displayName = "[VKN] Backward Facing Cap Black (Slov Logo)";
displayName = "[VKN] Front Facing Cap Black (Scand Logo)";
displayName = "[VKN] Backward Facing Cap Black (Scand Logo)";
displayName = "[VKN] Front Facing Cap Black (Russia Logo)";
displayName = "[VKN] Backward Facing Cap Black (Russia Logo)";
displayName = "[VKN] Front Facing Cap Black (USA Logo)";
displayName = "[VKN] Backward Facing Cap Black (USA Logo)";
displayName = "[VKN] Front Facing Cap OD (VKN Logo)";
displayName = "[VKN] Backward Facing Cap OD (VKN Logo)";
displayName = "[VKN] Front Facing Cap Sand (VKN Logo)";
displayName = "[VKN] Backward Facing Cap Sand (VKN Logo)";
displayName = "[VKN] Front Facing Cap Sand (Slov Logo)";
displayName = "[VKN] Backward Facing Cap Sand (Slov Logo)";
displayName = "[VKN] Front Facing Cap Sand (Scand Logo)";
displayName = "[VKN] Backward Facing Cap Sand (Scand Logo)";
displayName = "[VKN] Front Facing Cap Sand (USA Logo)";
displayName = "[VKN] Backward Facing Cap Sand (USA Logo)";
Loading