From ad9694844d70d50b99b68d1ff3ba1baff1153d28 Mon Sep 17 00:00:00 2001 From: oiad Date: Tue, 26 Jul 2016 13:22:10 +1200 Subject: [PATCH] Snap point changes This correctly fixes snap points for all cinder related to metal floors. Anything cinder will now correctly snap to full cinder walls and vice versa Metal floors will not have gaps so you can correclty create a 1x1 cube (as it should be) Renamed cinder_wall_kit to half_cinder_wall_kit to be in line with full_cinder_wall_kit since I felt it was confusing. cinder_wall_kit seems like it would be full to me. Fixed a string issue when building cancelling to make it more readable. --- SQF/dayz_code/Configs/CfgExtra/snappoints.hpp | 50 +++++++++++-------- .../Configs/CfgMagazines/DZE/Misc.hpp | 2 +- .../CfgMagazines/DZE/ModularBuilding.hpp | 2 +- SQF/dayz_code/stringtable.xml | 12 ++--- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp index 0317d5896..227947950 100644 --- a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp +++ b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp @@ -242,29 +242,38 @@ class SnapBuilding { class Cinder_DZE: FloorsWallsStairs { //All cinder walls and doors points[] = { {0,0,0,"Pivot"}, - {-2.64, 0, 1.5,"Left"}, - {2.64, 0, 1.5,"Right"}, + {-2.64, 0, 1.685,"Left"}, + {2.64, 0, 1.685,"Right"}, {0, 0, 3.37042,"Top"} }; 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 CinderWallSmallDoorway_Preview_DZ: Cinder_DZE {}; class CinderWallHalf_Preview_DZ: Cinder_DZE { points[] = { {0,0,0,"Pivot"}, - {-2.64, 0, 1.5,"Left"}, - {2.64, 0, 1.5,"Right"}, + {-2.64, 0, 1.685,"Left"}, + {2.64, 0, 1.685,"Right"}, {0, 0, 1.5,"Top"} }; }; class CinderWall_DZ: Cinder_DZE { points[] = { {0,0,0,"Pivot"}, - {-2.84, 0, 3.2,"Left"}, - {2.84, 0, 3.2,"Right"}, - {0, 0, 3.2,"Top"} + {-2.64, 0, 1.685,"Left"}, + {2.64, 0, 1.685,"Right"}, + {0, 0, 3.37042,"Top"}, + {0,0,-1.685,"Bottom"} }; }; class CinderWallDoorway_DZ: Cinder_DZE {}; @@ -275,35 +284,34 @@ class SnapBuilding { class CinderWallHalf_DZ: Cinder_DZE { points[] = { {0,0,0,"Pivot"}, - {-2.64, 0, 1.5,"Left"}, - {2.64, 0, 1.5,"Right"}, - {0, 0, 1.5,"Top"} + {-2.64, 0, 1.685,"Left"}, + {2.64, 0, 1.685,"Right"}, + {0, 0, 1.685,"Top"} }; }; class CinderWallDoorSmall_DZ: Cinder_DZE {}; - class MetalFloor_Preview_DZ: FloorsWallsStairs { //fix for broken offsets in ghost + class MetalFloor_Preview_DZ: FloorsWallsStairs { points[] = { {0,0,0.011,"Pivot"}, - {0, -2.64, 0.009,"Back"}, - {0, 2.64, 0.009,"Front"}, - {-2.64, 0, 0.009,"Left"}, - {2.64, 0, 0.009,"Right"} + {0, -2.64, 0.025,"Back"}, + {0, 2.64, 0.025,"Front"}, + {-2.64, 0, 0.025,"Left"}, + {2.64, 0, 0.025,"Right"} }; radius = 12; }; class MetalFloor_DZ: FloorsWallsStairs{ points[] = { {0,0,0,"Pivot"}, - {0, -2.64, 0.15,"Back"}, - {0, 2.64, 0.15,"Front"}, - {-2.64, 0, 0.15,"Left"}, - {2.64, 0, 0.15,"Right"} + {0, -2.64, 0.025,"Back"}, + {0, 2.64, 0.025,"Front"}, + {-2.64, 0, 0.025,"Left"}, + {2.64, 0, 0.025,"Right"} }; radius = 12; }; - //Non essential Items that only snap to themselves, do whitelist inheritance if you want these to snap class WoodCrate_DZ { snapTo[] = { diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index 5ec2aee1b..9030eb330 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -885,7 +885,7 @@ class CinderBlocks: CA_Magazine script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; - output[] = {{"cinder_wall_kit",1}}; + output[] = {{"half_cinder_wall_kit",1}}; input[] = {{"CinderBlocks",3},{"MortarBucket",1}}; }; class Crafting1 diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp index 6dd13f9e8..7277cc2d0 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp @@ -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; count = 1; type = 256; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 5958a04e6..d974351e1 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -11614,13 +11614,13 @@ Stavba zrušena. - Canceled construction of %1 %2. - Bau von %1 %2 abgebrochen. - Отменено строительство %1 %2. + Canceled construction of %1, %2. + Bau von %1, %2 abgebrochen. + Отменено строительство %1, %2. - Gestopt met het bouwen van %1 %2. - La construction de %1 %2 est annulée. - Stavba %1 %2 byla zrušena. + Gestopt met het bouwen van %1, %2. + La construction de %1, %2 est annulée. + Stavba %1, %2 byla zrušena. Downgrade already in progress.