From 673769afcff0cc1907080ff1334fdfd334b8edb5 Mon Sep 17 00:00:00 2001
From: vbawol <vbawol@veteranbastards.com>
Date: Sat, 26 Sep 2015 15:22:18 -0500
Subject: [PATCH] version bump to 0.3.4.0

---
 .../@epochhive/addons/a3_epoch_server.pbo     | Bin 357727 -> 357727 bytes
 .../addons/a3_epoch_server_settings.pbo       | Bin 270937 -> 270744 bytes
 .../@epochhive/addons/epoch_server_core.pbo   | Bin 14090 -> 14090 bytes
 Server_Install_Pack/keys/epoch0331.bikey      | Bin 162 -> 0 bytes
 Server_Install_Pack/keys/epoch0340.bikey      | Bin 0 -> 162 bytes
 Sources/epoch_code/config.cpp                 |  30 ++++++-------
 Sources/epoch_config/Configs/CfgActions.hpp   |   4 ++
 .../epoch_config/Configs/CfgEpochClient.hpp   |   2 +-
 .../Configs/CfgTraderMissions.hpp             |   2 +-
 Sources/epoch_config/Configs/CfgWeapons.hpp   |  19 ++++++++
 Sources/epoch_config/config.cpp               |   2 +-
 Sources/epoch_server/config.cpp               |   4 +-
 Sources/epoch_server_core/README.md           |  41 ++++++++++++++++++
 Sources/epoch_server_core/config.cpp          |   2 +-
 Sources/epoch_server_settings/config.cpp      |   4 +-
 .../configs/maps/takistan.h                   |   4 +-
 Sources/mpmissions/epoch.VR/description.ext   |   2 +-
 17 files changed, 90 insertions(+), 26 deletions(-)
 delete mode 100644 Server_Install_Pack/keys/epoch0331.bikey
 create mode 100644 Server_Install_Pack/keys/epoch0340.bikey
 create mode 100644 Sources/epoch_server_core/README.md

diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo
index 1a0b8125bd8f1bc6a76b9dfdc9d34c9a7735b7bb..2ad3712a5108bf501ff22144167cf20043a67a69 100644
GIT binary patch
delta 96
zcmccrO7#9K(G62XSW>>Rg*DF*X`dm&xP68QlR%4ziJk!iBSUh2URq{4gMps09#CNV
zo*7IA?8Zjs78Yg}?Vo2b0WtIT&ofve?uZmd6exYJ;H+X?bR@sf;^@x=jyp2|kwqj>

