Skip to content

Commit

Permalink
fixed issues with mounting weapons and loading crates on ammotruck of…
Browse files Browse the repository at this point in the history
… GM, also fixed #2761
  • Loading branch information
targetingsnake committed Dec 26, 2023
1 parent 64702c8 commit 3450737
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 9 deletions.
2 changes: 1 addition & 1 deletion A3A/addons/core/Templates/Templates/GM/GM_Reb.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ _rebUniforms append [
"U_IG_leader",
"U_IG_Guerrilla_6_1",
"U_I_G_resistanceLeader_F"
]
];

private _dlcUniforms = [];

Expand Down
112 changes: 104 additions & 8 deletions A3A/addons/logistics/Nodes/GM.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class gm_gm_vehicles_gm_land_gm_wheeled_gm_u1300l_gm_u1300l_container : TRIPLES(ADDON,Nodes,Base)
class gm_ge_army_u1300l_container : TRIPLES(ADDON,Nodes,Base)
{
class Nodes
{
Expand All @@ -25,7 +25,19 @@ class gm_gm_vehicles_gm_land_gm_wheeled_gm_u1300l_gm_u1300l_container : TRIPLES(
};
};

class gm_gm_vehicles_gm_land_gm_wheeled_gm_kat1_gm_kat1_454_cargo : TRIPLES(ADDON,Nodes,Base)
class gm_ge_army_u1300l_container_un : gm_ge_army_u1300l_container
{};

class gm_ge_army_u1300l_container_win : gm_ge_army_u1300l_container
{};

class gm_ge_army_u1300l_container_wiw : gm_ge_army_u1300l_container
{};

class gm_ge_army_u1300l_container_des : gm_ge_army_u1300l_container
{};

class gm_ge_army_kat1_454_cargo : TRIPLES(ADDON,Nodes,Base)
{
class Nodes
{
Expand Down Expand Up @@ -72,11 +84,23 @@ class gm_gm_vehicles_gm_land_gm_wheeled_gm_kat1_gm_kat1_454_cargo : TRIPLES(ADDO
};
};

class gm_gm_vehicles_gm_land_gm_wheeled_gm_kat1_gm_kat1_451_container : TRIPLES(ADDON,Nodes,Base)
class gm_ge_army_kat1_454_cargo_wiw : gm_ge_army_kat1_454_cargo
{};

class gm_ge_army_kat1_454_cargo_win : gm_ge_army_kat1_454_cargo
{};

class gm_ge_army_kat1_454_cargo_un : gm_ge_army_kat1_454_cargo
{};

class gm_ge_army_kat1_454_cargo_des : gm_ge_army_kat1_454_cargo
{};

class gm_ge_army_kat1_451_container : TRIPLES(ADDON,Nodes,Base)
{
class Nodes
{
class Node1
class Node1
{
offset[] = {0,0.6,-0.85};
seats[] = {2,3};
Expand Down Expand Up @@ -109,6 +133,18 @@ class gm_gm_vehicles_gm_land_gm_wheeled_gm_kat1_gm_kat1_451_container : TRIPLES(
};
};

class gm_ge_army_kat1_451_container_des : gm_ge_army_kat1_451_container
{};

class gm_ge_army_kat1_451_container_un : gm_ge_army_kat1_451_container
{};

class gm_ge_army_kat1_451_container_win : gm_ge_army_kat1_451_container
{};

class gm_ge_army_kat1_451_container_wiw : gm_ge_army_kat1_451_container
{};

class gm_gm_vehicles_gm_land_gm_wheeled_gm_kat1_gm_kat1_452_container : TRIPLES(ADDON,Nodes,Base)
{
class Nodes
Expand Down Expand Up @@ -236,46 +272,106 @@ class gm_gm_vehicles_gm_land_gm_wheeled_gm_ural375d_gm_ural375d_cargo_p3d : TRIP

class gm_gm_vehicles_gm_land_gm_wheeled_gm_typ2_gm_typ247 : TRIPLES(ADDON,Nodes,Base)
{
class Nodes
class Nodes
{
class Node1
{
offset[] = {-0.1,-1.2,-0.95};
seats[] = {};
};
class Node2
{
offset[] = {-0.1,-2,-0.95};
seats[] = {};
};
};
};

class gm_gm_vehicles_gm_land_gm_wheeled_gm_typ2_gm_typ251 : TRIPLES(ADDON,Nodes,Base)
{
class Nodes
canLoadWeapon = 0;
class Nodes
{
class Node1
{
offset[] = {-0.1,-0.3,-0.82};
seats[] = {};
};
class Node2
{
offset[] = {-0.1,-1.1,-0.82};
seats[] = {};
};
class Node3
{
offset[] = {-0.1,-1.9,-0.82};
seats[] = {};
};
};
};


class gm_gm_vehicles_gm_land_gm_wheeled_gm_typ2_gm_typ253 : TRIPLES(ADDON,Nodes,Base)
{
class Nodes
canLoadWeapon = 0;
class Nodes
{
class Node1
{
offset[] = {0,-2.2,-0.8};
seats[] = {};
};
};
};

class gm_gm_vehicles_gm_land_gm_wheeled_gm_uaz469_gm_uaz469_cargo : TRIPLES(ADDON,Nodes,Base)
{
canLoadWeapon = 0;
class Nodes
{
class Node1
{
offset[] = {-0.1,-1.7,-1.25};
seats[] = {4,5};
};
};
};
};

class gm_gm_vehicles_gm_land_gm_wheeled_gm_w123_gm_w123 : TRIPLES(ADDON,Nodes,Base)
{
canLoadWeapon = 0;
class Nodes
{
class Node1
{
offset[] = {0,-1.7,-0.45};
seats[] = {4};
};
};
};

class gm_gm_vehicles_gm_land_gm_wheeled_gm_p601_gm_p601_patrol : TRIPLES(ADDON,Nodes,Base)
{
canLoadWeapon = 0;
class Nodes
{
class Node1
{
offset[] = {0,-1.3,-0.98};
seats[] = {2};
};
};
};

class gm_gm_vehicles_gm_land_gm_wheeled_gm_p601_gm_p601 : TRIPLES(ADDON,Nodes,Base)
{
canLoadWeapon = 0;
class Nodes
{
class Node1
{
offset[] = {0,-1.3,-0.98};
seats[] = {3};
};
};
};

0 comments on commit 3450737

Please sign in to comment.