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 branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch

Browse Source
This commit is contained in:
icomrade
2016-07-26 12:52:31 -04:00
parent 23a5584b52 5b23e9f7af
commit a72498671d
4 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
View File

@@ -242,29 +242,38 @@ class SnapBuilding {
class Cinder_DZE: FloorsWallsStairs { //All cinder walls and doors class Cinder_DZE: FloorsWallsStairs { //All cinder walls and doors
points[] = { points[] = {
{0,0,0,"Pivot"}, {0,0,0,"Pivot"},
{-2.64, 0, 1.5,"Left"}, {-2.64, 0, 1.685,"Left"},
{2.64, 0, 1.5,"Right"}, {2.64, 0, 1.685,"Right"},
{0, 0, 3.37042,"Top"} {0, 0, 3.37042,"Top"}
}; };
radius = 10; radius = 10;
}; };
class CinderWall_Preview_DZ: Cinder_DZE {}; class CinderWall_Preview_DZ: Cinder_DZE {
points[] = {
{0,0,0,"Pivot"},
{-2.64, 0, 0,"Left"},
{2.64, 0, 0,"Right"},
{0, 0, 1.685,"Top"},
{0,0,-1.685,"Bottom"}
};
};
class CinderWallDoorway_Preview_DZ: Cinder_DZE {}; class CinderWallDoorway_Preview_DZ: Cinder_DZE {};
class CinderWallSmallDoorway_Preview_DZ: Cinder_DZE {}; class CinderWallSmallDoorway_Preview_DZ: Cinder_DZE {};
class CinderWallHalf_Preview_DZ: Cinder_DZE { class CinderWallHalf_Preview_DZ: Cinder_DZE {
points[] = { points[] = {
{0,0,0,"Pivot"}, {0,0,0,"Pivot"},
{-2.64, 0, 1.5,"Left"}, {-2.64, 0, 1.685,"Left"},
{2.64, 0, 1.5,"Right"}, {2.64, 0, 1.685,"Right"},
{0, 0, 1.5,"Top"} {0, 0, 1.5,"Top"}
}; };
}; };
class CinderWall_DZ: Cinder_DZE { class CinderWall_DZ: Cinder_DZE {
points[] = { points[] = {
{0,0,0,"Pivot"}, {0,0,0,"Pivot"},
{-2.84, 0, 3.2,"Left"}, {-2.64, 0, 1.685,"Left"},
{2.84, 0, 3.2,"Right"}, {2.64, 0, 1.685,"Right"},
{0, 0, 3.2,"Top"} {0, 0, 3.37042,"Top"},
{0,0,-1.685,"Bottom"}
}; };
}; };
class CinderWallDoorway_DZ: Cinder_DZE {}; class CinderWallDoorway_DZ: Cinder_DZE {};
@@ -275,35 +284,34 @@ class SnapBuilding {
class CinderWallHalf_DZ: Cinder_DZE { class CinderWallHalf_DZ: Cinder_DZE {
points[] = { points[] = {
{0,0,0,"Pivot"}, {0,0,0,"Pivot"},
{-2.64, 0, 1.5,"Left"}, {-2.64, 0, 1.685,"Left"},
{2.64, 0, 1.5,"Right"}, {2.64, 0, 1.685,"Right"},
{0, 0, 1.5,"Top"} {0, 0, 1.685,"Top"}
}; };
}; };
class CinderWallDoorSmall_DZ: Cinder_DZE {}; class CinderWallDoorSmall_DZ: Cinder_DZE {};
class MetalFloor_Preview_DZ: FloorsWallsStairs { //fix for broken offsets in ghost class MetalFloor_Preview_DZ: FloorsWallsStairs {
points[] = { points[] = {
{0,0,0.011,"Pivot"}, {0,0,0.011,"Pivot"},
{0, -2.64, 0.009,"Back"}, {0, -2.64, 0.025,"Back"},
{0, 2.64, 0.009,"Front"}, {0, 2.64, 0.025,"Front"},
{-2.64, 0, 0.009,"Left"}, {-2.64, 0, 0.025,"Left"},
{2.64, 0, 0.009,"Right"} {2.64, 0, 0.025,"Right"}
}; };
radius = 12; radius = 12;
}; };
class MetalFloor_DZ: FloorsWallsStairs{ class MetalFloor_DZ: FloorsWallsStairs{
points[] = { points[] = {
{0,0,0,"Pivot"}, {0,0,0,"Pivot"},
{0, -2.64, 0.15,"Back"}, {0, -2.64, 0.025,"Back"},
{0, 2.64, 0.15,"Front"}, {0, 2.64, 0.025,"Front"},
{-2.64, 0, 0.15,"Left"}, {-2.64, 0, 0.025,"Left"},
{2.64, 0, 0.15,"Right"} {2.64, 0, 0.025,"Right"}
}; };
radius = 12; radius = 12;
}; };
//Non essential Items that only snap to themselves, do whitelist inheritance if you want these to snap //Non essential Items that only snap to themselves, do whitelist inheritance if you want these to snap
class WoodCrate_DZ { class WoodCrate_DZ {
snapTo[] = { snapTo[] = {

2
SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
View File

@@ -885,7 +885,7 @@ class CinderBlocks: CA_Magazine
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
neednearby[] = {"workshop"}; neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox"};
output[] = {{"cinder_wall_kit",1}}; output[] = {{"half_cinder_wall_kit",1}};
input[] = {{"CinderBlocks",3},{"MortarBucket",1}}; input[] = {{"CinderBlocks",3},{"MortarBucket",1}};
}; };
class Crafting1 class Crafting1

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

@@ -17,7 +17,7 @@ class metal_floor_kit: CA_Magazine {
}; };
}; };
class cinder_wall_kit: CA_Magazine { class half_cinder_wall_kit: CA_Magazine {
scope = public; scope = public;
count = 1; count = 1;
type = 256; type = 256;

12
SQF/dayz_code/stringtable.xml
View File

@@ -11614,13 +11614,13 @@
<Czech>Stavba zrušena.</Czech> <Czech>Stavba zrušena.</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_47"> <Key ID="STR_EPOCH_PLAYER_47">
<English>Canceled construction of %1 %2.</English> <English>Canceled construction of %1, %2.</English>
<German>Bau von %1 %2 abgebrochen.</German> <German>Bau von %1, %2 abgebrochen.</German>
<Russian>Отменено строительство %1 %2.</Russian> <Russian>Отменено строительство %1, %2.</Russian>
<!-- <Spanish></Spanish> --> <!-- <Spanish></Spanish> -->
<Dutch>Gestopt met het bouwen van %1 %2.</Dutch> <Dutch>Gestopt met het bouwen van %1, %2.</Dutch>
<French>La construction de %1 %2 est annulée.</French> <French>La construction de %1, %2 est annulée.</French>
<Czech>Stavba %1 %2 byla zrušena.</Czech> <Czech>Stavba %1, %2 byla zrušena.</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_48"> <Key ID="STR_EPOCH_PLAYER_48">
<English>Downgrade already in progress.</English> <English>Downgrade already in progress.</English>