Merge pull request #74 from EpochModTeam/experimental

Release 1.0.0 Epoch Core
EpochModTeam · Oct 26, 2017 · f5c2ffb · f5c2ffb
2 parents a9d617e + 4f6a75c
commit f5c2ffb
Show file tree

Hide file tree

Showing 923 changed files with 20,177 additions and 25,376 deletions.
diff --git a/Build-Tools/build_client.cmd b/Build-Tools/build_client.cmd
@@ -0,0 +1,71 @@
+@Echo Off
+SETLOCAL enabledelayedexpansion
+
+REM Workshop IDs:
+REM EpochExperimental = 455221958
+REM Normal Epoch = 421839251
+SET WORKSHOPID=455221958
+SET PBO_PREFIX=x\addons
+SET SIGNFILE_PREFIX=epoch
+SET SIGNFILE_VERSION=100
+
+REM Arma 3 tools folder path
+SET TOOLSPATH=C:\Program Files (x86)\Steam\steamapps\common\Arma 3 Tools
+
+REM set tool paths
+SET AddonBuilder=%TOOLSPATH%\AddonBuilder
+SET Publisher=%TOOLSPATH%\Publisher
+SET DSSignFile=%TOOLSPATH%\DSSignFile
+SET BIprivatekey=%DSSignFile%\%SIGNFILE_PREFIX%%SIGNFILE_VERSION%.biprivatekey
+
+REM path to sources
+SET MAIN_PATH=C:\Jenkins\workspace\Team_EpochCore_experimental-PYKIA2SJDPUF7555RH7E6CEJQ52WFATMHKVGEXIMVMJPB5FYVKYA
+REM path to compiled mod
+SET WORKSHOP_PATH=C:\Program Files (x86)\Steam\steamapps\common\Arma 3\@epoch
+
+REM build all PBO's
+SET currentVersion="%MAIN_PATH%\version.txt"
+SET currentBuild="%MAIN_PATH%\build.txt"
+
+if exist %MAIN_PATH% (
+    ECHO "%MAIN_PATH% exists"
+) else (
+    ECHO "%MAIN_PATH% doesn't exist"
+    exit /b 0
+)
+
+REM Create bikey if does not already exist
+if not exist "%BIprivatekey%" (
+	START "DSCreateKey" /WAIT /d "%DSSignFile%" "%DSSignFile%\DSCreateKey.exe" %SIGNFILE_PREFIX%%SIGNFILE_VERSION%
+)
+
+
+SET AB_includes_path="C:\GITTEMP\includes.txt"
+
+REM increase build number
+SET /p BUILDNUMBER=<%currentBuild%
+SET /A BUILDNUMBER = BUILDNUMBER + 1
+echo %BUILDNUMBER% > %currentBuild%
+
+REM Build Client Pbo's
+echo building Client pbo's
+
+
+SET SOURCE_PATH=%MAIN_PATH%\Sources
+
+
+for /d %%D in ("%SOURCE_PATH%\*") do (
+	REM check if folder had a config.cpp file
+	if exist "%%~fD\config.cpp" (
+		SET pboBuild="%%~fD\build.hpp"
+		echo build=%BUILDNUMBER%; > !pboBuild!
+		START "AddonBuilder" /min /WAIT "%AddonBuilder%\AddonBuilder.exe" "P:\%PBO_PREFIX%\%%~nxD" "%WORKSHOP_PATH%\addons" -clear -prefix="%PBO_PREFIX%\%%~nxD" -sign="%BIprivatekey%" -project=P:\ -include=%AB_includes_path%
+		echo %%~nxD
+	)
+)
+
+REM upload to steam workshop to experimental client
+SET CHANGELOG="Build:%BUILDNUMBER% See Changelogs: https://github.com/EpochModTeam/Epoch/tree/experimental/Changelogs"
+START "" /WAIT "%Publisher%\PublisherCmd.exe" update /id:%WORKSHOPID% /changeNote:%CHANGELOG% /path:"%WORKSHOP_PATH%"
+
+exit /b 0
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,15 @@
+pipeline {
+  agent {
+    node {
+      label 'testing'
+    }
+
+  }
+  stages {
+    stage('Release') {
+      steps {
+        bat 'C:/GITTEMP/release_client.cmd'
+      }
+    }
+  }
+}
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Epoch Mod for Arma 3
+Epoch Mod assets for Arma 3
 =====
 
 http://epochmod.com
