From a88890863f43d783ad6722ee89105de28be5e58f Mon Sep 17 00:00:00 2001 From: He-Man Date: Mon, 7 May 2018 22:26:59 +0200 Subject: [PATCH] Snowman + 1/3 PlyWall --- .../epoch_config/Configs/CfgBaseBuilding.hpp | 34 ++++++++++++++++++ Sources/epoch_config/Configs/CfgCrafting.hpp | 35 ++++++++++++++++--- .../Configs/CfgItemInteractions.hpp | 8 +++++ .../epoch_config/Configs/CfgSnapChecks.hpp | 4 +++ 4 files changed, 77 insertions(+), 4 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp index aea9d700..2e17aaff 100644 --- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp +++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp @@ -648,6 +648,28 @@ class CfgBaseBuilding allowedSnapObjects[] = {"Const_floors_static_F","Const_WoodWalls_static_F","Const_Cinder_static_F"}; }; class WoodLargeWall_Ghost_EPOCH : WoodLargeWall_SIM_EPOCH {}; + class PlyThirdWall_EPOCH : Default + { + upgradeBuilding[] = {}; + removeParts[] = {{"PartPlankPack",1},{"ItemPlywoodPack",1}}; + simulClass = "PlyThirdWall_SIM_EPOCH"; + staticClass = "PlyThirdWall_EPOCH"; + GhostPreview = "PlyThirdWall_Ghost_EPOCH"; + snapType = "snapPointsPara"; + snapPointsPara[] = {"N","E","W"}; + allowedSnapPoints[] = {"N","S","E","W"}; + // snap points for WoodLargeWall_EPOCH + N[] = {0,0,1.02012}; + E[] = {5.237,0,0}; + W[] = {-5.237,0,0}; + }; + class PlyThirdWall_SIM_EPOCH : PlyThirdWall_EPOCH + { + upgradeBuilding[] = {}; + removeParts[] = {}; + allowedSnapObjects[] = {"Const_floors_static_F","Const_WoodWalls_static_F","Const_Cinder_static_F"}; + }; + class PlyThirdWall_Ghost_EPOCH : PlyThirdWall_SIM_EPOCH {}; class WoodWall1_EPOCH : Default { upgradeBuilding[] = {{"WoodWall2_EPOCH",{{"PartPlankPack",1}}},{"WoodLargeWallCor_EPOCH",{{"ItemCorrugated",1}}},{"WoodWallWindow_EPOCH",{{"ItemGlass",2}}}}; @@ -1535,6 +1557,18 @@ class CfgBaseBuilding removeParts[] = {}; }; class BaseCamTerminal_Ghost_EPOCH : BaseCamTerminal_SIM_EPOCH {}; + class snowman_EPOCH : Default + { + removeParts[] = {{1,"KitSnowman"}}; + GhostPreview = "snowman_Ghost_EPOCH"; + staticClass = "snowman_EPOCH"; + simulClass = "snowman_SIM_EPOCH"; + }; + class snowman_SIM_EPOCH : snowman_EPOCH + { + removeParts[] = {}; + }; + class snowman_Ghost_EPOCH : snowman_SIM_EPOCH {}; }; /*[[[end]]]*/ diff --git a/Sources/epoch_config/Configs/CfgCrafting.hpp b/Sources/epoch_config/Configs/CfgCrafting.hpp index ed9c0520..ae8d49fb 100644 --- a/Sources/epoch_config/Configs/CfgCrafting.hpp +++ b/Sources/epoch_config/Configs/CfgCrafting.hpp @@ -99,7 +99,7 @@ class CfgCrafting /** --------- RECIPES BELOW --------- **/ class ItemCoolerE : Part { - usedIn[] = {"ItemCooler0","ItemCooler1","ItemCooler2","ItemCooler3","ItemCooler4"}; + usedIn[] = {"ItemCooler0","ItemCooler1","ItemCooler2","ItemCooler3","ItemCooler4","KitSnowman"}; previewPosition[] = {0.795709,1,0.415296}; previewScale = 0.8; previewVector = 0; @@ -793,6 +793,13 @@ class CfgCrafting previewScale = 0.4; previewVector = 2.1; }; + class icecream_epoch : Part + { + usedIn[] = {"KitSnowman"}; + previewPosition[] = {0.796141,1,0.27}; + previewScale = 0.7; + previewVector = 2.1; + }; class emptyjar_epoch : Part { usedIn[] = {"water_epoch"}; @@ -809,7 +816,7 @@ class CfgCrafting }; class clean_water_epoch : Item { - usedIn[] = {"EnergyPack"}; + usedIn[] = {"EnergyPack","KitSnowman"}; nearby[] = {{"Fire","","fire",{1,{"ALL"}},3,1,1,0}}; recipe[] = {"water_epoch"}; previewPosition[] = {0.807346,1,0.43035}; @@ -835,7 +842,7 @@ class CfgCrafting }; class PartPlankPack : Item { - usedIn[] = {"KitStudWall","KitWoodFloor","KitWoodFoundation","KitWoodStairs","KitWoodRamp","KitWoodLadder","KitWoodTower","KitTiPi","KitWorkbench","KitSpikeTrap","KitMetalTrap","KitWoodQuarterFloor","KitWoodHalfFloor","KitBarGate","KitBagBunker","KitWatchTower","KitLightPole","KitScaffolding"}; + usedIn[] = {"KitStudWall","KitWoodFloor","KitWoodFoundation","KitWoodStairs","KitWoodRamp","KitWoodLadder","KitWoodTower","KitTiPi","KitWorkbench","KitSpikeTrap","KitMetalTrap","KitWoodQuarterFloor","KitWoodHalfFloor","KitBarGate","KitBagBunker","KitWatchTower","KitLightPole","KitScaffolding","KitPlyThirdWall_EPOCH"}; recipe[] = {{"WoodLog_EPOCH",2}}; previewPosition[] = {0.797837,1,0.288258}; previewScale = 0.2; @@ -844,7 +851,7 @@ class CfgCrafting }; class ItemPlywoodPack : Item { - usedIn[] = {}; + usedIn[] = {"KitPlyThirdWall_EPOCH"}; recipe[] = {{"WoodLog_EPOCH",3}}; previewPosition[] = {0.797837,1,0.288258}; previewScale = 0.2; @@ -886,6 +893,15 @@ class CfgCrafting previewScale = 0.07; previewVector = 0; }; + class KitPlyThirdWall_EPOCH : Kit + { + recipe[] = {{"PartPlankPack",2},{"ItemPlywoodPack",1}}; + model = "\x\addons\a3_epoch_community\models\third_ply_wall.p3d"; + nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; + previewPosition[] = {0.797675,1,0.398882}; + previewScale = 0.07; + previewVector = 0; + }; class KitWoodFloor : Kit { usedIn[] = {"KitWoodTower","KitBagBunker"}; @@ -1124,6 +1140,17 @@ class CfgCrafting previewScale = 0.055; previewVector = 0; }; + class KitSnowman : Kit + { + recipe[] = {{"ItemCoolerE",1},{"icecream_epoch",1},{"clean_water_epoch",2}}; + model = "\x\addons\a3_epoch_community\models\hol_x\epoch_snowman.p3d"; + nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; + previewPosition[] = {0.801378,1,0.29}; + previewScale = 0.15; + previewVector = 0; + descriptionShort = "Snowman"; + descriptionFull = "Nice deco for Wintertime"; + }; class ItemSolar : Part { usedIn[] = {"KitSolarGen","KitSolarCharger","KitSolarChargerXL"}; diff --git a/Sources/epoch_config/Configs/CfgItemInteractions.hpp b/Sources/epoch_config/Configs/CfgItemInteractions.hpp index b4d1621c..b5f99e98 100644 --- a/Sources/epoch_config/Configs/CfgItemInteractions.hpp +++ b/Sources/epoch_config/Configs/CfgItemInteractions.hpp @@ -1069,5 +1069,13 @@ class CfgItemInteractions buildClass = "BaseCamTerminal_EPOCH"; interactActions[] = {{"Watch","call Epoch_CamUse;"}}; }; + class KitSnowman : Item_Build_base + { + buildClass = "snowman_EPOCH"; + }; + class KitPlyThirdWall_EPOCH : Item_Build_base + { + buildClass = "PlyThirdWall_EPOCH"; + }; }; /*[[[end]]]*/ diff --git a/Sources/epoch_config/Configs/CfgSnapChecks.hpp b/Sources/epoch_config/Configs/CfgSnapChecks.hpp index 53c5ccac..86b600e5 100644 --- a/Sources/epoch_config/Configs/CfgSnapChecks.hpp +++ b/Sources/epoch_config/Configs/CfgSnapChecks.hpp @@ -28,6 +28,10 @@ class CfgSnapChecks class CinderWallDoorwHatch_EPOCH : WoodLargeWall_EPOCH {}; class CinderWall_EPOCH : WoodLargeWall_EPOCH {}; class CinderWallHalf_EPOCH : WoodLargeWall_EPOCH {}; + class PlyThirdWall_EPOCH : WoodLargeWall_EPOCH + { + nails[] = {{{2.46932,0,0.120775},{2.46932,0,-0.190775}},{{-2.46932,0,0.120775},{-2.46932,0,-0.190775}},{{0,0,1},{2.76932,0,1}},{{0,0,1},{-2.76932,0,1}}}; + }; class WoodFloor_Epoch { nails[] = {{{0,0,0.15},{2.8555,0,0.15}},{{0,0,0.15},{0,2.8555,0.15}},{{0,0,0.15},{-2.8555,0,0.15}},{{0,0,0.15},{0,-2.8555,0.15}},{{2.5555,0,0.15},{2.5555,0,-0.15}},{{-2.5555,0,0.15},{-2.5555,0,-0.15}},{{0,-2.5555,0.15},{0,-2.5555,-0.15}},{{0,2.5555,0.15},{0,2.5555,-0.15}}};