0.3.7.045

This commit is contained in:
vbawol 2016-01-19 12:34:31 -06:00
parent 14155a577c
commit f530de8021
10 changed files with 343 additions and 93 deletions

View File

@ -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] Male(Female) characters lose vest items after equipping opposite sex's vest.
[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.
@ -35,7 +36,7 @@
[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)
[Added] Debug box now dynamically spawns with flood lights to help players see inside the box at night.
[Added] CUP terrain pack support added:
[Added-WIP] CUP terrain pack support added:
- Sahrani
- Southern Sahrani
- United Sahrani
@ -51,12 +52,13 @@
- Bukovina
- Bystrica
- Takistan Mountains
[Changed] Removed support for Aia terrain pack in favor of CUP terrain pack.
[Changed] Removed support for AIA terrain pack in favor of CUP terrain pack.
[Changed] Empty fuel barrel added to large trash and vehicle loot tables.
[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] Static propPos campfires not working on Takistan due to disabled simulation.
[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.

View File

@ -1,7 +1,7 @@
//new2
7 EPOCH_C_SET !="!isNil \"EPOCH_C_SET\"" !="_array = EPOCH_C_SET;" !="EPOCH_C_SET = nil;"
7 "BIS_fnc_dynamictext" !="\"BIS_fnc_dynamictext"\" !", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;" !", 0, 0.4, 5, 2, 0, 2] spawn bis_fnc_dynamictext;" !", 0, 1, 6, 2, 0, 1] spawn bis_fnc_dynamictext;" !"snil '_fnc_scriptName') then {_fnc_scriptName}"
7 forceRespawn
7 forceRespawn !="reviveHandleForceRespawnAction"
7 setFriend
7 setAmmo
7 RscDebugConsole_watch !="RscDebugConsole_watchSave = [true,true,true,true];"
@ -23,7 +23,7 @@
7 onMapSingleClick !="onMapSingleClick '';"
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 addItem !="{player addItemToVest _x} forEach _vestItems;" !="player addItem _item;" !="_plyr addItemToVest _missionItem;" !="axeVIP addItemToVest _item;" !="_plyr addItemToVest _missionItem;" !="EPOCH_fnc_addItemOverflow"
7 addBackPack
7 addMissionEventHandler !="addMissionEventHandler ['Draw3D',_var + \"call Epoch_gui3DCooldownEH;\"];" !="addMissionEventHandler ['Draw3D',_var + \"call epoch_gui3dModelPosEH;\"];" !="addMissionEventHandler ['Draw3D',_var + \"call epoch_gui3dWorldPosEH;\"];" !="addMissionEventHandler [\n"ended",\n{\n\nBIS_fnc_missionHandlers_end = _this;"
7 removeMissionEventHandler !="removeMissionEventHandler [\"Draw3D\", _id];"

View File

@ -17,67 +17,6 @@ _woman = getNumber(configFile >> "CfgVehicles" >> (typeOf player) >> "woman");
_class = _this select 2;
_config = configfile >> "cfgweapons" >> _class;
/*
_sleepAndCheck = {
_good = true;
_failcount = 0;
switch _this do {
case 0: {
while {true} do {
if !(local(backpackContainer player)) then {
_good = false;
_failcount = _failcount + 1;
} else {
_good = true;
};
if (_good) exitWith {};
if (_failcount > 5) exitWith { removeBackpack player; };
sleep 0.5;
};
};
case 1: {
while {true} do {
if !(local(vestContainer player)) then {
_good = false;
_failcount = _failcount + 1;
} else {
_good = true;
};
if (_good) exitWith{};
if (_failcount > 5) exitWith{ removeVest player; };
sleep 0.5;
};
};
case 2: {
while {true} do {
if !(local(uniformContainer player)) then {
_good = false;
_failcount = _failcount + 1;
} else {
_good = true;
};
if (_good) exitWith{};
if (_failcount > 5) exitWith{ removeUniform player; };
sleep 0.5;
};
};
};
};
if (isclass _config) then {
_infoType = getnumber(_config >> "itemInfo" >> "type");
switch _infoType do {
case 701: { 1 spawn _sleepAndCheck; };
case 801: { 2 spawn _sleepAndCheck; };
};
} else {
if (getNumber(configFile >> "CfgVehicles" >> _class >> "isbackpack") == 1) then {
0 spawn _sleepAndCheck;
};
};
*/
_mags = (magazines player) + (handgunMagazine player);
// TODO optimize
@ -115,28 +54,14 @@ if (_woman == 1) then {
_vest = vest player;
if (_class == _vest) then {
if (_femaleVariant != _vest) then {
/* // everyContainer not working in 1.20
_holder = _this select 1;
_containers = (everyContainer _holder) select 0;
_mags = magazinesAmmoFull _container;
_weps = weaponCargo vestContainer _container;
_item = itemCargo vestContainer _container;
*/
// get items in existing vest
_vestItems = vestItems player;
// remove vest
removeVest player;
// replace with female variant
player addVest _femaleVariant;
/*
{
if ((_x select 4) == "Vest") then {
player addMagazine [(_x select 0),(_x select 1)]
}
} forEach _mags;
{
player addItemToVest _x;
} forEach (_weps+_item);
*/
// readd items to players vest
{player addItemToVest _x} forEach _vestItems;
};
};
};