@@ -13,3 +13,7 @@ http://www.bistudio.com/community/licenses/arma-public-license-share-alike
 Credits:
 =====
 https://github.com/EpochModTeam/Epoch/blob/release/CREDITS.md
+
+Changelogs:
+=====
+https://github.com/EpochModTeam/Epoch/blob/experimental/changelog.md
diff --git a/Sources/a2_epoch_weapons/build.hpp b/Sources/a2_epoch_weapons/build.hpp
@@ -1 +1 @@
-build=531;
+build=558;
diff --git a/Sources/a2_epoch_weapons/config.cpp b/Sources/a2_epoch_weapons/config.cpp
@@ -6,6 +6,6 @@
 		weapons[]={};
 		requiredVersion=0.1;
 		requiredAddons[]={};
-		epochVersion = "0.5.0.0";
+		epochVersion = "1.0.0";
 	};
 };
diff --git a/Sources/a2_epoch_weapons/treeView.txt b/Sources/a2_epoch_weapons/treeView.txt
diff --git a/Sources/a3_epoch_assets/build.hpp b/Sources/a3_epoch_assets/build.hpp
@@ -1 +1 @@
-build=531;
+build=558;
diff --git a/Sources/a3_epoch_assets/config.cpp b/Sources/a3_epoch_assets/config.cpp
@@ -3,7 +3,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		epochVersion = "0.5.0.0";
+		epochVersion = "1.0.0";
 		requiredAddons[] = {};
 	};
 };
diff --git a/Sources/a3_epoch_assets/models/Wood_stairs.p3d b/Sources/a3_epoch_assets/models/Wood_stairs.p3d
diff --git a/Sources/a3_epoch_assets/models/Wood_stairs_upgrade.p3d b/Sources/a3_epoch_assets/models/Wood_stairs_upgrade.p3d
diff --git a/Sources/a3_epoch_assets/models/Wooden_Floor_Ghost.p3d b/Sources/a3_epoch_assets/models/Wooden_Floor_Ghost.p3d
diff --git a/Sources/a3_epoch_assets/models/mineral_proxy.p3d b/Sources/a3_epoch_assets/models/mineral_proxy.p3d
diff --git a/Sources/a3_epoch_assets/models/shoebox.p3d b/Sources/a3_epoch_assets/models/shoebox.p3d
diff --git a/Sources/a3_epoch_assets/models/shoebox_proxy.p3d b/Sources/a3_epoch_assets/models/shoebox_proxy.p3d
diff --git a/Sources/a3_epoch_assets/treeView.txt b/Sources/a3_epoch_assets/treeView.txt
diff --git a/Sources/a3_epoch_assets_1/build.hpp b/Sources/a3_epoch_assets_1/build.hpp
@@ -1 +1 @@
-build=531;
+build=558;
diff --git a/Sources/a3_epoch_assets_1/config.cpp b/Sources/a3_epoch_assets_1/config.cpp
@@ -3,7 +3,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		epochVersion = "0.5.0.0";
+		epochVersion = "1.0.0";
 		requiredAddons[] = {};
 	};
 };
