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

Move make fire place to modular_build

Browse Source
This commit is contained in:
A Man
2019-12-17 12:03:16 +01:00
parent 73289a69a6
commit 55f99b0096
4 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
View File

@@ -68,8 +68,9 @@ class PartWoodPile : CA_Magazine
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_MAKEFIRE; text = $STR_ACTIONS_MAKEFIRE;
script = "spawn player_makeFire;"; //Do not use player_build because we have no ghost preview model for Land_Fire_DZ yet script = "spawn player_build;";
use[] = {"PartWoodPile"}; require[] = {"ItemMatchbox"};
create = "Land_Fire_DZ";
}; };
class Crafting class Crafting
{ {

20
SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp
View File

@@ -104,18 +104,9 @@ class Land_Fire_DZ : Land_Fire {
transportMaxMagazines = 1; transportMaxMagazines = 1;
transportMaxWeapons = 0; transportMaxWeapons = 0;
transportMaxBackpacks = 0; transportMaxBackpacks = 0;
offset[] = {0,1,0};
constructioncount = 1;
class UserActions { class UserActions {
/*
class upgrade {
displayNameDefault = "Create Base Fire";
displayName = "Create Base Fire";
position = "ohniste";
radius = 3;
onlyForPlayer = 0;
condition = "alive this";
statement = "[this] spawn object_upgradeFireplace";
};
*/
class lightup { class lightup {
displayNameDefault = $STR_ACTIONS_LIGHTFIRE; displayNameDefault = $STR_ACTIONS_LIGHTFIRE;
displayName = $STR_ACTIONS_LIGHTFIRE; displayName = $STR_ACTIONS_LIGHTFIRE;
@@ -135,13 +126,6 @@ class Land_Fire_DZ : Land_Fire {
statement = "[this,false] call dayz_inflame"; statement = "[this,false] call dayz_inflame";
}; };
}; };
/*
class Upgrade {
requiredTools[] = {"ItemEtool"};
requiredParts[] = {"ItemLog", "ItemLog", "ItemStone", "ItemStone", "ItemStone"};
create = "Base_Fire_DZ";
};
*/
}; };
class Base_Fire_DZ : Land_Fire { class Base_Fire_DZ : Land_Fire {

6
SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
View File

@@ -25,12 +25,6 @@ class ItemMatchbox : ItemMatchbox_base
class ItemActions class ItemActions
{ {
class Use
{
text = $STR_ACTIONS_MAKEFIRE;
script = "spawn player_makeFire;"; //Do not use player_build because we have no ghost preview model for Land_Fire_DZ yet
use[] = {"PartWoodPile"};
};
class Combine { class Combine {
text = $STR_ANTIBIOTICS_COMBINE; text = $STR_ANTIBIOTICS_COMBINE;
script = "spawn player_combineMatches;"; script = "spawn player_combineMatches;";

4
SQF/dayz_code/init/compiles.sqf
View File

@@ -92,7 +92,7 @@ if (!isDedicated) then {
player_attachAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_attachAttachment.sqf"; player_attachAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_attachAttachment.sqf";
player_removeAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_removeAttachment.sqf"; player_removeAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_removeAttachment.sqf";
player_fillWater = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\water_fill.sqf"; player_fillWater = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\water_fill.sqf";
player_makeFire = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_makefire.sqf"; //player_makeFire = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_makefire.sqf";
player_mineStone = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_mineStone.sqf"; player_mineStone = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_mineStone.sqf";
if (DZE_modularBuild) then { if (DZE_modularBuild) then {
player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\modular_build.sqf"; player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\modular_build.sqf";
@@ -109,7 +109,7 @@ if (!isDedicated) then {
player_buildPlaceables = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildPlaceables.sqf"; player_buildPlaceables = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildPlaceables.sqf";
fn_buildCamera = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildCamera.sqf"; fn_buildCamera = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildCamera.sqf";
object_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_build.sqf"; object_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_build.sqf";
object_upgradeFireplace = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_upgradeFireplace.sqf"; //object_upgradeFireplace = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_upgradeFireplace.sqf";
player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf"; player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf";
player_dropWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_dropWeapon.sqf"; player_dropWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_dropWeapon.sqf";
object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf"; object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf";