Skip to content

Commit

Permalink
Merge branch 'master' into refuel-fix-fuel-source-removal
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnb432
johnb432 committed May 23, 2024
2 parents 74e02eb + 7c65f85 commit 53fff65
Show file tree
Hide file tree
Showing 78 changed files with 644 additions and 219 deletions.
14 changes: 5 additions & 9 deletions addons/advanced_throwing/functions/fnc_prepare.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@
params ["_unit"];
TRACE_1("params",_unit);

// Temporarily enable wind info, to aid in throwing smoke grenades effectively
if (
GVAR(enableTempWindInfo) &&
{!(missionNamespace getVariable [QEGVAR(weather,WindInfo), false])}
) then {
[] call EFUNC(weather,displayWindInfo);
GVAR(tempWindInfo) = true;
};

// Select next throwable if one already in hand
if (_unit getVariable [QGVAR(inHand), false]) exitWith {
TRACE_1("inHand",_unit);
Expand All @@ -44,6 +35,11 @@ if (isNull (_unit getVariable [QGVAR(activeThrowable), objNull]) && {(currentThr
TRACE_1("no throwables",_unit);
};

// Temporarily enable wind info, to aid in throwing smoke grenades effectively
if (GVAR(enableTempWindInfo) && {!(missionNamespace getVariable [QEGVAR(weather,WindInfo), false])}) then {
[] call EFUNC(weather,displayWindInfo);
GVAR(tempWindInfo) = true;
};

_unit setVariable [QGVAR(inHand), true];

Expand Down
2 changes: 2 additions & 0 deletions addons/advanced_throwing/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
<Korean>바람 정보 임시로 표시</Korean>
<French>Afficher temporairement les informations sur le vent</French>
<Russian>Временно показать информацию о ветре</Russian>
<Spanish>Mostrar información del viento temporalmente</Spanish>
</Key>
<Key ID="STR_ACE_Advanced_Throwing_EnableTempWindInfo_Description">
<English>Temporarily display Wind Info while throwing, to aid in placing smoke grenades effectively.</English>
Expand All @@ -202,6 +203,7 @@
<Korean>연막탄을 효과적으로 배치하는 데 도움이 되도록 투척하는 동안 일시적으로 바람 정보를 표시합니다.</Korean>
<French>Affiche les informations sur le vent pendant le lancement pour placer les grenades fumigènes plus efficacement.</French>
<Russian>Временно отображайте информацию о ветре во время броска, чтобы помочь эффективно разместить дымовые шашки.</Russian>
<Spanish>Mostrar información del viento temporalmente mientras se lanza, para ayudar a lanzar las granadas de humo de forma efectiva.</Spanish>
</Key>
<Key ID="STR_ACE_Advanced_Throwing_Prepare">
<English>Prepare/Change Throwable</English>
Expand Down
2 changes: 2 additions & 0 deletions addons/ai/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
<Portuguese>Equipar NVGs automaticamente</Portuguese>
<Japanese>暗視装置の自動装備</Japanese>
<Russian>Автоматическое оснащение ПНВ</Russian>
<Spanish>Auto equipar gafas de visión nocturna</Spanish>
</Key>
<Key ID="STR_ACE_AI_AssignNVG_Description">
<English>Equips NVG in inventory during night time and unequips it during day time.\nDoes not add NVGs to inventory!</English>
Expand All @@ -102,6 +103,7 @@
<Portuguese>Equipa o NVG do inventário durante a noite e desequipa durante o dia.\nNão adiciona NVGs ao inventário!</Portuguese>
<Japanese>インベントリ内の暗視装置を夜間に装備し、日中は解除し収納します。\nこれはNVGをインベントリに追加しません。</Japanese>
<Russian>Экипирует ПНВ в ночное время и отключает его в дневное время.\nНе добавляет ПНВ в инвентарь!</Russian>
<Spanish>Equipa las gafas de visión nocturna en el inventario cuando es de noche, y las desequipa cuando es de día.\nNo añade las gafas al inventario!</Spanish>
</Key>
</Package>
</Project>
9 changes: 8 additions & 1 deletion addons/arsenal/functions/fnc_onSelChangedRight.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,14 @@ switch (_currentItemsIndex) do {
// Secondary weapon
case IDX_CURR_SECONDARY_WEAPON_ITEMS: {
private _currentItemInSlot = (GVAR(currentItems) select IDX_CURR_SECONDARY_WEAPON_ITEMS) select _itemIndex;
private _isDisposable = CBA_disposable_replaceDisposableLauncher && {!isNil {CBA_disposable_loadedLaunchers getVariable (secondaryWeapon GVAR(center))}};
private _isDisposable = CBA_disposable_replaceDisposableLauncher && {!isNil "CBA_disposable_loadedLaunchers"} &&
{
if (CBA_disposable_loadedLaunchers isEqualType createHashMap) then { // after CBA 3.18
(secondaryWeapon GVAR(center)) in CBA_disposable_loadedLaunchers
} else {
!isNil {CBA_disposable_loadedLaunchers getVariable (secondaryWeapon player)}
}
};

// If removal
if (_item == "") then {
Expand Down
12 changes: 12 additions & 0 deletions addons/arsenal/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1245,6 +1245,7 @@
<Russian>Интегрирован тепловизор.</Russian>
<Korean>열화상 내장</Korean>
<French>Thermique intégrée</French>
<Spanish>Térmica integrada</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_statVisionMode_intPrimTi">
<English>Thermal &amp; Primary integrated</English>
Expand All @@ -1253,6 +1254,7 @@
<Russian>Интегрирован тепловизор и осн.прицел.</Russian>
<Korean>열화상과 주무기 내장</Korean>
<French>Thermique et primaire intégrés</French>
<Spanish>Térmica y Primaria integrada</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_statVisionMode_NoSup">
<English>Not Supported</English>
Expand Down Expand Up @@ -1609,6 +1611,7 @@
<French>Décroissant</French>
<Portuguese>Decrescente</Portuguese>
<Russian>Нисходящий</Russian>
<Spanish>Descendiente</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_sortAscending">
<English>Ascending</English>
Expand All @@ -1620,6 +1623,7 @@
<French>Croissant</French>
<Portuguese>Crescente</Portuguese>
<Russian>Восходящий</Russian>
<Spanish>Ascendiente</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_toolsTab">
<English>Tools</English>
Expand Down Expand Up @@ -1647,6 +1651,7 @@
<French>Nombre de munitions</French>
<Portuguese>Quantidade de munição</Portuguese>
<Russian>Количество боеприпасов</Russian>
<Spanish>Cantidad de munición</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_statIlluminators">
<English>Illuminators</English>
Expand All @@ -1657,6 +1662,7 @@
<Portuguese>Iluminadores</Portuguese>
<Japanese>イルミネーター</Japanese>
<Russian>Осветители</Russian>
<Spanish>Iluminadores</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_defaultToFavoritesSetting">
<English>Default to Favorites</English>
Expand All @@ -1668,6 +1674,7 @@
<French>Favoris par défaut</French>
<Portuguese>Favoritos por padrão</Portuguese>
<Russian>По умолчанию - Избранное</Russian>
<Spanish>Favoritos por defecto</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_defaultToFavoritesTooltip">
<English>Controls whether the ACE Arsenal defaults to showing all items or favorites.</English>
Expand All @@ -1679,6 +1686,7 @@
<French>Contrôle si l'arsenal ACE affiche par défaut tous les éléments ou les favoris.</French>
<Portuguese>Controla se o Arsenal ACE exibe por padrão todos os itens ou favoritos.</Portuguese>
<Russian>Определяет, будет ли в арсенале ACE по умолчанию отображаться все предметы или избранное.</Russian>
<Spanish>Controla si el Arsenal de ACE muestra por defecto todos los objetos o sólo los favoritos</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_favoritesColorSetting">
<English>Favorites Color</English>
Expand All @@ -1690,6 +1698,7 @@
<French>Couleurs favorites</French>
<Portuguese>Cor dos favoritos</Portuguese>
<Russian>Избранный цвет</Russian>
<Spanish>Color de Favoritos</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_favoritesColorTooltip">
<English>Highlight color for favorited items.</English>
Expand All @@ -1701,6 +1710,7 @@
<French>Met en surbrillance les éléments favoris.</French>
<Portuguese>Cor de destaque para itens favoritados.</Portuguese>
<Russian>Выделите цветом любимые предметы.</Russian>
<Spanish>Color de marcado para los objetos favoritos</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_buttonFavoritesTooltip">
<English>Switch between displaying all items or your favorites.\nDouble click while holding Shift to add or remove an item.</English>
Expand All @@ -1712,6 +1722,7 @@
<French>Change entre l'affichage de tous les éléments ou de vos favoris.\nDouble-cliquez en maintenant la touche Maj enfoncée pour ajouter ou supprimer un élément.</French>
<Portuguese>Alterna entre a exibição de todos os itens ou seus favoritos.\nClique duas vezes enquanto mantém pressionada a tecla Shift para adicionar ou remover um item.</Portuguese>
<Russian>Переключайтесь между отображением всех элементов или ваших избранных.\nДважды щелкните, удерживая Shift, чтобы добавить или удалить элемент.</Russian>
<Spanish>Alterna entre mostrar todos los objetos o sólo los favoritos.\nDoble click mientras se pulsa Shift para añadir o quitar un objeto.</Spanish>
</Key>
<Key ID="STR_ACE_Arsenal_buttonSearchTooltip">
<English>Search\nCTRL + Click to enable live results</English>
Expand All @@ -1721,6 +1732,7 @@
<Korean>검색\nCtrl + 클릭으로 실시간 검색 결과를 활성화</Korean>
<Russian>Поиск\nCtrl + Click для включения результатов в реальном времени</Russian>
<French>Recherche\nCTRL + clic pour modifier les résultats tout en écrivant</French>
<Spanish>Buscar\nCTRL + Click habilita los objetos en directo</Spanish>
</Key>
</Package>
</Project>
7 changes: 7 additions & 0 deletions addons/ballistics/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3540,6 +3540,7 @@
<French>Utilisation de l'IA</French>
<Portuguese>Utilização por IA</Portuguese>
<Russian>Использование ИИ</Russian>
<Spanish>Uso de la IA</Spanish>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_illumination">
<English>Illum</English>
Expand All @@ -3551,6 +3552,7 @@
<French>Fusées éclairantes</French>
<Portuguese>Sinalizadoras</Portuguese>
<Russian>Осветители</Russian>
<Spanish>Iluminación</Spanish>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_concealment">
<English>Smoke</English>
Expand All @@ -3562,6 +3564,7 @@
<French>Fumigènes</French>
<Portuguese>Fumígenas</Portuguese>
<Russian>Дым</Russian>
<Spanish>Humo</Spanish>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_infantry">
<English>Inf</English>
Expand All @@ -3573,6 +3576,7 @@
<French>Infanterie</French>
<Portuguese>Infantaria</Portuguese>
<Russian>Пехота</Russian>
<Spanish>Infantería</Spanish>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_lightVehicle">
<English>Veh</English>
Expand All @@ -3584,6 +3588,7 @@
<French>Véhicule</French>
<Portuguese>Veículo</Portuguese>
<Russian>Техника</Russian>
<Spanish>Vehículo</Spanish>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_armor">
<English>Armor</English>
Expand All @@ -3595,6 +3600,7 @@
<French>Blindage</French>
<Portuguese>Blindagem</Portuguese>
<Russian>Бронетехника</Russian>
<Spanish>Blindados</Spanish>
</Key>
<Key ID="STR_ACE_Ballistics_ammoUsageShort_aircraft">
<English>Air</English>
Expand All @@ -3606,6 +3612,7 @@
<French>Aviation</French>
<Portuguese>Aeronaves</Portuguese>
<Russian>Авиация</Russian>
<Spanish>Aeronaves</Spanish>
</Key>
</Package>
</Project>
2 changes: 2 additions & 0 deletions addons/captives/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<Korean>포로 눈 가리기</Korean>
<Japanese>目隠しをする</Japanese>
<Russian>Завязать глаза пленному</Russian>
<Spanish>Vendar ojos al prisionero</Spanish>
</Key>
<Key ID="STR_ACE_Captives_RemoveBlindfoldCaptive">
<English>Remove blindfold</English>
Expand All @@ -156,6 +157,7 @@
<Korean>눈가리개 풀기</Korean>
<Japanese>目隠しを外す</Japanese>
<Russian>Снять повязку с глаз</Russian>
<Spanish>Quitar vendas de los ojos</Spanish>
</Key>
<Key ID="STR_ACE_Captives_CableTie">
<English>Cable Tie</English>
Expand Down
13 changes: 3 additions & 10 deletions addons/cargo/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,7 @@ class CfgVehicles {
class Car: LandVehicle {
GVAR(space) = 4;
GVAR(hasCargo) = 1;
class ACE_Cargo {
/*
class Cargo {
class ACE_medicalSupplyCrate {
type = "ACE_medicalSupplyCrate";
amount = 1;
};
};*/
};
class ADDON {};
};

class Tank: LandVehicle {
Expand All @@ -75,7 +67,7 @@ class CfgVehicles {
GVAR(hasCargo) = 1;
};

// HEMTTs - Default at 10, some variants are altered based on model size and/or expected level of free space inside.
// HEMTTs - Default at 30, some variants are altered based on model size and/or expected level of free space inside.
class Truck_01_base_F: Truck_F {
GVAR(space) = 30;
};
Expand Down Expand Up @@ -523,6 +515,7 @@ class CfgVehicles {
class EventHandlers {
class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
};

GVAR(space) = 3;
GVAR(hasCargo) = 1;
GVAR(size) = 3;
Expand Down
21 changes: 15 additions & 6 deletions addons/cargo/functions/fnc_addCargoItem.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,40 @@
* 0: Item to be loaded <STRING> or <OBJECT>
* 1: Holder object (vehicle) <OBJECT>
* 2: Amount <NUMBER> (default: 1)
* 3: Ignore interaction distance and stability checks <BOOL> (default: false)
*
* Return Value:
* None
* Objects loaded <NUMBER>
*
* Example:
* ["ACE_Wheel", cursorObject] call ace_cargo_fnc_addCargoItem
*
* Public: No
*/

params ["_item", "_vehicle", ["_amount", 1]];
TRACE_3("params",_item,_vehicle,_amount);
params ["_item", "_vehicle", ["_amount", 1], ["_ignoreInteraction", false]];
TRACE_4("params",_item,_vehicle,_amount,_ignoreInteraction);

private _loaded = 0;

// Get config sensitive case name
if (_item isEqualType "") then {
_item = _item call EFUNC(common,getConfigName);

for "_i" from 1 to _amount do {
[_item, _vehicle] call FUNC(loadItem);
if !([_item, _vehicle, _ignoreInteraction] call FUNC(loadItem)) exitWith {};

_loaded = _loaded + 1;
};
} else {
[_item, _vehicle] call FUNC(loadItem);
_loaded = parseNumber ([_item, _vehicle, _ignoreInteraction] call FUNC(loadItem));

_item = typeOf _item;
};

TRACE_1("loaded",_loaded);

// Invoke listenable event
["ace_cargoAdded", [_item, _vehicle, _amount]] call CBA_fnc_globalEvent;
["ace_cargoAdded", [_item, _vehicle, _loaded]] call CBA_fnc_globalEvent;

_loaded // return
11 changes: 9 additions & 2 deletions addons/cargo/functions/fnc_initVehicle.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,21 @@ if (isServer) then {

private _cargoClassname = "";
private _cargoCount = 0;
private _loaded = 0;

{
_cargoClassname = getText (_x >> "type");
_cargoCount = getNumber (_x >> "amount");

TRACE_3("adding ACE_Cargo",configName _x,_cargoClassname,_cargoCount);
TRACE_3("adding ace_cargo",configName _x,_cargoClassname,_cargoCount);

["ace_addCargo", [_cargoClassname, _vehicle, _cargoCount]] call CBA_fnc_localEvent;
// Ignore stability check (distance check is also ignored with this, but it's ignored by default if item is a string)
_loaded = [_cargoClassname, _vehicle, _cargoCount, true] call FUNC(addCargoItem);

// Let loop continue until the end, so that it prints everything into the rpt (there might be smaller items that could still fit in cargo)
if (_loaded != _cargoCount) then {
WARNING_5("%1 (%2) could not fit %3 %4 inside its cargo, only %5 were loaded.",_vehicle,_type,_cargoCount,_cargoClassname,_loaded);
};
} forEach ("true" configClasses (_config >> QUOTE(ADDON) >> "cargo"));
};

Expand Down
5 changes: 5 additions & 0 deletions addons/cargo/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<Japanese>配置する</Japanese>
<Korean>배치하기</Korean>
<French>Déployer</French>
<Spanish>Desplegar</Spanish>
</Key>
<Key ID="STR_ACE_Cargo_ScrollAction">
<English>Raise/Lower | (Ctrl + Scroll) Rotate</English>
Expand Down Expand Up @@ -337,6 +338,7 @@
<Japanese>荷降ろし不可能です</Japanese>
<Korean>하역할 수가 없습니다</Korean>
<Russian>Не может быть выгружен</Russian>
<Spanish>No puede ser descargado</Spanish>
</Key>
<Key ID="STR_ACE_Cargo_SizeMenu">
<English>Cargo Size: %1</English>
Expand All @@ -346,6 +348,7 @@
<Japanese>貨物のサイズ: %1</Japanese>
<Korean>화물 크기: %1</Korean>
<Russian>Размер груза: %1</Russian>
<Spanish>Tamaño de carga: %1</Spanish>
</Key>
<Key ID="STR_ACE_Cargo_customName_edenName">
<English>Custom Name</English>
Expand Down Expand Up @@ -584,6 +587,7 @@
<Japanese>配置機能を有効化</Japanese>
<Korean>배치 활성화</Korean>
<French>Permettre le placement</French>
<Spanish>Habilitar despliegue</Spanish>
</Key>
<Key ID="STR_ACE_Cargo_enableDeploy_description">
<English>Controls whether cargo items can be unloaded via the deploy method.</English>
Expand All @@ -592,6 +596,7 @@
<Japanese>配置機能を介して貨物アイテムを降ろすことが出来るかどうかを制御します。</Japanese>
<Korean>배치 방법을 통해 화물 아이템을 내릴 수 있는지 여부를 제어합니다.</Korean>
<French>Contrôler si les éléments de cargaison peuvent être déchargés via la méthode de déploiement.</French>
<Spanish>Controla si los objetos de la carga pueden ser descargados mediante el método de despliegue.</Spanish>
</Key>
</Package>
</Project>
Loading

0 comments on commit 53fff65

Please sign in to comment.