Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Several Changes / Tweaks

Browse Source
This commit is contained in:
He-Man 2019-10-19 19:56:38 +02:00
parent 3f3f1b220f
commit de999989ad
13 changed files with 475 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_code/System/player_login.fsm
View File

@ -1299,7 +1299,7 @@ class FSM
"switch (tolower _forcegender) do {" \n
" case ""male"": {EPOCH_PlayerIsMale = true;};" \n
" case ""female"": {EPOCH_PlayerIsMale = false;};" \n
" default {createdialog ""SelectGender""}" \n
" default {createdialog ""SelectGender"";}" \n
"};"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links

3
Sources/epoch_code/compile/functions/EPOCH_fnc_playerFired.sqf
View File

@ -75,6 +75,9 @@ switch true do {
}forEach((getAllHitPointsDamage _cursorTarget) param[2,[]]);
if (_highestDMG > 0) then {
_newDMG = ((_highestDMG - 0.5) max 0);
if (_cursorTarget iskindof "MAN") then {
_newDMG = ((_highestDMG - 1) max 0);
};
["Partially healed / repaired",5] call epoch_message;
if (local _cursorTarget) then {
[_cursorTarget,[[_currentHIT,_newDMG]]] call EPOCH_client_repairVehicle;

3
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -4,6 +4,9 @@ waitUntil {!isNull (findDisplay 46) && (!isNil "EPOCH_loadingScreenDone")};
// load favBar
'load' spawn epoch_favBar_draw;
// Switch to 3rd person (if possible)
vehicle player switchCamera 'EXTERNAL';
// force update within 15 seconds
EPOCH_forceUpdate = false;
_forceUpdate = false;

2
Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp
View File

@ -604,7 +604,7 @@ class BaseCam
class ConnectUAV
{
condition = "(dyna_cursorTarget iskindof 'UAV_01_base_F' || dyna_cursorTarget iskindof 'UAV_06_base_F') && alive dyna_cursorTarget";
action = "if ({_x in (assigneditems player)} count ['B_UavTerminal','O_UavTerminal','I_UavTerminal','C_UavTerminal'] > 0) then {dyna_cursorTarget spawn {_unit = _this;if (isnull (driver _unit)) then {_plyr = player;_grp = createGroup side _plyr;_driver = _grp createUnit[""I_UAV_AI"", position _unit, [], 0, ""CAN_COLLIDE""];_driver moveInAny _unit;uisleep 0.5;};player action [""SwitchToUAVDriver"", _unit];};}else {['You need an UAV-Terminal to connect',5] call epoch_message;};";
action = "if (missionnamespace getvariable ['insafezone',false]) exitwith {['Not allowed in Safe Zones',5] call Epoch_Message};if !({_x in (assigneditems player)} count ['B_UavTerminal','O_UavTerminal','I_UavTerminal','C_UavTerminal'] > 0) exitwith {['You need an UAV-Terminal to connect',5] call epoch_message;}; dyna_cursorTarget spawn {_unit = _this;if (isnull (driver _unit)) then {_plyr = player;_grp = createGroup side _plyr;_driver = _grp createUnit[""I_UAV_AI"", position _unit, [], 0, ""CAN_COLLIDE""];_driver moveInAny _unit;uisleep 0.5;};player action [""SwitchToUAVDriver"", _unit];_unit setvariable ['Ignatz_UavOwner',name player,true];};";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\epoch_UAV.paa";
tooltip = "Connect to UAV";
};

322
Sources/epoch_config/Configs/CfgBuildingLootPos.hpp
View File

@ -7190,6 +7190,328 @@ class CfgBuildingLootPos
wardrobePos[] = {{{2.29834,-0.0820313,1.78336},0.238892}};
couchPos[] = {{{1.22559,-2.25684,1.78084},90.2387}};
};
class Land_MedicalTent_01_MTP_closed_F : Default {
lootType = "medical";
cabinetPos[] = {
{ {3.22852,-4.89453,-0.273125}, 90.4999 }
};
palletPos[] = {
{ {-1.8418,6.03711,-1.37312}, -180 }
};
pelicanPos[] = {
{ {3.63867,5.79297,-1.37312}, 151 }
};
filingPos[] = {
{ {-3.22852,5.39063,-1.37312},-177.5}
};
shelfPos[] = {
{ {1.72656,5.28125,-1.37312}, 177.5 }
};
tablePos[] = {
{ {1.95117,-5.4375,-1.37312}, 0.997818 }
};
shoeboxPos[] = {
{ {-3.79688,-5.55273,-1.37312}, 26.4985 }
};
lockerPos[] = {
{ {-1.98242,-5.46484,-1.37312}, -0.50238 }
};
};
class Land_MedicalTent_01_white_generic_closed_F : Land_MedicalTent_01_MTP_closed_F {};
class Land_Destroyer_01_interior_03_F : Default {
lootType = "mil";
pelicanPos[] = {
{{4.13281,5.0293,7.92066},221.501},
{{-3.83008,10.5586,12.5327},140.998}
};
shelfPos[] = {
{{5.23242,19.8281,7.92066},270},
{{0.853516,3.68945,7.92063},0},
{{-3.94336,18.082,7.92066},0}
};
toolRackPos[] = {
{{13.4238,4.00586,7.92066},180.998},
{{-0.09375,16.5313,12.5327},0},
{{-1.74805,-20.9961,10.9124},270.5}
};
lockerPos[] = {
{{2.18555,19.8027,7.92065},89.9993}
};
cabinetPos[] = {
{{2.43555,12.3809,9.17067},89.4992},
{{-1.46094,-6.10352,9.22061},269},
{{-3.78906,18.1934,13.8826},90.4993}
};
filingPos[] = {
{{6.38477,-20.7461,11.0124},90.4993}
};
palletPos[] = {
{{-5.04102,5.96094,7.92066},311.5}
};
};
class Land_Destroyer_01_interior_04_F : default {
lootType = "mil";
palletPos[] = {
{{-3.80469,-18.1543,9.45211},19.5}
};
lockerPos[] = {
{{-9.33008,-3.1875,9.45211},269}
};
cabinetPos[] = {
{{-12.3613,9,10.7877},181.502}
};
couchPos[] = {
{{9.12109,-7.80273,9.45211},0}
};
tablePos[] = {
{{-9.54688,2.30664,9.45211},271}
};
pelicanPos[] = {
{{0.792969,-18.1191,9.45211},134.999}
};
};
class Land_Destroyer_01_hull_05_F : default {
lootType = "mil";
pelicanPos[] = {
{{10.6133,-7.68359,9.41183},135.499}
};
shelfPos[] = {
{{-14.0059,-12.582,9.41053},270}
};
shoeboxPos[] = {
{{8.24609,7.9043,9.41428},0}
};
palletPos[] = {
{{-8.55469,7.73438,9.41408},313.5}
};
};
class Land_Destroyer_01_hull_04_F : default {
lootType = "mil";
palletPos[] = {
{{12.1348,16.5391,9.41681},298},
{{-10.293,-18.6426,15.8783},0}
};
cabinetPos[] = {
{{-11.7148,14.7813,11.1646},273}
};
shoeboxPos[] = {
{{-13.3887,19.9199,9.42394},119.999}
};
toolRackPos[] = {
{{10.5352,-21.9043,15.8851},180.498}
};
pelicanPos[] = {
{{-12.2969,7.88672,15.8848},0}
};
};
class Land_Destroyer_01_hull_02_F : default {
lootType = "mil";
pelicanPos[] = {
{{-8.58008,-0.689453,11.098},48.9998}
};
palletPos[] = {
{{5.62695,-7.89258,11.1432},0}
};
shoeboxPos[] = {
{{-5.11133,-7.58203,11.1409},0}
};
};
class Land_Destroyer_01_hull_01_F : default {
lootType = "mil";
pelicanPos[] = {
{{0.193359,6.27539,12.6386},175.998}
};
palletPos[] = {
{{0.373047,-3.39648,12.9917},0}
};
};
class Land_Destroyer_01_interior_02_F : default {
lootType = "mil";
toolRackPos[] = {
{{3.2207,20.8301,11.0089},0}
};
filingPos[] = {
{{-1.3125,15.375,11.0056},267.5}
};
cabinetPos[] = {
{{-4.3457,6.91211,12.3288},86.9993}
};
freezerPos[] = {
{{6.98242,5.68945,11.0288},42.9998}
};
pelicanPos[] = {
{{-0.810547,20.3691,11.0063},0},
{{-0.630859,1.68164,19.842},180.502}
};
lockerPos[] = {
{{2.90234,14.2813,17.4492},178.002}
};
couchPos[] = {
{{-0.902344,9.8418,19.842},270}
};
shelfPos[] = {
{{-5.49414,10.8086,19.842},0}
};
Bunk_EPOCH[] = {
{{2.26172,10.2285,19.842},268.5}
};
cookerPos[] = {
{{-3.17578,10.4668,19.842},0}
};
};
class Land_Carrier_01_island_02_F : default {
lootType = "mil";
cabinetPos[] = {
{{0.611328,3.0332,0.0348701},271},
{{-3.81445,-0.130859,-0.215851},0}
};
pelicanPos[] = {
{{-2.41406,1.12305,-1.41662},304.5}
};
filingPos[] = {
{{5.75,7.49609,-1.3651},90.9992}
};
palletPos[] = {
{{-1.94531,9.57031,-1.41511},340.5}
};
shelfPos[] = {
{{2.99414,-3.69727,1.95266},0}
};
lockerPos[] = {
{{-3.35547,8.1543,-1.41511},269.5}
};
};
class Land_Carrier_01_island_01_F : default {
lootType = "mil";
palletPos[] = {
{{-5.11914,-11.9375,10.167},306},
{{7.2832,2.30078,7.3132},360}
};
pelicanPos[] = {
{{-6,-3.02344,10.1717},272},
};
shoeboxPos[] = {
{{6.56641,-2.1875,7.31347},88.9993},
{{-6.40039,-4.75195,10.1776},33.9998}
};
};
class Land_Carrier_01_hull_06_2_F : default {
lootType = "mil";
pelicanPos[] = {
{{-19.5,-13.6426,16.9168},233.999}
};
shoeboxPos[] = {
{{-20.0527,-2.68164,16.9168},128.001}
};
palletPos[] = {
{{-5.65625,-14.5137,18.5299},317.5},
{{21.9355,19.0313,18.5299},0}
};
toolRackPos[] = {
{{-17.7988,-11.9844,16.4168},89.9994}
};
cabinetPos[] = {
{{-19.4395,-1.5957,17.7168},36.9997}
};
};
class Land_Carrier_01_hull_09_2_F : default {
lootType = "mil";
palletPos[] = {
{{-12.6211,-18.5371,18.5435},0},
{{-14.873,13.2324,14.9902},0}
};
shoeboxPos[] = {
{{-16.6367,5.70508,18.5435},140.999},
{{-7.92578,7.97656,14.9903},0}
};
pelicanPos[] = {
{{-16.1504,7.82617,14.9402},201.002}
};
cabinetPos[] = {
{{-5.81445,9.43555,16.1402},178.498}
};
};
class Land_Carrier_01_hull_09_1_F : default {
lootType = "mil";
toolRackPos[] = {
{{-6.11133,-4.94336,14.4722},269.003}
};
pelicanPos[] = {
{{10.1172,-6.33398,14.7225},145.999}
};
palletPos[] = {
{{15.416,-19.0977,18.5144},0}
};
toiletPos[] = {
{{-5.42773,-6.78516,14.7162},218.001}
};
shoeboxPos[] = {
{{-5.67969,15.0645,14.7232},0},
{{5.49414,9.64453,14.7231},0}
};
};
class Land_Carrier_01_hull_05_1_F : default {
lootType = "mil";
toolRackPos[] = {
{{16.709,15.1426,14.5248},271}
};
pelicanPos[] = {
{{19.7637,14.9316,14.4186},90.5004}
};
lockerPos[] = {
{{17.8789,18.4805,11.5793},180.002}
};
shoeboxPos[] = {
{{22.8203,17.6484,14.4248},268.5}
};
cabinetPos[] = {
{{16.7988,10.0332,18.2292},0}
};
palletPos[] = {
{{19.1387,-16.4199,18.5495},0}
};
};
class Land_Carrier_01_hull_03_2_F : default {
lootType = "mil";
shelfPos[] = {
{{-6.72461,-4.2168,14.4014},85.4992}
};
pelicanPos[] = {
{{-8.25195,-12.3477,13.1341},0}
};
palletPos[] = {
{{-14.0117,3.96875,14.4014},0}
};
shoeboxPos[] = {
{{-14.2852,-4.03516,14.4014},0},
{{-12.832,18.7402,18.5309},0}
};
cabinetPos[] = {
{{-8.32617,6.69336,18.2137},144.501}
};
tablePos[] = {
{{-6.88086,-21.4336,16.9161},263.499}
};
};
class Land_Carrier_01_hull_03_1_F : default {
lootType = "mil";
shoeboxPos[] = {
{{8.94727,7.35156,16.9285},0},
{{4.54688,-19.4023,11.687},0}
};
tablePos[] = {
{{7.26953,-19.5352,16.9288},94.9993}
};
pelicanPos[] = {
{{5.69531,-8.48438,11.687},319.5}
};
palletPos[] = {
{{9.51953,-10.3203,11.687},0}
};
toolRackPos[] = {
{{5.93164,-5.24219,14.3667},274.5}
};
};
};
/*[[[end]]]*/