View File

@ -0,0 +1,110 @@
/*
Author: Aaron Clark - EpochMod.com
Contributors:
Description:
Epoch gamemode config for Sahrani Lite
Licence:
Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
Github:
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_config/Configs/CfgEpochClient/Sara.hpp
*/
class SaraLite {
Rocks[] = {
"stone4.p3d",
"stone3.p3d",
"stone4_invert.p3d",
"rocks_01.p3d",
"stone4a.p3d",
"stone3a.p3d",
"rockn_02.p3d",
"rockn_01.p3d"
};
ATM[] = {
"mailboxsouth.p3d",
"phone_box_south.p3d"
};
Water[] = {
"pumpa.p3d"
};
// main config
TrashClasses[] = { "Trash", "TrashSmall", "TrashVehicle", "PumpkinPatch", "TrashFood" };
TrashSmall[] = {
};
TrashVehicle[] = {
};
PumpkinPatch[] = {
"p_pumpkin_summer.p3d",
"pumpkin.p3d",
};
TrashFood[] = {
};
Trash[] = {
"Land_GarbagePallet_F",
"Land_GarbageBags_F",
"drevena_bedna.p3d",
"barels.p3d",
"paletyc.p3d",
"barel3.p3d",
"odpadkovy_kos.p3d",
"barel2.p3d",
"barel1.p3d",
"barel4.p3d",
"kontejner.p3d",
"dum_olez_istan1.p3d",
"kontejner_sklo.p3d",
"kontejner_plasty.p3d",
"kontejner_papir.p3d",
"popelnice.p3d",
"hrob2.p3d"
};
Trees[] = {
"str krovisko vysoke.p3d",
"str_fikovnik.p3d",
"str_fikovnik2.p3d",
"str_fikovnik_ker.p3d",
"palm_04.p3d",
"str_pinie.p3d",
"krovi2.p3d",
"palm_02.p3d",
"palm_03.p3d",
"palm_01.p3d",
"jablon.p3d",
"str_briza_kriva.p3d",
"dd_borovice.p3d",
"dd_borovice02.p3d",
"str habr.p3d",
"smrk_siroky.p3d",
"smrk_velky.p3d",
"str briza.p3d"
};
Bushes[] = {
"ker deravej.p3d",
"ker buxus.p3d",
"krovi4.p3d",
"krovi_bigest.p3d",
"krovi.p3d",
"ker s bobulema.p3d",
"str trnka.p3d",
"str_liskac.p3d",
"dd_bush02.p3d",
"dd_bush01.p3d",
"ker pichlavej.p3d",
"krovi_long.p3d"
};
Cinder[] = {
"cinderblocks_f.p3d"
};
Wrecks[] = {
"budova5.p3d",
"plot_vlnplech1.p3d",
"datsun01t.p3d",
"pletivo_dira.p3d",
"plot_vlnplech2.p3d",
"pletivo.p3d"
};
};

