Merge pull request #82 from EpochModTeam/experimental

Release 1.2

Sources/a2_epoch_weapons/config.cpp

@@ -6,6 +6,6 @@
 		weapons[]={};
 		requiredVersion=0.1;
 		requiredAddons[]={};
-		epochVersion = "1.1.0";
+		epochVersion = "1.2.0";
 	};
 };

Sources/a3_epoch_assets/config.cpp

@@ -3,7 +3,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		epochVersion = "1.1.0";
+		epochVersion = "1.2.0";
 		requiredAddons[] = {};
 	};
 };

Sources/a3_epoch_assets_1/config.cpp

@@ -3,7 +3,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		epochVersion = "1.1.0";
+		epochVersion = "1.2.0";
 		requiredAddons[] = {};
 	};
 };

Sources/a3_epoch_assets_2/config.cpp

@@ -8,6 +8,6 @@ class CfgPatches
 		requiredAddons[] = {};
 		magazines[] = {};
 		ammo[] = {};
-		epochVersion = "1.1.0";
+		epochVersion = "1.2.0";
 	};
 };

Sources/a3_epoch_assets_3/config.cpp

@@ -8,6 +8,6 @@ class CfgPatches
 		requiredAddons[] = {};
 		magazines[] = {};
 		ammo[] = {};
-		epochVersion = "1.1.0";
+		epochVersion = "1.2.0";
 	};
 };

Sources/a3_epoch_code/config.cpp

@@ -33,8 +33,8 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.epochmod.com";
-		version = "1.1.0";
-		majorVersion = 0.5; //MUST BE A NUMBER!; Change this if we release a new major version, don't change if we push just push a hotfix
+		version = "1.2.0";
+		majorVersion = 1.1; //MUST BE A NUMBER!; Change this if we release a new major version, don't change if we push just push a hotfix
 		overview = "Open world survival mod set 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.";
 	};
 };
@@ -43,19 +43,18 @@ class Epoch
 	class Version
 	{
 		//Version System, Check if PBO Version is compatible with Code
-		A3_epoch_assets = "1.1.0";
-		A3_epoch_assets_1 = "1.1.0";
-		epoch_objects = "1.1.0";
-		A3_epoch_assets_3 = "1.1.0";
-		A3_epoch_config = "1.1.0";
-		A3_epoch_language = "1.1.0";
-		a3_epoch_Underground = "1.1.0";
-		A3_epoch_vehicles = "1.1.0";
-		a3_epoch_weapons = "1.1.0";
-		a2_epoch_weapons = "1.1.0";
-		a3_epoch_structures = "1.1.0";
-		A3_epoch_functions = "1.1.0";
-		A3_epoch_vehicles_1 = "1.1.0";
-		a3_epoch_community = "1.1.0";
+		A3_epoch_assets = "1.2.0";
+		A3_epoch_assets_1 = "1.2.0";
+		epoch_objects = "1.2.0";
+		A3_epoch_assets_3 = "1.2.0";
+		A3_epoch_config = "1.2.0";
+		A3_epoch_language = "1.2.0";
+		A3_epoch_vehicles = "1.2.0";
+		a3_epoch_weapons = "1.2.0";
+		a2_epoch_weapons = "1.2.0";
+		a3_epoch_structures = "1.2.0";
+		A3_epoch_functions = "1.2.0";
+		A3_epoch_vehicles_1 = "1.2.0";
+		a3_epoch_community = "1.2.0";
 	};
 };

Sources/a3_epoch_code/gui/changelog.html

@@ -11,71 +11,58 @@
 <p>
 For the full Changelog click: <a href="https://github.com/EpochModTeam/Epoch/blob/release/changelog.md">Github</a><br>
 <br>
-<b>## [1.1.0.0]</b><br>
+<b>## [1.2.0.0]</b><br>
 <b>### Added</b><br>
