diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo index 6911a4f5..da034638 100644 Binary files a/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo and b/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo differ diff --git a/Server_Install_Pack/sc/battleye/attachto.txt b/Server_Install_Pack/sc/battleye/attachto.txt index bf710bae..fa4aec86 100644 --- a/Server_Install_Pack/sc/battleye/attachto.txt +++ b/Server_Install_Pack/sc/battleye/attachto.txt @@ -1 +1 @@ -5 "" !WeaponHolderSimulated !Shot !"(Safe|LockBox|FirePlace|PlotPole|Jack|SolarGen)_EPOCH" !"Jack_SIM_EPOCH" !"LockBox_Ghost_EPOCH" !"CinderWallHalf_Ghost_EPOCH" !"(Tipi|StorageShelf|Wood(Floor|LargeWall|Stairs|Ramp|Ladder|Tower)_Ghost_EPOCH" !"Foundation_Ghost_EPOCH" !"Land_Cages_F" !"Epoch_Sapper_F" +5 "" !WeaponHolderSimulated !Shot !"(Safe|LockBox|FirePlace|PlotPole|Jack|SolarGen)_EPOCH" !"Jack_SIM_EPOCH" !"LockBox_Ghost_EPOCH" !"CinderWallHalf_Ghost_EPOCH" !"(Tipi|Workbench|StorageShelf|Wood(Floor|LargeWall|Stairs|Ramp|Ladder|Tower)_Ghost_EPOCH" !"Foundation_Ghost_EPOCH" !"Land_Cages_F" !"Epoch_Sapper_F" diff --git a/Server_Install_Pack/sc/battleye/createvehicle.txt b/Server_Install_Pack/sc/battleye/createvehicle.txt index 14f3f9cc..1822de59 100644 --- a/Server_Install_Pack/sc/battleye/createvehicle.txt +++ b/Server_Install_Pack/sc/battleye/createvehicle.txt @@ -1,3 +1,3 @@ 5 "" !="I_UAV_01_F" !="(I|B|O)_UAV_AI" !"_EPOCH" !="B_65x39_Minigun_Caseless_Red_splash" !="B_762x51_Minigun_Tracer_Yellow_splash" !="B_(Swing|Stick)" !"^SmokeShell" !"^G_40mm_" !"^F_40mm_" !"Sub_F_" !"^F_Signal_" !="mini_Grenade" !="GrenadeHand" !="LaserTarget(C|W|E)" !"^Chemlight_" !="(ClaymoreDirectionalMine|DemoCharge|SatchelCharge)_Remote_Ammo" !="SLAMDirectionalMine_Wire_Ammo" !="(CMflare_Chaff|Sapper_Charge|SapperB_Charge|ATMine_Range)_Ammo" !="APERS(TripMine_Wire|BoundingMine_Range|Mine_Range)_Ammo" !="Epoch_(Sapper|SapperB|Cloak)_F" !="GreatWhite_F" !="groundWeaponHolder" !="WeaponHolderSimulated" !="Epoch_(Male|Female)_F" !"Supply[0-9]" !"Steerable_Parachute_F" !="Epoch_Female_CamoRed_F" !="Land_Cages_F" !="(O|I|B)_UAV_01_backpack_F" !="I_(helipilot|helicrew)_F" -5 "_EPOCH" !="(SapperHead|Jack|SolarGen)_SIM_EPOCH" !="Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower)_EPOCH" !="(Tipi|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower))_Ghost_EPOCH" !="(Tipi|StorageShelf|Safe|LockBox|FirePlace|FirePlaceOn|PlotPole|SolarGen|Jack|Freezer|Tarp|CinderWallHalf)_EPOCH" !="I_(Soldier[1-3]|Soldier)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="(Safe|LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp|Ladder|Tower)_SIM_EPOCH" !="(WoodFoundation|Foundation)_EPOCH" !="WoodWall[1-4](_SIM|_Ghost|)_EPOCH" +5 "_EPOCH" !="(SapperHead|Jack|SolarGen)_SIM_EPOCH" !="Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower)_EPOCH" !="(Tipi|Workbench|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower))_Ghost_EPOCH" !="(Tipi|StorageShelf|Safe|LockBox|FirePlace|FirePlaceOn|PlotPole|SolarGen|Jack|Freezer|Tarp|CinderWallHalf)_EPOCH" !="I_(Soldier[1-3]|Soldier)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="(Safe|LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp|Ladder|Tower)_SIM_EPOCH" !="(WoodFoundation|Foundation)_EPOCH" !="WoodWall[1-4](_SIM|_Ghost|)_EPOCH" 5 SeaGull diff --git a/Server_Install_Pack/sc/battleye/setpos.txt b/Server_Install_Pack/sc/battleye/setpos.txt index 25578000..45b3f821 100644 --- a/Server_Install_Pack/sc/battleye/setpos.txt +++ b/Server_Install_Pack/sc/battleye/setpos.txt @@ -1 +1 @@ -5 "" !="Epoch_(Male|Female)_F" !="SapperHead_SIM_EPOCH" !="(Tipi|StorageShelf|Safe|LockBox|FirePlace|FirePlaceOn|PlotPole|SolarGen)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="(Safe|LockBox|CinderWallHalf|CinderWall|Fireplace|SolarGen)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorway|Stairs|Stairs2|Ramp)_SIM_EPOCH" !="(Foundation|Wood(Foundation|Ladder|Tower))_Ghost_EPOCH" !="Foundation_EPOCH" !="WoodFoundation_EPOCH" !="WoodWall[1-4](_SIM|_Ghost|)_EPOCH" +5 "" !="Epoch_(Male|Female)_F" !="SapperHead_SIM_EPOCH" !="(Tipi|Workbench|StorageShelf|Safe|LockBox|FirePlace|FirePlaceOn|PlotPole|SolarGen)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="(Safe|LockBox|CinderWallHalf|CinderWall|Fireplace|SolarGen)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorway|Stairs|Stairs2|Ramp)_SIM_EPOCH" !="(Foundation|Wood(Foundation|Ladder|Tower))_Ghost_EPOCH" !="Foundation_EPOCH" !="WoodFoundation_EPOCH" !="WoodWall[1-4](_SIM|_Ghost|)_EPOCH" diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp index ce540a9c..8743d7b1 100644 --- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp +++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp @@ -117,4 +117,8 @@ class CfgBaseBuilding { { removeParts[] = { { "ItemCorrugated", 2 } }; }; + class Workbench_EPOCH : Default + { + removeParts[] = { { "PartPlankPack", 2 } }; + }; }; diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index 3540c93f..32e20f87 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -361,6 +361,8 @@ class CfgPricing class KitFirePlace {price = 4;}; class KitTiPi {price = 10;}; class KitShelf {price = 90;}; + class KitWorkbench { price = 10; }; + class KitWoodFoundation { price = 20; }; class KitFoundation {price = 90;}; class KitPlotPole {price = 300;}; diff --git a/Sources/epoch_config/Configs/CfgVehicles.hpp b/Sources/epoch_config/Configs/CfgVehicles.hpp index 6735876d..aba2f99e 100644 --- a/Sources/epoch_config/Configs/CfgVehicles.hpp +++ b/Sources/epoch_config/Configs/CfgVehicles.hpp @@ -3025,6 +3025,17 @@ class CfgVehicles bypassJammer = 1; }; + class WorkBench_SIM_EPOCH : Constructions_modular_F + { + scope = 2; + model = "\x\addons\a3_epoch_assets_1\models\workbench.p3d"; + displayName = "WorkBench (SIM)"; + staticClass = "WorkBench_EPOCH"; + simulClass = "WorkBench_SIM_EPOCH"; + limitNearby = 5; + bypassJammer = 1; + }; + class Tarp_SIM_EPOCH : Constructions_modular_F { scope = 2; @@ -3883,6 +3894,14 @@ class CfgVehicles staticClass = "StorageShelf_EPOCH"; ladders[] = {}; }; + class WorkBench_Ghost_EPOCH : Const_Ghost_EPOCH + { + scope = 2; + model = "\x\addons\a3_epoch_assets_1\models\workbench.p3d"; + displayName = "WorkBench Ghost"; + staticClass = "WorkBench_EPOCH"; + ladders[] = {}; + }; class WoodLargeWall_Ghost_EPOCH : Const_Ghost_EPOCH { @@ -4513,7 +4532,6 @@ class CfgVehicles maximumLoad = 1200; staticClass = "Tipi_EPOCH"; simulClass = "Tipi_SIM_EPOCH"; - removeParts[] = { { "Pelt_EPOCH", 2 }, { "PartPlankPack", 1 } }; limitNearby = 2; bypassJammer = 1; interactMode = 4; @@ -4527,7 +4545,19 @@ class CfgVehicles maximumLoad = 800; staticClass = "StorageShelf_EPOCH"; simulClass = "StorageShelf_SIM_EPOCH"; - removeParts[] = { { "ItemCorrugated", 2 } }; + limitNearby = 5; + bypassJammer = 1; + interactMode = 4; + }; + class WorkBench_EPOCH : Buildable_Storage + { + scope = 2; + model = "\x\addons\a3_epoch_assets_1\models\workbench.p3d"; + displayName = "WorkBench"; + GhostPreview = "WorkBench_Ghost_EPOCH"; + maximumLoad = 800; + staticClass = "WorkBench_EPOCH"; + simulClass = "WorkBench_SIM_EPOCH"; limitNearby = 5; bypassJammer = 1; interactMode = 4; diff --git a/Sources/epoch_config/Configs/CfgWeapons.hpp b/Sources/epoch_config/Configs/CfgWeapons.hpp index ec5d6b2e..7a4b3eba 100644 --- a/Sources/epoch_config/Configs/CfgWeapons.hpp +++ b/Sources/epoch_config/Configs/CfgWeapons.hpp @@ -2226,8 +2226,7 @@ class CfgWeapons autoreload = 1; magazineReloadTime = 0; model = "\x\addons\a3_epoch_assets_3\CfgWeapons\sword_weaponized.p3d"; - //TODO ICON - picture = "\x\addons\a3_epoch_assets\textures\Sledge\equip_sledge_CA.paa"; + picture = "\x\addons\a3_epoch_assets\textures\sword\equip_sword_ca.paa"; displayName = "Sword"; magazines[] = { "sledge_swing" }; handAnim[] = { "OFP2_ManSkeleton", "\x\addons\a3_epoch_assets_3\CfgVehicles\Characters\Sledge_hold.rtm" }; @@ -2275,8 +2274,7 @@ class CfgWeapons autoreload = 1; magazineReloadTime = 0; model = "\x\addons\a3_epoch_assets_3\CfgWeapons\fishingpole_weaponized.p3d"; - // TODO - picture = "\x\addons\a3_epoch_assets\textures\improv_weapon\gear_stick_ca.paa"; + picture = "\x\addons\a3_epoch_assets\textures\fishing\equip_fishingRod_ca.paa"; displayName = "Fishing Rod"; magazines[] = { "stick_swing" }; handAnim[] = { "OFP2_ManSkeleton", "\x\addons\a3_epoch_assets_3\CfgVehicles\Characters\Sledge_hold.rtm" }; diff --git a/Sources/epoch_config/Configs/cfgCrafting.hpp b/Sources/epoch_config/Configs/cfgCrafting.hpp index 857c5671..a462a1a6 100644 --- a/Sources/epoch_config/Configs/cfgCrafting.hpp +++ b/Sources/epoch_config/Configs/cfgCrafting.hpp @@ -595,7 +595,7 @@ class CfgCrafting }; class PartPlankPack : Kit { - usedIn[] = {"KitStudWall","KitWoodFloor","KitWoodFoundation","KitWoodStairs","KitWoodRamp","KitWoodLadder","KitWoodTower","KitTiPi"}; + usedIn[] = {"KitStudWall","KitWoodFloor","KitWoodFoundation","KitWoodStairs","KitWoodRamp","KitWoodLadder","KitWoodTower","KitTiPi","KitWorkbench"}; recipe[] = {{"WoodLog_EPOCH",2}}; previewPosition[] = {0.797837,1,0.288258}; previewScale = 0.2; @@ -675,6 +675,14 @@ class CfgCrafting previewScale = 0.17; previewVector = 0; }; + class KitWorkbench : Kit + { + recipe[] = { { "PartPlankPack", 2 } }; + model = "\x\addons\a3_epoch_assets_1\models\workbench.p3d"; + previewPosition[] = { 0.803749, 1, 0.448515 }; + previewScale = 0.17; + previewVector = 0; + }; class KitFoundation : Kit { recipe[] = {{"MortarBucket",4}}; diff --git a/Sources/epoch_server_settings/configs/loots.h b/Sources/epoch_server_settings/configs/loots.h index 86080332..4885be28 100644 --- a/Sources/epoch_server_settings/configs/loots.h +++ b/Sources/epoch_server_settings/configs/loots.h @@ -1356,7 +1356,8 @@ class CfgLootTable { { "KitPlotPole", "magazine" }, 5 }, { { "KitSolarGen", "magazine" }, 2 }, { { "KitStudWall", "magazine" }, 13 }, - { { "KitShelf", "magazine" }, 11 }, + { { "KitShelf", "magazine" }, 9 }, + { { "KitWorkbench", "magazine" }, 2 }, { { "KitWoodFloor", "magazine" }, 12 }, { { "KitWoodStairs", "magazine" }, 10 }, { { "KitWoodTower", "magazine" }, 5 },