View File

@ -0,0 +1,110 @@
/*
Author: Aaron Clark - EpochMod.com
Contributors:
Description:
Epoch gamemode config for Sahrani
Licence:
Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
Github:
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_config/Configs/CfgEpochClient/Sara.hpp
*/
class Sara_dbe1 {
Rocks[] = {
"stone4.p3d",
"stone3.p3d",
"stone4_invert.p3d",
"rocks_01.p3d",
"stone4a.p3d",
"stone3a.p3d",
"rockn_02.p3d",
"rockn_01.p3d"
};
ATM[] = {
"mailboxsouth.p3d",
"phone_box_south.p3d"
};
Water[] = {
"pumpa.p3d"
};
// main config
TrashClasses[] = { "Trash", "TrashSmall", "TrashVehicle", "PumpkinPatch", "TrashFood" };
TrashSmall[] = {
};
TrashVehicle[] = {
};
PumpkinPatch[] = {
"p_pumpkin_summer.p3d",
"pumpkin.p3d",
};
TrashFood[] = {
};
Trash[] = {
"Land_GarbagePallet_F",
"Land_GarbageBags_F",
"drevena_bedna.p3d",
"barels.p3d",
"paletyc.p3d",
"barel3.p3d",
"odpadkovy_kos.p3d",
"barel2.p3d",
"barel1.p3d",
"barel4.p3d",
"kontejner.p3d",
"dum_olez_istan1.p3d",
"kontejner_sklo.p3d",
"kontejner_plasty.p3d",
"kontejner_papir.p3d",
"popelnice.p3d",
"hrob2.p3d"
};
Trees[] = {
"str krovisko vysoke.p3d",
"str_fikovnik.p3d",
"str_fikovnik2.p3d",
"str_fikovnik_ker.p3d",
"palm_04.p3d",
"str_pinie.p3d",
"krovi2.p3d",
"palm_02.p3d",
"palm_03.p3d",
"palm_01.p3d",
"jablon.p3d",
"str_briza_kriva.p3d",
"dd_borovice.p3d",
"dd_borovice02.p3d",
"str habr.p3d",
"smrk_siroky.p3d",
"smrk_velky.p3d",
"str briza.p3d"
};
Bushes[] = {
"ker deravej.p3d",
"ker buxus.p3d",
"krovi4.p3d",
"krovi_bigest.p3d",
"krovi.p3d",
"ker s bobulema.p3d",
"str trnka.p3d",
"str_liskac.p3d",
"dd_bush02.p3d",
"dd_bush01.p3d",
"ker pichlavej.p3d",
"krovi_long.p3d"
};
Cinder[] = {
"cinderblocks_f.p3d"
};
Wrecks[] = {
"budova5.p3d",
"plot_vlnplech1.p3d",
"datsun01t.p3d",
"pletivo_dira.p3d",
"plot_vlnplech2.p3d",
"pletivo.p3d"
};
};

View File

