Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make money and supply convoy vehicles faction appropriate #30

Open
wants to merge 20 commits into
base: patch-50
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6c5a974
Merge pull request #421 from SilenceIsFatto/unstable
SilenceIsFatto Dec 10, 2024
45c2b35
Select faction-defined supply trucks for money and supply convoys bef…
jwoodruff40 Jan 8, 2025
7a23e0a
Use appropriate faction obj vehicles for supply and money convoys
jwoodruff40 Jan 9, 2025
5ad94a7
Fix termination conditions
jwoodruff40 Jan 9, 2025
123136b
Merge branch 'improve-convoy-vehicle-selection' into pr/wersal454/428
jwoodruff40 Jan 9, 2025
7ccd641
Rework war level vehicle selection
jwoodruff40 Jan 9, 2025
3086a11
Merge branch 'patch-50' into pr/wersal454/428
wersal454 Jan 10, 2025
6a2b765
Use existing _faction get XXX for armored vehicles
jwoodruff40 Jan 11, 2025
db64717
Cargo and vehicle selection fixes.
jwoodruff40 Jan 11, 2025
d21c0b2
Merge branch 'patch-50' into pr/wersal454/428
wersal454 Jan 12, 2025
1ed3de8
Use all faction-defined vehicles
jwoodruff40 Jan 12, 2025
64bafd2
remove the boxer
wersal454 Jan 12, 2025
f556035
Simplify convoy objective vehicle selection
jwoodruff40 Jan 12, 2025
8de8c58
Remove vehiclesCivSupply from defaults entirely
jwoodruff40 Jan 12, 2025
99f379d
Cleanup faction hashmaps before using them
jwoodruff40 Jan 13, 2025
91a67a2
Add supply crate retex's for convoys
jwoodruff40 Jan 13, 2025
9fb754c
Update A3A/addons/core/functions/Missions/fn_convoy.sqf
wersal454 Jan 13, 2025
6dd2e3b
Replace medical retex's with humanitarian cargo.
jwoodruff40 Jan 19, 2025
2e1c002
Money / Supply convoy container updates
jwoodruff40 Jan 20, 2025
80a09d5
Update convoy mission stringtable entries for money / supplies convoy…
jwoodruff40 Jan 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 63 additions & 38 deletions A3A/addons/core/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,42 +148,67 @@ class CfgVehicles
class NATO_Box_Base;


class A3AU_Build_Box_base: NATO_Box_Base
{
author = AUTHOR;
hiddenSelections[] =
{
"Camo_Signs",
"Camo"
};
hiddenSelectionsTextures[] =
{
QPATHTOFOLDER(Pictures\items\AmmoBox_signs_CA.paa),
QPATHTOFOLDER(Pictures\items\AmmoBox_black_CO.paa)
};
};

class A3AU_Build_Box_Large_1: A3AU_Build_Box_base
{
mapSize = 2.3399999;
class SimpleObject
{
eden = 1;
animate[] = {};
hide[] = {};
verticalOffset = 0.15000001;
verticalOffsetWorld = 0;
init = "''";
};
editorPreview = QPATHTOFOLDER(Pictures\items\A3AU_Build_Box_Large_1.jpg);
_generalMacro = "Box_NATO_WpsLaunch_F";
scope = 2;
displayName = "Build Box (Large)";
model = "\A3\weapons_F\AmmoBoxes\WpnsBox_long_F";
icon = "iconCrateLong";
class TransportMagazines{};
class TransportWeapons{};
class TransportItems{};
class TransportBackpacks{};
};
class A3AU_Build_Box_base: NATO_Box_Base {
author = AUTHOR;
hiddenSelections[] =
{
"Camo_Signs",
"Camo"
};
hiddenSelectionsTextures[] =
{
QPATHTOFOLDER(Pictures\items\AmmoBox_signs_CA.paa),
QPATHTOFOLDER(Pictures\items\AmmoBox_black_CO.paa)
};
};

class A3AU_Build_Box_Large_1: A3AU_Build_Box_base {
mapSize = 2.3399999;
class SimpleObject
{
eden = 1;
animate[] = {};
hide[] = {};
verticalOffset = 0.15000001;
verticalOffsetWorld = 0;
init = "''";
};
editorPreview = QPATHTOFOLDER(Pictures\items\A3AU_Build_Box_Large_1.jpg);
_generalMacro = "Box_NATO_WpsLaunch_F";
scope = 2;
displayName = "Build Box (Large)";
model = "\A3\weapons_F\AmmoBoxes\WpnsBox_long_F";
icon = "iconCrateLong";
class TransportMagazines{};
class TransportWeapons{};
class TransportItems{};
class TransportBackpacks{};
};

class B_supplyCrate_F;
class A3AU_supplyCrate_Base : B_supplyCrate_F {
author = AUTHOR;
class TransportBackpacks {};
class TransportItems {};
class TransportMagazines {};
class TransportWeapons {};
};
class A3AU_supplyCrate_Medical_01 : A3AU_supplyCrate_Base {
author = AUTHOR;
hiddenSelections[] = { "camo" };
hiddenSelectionsTextures[] = { QPATHTOFOLDER(Pictures\items\supplydrop_medical_01_co.paa) };
};
class A3AU_supplyCrate_Medical_02 : A3AU_supplyCrate_Base {
author = AUTHOR;
hiddenSelections[] = { "camo" };
hiddenSelectionsTextures[] = { QPATHTOFOLDER(Pictures\items\supplydrop_medical_02_co.paa) };
};

class Land_PaperBox_01_small_closed_white_med_F;
class A3AU_moneyCrate_small_01 : Land_PaperBox_01_small_closed_white_med_F {
displayName = "Money Crate (Small)";
author = AUTHOR;
hiddenSelections[] = { "camo" };
hiddenSelectionsTextures[] = { QPATHTOFOLDER(Pictures\items\PaperBox_01_small_money_CO.paa) };
};
};
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
["vehiclesCivPlane", []] call _fnc_saveToTemplate;
["vehiclesPlane", []] call _fnc_saveToTemplate;
["vehiclesMedical", []] call _fnc_saveToTemplate;
["vehiclesCivSupply", ["C_Van_01_box_F"]] call _fnc_saveToTemplate;

["animations", []] call _fnc_saveToTemplate;
["variants", []] call _fnc_saveToTemplate;
Expand All @@ -42,4 +41,4 @@ if(A3A_hasACE) then {

//FIA Rebels as Example
["faces", ["GreekHead_A3_02","GreekHead_A3_03","GreekHead_A3_04","GreekHead_A3_05","GreekHead_A3_06","GreekHead_A3_07","GreekHead_A3_08","GreekHead_A3_09","Ioannou","Mavros"]] call _fnc_saveToTemplate;
["voices", ["Male01GRE", "Male02GRE", "Male03GRE", "Male04GRE", "Male05GRE", "Male06GRE"]] call _fnc_saveToTemplate;
["voices", ["Male01GRE", "Male02GRE", "Male03GRE", "Male04GRE", "Male05GRE", "Male06GRE"]] call _fnc_saveToTemplate;
Loading