Merge branch 'master' into master

This commit is contained in:
J3aLeiNe 2016-03-31 22:22:50 +02:00
commit 093da2badf
58 changed files with 235 additions and 88 deletions

View File

@ -75,6 +75,7 @@ Gianmarco Varriale (TeamNuke) <admin@forhost.org>
GieNkoV <gienkov.grzegorz@gmail.com>
GitHawk <githawk@gmx.net>
gpgpgpgp
Grey-Soldierman <gungamer101@hotmail.com>
Grzegorz
Hamburger SV
Harakhti <shadowdragonphd@gmail.com>
@ -119,4 +120,3 @@ voiper
VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
Winter <simon@agius-muscat.net>
zGuba
Grey-Soldierman <gungamer101@hotmail.com>

View File

@ -21,7 +21,6 @@ if (!GVAR(extensionAvailable)) exitWith {
};
};
*/
[] call FUNC(initializeTerrainExtension);
if (!hasInterface) exitWith {};
@ -29,10 +28,28 @@ if (!hasInterface) exitWith {};
//If not enabled, dont't add PFEH
if (!GVAR(enabled)) exitWith {};
//Run the terrain processor
[] call FUNC(initializeTerrainExtension);
// Register fire event handler
["firedPlayer", DFUNC(handleFired)] call EFUNC(common,addEventHandler);
["firedPlayerNonLocal", DFUNC(handleFired)] call EFUNC(common,addEventHandler);
//Add warnings for missing compat PBOs (only if AB is on)
{
_x params ["_modPBO", "_compatPBO"];
if ((isClass (configFile >> "CfgPatches" >> _modPBO)) && {!isClass (configFile >> "CfgPatches" >> _compatPBO)}) then {
ACE_LOGWARNING_2("Weapon Mod [%1] missing ace compat pbo [%2] (from @ace\optionals)",_modPBO,_compatPBO);
};
} forEach [
["RH_acc","ace_compat_rh_acc"],
["RH_de_cfg","ace_compat_rh_de"],
["RH_m4_cfg","ace_compat_rh_m4"],
["RH_PDW","ace_compat_rh_pdw"],
["RKSL_PMII","ace_compat_rksl_pm_ii"],
["iansky_opt","ace_compat_sma3_iansky"],
["R3F_Armes","ace_compat_r3f"]
];
}] call EFUNC(common,addEventHandler);
#ifdef DEBUG_MODE_FULL

View File

@ -24,7 +24,7 @@ _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");
if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
#ifdef DEBUG_MODE_FULL
systemChat "AdvancedBallistics: Terrain already initialized";
#endIf
#endif
};
_mapGrids = ceil(_mapSize / 50) + 1;

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="ATragMX">
<Key ID="STR_ACE_ATragMX_Name">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Ballistics">
<!-- MX -->

View File

