diff --git a/Changelogs/0.3.2.0.txt b/Changelogs/0.3.2.0.txt new file mode 100644 index 00000000..45d25d35 --- /dev/null +++ b/Changelogs/0.3.2.0.txt @@ -0,0 +1,21 @@ +[New] Please welcome our newest team member SteamPunkGears http://www.twitch.tv/steampunkgears +[Added] New food item Tactical Bacon gives 500 hunger. +[Added] Revamped upgraded wood stair model. @SteamPunkGears +[Added] Armor stats for Uniforms, Vests, and Headgear now visible on inventory GUI. +[Added] Consume and Craft buttons added to inventory GUI, allows quicker action and identification of craftable items. +[Added] New custom wood log model. @SteamPunkGears +[Added] New Medicine cabinet loot object that spawns mostly medical loot. @SteamPunkGears +[Added] Custom Epoch Client function compiler. +[Changed] Lowered armor on certain base building objects that had way too much armor. +[Changed] Increased hunger and thirst loss a bit and you can now die from prolonged lack of hunger or thirst. +[Changed] Tweaked stats UI thresholds so that players will now see notifications sooner. Icons are now colorized and flash when at critical level. +[Fixed] Incorrect class for snake prevented killing snakes and looting them. +[Fixed] Use init eventhandler to remove local snakes and rabbits on spawning as maps other than Altis or Stratis spawn them randomly. +[Fixed] Dog brain targeting updates for prey like snakes and chickens. +[Fixed] AirDrops now have there own loot table with better loot payout. +[Fixed] Bornholm environmental loot configs had incorrect p3d names. Thanks to Robio! +[Fixed] Missing price value for M-900 helicopter. +[Fixed] Swap all references of old Rahim 10Rnd 762x51 to 10Rnd 762x54. +[ServerInfo] Removed old .bikey and added new one for 0320. +[ServerInfo] Added //new2 to the top of scripts.txt to enable kicking again. +[Info] version.txt added to client files to aid file mirrors. diff --git a/Server_Install_Pack/@epochhive/EpochServer.dll b/Server_Install_Pack/@epochhive/EpochServer.dll index d9b672c0..3a9436b2 100644 Binary files a/Server_Install_Pack/@epochhive/EpochServer.dll and b/Server_Install_Pack/@epochhive/EpochServer.dll differ diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 1156f01e..e8f59774 100644 Binary files a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo differ 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 3dee82c0..61424aa4 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/@epochhive/epochconfig.hpp b/Server_Install_Pack/@epochhive/epochconfig.hpp index cc887e7f..d29eff2a 100644 --- a/Server_Install_Pack/@epochhive/epochconfig.hpp +++ b/Server_Install_Pack/@epochhive/epochconfig.hpp @@ -10,7 +10,6 @@ timeDifference = 0; // Server uses real time this will allow you to offset just timeMultiplier = 4; // Sets a time multiplier for in-game time. The command range is now capped at 0.1 - 120 to avoid performance problems. lootMultiplier = 0.5; // 1 = max loot bias. This controls how much loot can payout per Epoch loot container. // Events -airDrops = false; // TBA WeatherChangeTime = 1200; // This controls how fast the weather changes as well as how fast shipping containers and earthquakes happen. WeatherStaticForecast[] = {}; // Default: {75.5,0,{0,0,0},0,{1,1}}; // Clear day; {19,1,{1,1,40},1,{5,5}}; // Cold Foggy Rainy Overcast Windy; Format: {temp ,rain ,fog ,overcast ,wind } events[] = { diff --git a/Server_Install_Pack/@epochhive/epochserver.so b/Server_Install_Pack/@epochhive/epochserver.so index 45ea6ae1..e6b68ac9 100644 Binary files a/Server_Install_Pack/@epochhive/epochserver.so and b/Server_Install_Pack/@epochhive/epochserver.so differ diff --git a/Server_Install_Pack/DB/redis-server.exe b/Server_Install_Pack/DB/redis-server.exe index facbe1e1..7f55502a 100644 Binary files a/Server_Install_Pack/DB/redis-server.exe and b/Server_Install_Pack/DB/redis-server.exe differ diff --git a/Server_Install_Pack/keys/epoch0304.bikey b/Server_Install_Pack/keys/epoch0304.bikey deleted file mode 100644 index a9f62a08..00000000 Binary files a/Server_Install_Pack/keys/epoch0304.bikey and /dev/null differ diff --git a/Server_Install_Pack/keys/epoch0310.bikey b/Server_Install_Pack/keys/epoch0310.bikey deleted file mode 100644 index 18161ce7..00000000 Binary files a/Server_Install_Pack/keys/epoch0310.bikey and /dev/null differ diff --git a/Server_Install_Pack/keys/epoch0320.bikey b/Server_Install_Pack/keys/epoch0320.bikey new file mode 100644 index 00000000..8540dfde Binary files /dev/null and b/Server_Install_Pack/keys/epoch0320.bikey differ diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index ad2ce1ca..b81ace76 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Altis.pbo and b/Server_Install_Pack/mpmissions/epoch.Altis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 89d689d2..7187df26 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Australia.pbo and b/Server_Install_Pack/mpmissions/epoch.Australia.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index ec64ce94..6758343e 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo and b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 6f9ea10e..b8fb1fad 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index c0a5e498..9400f178 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index 5771b64d..fd09fa78 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo and b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 5a9d3afa..8a2466d3 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo and b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 592d60b5..883cdee8 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo and b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo differ diff --git a/Server_Install_Pack/sc/battleye/createvehicle.txt b/Server_Install_Pack/sc/battleye/createvehicle.txt index 5daa413a..7c85f993 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)_SIM_EPOCH" !="Wood(Floor|LargeWall|Stairs|Ramp|Foundation)_EPOCH" !="(Tipi|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation))_Ghost_EPOCH" !="(Tipi|StorageShelf|LockBox|FirePlace|FirePlaceOn|PlotPole|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)_EPOCH" !="(Sheep|Goat|Snake|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="(LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp)_SIM_EPOCH" !="(WoodFoundation|Foundation)_EPOCH" +5 "_EPOCH" !="(SapperHead|Jack)_SIM_EPOCH" !="Wood(Floor|LargeWall|Stairs|Ramp|Foundation)_EPOCH" !="(Tipi|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation))_Ghost_EPOCH" !="(Tipi|StorageShelf|LockBox|FirePlace|FirePlaceOn|PlotPole|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" !="(LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp)_SIM_EPOCH" !="(WoodFoundation|Foundation)_EPOCH" 5 SeaGull diff --git a/Server_Install_Pack/sc/battleye/deleteVehicle.txt b/Server_Install_Pack/sc/battleye/deleteVehicle.txt index 26eb94c4..239acfaa 100644 --- a/Server_Install_Pack/sc/battleye/deleteVehicle.txt +++ b/Server_Install_Pack/sc/battleye/deleteVehicle.txt @@ -1 +1 @@ -1 "" !="Land_MPS_EPOCH" !="SapperHead_SIM_EPOCH" !="Epoch_Sapper_F" !="Epoch_Cloak_F" !="LockBox_EPOCH" !="Rabbit_EPOCH" !="(Sheep|Goat|Snake|Hen|Cock)_random_EPOCH" !="LockBox_(Ghost|SIM)_EPOCH" !="CinderWallHalf_(Ghost|SIM)_EPOCH" !="CinderWall_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorway|Stairs|Stairs2|Ramp)_(Ghost|SIM)_EPOCH" !="Foundation_Ghost_EPOCH" !="Foundation_EPOCH" \ No newline at end of file +1 "" !="Land_MPS_EPOCH" !="SapperHead_SIM_EPOCH" !="Epoch_Sapper_F" !="Epoch_Cloak_F" !="LockBox_EPOCH" !="Rabbit_EPOCH" !="(Sheep|Goat|Snake|Snake2|Hen|Cock)_random_EPOCH" !="LockBox_(Ghost|SIM)_EPOCH" !="CinderWallHalf_(Ghost|SIM)_EPOCH" !="CinderWall_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorway|Stairs|Stairs2|Ramp)_(Ghost|SIM)_EPOCH" !="Foundation_Ghost_EPOCH" !="Foundation_EPOCH" \ No newline at end of file diff --git a/Server_Install_Pack/sc/battleye/scripts.txt b/Server_Install_Pack/sc/battleye/scripts.txt index 940dc088..bb7e8b60 100644 --- a/Server_Install_Pack/sc/battleye/scripts.txt +++ b/Server_Install_Pack/sc/battleye/scripts.txt @@ -1,3 +1,4 @@ +//new2 7 "BIS_fnc_dynamictext" !="\"BIS_fnc_dynamictext"\" !", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;" !", 0, 0.4, 5, 2, 0, 2] spawn bis_fnc_dynamictext;" !", 0, 1, 6, 2, 0, 1] spawn bis_fnc_dynamictext;" !"snil '_fnc_scriptName') then {_fnc_scriptName}" 7 forceRespawn 7 setFriend @@ -46,18 +47,18 @@ 7 ctrlSetEventHandler !"BIS_fnc_guiMessage_status" !"ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," 7 addMPEventHandler 7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !"FiredNear" !"EpeContactStart" !"InventoryClosed" !"GetOut" !"InventoryOpened" !"local" !"Respawn" !"Put" !"Take" !"Fired" !"Killed" !" [\"PostReset\",{BIS_EnginePPReset = true;} ];" !"_logic addeventhandler [\n\"local\"" -7 displayAddEventHandler !"[_display] call _fnc_animate;" !"tVersion select 4) == \"Development\") then" !"_display displayaddeventhandler\n[\n\"mousemoving\"," !"(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !"(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"_this call EPOCH_KeyDown\"];" !="_addCase = _display46 displayAddEventHandler ['KeyDown',{_this call EPOCH_KeyDown;}];" !"_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" +7 displayAddEventHandler !"[_display] call _fnc_animate;" !"tVersion select 4) == \"Development\") then" !"_display displayaddeventhandler\n[\n\"mousemoving\"," !"(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !"(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"_this call EPOCH_KeyDown\"];" !="_addCase = _display46 displayAddEventHandler ['KeyDown',{_this call EPOCH_KeyDown;}];" !"_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'" 7 ctrlAddEventHandler !"rCfg >> \"refreshDelay\");" !" [\n\"draw\"," !" [\"buttonclick\"," !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," 7 removeAllEventHandlers !="ctrlRemoveAllEventHandlers" !="_vehicle removeAllEventHandlers \"GetOut\";" !="_sapper removeAllEventHandlers \"Hit\";\n_sapper removeAllEventHandlers \"FiredNear\";" !="_display46 displayRemoveAllEventHandlers 'KeyDown';" 7 removeAllMissionEventHandlers 7 ctrlRemoveAllEventHandlers !="(uiNamespace getVariable 'ESP_map') ctrlRemoveAllEventHandlers 'Draw';" !="ctrlAddEventHandler ['MouseButtonDown'" 7 removeEventHandler !="displayRemoveEventHandler" !="player removeEventHandler ['Fired', 0];" !"_currentTarget removeEventHandler[\"EpeContactStart\", _onContactEH]" !" [_adminVar,objnull];\npublicvariable _adminVar;\nplayer removeeventhandler [\"respawn\",_respawn];" !="_plyr removeEventHandler [\"FiredNear\", _smokeEH];" !="player removeEventHandler [_ehKey, 0];" 7 displayRemoveEventHandler !"BIS_fnc_guiMessage_status" -7 switchCamera !="{if (cameraOn != vehicle player) then { vehicle player switchCamera 'External' } };" +7 switchCamera !="vehicle player switchCamera" 7 remoteControl !"fn_moduleRemoteControl.sqf" !="\"BIS_fnc_moduleRemoteControl"\" 7 drawIcon3D !="drawIcon3D[\"\x\addons\a3_epoch_code\Data\Member.paa\",_color,_pos,1,1,0,_text,1,0.025,\"PuristaMedium\"];\n}forEach EPOCH_ESP_TARGETS;" !"drawIcon3D[format[\"\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa\",_stability],_color,(getPosATL EPOCH_stabilityTarget),5,5,0,\"\",1,0.05,\"PuristaMedium\"];" !"drawIcon3D[format[\"\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa\",_num],_color,_pos,4,4,0,\"\",1,0.05,\"PuristaMedium\"];" !"EPOCH_drawIcon3dStability" !"EPOCH_drawIcon3d" !"if (_condition) then {\ndrawIcon3D [_icon, _color, _position, _sizeX, _sizeY, _angle, _text," !="drawIcon3D [\"\A3\UI_F_MP_Mark\Data\Tasks\Misc\background.paa\"" 7 drawLine3D !"{\nfor [{_i = 1}, {_i < count _x}, {_i = _i + 1}] do {\ndrawLine3D [_x select (_i - 1), _x select _i, ((BIS_tracedShooter getVari" -7 ctrlCreate !="_ListGroup = _display ctrlCreate [\"RscControlsGroupNoHScrollbars\", 21903 ];" +7 ctrlCreate !="_ListGroup = _display ctrlCreate [\"RscControlsGroupNoHScrollbars\"" 7 ctrlDelete !="ctrlDelete _ListGroup;" 7 ctrlClassName 7 ctrlModel diff --git a/Server_Install_Pack/sc/battleye/setpos.txt b/Server_Install_Pack/sc/battleye/setpos.txt index 963569e3..cf6ec54c 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|LockBox|FirePlace|FirePlaceOn|PlotPole)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Rabbit)_EPOCH" !="(Sheep|Goat|Snake|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="LockBox_SIM_EPOCH" !="(CinderWallHalf|CinderWall|Fireplace)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorway|Stairs|Stairs2|Ramp)_SIM_EPOCH" !="(Foundation|WoodFoundation)_Ghost_EPOCH" !="Foundation_EPOCH" !="WoodFoundation_EPOCH" \ No newline at end of file +5 "" !="Epoch_(Male|Female)_F" !="SapperHead_SIM_EPOCH" !="(Tipi|StorageShelf|LockBox|FirePlace|FirePlaceOn|PlotPole)_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" !="LockBox_SIM_EPOCH" !="(CinderWallHalf|CinderWall|Fireplace)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorway|Stairs|Stairs2|Ramp)_SIM_EPOCH" !="(Foundation|WoodFoundation)_Ghost_EPOCH" !="Foundation_EPOCH" !="WoodFoundation_EPOCH" \ No newline at end of file diff --git a/Sources/epoch_server_settings/config.cpp b/Sources/epoch_server_settings/config.cpp index 1e00b424..51ad0a1b 100644 --- a/Sources/epoch_server_settings/config.cpp +++ b/Sources/epoch_server_settings/config.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright (C) 2015 - ARMA 3 EPOCH MOD [EpochMod.com] (v0.3.0.4) +Copyright (C) 2015 - ARMA 3 EPOCH MOD [EpochMod.com] (v0.3.2.0) *****************************************************************************/ #define _ARMA_ @@ -9,7 +9,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.1; - epochVersion = "0.3.1.0"; + epochVersion = "0.3.2.0"; requiredAddons[] = {}; }; }; diff --git a/Sources/epoch_server_settings/configs/loots.h b/Sources/epoch_server_settings/configs/loots.h index a85fb7ff..9b0b8944 100644 --- a/Sources/epoch_server_settings/configs/loots.h +++ b/Sources/epoch_server_settings/configs/loots.h @@ -274,6 +274,12 @@ class CfgMainTable LootMax = 6; tables[] = { "Food" }; }; + class Cabinet_EPOCH : Default + { + lootMin = 2; + LootMax = 4; + tables[] = { "Medical" }; + }; class Freezer_EPOCH : Default { lootMin = 3; @@ -499,6 +505,31 @@ class CfgMainTable { "SniperRifle", 2 } }; }; + class AirDrop_Payout1 + { + lootMin = 7; + LootMax = 10; + tables[] = { + { "Equipment", 6 }, + { "Pistols", 8 }, + { "PistolAmmo", 10 }, + { "Scopes", 4 }, + { "Muzzles", 4 }, + { "Uniforms", 12 }, + { "Vests", 5 }, + { "Headgear", 4 }, + { "Food", 11 }, + { "RifleAmmo", 5 }, + { "MachinegunAmmo", 3 }, + { "SniperRifleAmmo", 2 }, + { "Hand", 2 }, + { "Tools", 8 }, + { "Generic", 3 }, + { "GenericLarge", 5 }, + { "BaseBuilding", 6 }, + { "Grenades", 2 } + }; + }; class Mission_Payout1 { lootMin = 4; @@ -565,6 +596,12 @@ class CfgMainTable LootMax = 1; tables[] = { "Snake_random_EPOCH" }; }; + class Snake2_random_EPOCH + { + lootMin = 1; + LootMax = 1; + tables[] = { "Snake_random_EPOCH" }; + }; class SeaFood { lootMin = 1; @@ -601,7 +638,16 @@ class CfgLootTable items[] = { { { "ItemCompass", "item" }, 20 }, { { "ItemGPS", "item" }, 10 }, - { { "EpochRadio0", "item" }, 20 }, + { { "EpochRadio0", "item" }, 3 }, + { { "EpochRadio1", "item" }, 3 }, + { { "EpochRadio2", "item" }, 3 }, + { { "EpochRadio3", "item" }, 2 }, + { { "EpochRadio4", "item" }, 2 }, + { { "EpochRadio5", "item" }, 2 }, + { { "EpochRadio6", "item" }, 2 }, + { { "EpochRadio7", "item" }, 1 }, + { { "EpochRadio8", "item" }, 1 }, + { { "EpochRadio9", "item" }, 1 }, { { "ItemWatch", "item" }, 30 }, { { "FAK", "item" }, 20 } }; @@ -677,7 +723,7 @@ class CfgLootTable { { "20Rnd_762x51_Mag", "magazine" }, 1 }, { { "SniperRifleAmmo_5Rnd_127x108_Mag", "CfgLootTable" }, 1 }, { { "7Rnd_408_Mag", "magazine" }, 1 }, - { { "10Rnd_762x51_Mag", "magazine" }, 1 }, + { { "10Rnd_762x54_Mag", "magazine" }, 1 }, { { "10Rnd_338_Mag", "magazine" }, 1 }, { { "10Rnd_93x64_DMR_05_Mag", "magazine" }, 1 }, { { "10Rnd_127x54_Mag", "magazine" }, 1 } @@ -739,11 +785,13 @@ class CfgLootTable { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 13 }, - { { "sardines_epoch", "magazine" }, 12 }, - { { "meatballs_epoch", "magazine" }, 15 }, - { { "scam_epoch", "magazine" }, 16 }, - { { "sweetcorn_epoch", "magazine" }, 16 }, - { { "FoodSnooter", "magazine" }, 10 } + { { "sardines_epoch", "magazine" }, 11 }, + { { "meatballs_epoch", "magazine" }, 14 }, + { { "scam_epoch", "magazine" }, 15 }, + { { "sweetcorn_epoch", "magazine" }, 15 }, + { { "FoodSnooter", "magazine" }, 9 }, + { { "TacticalBacon", "magazine" }, 5 } + }; }; @@ -1280,6 +1328,15 @@ class CfgLootTable { { "CanFood", "CfgLootTable" }, 49 } }; }; + class Medical + { + items[] = { + { { "FAK", "item" }, 97 }, + { { "Heal_EPOCH", "item" }, 2 }, + { { "Defib_EPOCH", "item" }, 1 }, + { { "EnergyPack", "magazine" }, 1 } + }; + }; class BaseBuilding { items[] = { @@ -1295,7 +1352,7 @@ class CfgLootTable { { "KitWoodFoundation", "magazine" }, 14 } }; }; - + class Mission_Payout1 { items[] = { diff --git a/Sources/epoch_server_settings/configs/maps/esseker.h b/Sources/epoch_server_settings/configs/maps/esseker.h index 02d49359..da9f6ea6 100644 --- a/Sources/epoch_server_settings/configs/maps/esseker.h +++ b/Sources/epoch_server_settings/configs/maps/esseker.h @@ -2,7 +2,7 @@ class Esseker : Default { worldSize = 12000; traderBlds[] = { "Land_i_House_Big_02_V3_dam_F", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_sara_domek_zluty", "Land_Tovarna2", "Land_Shed_Ind02", "Land_i_House_Big_01_V3_dam_F", "Land_HouseV2_02_Interier", "Land_i_House_Small_01_V3_dam_F", "Land_HouseV_1I4", "Land_dum_rasovna", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_u_House_Small_02_V1_F", "Land_i_Stone_HouseSmall_V1_F", "Land_i_Stone_Shed_V1_F"}; - + containerPos[] = {}; telePos[] = { @@ -28,7 +28,7 @@ class Esseker : Default {"Land_PhoneBooth_02_F", {11867.5, 7928.89, 0}, 0}, {"Land_PhoneBooth_02_F", {1954.29, 7823.96, 0}, 19.5454}, {"Land_PhoneBooth_02_F", {7229.75, 9369.1, 0}, 2.72723}, - // Turbines + // Turbines {"Land_wpp_Turbine_V2_F", {660.226, 10060.1, 0}, 0}, {"Land_wpp_Turbine_V2_F", {638.57, 10022.9, 0}, 0}, {"Land_wpp_Turbine_V2_F", {619.792, 9992.28, 0}, 0}, @@ -122,11 +122,11 @@ class Esseker : Default // Protection Domes { "ProtectionZone_Invisible_F", { 5073.31, 8903.09, 0 }, 0, true }, { "ProtectionZone_Invisible_F", { 4407.77, 6054.78, 0 }, 0, true }, - { "ProtectionZone_Invisible_F", { 8692.93, 3854.72 }, 0, true } + { "ProtectionZone_Invisible_F", { 8692.93, 3854.72, 0 }, 0, true } }; staticNpcPos[] = { - //South + //South { "C_man_hunter_1_F", {8700.09, 3859.75, -0.0334778}, 241}, //West { "C_man_w_worker_F", {4411.08, 6058.25, 0}, 24.5455}, @@ -134,5 +134,3 @@ class Esseker : Default { "C_man_shorts_4_F_asia", {5068.45, 8893.52, 0}, 30} }; }; - - diff --git a/Sources/epoch_server_settings/configs/security/data/custom_vars.h b/Sources/epoch_server_settings/configs/security/data/custom_vars.h index 3ee97e75..27b7b1fd 100644 --- a/Sources/epoch_server_settings/configs/security/data/custom_vars.h +++ b/Sources/epoch_server_settings/configs/security/data/custom_vars.h @@ -112,9 +112,9 @@ epoch[] = { "epoch_fnc_selecttarget","epoch_fnc_selecttargetbuild","epoch_isbuildallowed","epoch_simulswap","epoch_staticmove","epoch_returnvector","epoch_upgradebuild","epoch_removebuild","epoch_startinteract","epoch_startinteractnpc","epoch_interactnpc","epoch_npctraderadd", "epoch_npctraderadd2","epoch_npctraderadd3","epoch_startnpctradermenu","epoch_npctradermenufilter","epoch_startnpctrade","epoch_makep2ptrade","epoch_tradefilter","epoch_takecrypto","epoch_startbanktransfer","epoch_keydown","epoch_onchar", "epoch_fnc_playerdeath","epoch_fnc_playerfired","epoch_fnc_isinsidebuilding","epoch_fnc_weather","epoch_fnc_findsafepos","epoch_pushcustomvar","epoch_itempicture","epoch_itemdisplayname","epoch_fnc_findrandomposbehind","epoch_fnc_stringleft", - "epoch_sortarraybydistance","epoch_client_earthquake","epoch_client_loadanimalbrain","epoch_biteplayer","epoch_client_repairvehicle","epoch_client_lockvehicle","epoch_client_fillvehicle","epoch_client_gearvehicle","epoch_mission_accept","epoch_mission_hover_uav", + "epoch_sortarraybydistance","epoch_client_earthquake","epoch_client_loadanimalbrain","epoch_client_biteplayer","epoch_client_repairvehicle","epoch_client_lockvehicle","epoch_client_fillvehicle","epoch_client_gearvehicle","epoch_mission_accept","epoch_mission_hover_uav", "epoch_mission_cage_sapper","epoch_loottrash","epoch_debugmonitor","epoch_interact","epoch_chopwood","epoch_minerocks","epoch_unisexcheck","epoch_puthandler","epoch_nitelight","epoch_lootit","epoch_supportcopter","epoch_iteminteract","epoch_consumeitem", - "epoch_craftitempreview","epoch_craftitem","epoch_unitspawn","epoch_handlegetout","epoch_enterbuilding","epoch_onpause","epoch_interactvehicle","epoch_showstats","epoch_group_btnmod","epoch_group_btninvite","epoch_group_onload","epoch_group_list","epoch_group_combo", - "epoch_group_btnleave","epoch_group_btnkick","epoch_cgroup_grouptext","epoch_cgroup_onload","epoch_cgroup_btncreate","epoch_igroup_acceptinvite","epoch_igroup_onload","epoch_igroup_refresh","epoch_updategroupui","epoch_inventory_group","epoch_inventory_igroup", + "epoch_craftitempreview","epoch_craftitem","epoch_unitspawn","epoch_antiwall","epoch_enterbuilding","epoch_onpause","epoch_interactvehicle","epoch_showstats","epoch_group_btnmod","epoch_group_btninvite","epoch_group_onload","epoch_group_list","epoch_group_combo", + "epoch_group_btnleave","epoch_group_btnkick","epoch_cgroup_grouptext","epoch_cgroup_onload","epoch_cgroup_btncreate","epoch_igroup_acceptinvite","epoch_igroup_onload","epoch_igroup_refresh","epoch_group_update","epoch_inventory_group","epoch_inventory_igroup", "epoch_mission_refresh","epoch_mission_description" }; \ No newline at end of file diff --git a/Sources/epoch_server_settings/configs/security/security_checks.h b/Sources/epoch_server_settings/configs/security/security_checks.h index 1c641787..479944ab 100644 --- a/Sources/epoch_server_settings/configs/security/security_checks.h +++ b/Sources/epoch_server_settings/configs/security/security_checks.h @@ -64,7 +64,7 @@ class CfgSecConf checks[] = {"Fired","InventoryClosed","InventoryOpened","Killed","HandleDamage","HandleHeal","Dammaged","Hit","HitPart"}; Fired = "_this call EPOCH_fnc_playerFired;"; InventoryClosed = "if !(EPOCH_arr_interactedObjs isEqualTo[]) then { EPOCH_S_S_VEHICLES = EPOCH_arr_interactedObjs; publicVariableServer 'EPOCH_S_S_VEHICLES'; EPOCH_arr_interactedObjs = [];};"; - InventoryOpened = "(locked (_this select 1) in [2, 3])"; + InventoryOpened = "_this spawn EPOCH_initUI; (locked (_this select 1) in [2, 3])"; Killed = "_this call EPOCH_fnc_playerDeath;"; HandleDamage = ""; HandleHeal = ""; diff --git a/Sources/mpmissions/epoch.Altis/description.ext b/Sources/mpmissions/epoch.Altis/description.ext index d6f0bd77..1c83d05b 100644 --- a/Sources/mpmissions/epoch.Altis/description.ext +++ b/Sources/mpmissions/epoch.Altis/description.ext @@ -11,7 +11,7 @@ respawnDialog = 0; onLoadMission= "Epoch"; OnLoadIntro = "Welcome to Epoch Mod"; -loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; +loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; OnLoadIntroTime = False; OnLoadMissionTime = False; onLoadName = "Epoch Mod"; @@ -40,184 +40,22 @@ class CfgRemoteExecCommands {}; class CfgEpochClient { - epochVersion = "0.3.1.0"; - + epochVersion = "0.3.2.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired - + buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area - buildingRequireJammer = 0; // 1 = to allow building without a jammer - buildingCountLimit = 200; // how many objects can be built within range of a jammer - buildingJammerRange = 75; // jammer range in meters - + buildingRequireJammer = 0; // 1 = to allow building without a jammer + buildingCountLimit = 200; // how many objects can be built within range of a jammer + buildingJammerRange = 75; // jammer range in meters + EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; - - class Altis { - blockedArea[] = { //[POS],radius - { { 16085, 16997, 0 }, 250 }, //South Telos - { { 12844, 16714, 0 }, 120 }, //Soldner Base - { { 3085, 13184, 0 }, 300 }, //Kavalar Carstel - { { 13493, 12013, 0 }, 450 }, //Makrynisi (Island) - { { 17439, 13165, 0 }, 165 }, //Pyrgorsk Military - { { 20084, 6728, 0 }, 55 }, //West of Selakano - { { 25303, 21807, 0 }, 100 } //Sofia - }; - Rocks[] = { - "sharpstone_03_lc.p3d", - "sharpstone_02_lc.p3d", - "sharpstone_01_lc.p3d", - "sharpstone_02.p3d", - "sharpstone_03.p3d", - "sharprock_monolith.p3d", - "sharprock_apart.p3d", - "sharpstones_erosion.p3d", - "bluntstone_01_lc.p3d", - "bluntstone_02_lc.p3d", - "bluntstone_03_lc.p3d", - "bluntstones_erosion.p3d", - "bluntstone_01.p3d", - "bluntstone_03.p3d", - "sharprock_spike.p3d", - "sharprock_wallh.p3d", - "w_sharpstone_03.p3d", - "w_sharpstone_02.p3d", - "w_sharpstone_01.p3d", - "bluntrock_apart.p3d", - "bluntstone_02.p3d", - "bluntrock_monolith.p3d", - "bluntrock_wallh.p3d", - "sharprock_wallv.p3d", - "stonesharp_medium.p3d", - "stone_medium_f.p3d", - "stonesharp_big.p3d", - "stonesharp_small.p3d", - "small_stone_02_f.p3d", - "stone_small_f.p3d", - "stone_big_f.p3d", - "bluntrock_spike.p3d" - }; - ATM[] = { - "atm_01_f.p3d", - "phonebooth_01_f.p3d", - "atm_02_f.p3d", - "phonebooth_02_f.p3d" - }; - Water[] = { - "barrelwater_f.p3d", - "water_source_f.p3d", - "waterbarrel_f.p3d", - "canisterplastic_f.p3d", - "watertank_f.p3d" - }; - Trash[] = { - "sack_f.p3d", - "garbagebags_f.p3d", - "pallets_f.p3d", - "junkpile_f.p3d", - "garbagepallet_f.p3d", - "garbagewashingmachine_f.p3d", - "basket_f.p3d", - "sacks_goods_f.p3d", - "crateswooden_f.p3d", - "cratesplastic_f.p3d", - "garbagebin_01_f.p3d", - "barrelsand_f.p3d", - "garbagecontainer_closed_f.p3d", - "cratesshabby_f.p3d", - "bucket_f.p3d", - "garbagebarrel_01_f.p3d", - "tyres_f.p3d", - "cargobox_v1_f.p3d", - "metalbarrel_f.p3d", - "sacks_heap_f.p3d", - "woodenbox_f.p3d", - "grave_v1_f.p3d", - "grave_v2_f.p3d", - "calvary_02_v2_f.p3d", - "fishinggear_02_f.p3d", - "fishinggear_01_f.p3d", - "humanskull_f.p3d", - "calvary_02_v1_f.p3d", - "rack_f.p3d", - "wreck_uaz_f.p3d", - "humanskeleton_f.p3d", - "shelvesmetal_f.p3d", - "kiosk_blueking_ruins_f.p3d", - "cargo20_white_f.p3d", - "cargo20_yellow_f.p3d", - "cargo20_military_green_f.p3d", - "cargo40_blue_f.p3d", - "cargo40_grey_f.p3d", - "cargo40_light_green_f.p3d", - "cargo40_light_blue_f.p3d", - "cargo40_orange_f.p3d", - "cargo20_orange_f.p3d", - "cargo20_brick_red_f.p3d" - }; - Trees[] = { - "t_ficusb1s_f.p3d", - "t_oleae1s_f.p3d", - "t_ficusb2s_f.p3d", - "t_broussonetiap1s_f.p3d", - "t_pinuss2s_f.p3d", - "t_pinuss2s_b_f.p3d", - "t_pinuss1s_f.p3d", - "t_oleae2s_f.p3d", - "i_house_big_01_v2_f.p3d", - "i_house_big_02_v1_f.p3d", - "i_addon_02_v1_f.p3d", - "t_fraxinusav2s_f.p3d", - "t_pinusp3s_f.p3d", - "t_poplar2f_dead_f.p3d", - "t_populusn3s_f.p3d", - "t_phoenixc1s_f.p3d" - }; - Bushes[] = { - "b_ficusc2d_f.p3d", - "b_ficusc1s_f.p3d", - "b_neriumo2d_f.p3d", - "b_arundod2s_f.p3d", - "b_arundod3s_f.p3d", - "b_ficusc2s_f.p3d" - }; - Wrecks[] = { - "wall_tin_4_2.p3d", - "mil_wiredfence_f.p3d", - "cages_f.p3d", - "wreck_car_f.p3d", - "pipes_small_f.p3d", - "pipe_fence_4m_f.p3d", - "spp_tower_f.p3d", - "wreck_ural_f.p3d", - "wreck_car3_f.p3d", - "ironpipes_f.p3d", - "pipes_large_f.p3d", - "coil_f.p3d", - "cinderblocks_f.p3d", - "wreck_offroad_f.p3d", - "wreck_offroad2_f.p3d", - "crabcages_f.p3d", - "metalbarrel_empty_f.p3d", - "net_fenced_8m_f.p3d", - "net_fence_8m_f.p3d", - "wavepowerplantbroken_f.p3d", - "wreck_truck_dropside_f.p3d", - "wavepowerplant_f.p3d", - "wreck_traw_f.p3d", - "wreck_slammer_f.p3d", - "maroula_f.p3d", - "indfnc_9_f.p3d", - "indfnc_3_f.p3d", - "indfnc_3_d_f.p3d", - "wreck_car2_f.p3d", - "net_fence_4m_f.p3d", - "wreck_truck_f.p3d", - "wreck_hunter_f.p3d", - "wreck_slammer_hull_f.p3d" - }; - }; + + #include "\x\addons\a3_epoch_config\Configs\CfgEpochClient\Altis.hpp" + }; class CfgEpochSapper @@ -250,4 +88,4 @@ class CfgEpochCloak targetChangeFrequency = 42; //Cloak will only attempt to change target once per this period. Make Higher to stick to first target player. (Min: 42) teleportChance = 66; //Chance for cloak to teleport. (Min: 1) hoverFrequency = 1280; //Cloak has new hover attack. When player is above cloak, and at a distance, cloak will float to player and teleport attack. Only perform one of these moves per this period. (Min: 240) -}; \ No newline at end of file +}; diff --git a/Sources/mpmissions/epoch.Australia/description.ext b/Sources/mpmissions/epoch.Australia/description.ext index 2cc9756f..64e493ad 100644 --- a/Sources/mpmissions/epoch.Australia/description.ext +++ b/Sources/mpmissions/epoch.Australia/description.ext @@ -11,7 +11,7 @@ respawnDialog = 0; onLoadMission= "Epoch"; OnLoadIntro = "Welcome to Epoch Mod"; -loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; +loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; OnLoadIntroTime = False; OnLoadMissionTime = False; onLoadName = "Epoch Mod"; @@ -40,228 +40,22 @@ class CfgRemoteExecCommands {}; class CfgEpochClient { - epochVersion = "0.3.1.0"; - + epochVersion = "0.3.2.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area - buildingRequireJammer = 0; // 1 = to allow building without a jammer - buildingCountLimit = 200; // how many objects can be built within range of a jammer - buildingJammerRange = 75; // jammer range in meters - + buildingRequireJammer = 0; // 1 = to allow building without a jammer + buildingCountLimit = 200; // how many objects can be built within range of a jammer + buildingJammerRange = 75; // jammer range in meters + EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; - - class australia { - blockedArea[] = { - { { 16286.1, 33578.6, 0 }, 650 }, //Darwin - { { 28467, 35190.1, 0 }, 150 }, //Weipa - { { 32103.5, 29816.8, 0 }, 300 }, //Cairns - { { 26754.5, 28028.5, 0 }, 120 }, //Mount Isa - { { 22069.6, 25578.4, 0 }, 380 }, //Alice Springs - { { 19741.6, 24224.8, 0 }, 420 }, //Pine Gap - { { 5201.47, 18284, 0 }, 1100 }, //Perth - { { 31122.2, 19938.1, 0 }, 280 }, //Toowoomba - { { 38111.5, 19942.4, 0 }, 600 }, //North Brisbane - { { 38621.4, 19226.6, 0 }, 410 }, //South Brisbane - { { 27702.9, 16997.3, 0 }, 170 }, //Broken Hill - { { 20723.4, 12752.9, 0 }, 160 }, //Port Lincoln - { { 25072.6, 12705.2, 0 }, 350 }, //Adelaide - { { 36505.9, 12877.1, 0 }, 540 }, //North Sydney - { { 36469.4, 12133.5, 0 }, 420 }, //South Sydney - { { 31070, 10856, 0 }, 750 }, //North Melbourne - { { 31205.9, 9721.02, 0 }, 510 }, //South Melbourne - { { 35364.5, 8453.59, 0 }, 200 } //Eden - }; - Rocks[] = { - "r_rock_02_ep1.p3d", - "brownrock2.p3d", - "brownrock3.p3d", - "sharpstone_03_lc.p3d", - "desertrock.p3d", - "desertrock2.p3d", - "desertrock3.p3d", - "r_stone_01_ep1.p3d", - "brownrock.p3d", - "rockn_02.p3d", - "sharprock_wallh.p3d", - "sharpstone_02.p3d", - "sharprock_spike.p3d", - "sharpstone_01.p3d", - "sharprock_apart.p3d", - "r_rock_03_ep1.p3d", - "rocks_02.p3d", - "sharprock_monolith.p3d", - "skala3_5.p3d", - "skala3_4.p3d", - "skala1_4.p3d" - }; - ATM[] = { - "phone_box_south.p3d" - }; - Water[] = { - }; - Trash[] = { - "Land_GarbagePallet_F", - "Land_GarbageBags_F", - "podesta_s10.p3d", - "kontejner_sklo.p3d", - "popelnice.p3d", - "paletyd.p3d", - "paletyc.p3d", - "garbage_misc.p3d", - "popelnice_2.p3d", - "garbage_plastic.p3d", - "garbage_metal.p3d", - "jeept_tanker.p3d", - "kontejner_plasty.p3d", - "odpadkovy_kos.p3d", - "socha.p3d", - "misc_greenhouse.p3d", - "kontejner_papir.p3d", - "cinderblocks_f.p3d", - "misc_boogieman.p3d", - "metalcrate.p3d", - "hrob2.p3d", - "barel5.p3d", - "kontejner.p3d", - "barel4.p3d", - "tires_ep1.p3d", - "barel2.p3d", - "barels.p3d", - "barel1.p3d", - "barels2.p3d", - "barels3.p3d" - }; - Trees[] = { - "t_pinuss3s_ep1.p3d", - "t_pinuse2s_ep1.p3d", - "t_oleae2s_f.p3d", - "t_populusf2s_ep1.p3d", - "str_topol.p3d", - "t_fraxinusav2s_f.p3d", - "les_singlestrom_b.p3d", - "t_fagus2f.p3d", - "t_quercus3s.p3d", - "t_salix2s.p3d", - "banana_3.p3d", - "jablon.p3d", - "str_pinie.p3d", - "t_sorbus2s.p3d", - "t_ficusb2s_ep1.p3d", - "palm_01.p3d", - "vysilac_budova.p3d", - "palm_10.p3d", - "palm_03.p3d", - "palm_04.p3d", - "t_pistacial2s_ep1.p3d", - "panelak.p3d", - "str kastan.p3d", - "a_hospital.p3d", - "i_barracks_v1_f.p3d", - "dum_istan3_hromada.p3d", - "dum_istan3_hromada2.p3d", - "dum_istan4_big_inverse.p3d", - "panelak2.p3d", - "podesta_1_mid.p3d", - "podesta_1_cornl.p3d", - "t_prunuss2s_ep1.p3d", - "dum_istan2_02.p3d", - "dum_istan4_inverse.p3d", - "podesta_1_stairs2.p3d", - "podesta_1_mid_cornl.p3d", - "hrusen2.p3d", - "zed_kamenna.p3d", - "t_pinuss2s_b_f.p3d", - "str dub.p3d", - "str dub jiny.p3d", - "t_pinuss1s_f.p3d", - "smrk_siroky.p3d", - "smrk_maly.p3d", - "les_singlestrom.p3d", - "t_pinuss2s_f.p3d", - "palm_02.p3d", - "brg_banana_3.p3d", - "banana_2.p3d", - "oliva.p3d", - "brg_umbrella_acacia02b.p3d", - "brg_umbrella_acacia01b.p3d", - "brg_umbrella_acacia04b.p3d", - "brg_umbrella_acacia03b.p3d", - "str buk.p3d", - "les_dub.p3d", - "t_ficusb2s_f.p3d", - "b_pinusm1s_ep1.p3d", - "krovi_long.p3d", - "str lipa.p3d", - "str javor.p3d", - "str trnka.p3d", - "t_pyrus2s.p3d", - "t_picea3f.p3d", - "t_pinusn1s.p3d", - "t_ficusb1s_f.p3d", - "t_poplar2f_dead_pmc.p3d", - "t_oleae1s_f.p3d", - "t_quercusir2s_f.p3d", - "dd_bush01.p3d", - "t_fagus2f_summer.p3d", - "akat02s.p3d", - "t_amygdalusc2s_ep1.p3d", - "str osika.p3d", - "palm_09.p3d", - "dd_borovice.p3d", - "dd_borovice02.p3d", - "t_poplar2f_dead_f.p3d", - "fuelstation_build_f.p3d", - "str_topol2.p3d", - "brg_umbrella_acacia_shrub02.p3d", - "t_betula2s.p3d", - "t_populusb2s_ep1.p3d", - "les_dub_jiny.p3d", - "les_buk.p3d", - "str_fikovnik.p3d", - "str_briza_rovna.p3d", - "str jerabina.p3d", - "str habr.p3d", - "les_fikovnik2.p3d" - }; - Bushes[] = { - "b_pmugo.p3d", - "b_ficusc2s_f.p3d", - "b_neriumo2d_f.p3d", - "krovi_bigest.p3d", - "b_ficusc1s_f.p3d", - "b_arundod3s_f.p3d", - "krovi4.p3d", - "krovi.p3d", - "ker s bobulema.p3d", - "ker pichlavej.p3d", - "pinus_mugo_lowpoly.p3d", - "b_amygdalusn1s_ep1.p3d", - "banana_4.p3d", - "banana_1.p3d", - "palm_08small.p3d", - "ker deravej.p3d", - "brg_umbrella_acacia_shrub2.p3d", - "b_salix2s.p3d", - "krovi2.p3d", - "b_ficusc2d_f.p3d", - "brg_banana_4.p3d" - }; - Wrecks[] = { - "plot_vlnplech1.p3d", - // - "datsun01t.p3d", - "datsun02t.p3d", - "skodovka_wrecked.p3d", - "lada_wrecked.p3d", - "hiluxt.p3d", - "uaz_wrecked.p3d", - "ural_wrecked.p3d" - }; - }; + + #include "\x\addons\a3_epoch_config\Configs\CfgEpochClient\australia.hpp" + }; class CfgEpochSapper @@ -294,4 +88,4 @@ class CfgEpochCloak targetChangeFrequency = 42; //Cloak will only attempt to change target once per this period. Make Higher to stick to first target player. (Min: 42) teleportChance = 66; //Chance for cloak to teleport. (Min: 1) hoverFrequency = 1280; //Cloak has new hover attack. When player is above cloak, and at a distance, cloak will float to player and teleport attack. Only perform one of these moves per this period. (Min: 240) -}; \ No newline at end of file +}; diff --git a/Sources/mpmissions/epoch.Bornholm/description.ext b/Sources/mpmissions/epoch.Bornholm/description.ext index 9c7096af..36830508 100644 --- a/Sources/mpmissions/epoch.Bornholm/description.ext +++ b/Sources/mpmissions/epoch.Bornholm/description.ext @@ -11,7 +11,7 @@ respawnDialog = 0; onLoadMission= "Epoch"; OnLoadIntro = "Welcome to Epoch Mod"; -loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; +loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; OnLoadIntroTime = False; OnLoadMissionTime = False; onLoadName = "Epoch Mod"; @@ -40,156 +40,22 @@ class CfgRemoteExecCommands {}; class CfgEpochClient { - epochVersion = "0.3.1.0"; - + epochVersion = "0.3.2.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area - buildingRequireJammer = 0; // 1 = to allow building without a jammer - buildingCountLimit = 200; // how many objects can be built within range of a jammer - buildingJammerRange = 75; // jammer range in meters - + buildingRequireJammer = 0; // 1 = to allow building without a jammer + buildingCountLimit = 200; // how many objects can be built within range of a jammer + buildingJammerRange = 75; // jammer range in meters + EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; - class Bornholm { - blockedArea[] = { - { { 1433, 8071, 0 }, 250 }, //Roenne NorthEast - { { 1939, 7788, 0 }, 250 }, //Roenne East - { { 1553, 7103, 0 }, 400 }, //Roenne South - { { 3052, 5412, 0 }, 400 }, //Main Airport - { { 3676, 5148, 0 }, 300 }, //Airport addons - { { 9547, 5541, 0 }, 600 }, //Aakirkeby - { { 17433, 5106, 0 }, 600 }, //Nexoe - { { 17989, 9844, 0 }, 600 }, //Svaneke - { { 11600, 14723, 0 }, 500 }, //Gudhjem - { { 5010, 19132, 0 }, 250 }, //Allinge - { { 5291, 12450, 0 }, 450 }, //Klemensker - { { 3386, 10088, 0 }, 350 }, //Nyker - { { 14560, 5130, 0 }, 300 }, //South Airport - { { 148786, 5024, 0 }, 300 }, //South Airport Base - { { 12993, 10197, 0 }, 250 }, //Oestermarie - { { 13867, 10672, 0 }, 300 }, //East Airport - { { 8564, 15015, 0 }, 350 }, //Roe - { { 6554, 5866, 0 }, 400 }, //Lobbaek - { { 5350, 5724, 0 }, 300 }, //Nylars - { { 12438, 2980, 0 }, 400 }, //Pedersker - { { 14121, 11331, 0 }, 200 }, //Central Spawn - { { 1322, 8733, 0 }, 200 }, //West Spawn - { { 15639, 191, 0 }, 200 } //East Spawn - }; - Rocks[] = { - "r2_boulder1.p3d", - "r2_boulder2.p3d", - "r2_rock1.p3d", - "r2_rocktower.p3d", - "r2_rockwall.p3d" - }; - ATM[] = { - "nastenka.p3d", - "nastenka2.p3d", - "nastenka3.p3d" - }; - Water[] = { - "misc_well.p3d", - "misc_wellpump.p3d", - "kasna_new.p3d" - }; - Trash[] = { - "p_pumpkin_summer.p3d", - "pumpkin.p3d", - "misc_postbox.p3d", - "popelnice.p3d", - "garbage_misc.p3d", - "paletyc.p3d", - "junkpile.p3d", - "kontejner.p3d", - "misc_chickencoop.p3d", - "misc_boogieman.p3d", - "misc_hutch.p3d", - "garbage_paleta.p3d", - "misc_cargo1a.p3d", - "misc_cargo2a.p3d", - "misc_greenhouse.p3d", - "zastavka_stojan.p3d", - "p_helianthus.p3d" - }; - Trees[] = { - "t_populus3s.p3d", - "t_fagus2w.p3d", - "t_betula2s.p3d", - "t_fagus2s.p3d", - "t_fagus2f.p3d", - "t_sorbus2s.p3d", - "t_fraxinus2w.p3d", - "t_salix2s.p3d", - "t_malus1s.p3d", - "t_betula1f.p3d", - "t_pinusn2s.p3d", - "t_picea2s.p3d", - "t_larix3s.p3d", - "t_picea3f.p3d", - "t_picea1s.p3d", - "misc_fallentree2.p3d", - "misc_stub2.p3d", - "t_fraxinus2s.p3d", - "t_quercus2f.p3d", - "misc_trunk_water.p3d", - "misc_trunk_torzo.p3d", - "t_alnus2s.p3d", - "misc_fallentree1.p3d", - "t_betula2f.p3d", - "t_pinusn1s.p3d", - "t_pinuss2f.p3d", - "t_quercus3s.p3d", - "t_carpinus2s.p3d", - "misc_fallenspruce.p3d", - "t_stub_picea.p3d", - "misc_stub1.p3d", - "t_acer2s.p3d", - "t_betula2w.p3d", - "t_pyrus2s.p3d" - }; - Bushes[] = { - "b_craet1.p3d", - "b_craet2.p3d", - "b_corylus.p3d", - "b_corylus2s.p3d", - "b_betulahumilis.p3d", - "b_sambucus.p3d", - "b_salix2s.p3d", - "b_canina2s.p3d", - "b_pmugo.p3d", - "b_prunus.p3d" - }; - Wrecks[] = { - "wall_fen1_5_pole.p3d", - "wall_fen1_5_2.p3d", - "wall_tin_4_2.p3d", - "wall_fen1_5.p3d", - "wall_indfnc_3.p3d", - "wall_indfnc_9.p3d", - "wall_indfnc_corner.p3d", - "misc_concrete_high.p3d", - "plot_vlnplech2.p3d", - "misc_g_pipes.p3d", - "wall_tincom_9.p3d", - "wall_tin_4.p3d", - "plot_vlnplech1.p3d", - "wall_tincom_9_2.p3d", - "wall_tincom_3.p3d", - "wall_tincom_pole.p3d", - "datsun01t.p3d", - "datsun02t.p3d", - "skodovka_wrecked.p3d", - "lada_wrecked.p3d", - "hiluxt.p3d", - "uaz_wrecked.p3d", - "ural_wrecked.p3d" - }; - }; + #include "\x\addons\a3_epoch_config\Configs\CfgEpochClient\Bornholm.hpp" + }; class CfgEpochSapper @@ -222,4 +88,4 @@ class CfgEpochCloak targetChangeFrequency = 42; //Cloak will only attempt to change target once per this period. Make Higher to stick to first target player. (Min: 42) teleportChance = 66; //Chance for cloak to teleport. (Min: 1) hoverFrequency = 1280; //Cloak has new hover attack. When player is above cloak, and at a distance, cloak will float to player and teleport attack. Only perform one of these moves per this period. (Min: 240) -}; \ No newline at end of file +}; diff --git a/Sources/mpmissions/epoch.Chernarus/description.ext b/Sources/mpmissions/epoch.Chernarus/description.ext index 58e8a54f..03133b1b 100644 --- a/Sources/mpmissions/epoch.Chernarus/description.ext +++ b/Sources/mpmissions/epoch.Chernarus/description.ext @@ -11,7 +11,7 @@ respawnDialog = 0; onLoadMission= "Epoch"; OnLoadIntro = "Welcome to Epoch Mod"; -loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; +loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; OnLoadIntroTime = False; OnLoadMissionTime = False; onLoadName = "Epoch Mod"; @@ -40,147 +40,22 @@ class CfgRemoteExecCommands {}; class CfgEpochClient { - epochVersion = "0.3.1.0"; - + epochVersion = "0.3.2.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired - + buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area - buildingRequireJammer = 0; // 1 = to allow building without a jammer - buildingCountLimit = 200; // how many objects can be built within range of a jammer - buildingJammerRange = 75; // jammer range in meters - + buildingRequireJammer = 0; // 1 = to allow building without a jammer + buildingCountLimit = 200; // how many objects can be built within range of a jammer + buildingJammerRange = 75; // jammer range in meters + EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; - class Chernarus { - blockedArea[] = { - { { 10203, 1886, 0 }, 430 }, //South Electro - { { 6822, 2498, 0 }, 600 }, //Cherno - { { 4612, 9670, 0 }, 140 }, //NWAF south barack - { { 4907, 10117, 0 }, 250 }, //NWAF NE hangas - { { 4707, 10384, 0 }, 200 }, //NWAF north barack - { { 4069, 10778, 0 }, 75 }, //NWAF west hangas - { { 4553, 10722, 0 }, 150 }, //NWAF NW hangas - { { 12279, 9505, 0 }, 350 }, //Berenzino Mid - { { 12816, 9816, 0 }, 400 }, //Berenzino SE - { { 12991, 10147, 0 }, 375 }, //Berenzino Docs - { { 2693, 5138, 0 }, 200 }, //Zeleno - { { 11467, 7508, 0 }, 150 }, //Polana Factory - { { 13092, 7096, 0 }, 140 } //Solnichniy Factory - }; - Rocks[] = { - "r2_boulder1.p3d", - "r2_boulder2.p3d", - "r2_rock1.p3d", - "r2_rocktower.p3d", - "r2_rockwall.p3d" - }; - ATM[] = { - "nastenka.p3d", - "nastenka2.p3d", - "nastenka3.p3d" - }; - Water[] = { - "misc_well.p3d", - "misc_wellpump.p3d", - "kasna_new.p3d" - }; - Trash[] = { - "p_pumpkin_summer.p3d", - "pumpkin.p3d", - "misc_postbox.p3d", - "popelnice.p3d", - "garbage_misc.p3d", - "paletyc.p3d", - "junkpile.p3d", - "kontejner.p3d", - "misc_chickencoop.p3d", - "misc_boogieman.p3d", - "misc_hutch.p3d", - "garbage_paleta.p3d", - "misc_cargo1a.p3d", - "misc_cargo2a.p3d", - "misc_greenhouse.p3d", - "zastavka_stojan.p3d", - "p_helianthus.p3d" - }; - Trees[] = { - "t_populus3s.p3d", - "t_fagus2w.p3d", - "t_betula2s.p3d", - "t_fagus2s.p3d", - "t_fagus2f.p3d", - "t_sorbus2s.p3d", - "t_fraxinus2w.p3d", - "t_salix2s.p3d", - "t_malus1s.p3d", - "t_betula1f.p3d", - "t_pinusn2s.p3d", - "t_picea2s.p3d", - "t_larix3s.p3d", - "t_picea3f.p3d", - "t_picea1s.p3d", - "misc_fallentree2.p3d", - "misc_stub2.p3d", - "t_fraxinus2s.p3d", - "t_quercus2f.p3d", - "misc_trunk_water.p3d", - "misc_trunk_torzo.p3d", - "t_alnus2s.p3d", - "misc_fallentree1.p3d", - "t_betula2f.p3d", - "t_pinusn1s.p3d", - "t_pinuss2f.p3d", - "t_quercus3s.p3d", - "t_carpinus2s.p3d", - "misc_fallenspruce.p3d", - "t_stub_picea.p3d", - "misc_stub1.p3d", - "t_acer2s.p3d", - "t_betula2w.p3d", - "t_pyrus2s.p3d" - }; - Bushes[] = { - "b_craet1.p3d", - "b_craet2.p3d", - "b_corylus.p3d", - "b_corylus2s.p3d", - "b_betulahumilis.p3d", - "b_sambucus.p3d", - "b_salix2s.p3d", - "b_canina2s.p3d", - "b_pmugo.p3d", - "b_prunus.p3d" - }; - Wrecks[] = { - "wall_fen1_5_pole.p3d", - "wall_fen1_5_2.p3d", - "wall_tin_4_2.p3d", - "wall_fen1_5.p3d", - "wall_indfnc_3.p3d", - "wall_indfnc_9.p3d", - "wall_indfnc_corner.p3d", - "misc_concrete_high.p3d", - "plot_vlnplech2.p3d", - "misc_g_pipes.p3d", - "wall_tincom_9.p3d", - "wall_tin_4.p3d", - "plot_vlnplech1.p3d", - "wall_tincom_9_2.p3d", - "wall_tincom_3.p3d", - "wall_tincom_pole.p3d", - "datsun01t.p3d", - "datsun02t.p3d", - "skodovka_wrecked.p3d", - "lada_wrecked.p3d", - "hiluxt.p3d", - "uaz_wrecked.p3d", - "ural_wrecked.p3d" - }; - }; - + #include "\x\addons\a3_epoch_config\Configs\CfgEpochClient\Chernarus.hpp" + }; class CfgEpochSapper @@ -213,4 +88,4 @@ class CfgEpochCloak targetChangeFrequency = 42; //Cloak will only attempt to change target once per this period. Make Higher to stick to first target player. (Min: 42) teleportChance = 66; //Chance for cloak to teleport. (Min: 1) hoverFrequency = 1280; //Cloak has new hover attack. When player is above cloak, and at a distance, cloak will float to player and teleport attack. Only perform one of these moves per this period. (Min: 240) -}; \ No newline at end of file +}; diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/description.ext b/Sources/mpmissions/epoch.Chernarus_Summer/description.ext index 9e4460f5..dfb709a3 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/description.ext +++ b/Sources/mpmissions/epoch.Chernarus_Summer/description.ext @@ -11,7 +11,7 @@ respawnDialog = 0; onLoadMission= "Epoch"; OnLoadIntro = "Welcome to Epoch Mod"; -loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; +loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; OnLoadIntroTime = False; OnLoadMissionTime = False; onLoadName = "Epoch Mod"; @@ -40,151 +40,22 @@ class CfgRemoteExecCommands {}; class CfgEpochClient { - epochVersion = "0.3.1.0"; - + epochVersion = "0.3.2.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area - buildingRequireJammer = 0; // 1 = to allow building without a jammer - buildingCountLimit = 200; // how many objects can be built within range of a jammer - buildingJammerRange = 75; // jammer range in meters - + buildingRequireJammer = 0; // 1 = to allow building without a jammer + buildingCountLimit = 200; // how many objects can be built within range of a jammer + buildingJammerRange = 75; // jammer range in meters + EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; - class Chernarus_Summer { - blockedArea[] = { - { { 10203, 1886, 0 }, 430 }, //South Electro - { { 6822, 2498, 0 }, 600 }, //Cherno - { { 4612, 9670, 0 }, 140 }, //NWAF south barack - { { 4907, 10117, 0 }, 250 }, //NWAF NE hangas - { { 4707, 10384, 0 }, 200 }, //NWAF north barack - { { 4069, 10778, 0 }, 75 }, //NWAF west hangas - { { 4553, 10722, 0 }, 150 }, //NWAF NW hangas - { { 12279, 9505, 0 }, 350 }, //Berenzino Mid - { { 12816, 9816, 0 }, 400 }, //Berenzino SE - { { 12991, 10147, 0 }, 375 }, //Berenzino Docs - { { 2693, 5138, 0 }, 200 }, //Zeleno - { { 11467, 7508, 0 }, 150 }, //Polana Factory - { { 13092, 7096, 0 }, 140 } //Solnichniy Factory - }; - Rocks[] = { - "r2_boulder1.p3d", - "r2_boulder2.p3d", - "r2_rock1.p3d", - "r2_rocktower.p3d", - "r2_rockwall.p3d" - }; - ATM[] = { - "nastenka.p3d", - "nastenka2.p3d", - "nastenka3.p3d" - }; - Water[] = { - "misc_well.p3d", - "misc_wellpump.p3d" - }; - Trash[] = { - "p_pumpkin_summer.p3d", - "pumpkin.p3d", - "misc_postbox.p3d", - "popelnice.p3d", - "garbage_misc.p3d", - "paletyc.p3d", - "junkpile.p3d", - "kontejner.p3d", - "misc_chickencoop.p3d", - "misc_boogieman.p3d", - "misc_hutch.p3d", - "garbage_paleta.p3d", - "misc_cargo1a.p3d", - "misc_cargo2a.p3d", - "misc_greenhouse.p3d", - "zastavka_stojan.p3d" - }; - Trees[] = { - "t_populus3s.p3d", - "t_fagus2w.p3d", - "t_betula2s.p3d", - "t_fagus2s.p3d", - "t_fagus2f.p3d", - "t_sorbus2s.p3d", - "t_fraxinus2w.p3d", - "t_salix2s.p3d", - "t_malus1s.p3d", - "t_betula1f.p3d", - "t_pinusn2s.p3d", - "t_picea2s.p3d", - "t_larix3s.p3d", - "t_picea3f.p3d", - "t_picea1s.p3d", - "misc_fallentree2.p3d", - "misc_stub2.p3d", - "t_fraxinus2s.p3d", - "t_quercus2f.p3d", - "misc_trunk_water.p3d", - "misc_trunk_torzo.p3d", - "t_alnus2s.p3d", - "misc_fallentree1.p3d", - "t_betula2f.p3d", - "t_pinusn1s.p3d", - "t_pinuss2f.p3d", - "t_quercus3s.p3d", - "t_carpinus2s.p3d", - "misc_fallenspruce.p3d", - "t_stub_picea.p3d", - "misc_stub1.p3d", - "t_acer2s.p3d", - "t_betula2w.p3d", - "t_fagus2s_summer.p3d", - "t_fagus2f_summer.p3d", - "t_betula2s_summer.p3d" - }; - Bushes[] = { - "b_craet1.p3d", - "b_craet2.p3d", - "b_corylus.p3d", - "b_corylus2s.p3d", - "b_betulahumilis.p3d", - "b_sambucus.p3d", - "b_salix2s.p3d", - "b_canina2s.p3d", - "b_pmugo.p3d", - "b_prunus.p3d", - "b_corylus2s_summer.p3d", - "b_craet1_summer.p3d", - "b_betula2w_summer.p3d", - "b_canina2s_summer.p3d" - }; - Wrecks[] = { - "wall_fen1_5_pole.p3d", - "wall_fen1_5_2.p3d", - "wall_tin_4_2.p3d", - "wall_fen1_5.p3d", - "wall_indfnc_3.p3d", - "wall_indfnc_9.p3d", - "wall_indfnc_corner.p3d", - "misc_concrete_high.p3d", - "plot_vlnplech2.p3d", - "misc_g_pipes.p3d", - "wall_tincom_9.p3d", - "wall_tin_4.p3d", - "plot_vlnplech1.p3d", - "wall_tincom_9_2.p3d", - "wall_tincom_3.p3d", - "wall_tincom_pole.p3d", - "datsun01t.p3d", - "datsun02t.p3d", - "skodovka_wrecked.p3d", - "lada_wrecked.p3d", - "hiluxt.p3d", - "uaz_wrecked.p3d", - "ural_wrecked.p3d" - }; - }; - + #include "\x\addons\a3_epoch_config\Configs\CfgEpochClient\Chernarus_Summer.hpp" + }; class CfgEpochSapper @@ -217,4 +88,4 @@ class CfgEpochCloak targetChangeFrequency = 42; //Cloak will only attempt to change target once per this period. Make Higher to stick to first target player. (Min: 42) teleportChance = 66; //Chance for cloak to teleport. (Min: 1) hoverFrequency = 1280; //Cloak has new hover attack. When player is above cloak, and at a distance, cloak will float to player and teleport attack. Only perform one of these moves per this period. (Min: 240) -}; \ No newline at end of file +}; diff --git a/Sources/mpmissions/epoch.Esseker/description.ext b/Sources/mpmissions/epoch.Esseker/description.ext index 0a5e42f5..ee9fb49d 100644 --- a/Sources/mpmissions/epoch.Esseker/description.ext +++ b/Sources/mpmissions/epoch.Esseker/description.ext @@ -11,7 +11,7 @@ respawnDialog = 0; onLoadMission= "Epoch"; OnLoadIntro = "Welcome to Epoch Mod"; -loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; +loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; OnLoadIntroTime = False; OnLoadMissionTime = False; onLoadName = "Epoch Mod"; @@ -40,169 +40,22 @@ class CfgRemoteExecCommands {}; class CfgEpochClient { - epochVersion = "0.3.1.0"; - + epochVersion = "0.3.2.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired - + buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area - buildingRequireJammer = 0; // 1 = to allow building without a jammer - buildingCountLimit = 200; // how many objects can be built within range of a jammer - buildingJammerRange = 75; // jammer range in meters - + buildingRequireJammer = 0; // 1 = to allow building without a jammer + buildingCountLimit = 200; // how many objects can be built within range of a jammer + buildingJammerRange = 75; // jammer range in meters + EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; - class Esseker { - blockedArea[] = { - { { 208.778,353.779,0 }, 300 }, //Cave - { { 1997.77,4177.22,0 }, 200 }, //Krupa - { { 2710.82,4577.82,0 }, 300 }, //Kupress - { { 6698.04,3901.16,0 }, 220 }, //Plava Vrana Military - { { 9441.22,4768.86,0 }, 500 }, //Adela AF West - { { 10336,4809.92,0 }, 280 }, //Adela AF East - { { 6453.85,5454.12,0 }, 200 }, //Neptune resort - { { 5237.39,4756.58,0 }, 200 }, //Power station - { { 5034.75,5126.94,0 }, 300 }, //Kula - { { 6317.04,6194.92,0 }, 200 }, //Gulash - { { 3023.79,6078.66,0 }, 400 }, //Danilov Grad - { { 8665.26,5643.09,0 }, 600 }, //Old Esseker (West) - { { 9676.37,5592.46,0 }, 600 }, //Esseker (Central) - { { 10547.4,5465.63,0 }, 600 }, //Lower Esseker (East) - { { 11896.2,7941.4,0 }, 200 }, //Novi Grad - { { 10136.3,7917,0 }, 60 }, //Chardak Resort - { { 9054.67,7902.84,0 }, 150 }, //Pilana Sawmill - { { 7780.88,6914.07,0 }, 200 }, //Posestra - { { 6199.98,6919.69,0 }, 150 }, //Lug - { { 3503.95,6888.93,0 }, 170 }, //Melina - { { 1953.28,7815.1,0 }, 210 }, //Rama - { { 4791.52,8074.88,0 }, 200 }, //Chokory - { { 3967.84,9242.61,0 }, 120 }, //ES Petrol - { { 1171.25,10280.1,0 }, 150 }, //Camp Spencer - { { 7169.08,9298.94,0 }, 150 }, //Tuk - { { 7676.77,10152.7,0 }, 100 }, //Igman Military Base - { { 10060.6,9901.3,0 }, 200 } //Borosh - }; - Rocks[] = { - "sharpstones_erosion.p3d", - "sharprock_spike.p3d", - "sharprock_wallh.p3d", - "w_sharpstones_erosion.p3d", - "bluntstone_02.p3d", - "bluntstone_03.p3d", - "sharpstone_02.p3d", - "decal_rock_dark.p3d" - }; - ATM[] = { - "atm_02_f.p3d", - "atm_01_f.p3d", - "phonebooth_01_f.p3d", - "phonebooth_02_f.p3d" - }; - Water[] = { - "rasman_pond.p3d", - "misc_well.p3d", - "misc_wellpump.p3d", - "water_source_f.p3d", - "kasna_new.p3d" - }; - Trash[] = { - "tyres_f.p3d", - "junkpile_f.p3d", - "garbagewashingmachine_f.p3d", - "garbagebags_f.p3d", - "kontejner.p3d", - "garbagepallet_f.p3d", - "popelnice.p3d" - }; - Trees[] = { - "str osika.p3d", - "cwr2_a2_t_sorbus2s.p3d", - "ind_pec_03.p3d", - "t_populusb2s_ep1.p3d", - "t_populusf2s_ep1.p3d", - "str lipa.p3d", - "t_picea2s.p3d", - "hrusen2.p3d", - "cwr2_a2_t_fagus2w.p3d", - "cwr2_a2_t_alnus2s.p3d", - "dd_borovice02.p3d", - "t_picea3f.p3d", - "t_pinuss2f.p3d", - "t_pinuss1s_f.p3d", - "t_carpinus2s.p3d", - "t_quercusir2s_f.p3d", - "jablon.p3d", - "mb_t_ulmus_large.p3d", - "cwr_aleppopine.p3d", - "t_fagus2f_summer.p3d", - "t_fagus2f.p3d", - "t_populus3s.p3d", - "t_pinusn2s.p3d", - "t_picea1s.p3d", - "cwr2_a2_t_quercus3s.p3d", - "str kastan.p3d", - "t_populusn3s_f.p3d", - "cwr2_a2_t_fraxinus2s.p3d", - "t_poplar2f_dead_f.p3d", - "misc_fallentree2.p3d", - "t_oleae1s_f.p3d", - "t_fraxinusav2s_f.p3d", - "t_oleae2s_f.p3d", - "t_prunuss2s_ep1.p3d" - }; - Bushes[] = { - "krovi_long.p3d", - "cwr2_a2_b_canina2s.p3d", - "b_salix2s.p3d", - "cwr2_a2_b_craet1.p3d", - "str krovisko vysoke.p3d", - "krovi2.p3d", - "ker s bobulema.p3d", - "t_malus1s.p3d", - "cwr2_a2_b_prunus.p3d", - "b_ficusc1s_f.p3d", - "hospital_side1_f.p3d", - "b_craet1_summer.p3d", - "b_neriumo2s_f.p3d", - "b_neriumo2s_white_f.p3d", - "cwr2_a2_b_sambucus.p3d" - }; - Wrecks[] = { - "wreck_ural_f.p3d", - "rubble_metal_plates_04.p3d", - "rubble_metal_plates_02.p3d", - "wreck_car2_f.p3d", - "rubble_metal_plates_01.p3d", - "wreck_truck_dropside_f.p3d", - "wreck_brdm2_f.p3d", - "wreck_bmp2_f.p3d", - "wreck_heli_attack_01_f.p3d", - "bmp_break.p3d", - "wreck_t72_hull_f.p3d", - "wreck_t72_turret_f.p3d", - "wreck_uaz_f.p3d", - "wreck_hmmwv_f.p3d", - "kamaz_bort.p3d", - "wreck_van_f.p3d", - "kamaz_awtobas.p3d", - "wreck_offroad_f.p3d", - "wreck_car3_f.p3d", - "maz.p3d", - "wreck_offroad2_f.p3d", - "wreck_car_f.p3d", - "wreck_skodovka_f.p3d", - "wreck_cardismantled_f.p3d", - "wreck_truck_f.p3d", - "kamaz_pozarka.p3d", - "zaporosez.p3d", - "kamaz_tent.p3d", - "uaz_wrecked.p3d", - "ural_wrecked.p3d" - }; - }; - + #include "\x\addons\a3_epoch_config\Configs\CfgEpochClient\Esseker.hpp" + }; class CfgEpochSapper @@ -235,4 +88,4 @@ class CfgEpochCloak targetChangeFrequency = 42; //Cloak will only attempt to change target once per this period. Make Higher to stick to first target player. (Min: 42) teleportChance = 66; //Chance for cloak to teleport. (Min: 1) hoverFrequency = 1280; //Cloak has new hover attack. When player is above cloak, and at a distance, cloak will float to player and teleport attack. Only perform one of these moves per this period. (Min: 240) -}; \ No newline at end of file +}; diff --git a/Sources/mpmissions/epoch.Stratis/description.ext b/Sources/mpmissions/epoch.Stratis/description.ext index e5b55f8d..a827d151 100644 --- a/Sources/mpmissions/epoch.Stratis/description.ext +++ b/Sources/mpmissions/epoch.Stratis/description.ext @@ -11,7 +11,7 @@ respawnDialog = 0; onLoadMission= "Epoch"; OnLoadIntro = "Welcome to Epoch Mod"; -loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; +loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; OnLoadIntroTime = False; OnLoadMissionTime = False; onLoadName = "Epoch Mod"; @@ -40,177 +40,22 @@ class CfgRemoteExecCommands {}; class CfgEpochClient { - epochVersion = "0.3.1.0"; - + epochVersion = "0.3.2.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area - buildingRequireJammer = 0; // 1 = to allow building without a jammer - buildingCountLimit = 200; // how many objects can be built within range of a jammer - buildingJammerRange = 75; // jammer range in meters - + buildingRequireJammer = 0; // 1 = to allow building without a jammer + buildingCountLimit = 200; // how many objects can be built within range of a jammer + buildingJammerRange = 75; // jammer range in meters + EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; - - - class Stratis { - blockedArea[] = {}; - Rocks[] = { - "sharpstone_03_lc.p3d", - "sharpstone_02_lc.p3d", - "sharpstone_01_lc.p3d", - "sharpstone_02.p3d", - "sharpstone_03.p3d", - "sharprock_monolith.p3d", - "sharprock_apart.p3d", - "sharpstones_erosion.p3d", - "bluntstone_01_lc.p3d", - "bluntstone_02_lc.p3d", - "bluntstone_03_lc.p3d", - "bluntstones_erosion.p3d", - "bluntstone_01.p3d", - "bluntstone_03.p3d", - "sharprock_spike.p3d", - "sharprock_wallh.p3d", - "w_sharpstone_03.p3d", - "w_sharpstone_02.p3d", - "w_sharpstone_01.p3d", - "bluntrock_apart.p3d", - "bluntstone_02.p3d", - "bluntrock_monolith.p3d", - "bluntrock_wallh.p3d", - "sharprock_wallv.p3d", - "stonesharp_medium.p3d", - "stone_medium_f.p3d", - "stonesharp_big.p3d", - "stonesharp_small.p3d", - "small_stone_02_f.p3d", - "stone_small_f.p3d", - "stone_big_f.p3d", - "bluntrock_spike.p3d" - }; - ATM[] = { - "atm_01_f.p3d", - "phonebooth_01_f.p3d", - "atm_02_f.p3d", - "phonebooth_02_f.p3d" - }; - Water[] = { - "barrelwater_f.p3d", - "water_source_f.p3d", - "waterbarrel_f.p3d", - "canisterplastic_f.p3d", - "watertank_f.p3d" - }; - Trash[] = { - "sack_f.p3d", - "garbagebags_f.p3d", - "pallets_f.p3d", - "junkpile_f.p3d", - "garbagepallet_f.p3d", - "garbagewashingmachine_f.p3d", - "basket_f.p3d", - "sacks_goods_f.p3d", - "crateswooden_f.p3d", - "cratesplastic_f.p3d", - "garbagebin_01_f.p3d", - "barrelsand_f.p3d", - "garbagecontainer_closed_f.p3d", - "cratesshabby_f.p3d", - "bucket_f.p3d", - "garbagebarrel_01_f.p3d", - "tyres_f.p3d", - "cargobox_v1_f.p3d", - "metalbarrel_f.p3d", - "sacks_heap_f.p3d", - "woodenbox_f.p3d", - "grave_v1_f.p3d", - "grave_v2_f.p3d", - "calvary_02_v2_f.p3d", - "fishinggear_02_f.p3d", - "fishinggear_01_f.p3d", - "humanskull_f.p3d", - "calvary_02_v1_f.p3d", - "rack_f.p3d", - "wreck_uaz_f.p3d", - "humanskeleton_f.p3d", - "shelvesmetal_f.p3d", - "kiosk_blueking_ruins_f.p3d", - "cargo20_white_f.p3d", - "cargo20_yellow_f.p3d", - "cargo20_military_green_f.p3d", - "cargo40_blue_f.p3d", - "cargo40_grey_f.p3d", - "cargo40_light_green_f.p3d", - "cargo40_light_blue_f.p3d", - "cargo40_orange_f.p3d", - "cargo20_orange_f.p3d", - "cargo20_brick_red_f.p3d" - }; - Trees[] = { - "t_ficusb1s_f.p3d", - "t_oleae1s_f.p3d", - "t_ficusb2s_f.p3d", - "t_broussonetiap1s_f.p3d", - "t_pinuss2s_f.p3d", - "t_pinuss2s_b_f.p3d", - "t_pinuss1s_f.p3d", - "t_oleae2s_f.p3d", - "i_house_big_01_v2_f.p3d", - "i_house_big_02_v1_f.p3d", - "i_addon_02_v1_f.p3d", - "t_fraxinusav2s_f.p3d", - "t_pinusp3s_f.p3d", - "t_poplar2f_dead_f.p3d", - "t_populusn3s_f.p3d", - "t_phoenixc1s_f.p3d" - }; - Bushes[] = { - "b_ficusc2d_f.p3d", - "b_ficusc1s_f.p3d", - "b_neriumo2d_f.p3d", - "b_arundod2s_f.p3d", - "b_arundod3s_f.p3d", - "b_ficusc2s_f.p3d" - }; - Wrecks[] = { - "wall_tin_4_2.p3d", - "mil_wiredfence_f.p3d", - "cages_f.p3d", - "wreck_car_f.p3d", - "pipes_small_f.p3d", - "pipe_fence_4m_f.p3d", - "spp_tower_f.p3d", - "wreck_ural_f.p3d", - "wreck_car3_f.p3d", - "ironpipes_f.p3d", - "pipes_large_f.p3d", - "coil_f.p3d", - "cinderblocks_f.p3d", - "wreck_offroad_f.p3d", - "wreck_offroad2_f.p3d", - "crabcages_f.p3d", - "metalbarrel_empty_f.p3d", - "net_fenced_8m_f.p3d", - "net_fence_8m_f.p3d", - "wavepowerplantbroken_f.p3d", - "wreck_truck_dropside_f.p3d", - "wavepowerplant_f.p3d", - "wreck_traw_f.p3d", - "wreck_slammer_f.p3d", - "maroula_f.p3d", - "indfnc_9_f.p3d", - "indfnc_3_f.p3d", - "indfnc_3_d_f.p3d", - "wreck_car2_f.p3d", - "net_fence_4m_f.p3d", - "wreck_truck_f.p3d", - "wreck_hunter_f.p3d", - "wreck_slammer_hull_f.p3d" - }; - }; + + #include "\x\addons\a3_epoch_config\Configs\CfgEpochClient\Stratis.hpp" + }; class CfgEpochSapper @@ -243,4 +88,4 @@ class CfgEpochCloak targetChangeFrequency = 42; //Cloak will only attempt to change target once per this period. Make Higher to stick to first target player. (Min: 42) teleportChance = 66; //Chance for cloak to teleport. (Min: 1) hoverFrequency = 1280; //Cloak has new hover attack. When player is above cloak, and at a distance, cloak will float to player and teleport attack. Only perform one of these moves per this period. (Min: 240) -}; \ No newline at end of file +}; diff --git a/Sources/mpmissions/epoch.Takistan/description.ext b/Sources/mpmissions/epoch.Takistan/description.ext index bd87d3cc..9ec659a7 100644 --- a/Sources/mpmissions/epoch.Takistan/description.ext +++ b/Sources/mpmissions/epoch.Takistan/description.ext @@ -11,7 +11,7 @@ respawnDialog = 0; onLoadMission= "Epoch"; OnLoadIntro = "Welcome to Epoch Mod"; -loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; +loadScreen = "\x\addons\a3_epoch_assets\pictures\loadScreen_ca.paa"; OnLoadIntroTime = False; OnLoadMissionTime = False; onLoadName = "Epoch Mod"; @@ -40,100 +40,22 @@ class CfgRemoteExecCommands {}; class CfgEpochClient { - epochVersion = "0.3.1.0"; - + epochVersion = "0.3.2.0"; + sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired - + buildingNearbyMilitary = 0; //1 to allow building nearby buildingNearbyMilitaryRange = 300; //Define radius of blocked area - buildingRequireJammer = 0; // 1 = to allow building without a jammer - buildingCountLimit = 200; // how many objects can be built within range of a jammer - buildingJammerRange = 75; // jammer range in meters - + buildingRequireJammer = 0; // 1 = to allow building without a jammer + buildingCountLimit = 200; // how many objects can be built within range of a jammer + buildingJammerRange = 75; // jammer range in meters + EPOCH_news[] = {"Word is that Sappers have a new boss.","Dogs will often lure them monsters away.","My dog was blown up. I miss him.."}; - class Takistan { - blockedArea[] = {}; - Rocks[] = { - "r_tk_stone_01_ep1.p3d", - "r_tk_stone_02_ep1.p3d", - "r_tk_rock_03_ep1.p3d", - "r_tk_boulder_03_ep1.p3d", - "r_tk_rock_02_ep1.p3d", - "r_tk_boulder_01_ep1.p3d", - "r_tk_boulder_02_ep1.p3d", - "r_tk_rock_01_ep1.p3d" - }; - ATM[] = { - }; - Water[] = { - "misc_well_c_ep1.p3d", - "misc_well_l_ep1.p3d", - "stand_water_ep1.p3d", - "misc_concbox_ep1.p3d" - }; - Trash[] = { - "misc_rubble_ep1.p3d", - "bags_stack_ep1.p3d", - "kiosk_ep1.p3d", - "tires_ep1.p3d", - "garbage_misc.p3d", - "garbage_paleta.p3d", - "paletyc.p3d", - "crates_ep1.p3d", - "cages_ep1.p3d", - "junkpile.p3d", - "crates_stack_ep1.p3d", - "transport_cart_ep1.p3d", - "stand_small_ep1.p3d", - "stand_meat_ep1.p3d", - "bags_ep1.p3d", - "misc_garb_heap_ep1.p3d", - "house_k_1_ruins_ep1.p3d" - }; - Trees[] = { - "t_populusf2s_ep1.p3d", - "t_pistacial2s_ep1.p3d", - "misc_trunk_torzo_ep1.p3d", - "t_populusb2s_ep1.p3d", - "t_amygdalusc2s_ep1.p3d", - "t_pinuse2s_ep1.p3d", - "t_ficusb2s_ep1.p3d", - "t_juniperusc2s_ep1.p3d", - "t_pinuss3s_ep1.p3d", - "misc_trunk_water_ep1.p3d", - "t_prunuss2s_ep1.p3d" - }; - Bushes[] = { - "b_amygdalusn1s_ep1.p3d", - "b_pistacial1s_ep1.p3d", - "b_pinusm1s_ep1.p3d" - }; - Wrecks[] = { - "wall_indfnc_9.p3d", - "wall_indfnc_pole.p3d", - "wall_tincom_9.p3d", - "wall_tincom_pole.p3d", - "ural_wrecked.p3d", - "uaz_wrecked.p3d", - "datsun02t.p3d", - "hiluxt.p3d", - "datsun01t.p3d", - "wall_tin_4.p3d", - "wall_indfnc_3_d.p3d", - "wall_indfnc_3.p3d", - "wall_indfnc_3_hole.p3d", - "skodovka_wrecked.p3d", - "lada_wrecked.p3d", - "misc_concrete_high.p3d", - "t72_wrecked.p3d", - "t72_wrecked_turret.p3d" - }; - }; - - + #include "\x\addons\a3_epoch_config\Configs\CfgEpochClient\Takistan.hpp" + }; class CfgEpochSapper @@ -166,4 +88,4 @@ class CfgEpochCloak targetChangeFrequency = 42; //Cloak will only attempt to change target once per this period. Make Higher to stick to first target player. (Min: 42) teleportChance = 66; //Chance for cloak to teleport. (Min: 1) hoverFrequency = 1280; //Cloak has new hover attack. When player is above cloak, and at a distance, cloak will float to player and teleport attack. Only perform one of these moves per this period. (Min: 240) -}; \ No newline at end of file +};