diff --git a/dynamicGroups/createHeli.sqf b/dynamicGroups/createAir.sqf similarity index 84% rename from dynamicGroups/createHeli.sqf rename to dynamicGroups/createAir.sqf index ebb4c16f..6c3f303d 100644 --- a/dynamicGroups/createHeli.sqf +++ b/dynamicGroups/createAir.sqf @@ -6,7 +6,7 @@ if (isServer) then private ["_group", "_leader", "_data"]; _group = group _unit; _leader = leader _group; - _data = ["grad_heli", "Heli", false]; // [, , ] + _data = ["grad_air", "Air", false]; // [, , ] ["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; diff --git a/dynamicGroups/createFoxtrot.sqf b/dynamicGroups/createFoxtrot.sqf new file mode 100644 index 00000000..a64e3a8f --- /dev/null +++ b/dynamicGroups/createFoxtrot.sqf @@ -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]; // [, , ] + + ["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; +}; \ No newline at end of file diff --git a/dynamicGroups/createGolf.sqf b/dynamicGroups/createGolf.sqf new file mode 100644 index 00000000..6fc9281d --- /dev/null +++ b/dynamicGroups/createGolf.sqf @@ -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]; // [, , ] + + ["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; +}; \ No newline at end of file diff --git a/dynamicGroups/createHotel.sqf b/dynamicGroups/createHotel.sqf new file mode 100644 index 00000000..ec28077d --- /dev/null +++ b/dynamicGroups/createHotel.sqf @@ -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]; // [, , ] + + ["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; +}; \ No newline at end of file diff --git a/dynamicGroups/createIndia.sqf b/dynamicGroups/createIndia.sqf new file mode 100644 index 00000000..0d00de11 --- /dev/null +++ b/dynamicGroups/createIndia.sqf @@ -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]; // [, , ] + + ["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; +}; \ No newline at end of file diff --git a/init.sqf b/init.sqf index aaf15283..1055fe40 100644 --- a/init.sqf +++ b/init.sqf @@ -223,6 +223,7 @@ if (hasInterface) then { [] execVM "spawn\hedgehogAssemblingSystem.sqf"; + [] execVM "spawn\assaultBoatAssemblingSystem.sqf"; [] execVM "spawn\addInteractions.sqf"; if (playerSide == west) then { diff --git a/mission.sqm b/mission.sqm index f973a4a7..42c73d65 100644 --- a/mission.sqm +++ b/mission.sqm @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { diff --git a/spawn/addInteractions.sqf b/spawn/addInteractions.sqf index abffe2b0..43821a80 100644 --- a/spawn/addInteractions.sqf +++ b/spawn/addInteractions.sqf @@ -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; @@ -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; \ No newline at end of file +["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["" + "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" diff --git a/spawn/assaultBoatAssemblingSystem.sqf b/spawn/assaultBoatAssemblingSystem.sqf new file mode 100644 index 00000000..b06f18f8 --- /dev/null +++ b/spawn/assaultBoatAssemblingSystem.sqf @@ -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; +}; \ No newline at end of file diff --git a/spawn/gui/_dialogs.hpp b/spawn/gui/_dialogs.hpp index 746f8025..1a9c35ac 100644 --- a/spawn/gui/_dialogs.hpp +++ b/spawn/gui/_dialogs.hpp @@ -840,7 +840,7 @@ class USSupplyGUI }; class US_gui_text_countleft_3: RscStructuredText { - idc = 3203; + idc = -1; text = "lade ..."; x = 12.5 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; @@ -1186,10 +1186,10 @@ class gui_spawn_opfor class Controls { - class text_spawn_opfor: RscStructuredText + class text_spawn_opfor1: RscStructuredText { - idc = 3202; - text = "TvT Breaking Contact"; + idc = -1; + text = "Hello Commander!"; x = 14 * GUI_GRID_W + GUI_GRID_X; y = 1 * GUI_GRID_H + GUI_GRID_Y; w = 12 * GUI_GRID_W; @@ -1197,9 +1197,20 @@ class gui_spawn_opfor colorBackground[] = {-1,-1,-1,0}; }; - class btn_spawn_opfor: RscButton + class text_spawn_opfor2: RscStructuredText + { + idc = -1; + text = "In case you close this dialog by accident, reopen with [SPACE]"; + 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; diff --git a/spawn/gui/addPublicVariableEventhandler.sqf b/spawn/gui/addPublicVariableEventhandler.sqf index d666c441..f2dea948 100644 --- a/spawn/gui/addPublicVariableEventhandler.sqf +++ b/spawn/gui/addPublicVariableEventhandler.sqf @@ -44,7 +44,7 @@ fillRussianSupplies = { clearMagazineCargoGlobal (_this select 0); (_this select 0) addItemCargoGlobal ['ItemGPS',1]; }, - format['%1
%2
%3
%4
%5','Crew: 1','Seats: 11','Speed: 90','',''] + format['%1
%2
%3
%4
%5','Crew: 1','Seats: 11','Speed: 90','','1 GPS'] ], [ tigr, @@ -61,7 +61,7 @@ fillRussianSupplies = { clearMagazineCargoGlobal (_this select 0); (_this select 0) addItemCargoGlobal ['ItemGPS',1]; }, - format['%1
%2
%3
%4
%5','Crew: 1','Seats: 7','Speed: 140','',''] + format['%1
%2
%3
%4
%5','Crew: 1','Seats: 7','Speed: 140','','1 GPS'] ], [ "rhs_gaz66_repair_vdv", @@ -114,7 +114,7 @@ fillRussianSupplies = { clearMagazineCargoGlobal (_this select 0); (_this select 0) addItemCargoGlobal ['ItemGPS',1]; }, - format['%1
%2
%3
%4
%5
%6
%7','Crew: 2','Seats: 1','Speed: 121','','Weapons:','50x4 12.7mm'] + format['%1
%2
%3
%4
%5
%6
%7
%8
%9','Crew: 2','Seats: 1','Speed: 121','','Weapons:','50x4 12.7mm','','1 GPS'] ], [ "rhs_btr70_vdv", @@ -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
%2
%3
%4
%5','Crew: 1','Seats: 5','Speed: 109','',''] + format['%1
%2
%3
%4
%5','Crew: 1','Seats: 5','Speed: 109','1 Assault Boat','1 GPS'] ], [ hmmwv_m2, @@ -247,7 +252,7 @@ fillUSSupplies = { clearMagazineCargoGlobal (_this select 0); (_this select 0) addItemCargoGlobal ['ItemGPS',1]; }, - format['%1
%2
%3
%4
%5
%6','Crew: 1','Seats: 3','Speed: 109','','Weapons:','100x6 7.62'] + format['%1
%2
%3
%4
%5
%6
%7
%8','Crew: 1','Seats: 3','Speed: 109','','Weapons:','100x6 7.62','','1 GPS'] ], [ m113_m2, @@ -264,7 +269,7 @@ fillUSSupplies = { clearMagazineCargoGlobal (_this select 0); (_this select 0) addItemCargoGlobal ['ItemGPS',1]; }, - format['%1
%2
%3
%4
%5','Crew: 2','Seats: 11','Speed: 67','',''] + format['%1
%2
%3
%4
%5','Crew: 2','Seats: 11','Speed: 67','','1 GPS'] ], [ m113_ammo,