delta 96
zcmccrO7#9K(G62XSZ=)e71}&Qq<w}6<MtUMOad(;#(IVfj10;7d1;yH3<i3}KxjC9
z&kQC5b|VuDOG`_m_RlkzfS7sv=NT*!cSO9z4lH`O-EH%XGq0R=0-~c%-_iUF02sq3
AE&u=k

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 7cd5c19972cbdc6cdb06f767bbb6722e2a597e31..279d56bdc55572fffb6e1f9a395e7fd738a84810 100644
GIT binary patch
delta 145
zcmcb4L}12Yfe9hXY2VnwTo@P_lJoP@GSl^v3krZ71OQ2IEDvO4J8jMq_Gj7VbBuQw
z*^Q0NEiB9pCU0ckz-FRnpvlWM`609O<PXeTlee(UVFn5{2eY;ZvoZoP)AnFi=Iw&p
mJH?q7cx}&4V!pLsgyqD8o$uCMnXd75ji|>|!D*bwe47E&qA>sf

delta 339
zcmbPnSm5Rnfe9hX3v7Obx-c*>B<JU)Wv1&T7Zd<F2mq4aSRTm8Hf?cV=-%a<&oSO%
zWH&N4G`29Xn7omB1Dmm)fhI54<cG}8lRq$XP2R#XhuK)qusN8uJ(!gdh?%wrvodcN
ztglv3axcm+%}WVSO)SXI^T^LhNi9;+QK&YxG&R*T*D*A*u+TFx)zLN3GcYhVGBY){
zs0GSa8|aytn3|gzfh5e$3=B-bD$I=y3@m{PfYJu0K*gqJU|~~312bb|9Roc}OP~s~
zTA&FfMWv|<wL06m#F-a(+2D4CnW?#+rH-MYp{1oB&<=AwGb2l5%T!$h15=<W#uj>(
m(-rqH3UA+@$b5FcNCE3g$#(Zk)hAYp{Fx%VeY>Z0uK@sbMq?NN

diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
index 9a3e51ffdc3a455ffbaec734e575b720657501a3..bd7ecb24814e619f953cdb5d196030284f8f5ac0 100644
GIT binary patch
delta 55
zcmeCm>&n}(n~5d$8(Y}s{Y+{ms>Vj<78Yif3?WPm5a94b`5&9{gg39%FMQ|nj(=G3
H&9)i<`iT>N

delta 55
zcmeCm>&n}(n~8-p^h4<8{Y+{ms)pv4rsigr3?WPm5TLQC^PyE-%%z7~bNPy5GBPyW
HAF%=e>Ms#~

diff --git a/Server_Install_Pack/keys/epoch0331.bikey b/Server_Install_Pack/keys/epoch0331.bikey
deleted file mode 100644
index dc3c646e313d5208191bde51194c0d100c72c312..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmV;T0A2rOaBpL1Ff%hT0F(d#00sg8001Na08&#yF#rSr0096209p69N~~1#jmLj1
zsKp=*%Qyj4@*w&fUhBuBhim?%Y~V*G5kTTZQp)j>A@6}t9DgU{32%W~u+`RrVU@gV
z{cQ1`dU?y_mz3nqItRBONo#FjN~qK+vp|3x8HuTe$ZxLy@s<PCG!tTE+r|YL5L6dP
QFO@g26H1bc-1t7utz#fW)&Kwi

diff --git a/Server_Install_Pack/keys/epoch0340.bikey b/Server_Install_Pack/keys/epoch0340.bikey
new file mode 100644
index 0000000000000000000000000000000000000000..84a4347bf2fd19fc8543f48055c79a3b80cdbb23
GIT binary patch
literal 162
zcmV;T0A2rOaBpL1Ff%kT0F(d#00sg8001Na08&#yF#rSr009620Lh!3<WX#bv6Og|
zEl0r{n?p+sd~nZ%ghU{t<J<Y552Adf#I5rtjAT_x*YH`cQZz$51k!N8kr`_<>>WCL
zWhwS7ff#~|s#6lDl2G(!h&ca~28J{uZXY<4)|O0Rk8oAEJ?^DeZkE~JE2bI)q>x{)
Q-W0U&^Nodb6G-8*;f57MeE<Le

literal 0
HcmV?d00001

diff --git a/Sources/epoch_code/config.cpp b/Sources/epoch_code/config.cpp
index 73d69553..16e05992 100644
--- a/Sources/epoch_code/config.cpp
+++ b/Sources/epoch_code/config.cpp
@@ -16,7 +16,7 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.epochmod.com";
-		version = "0.3.3.1";
+		version = "0.3.4.0";
 		majorVersion = 0.3; //MUST BE A NUMBER!; Change this if we release a new major version, don't change if we push just push a hotfix
 		ArmAVersion = 150;
 		overview = "Open world survival mod set in the year 2035, Just two years after the mass extinction of billions of people. Those that remain are left with remnants of a once technological society. Try to survive, build, or explore your way through the harsh dynamic environment.";
@@ -27,20 +27,20 @@ class Epoch
 	class Version
 	{
 		//Version System, Check if PBO Version is compatible with Code
-		A3_epoch_assets = "0.3.3.0";
-		A3_epoch_assets_1 = "0.3.3.0";
-		epoch_objects = "0.3.3.0";
-		A3_epoch_assets_3 = "0.3.3.0";
-		A3_epoch_config = "0.3.3.1";
-		A3_epoch_language = "0.3.3.0";
-		Underground_Epoch = "0.3.3.0";
-		A3_epoch_vehicles = "0.3.3.0";
-		a3_epoch_weapons = "0.3.3.0";
-		a2_epoch_weapons = "0.3.3.0";
-		a3_epoch_structures = "0.3.3.0";
-		A3_epoch_functions = "0.3.3.0";
-		A3_epoch_vehicles_1 = "0.3.3.0";
-		Enhanced_Epoch_AiASupport = "0.3.3.0";
+		A3_epoch_assets = "0.3.4.0";
+		A3_epoch_assets_1 = "0.3.4.0";
+		epoch_objects = "0.3.4.0";
+		A3_epoch_assets_3 = "0.3.4.0";
+		A3_epoch_config = "0.3.4.0";
+		A3_epoch_language = "0.3.4.0";
+		Underground_Epoch = "0.3.4.0";
+		A3_epoch_vehicles = "0.3.4.0";
+		a3_epoch_weapons = "0.3.4.0";
+		a2_epoch_weapons = "0.3.4.0";
+		a3_epoch_structures = "0.3.4.0";
+		A3_epoch_functions = "0.3.4.0";
+		A3_epoch_vehicles_1 = "0.3.4.0";
+		Enhanced_Epoch_AiASupport = "0.3.4.0";
 
 	};
 };
diff --git a/Sources/epoch_config/Configs/CfgActions.hpp b/Sources/epoch_config/Configs/CfgActions.hpp
index c64d36eb..cc2deb5e 100644
--- a/Sources/epoch_config/Configs/CfgActions.hpp
+++ b/Sources/epoch_config/Configs/CfgActions.hpp
@@ -45,6 +45,10 @@ class CfgActions
 	{
 		show = 0;
 	};
+	class AddBag : None
+	{
+		show = 0;
+	};
 	class TakeMine : None
 	{
 		show = 0;
diff --git a/Sources/epoch_config/Configs/CfgEpochClient.hpp b/Sources/epoch_config/Configs/CfgEpochClient.hpp
index 69abb8ac..7fcae7cf 100644
--- a/Sources/epoch_config/Configs/CfgEpochClient.hpp
+++ b/Sources/epoch_config/Configs/CfgEpochClient.hpp
@@ -1,6 +1,6 @@
 class CfgEpochClient
 {
-	epochVersion = "0.3.3.1";
+	epochVersion = "0.3.4.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
diff --git a/Sources/epoch_config/Configs/CfgTraderMissions.hpp b/Sources/epoch_config/Configs/CfgTraderMissions.hpp
index d822f92a..041ff1be 100644
--- a/Sources/epoch_config/Configs/CfgTraderMissions.hpp
+++ b/Sources/epoch_config/Configs/CfgTraderMissions.hpp
@@ -1,6 +1,6 @@
 class MissionList{
 	traderMissionNames[] = {"Mission - Pikes Peak Express","Mission - Animal Control","Mission - Track a Raider","Mission - VIP Chauffeur","What's the time ?","Who is near by ?","What's New ?","What is your name ?"};
-	traderMissionDisabled[] = { 1, 2, 3 };
+	traderMissionDisabled[] = {};
 	traderMissionActiveNames[] = {"Intercept Package","","","VIP Capture"};
 	traderMissionLongDesc[] = {"Deliver an important message to another trader.","I need a wild animal bringing back here.","Take control of an UAV and track down a bounty.","Deliver a person safely to another location.","ASk the trader the local time.","Find out information about nearby people.","Ask the trader for any news.","Find out the traders name."};
 	traderMissionActiveLongDesc[] = {"Intercept a mission delivery and bring me the message.","","","Capture a VIP being driven."};
diff --git a/Sources/epoch_config/Configs/CfgWeapons.hpp b/Sources/epoch_config/Configs/CfgWeapons.hpp
index 7867d707..5d348a33 100644
--- a/Sources/epoch_config/Configs/CfgWeapons.hpp
+++ b/Sources/epoch_config/Configs/CfgWeapons.hpp
@@ -1110,6 +1110,25 @@ class CfgWeapons
 		hiddenSelections[] = {};
 		hitpointName = "HitHead";
 	};
+
+	class clown_mask_epoch : ItemCore
+	{
+		scope = 2;
+		weaponPoolAvailable = 1;
+		displayName = "Clown Mask";
+		picture = "\x\addons\a3_epoch_assets_3\CfgVehicles\Characters\gear_wolfmask_x_ca.paa";
+		model = "\x\addons\a3_epoch_assets_3\CfgVehicles\Characters\clown.p3d";
+		class ItemInfo : HeadgearItem
+		{
+			mass = 40;
+			uniformModel = "\x\addons\a3_epoch_assets_3\CfgVehicles\Characters\clown.p3d";
+			modelSides[] = { 3, 2, 1 };
+			// armor = 400;
+			passThrough = 0.5;
+			// hiddenSelections[] = { "camo" };
+		};
+	};
+
 	class H_F0_EPOCH: ItemCore
 	{
 		scope = 2;
diff --git a/Sources/epoch_config/config.cpp b/Sources/epoch_config/config.cpp
index a5f79b31..c85dce63 100644
--- a/Sources/epoch_config/config.cpp
+++ b/Sources/epoch_config/config.cpp
@@ -18,7 +18,7 @@ class CfgPatches
 		requiredAddons[] = { "a3_map_altis", "a3_map_stratis", "A3_epoch_assets_3", "a3_epoch_weapons", "epoch_objects", "A3_epoch_vehicles", "A3_epoch_assets_1", "A3_epoch_assets", "A3_Soft_F", "A3_Characters_F", "A3_Characters_F_Beta", "A3_Characters_F_EPA", "A3_Characters_F_EPB", "A3_Structures_F", "A3_Armor_F_Beta", "A3_Data_F", "A3_Weapons_F", "A3_Characters_F_Kart", "A3_Soft_F_Kart_Kart_01", "a2_epoch_weapons", "A3_Air_F_Gamma_UAV_01", "A3_Soft_F_Car", "A3_Soft_F_Heli_Car", "A3_Soft_F_Offroad_01", "A3_Soft_F_Quadbike", "A3_Soft_F_Heli_Quadbike", "A3_Soft_F_SUV", "A3_Soft_F_Heli_SUV", "A3_Boat_F_Boat_Transport_01", "A3_Soft_F_Truck", "A3_Soft_F_Heli_Truck", "A3_Soft_F_Bootcamp_Truck", "A3_Boat_F_Civilian_Boat", "A3_Air_F_Heli_Light_01", "A3_Air_F_Heli_Heli_Light_01", "A3_Air_F_Beta_Heli_Transport_01", "A3_Boat_F_SDV_01", "A3_Boat_F_Heli_SDV_01", "A3_Soft_F_MRAP_01", "A3_Soft_F_Heli_MRAP_01", "A3_Soft_F_HEMTT", "A3_Soft_F_Gamma_HEMTT", "A3_Soft_F_TruckHeavy", "A3_Soft_F_Gamma_TruckHeavy", "A3_Soft_F_EPC_Truck_03", "A3_Air_F_Heli_Light_02", "A3_Air_F_Beta_Heli_Transport_02", "A3_Air_F_EPB_Heli_Light_03", "A3_Air_F_Heli_Heli_Transport_04", "A3_Air_F_Heli_Heli_Transport_03", "A3_Animals_F_Dog", "A3_Animals_F_Rabbit", "A3_Animals_F_Chicken", "A3_Characters_F_Common", "A3_Structures_F_Ind_Transmitter_Tower", "a3_epoch_structures" };
 		magazines[] = { "30Rnd_test_mag", "5Rnd_rollins_mag", "CSGAS", "sledge_swing", "30Rnd_test_mag_Tracer", "EnergyPack", "1Rnd_Soda", "1Rnd_Food", "WoodLog_EPOCH", "PaintCanBlk", "PaintCanBlu", "PaintCanBrn", "PaintCanGrn", "PaintCanOra", "PaintCanPur", "PaintCanRed", "PaintCanTeal", "PaintCanYel" };
 		ammo[] = { "B_Test_45ACP_Ball", "B_Swing", "Sapper_Charge_Ammo", "SapperB_Charge_Ammo", "B_Soda", "B_Food", "B_Test_Caseless", "ChainSaw_Bullet", "SmokeShellCustom" };
-		epochVersion = "0.3.3.1";
+		epochVersion = "0.3.4.0";
 	};
 };
 
diff --git a/Sources/epoch_server/config.cpp b/Sources/epoch_server/config.cpp
index 60ebbf2b..98b3fd74 100644
--- a/Sources/epoch_server/config.cpp
+++ b/Sources/epoch_server/config.cpp
@@ -44,7 +44,7 @@ class cfgFunctions
 };
 class CfgServerVersion
 {
-	client = "0.3.3.1";
-	config = "0.3.3.1";
+	client = "0.3.4.0";
+	config = "0.3.4.0";
 	hive = "0.5.1.7";
 };
diff --git a/Sources/epoch_server_core/README.md b/Sources/epoch_server_core/README.md
new file mode 100644
index 00000000..7de7a173
--- /dev/null
+++ b/Sources/epoch_server_core/README.md
@@ -0,0 +1,41 @@
+**Epoch Mod**
+================
+
+Arma 3 Epoch Mod
+
+--------------------------
+Developers
+--------------------------
+* Aaron Clark - [VB]AWOL - Game Design,  Code
+* Kenneth Bente - Axle - Public Relations
+* Paul Tomany - Sequisha - Models, Textures
+* Dan - OrangeSherbet - Tester, Videos, Wiki Editor
+* Darren Harrison - Kiory - Models, Textures
+* Damian Clark - [VB]GREEN - Graphics
+* Niklas Wagner - Skaronator - Code
+* Andrew Gregory - Axeman - AI Code
+* Florian Kinder - Fank - DLL Code
+* Denis Erygin - devd - Linux DLL Support
+* Richie - Map Support
+* SteamPunkGears - Models
+* Raymix - UI and Code
+
+
+---------------------------
+Install Notes 
+---------------------------
+Hive DLL requires vs2013 redist: http://www.microsoft.com/en-us/download/details.aspx?id=40784
+
+
+---------------------------
+Tools Used 
+---------------------------
+Mikero's tools - https://dev-heaven.net/projects/mikero-pbodll/files
+	moveobject - repath previous epoch content
+	proproject 
+BIS Tools 
+
+---------------------------
+Resources
+---------------------------
+* MSOpenTech - https://github.com/MSOpenTech/Redis
diff --git a/Sources/epoch_server_core/config.cpp b/Sources/epoch_server_core/config.cpp
index fa9abad4..6274f6d3 100644
--- a/Sources/epoch_server_core/config.cpp
+++ b/Sources/epoch_server_core/config.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************
-Copyright (C) 2015 - ARMA 3 EPOCH MOD [EpochMod.com] (v0.3.3.0)
+Copyright (C) 2015 - ARMA 3 EPOCH MOD [EpochMod.com] (v0.3.4.0)
 *****************************************************************************/
 #define _ARMA_
 class CfgPatches {
diff --git a/Sources/epoch_server_settings/config.cpp b/Sources/epoch_server_settings/config.cpp
index e352c3de..05fd43c0 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.3.0)
+Copyright (C) 2015 - ARMA 3 EPOCH MOD [EpochMod.com] (v0.3.4.0)
 *****************************************************************************/
 
 #define _ARMA_
@@ -9,7 +9,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		epochVersion = "0.3.3.1";
+		epochVersion = "0.3.4.0";
 		requiredAddons[] = {};
 	};
 };
diff --git a/Sources/epoch_server_settings/configs/maps/takistan.h b/Sources/epoch_server_settings/configs/maps/takistan.h
index 7005ae03..e4f4a2ea 100644
--- a/Sources/epoch_server_settings/configs/maps/takistan.h
+++ b/Sources/epoch_server_settings/configs/maps/takistan.h
@@ -171,7 +171,7 @@ class Takistan : Default
 			{ "Land_InvisibleBarrier_F", {6051.98,1118.6,-3.05176e-005}, {{0.630672,0.775946,0.0126463},{0.0271672,-0.0383609,0.998895}}, true },
 			{ "Land_InvisibleBarrier_F", {6052.1,1110.34,0}, {{-0.792943,0.609278,0.004677},{-0.00639553,-0.0159986,0.999852}}, true },
 			{ "Land_InvisibleBarrier_F", {6054.44,1116.41,0}, {{0.630672,0.775946,0.0126463},{0.0271672,-0.0383609,0.998895}}, true },
-			{ "GroundWeaponHolder", {5955.7,1288.45,-0.00326538}, {{0.645762,-0.76004,-0.0730098},{0.0526556,-0.0510633,0.997306}}, true },
+			
 			//North Takistan Trader City//
 			{ "Land_FieldToilet_F", {4692.69,9216.02,0.00186157}, {{-0.181867,0.983211,-0.0148318},{-0.0384089,0.00796881,0.99923}}, true },
 			{ "Land_WoodenTable_large_F", {4699.68,9209.76,-0.000869751}, {{0.000108613,0.999872,0.0160187},{-0.00918588,-0.0160171,0.99983}}, true },
@@ -324,7 +324,7 @@ class Takistan : Default
 			{ "Land_WoodPile_F", {6830.02,5007.43,-0.0032959}, {{0.964708,-0.261382,0.0318968},{-0.039955,-0.0255718,0.998874}}, true },
 			{ "Land_WoodPile_F", {6828.34,5007.86,0.00384521}, {{-0.935741,0.351541,-0.02843},{-0.039955,-0.0255718,0.998874}}, true },
 			//North Airfield//
-			{ "GroundWeaponHolder", {5657.9,11199.4,-7.62939e-005}, 38.9082 },
+			
 			{ "Land_Dome_Big_F", {5687.97,11165,0}, 222.826 },
 			{ "Land_Research_HQ_F", {5694.74,11152,0}, 317.013 },
 			{ "Land_Cargo_House_V3_F", {5689.55,11182.2,0}, 0 },
diff --git a/Sources/mpmissions/epoch.VR/description.ext b/Sources/mpmissions/epoch.VR/description.ext
index 1c076b56..a2282c28 100644
--- a/Sources/mpmissions/epoch.VR/description.ext
+++ b/Sources/mpmissions/epoch.VR/description.ext
@@ -72,7 +72,7 @@ class CfgRemoteExec
 
 class CfgEpochClient
 {
-	epochVersion = "0.3.3.0";
+	epochVersion = "0.3.4.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