mirror of
https://github.com/EpochModTeam/Epoch.git
synced 2024-08-30 18:22:13 +00:00
0.3.7 build 43
This commit is contained in:
parent
747064e07d
commit
14155a577c
@ -21,6 +21,7 @@
|
||||
[Changed] Crafting Hesco barrier now require 3x Burlap.
|
||||
[Changed] Crafting wood and metal spike traps now require 2x Sticks.
|
||||
[Changed] Change all publicVariableServer calls to use remoteExec calls for better performance.
|
||||
[Fixed] Secure storage locking mechanism improvments should prevent any unwanted intrusions.
|
||||
[Fixed] Reworked login to prevent getting stuck at "waiting for inventory".
|
||||
[Fixed] Prevented death just after revive due still having high blood pressure.
|
||||
[Fixed] Incorrectly being able to sell/buy items from a dead trader.
|
||||
@ -33,7 +34,8 @@
|
||||
[Added] Newly world spawned vehicles now have randomized damage.
|
||||
[Added] telePos array can now use world position for tele pads if 5th array element is true.
|
||||
[Added] Setting to control random magazine ammo counts in loot spawner. CfgEpochClient -> randomizeMagazineAmmoCount (default: true)
|
||||
[Changed] CUP terrain pack support added:
|
||||
[Added] Debug box now dynamically spawns with flood lights to help players see inside the box at night.
|
||||
[Added] CUP terrain pack support added:
|
||||
- Sahrani
|
||||
- Southern Sahrani
|
||||
- United Sahrani
|
||||
@ -54,7 +56,7 @@
|
||||
[Changed] Earthquakes with mineral veins spawn chances increased with less players.
|
||||
[Changed] Driver or passengers of a driverless can now control vehicle locks. Also only the owner can control locks from outside of a occupied vehicle.
|
||||
[Changed] Commented out Halloween masks from loot tables.
|
||||
[Changed] Player positions in database now use Epoch precision position functions.
|
||||
[Updated] New Battleye remoteExec.txt for added remoteExec calls.
|
||||
[Fixed] Player positions in database now use Epoch precision position functions this fixes loading issues noticed in testing.
|
||||
[Fixed] When killed instead of saving blank array delete (object,trader,vehicle) data from database.
|
||||
[Info] Removed old .bikey and added new one for 0370.
|
||||
|
Binary file not shown.
Binary file not shown.
@ -21,7 +21,7 @@
|
||||
7 allowDamage !="_unit allowDamage false;" !="_unit allowDamage true;" !="player allowDamage true;" !="vehicle player allowDamage true;" !="player allowDamage false;"
|
||||
7 addWeaponCargo !="_acceptHolder addWeaponCargo [_wWeapon, 1] ;"
|
||||
7 onMapSingleClick !="onMapSingleClick '';"
|
||||
7 addMagazine !"addMagazineCargo" !="player addMagazine _craftItem;" !="player addMagazine \"jerrycanE_epoch\";" !="player addMagazine \"emptyjar_epoch\";" !="player addMagazine \"jerrycan_epoch\";" !="player addMagazine \"Hatchet_swing\";" !="player addMagazine [(_x select 0),(_x select 1)]" !="player addMagazine _x;" !="if !(player canAdd (_x select 0)) exitWith {};\nplayer addMagazine[_x select 0, _x select 1];"
|
||||
7 addMagazine !"addMagazineCargo" !="player addMagazine [_item, _magazineSizeMax];" !="player addMagazine [_item, floor (_magazineSize % _magazineSizeMax)];" !="player addMagazine [(_x select 0),(_x select 1)]" !="player addMagazine \"sledge_swing\";" !="player addMagazine \"Hatchet_swing\";" !="player addMagazine \"stick_swing\";"
|
||||
7 addMagazineCargo !"_dogHolder addMagazineCargo [\"RabbitCarcass_EPOCH\", 1]" !"_dogHolder addMagazineCargo [\"Pelt_EPOCH\", 1]" !"_dogHolder addMagazineCargo [\"Venom_EPOCH\", 1]" !"_dogHolder addMagazineCargo [\"SnakeCarcass_EPOCH\", 1]" !"_dogHolder addMagazineCargo [\"ChickenCarcass_EPOCH\", 1]" !="_acceptHolder addMagazineCargo [_wAmmo, 1] ;"
|
||||
7 addItem !="player addItem _item;" !="player addItem _craftItem;" !="player addItem _x;" !="_plyr addItemToVest _missionItem;" !="axeVIP addItemToVest _item;" !="_plyr addItemToVest _missionItem;" !="EPOCH_fnc_addItemOverflow"
|
||||
7 addBackPack
|
||||
|
@ -99,9 +99,7 @@ _giveAttributes = {
|
||||
|
||||
_unifiedInteract = {
|
||||
if (_item call _removeItem) then {
|
||||
if (_interactReturnOnUse != "") then {
|
||||
player addMagazine _interactReturnOnUse;
|
||||
};
|
||||
_interactReturnOnUse call EPOCH_fnc_addItemOverflow;
|
||||
_output = "";
|
||||
{
|
||||
_output = _output + ([_forEachIndex, _x] call _giveAttributes);
|
||||
|
@ -134,15 +134,15 @@ if !(isNull _object) then {
|
||||
};
|
||||
|
||||
{
|
||||
_craftItem = _x;
|
||||
_craftQty = 1;
|
||||
if (typeName _x == "ARRAY") then {
|
||||
_craftItem = _x select 0;
|
||||
_craftQty = _x select 1;
|
||||
};
|
||||
for "_i" from 1 to _craftQty do {
|
||||
player addMagazine _craftItem;
|
||||
};
|
||||
_craftItem = _x;
|
||||
_craftQty = 1;
|
||||
if (typeName _x == "ARRAY") then {
|
||||
_craftItem = _x select 0;
|
||||
_craftQty = _x select 1;
|
||||
};
|
||||
for "_i" from 1 to _craftQty do {
|
||||
_craftItem call EPOCH_fnc_addItemOverflow;
|
||||
};
|
||||
}forEach _recipe;
|
||||
|
||||
_dt = [format["<t size='0.8' shadow='0' color='#99ffffff'>%1 part on %2</t>","Removed",_objClass call EPOCH_itemDisplayName], 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
|
||||
|
@ -19,23 +19,25 @@
|
||||
_this: STRING - Item Class
|
||||
|
||||
Returns:
|
||||
NOTHING
|
||||
BOOL
|
||||
*/
|
||||
private ["_wHPos","_wH","_nearByHolder","_item"];
|
||||
if (_this isEqualTo "") exitWith{false};
|
||||
_item = _this;
|
||||
if (player canAdd _item) then {
|
||||
player addItem _item;
|
||||
player addItem _item;
|
||||
} else {
|
||||
_wH = objNull;
|
||||
_nearByHolder = nearestObjects [position player,["groundWeaponHolder"],3];
|
||||
if (_nearByHolder isEqualTo []) then {
|
||||
_wHPos = player modelToWorld [0,1,0];
|
||||
if (surfaceIsWater _wHPos) then {
|
||||
_wHPos = ASLToATL _wHPos;
|
||||
_wH = objNull;
|
||||
_nearByHolder = nearestObjects [position player,["groundWeaponHolder"],3];
|
||||
if (_nearByHolder isEqualTo []) then {
|
||||
_wHPos = player modelToWorld [0,1,0];
|
||||
if (surfaceIsWater _wHPos) then {
|
||||
_wHPos = ASLToATL _wHPos;
|
||||
};
|
||||
_wH = createVehicle ["groundWeaponHolder",_wHPos, [], 0, "CAN_COLLIDE"];
|
||||
} else {
|
||||
_wH = _nearByHolder select 0;
|
||||
};
|
||||
_wH = createVehicle ["groundWeaponHolder",_wHPos, [], 0, "CAN_COLLIDE"];
|
||||
} else {
|
||||
_wH = _nearByHolder select 0;
|
||||
};
|
||||
_wh addItemCargoGlobal [_item,1];
|
||||
_wh addItemCargoGlobal [_item,1];
|
||||
};
|
||||
true
|
||||
|
@ -266,7 +266,8 @@ if (vehicle player == player) then {
|
||||
};
|
||||
};
|
||||
|
||||
if (_dikCode in(actionKeys "Gear")) then {
|
||||
if (_dikCode in(actionKeys "Gear") && !EPOCH_gearKeyPressed) then {
|
||||
EPOCH_gearKeyPressed = true;
|
||||
if !(isNull EPOCH_Target) then {
|
||||
if !(EPOCH_Target isKindOf "ThingX") then {
|
||||
deleteVehicle EPOCH_Target;
|
||||
@ -278,14 +279,6 @@ if (vehicle player == player) then {
|
||||
if (isTouchingGround player) then {
|
||||
_handled = call EPOCH_lootTrash;
|
||||
};
|
||||
if !(_handled) then {
|
||||
if (!isNull(findDisplay 602)) then { //Inventory Open?
|
||||
(findDisplay 602) closeDisplay 3000;
|
||||
}
|
||||
else {
|
||||
_handled = _ctrl call EPOCH_startInteract;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}; // end player only code
|
||||
|
@ -36,5 +36,9 @@ if (_dikCode == EPOCH_keysAction) then {
|
||||
true call Epoch_dynamicMenuCleanup;
|
||||
};
|
||||
|
||||
if (_dikCode in(actionKeys "Gear")) then {
|
||||
EPOCH_gearKeyPressed = false;
|
||||
};
|
||||
|
||||
|
||||
_handled
|
||||
|
@ -17,6 +17,14 @@ for "_i" from 5 to 8 do {
|
||||
_debug1 setDir 90;
|
||||
};
|
||||
|
||||
// spawn lights
|
||||
{
|
||||
_lightLocation = _debug modelToWorld _x;
|
||||
_light = createVehicle["Land_PortableLight_double_F", _lightLocation, [], 0, "CAN_COLLIDE"];
|
||||
_light setDir ([_debugLocation,_lightLocation] call BIS_fnc_dirTo);
|
||||
_light setpos _lightLocation;
|
||||
} forEach [[-16.623,-8.50195,-10.5417],[15.0352,-9.08594,-10.5417]];
|
||||
|
||||
_config = configFile >> "CfgEpoch";
|
||||
|
||||
// spawn area props
|
||||
|
@ -39,9 +39,6 @@ class Chernarus : Default
|
||||
{ "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 10688.6, 9428.98, 0.00144958 } } // North East
|
||||
};
|
||||
propsPos[] = {
|
||||
//debug lights
|
||||
{ "Land_PortableLight_double_F", { 1041.07,2032.96,0.249583 }, 48.2164 },
|
||||
{ "Land_PortableLight_double_F", { 1008.24,2013.97,0.217788 }, 233.858 },
|
||||
// phones
|
||||
{ "Land_PhoneBooth_02_F", { 10455.2, 2214.84, 0 }, 52.4502 },
|
||||
{ "Land_PhoneBooth_02_F", { 10480, 2350.02, 0.101999 }, 326.023 },
|
||||
|
Loading…
Reference in New Issue
Block a user