Compare commits
4 Commits
08317ffc77
...
6c94632089
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6c94632089 | ||
|
|
31954570a0 | ||
|
|
8450c6bbba | ||
|
|
6718e35b7a |
@@ -497,16 +497,15 @@ GRLIB_arsenal_magazines = [
|
|||||||
|
|
||||||
//RPG Ammo
|
//RPG Ammo
|
||||||
"RPG29_AT",
|
"RPG29_AT",
|
||||||
"RPG29_HE_F"
|
"RPG29_HE_F",
|
||||||
"rhs_pg7_PG7V_mag",
|
"rhs_pg7_PG7V_mag",
|
||||||
"rhs_pg7_PG7VM_mag",
|
"rhs_pg7_PG7VM_mag",
|
||||||
"rhs_pg7_PG7VS_mag",
|
"rhs_pg7_PG7VS_mag",
|
||||||
"rhs_pg7_PG7VL_mag",
|
"rhs_pg7_PG7VL_mag",
|
||||||
"rhs_pg7_TBG7V_mag",
|
"rhs_pg7_TBG7V_mag",
|
||||||
"gm_1Rnd_72mm_he_9m32m"
|
"gm_1Rnd_72mm_he_9m32m",
|
||||||
|
|
||||||
//Underbarrel Grenades
|
//Underbarrel Grenades
|
||||||
"
|
|
||||||
|
|
||||||
// Grenades
|
// Grenades
|
||||||
"gm_handgrenade_frag_rgd5",
|
"gm_handgrenade_frag_rgd5",
|
||||||
@@ -546,7 +545,7 @@ GRLIB_arsenal_magazines = [
|
|||||||
"rhssaf_mine_tma3_mag",
|
"rhssaf_mine_tma3_mag",
|
||||||
"rhs_mine_pmn2_mag",
|
"rhs_mine_pmn2_mag",
|
||||||
"rhs_mag_mine_ptm1",
|
"rhs_mag_mine_ptm1",
|
||||||
"APERSTripMine_Wire_Mag"
|
"APERSTripMine_Wire_Mag",
|
||||||
"rhs_ec75_mag",
|
"rhs_ec75_mag",
|
||||||
"rhs_ec200_mag",
|
"rhs_ec200_mag",
|
||||||
"rhs_ec400_mag",
|
"rhs_ec400_mag",
|
||||||
@@ -769,7 +768,7 @@ GRLIB_arsenal_items = [
|
|||||||
"G_Aviator",
|
"G_Aviator",
|
||||||
"JAM_ENVA_H_NVA_KDA_Balaclava_01",
|
"JAM_ENVA_H_NVA_KDA_Balaclava_01",
|
||||||
"rhs_balaclava",
|
"rhs_balaclava",
|
||||||
"rhs_balaclava1_olive"
|
"rhs_balaclava1_olive",
|
||||||
|
|
||||||
// Attachments
|
// Attachments
|
||||||
"gm_pgo7v_blk",
|
"gm_pgo7v_blk",
|
||||||
@@ -788,7 +787,7 @@ GRLIB_arsenal_items = [
|
|||||||
"gm_zvn64_ak",
|
"gm_zvn64_ak",
|
||||||
"gm_suppressor_pbs1_762_blk",
|
"gm_suppressor_pbs1_762_blk",
|
||||||
"gm_suppressor_pbs4_545_blk",
|
"gm_suppressor_pbs4_545_blk",
|
||||||
"gm_pgo7v_blk"
|
"gm_pgo7v_blk",
|
||||||
|
|
||||||
// Items
|
// Items
|
||||||
"gm_gc_compass_f73",
|
"gm_gc_compass_f73",
|
||||||
@@ -920,7 +919,6 @@ GRLIB_arsenal_items = [
|
|||||||
"ACE_surgicalKit", // Surgical Kit
|
"ACE_surgicalKit", // Surgical Kit
|
||||||
"ACE_tourniquet", // Tourniquet (CAT)
|
"ACE_tourniquet", // Tourniquet (CAT)
|
||||||
"ACE_wirecutter" // Wirecutter
|
"ACE_wirecutter" // Wirecutter
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
GRLIB_arsenal_backpacks = [
|
GRLIB_arsenal_backpacks = [
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
if (KPLIB_directArsenal) exitWith {
|
if (KPLIB_directArsenal) exitWith {
|
||||||
if (KP_liberation_ace && !KP_liberation_arsenal_type) then {
|
if (KP_liberation_ace && KP_liberation_arsenal_type) then {
|
||||||
[player, player, false] call ace_arsenal_fnc_openBox;
|
[player, player, false] call ace_arsenal_fnc_openBox;
|
||||||
} else {
|
} else {
|
||||||
["Open", false] spawn BIS_fnc_arsenal;
|
["Open", false] spawn BIS_fnc_arsenal;
|
||||||
@@ -17,7 +17,7 @@ private _backpack = backpack player;
|
|||||||
|
|
||||||
private ["_loadouts_data"];
|
private ["_loadouts_data"];
|
||||||
// Get loadouts either from ACE or BI arsenals
|
// Get loadouts either from ACE or BI arsenals
|
||||||
if (KP_liberation_ace && !KP_liberation_arsenal_type) then {
|
if (KP_liberation_ace && KP_liberation_arsenal_type) then {
|
||||||
_loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]);
|
_loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]);
|
||||||
} else {
|
} else {
|
||||||
private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data");
|
private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data");
|
||||||
@@ -82,7 +82,7 @@ while { dialog && (alive player) && edit_loadout == 0 } do {
|
|||||||
|
|
||||||
if ( load_loadout > 0 ) then {
|
if ( load_loadout > 0 ) then {
|
||||||
private _loaded_loadout = _loadouts_data select (lbCurSel 201);
|
private _loaded_loadout = _loadouts_data select (lbCurSel 201);
|
||||||
if (KP_liberation_ace && !KP_liberation_arsenal_type) then {
|
if (KP_liberation_ace && KP_liberation_arsenal_type) then {
|
||||||
player setUnitLoadout (_loaded_loadout select 1);
|
player setUnitLoadout (_loaded_loadout select 1);
|
||||||
} else {
|
} else {
|
||||||
[player, [profileNamespace, _loaded_loadout]] call BIS_fnc_loadInventory;
|
[player, [profileNamespace, _loaded_loadout]] call BIS_fnc_loadInventory;
|
||||||
@@ -123,7 +123,7 @@ while { dialog && (alive player) && edit_loadout == 0 } do {
|
|||||||
if ( edit_loadout > 0 ) then {
|
if ( edit_loadout > 0 ) then {
|
||||||
closeDialog 0;
|
closeDialog 0;
|
||||||
waitUntil { !dialog };
|
waitUntil { !dialog };
|
||||||
if (KP_liberation_ace && !KP_liberation_arsenal_type) then {
|
if (KP_liberation_ace && KP_liberation_arsenal_type) then {
|
||||||
[player, player, false] call ace_arsenal_fnc_openBox;
|
[player, player, false] call ace_arsenal_fnc_openBox;
|
||||||
} else {
|
} else {
|
||||||
[ "Open", false ] spawn BIS_fnc_arsenal;
|
[ "Open", false ] spawn BIS_fnc_arsenal;
|
||||||
@@ -131,7 +131,7 @@ if ( edit_loadout > 0 ) then {
|
|||||||
|
|
||||||
if (KP_liberation_arsenalUsePreset) then {
|
if (KP_liberation_arsenalUsePreset) then {
|
||||||
uiSleep 5;
|
uiSleep 5;
|
||||||
private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KP_liberation_ace && !KP_liberation_arsenal_type);
|
private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KP_liberation_ace && KP_liberation_arsenal_type);
|
||||||
waitUntil {sleep 1; isNull (uinamespace getvariable [_arsenalDisplay, displayNull])};
|
waitUntil {sleep 1; isNull (uinamespace getvariable [_arsenalDisplay, displayNull])};
|
||||||
[_backpack] call KPLIB_fnc_checkGear;
|
[_backpack] call KPLIB_fnc_checkGear;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ if (KP_liberation_arsenalUsePreset) then {
|
|||||||
KP_liberation_allowed_items append KP_liberation_allowed_items_extension;
|
KP_liberation_allowed_items append KP_liberation_allowed_items_extension;
|
||||||
};
|
};
|
||||||
|
|
||||||
if (KP_liberation_ace && !KP_liberation_arsenal_type) then {
|
if (KP_liberation_ace && KP_liberation_arsenal_type) then {
|
||||||
[player, KP_liberation_allowed_items, false] call ace_arsenal_fnc_addVirtualItems;
|
[player, KP_liberation_allowed_items, false] call ace_arsenal_fnc_addVirtualItems;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ if (KP_liberation_arsenalUsePreset) then {
|
|||||||
[missionNamespace, true] call BIS_fnc_addVirtualItemCargo;
|
[missionNamespace, true] call BIS_fnc_addVirtualItemCargo;
|
||||||
[missionNamespace, true] call BIS_fnc_addVirtualBackpackCargo;
|
[missionNamespace, true] call BIS_fnc_addVirtualBackpackCargo;
|
||||||
|
|
||||||
if (KP_liberation_ace && !KP_liberation_arsenal_type) then {
|
if (KP_liberation_ace && KP_liberation_arsenal_type) then {
|
||||||
[player, true, false] call ace_arsenal_fnc_addVirtualItems;
|
[player, true, false] call ace_arsenal_fnc_addVirtualItems;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ while {true} do {
|
|||||||
|
|
||||||
// Get loadouts either from ACE or BI arsenals
|
// Get loadouts either from ACE or BI arsenals
|
||||||
private ["_loadouts_data"];
|
private ["_loadouts_data"];
|
||||||
if (KP_liberation_ace && !KP_liberation_arsenal_type) then {
|
if (KP_liberation_ace && KP_liberation_arsenal_type) then {
|
||||||
_loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]);
|
_loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]);
|
||||||
} else {
|
} else {
|
||||||
private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data");
|
private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data");
|
||||||
@@ -191,7 +191,7 @@ while {true} do {
|
|||||||
|
|
||||||
if ((lbCurSel 203) > 0) then {
|
if ((lbCurSel 203) > 0) then {
|
||||||
private _selectedLoadout = _loadouts_data select ((lbCurSel 203) - 1);
|
private _selectedLoadout = _loadouts_data select ((lbCurSel 203) - 1);
|
||||||
if (KP_liberation_ace && !KP_liberation_arsenal_type) then {
|
if (KP_liberation_ace && KP_liberation_arsenal_type) then {
|
||||||
player setUnitLoadout (_selectedLoadout select 1);
|
player setUnitLoadout (_selectedLoadout select 1);
|
||||||
} else {
|
} else {
|
||||||
[player, [profileNamespace, _selectedLoadout]] call BIS_fnc_loadInventory;
|
[player, [profileNamespace, _selectedLoadout]] call BIS_fnc_loadInventory;
|
||||||
|
|||||||
@@ -51,11 +51,11 @@ if(isServer) then {
|
|||||||
GET_PARAM_BOOL(GRLIB_blufor_defenders, "BluforDefenders", 1);
|
GET_PARAM_BOOL(GRLIB_blufor_defenders, "BluforDefenders", 1);
|
||||||
GET_PARAM_BOOL(GRLIB_autodanger, "Autodanger", 0);
|
GET_PARAM_BOOL(GRLIB_autodanger, "Autodanger", 0);
|
||||||
GET_PARAM(GRLIB_time_factor, "DayDuration", 12);
|
GET_PARAM(GRLIB_time_factor, "DayDuration", 12);
|
||||||
GET_PARAM_BOOL(GRLIB_shorter_nights, "ShorterNights", 1);
|
GET_PARAM_BOOL(GRLIB_shorter_nights, "ShorterNights", 0);
|
||||||
GET_PARAM(GRLIB_weather_param, "Weather", 3);
|
GET_PARAM(GRLIB_weather_param, "Weather", 3);
|
||||||
GET_PARAM_BOOL(KP_liberation_fog_param, "VanillaFog", 1);
|
GET_PARAM_BOOL(KP_liberation_fog_param, "VanillaFog", 1);
|
||||||
GET_PARAM(GRLIB_resources_multiplier, "ResourcesMultiplier", 3);
|
GET_PARAM(GRLIB_resources_multiplier, "ResourcesMultiplier", 3);
|
||||||
GET_PARAM_BOOL(KP_liberation_arsenal_type, "ArsenalType", 1);
|
GET_PARAM_BOOL(KP_liberation_arsenal_type, "ArsenalType", 0);
|
||||||
GET_PARAM_BOOL(KPLIB_directArsenal, "DirectArsenal", 0);
|
GET_PARAM_BOOL(KPLIB_directArsenal, "DirectArsenal", 0);
|
||||||
GET_PARAM_BOOL(KP_liberation_playermenu, "PlayerMenu", 1);
|
GET_PARAM_BOOL(KP_liberation_playermenu, "PlayerMenu", 1);
|
||||||
GET_PARAM(KP_liberation_victoryCondition, "VictoryCondition", 0);
|
GET_PARAM(KP_liberation_victoryCondition, "VictoryCondition", 0);
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ class Params {
|
|||||||
title = $STR_PARAMS_ARSENAL;
|
title = $STR_PARAMS_ARSENAL;
|
||||||
values[] = {0, 1};
|
values[] = {0, 1};
|
||||||
texts[] = {$STR_PARAMS_ARSENAL_BI, $STR_PARAMS_ARSENAL_ACE};
|
texts[] = {$STR_PARAMS_ARSENAL_BI, $STR_PARAMS_ARSENAL_ACE};
|
||||||
default = 1;
|
default = 0;
|
||||||
};
|
};
|
||||||
class DirectArsenal {
|
class DirectArsenal {
|
||||||
title = $STR_PARAMS_DIRECTARSENAL;
|
title = $STR_PARAMS_DIRECTARSENAL;
|
||||||
|
|||||||
Reference in New Issue
Block a user