-- Plant Spawner: vehicle object for sunflower. @Helion4<br>
-- MoneyDrop Event: Random Money lump with Mapmarker (like Plants) @He-Man<br>
-- Examples for Vehicle upgrades for Server Admins into CfgVehicleUpgrades.hpp @He-Man<br>
-- Make Lighter refillable at Fuel-Sources (Gasstations / Vehicles) @He-Man<br>
-- Make Trader more configurable in epochconfig.hpp @He-Man<br>
-- Added Examples for Batchfiles to control Server Restarts @DirtySanchez<br>
-- default pops for "center" marker @AWOL<br>
-- More map supports @AWOL<br>
-- Lighter is needed to imflame fires @DirtySanchez<br>
-- FireExtinguisher is needed to "put our fire" on Burn Barrel @DirtySanchez<br>
-- Rope is needed for SlingLoad (get back on release) @DirtySanchez<br>
-- R3F compatibility for SlingLoad @DirtySanchez<br>
-- Hints while using Vehicle Repair (MultiGun) @He-Man<br>
-- Config to completely disable Simulation for BaseParts (if not needed) @He-Man<br>
-- Made Radiation configureable by cfgepochclient.hpp @Raymix<br>
-- Hints for lock / unlock Vehicles / Storages @He-Man<br>
-- Nuisance multiplicator in cfgepochclient.hpp @He-Man<br>
-- Reduce rads over time at cost of immunity @Raymix<br>
-- Wearable Male + Female wearable full radiation suit @Helion4<br>
-- December seasonal items (Santa hat / Snowman) @Helion4<br>
-- Autorun function (suggested by Ghostrider) @He-Man<br>
-&nbsp;&nbsp;&nbsp;- Default Key is "W"<br>
-&nbsp;&nbsp;&nbsp;- You can change the key in EPOCH ESC Menu<br>
-&nbsp;&nbsp;&nbsp;- If choosen key is same as "moveforward" (default), you have to 2x tap it, else you only have to 1x tap it<br>
-&nbsp;&nbsp;&nbsp;- If your legs are broken, you get a hint "can not autorun - legs are broken"<br>
-&nbsp;&nbsp;&nbsp;- If the terrain is too steep, you only walk in AutoRun<br>
-&nbsp;&nbsp;&nbsp;- Inside Water, you can not Autorun<br>
-- Helper 3D-Icon + Line on the part, where element is snapped on (while Base-Building) @He-Man<br>
-- Config in cfgepochclient.hpp to block ATM's in Plotpole range @He-Man<br>
-- Power Sword @Helion<br>
+- Radiation Suits to Loot, Pricing and Itemsort<br>
+- Reworked Trader Menu<br>
+&nbsp;&nbsp;&nbsp;- Secondary Weapon can now be sold directly from hand<br>
+&nbsp;&nbsp;&nbsp;- Attachments from sold weapons from hand will be put back into your Inventory<br>
+&nbsp;&nbsp;&nbsp;- Weapons in hand are now marked in menu as "in Hand"<br>
+- Solar Charger for EnergyPacks - Put an EnergyPack into the Charger and wait...<br>
+- 4 Hoverboard Vehicles:<br>
+&nbsp;&nbsp;&nbsp;- "hoverboard_epoch_1"<br>
+&nbsp;&nbsp;&nbsp;- "hoverboard_epoch_bttf"<br>
+&nbsp;&nbsp;&nbsp;- "hoverboard_epoch_a3"<br>
+&nbsp;&nbsp;&nbsp;- "hoverboard_epoch_cargo"<br>
+- Mountainbike "MBK_01_EPOCH"<br>
+- Helicopter UH1H "uh1h_Epoch"<br>
+- BaseCam + BaseCam Terminal<br>
+&nbsp;&nbsp;&nbsp;- Build Cams at your Base and watch them through the Terminal<br>
+- Wooden Stairs with lockable Bars on the top (upgradeable from Wooden Stairs)<br>
+- Wood and Metal Garage Doors as upgradeable Baseparts<br>
+- 1/3 Plywood wall directly craftable<br>
+- You can now wash yourself with a soap in your inventory at water sources (reduce Soiled)<br>
+- 2 new masks (Thor Helmet "thor_mask_epoch" and Iron Man Mask "iron_mask_epoch")<br>
 <b>### Fixed</b><br>