@ -0,0 +1,108 @@
/*
Author: Aaron Clark - EpochMod.com
Contributors:
Description:
Epoch gamemode config for Zargabad
Licence:
Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
Github:
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_config/Configs/CfgEpochClient/Takistan.hpp
*/
class Zargabad {
blockedArea[] = {};
Rocks[] = {
"r_tk_stone_01_ep1.p3d",
"r_tk_stone_02_ep1.p3d",
"r_tk_rock_03_ep1.p3d",
"r_tk_boulder_03_ep1.p3d",
"r_tk_rock_02_ep1.p3d",
"r_tk_boulder_01_ep1.p3d",
"r_tk_boulder_02_ep1.p3d",
"r_tk_rock_01_ep1.p3d"
};
ATM[] = {
};
Water[] = {
"misc_well_c_ep1.p3d",
"misc_well_l_ep1.p3d",
"stand_water_ep1.p3d",
"misc_concbox_ep1.p3d"
};
// main config
TrashClasses[] = { "Trash", "TrashSmall", "TrashVehicle", "PumpkinPatch", "TrashFood" };
TrashSmall[] = {
};
TrashVehicle[] = {
};
PumpkinPatch[] = {
"p_pumpkin_summer.p3d",
"pumpkin.p3d",
};
TrashFood[] = {
};
Trash[] = {
"misc_rubble_ep1.p3d",
"bags_stack_ep1.p3d",
"kiosk_ep1.p3d",
"tires_ep1.p3d",
"garbage_misc.p3d",
"garbage_paleta.p3d",
"paletyc.p3d",
"crates_ep1.p3d",
"cages_ep1.p3d",
"junkpile.p3d",
"crates_stack_ep1.p3d",
"transport_cart_ep1.p3d",
"stand_small_ep1.p3d",
"stand_meat_ep1.p3d",
"bags_ep1.p3d",
"misc_garb_heap_ep1.p3d",
"house_k_1_ruins_ep1.p3d"
};
Trees[] = {
"t_populusf2s_ep1.p3d",
"t_pistacial2s_ep1.p3d",
"misc_trunk_torzo_ep1.p3d",
"t_populusb2s_ep1.p3d",
"t_amygdalusc2s_ep1.p3d",
"t_pinuse2s_ep1.p3d",
"t_ficusb2s_ep1.p3d",
"t_juniperusc2s_ep1.p3d",
"t_pinuss3s_ep1.p3d",
"misc_trunk_water_ep1.p3d",
"t_prunuss2s_ep1.p3d"
};
Bushes[] = {
"b_amygdalusn1s_ep1.p3d",
"b_pistacial1s_ep1.p3d",
"b_pinusm1s_ep1.p3d"
};
Cinder[] = {
"cinderblocks_f.p3d"
};
Wrecks[] = {
"wall_indfnc_9.p3d",
"wall_indfnc_pole.p3d",
"wall_tincom_9.p3d",
"wall_tincom_pole.p3d",
"ural_wrecked.p3d",
"uaz_wrecked.p3d",
"datsun02t.p3d",
"hiluxt.p3d",
"datsun01t.p3d",
"wall_tin_4.p3d",
"wall_indfnc_3_d.p3d",
"wall_indfnc_3.p3d",
"wall_indfnc_3_hole.p3d",
"skodovka_wrecked.p3d",
"lada_wrecked.p3d",
"misc_concrete_high.p3d",
"t72_wrecked.p3d",
"t72_wrecked_turret.p3d"
};
};

View File

