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

addons/javelin/functions/fnc_onOpticDraw.sqf

@@ -110,7 +110,7 @@ if((call CBA_fnc_getFoV) select 1 > 9) then {
 FUNC(disableFire) = {
     _firedEH = _this select 0;
     
-    if(_firedEH < 0) then {
+    if(_firedEH < 0 && difficulty > 0) then {
         _firedEH = [ACE_player, "DefaultAction", {true}, { 
             _canFire = ACE_player getVariable["ace_missileguidance_target", nil];
             if(!isNil "_canFire") exitWith { false };
@@ -122,7 +122,7 @@ FUNC(disableFire) = {
 FUNC(enableFire) = {
     _firedEH = _this select 0;
     
-    if(_firedEH > 0) then {
+    if(_firedEH > 0 && difficulty > 0) then {
         [ACE_player, "DefaultAction", _firedEH] call EFUNC(common,removeActionEventHandler);
     };
     -1

addons/javelin/functions/fnc_onOpticUnload.sqf

@@ -13,7 +13,7 @@ if(!isNil "_pfh") then {
 _args = uiNamespace getVariable[QGVAR(arguments), nil ];
 if(!isNil "_args") then {
     _disableFireEH = _args select 6;
-    if(_disableFireEH > 0) then {
+    if(_disableFireEH > 0  && difficulty > 0) then {
         [ACE_player, "DefaultAction", _disableFireEH] call EFUNC(common,removeActionEventHandler);
     };
     uiNameSpace setVariable [QGVAR(arguments),nil];

addons/missileguidance/functions/fnc_onFired.sqf

@@ -48,7 +48,7 @@ if(isNil "_target") then {
     } else {
         _canUseLock = getNumber (_config >> "canVanillaLock");
         // @TODO: Get vanilla target
-        if(_canUseLock > 0 || cadetMode) then {
+        if(_canUseLock > 0 || difficulty < 1) then {
             _vanillaTarget = cursorTarget;
             
             TRACE_1("Using Vanilla Locking", _vanillaTarget);

documentation/feature/javelin.md

@@ -0,0 +1,10 @@
+---
+layout: wiki
+title: Javelin/Titan Locking and Firing
+group: feature
+order: 5
+parent: wiki
+---
+
+## 1. Overview
+Blah blah blah

documentation/features/feature-list.md

@@ -0,0 +1,20 @@
+---
+layout: wiki
+title: Features Documentation
+group: features
+order: 0
+parent: wiki
+---
+
+
+**This page will get updated soon.**
+
+
+## Table of Contents
+
+  1. [][[Advanced Missile Guidanced Framework|WikiLink]]
+  2. [yy](#yy)
+  3. [zz](#zz)
+
+
+## What ACE3 has to offer

documentation/features/titan-javelin-usage.md

@@ -0,0 +1,10 @@
+---
+layout: wiki
+title: ACE Titan and Javelin
+group: features
+order: 0
+parent: wiki
+---
+
+
+**This page will get updated soon.**

documentation/framework/advanced-missile-guidance.md

@@ -0,0 +1,10 @@
+---
+layout: wiki
+title: Advanced Missile Guidance 
+group: framework
+order: 5
+parent: wiki
+---
+
+## 1. Overview
+Blah blah blah

documentation/framework/fragmentation-configuration.md

@@ -1,7 +1,7 @@
 ---
 layout: wiki
 title: Fragmentation Configuration
-group: development
+group: framework
 parent: wiki
 order: 7
 ---