Permalink
Browse files

Merge pull request #582 from EpochModTeam/experimental

0.3.9 b566
  • Loading branch information...
2 parents f8b1f7e + 443c6e9 commit 654927ba60cf4f6c9c45070865d772bd4ddca547 @vbawol vbawol committed on GitHub Jul 10, 2016
Showing with 21 additions and 16 deletions.
  1. BIN Server_Install_Pack/@epochhive/addons/epoch_server.pbo
  2. BIN Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
  3. BIN Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
  4. BIN Server_Install_Pack/mpmissions/epoch.Altis.pbo
  5. BIN Server_Install_Pack/mpmissions/epoch.Australia.pbo
  6. BIN Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
  7. BIN Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
  8. BIN Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
  9. BIN Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
  10. BIN Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
  11. BIN Server_Install_Pack/mpmissions/epoch.Esseker.pbo
  12. BIN Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
  13. BIN Server_Install_Pack/mpmissions/epoch.Napf.pbo
  14. BIN Server_Install_Pack/mpmissions/epoch.Porto.pbo
  15. BIN Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
  16. BIN Server_Install_Pack/mpmissions/epoch.Sara.pbo
  17. BIN Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
  18. BIN Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
  19. BIN Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
  20. BIN Server_Install_Pack/mpmissions/epoch.Stratis.pbo
  21. BIN Server_Install_Pack/mpmissions/epoch.Takistan.pbo
  22. BIN Server_Install_Pack/mpmissions/epoch.Tanoa.pbo
  23. BIN Server_Install_Pack/mpmissions/epoch.VR.pbo
  24. BIN Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
  25. BIN Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
  26. BIN Server_Install_Pack/mpmissions/epoch.utes.pbo
  27. +1 −1 Server_Install_Pack/sc/BattlEye/scripts.txt
  28. +3 −2 Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf
  29. +1 −1 Sources/epoch_code/compile/p2p_trading/EPOCH_tradeRequest.sqf
  30. +1 −1 Sources/epoch_config/Configs/CfgBuildingLootPos.hpp
  31. +3 −1 Sources/epoch_config/Configs/CfgEpochClient/WorldInteractions.hpp
  32. +1 −1 Sources/epoch_config/build.hpp
  33. +1 −1 Sources/epoch_server/build.hpp
  34. +1 −1 Sources/epoch_server/compile/epoch_antagonists/EPOCH_server_triggerEvent.sqf
  35. +1 −1 Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf
  36. +0 −1 Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf
  37. +5 −2 Sources/epoch_server/compile/epoch_server/EPOCH_weightedArray.sqf
  38. +1 −1 Sources/epoch_server_core/build.hpp
  39. +1 −1 Sources/epoch_server_settings/build.hpp
  40. +1 −1 build.txt
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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;"
@@ -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;
{
@@ -15,7 +15,7 @@
if !(isNull _this) then {
// ignore request if either player is in a vehicle
if (vehicle player == player && vehicle _this == _this) then {
- ["Trade request received, press 'T' to accept", 5] call Epoch_message;
+ [format ["Trade request received, Hold (%1)",EPOCH_keysAction call BIS_fnc_keyCode], 5] call Epoch_message;
EPOCH_pendingP2ptradeTarget = _this;
};
};
@@ -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 } };
@@ -33,7 +33,9 @@ class CfgWorldInteractions {
wreck = 1;
};
-
+ 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 {};
@@ -1 +1 @@
-build=565;
+build=566;
@@ -1 +1 @@
-build=565;
+build=566;
@@ -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": {
@@ -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{};
@@ -139,7 +139,6 @@ if (!local _player) then {
addToRemainsCollector[_newPlyr];
- _newPlyr allowDammage false;
{
_newPlyr disableAI _x;
}forEach["FSM", "MOVE", "AUTOTARGET", "TARGET"];
@@ -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);
@@ -1 +1 @@
-build=565;
+build=566;
@@ -1 +1 @@
-build=565;
+build=566;
View
@@ -1 +1 @@
-565
+566

0 comments on commit 654927b

Please sign in to comment.