Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3

addons/aircraft/CfgAmmo.hpp

@@ -8,8 +8,6 @@ class CfgAmmo {
         indirectHit = 12;
         indirectHitRange = 2; //2;
         caliber = 1.4;
-        deflecting = 3;
-        fuseDistance = 3;
         tracerStartTime = 0.02;
         timeToLive = 40;
         explosive = 1.8;

addons/aircraft/Heli_Attack_01_base_F.hpp

@@ -863,9 +863,6 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
     
     class Turrets: Turrets {
         class MainTurret: MainTurret {
-            directionStabilized = 1;
-            horizontallyStabilized  = 1;
-            
             weapons[] = {"ACE_gatling_20mm_Comanche","missiles_DAGR","missiles_ASRAAM", "ACE_AIR_SAFETY"};
             magazines[] = {"ACE_500Rnd_20mm_shells_Comanche","4Rnd_AAA_missiles","24Rnd_PG_missiles"};
             
@@ -880,7 +877,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
             discretedistance[] = {100,200,300,400,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1600,1700,1800,1900,2000,2100,2200,2300,2400,2500,2600,2700,2800,2900,3000};
             discretedistanceinitindex = 3;
             copilotHasFlares = 1;
-                
+            directionStabilized = 1;
             isCopilot = 1;
             showHMD = 1;
             CanEject = 1;
@@ -910,6 +907,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
                     thermalMode[] = {0,1};
                     gunnerOpticsColor[] = {0,0,0,1};
                     directionStabilized = 1;
+					horizontallyStabilized = 1;
                     gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_wide_F";
                 };
                 class Medium: Wide
@@ -920,6 +918,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
                     maxFov = 0.093;
                     gunnerOpticsColor[] = {0,0,0,1};
                     directionStabilized = 1;
+					horizontallyStabilized = 1;
                     gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_medium_F";
                 };
                 class Narrow: Wide
@@ -930,6 +929,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
                     maxFov = 0.029;
                     gunnerOpticsColor[] = {0,0,0,1};
                     directionStabilized = 1;
+					horizontallyStabilized = 1;
                     gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_narrow_F";
 
                 };
@@ -941,6 +941,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
                     maxFov = 0.01;
                     gunnerOpticsColor[] = {0,0,0,1};
                     directionStabilized = 1;
+					horizontallyStabilized = 1;
                     gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_narrow_F";
 
                 };
@@ -958,8 +959,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
                     initFov = 1.1;
                     minFov = 0.133;
                     maxFov = 1.1;
-                    visionMode[] = {"Normal","NVG","Ti"};
+                    visionMode[] = {"Normal","NVG"};
-                    thermalMode[] = {2,3};
                     gunnerOpticsModel = "";
                     gunnerOpticsEffect[] = {};
                     hideUnitInfo = 1;

addons/common/stringtable.xml

@@ -296,25 +296,21 @@
       <Hungarian>Nincs hang</Hungarian>
     </Key>
     <Key ID="STR_ACE_ACTION_ACCEPT_REQUEST_KEY_TITLE">
-      <Original>Accept Requests</Original>
       <Polish>Akceptuj prośby</Polish>
       <Spanish>Aceptar Peticiones</Spanish>
       <English>Accept Requests</English>
     </Key>
     <Key ID="STR_ACE_ACTION_DECLINE_REQUEST_KEY_TITLE">
-      <Original>Decline Requests</Original>
       <Polish>Ignoruj prośby</Polish>
       <Spanish>Rechazar Peticiones</Spanish>
       <English>Decline Requests</English>
     </Key>
     <Key ID="STR_ACE_ACTION_ACCEPT_REQUEST_KEY_TOOLTIP">
-      <Original>Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions.</Original>
       <Polish>Akceptuj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności.</Polish>
       <Spanish>Acepta Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones.</Spanish>
       <English>Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions.</English>
     </Key>
     <Key ID="STR_ACE_ACTION_DECLINE_REQUEST_KEY_TOOLTIP">
