diff --git a/Server_Install_Pack/@epochhive/epochconfig.hpp b/Server_Install_Pack/@epochhive/epochconfig.hpp index ba97ac64..e83f2310 100644 --- a/Server_Install_Pack/@epochhive/epochconfig.hpp +++ b/Server_Install_Pack/@epochhive/epochconfig.hpp @@ -61,6 +61,7 @@ removevehmagazinesturret[] = { // Remove these Magazines from the given Turret f {"24Rnd_missiles",{-1}}, {"200Rnd_40mm_G_belt",{0}} }; +disableVehicleTIE = "true"; // BaseBuilding UseIndestructible = "false"; // Enable / Disable Indestructible BaseObjects diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event5.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event5.sqf index 9edab396..ba63f322 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event5.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event5.sqf @@ -1,6 +1,6 @@ _position = getPosATL player; -_nearestLocations = nearestLocations[player, _radioactiveLocations, 300]; +_nearestLocations = nearestLocations[player, ["NameLocal"], 300]; EPOCH_nearestLocations = _nearestLocations; _powerSources = nearestObjects[player, ["Land_spp_Tower_F","Land_wpp_Turbine_V2_F","Land_wpp_Turbine_V1_F","SolarGen_EPOCH","Land_Wreck_Satellite_EPOCH"], _energyRange]; diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf index 5a2fb39c..ac02f4a8 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf @@ -336,10 +336,7 @@ EPOCH_ActiveTraderMission = []; _LastMissionTrigger = 0; // setup radio active locations -//Commented out by Raymix: Does not ser variable on locations for some reason -/* { - _x params ["_loc", "_rads"]; + _x params ["_loc", "_rads","_markers"]; _loc setVariable ["EPOCH_Rads", _rads]; } forEach (missionNamespace getVariable ["EPOCH_radioactiveLocations", []]); -*/ diff --git a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp index f091d83b..f8a4d85f 100644 --- a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp +++ b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp @@ -223,42 +223,42 @@ class veh_RemoveAmmo4 class geiger_menu { condition = "'ItemGeigerCounter_EPOCH' in dyna_assigneditems"; - icon = "x\addons\a3_epoch_assets_1\pictures\geiger\geiger_radiation.paa"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\geiger_radiation.paa"; tooltip = "Geiger counter settings"; class geiger_toggle { condition = "true"; action = "call epoch_geiger_show_hide"; - icon = "x\addons\a3_epoch_assets_1\pictures\geiger\geiger_toggle.paa"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\geiger_toggle.paa"; tooltip = "Toggle HUD"; }; class geiger_counter_mute { condition = "!EPOCH_geiger_mute_counter"; action = "EPOCH_geiger_mute_counter = !EPOCH_geiger_mute_counter"; - icon = "x\addons\a3_epoch_assets_1\pictures\geiger\geiger_volumeoff.paa"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\geiger_volumeoff.paa"; tooltip = "Mute counter"; }; class geiger_counter_unmute { condition = "EPOCH_geiger_mute_counter"; action = "EPOCH_geiger_mute_counter = !EPOCH_geiger_mute_counter"; - icon = "x\addons\a3_epoch_assets_1\pictures\geiger\geiger_volumeon.paa"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\geiger_volumeon.paa"; tooltip = "Unmute counter"; }; class geiger_warning_mute { condition = "!EPOCH_geiger_mute_warning"; action = "EPOCH_geiger_mute_warning = !EPOCH_geiger_mute_warning"; - icon = "x\addons\a3_epoch_assets_1\pictures\geiger\geiger_alarmoff.paa"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\geiger_alarmoff.paa"; tooltip = "Mute warnings"; }; class geiger_warning_unmute { condition = "EPOCH_geiger_mute_warning"; action = "EPOCH_geiger_mute_warning = !EPOCH_geiger_mute_warning"; - icon = "x\addons\a3_epoch_assets_1\pictures\geiger\geiger_alarmon.paa"; + icon = "x\addons\a3_epoch_code\Data\UI\buttons\geiger_alarmon.paa"; tooltip = "Unmute warnings"; }; }; diff --git a/Sources/epoch_config/Configs/CfgEpochClient.hpp b/Sources/epoch_config/Configs/CfgEpochClient.hpp index 022f471a..64967f69 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient.hpp @@ -25,6 +25,7 @@ class CfgEpochClient baseHungerLoss = 2; // increase number to speed up rate of Hunger loss baseThirstLoss = 2; // increase number to speed up rate of Thirst loss + accelerateHTALoss = "true"; // use server's time acceleration to increase the rate of Hunger, Thirst and Alcohol loss buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf index 4976e3db..ae9185de 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf @@ -32,6 +32,7 @@ _immuneIfStartInBase = [_serverSettingsConfig, "immuneIfStartInBase", true] call _removeweapons = [_serverSettingsConfig, "removevehweapons", []] call EPOCH_fnc_returnConfigEntry; _removemagazinesturret = [_serverSettingsConfig, "removevehmagazinesturret", []] call EPOCH_fnc_returnConfigEntry; +_disableVehicleTIE = [_serverSettingsConfig, "disableVehicleTIE", true] call EPOCH_fnc_returnConfigEntry; for "_i" from 1 to _maxVehicleLimit do { _vehicleSlotIndex = EPOCH_VehicleSlots pushBack str(_i); @@ -141,7 +142,9 @@ for "_i" from 1 to _maxVehicleLimit do { _vehicle setvariable ["VEHICLE_BASECLASS",_baseClass]; }; // disable thermal imaging equipment - _vehicle disableTIEquipment true; + if (_disableVehicleTIE) then { + _vehicle disableTIEquipment true; + }; // lock all vehicles _vehicle lock true; // load vehicle inventory diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles_old.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles_old.sqf index 3ff9398c..513d877f 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles_old.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles_old.sqf @@ -28,6 +28,7 @@ _simulationHandler = [_serverSettingsConfig, "simulationHandlerOld", false] call _immuneVehicleSpawn = [_serverSettingsConfig, "immuneVehicleSpawn", false] call EPOCH_fnc_returnConfigEntry; _removeweapons = [_serverSettingsConfig, "removevehweapons", []] call EPOCH_fnc_returnConfigEntry; _removemagazinesturret = [_serverSettingsConfig, "removevehmagazinesturret", []] call EPOCH_fnc_returnConfigEntry; +_disableVehicleTIE = [_serverSettingsConfig, "disableVehicleTIE", true] call EPOCH_fnc_returnConfigEntry; for "_i" from 1 to _maxVehicleLimit do { _vehicleSlotIndex = EPOCH_VehicleSlots pushBack str(_i); @@ -131,7 +132,9 @@ for "_i" from 1 to _maxVehicleLimit do { } foreach _removemagazinesturret; }; - _vehicle disableTIEquipment true; + if (_disableVehicleTIE) then { + _vehicle disableTIEquipment true; + }; _vehicle lock true; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf index 5501edd5..95c86838 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf @@ -116,6 +116,10 @@ clearItemCargoGlobal _newveh; _serverSettingsConfig = configFile >> "CfgEpochServer"; _removeweapons = [_serverSettingsConfig, "removevehweapons", []] call EPOCH_fnc_returnConfigEntry; _removemagazinesturret = [_serverSettingsConfig, "removevehmagazinesturret", []] call EPOCH_fnc_returnConfigEntry; +_disableVehicleTIE = [_serverSettingsConfig, "disableVehicleTIE", true] call EPOCH_fnc_returnConfigEntry; +if (_disableVehicleTIE) then { + _newVeh disableTIEquipment true; +}; if !(_removeweapons isequalto []) then { { _newVeh removeWeaponGlobal _x; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf index 51b42f61..b28e4f43 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf @@ -20,6 +20,7 @@ if !(isClass (configFile >> "CfgVehicles" >> _vehClass)) exitWith {objNull}; _serverSettingsConfig = configFile >> "CfgEpochServer"; _removeweapons = [_serverSettingsConfig, "removevehweapons", []] call EPOCH_fnc_returnConfigEntry; _removemagazinesturret = [_serverSettingsConfig, "removevehmagazinesturret", []] call EPOCH_fnc_returnConfigEntry; +_disableVehicleTIE = [_serverSettingsConfig, "disableVehicleTIE", true] call EPOCH_fnc_returnConfigEntry; _vehObj = createVehicle[_vehClass, _position, [], 0, _can_collide]; // turn off BIS randomization _vehObj setVariable ["BIS_enableRandomization", false]; @@ -62,7 +63,9 @@ if !(isNull _vehObj) then{ }; // Disable Termal Equipment - _vehObj disableTIEquipment true; + if (_disableVehicleTIE) then { + _vehObj disableTIEquipment true; + }; // Vehicle Lock _vehObj lock _locked; diff --git a/Sources/epoch_server/init/server_init.sqf b/Sources/epoch_server/init/server_init.sqf index 25950bdf..3546338c 100644 --- a/Sources/epoch_server/init/server_init.sqf +++ b/Sources/epoch_server/init/server_init.sqf @@ -271,9 +271,10 @@ if !(_radioactiveLocations isEqualTo []) then { _locations = _locations - [_selectedLoc]; _locSize = size _selectedLoc; _radius = sqrt((_locSize select 0)^2 + (_locSize select 1)^2); - _radioactiveLocationsTmp pushBack [_selectedLoc,[random 666,_radius]]; private _position = locationPosition _selectedLoc; + _createdLoc = createLocation ["NameLocal", _position, _radius, _radius]; _markers = ["Radiation", _position] call EPOCH_server_createGlobalMarkerSet; + _radioactiveLocationsTmp pushBack [_createdLoc,[random 666,_radius],_markers]; }; }; }; diff --git a/Sources/epoch_server/init/server_securityfunctions.sqf b/Sources/epoch_server/init/server_securityfunctions.sqf index 5c355f68..9f5e02da 100644 --- a/Sources/epoch_server/init/server_securityfunctions.sqf +++ b/Sources/epoch_server/init/server_securityfunctions.sqf @@ -1140,6 +1140,7 @@ call compile ("'"+_skn_doAdminRequest+"' addPublicVariableEventHandler { _serverSettingsConfig = configFile >> 'CfgEpochServer'; _removeweapons = [_serverSettingsConfig, 'removevehweapons', []] call EPOCH_fnc_returnConfigEntry; _removemagazinesturret = [_serverSettingsConfig, 'removevehmagazinesturret', []] call EPOCH_fnc_returnConfigEntry; + _disableVehicleTIE = [_serverSettingsConfig, 'disableVehicleTIE', true] call EPOCH_fnc_returnConfigEntry; _position = getPosATL _target; _slot = EPOCH_VehicleSlots select 0; @@ -1151,7 +1152,9 @@ call compile ("'"+_skn_doAdminRequest+"' addPublicVariableEventHandler { _vehObj call EPOCH_server_setVToken; addToRemainsCollector[_vehObj]; - _vehObj disableTIEquipment true; + if (_disableVehicleTIE) then { + _vehObj disableTIEquipment true; + }; clearWeaponCargoGlobal _vehObj; clearMagazineCargoGlobal _vehObj;