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

Add missing variable + RPT cleanup

Browse Source 
fix 2 dup string warnings
fix "Cannot delete class rscdisplayinfo" warning.
Start extended vehicle damage debugging.
This commit is contained in:
icomrade
2014-03-26 02:40:24 -04:00
parent 935ed7931d
commit b80bb88467
9 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
SQF/dayz_code/Configs/CfgMagazines.hpp
View File

@@ -264,7 +264,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "GunRack_DZ"; create = "GunRack_DZ";
@@ -285,7 +285,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodCrate_DZ"; create = "WoodCrate_DZ";
@@ -349,7 +349,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "FireBarrel_DZ"; create = "FireBarrel_DZ";
@@ -390,7 +390,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WorkBench_DZ"; create = "WorkBench_DZ";
@@ -412,7 +412,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "WoodRamp_DZ"; create = "WoodRamp_DZ";
@@ -432,7 +432,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "Plastic_Pole_EP1_DZ"; create = "Plastic_Pole_EP1_DZ";
@@ -454,7 +454,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "MetalPanel_DZ"; create = "MetalPanel_DZ";
@@ -484,7 +484,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "DeerStand_DZ"; create = "DeerStand_DZ";
@@ -505,7 +505,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "DesertLargeCamoNet_DZ"; create = "DesertLargeCamoNet_DZ";
@@ -526,7 +526,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "ForestLargeCamoNet_DZ"; create = "ForestLargeCamoNet_DZ";
@@ -547,7 +547,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "DesertCamoNet_DZ"; create = "DesertCamoNet_DZ";
@@ -577,7 +577,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "ForestCamoNet_DZ"; create = "ForestCamoNet_DZ";
@@ -607,7 +607,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "FuelPump_DZ"; create = "FuelPump_DZ";
@@ -628,7 +628,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "LightPole_DZ"; create = "LightPole_DZ";
@@ -649,7 +649,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "StickFence_DZ"; create = "StickFence_DZ";
@@ -670,7 +670,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "Wooden_shed_DZ"; create = "Wooden_shed_DZ";
@@ -691,7 +691,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "WoodShack_DZ"; create = "WoodShack_DZ";
@@ -712,7 +712,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "M240Nest_DZ"; create = "M240Nest_DZ";
@@ -733,7 +733,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "CanvasHut_DZ"; create = "CanvasHut_DZ";
@@ -754,7 +754,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "ParkBench_DZ"; create = "ParkBench_DZ";
@@ -775,7 +775,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "MetalGate_DZ"; create = "MetalGate_DZ";
@@ -796,7 +796,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "SandNest_DZ"; create = "SandNest_DZ";
@@ -817,7 +817,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "OutHouse_DZ"; create = "OutHouse_DZ";
@@ -838,7 +838,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "StorageShed_DZ"; create = "StorageShed_DZ";
@@ -860,7 +860,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Generator_DZ"; create = "Generator_DZ";
@@ -881,7 +881,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "FuelPump_DZ"; create = "FuelPump_DZ";
@@ -903,7 +903,7 @@ class CfgMagazines {
{ {
class Build class Build
{ {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemEtool","ItemToolbox"}; require[] = {"ItemEtool","ItemToolbox"};
create = "Scaffolding_DZ"; create = "Scaffolding_DZ";
@@ -1631,7 +1631,7 @@ class CfgMagazines {
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Hedgehog_DZ"; create = "Hedgehog_DZ";
@@ -1669,7 +1669,7 @@ class CfgMagazines {
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Fort_RazorWire"; create = "Fort_RazorWire";

46
SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp
View File

@@ -9,7 +9,7 @@ class metal_floor_kit: CA_Magazine {
weight = 325; weight = 325;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "MetalFloor_DZ"; create = "MetalFloor_DZ";
@@ -28,7 +28,7 @@ class cinder_wall_kit: CA_Magazine {
weight = 325; weight = 325;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "CinderWallHalf_DZ"; create = "CinderWallHalf_DZ";
@@ -46,7 +46,7 @@ class cinder_door_kit: CA_Magazine {
weight = 325; weight = 325;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "CinderWallSmallDoorway_DZ"; create = "CinderWallSmallDoorway_DZ";
@@ -64,7 +64,7 @@ class cinder_garage_kit: CA_Magazine {
weight = 325; weight = 325;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "CinderWallDoorway_DZ"; create = "CinderWallDoorway_DZ";
@@ -83,7 +83,7 @@ class ItemWoodFloor: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodFloor_DZ"; create = "WoodFloor_DZ";
@@ -101,7 +101,7 @@ class ItemWoodFloorHalf: CA_Magazine {
weight = 15; weight = 15;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodFloorHalf_DZ"; create = "WoodFloorHalf_DZ";
@@ -128,7 +128,7 @@ class ItemWoodFloorQuarter: CA_Magazine {
weight = 10; weight = 10;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodFloorQuarter_DZ"; create = "WoodFloorQuarter_DZ";
@@ -156,7 +156,7 @@ class ItemWoodStairs: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodStairsSans_DZ"; create = "WoodStairsSans_DZ";
@@ -183,7 +183,7 @@ class ItemWoodStairsSupport: CA_Magazine {
weight = 30; weight = 30;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodStairs_DZ"; create = "WoodStairs_DZ";
@@ -202,7 +202,7 @@ class ItemWoodLadder: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodLadder_DZ"; create = "WoodLadder_DZ";
@@ -221,7 +221,7 @@ class ItemWoodWall: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodSmallWall_DZ"; create = "WoodSmallWall_DZ";
@@ -263,7 +263,7 @@ class ItemWoodWallThird: CA_Magazine {
weight = 7; weight = 7;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodSmallWallThird_DZ"; create = "WoodSmallWallThird_DZ";
@@ -289,7 +289,7 @@ class ItemWoodWallWindow: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodSmallWallWin_DZ"; create = "WoodSmallWallWin_DZ";
@@ -308,7 +308,7 @@ class ItemWoodWallDoor: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodSmallWallDoor_DZ"; create = "WoodSmallWallDoor_DZ";
@@ -334,7 +334,7 @@ class ItemWoodWallWithDoor: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Land_DZE_WoodDoor"; create = "Land_DZE_WoodDoor";
@@ -360,7 +360,7 @@ class ItemWoodWallWithDoorLocked: CA_Magazine {
weight = 30; weight = 30;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Land_DZE_WoodDoorLocked"; create = "Land_DZE_WoodDoorLocked";
@@ -379,7 +379,7 @@ class ItemWoodWallGarageDoor: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Land_DZE_GarageWoodDoor"; create = "Land_DZE_GarageWoodDoor";
@@ -405,7 +405,7 @@ class ItemWoodWallGarageDoorLocked: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Land_DZE_GarageWoodDoorLocked"; create = "Land_DZE_GarageWoodDoorLocked";
@@ -424,7 +424,7 @@ class ItemWoodWallLg: CA_Magazine {
weight = 25; weight = 25;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodLargeWall_DZ"; create = "WoodLargeWall_DZ";
@@ -466,7 +466,7 @@ class ItemWoodWallWindowLg: CA_Magazine {
weight = 30; weight = 30;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodLargeWallWin_DZ"; create = "WoodLargeWallWin_DZ";
@@ -485,7 +485,7 @@ class ItemWoodWallDoorLg: CA_Magazine {
weight = 30; weight = 30;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "WoodLargeWallDoor_DZ"; create = "WoodLargeWallDoor_DZ";
@@ -511,7 +511,7 @@ class ItemWoodWallWithDoorLg: CA_Magazine {
weight = 30; weight = 30;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Land_DZE_LargeWoodDoor"; create = "Land_DZE_LargeWoodDoor";
@@ -537,7 +537,7 @@ class ItemWoodWallWithDoorLgLocked: CA_Magazine {
weight = 35; weight = 35;
class ItemActions { class ItemActions {
class Build { class Build {
text = $STR_ACTIONS_BUILD; text = $STR_ACTIONS_BUILD_EPOCH;
script = "spawn player_build;"; script = "spawn player_build;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
create = "Land_DZE_LargeWoodDoorLocked"; create = "Land_DZE_LargeWoodDoorLocked";

4
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -95,7 +95,7 @@ class RscDisplayDebriefing: RscStandardDisplay {
delete CA_MissionTitle; delete CA_MissionTitle;
delete CA_TextVotingTimeLeft; delete CA_TextVotingTimeLeft;
delete CA_MissionResult; delete CA_MissionResult;
delete CA_DebriefingInfo; class CA_DebriefingInfo: RscHTML {};
delete CA_DebriefingTextGroup; delete CA_DebriefingTextGroup;
delete CA_DebriefingObjectivesGroup; delete CA_DebriefingObjectivesGroup;
delete CA_DebriefingStatsGroup; delete CA_DebriefingStatsGroup;
@@ -120,7 +120,7 @@ class RscDisplayMissionFail: RscStandardDisplay {
delete CA_MissionTitle; delete CA_MissionTitle;
delete CA_TextVotingTimeLeft; delete CA_TextVotingTimeLeft;
delete CA_MissionResult; delete CA_MissionResult;
delete CA_DebriefingInfo; class CA_DebriefingInfo: RscHTML {};
delete CA_DebriefingTextGroup; delete CA_DebriefingTextGroup;
delete CA_DebriefingObjectivesGroup; delete CA_DebriefingObjectivesGroup;
delete CA_DebriefingStatsGroup; delete CA_DebriefingStatsGroup;

4
SQF/dayz_code/compile/fn_damageHandler.sqf
View File

@@ -77,7 +77,9 @@ if (_damage > 0.4) then {
if (_unitIsPlayer) then { if (_unitIsPlayer) then {
//Cause blood loss //Cause blood loss
//Log Damage //Log Damage
diag_log ("DAMAGE: player hit by " + typeOf _source + " in " + _hit + " with " + _ammo + " for " + str(_damage) + " scaled " + str(_damage * _scale)); if (DZE_Debug_Damage) then {
diag_log ("DAMAGE: player hit by " + typeOf _source + " in " + _hit + " with " + _ammo + " for " + str(_damage) + " scaled " + str(_damage * _scale));
};
r_player_blood = r_player_blood - (_damage * _scale); r_player_blood = r_player_blood - (_damage * _scale);
}; };
}; };

4
SQF/dayz_code/compile/object_vehicleKilled.sqf
View File

@@ -1,9 +1,5 @@
private ["_unit"]; private ["_unit"];
_unit = _this select 0; _unit = _this select 0;
//_killer = _this select 1;
//_type = typeOf _unit;
//_pos = getposATL _unit;
//_dir = direction _unit;
if (local _unit) then { if (local _unit) then {
deleteVehicle _unit; deleteVehicle _unit;
}; };

9
SQF/dayz_code/compile/vehicle_handleKilled.sqf
View File

@@ -13,7 +13,14 @@ _hitPoints = _unit call vehicle_getHitpoints;
if (isServer) then { if (isServer) then {
[_unit, "killed"] call server_updateObject; [_unit, "killed"] call server_updateObject;
} else { } else {
PVDZE_veh_Update = [_unit, "killed"]; if (DZE_Debug_Damage && !(isPlayer _unit)) then {
PVDZE_veh_Update = [_unit, "killed",_killer];
_killerVeh = if (vehicle _killer != _killer) then { format["[KILLER IN VEHICLE %1 OF TYPE %2]", (vehicle _killer), (typeOf (vehicle _killer))]; } else {"KILLER NOT IN VEHICLE";};
_name = if (alive _killer) then { name _killer; } else { format["OBJECT %1", _killer]; };
diag_log format["DAMAGE: Vehicle %1 (TYPE: %2) Killed by player %3 (UID: %4) %5",_unit, (typeOf _unit), _name, (getPlayerUID _killer), _killerVeh];
} else {
PVDZE_veh_Update = [_unit, "killed"];
};
publicVariableServer "PVDZE_veh_Update"; publicVariableServer "PVDZE_veh_Update";
}; };

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

@@ -15,8 +15,8 @@ Soldier1_DZ = "Soldier1_DZ";
Rocket_DZ = "Rocket_DZ"; Rocket_DZ = "Rocket_DZ";
AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWsequishaD_DZ","SurvivorWsequisha_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ","TK_Special_Forces_MG_EP1_DZ","TK_Soldier_Sniper_EP1_DZ","TK_Commander_EP1_DZ","RU_Soldier_Crew_DZ","INS_Lopotev_DZ","INS_Soldier_AR_DZ","INS_Soldier_CO_DZ","INS_Bardak_DZ","INS_Worker2_DZ"]; AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWsequishaD_DZ","SurvivorWsequisha_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ","TK_Special_Forces_MG_EP1_DZ","TK_Soldier_Sniper_EP1_DZ","TK_Commander_EP1_DZ","RU_Soldier_Crew_DZ","INS_Lopotev_DZ","INS_Soldier_AR_DZ","INS_Soldier_CO_DZ","INS_Bardak_DZ","INS_Worker2_DZ"];
MeleeWeapons = ["MeleeFishingPole","MeleeCrowbar","MeleeBaseBallBatNails","MeleeBaseBallBatBarbed","MeleeBaseBallBat","Crossbow_DZ","MeleeSledge","MeleeMachete","MeleeHatchet_DZE"];
gear_done = false; gear_done = false;
//Cooking //Cooking
meatraw = [ meatraw = [
"FoodSteakRaw", "FoodSteakRaw",
@@ -468,6 +468,9 @@ if (isNil "DZE_GodModeBase") then {
if(isNil "DZEdebug") then { if(isNil "DZEdebug") then {
DZEdebug = false; DZEdebug = false;
}; };
if (isNil "DZE_Debug_Damage") then {
DZE_Debug_Damage = true; //enable by default
};
if(isNil "DZE_TRADER_SPAWNMODE") then { if(isNil "DZE_TRADER_SPAWNMODE") then {
DZE_TRADER_SPAWNMODE = false; DZE_TRADER_SPAWNMODE = false;
}; };

12
SQF/dayz_epoch_b/stringtable.xml
View File

@@ -1182,7 +1182,7 @@
<French>Examiner le corps</French> <French>Examiner le corps</French>
<Czech>Prozkoumat tělo</Czech> <Czech>Prozkoumat tělo</Czech>
</Key> </Key>
<Key ID="str_actions_build"> <Key ID="STR_ACTIONS_BUILD_EPOCH">
<Original>Build %1</Original> <Original>Build %1</Original>
<English>Build %1</English> <English>Build %1</English>
<German>%1 bauen</German> <German>%1 bauen</German>
@@ -6986,16 +6986,6 @@
<!-- <French></French> --> <!-- <French></French> -->
<!-- <Czech></Czech> --> <!-- <Czech></Czech> -->
</Key> </Key>
<Key ID="STR_EPOCH_BULK_DESC_MP5SD">
<Original>12 x 30Rnd_556x45_StanagSD</Original>
<English>12 x 30Rnd_556x45_StanagSD</English>
<!-- <German></German> -->
<!-- <Russian></Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
</Key>
<Key ID="STR_EPOCH_BULK_DESC_SANDBAG"> <Key ID="STR_EPOCH_BULK_DESC_SANDBAG">
<Original>12 x SandBag</Original> <Original>12 x SandBag</Original>
<English>12 x SandBag</English> <English>12 x SandBag</English>

6
SQF/dayz_server/compile/server_updateObject.sqf
View File

@@ -120,6 +120,12 @@ _object_killed = {
//diag_log ("HIVE: WRITE: "+ str(_key)); //diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite; _key call server_hiveWrite;
_object setVariable ["needUpdate",false,true]; _object setVariable ["needUpdate",false,true];
if ((count _this) > 2) then {
_killer = _this select 2;
_killerVeh = if (vehicle _killer != _killer) then { format["[KILLER IN VEHICLE %1 OF TYPE %2]", (vehicle _killer), (typeOf (vehicle _killer))]; } else {""};
_name = if (alive _killer) then { name _killer; } else { format["OBJECT %1", _killer]; };
diag_log format["DAMAGE: Vehicle %1 (TYPE: %2) Killed by player %3 (UID: %4) %5",_unit, (typeOf _unit), _name, (getPlayerUID _killer), _killerVeh];
};
}; };
_object_repair = { _object_repair = {