38
Sources/epoch_config/Configs/CfgItemSort.hpp
View File

@ -207,6 +207,7 @@ class CfgItemSort
"U_C_ConstructionCoverall_Vrana_F",
"U_C_ConstructionCoverall_Black_F",
"U_C_ConstructionCoverall_Blue_F",
"U_I_CombatUniform",
"U_I_CombatUniform_shortsleeve",
"U_I_pilotCoveralls",
"U_I_HeliPilotCoveralls",
@ -264,11 +265,13 @@ class CfgItemSort
"V_TacChestrig_oli_F",
"V_TacChestrig_cbr_F",
"V_PlateCarrierSpec_tna_F",
"V_PlateCarrierSpec_mtp",
"V_PlateCarrierSpec_blk",
"V_HarnessO_ghex_F",
"V_HarnessOGL_ghex_F",
"V_PlateCarroer2_tna_F",
"V_PlateCarrierGL_tna_F"
"V_PlateCarrierGL_tna_F",
"V_PlateCarrier2_blk"
};
Backpacks[] = {
@ -468,6 +471,8 @@ class CfgItemSort
// Headgear Apex
"H_HelmetLeaderO_ghex_F",
"H_HelmetLeaderO_oucamo",
"H_HelmetLeaderO_ocamo",
"H_HelmetCrew_O_ghex_F",
"H_HelmetO_ghex_F",
"H_Helmet_Skate",
@ -477,7 +482,11 @@ class CfgItemSort
"H_MilCap_tna_F",
"H_MilCap_ghex_F",
"H_Booniehat_tna_F",
"H_HelmetB_Light_tna_F"
"H_HelmetB_Light_tna_F",
"H_HelmetSpecO_ocamo",
"H_HelmetSpecO_blk",
"H_HelmetO_oucamo",
"H_HelmetO_ocamo"
};
Equipment[] = {
@ -485,6 +494,8 @@ class CfgItemSort
"Laserdesignator",
"ItemCompass",
"ItemGPS",
"ItemLaptop",
"ItemLaptop_wpn",
"ItemGeigerCounter_EPOCH",
"ItemWatch",
"NVG_EPOCH",
@ -648,6 +659,8 @@ class CfgItemSort
// Apex
"LMG_03_F",
"arifle_CTARS_blk_F",
"arifle_CTARS_hex_F",
// Launcher
"launch_I_Titan_F",
"launch_B_Titan_short_F",
@ -1181,7 +1194,9 @@ class CfgItemSort
"ItemComboLock",
"ItemPipe",
"ItemBulb",
"SmeltingTools_EPOCH"
"SmeltingTools_EPOCH",
"Kit_IG_Box_s",
"Kit_IG_Box_l"
};
Items[] = {
@ -1289,6 +1304,8 @@ class CfgItemSort
"hoverboard_epoch_cargo",
"MBK_01_EPOCH",
"ebike_epoch", // Motorcycle
"C_Kart_01_black_F",
"C_Quadbike_01_F",
"C_Offroad_01_EPOCH", // Offroader
"C_Offroad_01_EPOCH1",
"C_Offroad_01_EPOCH2",
@ -1428,6 +1445,8 @@ class CfgItemSort
"B_MRAP_01_hmg_F",
"O_MRAP_02_hmg_F",
"I_MRAP_03_hmg_F",
"I_LT_01_scout_F",
"I_LT_01_cannon_F",
// Orange DLC
"I_G_Van_02_transport_F", /* Van Transport (Orange DLC) */
@ -1437,6 +1456,15 @@ class CfgItemSort
"I_G_Van_02_vehicle_F", /* Van Transport (Orange DLC) */
"O_G_Van_02_vehicle_F", /* Van Transport (Orange DLC) */
"B_G_Van_02_vehicle_F", /* Van Transport (Orange DLC) */
"I_G_Van_02_transport_EPOCH", /* Van Transport (Orange DLC) */
"O_G_Van_02_transport_EPOCH", /* Van Transport (Orange DLC) */
"B_G_Van_02_transport_EPOCH", /* Van Transport (Orange DLC) */
"I_G_Van_02_vehicle_EPOCH", /* Van Transport (Orange DLC) */
"O_G_Van_02_vehicle_EPOCH", /* Van Transport (Orange DLC) */
"B_G_Van_02_vehicle_EPOCH", /* Van Transport (Orange DLC) */
"B_GEN_Van_02_transport_EPOCH", /* Van Transport (Orange DLC) */
// Apex
"I_C_Offroad_02_unarmed_F",
"I_C_Offroad_02_unarmed_brown_F",
@ -1449,6 +1477,8 @@ class CfgItemSort
"C_Offroad_02_unarmed_white_F",
"C_Offroad_02_unarmed_red_F",
"C_IDAP_Offroad_02_unarmed_F",
"I_C_Offroad_02_LMG_F",
"B_LSV_01_unarmed_F",
"B_LSV_01_unarmed_olive_F",
"B_LSV_01_unarmed_sand_F",
@ -1500,6 +1530,7 @@ class CfgItemSort
"O_Heli_Light_02_unarmed_EPOCH",
"I_Heli_light_03_unarmed_EPOCH",
"I_Heli_Transport_02_EPOCH",
"C_IDAP_Heli_Transport_02_F",
"B_Heli_Transport_03_unarmed_green_F",
"B_Heli_Transport_03_unarmed_EPOCH",
"O_Heli_Transport_04_EPOCH",
@ -1521,6 +1552,7 @@ class CfgItemSort
"B_Heli_Light_01_armed_F",
"B_Heli_Transport_01_EPOCH",
"B_Heli_Transport_01_F",
"B_Heli_Transport_03_black_F",
"O_Heli_Light_02_v2_F",
"I_Heli_light_03_F",

5
Sources/epoch_config/Configs/CfgMarkerSets.hpp
View File

@ -221,4 +221,9 @@ class CfgMarkerSets
{"","ICON","EpochHeli2","ColorYellow",1,{0.5,0.5}}
};
};
class Medical {
markerArray[] = {
{"","ICON","o_med","",1,{1,1}}
};
};
};

