Skip to content

Commit

Permalink
groups, rubber boat for blufor
Browse files Browse the repository at this point in the history
  • Loading branch information
@nomisum
nomisum committed Jan 4, 2016
1 parent 0626960 commit fcc1f8a
Show file tree
Hide file tree
Showing 11 changed files with 138 additions and 24 deletions.
2 changes: 1 addition & 1 deletion dynamicGroups/createHeli.sqf → dynamicGroups/createAir.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if (isServer) then
private ["_group", "_leader", "_data"];
_group = group _unit;
_leader = leader _group;
_data = ["grad_heli", "Heli", false]; // [<Insignia>, <Group Name>, <Private>]
_data = ["grad_air", "Air", false]; // [<Insignia>, <Group Name>, <Private>]

["RegisterGroup", [_group, _leader, _data]] call BIS_fnc_dynamicGroups;
// {[[ _x, "GRAD_heli"], "BIS_fnc_setUnitInsignia", nil, true, true] call BIS_fnc_MP;sleep 0.1;} forEach units _group;
Expand Down
13 changes: 13 additions & 0 deletions dynamicGroups/createFoxtrot.sqf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
_unit = _this select 0;
_groupThis = group _unit;

if (isServer) then
{
private ["_group", "_leader", "_data"];
_group = group _unit;
_leader = leader _group;
_data = ["grad_foxtrot", "Foxtrot", false]; // [<Insignia>, <Group Name>, <Private>]

["RegisterGroup", [_group, _leader, _data]] call BIS_fnc_dynamicGroups;
// {[[ _x, "GRAD_delta"], "BIS_fnc_setUnitInsignia", nil, true, true] call BIS_fnc_MP;sleep 0.1;} forEach units _group;
};
13 changes: 13 additions & 0 deletions dynamicGroups/createGolf.sqf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
_unit = _this select 0;
_groupThis = group _unit;

if (isServer) then
{
private ["_group", "_leader", "_data"];
_group = group _unit;
_leader = leader _group;
_data = ["grad_golf", "Golf", false]; // [<Insignia>, <Group Name>, <Private>]

["RegisterGroup", [_group, _leader, _data]] call BIS_fnc_dynamicGroups;
// {[[ _x, "GRAD_delta"], "BIS_fnc_setUnitInsignia", nil, true, true] call BIS_fnc_MP;sleep 0.1;} forEach units _group;
};
13 changes: 13 additions & 0 deletions dynamicGroups/createHotel.sqf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
_unit = _this select 0;
_groupThis = group _unit;

if (isServer) then
{
private ["_group", "_leader", "_data"];
_group = group _unit;
_leader = leader _group;
_data = ["grad_hotel", "Hotel", false]; // [<Insignia>, <Group Name>, <Private>]

["RegisterGroup", [_group, _leader, _data]] call BIS_fnc_dynamicGroups;
// {[[ _x, "GRAD_delta"], "BIS_fnc_setUnitInsignia", nil, true, true] call BIS_fnc_MP;sleep 0.1;} forEach units _group;
};
13 changes: 13 additions & 0 deletions dynamicGroups/createIndia.sqf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
_unit = _this select 0;
_groupThis = group _unit;