diff --git a/Sources/a3_epoch_assets_1/models/half_floor.p3d b/Sources/a3_epoch_assets_1/models/half_floor.p3d
diff --git a/Sources/a3_epoch_assets_1/models/half_floor_ghost.p3d b/Sources/a3_epoch_assets_1/models/half_floor_ghost.p3d
diff --git a/Sources/a3_epoch_assets_1/models/metal_floor_ghost.p3d b/Sources/a3_epoch_assets_1/models/metal_floor_ghost.p3d
diff --git a/Sources/a3_epoch_assets_1/models/quarter_floor.p3d b/Sources/a3_epoch_assets_1/models/quarter_floor.p3d
diff --git a/Sources/a3_epoch_assets_1/models/quarter_floor_ghost.p3d b/Sources/a3_epoch_assets_1/models/quarter_floor_ghost.p3d
diff --git a/Sources/a3_epoch_assets_1/models/zombie_parts_bag_v2.p3d b/Sources/a3_epoch_assets_1/models/zombie_parts_bag_v2.p3d
diff --git a/Sources/a3_epoch_assets_1/pictures/ItemDuctTape.paa b/Sources/a3_epoch_assets_1/pictures/ItemDuctTape.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioAmethyst.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioAmethyst.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioCitrine.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioCitrine.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioEmerald.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioEmerald.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioGarnet.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioGarnet.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioJade.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioJade.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioObsidian.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioObsidian.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioQuartz.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioQuartz.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioRuby.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioRuby.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioSapphire.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioSapphire.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioTopaz.paa b/Sources/a3_epoch_assets_1/pictures/epochRadio/epochRadioTopaz.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_10oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_10oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_20oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_20oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_30oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_30oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_40oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_40oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_50oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_50oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_60oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_60oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_70oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_70oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_80oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_80oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_briefcase_90oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_briefcase_90oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_2oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_2oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_3oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_3oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_4oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_4oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_5oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_5oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_6oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_6oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_7oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_7oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_8oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_8oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_9oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_gold_bar_9oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_2oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_2oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_3oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_3oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_4oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_4oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_5oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_5oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_6oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_6oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_7oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_7oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_8oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_8oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_9oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silver_bar_9oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_10oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_10oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_20oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_20oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_30oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_30oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_40oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_40oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_50oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_50oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_60oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_60oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_70oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_70oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_80oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_80oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_silvercase_90oz_CA.paa b/Sources/a3_epoch_assets_1/pictures/equip_silvercase_90oz_CA.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_sledge_handle_ca.paa b/Sources/a3_epoch_assets_1/pictures/equip_sledge_handle_ca.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/equip_sledge_head_ca.paa b/Sources/a3_epoch_assets_1/pictures/equip_sledge_head_ca.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_1.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_1.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_2.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_2.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_3.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_3.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_4.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_4.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_4on.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_4on.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_5.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_5.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_6.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_6.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_7.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_7.paa
diff --git a/Sources/a3_epoch_assets_1/pictures/geiger/geiger_8.paa b/Sources/a3_epoch_assets_1/pictures/geiger/geiger_8.paa
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger0.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger0.ogg
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger1.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger1.ogg
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger2.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger2.ogg
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger3.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger3.ogg
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger4.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger4.ogg
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger_alarm.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger_alarm.ogg
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger_alarm_low.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger_alarm_low.ogg
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger_tick.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger_tick.ogg
diff --git a/Sources/a3_epoch_assets_1/sounds/geiger/geiger_tick_low.ogg b/Sources/a3_epoch_assets_1/sounds/geiger/geiger_tick_low.ogg
diff --git a/Sources/a3_epoch_assets_1/treeView.txt b/Sources/a3_epoch_assets_1/treeView.txt
diff --git a/Sources/a3_epoch_assets_2/build.hpp b/Sources/a3_epoch_assets_2/build.hpp
@@ -1 +1 @@
-build=531;
+build=558;
diff --git a/Sources/a3_epoch_assets_2/config.cpp b/Sources/a3_epoch_assets_2/config.cpp
@@ -8,6 +8,6 @@ class CfgPatches
 		requiredAddons[] = {};
 		magazines[] = {};
 		ammo[] = {};
-		epochVersion = "0.5.0.0";
+		epochVersion = "1.0.0";
 	};
 };
