W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-22 03:16:27 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Revert "Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch""

Browse Source 
This reverts commit 109ec5c9a3.
This commit is contained in:
seelenapparat
2021-08-24 15:47:06 +02:00
parent c801365a1f
commit d1abb66e9f
145 changed files with 9200 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/system/mission/server_traders/caribou.sqf
View File

@@ -135,6 +135,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -142,6 +144,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/chernarus11.sqf
View File

@@ -181,6 +181,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -188,6 +190,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/chernarus17.sqf
View File

@@ -179,6 +179,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -186,6 +188,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/cmr_ovaron.sqf
View File

@@ -138,6 +138,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -145,6 +147,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/fdf_isle1_a.sqf
View File

@@ -128,6 +128,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -135,6 +137,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/isladuala.sqf
View File

@@ -181,6 +181,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -188,6 +190,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/lingor.sqf
View File

@@ -181,6 +181,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -188,6 +190,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

2
SQF/dayz_code/system/mission/server_traders/namalsk.sqf
View File

@@ -88,6 +88,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/napf.sqf
View File

@@ -179,6 +179,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -186,6 +188,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/panthera2.sqf
View File

@@ -181,6 +181,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -188,6 +190,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/sauerland.sqf
View File

@@ -174,6 +174,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -181,6 +183,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/smd_sahrani_a2.sqf
View File

@@ -181,6 +181,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -188,6 +190,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/takistan.sqf
View File

@@ -167,6 +167,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -174,6 +176,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],

4
SQF/dayz_code/system/mission/server_traders/tavi.sqf
View File

@@ -181,6 +181,8 @@ menu_Profiteer2 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer2 select 0) set [count (menu_Profiteer2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Wholesaler*********/
menu_Profiteer3 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
@@ -188,6 +190,8 @@ menu_Profiteer3 = [
"neutral"
];
if (DZE_Virtual_Garage) then {(menu_Profiteer3 select 0) set [count (menu_Profiteer3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_HELI_PADS",52]];};
/***************Banker*********/
menu_Functionary1_EP1 = [
[[localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]],