1
Sources/epoch_config/Configs/CfgMissions.hpp
View File

@ -14,7 +14,6 @@
*/
class EpochMissionList{
// traderMissionClasses[] = {"missionMonster","missionDelivery","missionEscort","missionUav","missionSapper","missionSkull","missionMilitary","gameCaptureTheJammer","gameCarRace","infoTime","infoName","infoNews","infoVehicles","infoPeople","helpAirDrop","debugResetMission"}; //Exclude from here to remove from menu and trigger
traderMissionClasses[] = {"missionDocCheck","missionfishing","missionDelivery","missionUav","infoTime","infoName","infoNews","infoVehicles","infoPeople","debugResetMission"}; //Exclude from here to remove from menu and trigger
traderMissionActiveNames[] = {}; //Not currently used (WIP)
traderMissionLongDesc[] = {}; //Not currently used (WIP)

8
Sources/epoch_config/Configs/CfgObjectInteractions.hpp
View File

@ -308,6 +308,14 @@ class CfgObjectInteractions
class EPOCH_RyanZombie_3_S : EPOCH_RyanZombie_1 {};
class EPOCH_RyanZombie_4_S : EPOCH_RyanZombie_1 {};
class EPOCH_RyanZombie_5_S : EPOCH_RyanZombie_1 {};
class IG_Box_s : Default
{
interactMode = 4;
};
class IG_Box_l : Default
{
interactMode = 4;
};
};
/*[[[end]]]*/