-      <Original>Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions.</Original>
       <Polish>Ignoruj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności.</Polish>
       <Spanish>Rechazar Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones.</Spanish>
       <English>Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions.</English>

addons/fcs/functions/fnc_firedEH.sqf

@@ -50,6 +50,12 @@ _velocityCorrection = (vectorMagnitude velocity _projectile) -
 
 [_projectile, (_vehicle getVariable format ["%1_%2", QGVAR(Azimuth), _turret]), _offset, -_velocityCorrection] call EFUNC(common,changeProjectileDirection);
 
+// Remove the platform velocity 
+if( (vectorMagnitude velocity _vehicle) > 2) then {
+    _sumVelocity = (velocity _projectile) vectorDiff (velocity _vehicle);
+    _projectile setVelocity _sumVelocity;
+};
+
 // Air burst missile
 
 // handle locally only

addons/laserpointer/stringtable.xml

@@ -17,7 +17,6 @@
     </Key>
 
     <Key ID="STR_ACE_Laserpointer_useLaser">
-      <Original>&lt;t color='#9cf953'&gt;Use: &lt;/t&gt;Turn Laser ON/OFF</Original>
       <English>&lt;t color='#9cf953'&gt;Use: &lt;/t&gt;Turn Laser ON/OFF</English>
       <Czech>&lt;t color='#9cf953'&gt;Použití: &lt;/t&gt;Zapnout/vypnout laser</Czech>
       <French>&lt;t color='#9cf953'&gt;Utiliser : &lt;/t&gt;laser on/off</French>

addons/magazines/CfgEventHandlers.hpp

@@ -1,13 +0,0 @@
-class Extended_PreInit_EventHandlers {
-    class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
-    };
-};
-
-class Extended_FiredBIS_EventHandlers {
-    class AllVehicles {
-        class ADDON {
-            firedBIS = QUOTE(_this call FUNC(forceMagazineMuzzleVelocity));
-        };
-    };
-};

addons/magazines/CfgMagazines.hpp

