Merge branch 'master' into release-3.18.0

MiszczuZPolski · Oct 8, 2024 · 118c6a1 · 118c6a1
2 parents 996fc7c + 913d550
commit 118c6a1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/addons/cargo/XEH_postInit.sqf b/addons/cargo/XEH_postInit.sqf
@@ -111,6 +111,20 @@ GVAR(objectActions) = [
             {[_player, _target] call EFUNC(interaction,canInteractWithVehicleCrew)}
         }
     ] call EFUNC(interact_menu,createAction),
+    [QGVAR(checkSize), LLSTRING(checkSize), "\a3\ui_f\data\igui\cfg\simpletasks\types\box_ca.paa",
+        {
+            //IGNORE_PRIVATE_WARNING ["_target", "_player"];
+            [format [LLSTRING(SizeMenu), _target call FUNC(getSizeItem)], 3] call EFUNC(common,displayTextStructured);
+        },
+        {
+            //IGNORE_PRIVATE_WARNING ["_target", "_player"];
+            GVAR(enable) &&
+            {alive _target} &&
+            {_target getVariable [QGVAR(canLoad), getNumber (configOf _target >> QGVAR(canLoad)) == 1]} &&
+            {[_player, _target, ["isNotSwimming"]] call EFUNC(common,canInteractWith)} &&
+            {[_player, _target] call EFUNC(interaction,canInteractWithVehicleCrew)}
+        }
+    ] call EFUNC(interact_menu,createAction),
     [QGVAR(load), LLSTRING(loadObject), "a3\ui_f\data\IGUI\Cfg\Actions\loadVehicle_ca.paa",
         {
             //IGNORE_PRIVATE_WARNING ["_target", "_player"];

diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml
@@ -343,6 +343,9 @@
             <Russian>Не может быть выгружен</Russian>
             <Spanish>No puede ser descargado</Spanish>
         </Key>
+        <Key ID="STR_ACE_Cargo_checkSize">
+            <English>Check Cargo Size</English>
+        </Key>
         <Key ID="STR_ACE_Cargo_SizeMenu">
             <English>Cargo Size: %1</English>
             <German>Frachtgröße: %1</German>

diff --git a/addons/missile_gbu/stringtable.xml b/addons/missile_gbu/stringtable.xml
@@ -4,30 +4,37 @@
         <Key ID="STR_ACE_MISSILE_GBU_12">
             <English>GBU-12 [ACE]</English>
             <Italian>GBU-12 [ACE]</Italian>
+            <Japanese>GBU-12 [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_GBU_fab250">
             <English>FAB-250M-54 [ACE]</English>
             <Italian>FAB-250M-54 [ACE]</Italian>
+            <Japanese>FAB-250M-54 [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_GBU_12_1x">
             <English>1x GBU-12 [ACE]</English>
             <Italian>1x GBU-12 [ACE]</Italian>
+            <Japanese>1x GBU-12 [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_GBU_12_2x">
             <English>2x GBU-12 [ACE]</English>
             <Italian>2x GBU-12 [ACE]</Italian>
+            <Japanese>2x GBU-12 [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_GBU_12_4x">
             <English>4x GBU-12 [ACE]</English>
             <Italian>4x GBU-12 [ACE]</Italian>
+            <Japanese>4x GBU-12 [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_GBU_fab250_1x">
             <English>1x FAB-250M-54 [ACE]</English>
             <Italian>1x FAB-250M-54 [ACE]</Italian>
+            <Japanese>1x FAB-250M-54 [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_GBU_fab250_2x">
             <English>2x FAB-250M-54 [ACE]</English>
             <Italian>2x FAB-250M-54 [ACE]</Italian>
+            <Japanese>2x FAB-250M-54 [ACE]</Japanese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/missile_vikhr/stringtable.xml b/addons/missile_vikhr/stringtable.xml
@@ -4,30 +4,37 @@
         <Key ID="STR_ACE_MISSILE_VIKHR_9k121">
             <English>9k121 Vikhr [ACE]</English>
             <Italian>9k121 Vikhr [ACE]</Italian>
+            <Japanese>9k121 ヴィーフリ [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_VIKHR_1x">
             <English>1x 9k121 Vikhr [ACE]</English>
             <Italian>1x 9k121 Vikhr [ACE]</Italian>
+            <Japanese>1x 9k121 ヴィーフリ [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_VIKHR_2x">
             <English>2x 9k121 Vikhr [ACE]</English>
             <Italian>2x 9k121 Vikhr [ACE]</Italian>
+            <Japanese>2x 9k121 ヴィーフリ [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_VIKHR_3x">
             <English>3x 9k121 Vikhr [ACE]</English>
             <Italian>3x 9k121 Vikhr [ACE]</Italian>
+            <Japanese>3x 9k121 ヴィーフリ [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_VIKHR_4x">
             <English>4x 9k121 Vikhr [ACE]</English>
             <Italian>4x 9k121 Vikhr [ACE]</Italian>
+            <Japanese>4x 9k121 ヴィーフリ [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_VIKHR_6x">
             <English>6x 9k121 Vikhr [ACE]</English>
             <Italian>6x 9k121 Vikhr [ACE]</Italian>
+            <Japanese>6x 9k121 ヴィーフリ [ACE]</Japanese>
         </Key>
         <Key ID="STR_ACE_MISSILE_VIKHR_8x">
             <English>8x 9k121 Vikhr [ACE]</English>
             <Italian>8x 9k121 Vikhr [ACE]</Italian>
+            <Japanese>8x 9k121 ヴィーフリ [ACE]</Japanese>
         </Key>
     </Package>
 </Project>