-- False BE kicks since Arma 3 1.80 update.<br>
-- Nightlight now also follow players inside Vehicles @He-Man<br>
-- Fixed fault disabled DynamicDebris @morgoth0<br>
-- SERVER_VARS (BaseSpawn) was not saved on revive @morgoth0<br>
-- Without Advanced Vehicle Repair, Vehicle upgrade was not available @He-Man<br>
-- Base Storages could be deleted if near Loot containers were auto-deleted @He-Man<br>
-- Some Tarp Loot was spawned under the Floor @He-Man<br>
-- Reworked wall check by getting out of Vehicles @He-Man<br>
-- Garden Plot had no physical ground @Helion4<br>
-- Some Vehicles were missing in EPOCH Admin Spawn Menu @He-Man<br>
+- Mine Rocks / Chop Wood was only possible with Swords after 1.1.0 update.<br>
+- Alive Toxic Sapper was not toxic<br>
+- Binocular with "B" was not working, if you are using R3F or AdvSlingLoad<br>
+- Models for Radiation Suits<br>
+- Hopefully less login issues on BaseSpawn<br>
+- Kick by using Jet ejector seats<br>
+- Wrong calculated Bullets in Traders<br>
+- Locked Vehicles were unlocked after upgrade<br>
+- Everybody was able to open Hatch on Windows / Doors on foreign Bases<br>
+- Ban for "RscMenuTeam" commandmenu<br>
+- Adjusted some SnapPoints for Basebuilding to be more accurate<br>
+- Advanced Vehicle Repair was broken after last Arma Update (Tank DLC)<br>
+- Added missing ItemWaterPurificationTablets to pricing<br>
+- MultiGun was not working on very large Vehicles (VTOL)<br>
+- GoldenSeal will no longer disappear when fully grown in a Garden<br>
+- Items in Subcontainers (Items in BackPacks in Containers) were not saved<br>
+- Drunk effects were not working correctly<br>
+- Model / Graphics fix for Cinder Floors<br>
+- Snapped Walls on Stairs sometimes were not fixed correctly<br>
+- Quadbike handling was a bit too slippery<br>
 <b>### Changed</b><br>
-- RCon Port is now set to 2307 by default since changes in A3 1.78 prevent use of 2306. @AWOL<br>
-- SnapPoints for Building objects (especially full / half / quarter Floors) @He-Man<br>
-- Some performance tweaks<br>
-- Inventory will be opened automatically, if "you found something" @AWOL<br>
-- EPOCH Events reworked (Markers will change if players near / event looted) @DirtySanchez<br>
-- Traders will no longer refill sold magazines @He-Man<br>
-&nbsp;&nbsp;&nbsp;- Magazines will automatic be repacked in Trader<br>
-&nbsp;&nbsp;&nbsp;- First the trader offers full magazines<br>
-&nbsp;&nbsp;&nbsp;- If no full magazine is available, the Trader offer the last not full magazine<br>
-&nbsp;&nbsp;&nbsp;- Not full magazines are colored: Yellow (nearly full) -> Red (nearly empty)<br>
-&nbsp;&nbsp;&nbsp;- You also get a Tooltip, how much bullets left in magazine<br>
-&nbsp;&nbsp;&nbsp;- The prices are calculated by the left bullets in the magazine<br>
-- Increased snap-distance for Foundations (much easier to find snap positions) @He-Man<br>
-- Reworked and added EPOCH Vehicle Classes @He-Man<br>
-&nbsp;&nbsp;&nbsp;- Each upgrade increase Speed, Torque, Fuel, Terrainbehaviour, Load and Armor<br>
-&nbsp;&nbsp;&nbsp;- Hatchback >= lvl2 will no longer stuck in forests<br>
-&nbsp;&nbsp;&nbsp;- Added M900 forced without Backseats -> "C_Heli_Light_01_civil_2seat_EPOCH"<br>
-&nbsp;&nbsp;&nbsp;- Added M900 forced with Backseats -> "C_Heli_Light_01_civil_4seat_EPOCH"<br>
-&nbsp;&nbsp;&nbsp;- The Random M900 will also stay available -> "C_Heli_Light_01_civil_EPOCH"<br>
-&nbsp;&nbsp;&nbsp;- Added very low EPOCH variants of VTOL and Xi'an (eventually we have to change them with the next update a bit)<br>
-&nbsp;&nbsp;&nbsp;- Added Door-Animations to some Vehicles by GetIn / GetOut<br>
+- Reworked Vehicle Load / Save commands for more precise Vehicle Spawn<br>
+- Made Temp-Vehicles tradable (will not be stored in Trader after selling them)<br>
+- Wood / Cinder Walls can now snap to each other<br>
+- Energy from windsources / solarsources is now calculated by wind / overcast<br>
+- Ammo of crafted Mags are calculated by the left ammo of used Mags (example: EnergyPacks)<br>
+- Consumed EnergyPacks give only energy calculated by left ammo in the Pack<br>
+- Vehicle pricing adjustments "import tariffs"<br>
+- Some now Icons for Dynamenu<br>
 </p>
 </body>
 </html>

Sources/a3_epoch_community/MBK/mbk.cfg

