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

addons/aircraft/Heli_Attack_01_base_F.hpp

@@ -891,6 +891,25 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
             
             class OpticsIn
             {
+                class WideUnstabalized
+                {
+                    opticsDisplayName = "WU";
+                    initAngleX = 0;
+                    minAngleX = -35;
+                    maxAngleX = 10;
+                    initAngleY = 0;
+                    minAngleY = -100;
+                    maxAngleY = 100;
+                    initFov = 0.466;
+                    minFov = 0.466;
+                    maxFov = 0.466;
+                    visionMode[] = {"Normal","Ti"};
+                    thermalMode[] = {0,1};
+                    gunnerOpticsColor[] = {0,0,0,1};
+                    directionStabilized = 0;
+                    horizontallyStabilized = 1;
+                    gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_wide_F";
+                };
                 class Wide
                 {
                     opticsDisplayName = "W";

addons/atragmx/functions/fnc_parse_input.sqf

@@ -95,9 +95,9 @@ if ((missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false])
 GVAR(workingMemory) set [1, _muzzleVelocity];
 GVAR(workingMemory) set [2, _zeroRange];
 
-private ["_elevationCur", "_windageCur", "_elevationScopeStep", "_windageScopeStep"];
+private ["_elevationCur", "_windageCur", "_clickSize", "_clickNumber", "_clickInterval"];
-_elevationCur = parseNumber(ctrlText 402);
+_elevationCur = GVAR(workingMemory) select 10;
-_windageCur = parseNumber(ctrlText 412);
+_windageCur = GVAR(workingMemory) select 11;
 
 switch (GVAR(currentScopeUnit)) do {
     case 0: {
@@ -109,11 +109,16 @@ switch (GVAR(currentScopeUnit)) do {
         _windageCur = _windageCur / 1.047;
     };
     case 3: {
-        _elevationScopeStep = (GVAR(workingMemory) select 7);
+        switch (GVAR(workingMemory) select 7) do {
-        _windageScopeStep = (GVAR(workingMemory) select 8);
+            case 0: { _clickSize = 1; };
+            case 1: { _clickSize = 1 / 1.047; };
+            case 2: { _clickSize = 3.38; };
+        };
+        _clickNumber = GVAR(workingMemory) select 8;
+        _clickInterval = _clickSize / _clickNumber;
         
-        _elevationCur = _elevationCur * _elevationScopeStep;
+        _elevationCur = Round(_elevationCur / _clickInterval);
-        _windageCur = _windageCur * _windageScopeStep;
+        _windageCur = Round(_windageCur / _clickInterval);
     };
 };
 

addons/attach/CfgWeapons.hpp

@@ -5,7 +5,6 @@ class CfgWeapons {
 
     class ACE_IR_Strobe_Item: ACE_ItemCore {
         ACE_attachable = "ACE_IR_Strobe_Effect";
-        author = "$STR_ACE_Common_ACETeam";
         scope = 2;
         displayName = "$STR_ACE_IrStrobe_Name";
         descriptionShort = "$STR_ACE_IrStrobe_Description";

addons/common/CfgWeapons.hpp

@@ -2,6 +2,7 @@
 class CfgWeapons {
     class ItemCore;
     class ACE_ItemCore: ItemCore {
+        author = "$STR_ACE_Common_ACETeam";
         type = 4096;//4;
         detectRange = -1;
         simulation = "ItemMineDetector";
@@ -13,6 +14,7 @@ class CfgWeapons {
     };
 
     class ACE_FakePrimaryWeapon: Rifle_Base_F {
+        author = "$STR_ACE_Common_ACETeam";
         scope = 2;
         scopeCurator = 1;
         
@@ -30,7 +32,6 @@ class CfgWeapons {
 
     class InventoryItem_Base_F;
     class ACE_Banana: ACE_ItemCore {
-        author = "$STR_ACE_Common_ACETeam";
         scope = 2;
         displayName = "$STR_ACE_Common_bananaDisplayName";
         descriptionShort = "$STR_ACE_Common_bananaDescr";

addons/explosives/CfgVehicles.hpp

@@ -50,7 +50,7 @@ class CfgVehicles {
     class Items_base_F;
     class ACE_DefuseObject: Items_base_F {
         XEH_ENABLED;
-        author = "ACE";
+        author = "$STR_ACE_Common_ACETeam";
         _generalMacro = "ACE_DefuseObject";
         displayName = "ACE Defuse Helper";
         mapSize = 0.2;
@@ -80,7 +80,7 @@ class CfgVehicles {
     };
     class ACE_Explosives_Place: Items_base_F {
         XEH_ENABLED;
-        author = "ACE";
+        author = "$STR_ACE_Common_ACETeam";
         _generalMacro = "ACE_Explosives_Place";
         displayName = "Multi-meter";
         mapSize = 0.2;

addons/grenades/CfgMagazines.hpp

@@ -1,6 +1,7 @@
 class CfgMagazines {
     class HandGrenade;
     class ACE_HandFlare_Base: HandGrenade {
+        author = "$STR_ACE_Common_ACETeam";
         value = 2;
         nameSoundWeapon = "smokeshell";
         nameSound = "smokeshell";
@@ -41,19 +42,23 @@ class CfgMagazines {
     };
     class ACE_M84: HandGrenade {
         ammo = "ACE_G_M84";
+        author = "$STR_ACE_Common_ACETeam";
         displayname = "$STR_ACE_Grenades_M84_Name";
         descriptionshort = "$STR_ACE_Grenades_M84_Description";
         displayNameShort = "M84";
+        mass = 4;
         model = PATHTOF(models\ACE_m84.p3d);
         picture = PATHTOF(UI\ACE_m84_x_ca.paa);
     };
 
     class 3Rnd_UGL_FlareGreen_F;
     class 6Rnd_GreenSignal_F: 3Rnd_UGL_FlareGreen_F {
+        author = "$STR_ACE_Common_ACETeam";
         ammo = "F_40mm_Green";
         initSpeed = 120;
     };
     class 6Rnd_RedSignal_F: 6Rnd_GreenSignal_F {
+        author = "$STR_ACE_Common_ACETeam";
         ammo = "F_40mm_Red";
         initSpeed = 120;
     };

addons/grenades/functions/fnc_flashbangExplosionEH.sqf

@@ -80,7 +80,7 @@ _affected = _grenade nearEntities ["CAManBase", 20];
 
 
             //Add ace_medical pain effect:
-            if ((isClass (configFile >> "CfgPatches" >> "ACE_Medical")) && {_strength > 0}) then {
+            if ((isClass (configFile >> "CfgPatches" >> "ACE_Medical")) && {_strength > 0.1}) then {
                 [ACE_player, (_strength / 2)] call EFUNC(medical,adjustPainLevel);
             };
 

addons/logistics_wirecutter/CfgWeapons.hpp

@@ -3,7 +3,6 @@ class CfgWeapons {
     class ACE_ItemCore;
 
     class ACE_wirecutter: ACE_ItemCore {
-        author = "$STR_ACE_Common_ACETeam";
         displayName = "$STR_ACE_logistics_wirecutter_wirecutterName";
         descriptionShort = "$STR_ACE_logistics_wirecutter_wirecutterDescription";
         model = "\A3\weapons_F\ammo\mag_univ.p3d";

addons/medical/stringtable.xml

@@ -4,10 +4,12 @@
         <Key ID="TR_ACE_Medical_litterSimulationDetail">
             <English>Litter Simulation Detail</English>
             <Polish>Detale zużytych medykamentów</Polish>
+            <Spanish>Detalle de simulación de basura</Spanish>
         </Key>
         <Key ID="TR_ACE_Medical_litterSimulationDetail_Desc">
             <English>Litter simulation detail level sets the number of litter items which will be locally spawned in the client. Excessive amounts in local areas could cause FPS lag, so this is a client only setting.</English>
             <Polish>Opcja ta ustawia liczbę zużytych medykamentów, jakie pojawiają się lokalnie wokół gracza. Ich zbyt duża ilość może spowodować spadki FPS, dlatego jest to ustawienie tylko po stronie klienta.</Polish>
+            <Spanish>Detalle simulación de basura establece el número de artículos de basura que se generan a nivel local en el cliente. Las cantidades excesivas en áreas locales podrían causar caída de rendimiento, así que esto es un ajuste de cliente únicamente.</Spanish>
         </Key>
         <Key ID="STR_ACE_Medical_Inject_Atropine">
             <English>Inject Atropine</English>
@@ -1634,4 +1636,4 @@
             <French>Aberration chromatique</French>
         </Key>
     </Package>
-</Project>
+</Project>

addons/microdagr/CfgWeapons.hpp

@@ -3,7 +3,6 @@ class CfgWeapons {
     class InventoryItem_Base_F;
 
     class ACE_microDAGR: ACE_ItemCore {
-        author = "$STR_ACE_Common_ACETeam";
         scope = 2;
         displayName = "$STR_ACE_microdagr_itemName";
         descriptionShort = "$STR_ACE_microdagr_itemDescription";

addons/missileguidance/CfgVehicles.hpp

@@ -20,7 +20,7 @@ class CfgVehicles {
     
     class ACE_Comanche_Test : B_Heli_Attack_01_F {
         displayName = "ACE_Comanche_Test";
-        author = "ACE Team";
+        author = "$STR_ACE_Common_ACETeam";
         class Library {
             libTextDesc = "ACE_Comanche_Test";
         };

addons/missileguidance/stringtable.xml

@@ -17,6 +17,7 @@
         <Key ID="STR_ACE_MissileGuidance_Desc">
             <English>Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types.</English>
             <Polish>Zaawansowane namierzanie rakiet, lub ZNR, dostarcza wiele poprawek do systemu namierzania rakiet oraz dodaje nowe tryby strzału. Jest to wymagana opcja dla broni rakietowych.</Polish>
+            <Spanish>Guía de misiles avanzada, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un framework requerido para armas de tipo misil.</Spanish>
         </Key>
         <Key ID="STR_ACE_Hydra70_DAGR">
             <English>Hydra-70 DAGR Missile</English>

addons/optionsmenu/stringtable.xml

@@ -218,6 +218,7 @@
             <English>Option Menu UI Scaling</English>
             <French>Menu option: taille de l'UI</French>
             <Polish>Skalowanie UI menu ustawień</Polish>
+            <Spanish>Opción de escalado del menú UI</Spanish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/overheating/CfgWeapons.hpp

@@ -5,7 +5,6 @@ class CfgWeapons {
     class ACE_SpareBarrel: ACE_ItemCore {
         displayname = "$STR_ACE_Overheating_SpareBarrelName";
         descriptionshort = "$STR_ACE_Overheating_SpareBarrelDescription";
-        //model = "";
         picture = QUOTE(PATHTOF(UI\spare_barrel_ca.paa));
         scope = 2;
         class ItemInfo: InventoryItem_Base_F {

addons/vehiclelock/CfgWeapons.hpp

@@ -3,7 +3,6 @@ class CfgWeapons {
     class ACE_ItemCore;
 
     class ACE_key_master: ACE_ItemCore {
-        author = "$STR_ACE_Common_ACETeam";
         displayName = "Vehicle Key: Master";
         descriptionShort = "$STR_ACE_Vehicle_Item_Master_Description";
         model = "\A3\weapons_F\ammo\mag_univ.p3d";

documentation/framework/carry-drag.md

@@ -0,0 +1,27 @@
+---
+layout: wiki
+title: Carry and Drag System
+group: framework
+order: 5
+parent: wiki
+---
+
+# 1. Config Values
+
+```
+class CfgVehicles {
+    class MyVehicle {
+        
+
+        ace_dragging_canDrag = 1; // can this object be dragged?; 1 yes, 0 no (0 default)
+        ace_dragging_dragPosition[] = {0,1.2,0} // Offset of the model from the body while dragging, comparable to the offset in attachTo (It's the same actually)
+        ace_dragging_dragDirection = 0;  // how much degrees is the model rotatated after dragging it (a global setDir after attachTo)
+
+        ace_dragging_canCarry = 1; // can this object be carried?; 1 yes, 0 no (0 default)
+        ace_dragging_carryPosition[] = {0,1.2,0}; // Same as drag, but for carrying objects
+        ace_dragging_carryDirection = 0; // Same as drag, but for carrying objects
+
+    };
+};
+```
+

tools/make.py

@@ -293,9 +293,9 @@ def print_yellow(msg):
     print(msg)
     color("reset")
 
-    
+
 def copy_important_files(source_dir,destination_dir):
-    
+
     originalDir = os.getcwd()
     importantFiles = ["mod.cpp",
     "README.md",
@@ -303,10 +303,10 @@ def copy_important_files(source_dir,destination_dir):
     "LICENSE",
     "logo_ace3_ca.paa"
     ]
-    
+
     print_yellow ("source_dir: " + source_dir)
     print_yellow("destination_dir: " + destination_dir)
-    
+
     #copy importantFiles
     try:
         print_blue("\nSearching for important files in " + source_dir)
@@ -316,16 +316,16 @@ def copy_important_files(source_dir,destination_dir):
     except:
         print_error("COPYING IMPORTANT FILES.")
         raise
-    
+
     #copy all extension dlls
     try:
         os.chdir(os.path.join(source_dir))
         print_blue("\nSearching for DLLs in " + os.getcwd())
         filenames = glob.glob("*.dll")
-        
+
         if not filenames:
             print ("Empty SET")
-            
+
         for dll in filenames:
             print_green("Copying dll => " + os.path.join(source_dir,dll))
             if os.path.isfile(dll):
@@ -339,15 +339,15 @@ def copy_important_files(source_dir,destination_dir):
 def copy_optionals_for_building(mod,pbos):
     src_directories = os.listdir(optionals_root)
     current_dir = os.getcwd()
-    
+
-    print("")
+    print_blue("\nChecking Optionals folder...")
     try:
-        
+
         #special server.pbo processing
         files = glob.glob(os.path.join(release_dir, "@ace","optionals","*.pbo"))
         for file in files:
             file_name = os.path.basename(file)
-            print ("Adding the following file: " + file_name)
+            #print ("Adding the following file: " + file_name)
             pbos.append(file_name)
             pbo_path = os.path.join(release_dir, "@ace","optionals",file_name)
             if (os.path.isfile(pbo_path)):
@@ -364,31 +364,38 @@ def copy_optionals_for_building(mod,pbos):
     try:
         for dir_name in src_directories:
             mod.append(dir_name)
+            #userconfig requires special handling since it is not a PBO source folder.
+            #CfgConvert fails to build server.pbo if userconfig is not found in P:\
             if (dir_name == "userconfig"):
+                if (os.path.exists(os.path.join(release_dir, "@ace","optionals",dir_name))):
+                    shutil.rmtree(os.path.join(release_dir, "@ace","optionals",dir_name), True)
+                shutil.copytree(os.path.join(optionals_root,dir_name), os.path.join(release_dir, "@ace","optionals",dir_name))
                 destination = os.path.join(work_drive,dir_name)
             else:
                 destination = os.path.join(module_root,dir_name)
 
             print("Temporarily copying " + os.path.join(optionals_root,dir_name) + " => " + destination + " for building.")
-            shutil.rmtree(destination, True)
+            if (os.path.exists(destination)):
+                shutil.rmtree(destination, True)
             shutil.copytree(os.path.join(optionals_root,dir_name), destination)
     except:
         print_error("Copy Optionals Failed")
         raise
     finally:
         os.chdir(current_dir)
-        
+
 def cleanup_optionals(mod,pbos):
     print("")
-    try:            
+    try:
         for dir_name in mod:
+            #userconfig requires special handling since it is not a PBO source folder.
             if (dir_name == "userconfig"):
                 destination = os.path.join(work_drive,dir_name)
             else:
                 destination = os.path.join(module_root,dir_name)
-            
+
             print("Cleaning " + destination)
-            
+
             try:
                 file_name = "ace_{}.pbo".format(dir_name)
                 src_file_path = os.path.join(release_dir, "@ace","addons",file_name)
@@ -400,7 +407,7 @@ def cleanup_optionals(mod,pbos):
                 print_error(file_name + " already exists")
                 continue
             shutil.rmtree(destination)
-            
+
     except:
         print_error("Cleaning Optionals Failed")
         raise
@@ -528,7 +535,7 @@ See the make.cfg file for additional build options.
         global release_dir
         global module_root_parent
         global optionals_root
-        
+
         cfg.read(os.path.join(make_root, "make.cfg"))
 
         # Project name (with @ symbol)
@@ -562,7 +569,7 @@ See the make.cfg file for additional build options.
 
         # Release/build directory, relative to script dir
         release_dir = cfg.get(make_target, "release_dir", fallback="release")
-        
+
         # Project PBO file prefix (files are renamed to prefix_name.pbo)
         pbo_name_prefix = cfg.get(make_target, "pbo_name_prefix", fallback=None)
 
@@ -571,7 +578,7 @@ See the make.cfg file for additional build options.
         module_root = cfg.get(make_target, "module_root", fallback=os.path.join(make_root_parent, "addons"))
         optionals_root = os.path.join(module_root_parent, "optionals")
         print_green ("module_root: " + module_root)
-        
+
         if (os.path.isdir(module_root)):
             os.chdir(module_root)
         else:
@@ -583,9 +590,9 @@ See the make.cfg file for additional build options.
         else:
             print_error ("Directory " + optionals_root + " does not exist.")
             sys.exit()
-        
+
         print_green ("release_dir: " + release_dir)
-        
+
     except:
         raise
         print_error("Could not parse make.cfg.")
@@ -633,14 +640,14 @@ See the make.cfg file for additional build options.
         print ("No cache found.")
         cache = {}
 
-    #Temporarily copy optionals_root for building. They will be removed later. 
+    #Temporarily copy optionals_root for building. They will be removed later.
     optionals_modules = []
     optional_files = []
     copy_optionals_for_building(optionals_modules,optional_files)
-    
+
     # Get list of subdirs in make root.
     dirs = next(os.walk(module_root))[1]
-    
+
     # Autodetect what directories to build.
     if module_autodetect and not arg_modules:
         modules = []
@@ -681,10 +688,11 @@ See the make.cfg file for additional build options.
 
 
     # For each module, prep files and then build.
+    print_blue("\nBuilding...")
     for module in modules:
         print_green("\nMaking " + module + "-"*max(1, (60-len(module))))
         missing = False
-        
+
         # Cache check
         if module in cache:
             old_sha = cache[module]
@@ -697,7 +705,7 @@ See the make.cfg file for additional build options.
 
         # Hash the module
         new_sha = get_directory_hash(os.path.join(module_root, module))
-        
+
         # Is the pbo file missing?
         missing = not os.path.isfile(os.path.join(release_dir, project, "addons", "ace_{}.pbo".format(module)))
         if missing:
@@ -781,7 +789,7 @@ See the make.cfg file for additional build options.
                     print_error("CfgConvert -txt return code == " + str(ret) + ". Usually means there is a syntax error within the config.cpp file.")
                     os.remove(os.path.join(work_drive, prefix, module, "config.cpp"))
                     shutil.copyfile(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp"))
-                    
+
 
                 # Include build number
                 try:
@@ -799,7 +807,7 @@ See the make.cfg file for additional build options.
                         f.close()
                     else:
                         os.remove(os.path.join(work_drive, prefix, module, "config.cpp"))
-                        os.rename(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp"))    
+                        os.rename(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp"))
                 except:
                     raise
                     print_error("Failed to include build number")