98
Sources/epoch_config/Configs/CfgServicePoint.hpp
View File

@ -45,18 +45,55 @@ class CfgServicePoint {
};
};
class Tanoa {
ServicePoints[] = { // Array of coords for ServicePoints
/*
{2157.79,3477.65,0},
{11731.5,3125.95,0},
{7008.93,7582.59,0},
{2326.28,13167.9,0},
{11805.8,13100.6,0},
{5525.8,10345.2,0},
{11916,2383.88,0},
{13562.4,12139.5,0}
*/
ServicePoints[] = {
{
{2157.79,3477.65,0}, // Pos
40, // max distance
{"Landvehicle","Ship","AIR","Tank"}, // Vehicle Types for SP
"Service Point" // Marker Text
},
{
{11731.5,3125.95,0}, // Pos
40, // max distance
{"Landvehicle","Ship","AIR","Tank"}, // Vehicle Types for SP
"Service Point" // Marker Text
},
{
{7008.93,7582.59,0}, // Pos
40, // max distance
{"Landvehicle","Ship","AIR","Tank"}, // Vehicle Types for SP
"Service Point" // Marker Text
},
{
{2326.28,13167.9,0}, // Pos
40, // max distance
{"Landvehicle","Ship","AIR","Tank"}, // Vehicle Types for SP
"Service Point" // Marker Text
},
{
{11805.8,13100.6,0}, // Pos
40, // max distance
{"Landvehicle","Ship","AIR","Tank"}, // Vehicle Types for SP
"Service Point" // Marker Text
},
{
{5525.8,10345.2,0}, // Pos
40, // max distance
{"Landvehicle","Ship","AIR","Tank"}, // Vehicle Types for SP
"Service Point" // Marker Text
},
{
{11916,2383.88,0}, // Pos
40, // max distance
{"Landvehicle","Ship","AIR","Tank"}, // Vehicle Types for SP
"Service Point" // Marker Text
},
{
{13562.4,12139.5,0}, // Pos
40, // max distance
{"Landvehicle","Ship","AIR","Tank"}, // Vehicle Types for SP
"Service Point" // Marker Text
}
};
};
class Chernarus { // Array of coords for ServicePoints
@ -147,6 +184,41 @@ class CfgServicePoint {
{"200Rnd_762x51_Belt",{0},3,200}
};
};
class I_LT_01_cannon_F {
MagsTurrets[] = {
{"SmokeLauncherMag",{0},2,50},
{"200Rnd_762x51_Belt_Yellow",{0},1,300}
};
};
class I_LT_01_scout_F {
MagsTurrets[] = {
{"SmokeLauncherMag",{0},2,50}
};
};
class I_C_Offroad_02_LMG_F {
MagsTurrets[] = {
{"200Rnd_556x45_Box_Tracer_F",{0},3,250}
};
};
class I_MRAP_03_hmg_F {
MagsTurrets[] = {
{"500Rnd_127x99_mag_Tracer_Red",{0},3,1500},
{"200Rnd_127x99_mag_Tracer_Red",{0},3,600},
{"SmokeLauncherMag",{1},2,50}
};
};
class O_MRAP_02_EPOCH1 {
MagsTurrets[] = {
{"SmokeLauncherMag",{-1},2,50}
};
};
class B_Heli_Transport_01_F {
MagsTurrets[] = {
{"168Rnd_CMFlare_Chaff_Magazine",{-1},1,150},
{"2000Rnd_65x39_Belt_Tracer_Red",{1},1,800,1250},
{"2000Rnd_65x39_Belt_Tracer_Red",{2},1,800,1250}
};
};
class B_G_Offroad_01_armed_F {
MagsTurrets[] = {
{"100Rnd_127x99_mag_Tracer_Yellow",{0},4,200}
@ -192,7 +264,7 @@ class CfgServicePoint {
};
class B_Heli_Light_01_armed_F {
MagsTurrets[] = {
{"5000Rnd_762x51_Belt",{-1},1,1600}
{"5000Rnd_762x51_Belt",{-1},1,1600,2000}
};
};
class B_Heli_Light_01_armed_EPOCH {

4
Sources/epoch_server/compile/epoch_player/EPOCH_server_deadPlayer.sqf
View File

@ -65,7 +65,9 @@ if (_playerObj != _killer) then {
if(_playerIsHero)then{_playerKarmaAdj = abs((-_playerKarma) * 0.025)};
_deathType = 0;
if!(_killerUID isEqualTo "")then{
[_killer, "Murders", 1, true] call EPOCH_server_updatePlayerStats;
if !((group _playerObj) isEqualTo (group _killer)) then {
[_killer, "Murders", 1, true] call EPOCH_server_updatePlayerStats;
};
// find killer's Karma status
_killerCStats = _killer getVariable["COMMUNITY_STATS", EPOCH_defaultStatVars];

8
Sources/epoch_server_events/EpochEvents/PlantSpawner.sqf
View File

@ -73,6 +73,14 @@ if ((count _position) == 2) then{
_plantCount = (floor(random(3)))+5;
_scatter = 20;
};
case "HempPlant_EPOCH": {
_plantCount = (floor(random(2)))+1;
_scatter = 20;
};
case "SunflowerPlant_EPOCH": {
_plantCount = (floor(random(2)))+1;
_scatter = 20;
};
};
_plants = [];

2
Sources/epoch_server_settings/config.cpp
View File

@ -126,7 +126,7 @@ class CfgEpoch
plantDecayTime = 1200; //Half this time results in decayMarkerColor marker
plantDecayMarkerColor = "ColorBrown";
plantCompromisedColor = "ColorRed";
availablePlants[] = {"Goldenseal_EPOCH", "Goldenseal_EPOCH", "Goldenseal_EPOCH", "Poppy_EPOCH", "Pumpkin_EPOCH"};
availablePlants[] = {"Goldenseal_EPOCH", "Goldenseal_EPOCH", "Goldenseal_EPOCH", "Poppy_EPOCH", "Poppy_EPOCH", "Pumpkin_EPOCH", "Pumpkin_EPOCH", "HempPlant_EPOCH","SunflowerPlant_EPOCH"};
// Carnival and Loot Box Spawner
debugCarnivalSpawner = 0;