if (isServer) then
{
private ["_group", "_leader", "_data"];
_group = group _unit;
_leader = leader _group;
_data = ["grad_india", "India", false]; // [<Insignia>, <Group Name>, <Private>]

["RegisterGroup", [_group, _leader, _data]] call BIS_fnc_dynamicGroups;
// {[[ _x, "GRAD_delta"], "BIS_fnc_setUnitInsignia", nil, true, true] call BIS_fnc_MP;sleep 0.1;} forEach units _group;
};
1 change: 1 addition & 0 deletions init.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ if (hasInterface) then {


[] execVM "spawn\hedgehogAssemblingSystem.sqf";
[] execVM "spawn\assaultBoatAssemblingSystem.sqf";
[] execVM "spawn\addInteractions.sqf";

if (playerSide == west) then {
Expand Down
24 changes: 16 additions & 8 deletions mission.sqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1997,7 +1997,8 @@ class Mission
leader=1;
rank="LIEUTENANT";
skill=0.5;
description="Crewman-Commander";
init="0 = [this] execVM ""dynamicGroups\createFoxtrot.sqf"";";
description="Crewman-Commander (Foxtrot)";
};
class Item1
{
Expand Down Expand Up @@ -2045,7 +2046,8 @@ class Mission
leader=1;
rank="LIEUTENANT";
skill=0.5;
description="Crewman-Commander";
init="0 = [this] execVM ""dynamicGroups\createGolf.sqf"";";
description="Crewman-Commander (Golf)";
};
class Item1
{
Expand Down Expand Up @@ -2093,7 +2095,8 @@ class Mission
leader=1;
rank="LIEUTENANT";
skill=0.5;
description="Crewman-Commander";
init="0 = [this] execVM ""dynamicGroups\createHotel.sqf"";";
description="Crewman-Commander (Hotel)";
};
class Item1
{
Expand Down Expand Up @@ -2761,7 +2764,8 @@ class Mission
leader=1;
rank="LIEUTENANT";
skill=0.5;
description="Crewman-Commander";
init="0 = [this] execVM ""dynamicGroups\createFoxtrot.sqf"";";
description="Crewman-Commander (Foxtrot)";
};
class Item2
{
Expand Down Expand Up @@ -2809,7 +2813,8 @@ class Mission
leader=1;
rank="LIEUTENANT";
skill=0.5;
description="Crewman-Commander";
init="0 = [this] execVM ""dynamicGroups\createGolf.sqf"";";
description="Crewman-Commander (Golf)";
};
class Item2
{
Expand Down Expand Up @@ -2857,7 +2862,8 @@ class Mission
leader=1;
rank="LIEUTENANT";
skill=0.5;
description="Crewman-Commander";
init="0 = [this] execVM ""dynamicGroups\createHotel.sqf"";";
description="Crewman-Commander (Hotel)";
};
class Item2
{
Expand Down Expand Up @@ -2926,7 +2932,8 @@ class Mission
leader=1;
rank="LIEUTENANT";
skill=0.5;
description="Helicopter Pilot";
init="0 = [this] execVM ""dynamicGroups\createAir.sqf"";";
description="Helicopter Pilot (Air)";
};
class Item1
{
Expand Down Expand Up @@ -2974,7 +2981,8 @@ class Mission
leader=1;
rank="LIEUTENANT";
skill=0.5;
description="Crewman-Commander";
init="0 = [this] execVM ""dynamicGroups\createIndia.sqf"";";
description="Crewman-Commander (India)";
};
class Item1
{
Expand Down
35 changes: 32 additions & 3 deletions spawn/addInteractions.sqf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// buy actions
_usAction = ["ACE_MainActions", (localize "str_GRAD_buy_vehicles"), "",
{0 = createDialog "USSupplyGUI"; disableSerialization; [USSupplies, false, 0, "","",""] call refreshUSUI;},
{side player == west},{},[],[2,3.5,0],5] call ace_interact_menu_fnc_createAction;
Expand All @@ -12,30 +13,58 @@ _rusAction = ["ACE_MainActions", (localize "str_GRAD_buy_vehicles"), "",
["Land_Cargo_House_V1_F", 0, [], _rusAction] call ace_interact_menu_fnc_addActionToClass;




/*_assembleTankTrap = ["ACE_MainActions", "Assemble Tank Trap", "",
{[this] call assembleTankTrap;},
{},{},[],[1,0,0],1] call ace_interact_menu_fnc_createAction;*/

// CURRENTLY NOT IN USE (UNWANTED AIA DEPENDENCY)

/*
_assembleTankTrap = ["TankTrapSystem", "Assemble Tank Trap", "",
{[(_this select 0)] call assembleTankTrap;},
{true}] call ace_interact_menu_fnc_createAction;
["ACE_Box_Misc", 0, ["ACE_MainActions"],_assembleTankTrap] call ace_interact_menu_fnc_addActionToClass;
*/


/*_disassembleTankTrap = ["ACE_MainActions", "Disassemble Tank Trap", "",
/*
_disassembleTankTrap = ["ACE_MainActions", "Disassemble Tank Trap", "",
{[this] call disassembleTankTrap;},
{},{},[],[1,0,0],1] call ace_interact_menu_fnc_createAction;*/


// CURRENTLY NOT IN USE (UNWANTED AIA DEPENDENCY)
/*
_disassembleTankTrap = ["TankTrapSystem", "Disassemble Tank Trap", "",
{[(_this select 0)] call disassembleTankTrap;},
{true}] call ace_interact_menu_fnc_createAction;
["Hedgehog", 0, ["ACE_MainActions"],_disassembleTankTrap] call ace_interact_menu_fnc_addActionToClass;
*/


// transmission progress check
_transmissionProgressAction = ["TransmissionProgress", "Check Transmission Progress", "",
{[{[] call showPointsInstant;},"BIS_fnc_spawn",true,true] call BIS_fnc_MP;},
{side player == east}] call ace_interact_menu_fnc_createAction;

["rhs_gaz66_r142_vv", 0, ["ACE_MainActions"],_transmissionProgressAction] call ace_interact_menu_fnc_addActionToClass;
["rhs_gaz66_r142_vv", 0, ["ACE_MainActions"],_transmissionProgressAction] call ace_interact_menu_fnc_addActionToClass;




// assault boat assembly

_assembleAssaultBoat = ["AssaultBoatAssembly", "Assemble Assault Boat", "",
{[(_this select 0)] call assembleAssaultBoat;},
{true}] call ace_interact_menu_fnc_createAction;

["ACE_Box_Misc", 0, ["ACE_MainActions"],_assembleAssaultBoat] call ace_interact_menu_fnc_addActionToClass;

/* 0 = _x addAction["<t color=""#93E352"">" + "Assemble Assault Boat",{[[[position player] "spawn\assaultBoatAssemblingSystem.sqf"],"BIS_fnc_execVM",true,true] spawn BIS_fnc_MP; }, _Args, 1, false, true, "","typeOf 'B_FieldPack_blk' == typeOf _target"];*/


// "B_Boat_Transport_01_F" / "B_FieldPack_blk"
8 changes: 8 additions & 0 deletions spawn/assaultBoatAssemblingSystem.sqf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
assembleAssaultBoat = {
_crate = _this select 0;
_pos = getPos _crate;
deleteVehicle _crate;

_boat = createVehicle ["B_Boat_Transport_01_F", _pos, [], 0, "NONE"];
// [_boat, true, [0,1.1,0.092], 180] call ace_dragging_fnc_setDraggable;
};
23 changes: 17 additions & 6 deletions spawn/gui/_dialogs.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ class USSupplyGUI
};
class US_gui_text_countleft_3: RscStructuredText
{
idc = 3203;
idc = -1;
text = "<t align='center'>lade ...</t>";
x = 12.5 * GUI_GRID_W + GUI_GRID_X;
y = 12 * GUI_GRID_H + GUI_GRID_Y;
Expand Down Expand Up @@ -1186,20 +1186,31 @@ class gui_spawn_opfor

class Controls {

class text_spawn_opfor: RscStructuredText
class text_spawn_opfor1: RscStructuredText
{
idc = 3202;
text = "<t align='center' size='1.2'>TvT Breaking Contact</t>";
idc = -1;
text = "<t align='center' size='1.2'>Hello Commander!</t>";
x = 14 * GUI_GRID_W + GUI_GRID_X;
y = 1 * GUI_GRID_H + GUI_GRID_Y;
w = 12 * GUI_GRID_W;
h = 3 * GUI_GRID_H;
colorBackground[] = {-1,-1,-1,0};
};

class btn_spawn_opfor: RscButton
class text_spawn_opfor2: RscStructuredText
{
idc = -1;
text = "<t align='center' size='0.6'>In case you close this dialog by accident, reopen with [SPACE]</t>";
x = 14 * GUI_GRID_W + GUI_GRID_X;
y = 3 * GUI_GRID_H + GUI_GRID_Y;
w = 12 * GUI_GRID_W;
h = 3 * GUI_GRID_H;
colorBackground[] = {-1,-1,-1,0};
};

class btn_spawn_opfor3: RscButton
{
idc = 8012;
idc = -1;
text = $STR_GRAD_choose_spawn_location;
x = 14 * GUI_GRID_W + GUI_GRID_X;
y = 5 * GUI_GRID_H + GUI_GRID_Y;
Expand Down
17 changes: 11 additions & 6 deletions spawn/gui/addPublicVariableEventhandler.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fillRussianSupplies = {
clearMagazineCargoGlobal (_this select 0);
(_this select 0) addItemCargoGlobal ['ItemGPS',1];
},
format['%1<br/>%2<br/>%3<br/>%4<br/>%5','Crew: 1','Seats: 11','Speed: 90','','']
format['%1<br/>%2<br/>%3<br/>%4<br/>%5','Crew: 1','Seats: 11','Speed: 90','','1 GPS']
],
[
tigr,
Expand All @@ -61,7 +61,7 @@ fillRussianSupplies = {
clearMagazineCargoGlobal (_this select 0);
(_this select 0) addItemCargoGlobal ['ItemGPS',1];
},
format['%1<br/>%2<br/>%3<br/>%4<br/>%5','Crew: 1','Seats: 7','Speed: 140','','']
format['%1<br/>%2<br/>%3<br/>%4<br/>%5','Crew: 1','Seats: 7','Speed: 140','','1 GPS']
],
[
"rhs_gaz66_repair_vdv",
Expand Down Expand Up @@ -114,7 +114,7 @@ fillRussianSupplies = {
clearMagazineCargoGlobal (_this select 0);
(_this select 0) addItemCargoGlobal ['ItemGPS',1];
},
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6<br/>%7','Crew: 2','Seats: 1','Speed: 121','','Weapons:','50x4 12.7mm']
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6<br/>%7<br/>%8<br/>%9','Crew: 2','Seats: 1','Speed: 121','','Weapons:','50x4 12.7mm','','1 GPS']
],
[
"rhs_btr70_vdv",
Expand Down Expand Up @@ -229,8 +229,13 @@ fillUSSupplies = {
clearBackpackCargoGlobal (_this select 0);
clearMagazineCargoGlobal (_this select 0);
(_this select 0) addItemCargoGlobal ['ItemGPS',1];
_box = createVehicle ['ACE_Box_Misc', position (_this select 0), [], 1, 'NONE'];
clearWeaponCargoGlobal _box;
clearItemCargoGlobal _box;
clearBackpackCargoGlobal _box;
clearMagazineCargoGlobal _box;
},
format['%1<br/>%2<br/>%3<br/>%4<br/>%5','Crew: 1','Seats: 5','Speed: 109','','']
format['%1<br/>%2<br/>%3<br/>%4<br/>%5','Crew: 1','Seats: 5','Speed: 109','1 Assault Boat','1 GPS']
],
[
hmmwv_m2,
Expand All @@ -247,7 +252,7 @@ fillUSSupplies = {
clearMagazineCargoGlobal (_this select 0);
(_this select 0) addItemCargoGlobal ['ItemGPS',1];
},
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6','Crew: 1','Seats: 3','Speed: 109','','Weapons:','100x6 7.62']
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6<br/>%7<br/>%8','Crew: 1','Seats: 3','Speed: 109','','Weapons:','100x6 7.62','','1 GPS']
],
[
m113_m2,
Expand All @@ -264,7 +269,7 @@ fillUSSupplies = {
clearMagazineCargoGlobal (_this select 0);
(_this select 0) addItemCargoGlobal ['ItemGPS',1];
},
format['%1<br/>%2<br/>%3<br/>%4<br/>%5','Crew: 2','Seats: 11','Speed: 67','','']
format['%1<br/>%2<br/>%3<br/>%4<br/>%5','Crew: 2','Seats: 11','Speed: 67','','1 GPS']
],
[
m113_ammo,
Expand Down

0 comments on commit fcc1f8a

Please sign in to comment.