diff --git a/Sources/a3_epoch_assets_2/treeView.txt b/Sources/a3_epoch_assets_2/treeView.txt
diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Characters/female_ghillie.p3d b/Sources/a3_epoch_assets_3/CfgVehicles/Characters/female_ghillie.p3d
diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Tower/Tower/Base_Tower_Frame.p3d b/Sources/a3_epoch_assets_3/CfgVehicles/Tower/Tower/Base_Tower_Frame.p3d
diff --git a/Sources/a3_epoch_assets_3/build.hpp b/Sources/a3_epoch_assets_3/build.hpp
@@ -1 +1 @@
-build=531;
+build=558;
diff --git a/Sources/a3_epoch_assets_3/config.cpp b/Sources/a3_epoch_assets_3/config.cpp
@@ -8,6 +8,6 @@ class CfgPatches
 		requiredAddons[] = {};
 		magazines[] = {};
 		ammo[] = {};
-		epochVersion = "0.5.0.0";
+		epochVersion = "1.0.0";
 	};
 };
diff --git a/Sources/a3_epoch_assets_3/treeView.txt b/Sources/a3_epoch_assets_3/treeView.txt
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Drink.paa b/Sources/a3_epoch_code/Data/UI/buttons/Drink.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/RemoveMag.paa b/Sources/a3_epoch_code/Data/UI/buttons/RemoveMag.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Remove_Engine.paa b/Sources/a3_epoch_code/Data/UI/buttons/Remove_Engine.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Remove_Wheel.paa b/Sources/a3_epoch_code/Data/UI/buttons/Remove_Wheel.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Repair_Avionics.paa b/Sources/a3_epoch_code/Data/UI/buttons/Repair_Avionics.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Repair_Engine.paa b/Sources/a3_epoch_code/Data/UI/buttons/Repair_Engine.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Repair_Fuel.paa b/Sources/a3_epoch_code/Data/UI/buttons/Repair_Fuel.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Repair_HullBody.paa b/Sources/a3_epoch_code/Data/UI/buttons/Repair_HullBody.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Repair_MainRotor.paa b/Sources/a3_epoch_code/Data/UI/buttons/Repair_MainRotor.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Repair_TailRotor.paa b/Sources/a3_epoch_code/Data/UI/buttons/Repair_TailRotor.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Repair_Wheel.paa b/Sources/a3_epoch_code/Data/UI/buttons/Repair_Wheel.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Replace_Engine.paa b/Sources/a3_epoch_code/Data/UI/buttons/Replace_Engine.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Replace_Glass.paa b/Sources/a3_epoch_code/Data/UI/buttons/Replace_Glass.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Replace_HullBody.paa b/Sources/a3_epoch_code/Data/UI/buttons/Replace_HullBody.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Replace_MainRotor.paa b/Sources/a3_epoch_code/Data/UI/buttons/Replace_MainRotor.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Replace_SLG.paa b/Sources/a3_epoch_code/Data/UI/buttons/Replace_SLG.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Replace_TailRotor.paa b/Sources/a3_epoch_code/Data/UI/buttons/Replace_TailRotor.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Replace_Wheel.paa b/Sources/a3_epoch_code/Data/UI/buttons/Replace_Wheel.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/geiger_alarmoff.paa b/Sources/a3_epoch_code/Data/UI/buttons/geiger_alarmoff.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/geiger_alarmon.paa b/Sources/a3_epoch_code/Data/UI/buttons/geiger_alarmon.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/geiger_radiation.paa b/Sources/a3_epoch_code/Data/UI/buttons/geiger_radiation.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/geiger_toggle.paa b/Sources/a3_epoch_code/Data/UI/buttons/geiger_toggle.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/geiger_volumeoff.paa b/Sources/a3_epoch_code/Data/UI/buttons/geiger_volumeoff.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/geiger_volumeon.paa b/Sources/a3_epoch_code/Data/UI/buttons/geiger_volumeon.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/perm_group_menu_ca.paa b/Sources/a3_epoch_code/Data/UI/buttons/perm_group_menu_ca.paa
diff --git a/Sources/a3_epoch_code/Data/UI/buttons/temp_group_menu_ca.paa b/Sources/a3_epoch_code/Data/UI/buttons/temp_group_menu_ca.paa
diff --git a/Sources/a3_epoch_code/Data/UI/favbar/fav_bg.paa b/Sources/a3_epoch_code/Data/UI/favbar/fav_bg.paa
diff --git a/Sources/a3_epoch_code/Data/UI/favbar/fav_bg2.paa b/Sources/a3_epoch_code/Data/UI/favbar/fav_bg2.paa
diff --git a/Sources/a3_epoch_code/System/Construct_Brain.fsm b/Sources/a3_epoch_code/System/Construct_Brain.fsm
@@ -496,7 +496,7 @@ class FSM
           precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
           condition=/*%FSM<CONDITION""">*/"_sanityCheck > 90;"/*%FSM</CONDITION""">*/;
           action=/*%FSM<ACTION""">*/"_canSee = false;" \n