@ -87,9 +87,6 @@ if (typename _this == "ARRAY") then {
_server_vars = _arr select 3;
_vars = _arr select 4;
diag_log format["DEBUG (Load Player) _worldspace 1: %1", _worldspace];
diag_log format["DEBUG (Load Player) _location 1: %1", _location];
_plyrGroup = _arr select 10;
_canBeRevived = _arr select 11;
@ -255,7 +252,6 @@ if (typename _this == "ARRAY") then {
_newPlyr linkItem _x;
};
} forEach _linkedItems;
diag_log format["DEBUG (Load Player) _linkedItems: %1", _linkedItems];
// add items to containers
[_newPlyr, _itemsInContainers] call _fnc_addItemToX;
@ -265,7 +261,6 @@ if (typename _this == "ARRAY") then {
// Add magazines
{_newPlyr addMagazine _x} forEach _normalMagazines;
diag_log format["DEBUG (Load Player) _normalMagazines 1: %1", _normalMagazines];
// Load inventory + defaults END
// Final Push

View File

@ -185,7 +185,7 @@ class Takistan : Default
{ "Land_InvisibleBarrier_F", {6031.06,1125.35,-3.05176e-005}, {{-0.792986,0.609239,0.00106654},{-0.0047996,-0.0079977,0.999957}}, true },
{ "Land_InvisibleBarrier_F", {6036.83,1107.76,0}, {{0.630791,0.77592,0.00714174},{0.00639569,-0.0144025,0.999876}}, true },
{ "Land_InvisibleBarrier_F", {6047.28,1122.39,3.05176e-005}, {{0.631136,0.775013,0.0319748},{0.0239479,-0.0606713,0.99787}}, true },
{ "Land_Campfire_F", {6032.87,1115.99,-0.0418091}, {{0.000214814,0.999436,0.0335832},{0.00639275,-0.0335839,0.999416}}, true },
{ "Land_Campfire_F", {6032.87,1115.99,-0.0418091}, {{0.000214814,0.999436,0.0335832},{0.00639275,-0.0335839,0.999416}}, false },
{ "Land_Pallet_MilBoxes_F", {6041.29,1125.05,-0.00198364}, {{0.827488,-0.561467,0.00430099},{-0.012796,-0.0111996,0.999856}}, true },
{ "Land_CncBarrier_stripes_F", {6040.33,1113.02,0.000823975}, {{-0.632139,-0.774606,-0.0196288},{0.0159872,-0.0383653,0.999136}}, true },
{ "Land_CncBarrier_stripes_F", {6047.36,1107.46,0.000335693}, {{-0.631868,-0.775074,-0.00173746},{0.0207925,-0.0191915,0.9996}}, true },
@ -272,7 +272,7 @@ class Takistan : Default
{ "Land_InvisibleBarrier_F", {4710.81,9212.97,0}, {{-0.997574,-0.0618166,0.0320209},{0.0319831,0.00160074,0.999487}}, true },
{ "Land_InvisibleBarrier_F", {4711.04,9209.09,0}, {{-0.997634,-0.0612471,0.0312378},{0.0319811,-0.0111947,0.999426}}, true },
{ "Land_InvisibleBarrier_F", {4710.66,9216.81,0}, {{-0.995205,-0.0616866,0.0759106},{0.0733321,0.0430442,0.996378}}, true },
{ "Land_Campfire_F", {4706.18,9209.11,-0.0424957}, {{7.679e-005,0.999872,0.0159986},{0.00479914,-0.0159987,0.999861}}, true },
{ "Land_Campfire_F", {4706.18,9209.11,-0.0424957}, {{7.679e-005,0.999872,0.0159986},{0.00479914,-0.0159987,0.999861}}, false },
{ "Land_Cages_F", {4702.99,9202.33,7.62939e-005}, {{-0.120214,-0.992684,-0.011309},{-0.00159902,-0.011198,0.999936}}, true },
{ "Land_WoodPile_F", {4711.05,9209.09,-0.00050354}, {{5.74658e-008,0.999937,0.0112005},{0.0319811,-0.0111947,0.999426}}, true },
{ "Land_CncBarrier_stripes_F", {4711.09,9205.7,0.000488281}, {{0.999128,-0.0317508,-0.0271252},{0.0271896,0.00159853,0.999629}}, true },
@ -329,7 +329,7 @@ class Takistan : Default
{ "Land_Mil_ConcreteWall_F", {6833.52,4985.23,0}, {{-0.971093,0.2387,0},{0,0,1}}, true },
{ "Land_Mil_ConcreteWall_F", {6834.37,4989.17,0}, {{0.985853,-0.167609,0},{0,0,1}}, true },
{ "Land_Garbage_square3_F", {6835.88,4968.22,-0.0100098}, {{0.0010217,0.997959,-0.063852},{-0.0159663,0.0638602,0.997831}}, true },
{ "Land_Campfire_F", {6827.88,4986.2,0.000396729}, {{0.000675027,0.999816,-0.0191768},{-0.0351719,0.0191887,0.999197}}, true },
{ "Land_Campfire_F", {6827.88,4986.2,0.000396729}, {{0.000675027,0.999816,-0.0191768},{-0.0351719,0.0191887,0.999197}}, false },
{ "Land_CncBarrier_stripes_F", {6832.8,4967.1,0}, {{0.435862,0.900013,0},{0,0,1}}, true },
{ "Land_CncBarrier_stripes_F", {6843.6,4992.37,-3.05176e-005}, {{0.965017,-0.262186,0},{0,0,1}}, true },
{ "Land_CncBarrier_stripes_F", {6836.55,4997.99,0}, {{0.965017,-0.262186,0},{0,0,1}}, true },