Arma3_Epoch/blckeagles-revisited-RC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Version-6.55-Build-38

Browse Source
This commit is contained in:
Ghostrider-DbD- 2017-02-12 07:47:29 -05:00 committed by GitHub
commit 3302f2dee4
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
@epochhive/addons/custom_server/Compiles/Functions/GMS_fnc_getTraderCitesExile.sqf
View File

@ -12,8 +12,8 @@ _tc = [];
if (blck_debugON) then {diag_log format["[blckeagls] _fnc_getExileLocations :: -- >> Added Exile Spawn location at %1", (getMarkerPos _x)];};
};
//
if (getMarkerType _x isEqualTo "ExileConcreteMixerZone" && blcklistConcreteMixerZones) then {
if (getMarkerType _x isEqualTo "ExileConcreteMixerZone" && blck_listConcreteMixerZones) then {
blck_locationBlackList pushback [(getMarkerPos _x),1000];
if (blck_debugON) then {diag_log format["[blckeagls] _fnc_getExileLocations :: -- >> Added Exile Concrete Mixer location at %1", (getMarkerPos _x)];};
};
}forEach _traderCites;
}forEach _traderCites;

4
@epochhive/addons/custom_server/Compiles/TimeAccel/GMS_fnc_Time.sqf
View File

@ -22,13 +22,13 @@ _time = dayTime;
// Night
if (_time > (_sunset + 0.5) || _time < (_sunrise - 0.5)) exitWith {
setTimeMultiplier blck_timeAccelerationNight;
diag_log format["NIGHT TIMGE ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
//diag_log format["NIGHT TIMGE ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
};
// Day
if (_time > (_sunrise + 0.5) && _time < (_sunset - 0.5)) exitWith {
setTimeMultiplier blck_timeAccelerationDay;
diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
//diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
};
// default

2
@epochhive/addons/custom_server/Compiles/blck_variables.sqf
View File

@ -6,7 +6,7 @@
Last modified 10/25/16
*/
//blck_variablesLoaded = false;
blck_debugON = true;
blck_debugON = false;
blck_debugLevel = 0; // Sets level of detail for debugging info - WIP.
blck_minFPS = 10;

11
@epochhive/addons/custom_server/Configs/blck_configs_exile.sqf
View File

@ -4,7 +4,7 @@ Last modified 8/1/15
*/
#define DBDserver 1
if (blck_debugON) then {diag_log "[blckeagls] Loading blck_configs_epoch.sqf";};
if (blck_debugON) then {diag_log "[blckeagls] Loading blck_configs_exlie.sqf";};
/*
Configuration for Addons that support the overall Mission system.
@ -30,7 +30,7 @@ Last modified 8/1/15
// if true then missions will not spawn within 1000 m of spawn points for Altis, Bornholm, Cherno, Esseker or stratis.
blck_listConcreteMixerZones = true;
blck_blacklistSpawns = true;
blck_blacklistTraderCities = true; // Set this = true if you would like the mission system to automatically search for the locations of the Epoch trader cities. Note that these are pre-defined in GMS_fnc_findWorld for the most common maps.
blck_blacklistTraderCities = true; // Set this = true if you would like the mission system to automatically search for the locations of the trader cities. Note that these are pre-defined in GMS_fnc_findWorld for the most common maps.
// list of locations that are protected against mission spawns
switch (toLower(worldName)) do
@ -85,7 +85,7 @@ Last modified 8/1/15
blck_VK_GunnerDamage = true; // when the AI was killed by a gunner on a vehicle that is is in the list of forbidden vehicles, blck_RunGearDamage of damage will be applied to the killer's vehicle each time an AI is killed with a vehicle's gun.
blck_forbidenVehicles = ["B_MRAP_01_hmg_F","O_MRAP_02_hmg_F"]; // Add any vehicles for which you wish to forbid vehicle kills
// For a listing of the guns mounted on various land vehicles see the following link: https://community.bistudio.com/wiki/Arma_3_CfgWeapons_Vehicle_Weapons
// HMG_M2 is mounted on the armed offroad that is spawned by Epoch
blck_forbidenVehicleGuns = ["LMG_RCWS","LMG_M200","HMG_127","HMG_127_APC",/*"HMG_M2",*/"HMG_NSVT","GMG_40mm","GMG_UGV_40mm","autocannon_40mm_CTWS","autocannon_30mm_CTWS","autocannon_35mm","LMG_coax","autocannon_30mm","HMG_127_LSV_01"]; // Add any vehicles for which you wish to forbid vehicle kills, o
// GLOBAL MISSION PARAMETERS
@ -99,6 +99,7 @@ Last modified 8/1/15
// Settings for Mission Vehicles.
blck_useVehiclePatrols = true; // When true vehicles will be spawned at missions and will patrol the mission area.
blck_killEmptyAIVehicles = false; // when true, the AI vehicle will be extensively damaged once all AI have gotten out.
blck_AIPatrolVehicles = ["Exile_Car_Offroad_Armed_Guerilla01","Exile_Car_Offroad_Armed_Guerilla02","Exile_Car_BTR40_MG_Green","Exile_Car_BTR40_MG_Camo","Exile_Car_HMMWV_M134_Green","Exile_Car_HMMWV_M134_Desert",/*"Exile_Car_HMMWV_M134_Desert","Exile_Car_HMMWV_M2_Desert",*/"B_LSV_01_armed_F"]; // Type of vehicle spawned to defend AI bases
// AI STATIC WEAPON PARAMETERS
@ -113,7 +114,7 @@ Last modified 8/1/15
blck_AIHelis = ["B_Heli_Light_01_armed_F","B_Heli_Transport_01_camo_F","B_Heli_Transport_03_F"]; // The helis used to bring in and drop reinforcements.
// Unarmed Helis provided for reference.
// ["B_Heli_Transport_03_unarmed_EPOCH","O_Heli_Light_02_unarmed_EPOCH","I_Heli_Transport_02_EPOCH"];
// ["Exile_Chopper_Orca_CSAT", "Exile_Chopper_Orca_Black","","Exile_Chopper_Huey_Desert","Exile_Chopper_Hummingbird_Green","Exile_Chopper_Huron_Green"]
// Mission - specific settings
//Set to -1 to disable. Values of 2 or more force the mission spawner to spawn copies of that mission - this feature is not thoroughly tested.
@ -172,7 +173,7 @@ Last modified 8/1/15
blck_combatMode = "RED"; // Change this to "YELLOW" if the AI wander too far from missions for your tastes.
blck_groupFormation = "WEDGE"; // Possibilities include "WEDGE","VEE","FILE","DIAMOND"
blck_AI_Side = RESISTANCE;
blck_AI_Side = EAST;
blck_chanceBackpack = 0.3; // Chance AI will be spawned with a backpack
blck_useNVG = true; // When true, AI will be spawned with NVG if is dark

4
@epochhive/addons/custom_server/SLS/SLS_init.sqf
View File

@ -15,5 +15,5 @@ if not (isNull( configFile >> "CfgPatches" >> "a3_epoch_server" )) then
if not (isNull ( configFile >> "CfgPatches" >> "exile_server" ) ) then
{
[] execVM "q\addons\custom_server\SLS\SLS_init_exile.sqf";
};
[] execVM "\q\addons\custom_server\SLS\SLS_init_exile.sqf";
};

2
@epochhive/addons/custom_server/SLS/SLS_init_exile.sqf
View File

@ -1,4 +1,4 @@
// Assemble the final executable with Epoch crate configurations and SLS code
#include "\q\addons\custom_server\SLS\SLS_defines_exlie.sqf";
#include "\q\addons\custom_server\SLS\SLS_defines_exile.sqf";
#include "\q\addons\custom_server\SLS\SLS_functions.sqf";