0.3.9 b566

fixed incorrect index in weighted array fnc when zombies not used
added 3 additional water sources
fixed BE kick when base building since b564
removed allowdamage false on player revive, that caused player immunity
to server side AI.
trade request text feedback changed

Server_Install_Pack/sc/BattlEye/scripts.txt

@@ -6,7 +6,7 @@
 7 enableFatigue
 7 setUnitRecoilCoefficient
 7 setWeaponReloadingTime
-7 allMissionObjects
+7 allMissionObjects !="_alljammer = allmissionobjects 'PlotPole_EPOCH';"
 7 callExtension
 7 showCommandingMenu !="showCommandingMenu '';" !"showCommandingMenu '#USER:"
 7 moveIn !="\"A3\functions_f\Misc\fn_moveIn.sqf\"" !="\"A3\functions_f\arrays\fn_removeIndex.sqf\"" !="player moveInAny _vehicle;\nEPOCH_antiWallCount = EPOCH_antiWallCount + 1;" !="[\"I_UAV_AI\", position _unit, [], 0, \"CAN_COLLIDE\"];\n_driver moveInAny _unit;" !="_driver moveInAny Epoch_mission_uav;" !="axeVIP moveInDriver vehicle axeVIP;" !="axeVIP moveInCargo vehicle axeVIP; !="_driver moveInDriver _axeCopter;" !="_unit moveInGunner _axeCopter;" !="axeVIP moveInDriver vehicle axeVIP;" !="axeVIP moveInCargo vehicle axeVIP;"

Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf

@@ -91,7 +91,7 @@ if !(_jammer isEqualTo []) then {
 				["Building Disallowed: Frequency Blocked", 5] call Epoch_message;
 			};
 			_objectCount = count nearestObjects[_nearestJammer, ["Constructions_static_F"], _buildingJammerRange];
-			
+
 			_membercount = 0;
 			if (count Epoch_my_Group > 0) then {
 				_membercount = count (Epoch_my_Group select 3) + count (Epoch_my_Group select 4);
@@ -104,7 +104,7 @@ if !(_jammer isEqualTo []) then {
 				_buildingCountLimit = _buildingCountLeader + _buildingCountPerMember*_membercount;
 				_objectCount = count nearestObjects[_nearestJammer, ["Constructions_static_F","Constructions_foundation_F"], _buildingJammerRange];
 			};
-			
+
 			if (_objectCount >= _buildingCountLimit) then {
 				_buildingAllowed = false;
 				[format["Building Disallowed: Frequency Overloaded: Limit %1", _buildingCountLimit], 5] call Epoch_message;
@@ -119,6 +119,7 @@ if !(_jammer isEqualTo []) then {
 }
 else {
 	if (_objType in ["PlotPole_EPOCH", "PlotPole_SIM_EPOCH"]) then {
+		// TODO: rework not ideal to use allmissionobjects
 		_alljammer = allmissionobjects 'PlotPole_EPOCH';
 		_c = 0;
 		{

Sources/epoch_config/Configs/CfgBuildingLootPos.hpp

@@ -6213,7 +6213,7 @@ class CfgBuildingLootPos
 		pelicanPos[] = { { { -0.840332, 1.09473, -10 }, 269.861 } };
 	};
 	class Carnival_Tent : Default {
-		limit = 2;
+		limit = 1;
 		lootBias = 50;
 		shelfPos[] = { { { -1, -1, -10 }, 178.014 } };
 		chairPos[] = { { { 1, 1, -10 }, 152.678 } };

Sources/epoch_config/Configs/CfgEpochClient/WorldInteractions.hpp

@@ -34,6 +34,8 @@ class CfgWorldInteractions  {
     };
 
     class Land_WaterBarrel_F : Water {};
+    class Land_BarrelWater_F : Water {};
+    class Land_WaterTank_F : Water {};
     class barrelwater_f_p3d : Water {};
     class water_source_f_p3d : Water {};
     class waterbarrel_f_p3d : Water {};

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=565;
+build=566;

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=565;
+build=566;

Sources/epoch_server/compile/epoch_antagonists/EPOCH_server_triggerEvent.sqf

@@ -12,7 +12,7 @@
     Github:
     https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_antagonists/EPOCH_server_triggerEvent.sqf
 */
-params ["_target", "_type"];
+params [["_target",objNull,[objNull]], ["_type","",[""]]];
 if (!isNull _target) then {
 	switch (_type) do {
 		case "UAV": {

Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf

@@ -13,7 +13,7 @@
     https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf
 */
 private["_target", "_eventArray", "_triggerType", "_nearPlayers", "_posWH", "_item", "_config", "_object", "_player", "_payout", "_type"];
-params ["_object","_type","_player",["_token","",[""]]];
+params [["_object",objNull,[objNull]],["_type",0,[0]],["_player",objNull,[objNull]],["_token","",[""]]];
 
 if (isNull _object) exitWith{};
 if !([_player, _token] call EPOCH_server_getPToken) exitWith{};

Sources/epoch_server/compile/epoch_server/EPOCH_weightedArray.sqf

@@ -18,19 +18,22 @@ _return = missionNamespace getVariable[format["EPOCH_LT_%1_%2_%3",_configName,_k
 if(_return isEqualTo[]) then {
     _lootTableArray = [];
     _weightedArray  = [];
+    _lootIndex = 0;
     {
         if(_x isEqualType []) then {
             _x params ["_tname","_tqty"];
             if (!(_tname isEqualTo "Zombie") || (_tname isEqualTo "Zombie") && EPOCH_mod_Ryanzombies_Enabled) then {
                 _lootTableArray pushBack _tname;
                 for "_i" from 1 to _tqty do {
-                    _weightedArray pushBack _forEachIndex;
+                    _weightedArray pushBack _lootIndex;
                 };
+                _lootIndex = _lootIndex + 1;
             };
         } else {
             if (!(_x isEqualTo "Zombie") || (_x isEqualTo "Zombie") && EPOCH_mod_Ryanzombies_Enabled) then {
                 _lootTableArray pushBack _x;
-                _weightedArray pushBack _forEachIndex;
+                _weightedArray pushBack _lootIndex;
+                _lootIndex = _lootIndex + 1;
             };
         };
     }forEach getArray(configFile >> _configName >> _keyName >> _arrayName);

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=565;
+build=566;

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=565;
+build=566;

build.txt

@@ -1 +1 @@
-565
+566