W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-18 01:30:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch

Browse Source
This commit is contained in:
icomrade
2016-09-11 16:38:30 -04:00
parent 203975def7 8bcd3a44e6
commit 82c8d4d538
66 changed files with 636 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/compile/client_plantSpawner.sqf
View File

@@ -62,7 +62,7 @@ _insideloop = {
};
for "_i" from 1 to 2048 do {
if (!dayz_townGenerator or {toLower worldName != "chernarus"}) exitWith {};
if (!dayz_townGenerator) exitWith {};
_pos = _a call psrnd;
_pos call _insideloop;
if (_plantcount >= dayz_maxGlobalPlants) exitWith {};

4
SQF/dayz_code/configVariables.sqf
View File

@@ -8,8 +8,8 @@ dayz_matchboxCount = false; // Enable match stick count. After five uses matches
dayz_toolBreaking = false; //Sledgehammer, crowbar and pickaxe have a chance to break when used.
dayz_waterBottleBreaking = false; // Water bottles have a chance to break when boiling and require duct tape to fix
dayz_tameDogs = false; // Allow taming dogs with raw meat
dayz_townGenerator = false; // Spawn vanilla map junk in addition to Epoch DynamicDebris. Only works on Chernarus.
dayz_townGeneratorBlackList = [[4053,11668,0],[11463,11349,0],[6344,7806,0],[1606,7803,0],[12944,12766,0],[5075,9733,0],[12060,12638,0]]; // Town generator will not spawn junk within 150m of these positions.
dayz_townGenerator = false; // Spawn vanilla map junk in addition to Epoch DynamicDebris. Currently only compatible with Chernarus. Need to add coordinates for other maps.
dayz_townGeneratorBlackList = []; // Town generator will not spawn junk within 150m of these positions. Example for Chernarus trader cities: [[4053,11668,0],[11463,11349,0],[6344,7806,0],[1606,7803,0],[12944,12766,0],[5075,9733,0],[12060,12638,0]]
DynamicVehicleDamageLow = 0; // Min damage random vehicles can spawn with
DynamicVehicleDamageHigh = 100; // Max damage random vehicles can spawn with

2
SQF/dayz_code/init/publicEH.sqf
View File

@@ -18,7 +18,7 @@
"PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH};
"PVDZE_obj_Remove" addPublicVariableEventHandler {_pos = (_this select 1); _obj = nearestObjects [_pos, DZE_isWreckBuilding, 5]; if (count _obj > 0) then {deleteVehicle (_obj select 0);};};
if (toLower worldName == "chernarus") then {
if (toLower worldName == "chernarus") then { //need to add building coordinates for other maps
{
private ["_building","_fckingcode"];

26
SQF/dayz_code/init/variables.sqf
View File

@@ -131,7 +131,6 @@ pickupInit = false;
mouseOverCarry = false; //for carry slot since determining mouse pos doesn't work right
dayZ_partClasses = ["PartFueltank","PartWheel","PartEngine"]; //No need to add PartGeneric, it is default for everything
dayZ_explosiveParts = ["palivo","motor"];
dayz_centerMarker = getMarkerPos "center";
//Survival Variables
SleepFood = 2160; //minutes (48 hours)
@@ -421,6 +420,12 @@ if(isNil "dayz_ForcefullmoonNights") then {
if(isNil "dayz_randomMaxFuelAmount") then {
dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
};
if(isNil "dayz_townGenerator") then {
dayz_townGenerator = true; // Spawn map junk. Currently only compatible with Chernarus. Need to add coordinates for other maps.
};
if(isNil "dayz_townGeneratorBlackList") then {
dayz_townGeneratorBlackList = []; // Town generator will not spawn junk within 150m of these positions.
};
//Replace server individual settings with ranked settings
if(isNil "dayz_presets") then { dayz_presets = "Vanilla"; };
@@ -480,6 +485,14 @@ switch (dayz_presets) do {
};
};
switch (toLower worldName) do {
case "napf";
case "sauerland" : {dayz_minpos = -1000; dayz_maxpos = 26000;};
case "tavi" : {dayz_minpos = -26000; dayz_maxpos = 26000;};
case "chernarus" : {dayz_minpos = -1; dayz_maxpos = 16000;};
case default {dayz_minpos = -20000; dayz_maxpos = 20000;};
};
//start achievements_init
//call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\achievements_init.sqf";
@@ -543,14 +556,6 @@ if (isNil "DZE_PlotPole") then {DZE_PlotPole = [30,45];};
DZE_maintainRange = ((DZE_PlotPole select 0)+20);
if (isNil "DZE_slowZombies") then {DZE_slowZombies = false;};
switch (toLower worldName) do {
case "napf";
case "sauerland" : {dayz_minpos = -1000; dayz_maxpos = 26000;};
case "tavi" : {dayz_minpos = -26000; dayz_maxpos = 26000;};
case "chernarus" : {dayz_minpos = -1; dayz_maxpos = 16000;};
case default {dayz_minpos = -20000; dayz_maxpos = 20000;};
};
if (isServer) then {
dead_bodyCleanup = [];
needUpdate_objects = [];
@@ -573,9 +578,6 @@ if (isServer) then {
DZE_safeVehicle = ["ParachuteWest","ParachuteC"];
if (isNil "EpochUseEvents") then {EpochUseEvents = false;};
if (isNil "EpochEvents") then {EpochEvents = [];};
if (isNil "dayz_MapArea") then {dayz_MapArea = 10000;};
if (isNil "DynamicVehicleArea") then {DynamicVehicleArea = dayz_MapArea / 2;};
if (isNil "HeliCrashArea") then {HeliCrashArea = dayz_MapArea / 2;};
if (isNil "MaxDynamicDebris") then {MaxDynamicDebris = 100;};
if (isNil "MaxVehicleLimit") then {MaxVehicleLimit = 50;};
if (isNil "spawnArea") then {spawnArea = 1400;};

114
SQF/dayz_code/stringtable.xml
View File

@@ -2890,36 +2890,6 @@
<Czech>Blueprint vytvořit Herbal drink. Povinné - 1 láhev vody vařené a jedna bylina box.</Czech>
<German>Rezept für einen Kräutertrunk. Gebraucht werden: 1x Flasche gekochtes Wasser, 1x Kräuter-Box.</German>
</Key>
<Key ID="STR_CRAFT_NAME_FERTILIZER">
<English>Fertilizer</English>
</Key>
<Key ID="STR_CRAFT_DESC_FERTILIZER">
<English>A bag that is applied to soils or to plant tissues (usually leaves) to supply one or more plant nutrients essential to the growth of plants.</English>
</Key>
<Key ID="STR_CRAFT_NAME_PUMPKIN_SEED">
<English>Pumpkin Seed</English>
</Key>
<Key ID="STR_CRAFT_DESC_PUMPKIN_SEED">
<English>A single pumpkin seed.</English>
</Key>
<Key ID="STR_CRAFT_NAME_PUMPKIN_PLANT">
<English>Pumpkin Plant</English>
</Key>
<Key ID="STR_CRAFT_DESC_PUMPKIN_PLANT">
<English>A fully grown pumpkin plant.</English>
</Key>
<Key ID="STR_CRAFT_NAME_HEMP_SEED">
<English>Hemp Seed</English>
</Key>
<Key ID="STR_CRAFT_DESC_HEMP_SEED">
<English>A single hemp seed.</English>
</Key>
<Key ID="STR_CRAFT_NAME_HEMP_PLANT">
<English>Hemp Plant</English>
</Key>
<Key ID="STR_CRAFT_DESC_HEMP_PLANT">
<English>A fully grown hemp plant. Hemp is used to make a variety of commercial and industrial products including rope, clothes, food, paper, textiles, plastics, insulation and biofuel.</English>
</Key>
<Key ID="STR_CRAFT_NAME_BaseBallBatBarbed">
<English>Baseball Bat Barbed</English>
<German>Stacheldrahtkeule</German>
@@ -4341,27 +4311,6 @@
<Czech>Jutové pytle, lze naplnit pískem nebo zeminou a použít je pro postavení opevnění.</Czech>
<French>Des sacs de jute qui peuvent être remplis de sable et utilisés pour des fortifications militaires.</French>
</Key>
<Key ID="STR_EQUIP_NAME_21_ROUND">
<English>Sandbag Fence (Round)</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_NEST">
<English>Sandbag Nest</English>
</Key>
<Key ID="STR_EQUIP_DESC_21_NEST">
<English>A buildable fortification object, can be removed.</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_HBARRIER">
<English>Sandbag Cube (H-barrier)</English>
</Key>
<Key ID="STR_EQUIP_DESC_21_HBARRIER">
<English>Hesco barrier: A buildable object that is used for fortification purposes.</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_3XHBARRIER">
<English>Sandbag Cube (3x H-barrier)</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_5XHBARRIER">
<English>Sandbag Cube (5x H-barrier)</English>
</Key>
<Key ID="STR_EQUIP_NAME_22">
<English>Tank Trap Kit</English>
<German>Panzersperre</German>
@@ -9819,12 +9768,6 @@
<English>DMR Camo</English>
<Russian>DMR (камуфляж)</Russian>
</Key>
<Key ID="STR_DZ_WPN_M107_NAME">
<English>M107</English>
</Key>
<Key ID="STR_DZ_WPN_M107_DESC">
<English>Anti-materiel sniper rifle, 12.7x99 mm caliber round.</English>
</Key>
<!-- M4A1 -->
<Key ID="STR_DZ_WPN_M4A1_NAME">
@@ -13975,6 +13918,36 @@
<German>Bio-Fleisch: Eine sehr gute Nahrungsquelle und ein sehr grosses Risiko, eine Infection aufzulesen. Essen auf eigene Gefahr.</German>
<Russian>Органическое мясо: Очень хороший источник пит. веществ, обладающий высокой вероятностью заражения. Ешьте на свой страх и риск.</Russian>
</Key>
<Key ID="STR_CRAFT_NAME_FERTILIZER">
<English>Fertilizer</English>
</Key>
<Key ID="STR_CRAFT_DESC_FERTILIZER">
<English>A bag that is applied to soils or to plant tissues (usually leaves) to supply one or more plant nutrients essential to the growth of plants.</English>
</Key>
<Key ID="STR_CRAFT_NAME_PUMPKIN_SEED">
<English>Pumpkin Seed</English>
</Key>
<Key ID="STR_CRAFT_DESC_PUMPKIN_SEED">
<English>A single pumpkin seed.</English>
</Key>
<Key ID="STR_CRAFT_NAME_PUMPKIN_PLANT">
<English>Pumpkin Plant</English>
</Key>
<Key ID="STR_CRAFT_DESC_PUMPKIN_PLANT">
<English>A fully grown pumpkin plant.</English>
</Key>
<Key ID="STR_CRAFT_NAME_HEMP_SEED">
<English>Hemp Seed</English>
</Key>
<Key ID="STR_CRAFT_DESC_HEMP_SEED">
<English>A single hemp seed.</English>
</Key>
<Key ID="STR_CRAFT_NAME_HEMP_PLANT">
<English>Hemp Plant</English>
</Key>
<Key ID="STR_CRAFT_DESC_HEMP_PLANT">
<English>A fully grown hemp plant. Hemp is used to make a variety of commercial and industrial products including rope, clothes, food, paper, textiles, plastics, insulation and biofuel.</English>
</Key>
<Key ID="STR_FOOD_NAME_PUMPKIN">
<English>Pumpkin</English>
<German>Kürbis</German>
@@ -15300,6 +15273,27 @@
<Key ID="STR_EPOCH_LARGEWALLWITHDOORLOCKED_DESC">
<English>Wall with combination lock door constructed out of plywood and lumber.</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_ROUND">
<English>Sandbag Fence (Round)</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_NEST">
<English>Sandbag Nest</English>
</Key>
<Key ID="STR_EQUIP_DESC_21_NEST">
<English>A buildable fortification object, can be removed.</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_HBARRIER">
<English>Sandbag Cube (H-barrier)</English>
</Key>
<Key ID="STR_EQUIP_DESC_21_HBARRIER">
<English>Hesco barrier: A buildable object that is used for fortification purposes.</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_3XHBARRIER">
<English>Sandbag Cube (3x H-barrier)</English>
</Key>
<Key ID="STR_EQUIP_NAME_21_5XHBARRIER">
<English>Sandbag Cube (5x H-barrier)</English>
</Key>
<Key ID="STR_EPOCH_ALUMINUM">
<English>Aluminum</English>
<Russian>Алюминий</Russian>
@@ -16216,6 +16210,12 @@
<Key ID="str_fireplace_noMatches">
<English>You need matches to build a fireplace</English>
</Key>
<Key ID="STR_DZ_WPN_M107_NAME">
<English>M107</English>
</Key>
<Key ID="STR_DZ_WPN_M107_DESC">
<English>Anti-materiel sniper rifle, 12.7x99 mm caliber round.</English>
</Key>
<Key ID="STR_DZ_MAG_20Rnd_762x51_B_SCAR_NAME">
<English>20Rnd. SCAR mag.</English>
<Russian>20п. SCAR маг.</Russian>

2
SQF/dayz_code/system/antihack.sqf
View File

@@ -9,7 +9,7 @@ inGameUISetEventHandler ["Action","false"];
// thanks to Tansien the great
// run only once per character life
{
_plant = _x createVehicleLocal dayz_centerMarker;
_plant = _x createVehicleLocal (getMarkerPos "center");
uiSleep 0.1;
if (sizeOf _x == 0) exitWith {
PVDZ_sec_atp = toArray ("Plants texture hack for type " + _x);

5
SQF/dayz_code/system/mission/chernarus/security/init.sqf
View File

@@ -14,7 +14,6 @@ poi_processObject = {
_o setVariable ["", true]; // prevent network SV by loot/zeds spawner
};
if (toLower worldName == "chernarus") then {
if (toLower worldName == "chernarus") then { //need to add building coordinates for other maps
call compile preprocessFileLineNumbers ("\z\addons\dayz_code\system\mission\chernarus\security\antiwallhack.sqf");
};
};

4
SQF/dayz_code/system/scheduler/sched_towngenerator.sqf
View File

@@ -159,10 +159,10 @@ sched_townGenerator = {
_x = _cell select _i;
//sched_tg_newSpawned = sched_tg_newSpawned + 1;
if ("" != (_x select 1)) then {
_blocked = if (!dayz_townGenerator or {toLower worldName != "chernarus"}) then {true} else {false};
_position = _x select 2;
_blocked = false;
{if (_position distance _x < 150) exitWith {_blocked = true;};} forEach dayz_townGeneratorBlackList;
if (!_blocked) then {
if (!_blocked && dayz_townGenerator) then {
_object = (_x select 1) createVehicleLocal [0,0,0];
_object setDir (_x select 3);
_object setPos [_position select 0,_position select 1,0];