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

Merge pull request #9 from EpochModTeam/master

Browse Source 
update fork
This commit is contained in:
W0LF
2021-03-17 15:51:08 +03:00
committed by GitHub
parent 77bac69229 db134935ba
commit 6021f282a1
6 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp
View File

@@ -39,9 +39,18 @@ class PartGeneric : CA_Magazine
}; };
class Crafting3 class Crafting3
{ {
text = $STR_EPOCH_ACTION_METAL_DOORWAY; text = $STR_CRAFTING_METALSHEET;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"workshop","fire"}; neednearby[] = {"workshop","fire"};
requiretools[] = {"ItemToolbox","ItemCrowbar","ItemSledge"};
output[] = {{"equip_metal_sheet",1}};
input[] = {{"PartGeneric",2},{"ItemTankTrap",2}};
};
class Crafting4
{
text = $STR_EPOCH_ACTION_METAL_DOORWAY;
script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"workshop","fire"};
requiretools[] = {"ItemToolbox","ItemCrowbar"}; requiretools[] = {"ItemToolbox","ItemCrowbar"};
output[] = {{"door_frame_kit",1}}; output[] = {{"door_frame_kit",1}};
input[] = {{"ItemPole",4},{"ItemTankTrap",4},{"PartGeneric",2}}; input[] = {{"ItemPole",4},{"ItemTankTrap",4},{"PartGeneric",2}};

4
SQF/dayz_code/Configs/CfgVehicles/Car/Tatra_T810.hpp
View File

@@ -824,7 +824,7 @@ class T810A_ACR_REFUEL_DZE3: T810A_ACR_REFUEL_DZE2 {
}; };
}; };
class T810A_ACR_REFUEL_DZE4: T810A_ACR_REFUEL_DZE3 { class T810A_ACR_REFUEL_DZE4: T810A_ACR_REFUEL_DZE3 {
displayname = "$STR_VEH_NAME_TATRA_WOODLAND_REFUEL+++"; displayname = "$STR_VEH_NAME_TATRA_WOODLAND_REFUEL++++";
fuelCapacity = 20000; fuelCapacity = 20000;
}; };
@@ -869,7 +869,7 @@ class T810A_ACR_REFUEL_DES_DZE3: T810A_ACR_REFUEL_DES_DZE2 {
}; };
}; };
class T810A_ACR_REFUEL_DES_DZE4: T810A_ACR_REFUEL_DES_DZE3 { class T810A_ACR_REFUEL_DES_DZE4: T810A_ACR_REFUEL_DES_DZE3 {
displayname = "$STR_VEH_NAME_TATRA_DESERT_REFUEL+++"; displayname = "$STR_VEH_NAME_TATRA_DESERT_REFUEL++++";
fuelCapacity = 20000; fuelCapacity = 20000;
}; };

2
SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp
View File

@@ -279,7 +279,7 @@ class V3S_Refuel_TK_GUE_EP1_DZE3: V3S_Refuel_TK_GUE_EP1_DZE2 {
}; };
}; };
class V3S_Refuel_TK_GUE_EP1_DZE4: V3S_Refuel_TK_GUE_EP1_DZE3 { class V3S_Refuel_TK_GUE_EP1_DZE4: V3S_Refuel_TK_GUE_EP1_DZE3 {
displayname = "$STR_VEH_NAME_V3S_FUEL+++"; displayname = "$STR_VEH_NAME_V3S_FUEL++++";
fuelCapacity = 20000; fuelCapacity = 20000;
}; };

2
SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp
View File

@@ -56,7 +56,7 @@ class ItemNVGFullBroken_DZE : Default
output[] = {}; output[] = {};
outputweapons[] = {"NVGoggles_DZE"}; outputweapons[] = {"NVGoggles_DZE"};
input[] = {{"equip_floppywire",1},{"equip_scrapelectronics",1}}; input[] = {{"equip_floppywire",1},{"equip_scrapelectronics",1}};
inputweapons[] = {"ItemNVGBroken_DZE"}; inputweapons[] = {"ItemNVGFullBroken_DZE"};
}; };
}; };
}; };

4
SQF/dayz_code/stringtable.xml
View File

@@ -33396,6 +33396,10 @@
<German>Wellblech herstellen</German> <German>Wellblech herstellen</German>
<Russian>Создать: Гофрир. лист</Russian> <Russian>Создать: Гофрир. лист</Russian>
</Key> </Key>
<Key ID="STR_CRAFTING_METALSHEET">
<English>Craft Sheet Metal</English>
<German>Metallplatte herstellen</German>
</Key>
<Key ID="STR_CRAFTING_NEEDED_ITEMS"> <Key ID="STR_CRAFTING_NEEDED_ITEMS">
<English>Needed items:</English> <English>Needed items:</English>
<German>Benötigte Gegenstände:</German> <German>Benötigte Gegenstände:</German>

9
SQF/dayz_server/compile/spawn_mineveins.sqf
View File

@@ -10,10 +10,17 @@ if ((count _position) == 2) then {
_spawnveh = ["Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Silver_Vein_DZE","Silver_Vein_DZE","Silver_Vein_DZE","Gold_Vein_DZE","Gold_Vein_DZE"] call BIS_fnc_selectRandom; _spawnveh = ["Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Silver_Vein_DZE","Silver_Vein_DZE","Silver_Vein_DZE","Gold_Vein_DZE","Gold_Vein_DZE"] call BIS_fnc_selectRandom;
//diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position)); //diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position));
//_veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"];
_veh = _spawnveh createVehicle [0,0,0]; _veh = _spawnveh createVehicle [0,0,0];
_veh enableSimulation false; _veh enableSimulation false;
_veh setDir round(random 360); _veh setDir round(random 360);
_veh setPos _position; _veh setPos _position;
_veh setVariable ["ObjectID","1",true]; _veh setVariable ["ObjectID","1",true];
_veh addEventHandler ["HandleDamage",{
local _damage = _this select 2;
if ((_this select 4) == "Sledge_Swing_Ammo") then {
_damage = _damage*1.2;
};
_damage
} ];
}; };