@ -194,12 +194,69 @@ class CfgVehicles {
GVAR(hasCargo) = 1;
};
class Heli_Transport_02_base_F;
class I_Heli_Transport_02_F: Heli_Transport_02_base_F {
class Helicopter_Base_H;
class Heli_Light_01_base_F: Helicopter_Base_H {
GVAR(space) = 0;
GVAR(hasCargo) = 0;
};
class Heli_Light_02_base_F: Helicopter_Base_H {
GVAR(space) = 4;
};
class Helicopter_Base_F;
class Heli_light_03_base_F: Helicopter_Base_F {
GVAR(space) = 4;
};
class Heli_Transport_01_base_F: Helicopter_Base_H {
GVAR(space) = 8;
};
class Heli_Transport_02_base_F: Helicopter_Base_H {
GVAR(space) = 20;
};
class Heli_Transport_03_base_F: Helicopter_Base_H {
GVAR(space) = 40;
};
class Heli_Transport_04_base_F: Helicopter_Base_H {
GVAR(space) = 0;
GVAR(hasCargo) = 0;
};
class O_Heli_Transport_04_box_F: Heli_Transport_04_base_F {
GVAR(space) = 20;
GVAR(hasCargo) = 1;
};
class O_Heli_Transport_04_repair_F: Heli_Transport_04_base_F {
GVAR(space) = 12;
GVAR(hasCargo) = 1;
};
class O_Heli_Transport_04_ammo_F: Heli_Transport_04_base_F {
GVAR(space) = 8;
GVAR(hasCargo) = 1;
};
class O_Heli_Transport_04_fuel_F: Heli_Transport_04_base_F {};
class O_Heli_Transport_04_medevac_F: Heli_Transport_04_base_F {
GVAR(space) = 8;
GVAR(hasCargo) = 1;
};
class Heli_Attack_01_base_F: Helicopter_Base_F {
GVAR(space) = 0;
GVAR(hasCargo) = 0;
};
class Heli_Attack_02_base_F: Helicopter_Base_F {
GVAR(space) = 4;
};
// jets
class Plane: Air {
GVAR(space) = 0;
@ -207,7 +264,6 @@ class CfgVehicles {
};
// autonomus
class Helicopter_Base_F;
class UAV_01_base_F: Helicopter_Base_F {
GVAR(space) = 0;
GVAR(hasCargo) = 0;

View File

@ -33,7 +33,7 @@ class Extended_InitPost_EventHandlers {
};
class CAManBase {
class GVAR(setName) {
init = QUOTE(if (local (_this select 0)) then {_this call FUNC(setName)};);
init = QUOTE(if (local (_this select 0)) then {[ARR_2(FUNC(setName),_this)] call FUNC(execNextFrame)};);
};
class GVAR(muteUnit) {
init = QUOTE(_this call FUNC(muteUnitHandleInitPost));

View File

@ -12,12 +12,11 @@
*/
#include "script_component.hpp"
params ["_function"];
params ["_code"];
if (_code isEqualType "") exitWith {_code};
if (_function isEqualType "") exitWith {_function};
_code = str(_code);
_code = _code select [1, count _code - 2];
_function = toArray str _function;
_function deleteAt 0;
_function deleteAt (count _function - 1);
_code
toString _function // return

View File

@ -19,13 +19,7 @@ if (isNull _unit || {!alive _unit}) exitWith {};
if (_unit isKindOf "CAManBase") then {
private _sanitizedName = [name _unit, true] call FUNC(sanitizeString);
private _rawName = [name _unit, false] call FUNC(sanitizeString);
//Debug Testing Code (with html tags):
// private _sanitizedName = ["<TAG>Name", true] call FUNC(sanitizeString);
// private _rawName = ["<TAG>Name", false] call FUNC(sanitizeString);
//if (_name != _unit getVariable ["ACE_Name", ""]) then {
_unit setVariable ["ACE_Name", _sanitizedName, true];
_unit setVariable ["ACE_NameRaw", _rawName, true];
//};
};

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Disarming">
<Key ID="STR_ACE_Disarming_OpenInventory">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Disposable">
<Key ID="STR_ACE_Disposable_UsedTube">

View File

@ -4,7 +4,7 @@
* detonate editor-placed explosives.
*
* Arguments:
* 0: Explosives objects to detonate <ARRAY>
* 0: Explosives objects to detonate <OBJECT or ARRAY>
* 1: Fuze delay (for each explosive; use negative number for random time up to value) <NUMBER> <OPTIONAL>
*
* Return Value:
@ -18,10 +18,13 @@
*/
#include "script_component.hpp"
params ["_explosiveArr",["_fuzeTime",0]];
params [["_explosiveArr", [], [[], objNull]], ["_fuzeTime", 0, [0]]];
if (_explosiveArr isEqualType objNull) then {
_explosiveArr = [_explosiveArr];
};
private _detTime;
{
_detTime = if (_fuzeTime < 0) then {random abs _fuzeTime} else {_fuzeTime};
private _detTime = if (_fuzeTime < 0) then {random abs _fuzeTime} else {_fuzeTime};
[objNull, -1, [_x, _detTime]] call FUNC(detonateExplosive);
} forEach _explosiveArr;

View File

@ -647,6 +647,7 @@
<Polish>Mina M6 SLAM (atak od dołu)</Polish>
<Spanish>Mina M6 SLAM (Ataque Inferior)</Spanish>
<French>Mine M6 SLAM (par le bas)</French>
<Italian>Mina M6 SLAM (base)</Italian>
</Key>
<Key ID="STR_ACE_Explosives_Module_SLAMSideAttack_DisplayName">
<English>M6 SLAM Mine (Side Attack)</English>
@ -661,6 +662,7 @@
<Polish>Mina M6 SLAM (atak od boku)</Polish>
<Spanish>Mina M6 SLAM (Ataque Lateral)</Spanish>
<French>Mine M6 SLAM (de flanc)</French>
<Italian> STR_ACE_Explosives_Module_SLAMBottomAttack_DisplayName M6 SLAM Mine (Bottom Attack) Mine M6 SLAM (par le bas) M6-SLAM-Mine (Bodenangriff) Mina M6 SLAM (base) Mina M6 SLAM (atak od dołu) Mina M6 SLAM (Laterale)</Italian>
</Key>
<Key ID="STR_ACE_Explosives_Module_IEDUrbanBig_Range_DisplayName">
<English>Large IED (Urban, Pressure Plate)</English>
@ -675,6 +677,7 @@
<Polish>Duży IED (miejski, płyta naciskowa)</Polish>
<Spanish>IED Grande (Urbano, Placa de presión)</Spanish>
<French>Grand EEI (Urbain, plaque de pression)</French>
<Italian>IED grande (urbano, a pressione)</Italian>
</Key>
<Key ID="STR_ACE_Explosives_Module_IEDLandBig_Range_DisplayName">
<English>Large IED (Dug-in, Pressure Plate)</English>
@ -689,6 +692,7 @@
<Polish>Duży IED (zakopany, płyta naciskowa)</Polish>
<Spanish>IED Grande (Enterrado, Placa de presión)</Spanish>
<French>Grand EEI (Enterré, plaque de pression)</French>
<Italian>IED grande (interrato, a pressione)</Italian>
</Key>
<Key ID="STR_ACE_Explosives_Module_IEDUrbanSmall_Range_DisplayName">
<English>Small IED (Urban, Pressure Plate)</English>
@ -703,6 +707,7 @@
<Polish>Mały IED (miejski, płyta naciskowa)</Polish>
<Spanish>IED Pequeño (Urbano, Placa de presión)</Spanish>
<French>Petit EEI (Urbain, plaque de pression)</French>
<Italian>IED piccolo (urbano, a pressione)</Italian>
</Key>
<Key ID="STR_ACE_Explosives_Module_IEDLandSmall_Range_DisplayName">
<English>Small IED (Dug-in, Pressure Plate)</English>
@ -717,6 +722,7 @@
<Polish>Mały IED (zakopany, płyta naciskowa)</Polish>
<Spanish>IED Pequeño (Enterrado, Placa de presión)</Spanish>
<French>Petit EEI (Enterré, plaque de pression)</French>
<Italian>IED piccolo (interrato, a pressione)</Italian>
</Key>
<Key ID="STR_ACE_Explosives_connectInventoryExplosiveToDeadman">
<English>Connect to %1</English>
@ -731,4 +737,4 @@
<Portuguese>Conectar à %1</Portuguese>
</Key>
</Package>
</Project>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Fastroping">
<Key ID="STR_ACE_Fastroping_Module_FRIES_DisplayName">
@ -7,6 +7,7 @@
<Polish>Wyposaż FRIES</Polish>
<French>Equiper le FRIES</French>
<Spanish>Equipar FRIES</Spanish>
<Italian>Equipaggia la FRIES</Italian>
</Key>
<Key ID="STR_ACE_Fastroping_Module_FRIES_Description">
<English>Equips compatible helicopters with a Fast Rope Insertion Extraction System.</English>
@ -14,6 +15,7 @@
<Polish>Wyposaża kompatybilne helikoptery w zestaw Fast Rope Insertion Extraction System.</Polish>
<French>Equipe les hélicoptères compatibles avec un Module Fast Rope Insertion Extraction System.</French>
<Spanish>Equipar helicoptero compatible con un Sistema de Inserción Extracción Fast Rope.</Spanish>
<Italian>Equipagga l'elicottero compatibile con il Fast Rope Insertion Exstraction System</Italian>
</Key>
<Key ID="STR_ACE_Fastroping_Interaction_prepareFRIES">
<English>Prepare fast roping system</English>
@ -21,6 +23,7 @@
<Polish>Przygotuj system zjazdu na linach</Polish>
<French>Préparer le système de corde lisse</French>
<Spanish>Preparar el sistema fast roping</Spanish>
<Italian>Prepara le corde</Italian>
</Key>
<Key ID="STR_ACE_Fastroping_Interaction_deployRopes">
<English>Deploy ropes</English>
@ -28,6 +31,7 @@
<Polish>Wypuść liny</Polish>
<French>Déployer les cordes</French>
<Spanish>Desplegar cuerdas</Spanish>
<Italian>Srotola le corde</Italian>
</Key>
<Key ID="STR_ACE_Fastroping_Interaction_fastRope">
<English>Fast rope</English>
@ -35,6 +39,7 @@
<Polish>Zjedź na linie</Polish>
<French>Descendre à la corde</French>
<Spanish>Descender por la cuerda</Spanish>
<Italian>Scendi sulla corda</Italian>
</Key>
<Key ID="STR_ACE_Fastroping_Interaction_cutRopes">
<English>Cut ropes</English>
@ -42,6 +47,7 @@
<Polish>Odetnij liny</Polish>
<French>Détacher les cordes</French>
<Spanish>Cortar cuerdas</Spanish>
<Italian>Taglia le corde</Italian>
</Key>
<Key ID="STR_ACE_Fastroping_Eden_equipFRIES">
<English>Equip helicopter with FRIES</English>
@ -49,6 +55,7 @@
<Polish>Wyposaż helikopter w FRIES</Polish>
<French>Equiper l'hélicoptère avec le FRIED</French>
<Spanish>Equipar helicoptero con FRIES</Spanish>
<Italian>Equipaggia l'elicottero con FRIES</Italian>
</Key>
<Key ID="STR_ACE_Fastroping_Eden_equipFRIES_Tooltip">
<English>Equips the selected helicopter with a Fast Rope Insertion Extraction System</English>
@ -56,10 +63,12 @@
<Polish>Wyposaża wybrany helikopter w zestaw Fast Rope Insertion Extraction System</Polish>
<French>Equipe l'hélicoptère sélectionné avec un Fast Rope Insertion Extraction System</French>
<Spanish>Equipa el helicoptero seleccionado con un Sistema de Inserción Extracción Fast Rope</Spanish>
<Italian>Equipaggia l'elicottero selezionato con il Fast Rope Insertion Extraction System</Italian>
</Key>
<Key ID="STR_ACE_Fastroping_Waypoint_Fastrope">
<English>LET UNITS FAST ROPE</English>
<German>EINHEITEN ABSEILEN LASSEN</German>
<Italian>SCENDI DALLE CORDE</Italian>
</Key>
</Package>
</Project>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="FCS">
<Key ID="STR_ACE_FCS_LaseTarget">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="FlashSuppressors">
<Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_H">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Goggles">
<Key ID="STR_ACE_Goggles_ShowInThirdPerson">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Grenades">
<Key ID="STR_ACE_Grenades_SwitchGrenadeMode">

View File

@ -115,6 +115,7 @@
<Spanish>Desactiva el efecto de zumbido cuando el jugador recibe daño auditivo.</Spanish>
<Polish>Usuń szum w uszach przy chwilowej utracie słuchu.</Polish>
<French>Enlève les acouphènes quand le joueur prend des dommages auditifs.</French>
<Italian>Quando il giocatore riceve danni all'udito, non fa sentire i fischi nelle orecchie</Italian>
</Key>
<Key ID="STR_ACE_Hearing_Module_DisplayName">
<English>Hearing</English>
@ -208,4 +209,4 @@
<French>Ajouter l'item "ACE_EarPlugs" à toutes les unités qui ont des armes lourdes. Peut être desactivé si des équipements personnels sont utilisés.</French>
</Key>
</Package>
</Project>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="HuntIR">
<Key ID="STR_DN_ACE_HUNTIRBOX">

View File

@ -711,6 +711,7 @@
<Polish>Włącz</Polish>
<Spanish>Encender</Spanish>
<French>Allumer</French>
<Italian>Accendi</Italian>
</Key>
<Key ID="STR_ACE_Interaction_TurnOff">
<English>Turn off</English>
@ -718,6 +719,7 @@
<Polish>Wyłącz</Polish>
<Spanish>Apagar</Spanish>
<French>Eteindre</French>
<Italian>Spegni</Italian>
</Key>
<Key ID="STR_ACE_Interaction_PassMagazine">
<English>Pass magazine</English>
@ -775,4 +777,4 @@
<French>Montrer l'interaction "donner un chargeur".</French>
</Key>
</Package>
</Project>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Javelin">
<Key ID="STR_ACE_Javelin_LockTarget">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Kestrel4500">
<Key ID="STR_ACE_Kestrel4500_Name">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Laser">
<Key ID="STR_ACE_Laser_laserCode">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Laser_SelfDesignate">
<Key ID="STR_ACE_Laser_SelfDesignate_DesignatorOn">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Laserpointer">
<Key ID="STR_ACE_Laserpointer_red">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Logistics_UAVbattery">
<Key ID="STR_ACE_Logistics_UAVbattery_Full">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Logistics_Wirecutter">
<Key ID="STR_ACE_Logistics_Wirecutter_wirecutterName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="MagazineRepack">
<Key ID="STR_ACE_MagazineRepack_RepackMagazines">

View File

@ -0,0 +1,17 @@
class CfgSettings {
class CBA {
class Versioning {
class ACE {
class dependencies {
//ACE will hard exit if this is missing
CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "(true)"};
//Warnings for missing RHS compat pbos
compat_rhs_afrf3[] = {"ace_compat_rhs_afrf3", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'rhs_main')"};
compat_rhs_usf3[] = {"ace_compat_rhs_usf3", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'rhsusf_main')"};
};
};
};
};
};

View File

@ -586,18 +586,6 @@ class CfgMods {
};
};
#include "CfgSettings.hpp"
#include "CfgModuleCategories.hpp"
#include "CfgVehicleClasses.hpp"
class CfgSettings {
class CBA {
class Versioning {
class ACE {
class dependencies {
CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "(true)"};
};
};
};
};
};

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="MapTools">
<Key ID="STR_ACE_MapTools_Name">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Markers">
<Key ID="STR_ACE_Markers_MarkerDirection">

View File

@ -58,6 +58,7 @@ if (_unit getVariable [QGVAR(isFalling), false]) then {
} else {
_newDamage = _newDamage * 0.5;
};
if (_newDamage < 0.075) then {_newDamage = 0;}; //Filter minor falling damage to non-leg hitpoints
} else {
if (_selectionName == "") then {
_selectionName = selectRandom ["leg_l", "leg_r"];

View File

@ -55,6 +55,7 @@
<Spanish>Inyectar Adenosina</Spanish>
<Polish>Wstrzyknij adenozynę</Polish>
<French>Injecter de l'adénosine</French>
<Italian>Inietta andenosina</Italian>
</Key>
<Key ID="STR_ACE_Medical_Inject_Atropine">
<English>Inject Atropine</English>
@ -254,6 +255,7 @@
<Spanish>Inyectando Adenosina...</Spanish>
<Polish>Wstrzykiwanie adenozyny...</Polish>
<French>Injection d'adénosine...</French>
<Italian>Inietto l'andenosina</Italian>
</Key>
<Key ID="STR_ACE_Medical_Injecting_Atropine">
<English>Injecting Atropine...</English>
@ -969,6 +971,7 @@
<Spanish>Asenosina auto-inyectable</Spanish>
<Polish>Autostrzykawka z adenozyną</Polish>
<French>Auto-injécteur d'adénosine</French>
<Italian>Autoiniettore di adenosina</Italian>
</Key>
<Key ID="STR_ACE_Medical_Adenosine_Desc_Short">
<English>Used to counter effects of Epinephrine</English>
@ -976,6 +979,7 @@
<Spanish>Utilizada para contrarrestar los effectos de la Epinefrina</Spanish>
<Polish>Adenozyna. Stosowana do zwalczania efektów działania adrenaliny.</Polish>
<French>Utilisé pour contrer les effets de l'adrénaline</French>
<Italian>Usato per contrastare l'effetto dell'epinefrina</Italian>
</Key>
<Key ID="STR_ACE_Medical_Adenosine_Desc_Use">
<English>A drug used to counter the effects of Epinephrine</English>
@ -983,6 +987,7 @@
<Spanish>Medicamento usado para contrarrestar los efectos de la Epinefrina.</Spanish>
<Polish>Organiczny związek chemiczny z grupy nukleozydów. Skuteczna w leczeniu częstoskurczu komorowego. Działa rozszerzająco na naczynia krwionośne.</Polish>
<French>Un composé utilisé pour contrer les effets de l'adrénaline</French>
<Italian>Medicamento usato per contrastare l'effetto dell'epinefrina</Italian>
</Key>
<Key ID="STR_ACE_Medical_Atropine_Display">
<English>Atropine autoinjector</English>
@ -3199,6 +3204,7 @@
<Polish>Podstawowe ustawienia medyczne</Polish>
<Spanish>Ajustes médicos básicos [ACE]</Spanish>
<French>Réglages du système médical basic [ACE]</French>
<Italian>Impostazioni Mediche Di Base [ACE]</Italian>
</Key>
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_Module_DisplayName">
<English>Advanced Medical Settings [ACE]</English>
@ -3314,6 +3320,7 @@
<Spanish>Permitir Epinefrina</Spanish>
<Polish>Ograniczenia adrenaliny</Polish>
<French>Autoriser l'adrénaline</French>
<Italian>Permette epinefrina</Italian>
</Key>
<Key ID="STR_ACE_Medical_BasicMedicalSettings_medicSetting_basicEpi_Description">
<English>Who can use Epinephrine for full heal? (Basic medical only)</English>
@ -3321,6 +3328,7 @@
<Spanish>Configura quienes pueden usar Epinefrina (Solo sistema médico básico)</Spanish>
<Polish>Kto może skorzystać z adrenaliny w celu pełnego uleczenia? (Tylko podstawowy system medyczny)</Polish>
<French>Qui peut utiliser l'adrénaline pour les soins complets ? (Médical basique seulement)</French>
<Italian>Chi può usare l'epinefrina per la cura completa? (solo per sistema medico di base)</Italian>
</Key>
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_medicSetting_PAK_DisplayName">
<English>Allow PAK</English>
@ -3412,6 +3420,7 @@
<Spanish>Ubicaciones epinefrina</Spanish>
<Polish>Ograniczenia adrenaliny</Polish>
<French>Position des adrénalines</French>
<Italian>Ubicazione epinefrina</Italian>
</Key>
<Key ID="STR_ACE_Medical_BasicMedicalSettings_useLocation_basicEpi_Description">
<English>Where can the Epinephrine be used? (Basic Medical)</English>
@ -3419,6 +3428,7 @@
<Spanish>Configura donde puede usarse Epinefrina (Solo sistema médico básico)</Spanish>
<Polish>Gdzie można korzystać z adrenaliny? (Podstawowy system medyczny)</Polish>
<French>Où peuvent être utilisées les adrénalines ? (Médical basique)</French>
<Italian>Dove si può usare l'epinefrina? (Sistema medico di base)</Italian>
</Key>
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_useLocation_PAK_DisplayName">
<English>Locations PAK</English>
@ -3664,6 +3674,7 @@
<Spanish>Configure las opciones de tratamiento del sistema médico básico de ACE</Spanish>
<Polish>Skonfiguruj ustawienia leczenia podstawowego systemu medycznego ACE</Polish>
<French>Configure les réglages de traitement dans ACE médical basique</French>
<Italian>Configura le impostazioni trattamenti per ACE Medical di base</Italian>
</Key>
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_Module_Description">
<English>Configure the treatment settings from ACE Advanced Medical</English>
@ -4125,12 +4136,14 @@
<Key ID="STR_ACE_Medical_MedicalSettings_delayUnconCaptive_Description">
<English>Delay cease fire of AI while player is unconscious for medical reasons.</English>
<German>Verzögert das Ende des KI-Beschusses auf einen Spieler, wenn dieser aus medizinischen Gründen bewustlos wird.</German>
<Italian>Ritarda il cessate il fuoco dell'IA quando il giocatore è svenuto per motivi medici.</Italian>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_delayUnconCaptive_DisplayName">
<English>Delay cease fire of AI for unconsciousness</English>
<German>Verzögert Ende des KI-Beschusses bei medizinischer Bewustlosigkeit</German>
<Spanish>Demora antes de volverse neutral al caer inconsciente</Spanish>
<Polish>Opóźnij status captive u nieprzytomnych osób</Polish>
<Italian>Ritarda il cessate il fuoco dell'IA quando si è svenuti</Italian>
</Key>
</Package>
</Project>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="MissionModules">
<Key ID="STR_ACE_MissionModules_Category_DisplayName">

View File

@ -150,6 +150,7 @@
<Spanish>Usar manejo de munición.</Spanish>
<Polish>Aktywuj obsługę amunicji</Polish>
<French>Utiliser la gestion des munitions</French>
<Italian>Utilizza la gestione delle munizioni</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_useAmmoHandling_Description">
<English>Removes mortar magazines, requiring individual rounds to be loaded by the gunner or loader. Does not affect AI mortars.</English>
@ -157,6 +158,7 @@
<Spanish>Elimina los cargadores del mortero, requiriendo al artillero o cargador la carga manual de cada rondas. No afecta morteros controlados por IA.</Spanish>
<Polish>Usuwa magazynki moździerza, wymagając ładowania pojedynczych pocisków przez strzelca lub ładowniczego. Nie dotyczy moździerzy AI.</Polish>
<French>Enlever les chargeurs de mortier, requiert des obus individuels qui doivent être chargés par le tireur ou le servant. N'affect pas les mortiers IA.</French>
<Italian>Toglie i proiettili dal mortaio. I colpi singoli devono essere caricati dall'operatore. Non cambia quado l'IA spara.</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_unloadMortar">
<English>Remove Round</English>
@ -164,6 +166,7 @@
<Spanish>Extraer ronda</Spanish>
<Polish>Wyładuj pocisk</Polish>
<French>Enlever l'obus</French>
<Italian>Togli proiettile</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_loadMortar">
<English>Load Mortar</English>
@ -171,6 +174,7 @@
<Spanish>Cargar mortero</Spanish>
<Polish>Załaduj moździerz</Polish>
<French>Charger le mortier</French>
<Italian>Carica mortaio</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_unloadingMortar">
<English>Unloading Round</English>
@ -178,6 +182,7 @@
<Spanish>Descargando ronda</Spanish>
<Polish>Rozładowywanie moździerza</Polish>
<French>Déchargement de l'obus</French>
<Italian>Scarica proiettile</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_loadingMortar">
<English>Preparing Round</English>
@ -185,6 +190,7 @@
<Spanish>Preparando ronda</Spanish>
<Polish>Przygotowywanie pocisku</Polish>
<French>Praparation de l'obus</French>
<Italian>Prepara il proiettile</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_loadMagazine_HE">
<English>Load HE</English>
@ -192,6 +198,7 @@
<Spanish>Cargar HE</Spanish>
<Polish>Załaduj pocisk wybuchowy</Polish>
<French>Charger HE</French>
<Italian>Carica proiettile esplosivo ad alto potenziale (HE)</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_loadMagazine_Smoke">
<English>Load Smoke</English>
@ -199,6 +206,7 @@
<Spanish>Cargar Humo</Spanish>
<Polish>Załaduj pocisk dymny</Polish>
<French>Charger Fumigène</French>
<Italian>Carica fumogeno</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_loadMagazine_Illum">
<English>Load Illumination</English>
@ -206,6 +214,7 @@
<Spanish>Cargar Iluminación</Spanish>
<Polish>Załaduj pocisk oświetlający</Polish>
<French>Charger Eclairante</French>
<Italian>Carica illuminante</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_loadMagazine_HE_Guided">
<English>Load Guided HE</English>
@ -213,6 +222,7 @@
<Spanish>Cagar HE Guiada</Spanish>
<Polish>Załaduj kierowany pocisk wybuchowy</Polish>
<French>Charger HE guidé</French>
<Italian>Carica HE guidata</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_loadMagazine_HE_LaserGuided">
<English>Load Laser Guided HE</English>
@ -220,6 +230,7 @@
<Spanish>Cargar HE Guiada por Laser</Spanish>
<Polish>Załaduj laserowo napr. pocisk wybuchowy</Polish>
<French>Charger HE guidé au laser</French>
<Italian>Carica HE a guida laser</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_magazine_HE_displayName">
<English>82mm HE Round</English>
@ -227,6 +238,7 @@
<Spanish>Ronda 82mm HE</Spanish>
<Polish>Pocisk wybuchowy kal. 82mm</Polish>
<French>Obus de 82mm HE</French>
<Italian>Proiettile da 82mm HE</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_magazine_Smoke_displayName">
<English>82mm Smoke Round</English>
@ -234,6 +246,7 @@
<Spanish>Ronda 82mm Humo</Spanish>
<Polish>Pocisk dymny kal. 82mm</Polish>
<French>Obus de 82mm fumigène</French>
<Italian>Proiettile Fumogeno da 82mm</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_magazine_Illum_displayName">
<English>82mm Illumination Round</English>
@ -241,6 +254,7 @@
<Spanish>Ronda 82mm Iluminación</Spanish>
<Polish>Pocisk oświetlający kal. 82mm</Polish>
<French>Obus de 82mm éclairant</French>
<Italian>Proiettile illuminante da 82mm</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_magazine_HE_Guided_displayName">
<English>82mm Guided HE Round</English>
@ -248,6 +262,7 @@
<Spanish>Ronda 82mm Guiada</Spanish>
<Polish>Kierowany pocisk wybuchowy kal. 82mm</Polish>
<French>Obus de 82mm HE guidé</French>
<Italian>Proiettile HE guidato</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_magazine_HE_LaserGuided_displayName">
<English>82mm Laser Guided HE Round</English>
@ -255,6 +270,7 @@
<Spanish>Ronda 82mm Guiada por Laser</Spanish>
<Polish>Laserowo napr. pocisk wybuchowy kal. 82mm</Polish>
<French>Obus de 82mm HE guidé au laser</French>
<Italian>Proiettile HE a guida laser</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_magazine_descriptionShort">
<English>Used in Mk6 mortar</English>
@ -262,6 +278,7 @@
<Spanish>Usada en el mortero Mk6</Spanish>
<Polish>Używany w moździerzu Mk6</Polish>
<French>Utilisé dans le mortier Mk6</French>
<Italian>Usato nel mortaio Mk6</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_HEBox_DisplayName">
<English>[ACE] 82mm HE Rounds Box</English>
@ -269,6 +286,7 @@
<Spanish>[ACE] Caja de municiones 82mm HE</Spanish>
<Polish>[ACE] Skrzynka amunicji wybuchowej 82mm</Polish>
<French>[ACE] Obus de 82mm HE</French>
<Italian>[ACE] Scatola proiettili espolisvi ad alto potenziale (HE) da 82mm</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_SmokeBox_DisplayName">
<English>[ACE] 82mm Smoke Rounds Box</English>
@ -276,6 +294,7 @@
<Spanish>[ACE] Caja de municiones 82mm Humo</Spanish>
<Polish>[ACE] Skrzynka amunicji dymnej 82mm</Polish>
<French>[ACE] Obus de 82mm fumigène</French>
<Italian>[ACE] Scatola fumogeni da 82mm</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_IllumBox_DisplayName">
<English>[ACE] 82mm Illumination Rounds Box</English>
@ -283,6 +302,7 @@
<Spanish>[ACE] Caja de municiones 82mm Iluminacion</Spanish>
<Polish>[ACE] Skrzynka amunicji oświetlającej 82mm</Polish>
<French>[ACE] Obus de 82mm éclairants</French>
<Italian>[ACE] Scatola illuminanti da 82mm</Italian>
</Key>
<Key ID="STR_ACE_Mk6Mortar_ComboBox_DisplayName">
<English>[ACE] 82mm Default Loadout Box</English>
@ -290,6 +310,7 @@
<Spanish>[ACE] Caja de municiones 82mm por defecto</Spanish>
<Polish>[ACE] Skrzynka amunicji standardowej 82mm</Polish>
<French>[ACE] Obus de 82mm par défaut</French>
<Italian>[ACE] Scatola proiettili 82mm standard</Italian>
</Key>
</Package>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Movement">
<Key ID="STR_ACE_Movement_UseImperial">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="MX2A">
<Key ID="STR_ACE_MX2A_DisplayName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="NameTags">
<Key ID="STR_ACE_NameTags_ShowNames">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Optics">
<Key ID="STR_ACE_Optics_hamr">

View File

@ -79,6 +79,7 @@
<Spanish>Desencasquillar el arma al recargar.</Spanish>
<Polish>Usuń zacięcie przy przeładowaniu</Polish>
<French>Des-enrayer l'arme au rechargement.</French>
<Italian>Disinceppa l'arma quando si ricarica</Italian>
</Key>
<Key ID="STR_ACE_Overheating_unJamOnreload_description">
<English>Reloading clears a weapon jam.</English>
@ -86,6 +87,7 @@
<Spanish>Recargar el arma la desencasquilla.</Spanish>
<Polish>Przeładowywanie usuwa zacięcie</Polish>
<French>Recharger vide la chambre de l'arme</French>
<Italian>L'arma si disinceppa quando si ricarica</Italian>
</Key>
<Key ID="STR_ACE_Overheating_unJamFailChance_displayName">
<English>Chance of unjam failing</English>
@ -93,6 +95,7 @@
<Spanish>Probabilidad de falla al desencasquillar.</Spanish>
<Polish>Szansa na porażkę usuw. zacięcia</Polish>
<French>Chance de rater le des-enrayement</French>
<Italian>Probabilità di sbagliare a disinceppare l'arma</Italian>
</Key>
<Key ID="STR_ACE_Overheating_unJamFailChance_description">
<English>Probability that an unjam action might fail, requiring to be repeated.</English>
@ -100,6 +103,7 @@
<Spanish>Probabilidad de que el proceso de desencasquille falle, teniendo que repetirlo.</Spanish>
<Polish>Szansa na to, że przy przeładowaniu broni zacięcie nie zostanie usunięte, przez co czynność będzie musiała zostać powtórzona ponownie.</Polish>
<French>Probabilité qu'une action de des-enrayement échoue, nécessitant de recommencer.</French>
<Italian>Probabilità che si possa sbagliare a caso a disinceppare l'arma. Richiede di ripetere.</Italian>
</Key>
<Key ID="STR_ACE_Overheating_SpareBarrelName">
<English>Spare barrel</English>
@ -167,6 +171,7 @@
<Spanish>Falló el desencasquillado</Spanish>
<Polish>Porażka przy usuwaniu zacięcia</Polish>
<French>Toujours enrayé !</French>
<Italian>Non si è disinceppata!</Italian>
</Key>
<Key ID="STR_ACE_Overheating_SwapBarrel">
<English>Swap barrel</English>
@ -253,4 +258,4 @@
<Russian>Температура</Russian>
</Key>
</Package>
</Project>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="RangeCard">
<Key ID="STR_ACE_RangeCard_Name">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="RealisticNames">
<Key ID="STR_ACE_RealisticNames_HMG_01_Name">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Reload">
<Key ID="STR_ACE_Reload_SettingDisplayTextName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="ReloadLaunchers">
<Key ID="STR_ACE_ReloadLaunchers_LoadLauncher">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="SafeMode">
<Key ID="STR_ACE_SafeMode_SafeMode">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="sandbag">
<Key ID="STR_ACE_Sandbag_sandbag_displayName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="tripod">
<Key ID="STR_ACE_SpottingScope_DisplayName">

View File

@ -57,6 +57,7 @@
<Czech>+Ctrl naklonit</Czech>
<Spanish>+Ctrl inclinar</Spanish>
<French>+Ctrl incliner</French>
<Italian>+Ctrl per inclinare</Italian>
</Key>
<Key ID="STR_ACE_TacticalLadder_Position">
<English>Position ladder</English>
@ -83,4 +84,4 @@
<Portuguese>Pegar escada</Portuguese>
</Key>
</Package>
</Project>
</Project>

View File

@ -7,6 +7,7 @@
<Spanish>Marcar en negro</Spanish>
<Polish>Oznakuj na czarno</Polish>
<French>Tag noir</French>
<Italian>Marca nero</Italian>
</Key>
<Key ID="STR_ACE_tagging_tagWallRed">
<English>Tag red</English>
@ -14,6 +15,7 @@
<Spanish>Marcar en rojo</Spanish>
<Polish>Oznakuj na czerwono</Polish>
<French>Tag rouge</French>
<Italian>Marca rosso</Italian>
</Key>
<Key ID="STR_ACE_tagging_tagWallGreen">
<English>Tag green</English>
@ -21,6 +23,7 @@
<Spanish>Marcar en verde</Spanish>
<Polish>Oznakuj na zielono</Polish>
<French>Tag vert</French>
<Italian>Marca verde</Italian>
</Key>
<Key ID="STR_ACE_tagging_tagWallBLue">
<English>Tag blue</English>
@ -28,6 +31,7 @@
<Spanish>Marcar en azul</Spanish>
<Polish>Oznakuj na niebiesko</Polish>
<French>Tag bleu</French>
<Italian>Marca blu</Italian>
</Key>
<Key ID="STR_ACE_tagging_tagGroundBlack">
<English>Tag ground black</English>
@ -35,6 +39,7 @@
<Polish>Oznakuj ziemię na czarno</Polish>
<Spanish>Marcar suelo en negro</Spanish>
<French>Tag fond noir</French>
<Italian>Segna nero a terra</Italian>
</Key>
<Key ID="STR_ACE_tagging_tagGroundRed">
<English>Tag ground red</English>
@ -42,6 +47,7 @@
<Polish>Oznakuj ziemię na czerwono</Polish>
<Spanish>Marcar suelo en rojo</Spanish>
<French>Tag fond rouge</French>
<Italian>Segna rosso a terra</Italian>
</Key>
<Key ID="STR_ACE_tagging_tagGroundGreen">
<English>Tag ground green</English>
@ -49,6 +55,7 @@
<Polish>Oznakuj ziemię na zielono</Polish>
<Spanish>Marcar suelo en verde</Spanish>
<French>Tag fond vert</French>
<Italian>Segna verde a terra</Italian>
</Key>
<Key ID="STR_ACE_tagging_tagGroundBlue">
<English>Tag ground blue</English>
@ -56,6 +63,7 @@
<Polish>Oznakuj ziemię na niebiesko</Polish>
<Spanish>Marcar suelo en azul</Spanish>
<French>Tag font bleu</French>
<Italian>Segna blu a terra</Italian>
</Key>
<Key ID="STR_ACE_tagging_spraypaintBlack">
<English>Black spray paint</English>
@ -63,6 +71,7 @@
<Spanish>Pintura negra</Spanish>
<Polish>Czarna farba w sprayu</Polish>
<French>Peinture pulvérisée noire</French>
<Italian>Bomboletta spray nera</Italian>
</Key>
<Key ID="STR_ACE_tagging_spraypaintRed">
<English>Red spray paint</English>
@ -70,6 +79,7 @@
<Spanish>Pintura roja</Spanish>
<Polish>Czerwona farba w sprayu</Polish>
<French>Peinture pulvérisée rouge</French>
<Italian>Bomboletta spray rossa</Italian>
</Key>
<Key ID="STR_ACE_tagging_spraypaintGreen">
<English>Green spray paint</English>
@ -77,6 +87,7 @@
<Spanish>Pintura verde</Spanish>
<Polish>Zielona farba w sprayu</Polish>
<French>Peinture pulvérisée verte</French>
<Italian>Bomboletta spray verde</Italian>
</Key>
<Key ID="STR_ACE_tagging_spraypaintBlue">
<English>Blue spray paint</English>
@ -84,6 +95,7 @@
<Spanish>Pintura azul</Spanish>
<Polish>Niebieska farba w sprayu</Polish>
<French>Peinture pulvérisée bleue</French>
<Italian>Bomboletta spray blu</Italian>
</Key>
<Key ID="STR_ACE_tagging_descSpraypaint">
<English>A can of spray paint for tagging walls.</English>
@ -91,6 +103,7 @@
<Spanish>Lata de pintura en aerosol para marcar.</Spanish>
<Polish>Farba w sprayu, służy do oznakowywania terenu.</Polish>
<French>Un spray de peinture pour taguer les murs.</French>
<Italian>Una bomboletta di spay per contrassegnare i muri.</Italian>
</Key>
</Package>
</Project>
</Project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Vector">
<Key ID="STR_ACE_Vector_VectorName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="VehicleLock">
<Key ID="STR_ACE_VehicleLock_Action_UnLock">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Vehicles">
<Key ID="STR_ACE_Vehicles_On">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="WeaponSelect">
<Key ID="STR_ACE_WeaponSelect_SettingDisplayTextName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="Weather">
<Key ID="STR_ACE_Weather_WindInfoKey">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project name="ACE">
<Package name="WindDeflection">
<Key ID="STR_ACE_WindDeflection_METER_WIND_CATEGORY">

View File

@ -13,12 +13,13 @@
#include "script_component.hpp"
if (!isServer) exitWith {};
params ["_object"];
if (!(_object getVariable [QGVAR(addObject), GVAR(autoAddObjects)])) exitWith {};
{
_x addCuratorEditableObjects [[_object], true];
}forEach allCurators;
[{
TRACE_1("Delayed addCuratorEditableObjects",_this);
{
_x addCuratorEditableObjects [[_this], true];
} forEach allCurators;
}, _object] call EFUNC(common,execNextFrame);