@@ -0,0 +1,129 @@
+class CfgSkeletons
+{
+	class Default
+	{
+		isDiscrete = 1;
+		skeletonInherit = "";
+		skeletonBones[] = {};
+	};
+	class Vehicle : Default {};
+	class mbk_skel: Vehicle
+	{
+		skeletonBones[]=
+		{
+		    "frame","",
+			"Volant","frame",
+			"wheel_1_damper","Volant",
+			"light","Volant",
+			"wheel_2_damper","",
+			"wheel_1","wheel_1_damper",
+			"wheel_2","wheel_2_damper",
+			"prevodnik","",
+			"slapka_leva","prevodnik",
+			"slapka_prava","prevodnik"
+		};
+	};
+};
+class CfgModels
+{
+	class Default
+	{
+		sectionsInherit = "";
+		sections[] = {"light"};
+		skeletonName = "";
+	};
+	class Vehicle: Default {};
+	class MBK: Vehicle
+	{
+		sections[]={};
+		skeletonName="mbk_skel";
+		class Animations
+		{
+
+			class DrivingWheel
+			{
+				type="rotation";
+				source="drivingWheel";
+				selection="Volant";
+				axis="osa_volant";
+				memory="true";
+				animPeriod=0;
+				minValue=-1;
+				maxValue=1;
+				angle0=18;
+				angle1=-18;
+			};
+			class FrontWheel
+			{
+				type="rotationX";
+				source="wheel";
+				selection="wheel_1";
+				axis="osa_wheel_1";
+				memory="true";
+				animPeriod=0;
+				sourceAddress="loop";
+				minValue=0;
+				maxValue=1;
+				angle0=0;
+				angle1="rad -360";
+			};
+			class BackWheel: FrontWheel
+			{
+				selection="wheel_2";
+				axis="osa_wheel_2";
+			};
+
+			class Prevodnik
+			{
+				animPeriod=0.100000;
+				type="rotationX";
+				source="pedals";
+				selection="prevodnik";
+				axis="osa_prevodnik";
+				memory=1;
+				minValue=0.000000;
+				maxValue=1.000000;
+				angle0=0.000000;
+				angle1=-6.283185;
+			};
+			class Slapka_prava: Prevodnik
+			{
+
+				selection="slapka_prava";
+				axis="osa_slapka_prava";
+
+				angle0=0.000000;
+				angle1=6.283185;
+			};
+			class Slapka_leva: Slapka_prava
+			{
+				selection="slapka_leva";
+				axis="osa_slapka_leva";
+			};
+			class FrontWheelDamper
+			{
+				animPeriod=0;
+				type="translation";
+				source="Damper";
+				selection="wheel_1_damper";
+				axis="osa_volant";
+				minValue=-1.000000;
+				maxValue=1.000000;
+				offset0=0.6000000;  //0.6000000
+				offset1=-0.400000;  //0.400000
+			};
+			class BackWheelDamper
+			{
+				animPeriod=0;
+				type="translation";
+				source="Damper";
+				selection="wheel_2_damper";
+				axis="osa_volant";
+				minValue=-1.000000;
+				maxValue=1.000000;
+				offset0=0.000000;
+				offset1=0.000000;
+			};					
+		};
+	};
+};

Sources/a3_epoch_community/config.cpp

@@ -6,6 +6,6 @@
 		weapons[]={};
 		requiredVersion=0.1;
 		requiredAddons[]={};
-		epochVersion = "1.1.0";
+		epochVersion = "1.2.0";
 	};
 };

Sources/a3_epoch_community/epoch_radsuit/data/Radsuit2.rvmat

@@ -12,7 +12,7 @@ PixelShaderID="Super";
 VertexShaderID="Super";
 class Stage1
 {
-	texture="\x\addons\a3_epoch_community\epoch_radsuit\data\Radsuit2_nohq.paa";
+	texture="x\addons\a3_epoch_community\epoch_radsuit\data\Radsuit2_nohq.paa";
 	uvSource="tex";
 	class uvTransform
 	{
@@ -48,8 +48,7 @@ class Stage3
 };
 class Stage4
 {
-	texture="\x\addons\a3_epoch_community\epoch_radsuit\data\Radsuit2_AS.paa";
-	//texture="#(argb,8,8,3)color(0,0,0,0,AS)";
+	texture="x\addons\a3_epoch_community\epoch_radsuit\data\Radsuit2_AS.paa";
 	uvSource="tex";
 	class uvTransform
 	{
@@ -61,7 +60,7 @@ class Stage4
 };
 class Stage5
 {
-	texture="\x\addons\a3_epoch_community\epoch_radsuit\data\Radsuit2_smdi.paa";
+	texture="x\addons\a3_epoch_community\epoch_radsuit\data\Radsuit2_smdi.paa";
 	uvSource="tex";
 	class uvTransform
 	{