-           "_nrTrgts = (getPosATL _construct) nearEntities [_trgtArr, _sRange];" \n
+           "_nrTrgts = _construct nearEntities [_trgtArr, _sRange];" \n
            "if(count _nrTrgts >0)then{" \n
            "{" \n
            "if(alive _x)then{" \n

diff --git a/Sources/a3_epoch_code/System/Copter_brain.fsm b/Sources/a3_epoch_code/System/Copter_brain.fsm
@@ -1,11 +1,11 @@
-/*%FSM<COMPILE "C:\Program Files (x86)\PoseidonTools\Data\Packages\Bin\fsmEditor\scriptedFSM.cfg, copter_ai">*/
+/*%FSM<COMPILE "C:\Program Files (x86)\Steam\steamapps\common\Arma 3 Tools\FSMEditor\scriptedFSM.cfg, copter_ai">*/
 /*%FSM<HEAD>*/
 /*
 item0[] = {"copter",0,250,77.124176,-2127.698242,167.124191,-2077.697266,0.000000,"copter"};
 item1[] = {"update",2,250,76.399269,-1842.943848,166.399292,-1792.943848,0.000000,"update"};
 item2[] = {"player_see",4,218,230.161133,-1924.389893,320.161102,-1874.389893,20.000000,"player see"};
 item3[] = {"dead",4,218,-181.680664,-1843.368408,-91.680664,-1793.368408,100.000000,"dead"};
-item4[] = {"end",1,4346,-182.661209,-1721.283813,-92.661232,-1671.283813,0.000000,"end"};
+item4[] = {"end",1,250,-182.661209,-1721.283813,-92.661232,-1671.283813,0.000000,"end"};
 item5[] = {"copter_move",2,250,465.176025,-1680.020264,555.176392,-1630.020264,0.000000,"copter move"};
 item6[] = {"near_target_pos",4,218,75.965195,-1679.590576,165.965347,-1629.590576,90.000000,"near target pos"};
 item7[] = {"wait_start",2,250,331.527832,-1758.595947,421.527863,-1708.595947,0.000000,"wait start"};
@@ -20,7 +20,7 @@ item15[] = {"player_hidden",4,218,167.131546,-1965.252563,257.131653,-1915.25207
 item16[] = {"search",2,250,333.506439,-1965.507813,423.506744,-1915.507813,0.000000,"search"};
 item17[] = {"delete",2,250,-182.017578,-1584.171875,-92.017548,-1534.171875,0.000000,"delete"};
 item18[] = {"_",8,218,-162.792191,-1649.780273,-110.753067,-1622.927124,0.000000,""};
-item19[] = {"send_support",2,250,-183.828308,-2072.576172,-93.828339,-2022.575073,0.000000,"send support"};
+item19[] = {"send_support",2,4346,-183.828308,-2072.576172,-93.828339,-2022.575073,0.000000,"send support"};
 item20[] = {"new_player",2,250,343.614227,-1843.289429,433.614288,-1793.289551,0.000000,"new player"};
 item21[] = {"wait",4,218,172.726486,-1777.677124,262.726624,-1727.677124,1.000000,"wait"};
 item22[] = {"_",8,218,97.991913,-1951.730469,145.401703,-1926.729126,0.000000,""};
@@ -57,7 +57,7 @@ link27[] = {22,1};
 link28[] = {23,24};
 link29[] = {24,5};
 globals[] = {0.000000,0,0,0,0,640,480,1,55,0,1,-284.459595,633.086609,-1492.426025,-2128.185547,953,884,1};
-window[] = {2,-1,-1,-1,-1,724,104,1148,104,3,971};
+window[] = {2,-1,-1,-1,-1,776,156,1200,156,3,971};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -473,7 +473,7 @@ class FSM
                          "" \n
                          "[[(getPos _trgt),80,150,1,true] call EPOCH_fnc_findSafePos,_copter] call EPOCH_supportCopter;" \n
                          "" \n
-                         "_copter say3D ""drone_alert0"";" \n
+                         "_copter say3D [""drone_alert0"",500,1];" \n
                          "[player, _copter, ""drone_alert0"",Epoch_personalToken] remoteExec [""EPOCH_server_handle_say3D"",2];" \n
                          "" \n
                          "_troopsOnGround = true;" \n
@@ -569,4 +569,4 @@ class FSM
                 "end",
         };
 };
-/*%FSM</COMPILE>*/
+/*%FSM</COMPILE>*/
diff --git a/Sources/a3_epoch_code/System/Dog_Brain.fsm b/Sources/a3_epoch_code/System/Dog_Brain.fsm
@@ -1007,10 +1007,10 @@ class FSM
       init = /*%FSM<STATEINIT""">*/"deleteVehicle _foodHolder;" \n
        "" \n
        "if (_plyrVar == _dogName) then {" \n
