diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp index bd3b8682..feb71ab1 100644 --- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp +++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp @@ -235,6 +235,29 @@ class CfgBaseBuilding removeParts[] = {}; }; class MetalFloor_Ghost_EPOCH : MetalFloor_SIM_EPOCH {}; + + class MetalTower_EPOCH : Default + { + removeParts[] = {{"ItemCorrugatedLg",3}}; + upgradeBuilding[] = {{"CinderTower_EPOCH",{{"CinderBlocks",4},{"MortarBucket",4}}}}; + upgradeBuildingPart[] = {{"ItemCorrugatedLg",4}}; + removeBuildingPart[] = {{"ItemCorrugatedLg",2}}; + simulClass = "MetalTower_SIM_EPOCH"; + staticClass = "MetalTower_EPOCH"; + GhostPreview = "MetalTower_Ghost_EPOCH"; + snapPointsPara[] = {"NF2","SF2","EF2","WF2","NF","SF","EF","WF","C","CB"}; + snapPointsPerp[] = {"N","S","E","W","CinN","CinS","CinE","CinW"}; + persistAnimations[] = {"NWall","EWall","SWall","WWall"}; + energyCost = 0.5; + }; + class MetalTower_SIM_EPOCH : MetalTower_EPOCH + { + allowedSnapPoints[] = {"NF2","SF2","EF2","WF2","CB"}; + allowedSnapObjects[] = {"MetalTower_EPOCH","Const_floors_static_F","Constructions_foundation_F"}; + }; + class MetalTower_Ghost_EPOCH : MetalTower_SIM_EPOCH {}; + + class CinderWallGarage_EPOCH : Default { removeParts[] = {{"CinderBlocks",4},{"ItemCorrugatedLg",1},{"CircuitParts",1}}; @@ -313,7 +336,28 @@ class CfgBaseBuilding snapPointsPara[] = {"N","E","W"}; allowedSnapPoints[] = {"N","S","E","W"}; }; - class WoodLargeWall_EPOCH : Default + + class CinderTower_EPOCH : Default + { + removeParts[] = {{"CinderBlocks",2}}; + upgradeBuildingPart[] = {{"CinderBlocks",2},{"MortarBucket",2}}; + removeBuildingPart[] = {{"CinderBlocks",2}}; + simulClass = "CinderTower_SIM_EPOCH"; + staticClass = "CinderTower_EPOCH"; + GhostPreview = "CinderTower_Ghost_EPOCH"; + snapPointsPara[] = {"NF2","SF2","EF2","WF2","NF","SF","EF","WF","C","CB"}; + snapPointsPerp[] = {"N","S","E","W","CinN","CinS","CinE","CinW"}; + persistAnimations[] = {"NWall","EWall","SWall","WWall"}; + energyCost = 0.4; + }; + class CinderTower_SIM_EPOCH : CinderTower_EPOCH + { + allowedSnapPoints[] = {"NF2","SF2","EF2","WF2","CB"}; + allowedSnapObjects[] = {"CinderTower_EPOCH","Const_floors_static_F","Constructions_foundation_F"}; + }; + class CinderTower_Ghost_EPOCH : CinderTower_SIM_EPOCH {}; + + class WoodLargeWall_EPOCH : Default { upgradeBuilding[] = {{"WoodWall1_EPOCH",{{"ItemPlywoodPack",1}}},{"WoodLargeWallCor_EPOCH",{{"ItemCorrugated",1}}}}; removeParts[] = {{"PartPlankPack",2}}; @@ -560,7 +604,7 @@ class CfgBaseBuilding class Tipi_Ghost_EPOCH : Tipi_SIM_EPOCH {}; class TentA_EPOCH : Default { - removeParts[] = {{"Pelt_EPOCH",2},{"PartPlankPack",1}}; + removeParts[] = {{"KitTentA",1}}; GhostPreview = "TentA_Ghost_EPOCH"; staticClass = "TentA_EPOCH"; simulClass = "TentA_SIM_EPOCH"; @@ -578,7 +622,7 @@ class CfgBaseBuilding class TentA_Ghost_EPOCH : TentA_SIM_EPOCH {}; class TentDome_EPOCH : Default { - removeParts[] = {{"Pelt_EPOCH",2},{"PartPlankPack",1}}; + removeParts[] = {{"KitTentDome",1}}; GhostPreview = "TentDome_Ghost_EPOCH"; staticClass = "TentDome_EPOCH"; simulClass = "TentDome_SIM_EPOCH"; diff --git a/Sources/epoch_config/Configs/CfgItemInteractions.hpp b/Sources/epoch_config/Configs/CfgItemInteractions.hpp index 7916b7da..7d87fbe9 100644 --- a/Sources/epoch_config/Configs/CfgItemInteractions.hpp +++ b/Sources/epoch_config/Configs/CfgItemInteractions.hpp @@ -375,6 +375,14 @@ class CfgItemInteractions class KitWoodTower : Item_Build_base { buildClass = "WoodTower_EPOCH"; + }; + class KitMetalTower : Item_Build_base + { + buildClass = "MetalTower_EPOCH"; + }; + class KitCinderTower : Item_Build_base + { + buildClass = "CinderTower_EPOCH"; }; class KitWoodRamp : Item_Build_base { @@ -793,5 +801,50 @@ class CfgItemInteractions class SeedPacket_Poppy : Default {}; class SeedPacket_Pumpkin : Default {}; class SeedPacket_Sunflower : Default {}; + class ItemBakedBeans : Food_TinCan_base + { + interactAttributes[] = {{"Hunger",800}}; + }; + class gyro_wrap_epoch : Food_base + { + interactAttributes[] = {{"Hunger",600}}; + }; + class icecream_epoch : Food_base + { + interactAttributes[] = {{"Hunger",200},{"Stamina",20}}; + }; + class redburger_epoch : Food_base + { + interactAttributes[] = {{"Hunger",600}}; + }; + class bluburger_epoch : Food_base + { + interactAttributes[] = {{"Hunger",600}}; + }; + class krypto_candy_epoch : Food_base + { + interactAttributes[] = {{"Hunger",500},{"Stamina",50}}; + }; + class ItemBottlePlastic_Clean : Drink_base + { + interactAttributes[] = {{"Thirst",500},{"Stamina",50}}; + interactReturnOnUse = "ItemBottlePlastic_Empty"; + }; + class ItemCanteen_Clean : Drink_base + { + interactAttributes[] = {{"Thirst",1000},{"Stamina",50}}; + interactReturnOnUse = "ItemCanteen_Empty"; + }; + class ItemBottlePlastic_Dirty: Drink_base + { + interactAttributes[] = {{"Thirst",500},{"Toxicity",5,1},{"Stamina",50}}; + interactReturnOnUse = "ItemBottlePlastic_Empty"; + }; + + class ItemCanteen_Dirty : Drink_base + { + interactAttributes[] = {{"Thirst",1000},{"Toxicity",5,1},{"Stamina",50}}; + interactReturnOnUse = "ItemCanteen_Empty"; + }; }; /*[[[end]]]*/ diff --git a/Sources/epoch_config/Configs/CfgItemSort.hpp b/Sources/epoch_config/Configs/CfgItemSort.hpp index 6eba7e2b..9436213c 100644 --- a/Sources/epoch_config/Configs/CfgItemSort.hpp +++ b/Sources/epoch_config/Configs/CfgItemSort.hpp @@ -802,6 +802,8 @@ class CfgItemSort "KitWorkbench", "KitWoodLadder", "KitWoodTower", + "KitMetalTower", + "KitCinderTower", "ItemLockbox", "Pelt_EPOCH", "ItemSafe", diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index 9aec5dc5..bd177e1a 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -1810,7 +1810,7 @@ class CfgPricing }; class WoodLog_EPOCH { - price = 1; + price = 2; }; class ItemRope { @@ -2900,7 +2900,7 @@ class CfgPricing }; class PartPlankPack { - price = 2; + price = 4; }; class CinderBlocks { @@ -2926,21 +2926,45 @@ class CfgPricing { price = 10; }; + class KitWoodQuarterFloor + { + price = 8; // price of 2 planks + }; + class KitWoodHalfFloor + { + price = 16; // price of 4 planks + }; class KitWoodFloor { - price = 10; + price = 32; // price of 8 planks + }; + class KitMetalFloor + { + price = 100; // price of 4 ItemCorrugatedLg + }; + class KitCinderFloor + { + price = 120; //price of 3 CinderBlocks and 3 MortarBucket }; class KitWoodStairs { - price = 10; + price = 16; // price of 4 planks }; class KitWoodTower { - price = 10; + price = 48; // price of 12 plank packs + }; + class KitMetalTower + { + price = 150; // price of 6 ItemCorrugatedLg + }; + class KitCinderTower + { + price = 200; //price of 5 CinderBlocks and 5 MortarBucket }; class KitWoodRamp { - price = 14; + price = 24; // price of 6 planks }; class KitSpikeTrap { diff --git a/Sources/epoch_config/Configs/cfgCrafting.hpp b/Sources/epoch_config/Configs/cfgCrafting.hpp index 1046abda..4b41db33 100644 --- a/Sources/epoch_config/Configs/cfgCrafting.hpp +++ b/Sources/epoch_config/Configs/cfgCrafting.hpp @@ -321,7 +321,7 @@ class CfgCrafting }; class MortarBucket : Item { - usedIn[] = {"KitFoundation","KitCinderWall","KitHesco3"}; + usedIn[] = {"KitFoundation","KitCinderWall","KitHesco3","KitCinderFloor","KitCinderTower"}; nearby[] = {{"Fire","","fire",{1,{"ALL"}},3,1,1,0},{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; recipe[] = {{"ItemRock",12},{"water_epoch",2}}; previewPosition[] = {0.799442,1,0.426761}; @@ -348,7 +348,7 @@ class CfgCrafting }; class CinderBlocks : Part { - usedIn[] = {"KitCinderWall"}; + usedIn[] = {"KitCinderWall","KitCinderFloor","KitCinderTower"}; previewPosition[] = {0.801866,1,0.35}; previewScale = 0.2; }; @@ -727,7 +727,7 @@ class CfgCrafting }; class ItemCorrugatedLg : Item { - usedIn[] = {"KitPlotPole","KitTankTrap","KitHesco3","KitSolarGen","ItemRotor","EngineBlock"}; + usedIn[] = {"KitPlotPole","KitTankTrap","KitHesco3","KitSolarGen","ItemRotor","EngineBlock","KitMetalFloor","KitMetalTower"}; recipe[] = {{"ItemCorrugated",3}}; nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; previewPosition[] = {0.797491,1,0.32899}; @@ -790,7 +790,7 @@ class CfgCrafting class KitWoodFloor : Kit { usedIn[] = {"KitWoodTower"}; - recipe[] = {{"PartPlankPack",4}}; + recipe[] = {{"PartPlankPack",8}}; nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; model = "\x\addons\a3_epoch_assets\models\Wooden_Floor.p3d"; previewPosition[] = {0.800198,1,0.262418}; @@ -799,7 +799,7 @@ class CfgCrafting }; class KitWoodHalfFloor : Kit { - recipe[] = {{"KitWoodQuarterFloor",2}}; + recipe[] = {{"KitWoodQuarterFloor",4}}; nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; model = "\x\addons\a3_epoch_assets_1\models\Half_Floor.p3d"; previewPosition[] = {0.800198,1,0.262418}; @@ -809,7 +809,7 @@ class CfgCrafting class KitWoodQuarterFloor : Kit { usedIn[] = {"KitWoodHalfFloor"}; - recipe[] = {{"PartPlankPack",1}}; + recipe[] = {{"PartPlankPack",2}}; nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; model = "\x\addons\a3_epoch_assets_1\models\Quarter_Floor.p3d"; previewPosition[] = {0.800198,1,0.262418}; @@ -871,6 +871,45 @@ class CfgCrafting previewScale = 0.05; previewVector = 0; }; + class KitMetalFloor : Kit + { + usedIn[] = {"KitMetalTower"}; + recipe[] = {{"ItemCorrugatedLg",4}}; + nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; + model = "\x\addons\a3_epoch_assets_1\models\metal_floor.p3d"; + previewPosition[] = {0.800198,1,0.262418}; + previewScale = 0.055; + previewVector = 3.6; + }; + class KitMetalTower : Kit + { + recipe[] = {{"KitMetalFloor",1},{"ItemCorrugatedLg",2}}; + nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; + model = "\x\addons\a3_epoch_community\Metal_Base_Tower\Metal_floor_tower.p3d"; + previewPosition[] = {0.800653,1,0.378749}; + previewScale = 0.05; + previewVector = 0; + }; + class KitCinderFloor : Kit + { + usedIn[] = {"KitCinderTower"}; + recipe[] = {{"CinderBlocks",3},{"MortarBucket",3}}; + nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; + model = "\x\addons\a3_epoch_community\models\cinderfloor.p3d"; + previewPosition[] = {0.800198,1,0.262418}; + previewScale = 0.055; + previewVector = 3.6; + }; + class KitCinderTower : Kit + { + recipe[] = {{"KitCinderFloor",1},{"CinderBlocks",2},{"MortarBucket",2}}; + nearby[] = {{"Workbench","","workbench",{1,{"WorkBench_EPOCH"}},3,1,0,1}}; + model = "\x\addons\a3_epoch_community\Cinder_Base_Tower\cinder_tower_upgrade.p3d"; + previewPosition[] = {0.800653,1,0.378749}; + previewScale = 0.05; + previewVector = 0; + }; + class KitTiPi : Kit { recipe[] = {{"Pelt_EPOCH",4},{"PartPlankPack",2}}; @@ -1250,6 +1289,51 @@ class CfgCrafting previewScale = 0.3; previewVector = 0.3; }; + class ItemBottlePlastic_Empty : Part + { + usedIn[] = {"ItemBottlePlastic_Dirty"}; + previewPosition[] = {0.807346,1,0.43035}; + previewScale = 2.5; + }; + class ItemBottlePlastic_Dirty: Item + { + usedIn[] = {"ItemBottlePlastic_Clean"}; + nearby[] = {{"Water source","","water",{2,{"water"}},3,1,0,0}}; + recipe[] = {"ItemBottlePlastic_Empty"}; + previewPosition[] = {0.807346,1,0.43035}; + previewScale = 2.5; + }; + class ItemBottlePlastic_Clean : Item + { + usedIn[] = {}; + recipe[] = {"ItemBottlePlastic_Dirty","ItemWaterPurificationTablets"}; + previewPosition[] = {0.807346,1,0.43035}; + previewScale = 2.5; + displayName = "Clean Water in a plastic bottle"; + }; + + class ItemCanteen_Empty : Part + { + usedIn[] = {"ItemCanteen_Dirty"}; + previewPosition[] = {0.807346,1,0.43035}; + previewScale = 2.5; + }; + class ItemCanteen_Dirty : Item + { + usedIn[] = {"ItemCanteen_Clean"}; + nearby[] = {{"Water source","","water",{2,{"water"}},3,1,0,0}}; + recipe[] = {"ItemCanteen_Empty"}; + previewPosition[] = {0.807346,1,0.43035}; + previewScale = 2.5; + }; + class ItemCanteen_Clean : Item + { + usedIn[] = {}; + recipe[] = {"ItemCanteen_Dirty","ItemWaterPurificationTablets"}; + previewPosition[] = {0.807346,1,0.43035}; + previewScale = 2.5; + displayName = "Clean Water in a canteen"; + }; }; /*[[[end]]]*/