Skip to content

Commit ca40df3

Browse files
maxcloutier13maxcloutier13
authored
Merge pull request #504 from maxcloutier13/Dev_Current
Dev current
2 parents f08e3b5 + 07f1c13 commit ca40df3

43 files changed

Lines changed: 1174 additions & 256 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎XEH_postInitClient.sqf‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ if (cgqc_player_loadAll) then {
205205
[player, "save", "single", "auto"] spawn CGQC_fnc_snapshot;
206206
}] call CBA_fnc_addEventHandler;
207207

208+
209+
208210
player addEventHandler ["InventoryClosed", {
209211
params ["_unit", "_container"];
210212
[] call CGQC_fnc_reloadTraits;
@@ -242,6 +244,43 @@ if (cgqc_player_loadAll) then {
242244
["CGQC_event_receivingTreatment", [_medic, _patient, _classname, _bodyPart], _patient] call CBA_fnc_targetEvent;
243245
}] call CBA_fnc_addEventHandler;
244246

247+
248+
["CGQC_event_yeet", {
249+
params ["_unit"];
250+
LOG_1("Unit %1 has been yeeted", name _unit);
251+
_unit setVelocity [0, 0, 200];
252+
hint "Bon... kessé t'as faite encore?";
253+
sleep 5;
254+
hint "Chill. Voici un parachute. Tu vas retrouver ton backpack une fois au sol ;o)";
255+
_backpack = backpack _unit;
256+
_items = backpackItems _unit;
257+
removeBackpack _unit;
258+
_unit addBackpack "B_Parachute";
259+
[]spawn {
260+
waitUntil {getPosATL _unit select 2 < 100}; // Wait until the _unit's altitude is less than 100 meters
261+
_unit action ["OpenParachute", _unit]; // Open the parachute for the _unit
262+
};
263+
//Make temporarily invincible
264+
while {isDamageAllowed _unit} do
265+
{
266+
_unit allowDamage false;
267+
sleep 0.5;
268+
};
269+
waitUntil{sleep 1;isTouchingGround _unit};
270+
removeBackpack _unit;
271+
_unit addBackpack _backpack;
272+
{
273+
_unit addItemToBackpack _x;
274+
}forEach _items;
275+
sleep 1;
276+
hint "Ton backpack is back";
277+
while {!isDamageAllowed _unit} do
278+
{
279+
_unit allowDamage true;
280+
sleep 0.5;
281+
};
282+
}] call CBA_fnc_addEventHandler;
283+
245284
["CGQC_event_receivingTreatment", {
246285
params ["_medic", "_patient", "_treatment", "_bodyPart"];
247286
LOG_4("[medical_receivingTreatment] - Med:%1/Patient:%2/Treat:%3/Part:%4", _medic, _patient, _treatment, _bodyPart);
@@ -659,10 +698,15 @@ if !(_findLoadout) then { // Skip if loadout was found and loaded
659698
cgqc_acre_previousVolume = [] call acre_api_fnc_getSelectableVoiceCurve;
660699

661700
// Setup default groups colors
662-
["HQ", [1.0, 0.38, 0, 1], [1.0, 0.38, 0, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping; // Purple
663-
["Spartan-1", [1.0, 0.5, 0.5, 1], [1.0, 0.5, 0.5, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
664-
["Spartan-2", [0.5, 0.5, 1.0, 1], [0.5, 0.5, 1.0, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
665-
["Spartan-3", [0.5, 1.0, 0.5, 1], [0.5, 1.0, 0.5, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
701+
["Spartan", [1.0, 0.5, 0.5, 1], [1.0, 0.78, 0.0, 0.8]] call ace_map_gestures_fnc_addGroupColorMapping; // Purple
702+
/*
703+
["Hermes", [1.0, 0.5, 0.5, 1], [1.0, 0.5, 0.5, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
704+
["Orion", [1.0, 0.5, 0.5, 1], [1.0, 0.5, 0.5, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
705+
["Recon", [1.0, 0.5, 0.5, 1], [1.0, 0.5, 0.5, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
706+
["Centaure-2", [0.5, 0.5, 1.0, 1], [0.5, 0.5, 1.0, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
707+
["Griffon", [0.5, 1.0, 0.5, 1], [0.5, 1.0, 0.5, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
708+
["Pegase", [0.5, 1.0, 0.5, 1], [0.5, 1.0, 0.5, 0.7]] call ace_map_gestures_fnc_addGroupColorMapping;
709+
*/
666710

667711
// Pause the AI if the config says so
668712
if (cgqc_config_state_pause) then {

‎XEH_postInitServer.sqf‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ addMissionEventHandler ["HandleDisconnect", {
7777
publicVariable "cgqc_stats_civilianCasualties";
7878
publicVariable "cgqc_stats_civilianKillers";
7979
_txt = " ... killed a civilian!";
80-
[_killer, _txt] remoteExec ["globalChat",0];
80+
//[_killer, _txt] remoteExec ["globalChat",0];
81+
LOG_2("[CGQC_Killed]: Casualties - %1 killed a civilian", name _killer);
8182
} else {
8283
_sideKiller = side (group _killer);
8384
_sideKilled = side (group _killed);
@@ -90,7 +91,8 @@ addMissionEventHandler ["HandleDisconnect", {
9091
publicVariable "cgqc_stats_friendlyCasualties";
9192
publicVariable "cgqc_stats_friendlyKillers";
9293
_txt = " ... killed a friendly!";
93-
[_killer, _txt] remoteExec ["globalChat",0];
94+
//[_killer, _txt] remoteExec ["globalChat",0];
95+
LOG_2("[CGQC_Killed]: Casualties - %1 killed a friendly", name _killer);
9496
};
9597
} else {
9698
//Enemy down
@@ -193,7 +195,8 @@ addMissionEventHandler ["HandleDisconnect", {
193195
publicVariable "cgqc_stats_teamCasualties";
194196
publicVariable "cgqc_stats_teamKillers";
195197
_txt = " ... killed a teammate!";
196-
[_killer, _txt] remoteExec ["globalChat",0];
198+
LOG_2("[CGQC_Killed]: Casualties - %1 killed a teammate", name _killer);
199+
//[_killer, _txt] remoteExec ["globalChat",0];
197200
};
198201
} else {
199202
LOG("[CGQC_Killed]: Killed by an AI!");

‎XEH_preInit.sqf‎

Lines changed: 87 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,91 @@ cgqc_showObject_running = false;
8181
cgqc_player_clearMarkers = [];
8282
cgqc_vic_limiter = false;
8383
cgqc_player_rosterInit = false;
84-
cgqc_player_route = [];
85-
cgqc_player_route_on = false;
8684
cgqc_player_trait_loadCoef = 1;
8785
cgqc_player_trait_audibleCoef = 1;
8886
cgqc_player_trait_camoCoef = 1;
8987

88+
89+
// Map tools - Advanced
90+
cgqc_player_route_id = 0;
91+
cgqc_player_route = [];
92+
missionNamespace setVariable ["cgqc_maptools_mortar", 0, true];
93+
// Map tools - Basic
94+
missionNamespace setVariable ["cgqc_maptools_hq", 0, true];
95+
missionNamespace setVariable ["cgqc_maptools_objective", 0, true];
96+
missionNamespace setVariable ["cgqc_maptools_irp", 0, true];
97+
missionNamespace setVariable ["cgqc_maptools_wp", 0, true];
98+
missionNamespace setVariable ["cgqc_maptools_rp", 0, true];
99+
missionNamespace setVariable ["cgqc_maptools_orp", 0, true];
100+
missionNamespace setVariable ["cgqc_maptools_near", 0, true];
101+
missionNamespace setVariable ["cgqc_maptools_far", 0, true];
102+
missionNamespace setVariable ["cgqc_maptools_csp", 0, true];
103+
missionNamespace setVariable ["cgqc_maptools_crp", 0, true];
104+
missionNamespace setVariable ["cgqc_maptools_dis", 0, true];
105+
missionNamespace setVariable ["cgqc_maptools_lz", 0, true];
106+
missionNamespace setVariable ["cgqc_maptools_route", 0, true];
107+
missionNamespace setVariable ["cgqc_maptools_supply", 0, true];
108+
missionNamespace setVariable ["cgqc_maptools_city", 0, true];
109+
missionNamespace setVariable ["cgqc_maptools_house", 0, true];
110+
111+
// Location names
112+
cgqc_maptools_running = false;
113+
cgqc_location_nato = ["Alfa", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliett", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu"];
114+
cgqc_location_space = ["Asteroid", "Blackhole", "Comet", "Darkmatter", "Eclipse", "Fusion", "Galactic", "Halo", "Ion", "Jupiter", "Kuiper", "Lightyear", "Meteor", "Nebula", "Orbit", "Pulsar", "Quasar", "Redshift", "Star", "Telescope", "Universe", "Voyager", "Wormhole", "X-ray", "Yellowstar", "Zenith"];
115+
cgqc_location_metal = ["Aluminium", "Barium", "Calcium", "Diamond", "Erbium", "Fluorite", "Gold", "Hafnium", "Iron", "Jade", "Krypton", "Lithium", "Manganese", "Nickel", "Osmium", "Platinum", "Quartz", "Rhodium", "Silver", "Titanium", "Uranium", "Vanadium", "Wolfram", "Xenon", "Yttrium", "Zinc"];
116+
cgqc_location_dune = ["Arrakis", "Bene Gesserit", "Crusade", "Dune", "Empire", "Fremen", "Guild", "Harkonnen", "Imperial", "Jihad", "Kwisatz Haderach", "Leto", "Mentat", "Naboo", "Ornithopter", "Padishah", "Quin", "Sandworm", "Tleilaxu", "Utterson", "Voyager", "Worm", "Xerxes", "Yen", "Zensunni"];
117+
cgqc_location_dungeon = ["Amulet", "Beholder", "Cave", "Dragon", "Elemental", "Familiar", "Goblin", "Hydra", "Illusion", "Jinn", "Kobold", "Lich", "Mage", "Necromancer", "Ogre", "Potion", "Quest", "Ranger", "Sorcerer", "Treant", "Undead", "Vampire", "Warlock", "Xenon", "Yeti", "Zebra"];
118+
119+
cgqc_location_names = [cgqc_location_space, cgqc_location_metal, cgqc_location_dune, cgqc_location_dungeon];
120+
cgqc_location_currentNames = cgqc_location_names call BIS_fnc_arrayShuffle;
121+
122+
cgqc_location_cities = [
123+
["Atlanta", "Buffalo", "Chicago", "Dallas", "El Paso", "Fargo", "Greensboro", "Hartford", "Indianapolis", "Jacksonville", "Kansas", "Lafayette", "Memphis", "Nashville", "Orlando", "Phoenix", "Quincy", "Richmond", "Seattle", "Toronto", "Utica", "Vancouver", "Washington", "Xenia", "Yonkers", "Zanesville"],
124+
["Albany", "Boston", "Columbus", "Denver", "Eugene", "Fresno", "Gainesville", "Houston", "Irving", "Juneau", "Kirkland", "Laredo", "Madison", "Newark", "Oakland", "Philadelphia", "Québec City", "Raleigh", "San Diego", "Tampa", "Upland", "Victoria", "Wichita", "Xavier", "York", "Zephyrhills"],
125+
["Aurora", "Baltimore", "Calgary", "Durham", "Eastman", "Fairfax", "Garland", "Huntsville", "Indio", "Jasper", "Keene", "Lincoln", "Midland", "Nampa", "Ottawa", "Plano", "Quakertown", "Reno", "Savannah", "Tulsa", "Union", "Valdosta", "Wilmington", "Xanadu", "Yuma", "Zion"],
126+
["Amherst", "Banff", "Carlton", "Denver", "Entrelacs", "Ferland", "Geneva", "Helena", "Irvine", "Joliet", "Kenner", "London", "Milford", "Naples", "Omaha", "Pasadena", "Quincy", "Rochester", "Spokane", "Thunder Bay", "Uxbridge", "Valparaiso", "Worcester", "Xochimilco", "Ypsilanti", "Zimmerman"],
127+
["Aylmer", "Brossard", "Chester", "Delson", "Eureka", "Fabre", "Goderich", "Havre-Aubert", "Ingram", "Jamestown", "Kelowna", "Lindsay", "Mobile", "Norman", "Orem", "Provo", "Quincy", "Red Deer", "Sarasota", "Trail", "Upper Musquodoboit", "Ventura", "Waterloo", "Xander", "Yorkville", "Zwolle"],
128+
["Aurora", "Boston", "Cornwall", "Drummond", "El Paso", "Farnham", "Granby", "Howick", "Inverness", "Jonquière", "Kamouraska", "Lévis", "Miramichi", "Nepean", "Outlook", "Peoria", "Quilcene", "Regina", "Springfield", "Thetford Mines", "Uxbridge", "Valleyfield", "Woodstock", "Xenon", "Yankton", "Zabriskie"],
129+
["Austin", "Blainville", "Clifton", "Dunham", "Eugene", "Fermont", "Glendale", "Hope", "Irwin", "Joplin", "Kingston", "Lethbridge", "Monroe", "Nogales", "Oshawa", "Penticton", "Quantico", "Rockford", "Syracuse", "Terrace", "Uplands", "Vicksburg", "Windsor", "Xenia", "Yarmouth", "Zephyr"],
130+
["Amherst", "Buffalo", "Cedar", "Dorval", "Eastman", "Forestville", "Gastonia", "Henryville", "Inukjuak", "Joliette", "Kinston", "Lorraine", "Montague", "Newton", "Oromocto", "Pembroke", "Quincy", "Roseville", "Sudbury", "Trois-Rivières", "Uxbridge", "Ville-Marie", "Westmount", "Xavier", "Yorkton", "Zebulon"],
131+
["Atlanta", "Brossard", "Chester", "Dallas", "Entrelacs", "Fabre", "Gilbert", "Hamilton", "Iroquois", "Joliette", "Kingsley", "Lincoln", "Mansfield", "Nelson", "Oka", "Pueblo", "Quesnel", "Russell", "Saskatoon", "Union", "Uplands", "Val-d'Or", "Winnipeg", "Xanadu", "Yonkers", "Zionville"],
132+
["Austin", "Burlington", "Columbus", "Denver", "El Paso", "Fresno", "Greensboro", "Hudson", "Ithaca", "Jericho", "Kenner", "London", "Milton", "Neuville", "Ontario", "Phoenix", "Qualicum", "Rochester", "San Jose", "Tucson", "Urbana", "Vernon", "Westminster", "Xerxes", "York", "Zephyrhills"]
133+
];
134+
135+
_random = floor (random 10);
136+
cgqc_location_currentCities = cgqc_location_cities select _random;
137+
138+
/*
139+
cgqc_location_us = [
140+
["Atlanta", "Albany", "Austin", "Aurora", "Amherst", "Aylmer"],
141+
["Baltimore", "Banff", "Burlington", "Blainville", "Brossard", "Bathurst", "Boston", "Buffalo"],
142+
["Cleveland", "Chicago", "Columbus", "Calgary", "Carlton", "Cedar", "Cornwall", "Chester", "Clifton", "Coral"],
143+
["Dallas", "Durham", "Dunham", "Denver", "Delson", "Dolbeau", "Dorval", "Drummond", "Donnacona"],
144+
["Eugene", "El Paso", "Eureka", "Eastman", "Entrelacs"],
145+
["Fresno", "Fargo", "Fairfax", "Fremont", "Farnham", "Ferland", "Fermont", "Fabre", "Frampton", "Frontenac", "Frelighsburg", "Forestville"],
146+
["Greensboro", "Garland", "Gilbert", "Gresham", "Gastonia", "Georgetown", "Gainesville", "Geneva", "Glendale", "Greenwood", "Guelph", "Grimsby", "Goderich", "Granby", "Gibbons", "Gatineau", "Greenwood", "Granby", "Gaspé", "Gatineau", "Granby", "Gentilly", "Granville", "Grandes-Piles"],
147+
["Houston", "Hartford", "Hoboken", "Helena", "Hampton", "Hamilton", "Halifax", "Hinton", "Huntsville", "Hudson", "Hawkesbury", "Hébertville", "Hemmingford", "Howick", "Hampstead", "Harrington", "Hatley", "Hope", "Havelock", "Havre-Aubert", "Hérouxville", "Huntingdon", "Henryville", "Hemmingford", "Ham-Sud"],
148+
["Indianapolis", "Indio", "Irving", "Irvine", "Ithaca", "Ingram", "Irwin", "Innisfil", "Inuvik", "Iroquois", "Innisfail", "Inverness", "Inukjuak", "Iberville", "Irlande"],
149+
["Jacksonville", "Jackson", "Jasper", "Joliet", "Joplin", "Juneau", "Jersey", "Jamestown", "Jericho", "Jenkins", "Johnson", "Jansen", "Joliette", "Jonquière", "Joffre", "Joly", "Joutel", "Jacmel", "Jumelles", "Joliette", "Jonquière"],
150+
["Kansas", "Kinston", "Kingsley", "Keene", "Kenner", "Kelowna", "Kingston", "Kenora", "Kirkland", "Kincardine", "Kanata", "Kemptville", "Killam", "Kapuskasing", "Kamouraska", "Kirkland"],
151+
["Lincoln", "Laredo", "Lansing", "Lafayette", "Lakeland", "London", "Leduc", "Lindsay", "Lethbridge", "Laval", "Lorraine", "Lévis", "Lorrainville", "LaSalle", "Lachine"],
152+
["Memphis", "Madison", "Midland", "Macon", "Marion", "Monroe", "Medford", "Milford", "Mobile", "Mansfield", "Milton", "Moncton", "Morden", "Moose Jaw", "Martensville", "Midland", "Miramichi", "Montague", "Melville", "Montreal", "Magog", "Mascouche", "Matane", "Montmagny", "Mont-Laurier", "Marieville", "Mont-Tremblant"],
153+
["New York", "Nashville", "Newark", "Norfolk", "Naples", "Norman", "Newton", "Nampa", "Napa", "Nogales", "Newport", "Nelson", "Nanaimo", "Norwood", "Nepean", "Newmarket", "Neepawa", "Napierville", "Neuville", "Nicolet", "Norbertville", "Normandin", "Natashquan", "Notre-Dame", "Nantes"],
154+
["Omaha", "Orlando", "Oakland", "Odessa", "Olathe", "Orem", "Olympia", "Oxford", "Ontario", "Ottawa", "Oshawa", "Oakville", "Owen Sound", "Outlook", "Oromocto", "Oliver", "Oxbow", "Orford", "Ormstown", "Otterburn", "Orsainville", "Oka", "Outremont", "Otterburn", "Odanak", "Ostiguy", "Omerville"],
155+
["Philadelphia", "Phoenix", "Plano", "Pasadena", "Provo", "Paterson", "Pueblo", "Peoria", "Parker", "Pembroke", "Penticton", "Pickering"],
156+
["Quincy", "Québec City", "Quakertown", "Qualicum", "Quesnel", "Quispamsis", "Quincy", "Quilcene", "Quantico", "Queens", "Quarryville", "Quinton"],
157+
["Richmond", "Reno", "Raleigh", "Rochester", "Rockford", "Roseville", "Redmond", "Rockville", "Russell", "Regina", "Red Deer", "Richmond Hill"],
158+
["Seattle", "San Diego", "San Jose", "Savannah", "Spokane", "Salem", "Sarasota", "Springfield", "Syracuse", "Sudbury", "Saskatoon", "Sherbrooke"],
159+
["Toronto", "Tampa", "Tucson", "Topeka", "Tulsa", "Thorold", "Thunder Bay", "Trois-Rivières", "Trenton", "Trail", "Terrace", "Thetford Mines"],
160+
["Utica", "Union", "Urbana", "Ukiah", "Upland", "Uxbridge", "Unity", "Ucluelet", "Upper Musquodoboit", "Uxbridge", "Upton", "Ushaw Moor"],
161+
["Vancouver", "Victoria", "Valdosta", "Valparaiso", "Vernon", "Vicksburg", "Visalia", "Ventura", "Ville-Marie", "Val-d'Or", "Valleyfield", "Victoriaville"],
162+
["Washington", "Wichita", "Wilmington", "Worcester", "Westminster", "Waterloo", "Windsor", "Whitby", "Welland", "Woodstock", "Winnipeg", "Westmount"],
163+
["Xenia", "Xavier", "Xanadu", "Xochimilco", "Xanadu", "Xenia", "Xerxes", "Xanadu", "Xochimilco", "Xylophon", "Xander", "Ximenes"],
164+
["Yonkers", "York", "Yuma", "Ypsilanti", "Yukon", "Yellowknife", "Yarmouth", "Yorkton", "Yorkville", "Yankton", "Yates", "Yarker"],
165+
["Zanesville", "Zephyrhills", "Zion", "Zebulon", "Zimmerman", "Zeballos", "Zion", "Zephyr", "Zenda", "Zionville", "Zabriskie", "Zwolle"]
166+
];*/
167+
168+
// Wakeup
90169
player setVariable ["cgqc_player_wakeup_time", 0, true];
91170

92171
cgqc_subskills = [
@@ -508,6 +587,12 @@ Examples
508587
509588
*/
510589
//Intro Stuff
590+
_section_name = "Mission Options";
591+
592+
["cgqc_config_droneRestriction", "LIST", ["Optiques", "Types d'optiques disponibles dans le quick switcher"],
593+
[_menu_name, "Drone Restriction"], [[0, 1, 2, 3], ["No Drones", "BlackHornet only", "+Darter", "Unrestricted"], 2], {publicVariable "cgqc_config_droneRestriction"}] call CBA_fnc_addSetting;
594+
595+
511596
_section_name = "Intro/Cinématiques";
512597
["cgqc_config_showIntro", "CHECKBOX", ["Show Intro", "Intro en début de mission"],
513598
[_menu_name, _section_name], true] call CBA_fnc_addSetting;

‎cfg/cfg_atrag.hpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
class ACE_ATragMX_Presets {
2+
// Profile Name, Muzzle Velocity, Zero Range, Scope Base Angle, AirFriction, Bore Height, Scope Unit, Scope Click Unit,
3+
// Scope Click Number, Maximum Elevation, Dialed Elevation, Dialed Windage, Mass, Bullet Diameter, Rifle Twist, BC,
4+
//Drag Model, Atmosphere Model, Muzzle Velocity vs. Temperature Interpolation,
5+
//C1 Ballistic Coefficient vs. Distance Interpolation
6+
class cgqc_atrag_m200_ball {
7+
preset[] = {"CGQC M200 Ball", 901.903,99.6696,0.0778564,-0.001035,7.366,0,2,10,120,0,0,27.3451,10.3632,33.02,0.879,1,"ICAO",
8+
{{-15,883.006},{5,893.064},{10,897.026},{15,901.903},{25,915.924},{30,925.068},{35,936.041}},
9+
{{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}}};
10+
};
11+
};

‎cfg/cfg_functions.hpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ class CGQC {
1313
class functions {
1414
// Fonctions ---------------------------------------------------------------------------
1515

16+
class getDrone {
17+
file = "\cgqc\functions\fnc_getDrone.sqf";
18+
description = "Handles drone restrictions";
19+
};
20+
class mapTools {
21+
file = "\cgqc\functions\fnc_mapTools.sqf";
22+
description = "Various custom map tools";
23+
};
1624
class becomeAmmoBearer {
1725
file = "\cgqc\functions\fnc_becomeAmmoBearer.sqf";
1826
description = "Get some ammo from the target's setup";

‎config.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,6 @@ class CfgSounds
162162
#include "\CGQC\gui\pauseMenu.hpp"
163163
// Animations
164164
#include "\CGQC\cfg\cfg_animations.hpp"
165+
166+
// AtragMX profiles ------------------------------------------
167+
#include "\CGQC\cfg\cfg_atrag.hpp"

‎functions/fnc_addPerks.sqf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@ _adding = [ player, 1, ["ACE_SelfActions", "menu_self_cgqc","menu_self_signals"]
234234
// Fixes =========================================================================================================
235235
_action = [ "menu_self_fixes", "Fixes/Debug", "a3\ui_f\data\IGUI\Cfg\simpleTasks\types\use_ca", {""}, {true} ] call ace_interact_menu_fnc_createAction;
236236
_adding = [ player, 1, ["ACE_SelfActions", "menu_self_cgqc"], _action ] call ace_interact_menu_fnc_addActionToObject;
237+
// Panic
238+
_action = [ "menu_self_panic", "PANIC! Fix all!", "", {["panic", false] spawn CGQC_fnc_perksBasic}, {true} ] call ace_interact_menu_fnc_createAction;
239+
_adding = [ player, 1, ["ACE_SelfActions", "menu_self_cgqc", "menu_self_fixes"], _action ] call ace_interact_menu_fnc_addActionToObject;
237240
// Fix Blackout
238241
_action = [ "menu_self_blackout", "Fix Blackout", "", {["fix_blackout", false] spawn CGQC_fnc_perksBasic}, {true} ] call ace_interact_menu_fnc_createAction;
239242
_adding = [ player, 1, ["ACE_SelfActions", "menu_self_cgqc", "menu_self_fixes"], _action ] call ace_interact_menu_fnc_addActionToObject;

‎functions/fnc_getDrone.sqf‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#include "\CGQC\script_component.hpp"
2+
// --- getDrone ----------------------------------------------------------
3+
// Handles the drone restrictions
4+
// [0, 1, 2, 3], ["No Drones", "+BlackHornet", "+BH and Darter", "Unrestricted"
5+
params ["_type"];
6+
LOG_1("[getDrone] %1 started", _type);
7+
8+
_proceed = false;
9+
switch (_type) do {
10+
case "sps_black_hornet_01_Static_F": {
11+
if (cgqc_config_droneRestriction > 0) then {
12+
_proceed = true;
13+
LOG("[getDrone] Drone not restricted. Adding");
14+
};
15+
};
16+
case "rev_darter_item": {
17+
if (cgqc_config_droneRestriction > 1) then {
18+
_proceed = true;
19+
LOG("[getDrone] Drone not restricted. Adding");
20+
};
21+
};
22+
default {
23+
LOG("[getDrone] Drone not restricted. Adding");
24+
};
25+
};
26+
27+
if (_proceed) then {
28+
player addItemToBackpack _type;
29+
player addItemToBackpack "ACE_UAVBattery";
30+
LOG("[getDrone] Drone added");
31+
} else {
32+
[["Drone is restricted", 1.5], false] call CBA_fnc_notify;
33+
LOG("[getDrone] Drone restricted");
34+
};
35+
36+
LOG("[getDrone] done");

‎functions/fnc_getLinkedItems.sqf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ if (_nvg isNotEqualTo "") then {
9191
// === NVG's
9292
[] call CGQC_fnc_isDaytime;
9393
if (cgqc_mission_daytime || _forceDay) then {
94-
player addItemToBackpack _nvg;
95-
LOG("[getLinkedItems] - Daytime. Nvg's in backpack");
96-
hint "Daytime. Nvg's in backpack";
94+
player addItemToUniform _nvg;
95+
LOG("[getLinkedItems] - Daytime. Nvg's in uniform");
96+
hint "Daytime. Nvg's in uniform";
9797
}else{
9898
//Night mission
9999
player linkItem _nvg;

0 commit comments

Comments
 (0)