-       "[format[""You have fed %1"",_dogName], 5] call Epoch_message;" \n
+       "[format[""You have fed %1"",_dogName], 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;" \n
        "}else{" \n
        "_plyr setVariable [""dog"", _dogName];" \n
-       "[format[""You have tamed %1"",_dogName], 5] call Epoch_message;" \n
+       "[format[""You have tamed %1"",_dogName], 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;" \n
        "};" \n
        "_hunger = _hunger - 40;" \n
        "" \n

diff --git a/Sources/a3_epoch_code/System/Looter_Brain.fsm b/Sources/a3_epoch_code/System/Looter_Brain.fsm
@@ -506,7 +506,7 @@ class FSM
        "_bldMap = _bldMap -  [_closestBld];" \n
        "} forEach _bldMap;" \n
        "" \n
-       "_bldMap = [] + _sortBuilds;" \n
+       "_bldMap = +_sortBuilds;" \n
        "_moveTo = _sortBuilds select 0;" \n
        "_bldMap set [0,""byebye""];" \n
        "_bldMap = _bldMap - [""byebye""];" \n
@@ -724,7 +724,7 @@ class FSM
            "};" \n
            "" \n
            "" \n
-           "_lLastPos = [] + _sanityPos;" \n
+           "_lLastPos = +_sanityPos;" \n
            "_sanityCheck = 20;" \n
            ""/*%FSM</ACTION""">*/;
         };
@@ -753,7 +753,7 @@ class FSM
     class create_map
     {
       name = "create_map";
-      init = /*%FSM<STATEINIT""">*/"_nrBuilds = nearestObjects [getPosATL _looter,[""house""],50];" \n
+      init = /*%FSM<STATEINIT""">*/"_nrBuilds = nearestObjects [_looter,[""house""],50];" \n
        "" \n
        "_strDebug = _strDebug +  format [""Found %1 Buildings\n"",count _nrBuilds];" \n
        "" \n

diff --git a/Sources/a3_epoch_code/System/Mission_VIP_Militia.fsm b/Sources/a3_epoch_code/System/Mission_VIP_Militia.fsm
@@ -550,7 +550,7 @@ class FSM
     {
       name = "do_investigate";
       init = /*%FSM<STATEINIT""">*/"" \n
-       "_nrBodies = nearestObjects [getPos _investigate,_trgtArray , 25];" \n
+       "_nrBodies = nearestObjects [_investigate,_trgtArray , 25];" \n
        "" \n
        "if (count _nrBodies > 0) then {" \n
        "" \n