@@ -22,7 +22,6 @@ class CfgMagazines {
         descriptionShort = "$STR_ACE_30Rnd_65x39_caseless_mag_SDDescription";
         picture = "\A3\weapons_f\data\ui\m_30stanag_caseless_green_CA.paa";
         initSpeed = 320;
-        GVAR(forceMagazineMuzzleVelocity) = 1;
     };
 
     class ACE_30Rnd_65x39_caseless_mag_AP: 30Rnd_65x39_caseless_mag {
@@ -58,7 +57,6 @@ class CfgMagazines {
         displayNameShort = "$STR_ACE_30Rnd_65x39_caseless_green_mag_SDNameShort";
         descriptionShort = "$STR_ACE_30Rnd_65x39_caseless_green_mag_SDDescription";
         initSpeed = 320;
-        GVAR(forceMagazineMuzzleVelocity) = 1;
     };
 
     class ACE_30Rnd_65x39_caseless_green_mag_AP: 30Rnd_65x39_caseless_green {
@@ -90,7 +88,6 @@ class CfgMagazines {
         displayNameShort = "$STR_ACE_30Rnd_556x45_mag_SDNameShort";
         descriptionShort = "$STR_ACE_30Rnd_556x45_mag_SDDescription";
         initSpeed = 320;
-        GVAR(forceMagazineMuzzleVelocity) = 1;
         picture = "\A3\weapons_f\data\ui\m_30stanag_green_ca.paa";
     };
 
@@ -130,7 +127,6 @@ class CfgMagazines {
         displayNameShort = "$STR_ACE_20Rnd_762x51_mag_SDNameShort";
         descriptionShort = "$STR_ACE_20Rnd_762x51_mag_SDDescription";
         initSpeed = 320;
-        GVAR(forceMagazineMuzzleVelocity) = 1;
     };
 
     class ACE_20Rnd_762x51_Mag_AP: 20Rnd_762x51_Mag {

addons/magazines/XEH_preInit.sqf

@@ -1,7 +0,0 @@
-#include "script_component.hpp"
-
-ADDON = false;
-
-PREP(forceMagazineMuzzleVelocity);
-
-ADDON = true;

addons/magazines/config.cpp

@@ -12,8 +12,6 @@ class CfgPatches {
     };
 };
 
-#include "CfgEventHandlers.hpp"
-
 #include "CfgAmmo.hpp"
 #include "CfgMagazines.hpp"
 #include "CfgVehicles.hpp"

addons/magazines/functions/fnc_forceMagazineMuzzleVelocity.sqf

@@ -1,41 +0,0 @@
-/*
- * Author: commy2
- *
- * DESCRIPTION.
- *
- * Arguments:
- * firedBIS
- *
- * Return Value:
- * None
- */
-
-#include "script_component.hpp"
-
-private ["_weapon", "_magazine", "_projectile"];
-
-_weapon = _this select 1;
-_magazine = _this select 5;
-_projectile = _this select 6;
-
-if (getNumber (configFile >> "CfgMagazines" >> _magazine >> QGVAR(forceMagazineMuzzleVelocity)) != 1) exitWith {
-    //hint str (speed _projectile / 3.6);
-};
-
-private ["_initSpeedWeapon", "_initSpeedMagazine"];
-
-_initSpeedWeapon = getNumber (configFile >> "CfgWeapons" >> _weapon >> "initSpeed");
-_initSpeedMagazine = getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed");
-
-//systemChat format ["W: %1m/s, M: %2m/s", _initSpeedWeapon, _initSpeedMagazine];
-
-// force magazine initSpeed
-
-private ["_credit", "_debit"];
-
-_credit = vectorMagnitude velocity _projectile;
-_debit = _credit + (_initSpeedMagazine - _initSpeedWeapon);
-
-_projectile setVelocity ((velocity _projectile) vectorMultiply (_debit / _credit));
-
-//hint str (speed _projectile / 3.6);

addons/magazines/functions/script_component.hpp

@@ -1 +0,0 @@
-#include "\z\ace\addons\magazines\script_component.hpp"

addons/medical/CfgVehicles.hpp

@@ -886,7 +886,7 @@ class CfgVehicles {
         scope = 2;
         accuracy = 1000;
         displayName = "[ACE] Medical Supply Crate";
-        model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
+        model = PATHTOF(data\ace_medcrate.p3d);
         author = "$STR_ACE_Common_ACETeam";
         class TransportItems {
             class ACE_fieldDressing {

addons/winddeflection/stringtable.xml

@@ -3,31 +3,26 @@
 	<Package name="WindDeflection">
 		<Container ID="Weather_Meter">
 			<Key ID="STR_ACE_WEATHER_METER_WIND_CATEGORY"> 
-				<Original>Wind Information</Original>
 				<English>Wind Information</English>
 				<Polish>Informacje o wietrze</Polish>
 				<Spanish>Información del viento</Spanish>
 			</Key>
 			<Key ID="STR_ACE_WEATHER_METER_WIND_DIRECTION">
-				<Original>Direction: %1</Original>
 				<English>Direction: %1</English>
 				<Polish>Kierunek: %1</Polish>
 				<Spanish>Dirección: %1</Spanish>
 			</Key>
 			<Key ID="STR_ACE_WEATHER_METER_WIND_SPEED">
-				<Original>Speed: %1 m/s</Original>
 				<English>Speed: %1 m/s</English>
 				<Polish>Prędkość: %1</Polish>
 				<Spanish>Velocidad: %1 m/s</Spanish>
 			</Key>
 			<Key ID="STR_ACE_WEATHER_METER_WEATHER_CATEGORY">
-				<Original>Weather Information</Original>
 				<English>Weather Information</English>
 				<Polish>Informacje o pogodzie</Polish>
 				<Spanish>Información Meteorológica</Spanish>
 			</Key>
 			<Key ID="STR_ACE_WEATHER_METER_WEATHER_HUMIDITY">
-				<Original>Humidity: %1%</Original>
 				<English>Humidity: %1%</English>
 				<Polish>Wilgotność: %1</Polish>
 				<Spanish>Humedad: %1%</Spanish>