From d19780e6f810d10c3ad8f86369ec99f74c0c4874 Mon Sep 17 00:00:00 2001 From: Killerswin2 Date: Thu, 21 Dec 2023 12:59:11 -0600 Subject: [PATCH 1/3] larger builder boxes --- A3A/addons/core/Stringtable.xml | 15 ++++++++ .../UtilityItems/fn_initObjectRemote.sqf | 9 +++++ .../functions/init/fn_initUtilityItems.sqf | 9 ++++- A3A/addons/logistics/Cargo/Vanilla.hpp | 37 ++++++++++++++++++- 4 files changed, 67 insertions(+), 3 deletions(-) diff --git a/A3A/addons/core/Stringtable.xml b/A3A/addons/core/Stringtable.xml index 9d9b7a1245..5d18476de0 100644 --- a/A3A/addons/core/Stringtable.xml +++ b/A3A/addons/core/Stringtable.xml @@ -12753,6 +12753,21 @@ Cephane İstasyonu 弹药站 + + Colossal construction kit + + + Enormous construction kit + + + Extra Large construction kit + + + Gargantuan construction kit + + + Humongous construction kit + Large construction kit Kit di costruzioni grande diff --git a/A3A/addons/core/functions/UtilityItems/fn_initObjectRemote.sqf b/A3A/addons/core/functions/UtilityItems/fn_initObjectRemote.sqf index 1adb0351f6..f0a32b7b53 100644 --- a/A3A/addons/core/functions/UtilityItems/fn_initObjectRemote.sqf +++ b/A3A/addons/core/functions/UtilityItems/fn_initObjectRemote.sqf @@ -66,6 +66,15 @@ if ("build" in _flags) then { ]; }; +// building placer box with huge crap +if ("hugebuild" in _flags) then { + if(A3A_hasACE) then + { + [_object, 4] call ace_cargo_fnc_setSize; + }; + // TODO: find a good way to calculate a new mass for these objects. +}; + // packable object if ("pack" in _flags) then { _object addAction [ diff --git a/A3A/addons/core/functions/init/fn_initUtilityItems.sqf b/A3A/addons/core/functions/init/fn_initUtilityItems.sqf index 401060127d..c3a71c20a0 100644 --- a/A3A/addons/core/functions/init/fn_initUtilityItems.sqf +++ b/A3A/addons/core/functions/init/fn_initUtilityItems.sqf @@ -29,8 +29,13 @@ private _items = [ [_repairStation#0, _repairStation#1, "repairstation", "repair", ["cmmdr", "place", "move", "rotate", "pack", "save"]], [FactionGet(reb,"vehicleLightSource"), 25, "light", "", ["move"]], // note: If we do want this saved, need to switch saveLoop to nearObjects ["Land_PlasticCase_01_medium_F", 100, "buildboxsmall", "", ["place", "move", "build"]], - ["Land_PlasticCase_01_large_F", 500, "buildboxlarge", "", ["place", "move", "build"]] - // TODO: get larger box from somewhere + ["Land_PlasticCase_01_large_F", 500, "buildboxlarge", "", ["place", "move", "build"]], + ["Land_WoodenCrate_01_F", 1000, "buildboxextralarge", "", ["place", "move", "build"]], + ["Land_WoodenCrate_01_stack_x5_F", 5000, "buildboxcolossal", "", ["place", "build", "hugebuild"]], + ["Land_Cargo10_cyan_F", 10000, "buildboxenormous", "", ["place", "build", "hugebuild"]], + ["Land_Cargo20_cyan_F", 50000, "buildboxhumongous", "", ["place", "build", "hugebuild"]], + ["Land_Cargo40_cyan_F", 100000, "buildboxgargantuan", "", ["place", "build", "hugebuild"]] + ]; if (LootToCrateRadius == 0) then { _items deleteAt 0 }; diff --git a/A3A/addons/logistics/Cargo/Vanilla.hpp b/A3A/addons/logistics/Cargo/Vanilla.hpp index df476c7af1..5d993e8641 100644 --- a/A3A/addons/logistics/Cargo/Vanilla.hpp +++ b/A3A/addons/logistics/Cargo/Vanilla.hpp @@ -190,4 +190,39 @@ class A3_Structures_F_Heli_Ind_Cargo_Cargo10_red_F_p3d: TRIPLES(ADDON,Cargo,Base offset[] = {0,0.1,1.35}; rotation[] = {1,0,0}; size = 4; -}; \ No newline at end of file +}; + +class A3_Structures_F_Heli_Ind_Cargo_Cargo10_cyan_F_p3d : TRIPLES(ADDON,Cargo,Base) +{ + offset[] = {0,0.1,1.35}; + rotation[] = {1,0,0}; + size = 4; +}; + +class A3_Structures_F_Ind_Cargo_Cargo20_cyan_F_p3d : TRIPLES(ADDON,Cargo,Base) +{ + offset[] = {0,-0.3,1.3}; + rotation[] = {1,0,0}; + size = 7; +}; + +class A3_Structures_F_Ind_Cargo_Cargo40_cyan_F_p3d : TRIPLES(ADDON,Cargo,Base) +{ + offset[] = {0,-4.44,1.1.35}; + rotation[] = {1,0,0}; + size = 12; +}; + +class A3_Props_F_Exp_Commercial_Market_WoodenCrate_01_F_p3d : TRIPLES(ADDON,Cargo,Base) +{ + offset[] = {0,0,0.32}; + rotation[] = {0,1,0}; + size = 2; +}; + +class A3_Props_F_Exp_Commercial_Market_WoodenCrate_01_stack_x5_F_p3d : TRIPLES(ADDON,Cargo,Base) +{ + offset[] = {0,0.5,0.97}; + rotation[] = {0,1,0}; + size = 3; +}; From edb59d25e30fe766cf2d8021f7d9db8c7d20e59c Mon Sep 17 00:00:00 2001 From: Bob-Murphy Date: Tue, 23 Jan 2024 18:20:09 +0100 Subject: [PATCH 2/3] removed two largest options --- A3A/addons/core/functions/init/fn_initUtilityItems.sqf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/A3A/addons/core/functions/init/fn_initUtilityItems.sqf b/A3A/addons/core/functions/init/fn_initUtilityItems.sqf index c3a71c20a0..f2a24ab0c9 100644 --- a/A3A/addons/core/functions/init/fn_initUtilityItems.sqf +++ b/A3A/addons/core/functions/init/fn_initUtilityItems.sqf @@ -32,9 +32,7 @@ private _items = [ ["Land_PlasticCase_01_large_F", 500, "buildboxlarge", "", ["place", "move", "build"]], ["Land_WoodenCrate_01_F", 1000, "buildboxextralarge", "", ["place", "move", "build"]], ["Land_WoodenCrate_01_stack_x5_F", 5000, "buildboxcolossal", "", ["place", "build", "hugebuild"]], - ["Land_Cargo10_cyan_F", 10000, "buildboxenormous", "", ["place", "build", "hugebuild"]], - ["Land_Cargo20_cyan_F", 50000, "buildboxhumongous", "", ["place", "build", "hugebuild"]], - ["Land_Cargo40_cyan_F", 100000, "buildboxgargantuan", "", ["place", "build", "hugebuild"]] + ["Land_Cargo10_cyan_F", 10000, "buildboxenormous", "", ["place", "build", "hugebuild"]] ]; From 246d580b5a53c4e4483ecfd02e1dfb10ab13bbbe Mon Sep 17 00:00:00 2001 From: Bob-Murphy Date: Tue, 23 Jan 2024 18:23:06 +0100 Subject: [PATCH 3/3] stringtable adaptation --- A3A/addons/core/Stringtable.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/A3A/addons/core/Stringtable.xml b/A3A/addons/core/Stringtable.xml index 5d18476de0..577f0417cb 100644 --- a/A3A/addons/core/Stringtable.xml +++ b/A3A/addons/core/Stringtable.xml @@ -12762,12 +12762,6 @@ Extra Large construction kit - - Gargantuan construction kit - - - Humongous construction kit - Large construction kit Kit di costruzioni grande