started working on pbo project

Example.txt

@@ -0,0 +1 @@
+hi source tree tutorial o/

addons/501st_Helmets/AB/data/pilot_lum.rvmat

@@ -1,85 +0,0 @@
-
-#define _ARMA_
-
-class StageTI
-{
-	texture = "a3\characters_f\blufor\data\clothing1_ti_ca.paa";
-};
-ambient[] = {1,1,1,1};
-diffuse[] = {1,1,1,1};
-forcedDiffuse[] = {0,0,0,1};
-emmisive[]={0,0,0,1};
-specular[] = {0.2,0.2,0.2,1};
-specularPower = 50;
-PixelShaderID = "Super";
-VertexShaderID = "Super";
-class Stage1
-{
-	texture = "SWOP_clones\data\clonePilotHelmet_n.paa";
-	uvSource = "tex";
-	class uvTransform
-	{
-		aside[] = {1,0,0};
-		up[] = {0,1,0};
-		dir[] = {0,0,0};
-		pos[] = {0,0,0};
-	};
-};
-class Stage2
-{
-	texture = "#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
-	uvSource = "tex";
-	class uvTransform
-	{
-		aside[] = {10,0,0};
-		up[] = {0,10,0};
-		dir[] = {0,0,0};
-		pos[] = {0,0,0};
-	};
-};
-class Stage3
-{
-	texture = "#(argb,8,8,3)color(0,0,0,0,MC)";
-	uvSource = "tex";
-	class uvTransform
-	{
-		aside[] = {1,0,0};
-		up[] = {0,1,0};
-		dir[] = {0,0,0};
-		pos[] = {0,0,0};
-	};
-};
-class Stage4
-{
-	texture = "SWOP_clones\data\clonePilotHelmet_as.paa";
-	uvSource = "tex";
-	class uvTransform
-	{
-		aside[] = {1,0,0};
-		up[] = {0,1,0};
-		dir[] = {0,0,1};
-		pos[] = {0,0,1};
-	};
-};
-class Stage5
-{
-	texture = "SWOP_clones\data\clonePilotHelmet_smdi.paa";
-	uvSource = "tex";
-	class uvTransform
-	{
-		aside[] = {1,0,0};
-		up[] = {0,1,0};
-		dir[] = {0,0,1};
-		pos[] = {0,0,1};
-	};
-};
-class Stage6
-{
-	texture = "#(ai,64,64,1)fresnel(1.53,2.44)";
-	uvSource = "none";
-};
-class Stage7
-{
-	texture = "A3\data_f\env_land_co.paa";
-	uvSource = "none";
-};

addons/RD501_AARF/$PREFIX$

@@ -1 +0,0 @@
-RD501_AARF

addons/RD501_AARF/BIS_AddonInfo.hpp

@@ -1,5 +0,0 @@
-class BIS_AddonInfo
-{
-	author="M3ales";
-	timepacked="1581862901";
-};

addons/RD501_AARF/XEH_PREP.sqf

@@ -1,2 +0,0 @@
-#define PREP(var1) FUNC(var1) = compile preProcessFileLineNumbers QUOTE(ADDON\functions\CONCAT(fn_,var1).sqf)
-PREP(arsenalSaveLoadoutHandler);

addons/RD501_AARF/XEH_preInit.sqf

@@ -1,31 +0,0 @@
-#include "functions\function_macros.hpp"
-LOG("PreInit Begin");
-LOG("PREP Begin");
-#include "XEH_PREP.sqf"
-LOG("PREP Complete");
-LOG("Adding CBASettings");
-[
-	QUOTE(GVAR(enabled)), 
-	"CHECKBOX", 
-	[
-		"Auto Save Radio to all Loadouts", 
-		"Enable/Disable adding radio to all saved ace arsenal loadouts when they're saved"
-	], 
-	"ACE Arsenal TFAR Radio Fix", 
-	true, 
-	0, 
-	{}
-] call CBA_fnc_addSetting;
-
-[
-	QUOTE(GVAR(radio)),
-        "EDITBOX",
-        [
-                "Radio Identifier",
-                "The classname of the radio you want to save, can be seen in ace arsenal when hovering over an item -- example: tf_anprc152"
-        ],
-        "ACE Arsenal TFAR Radio Fix", 
-		"tf_anprc152"
- ] call cba_settings_fnc_init;
-LOG("CBASettings Added");
-LOG("PreInit Complete");

addons/RD501_AARF/config.cpp

@@ -1,47 +0,0 @@
-#include "BIS_AddonInfo.hpp"
-#include "config_macros.hpp"
-
-class CfgPatches {
-	class ADDON {
-		name = ADDON_NAME;
-		author = "M3ales";
-		url = "https://github.com/M3ales/";
-		requiredAddons[] = {"ace_arsenal", "task_force_radio_items"};
-		units[] = {};
-		weapons[] = {};
-	};
-};
-
-class Extended_PreInit_EventHandlers {
-    class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
-    };
-};
-
-class Extended_Init_EventHandlers {
-    class CAManBase {
-        class ADDON {
-            init = QUOTE(call FUNC(arsenalSaveLoadoutHandler));
-        };
-    };
-};
-
-#include "radio_ids.hpp"
-class CfgWeapons
-{
-	class ItemRadio;	
-	class ItemWatch;
-	class tf_microdagr: ItemWatch{};
-	class tf_anprc152: ItemRadio{};
-	class tf_anprc148jem: ItemRadio{};
-	class tf_fadak: ItemRadio{};
-	class tf_anprc154: ItemRadio{};
-	class tf_rf7800str: ItemRadio{};
-	class tf_pnr1000a: ItemRadio{};
-	TF_RADIO_IDS(tf_anprc152,AN/PRC-152)
-	TF_RADIO_IDS(tf_anprc148jem,AN/PRC-148 JEM)
-	TF_RADIO_IDS(tf_fadak,FADAK)
-	TF_RADIO_IDS(tf_anprc154,AN/PRC-154)
-	TF_RADIO_IDS(tf_rf7800str,RF-7800S-TR)
-	TF_RADIO_IDS(tf_pnr1000a,PNR-1000A)
-};

addons/RD501_AARF/config_macros.hpp

@@ -1,12 +0,0 @@
-#define ADDON RD501_AARF
-#define ADDON_NAME Ace TFAR Radio Arsenal Fix
-#define FUNC(name) ADDON##_fnc_##name
-#define FUNC_ACE(module,name) ace_##module##_fnc_##name
-#define QUOTE(target) #target
-#define CONCAT(a,b) a##b
-#define COMPILE_FILE(name) compile preprocessFileLineNumbers 'ADDON\##name##.sqf'
-#define GVAR(name) ADDON##_##name
-#define ARR_2(a,b) a, b
-#define ARR_3(a,b,c) a, b, c
-#define ARR_4(a,b,c,d) a, b, c, d
-#define ARR_5(a,b,c,d,e) a, b, c, d, e

addons/RD501_AARF/functions/fn_arsenalSaveLoadoutHandler.sqf

@@ -1,24 +0,0 @@
-#include "function_macros.hpp"
-
-if(!local this || isServer || player != this) exitWith{};
-if(hasInterface && ACE_Player == this) then {
-	_id = ["ace_arsenal_onLoadoutSave", {
-			params["_index", "_savedLoadout"];
-			//sadly this event is only called AFTER saving, cant modify/inject while save is happening
-			//LOGF_2("Loadout: %1 ::: %2", _loadoutIndex, _savedLoadout);
-			//get all loadouts
-			if(!GVAR(enabled)) exitWith {};
-			_loadouts = profileNamespace getVariable ["ace_arsenal_saved_loadouts", []];
-			//grab index for our loadout so we can update it
-			_items = _savedLoadout select 1;
-			_miscItems = _items select 9;
-			_selectedRadio = _miscItems select 2;
-			_miscItems set [2, GVAR(radio)];
-			LOGF_1("Added Radio to Misc Items: '%1'", _miscItems);
-			_loadouts set [_index, _savedLoadout];
-			_success = profileNamespace setVariable ["ace_arsenal_saved_loadouts", _loadouts];
-		}
-	] call CBA_fnc_addEventHandler;
-
-	LOGF_2("Registered and loaded for '%1' with id '%2'", [this] call ace_common_fnc_getName, _id);
-};

addons/RD501_AARF/functions/function_macros.hpp

@@ -1,10 +0,0 @@
-#include "..\config_macros.hpp"
-#define LOG_BASE(level,msg) diag_log text format[QUOTE(ADDON[level]: %1), msg]
-#define LOG(msg) LOG_BASE(DEBUG, LOG_FILENUMBER(msg))
-#define LOGF_1(msg,arg0) LOG(format[ARR_2(msg,arg0)])
-#define LOGF_2(msg,arg0,arg1) LOG(format[ARR_3(msg,arg0,arg1)])
-#define LOGF_3(msg,arg0,arg1,arg2) LOG(format[ARR_4(msg,arg0,arg1,arg2)])
-#define LOG_ERROR(msg) LOG_BASE(ERR,LOG_FILENUMBER(msg))
-#define LOG_ERRORF_1(msg,arg0) LOG_ERROR(format[ARR_2(msg,arg0)])
-#define LOG_ERRORF_2(msg,arg0,arg1) LOG_ERROR(format[ARR_3(msg,arg0,arg1)])
-#define LOG_FILENUMBER(msg) format [ARR_4('%1 at %2:%3',msg,__FILE__,__LINE__ + 1)]

addons/RD501_AARF/radio_ids.hpp

@@ -1,1011 +0,0 @@
-#define TF_RADIO_ID(X,Y,Z) class X##_##Z : X \
-	{ \
-		displayName = Y Z; \
-		scope = 1; \
-		scopeCurator = 1; \
-		tf_prototype = 0; \
-		tf_radio = 1; \
-		ace_arsenal_uniqueBase = X; \
-	};	
-	
-#define TF_RADIO_IDS(X,Y) \
-    TF_RADIO_ID(X,Y,1) \
-    TF_RADIO_ID(X,Y,2) \
-    TF_RADIO_ID(X,Y,3) \
-    TF_RADIO_ID(X,Y,4) \
-    TF_RADIO_ID(X,Y,5) \
-    TF_RADIO_ID(X,Y,6) \
-    TF_RADIO_ID(X,Y,7) \
-    TF_RADIO_ID(X,Y,8) \
-    TF_RADIO_ID(X,Y,9) \
-    TF_RADIO_ID(X,Y,10) \
-    TF_RADIO_ID(X,Y,11) \
-    TF_RADIO_ID(X,Y,12) \
-    TF_RADIO_ID(X,Y,13) \
-    TF_RADIO_ID(X,Y,14) \
-    TF_RADIO_ID(X,Y,15) \
-    TF_RADIO_ID(X,Y,16) \
-    TF_RADIO_ID(X,Y,17) \
-    TF_RADIO_ID(X,Y,18) \
-    TF_RADIO_ID(X,Y,19) \
-    TF_RADIO_ID(X,Y,20) \
-    TF_RADIO_ID(X,Y,21) \
-    TF_RADIO_ID(X,Y,22) \
-    TF_RADIO_ID(X,Y,23) \
-    TF_RADIO_ID(X,Y,24) \
-    TF_RADIO_ID(X,Y,25) \
-    TF_RADIO_ID(X,Y,26) \
-    TF_RADIO_ID(X,Y,27) \
-    TF_RADIO_ID(X,Y,28) \
-    TF_RADIO_ID(X,Y,29) \
-    TF_RADIO_ID(X,Y,30) \
-    TF_RADIO_ID(X,Y,31) \
-    TF_RADIO_ID(X,Y,32) \
-    TF_RADIO_ID(X,Y,33) \
-    TF_RADIO_ID(X,Y,34) \
-    TF_RADIO_ID(X,Y,35) \
-    TF_RADIO_ID(X,Y,36) \
-    TF_RADIO_ID(X,Y,37) \
-    TF_RADIO_ID(X,Y,38) \
-    TF_RADIO_ID(X,Y,39) \
-    TF_RADIO_ID(X,Y,40) \
-    TF_RADIO_ID(X,Y,41) \
-    TF_RADIO_ID(X,Y,42) \
-    TF_RADIO_ID(X,Y,43) \
-    TF_RADIO_ID(X,Y,44) \
-    TF_RADIO_ID(X,Y,45) \
-    TF_RADIO_ID(X,Y,46) \
-    TF_RADIO_ID(X,Y,47) \
-    TF_RADIO_ID(X,Y,48) \
-    TF_RADIO_ID(X,Y,49) \
-    TF_RADIO_ID(X,Y,50) \
-    TF_RADIO_ID(X,Y,51) \
-    TF_RADIO_ID(X,Y,52) \
-    TF_RADIO_ID(X,Y,53) \
-    TF_RADIO_ID(X,Y,54) \
-    TF_RADIO_ID(X,Y,55) \
-    TF_RADIO_ID(X,Y,56) \
-    TF_RADIO_ID(X,Y,57) \
-    TF_RADIO_ID(X,Y,58) \
-    TF_RADIO_ID(X,Y,59) \
-    TF_RADIO_ID(X,Y,60) \
-    TF_RADIO_ID(X,Y,61) \
-    TF_RADIO_ID(X,Y,62) \
-    TF_RADIO_ID(X,Y,63) \
-    TF_RADIO_ID(X,Y,64) \
-    TF_RADIO_ID(X,Y,65) \
-    TF_RADIO_ID(X,Y,66) \
-    TF_RADIO_ID(X,Y,67) \
-    TF_RADIO_ID(X,Y,68) \
-    TF_RADIO_ID(X,Y,69) \
-    TF_RADIO_ID(X,Y,70) \
-    TF_RADIO_ID(X,Y,71) \
-    TF_RADIO_ID(X,Y,72) \
-    TF_RADIO_ID(X,Y,73) \
-    TF_RADIO_ID(X,Y,74) \
-    TF_RADIO_ID(X,Y,75) \
-    TF_RADIO_ID(X,Y,76) \
-    TF_RADIO_ID(X,Y,77) \
-    TF_RADIO_ID(X,Y,78) \
-    TF_RADIO_ID(X,Y,79) \
-    TF_RADIO_ID(X,Y,80) \
-    TF_RADIO_ID(X,Y,81) \
-    TF_RADIO_ID(X,Y,82) \
-    TF_RADIO_ID(X,Y,83) \
-    TF_RADIO_ID(X,Y,84) \
-    TF_RADIO_ID(X,Y,85) \
-    TF_RADIO_ID(X,Y,86) \
-    TF_RADIO_ID(X,Y,87) \
-    TF_RADIO_ID(X,Y,88) \
-    TF_RADIO_ID(X,Y,89) \
-    TF_RADIO_ID(X,Y,90) \
-    TF_RADIO_ID(X,Y,91) \
-    TF_RADIO_ID(X,Y,92) \
-    TF_RADIO_ID(X,Y,93) \
-    TF_RADIO_ID(X,Y,94) \
-    TF_RADIO_ID(X,Y,95) \
-    TF_RADIO_ID(X,Y,96) \
-    TF_RADIO_ID(X,Y,97) \
-    TF_RADIO_ID(X,Y,98) \
-    TF_RADIO_ID(X,Y,99) \
-    TF_RADIO_ID(X,Y,100) \
-    TF_RADIO_ID(X,Y,101) \
-    TF_RADIO_ID(X,Y,102) \
-    TF_RADIO_ID(X,Y,103) \
-    TF_RADIO_ID(X,Y,104) \
-    TF_RADIO_ID(X,Y,105) \
-    TF_RADIO_ID(X,Y,106) \
-    TF_RADIO_ID(X,Y,107) \
-    TF_RADIO_ID(X,Y,108) \
-    TF_RADIO_ID(X,Y,109) \
-    TF_RADIO_ID(X,Y,110) \
-    TF_RADIO_ID(X,Y,111) \
-    TF_RADIO_ID(X,Y,112) \
-    TF_RADIO_ID(X,Y,113) \
-    TF_RADIO_ID(X,Y,114) \
-    TF_RADIO_ID(X,Y,115) \
-    TF_RADIO_ID(X,Y,116) \
-    TF_RADIO_ID(X,Y,117) \
-    TF_RADIO_ID(X,Y,118) \
-    TF_RADIO_ID(X,Y,119) \
-    TF_RADIO_ID(X,Y,120) \
-    TF_RADIO_ID(X,Y,121) \
-    TF_RADIO_ID(X,Y,122) \
-    TF_RADIO_ID(X,Y,123) \
-    TF_RADIO_ID(X,Y,124) \
-    TF_RADIO_ID(X,Y,125) \
-    TF_RADIO_ID(X,Y,126) \
-    TF_RADIO_ID(X,Y,127) \
-    TF_RADIO_ID(X,Y,128) \
-    TF_RADIO_ID(X,Y,129) \
-    TF_RADIO_ID(X,Y,130) \
-    TF_RADIO_ID(X,Y,131) \
-    TF_RADIO_ID(X,Y,132) \
-    TF_RADIO_ID(X,Y,133) \
-    TF_RADIO_ID(X,Y,134) \
-    TF_RADIO_ID(X,Y,135) \
-    TF_RADIO_ID(X,Y,136) \
-    TF_RADIO_ID(X,Y,137) \
-    TF_RADIO_ID(X,Y,138) \
-    TF_RADIO_ID(X,Y,139) \
-    TF_RADIO_ID(X,Y,140) \
-    TF_RADIO_ID(X,Y,141) \
-    TF_RADIO_ID(X,Y,142) \
-    TF_RADIO_ID(X,Y,143) \
-    TF_RADIO_ID(X,Y,144) \
-    TF_RADIO_ID(X,Y,145) \
-    TF_RADIO_ID(X,Y,146) \
-    TF_RADIO_ID(X,Y,147) \
-    TF_RADIO_ID(X,Y,148) \
-    TF_RADIO_ID(X,Y,149) \
-    TF_RADIO_ID(X,Y,150) \
-    TF_RADIO_ID(X,Y,151) \
-    TF_RADIO_ID(X,Y,152) \
-    TF_RADIO_ID(X,Y,153) \
-    TF_RADIO_ID(X,Y,154) \
-    TF_RADIO_ID(X,Y,155) \
-    TF_RADIO_ID(X,Y,156) \
-    TF_RADIO_ID(X,Y,157) \
-    TF_RADIO_ID(X,Y,158) \
-    TF_RADIO_ID(X,Y,159) \
-    TF_RADIO_ID(X,Y,160) \
-    TF_RADIO_ID(X,Y,161) \
-    TF_RADIO_ID(X,Y,162) \
-    TF_RADIO_ID(X,Y,163) \
-    TF_RADIO_ID(X,Y,164) \
-    TF_RADIO_ID(X,Y,165) \
-    TF_RADIO_ID(X,Y,166) \
-    TF_RADIO_ID(X,Y,167) \
-    TF_RADIO_ID(X,Y,168) \
-    TF_RADIO_ID(X,Y,169) \
-    TF_RADIO_ID(X,Y,170) \
-    TF_RADIO_ID(X,Y,171) \
-    TF_RADIO_ID(X,Y,172) \
-    TF_RADIO_ID(X,Y,173) \
-    TF_RADIO_ID(X,Y,174) \
-    TF_RADIO_ID(X,Y,175) \
-    TF_RADIO_ID(X,Y,176) \
-    TF_RADIO_ID(X,Y,177) \
-    TF_RADIO_ID(X,Y,178) \
-    TF_RADIO_ID(X,Y,179) \
-    TF_RADIO_ID(X,Y,180) \
-    TF_RADIO_ID(X,Y,181) \
-    TF_RADIO_ID(X,Y,182) \
-    TF_RADIO_ID(X,Y,183) \
-    TF_RADIO_ID(X,Y,184) \
-    TF_RADIO_ID(X,Y,185) \
-    TF_RADIO_ID(X,Y,186) \
-    TF_RADIO_ID(X,Y,187) \
-    TF_RADIO_ID(X,Y,188) \
-    TF_RADIO_ID(X,Y,189) \
-    TF_RADIO_ID(X,Y,190) \
-    TF_RADIO_ID(X,Y,191) \
-    TF_RADIO_ID(X,Y,192) \
-    TF_RADIO_ID(X,Y,193) \
-    TF_RADIO_ID(X,Y,194) \
-    TF_RADIO_ID(X,Y,195) \
-    TF_RADIO_ID(X,Y,196) \
-    TF_RADIO_ID(X,Y,197) \
-    TF_RADIO_ID(X,Y,198) \
-    TF_RADIO_ID(X,Y,199) \
-    TF_RADIO_ID(X,Y,200) \
-    TF_RADIO_ID(X,Y,201) \
-    TF_RADIO_ID(X,Y,202) \
-    TF_RADIO_ID(X,Y,203) \
-    TF_RADIO_ID(X,Y,204) \
-    TF_RADIO_ID(X,Y,205) \
-    TF_RADIO_ID(X,Y,206) \
-    TF_RADIO_ID(X,Y,207) \
-    TF_RADIO_ID(X,Y,208) \
-    TF_RADIO_ID(X,Y,209) \
-    TF_RADIO_ID(X,Y,210) \
-    TF_RADIO_ID(X,Y,211) \
-    TF_RADIO_ID(X,Y,212) \
-    TF_RADIO_ID(X,Y,213) \
-    TF_RADIO_ID(X,Y,214) \
-    TF_RADIO_ID(X,Y,215) \
-    TF_RADIO_ID(X,Y,216) \
-    TF_RADIO_ID(X,Y,217) \
-    TF_RADIO_ID(X,Y,218) \
-    TF_RADIO_ID(X,Y,219) \
-    TF_RADIO_ID(X,Y,220) \
-    TF_RADIO_ID(X,Y,221) \
-    TF_RADIO_ID(X,Y,222) \
-    TF_RADIO_ID(X,Y,223) \
-    TF_RADIO_ID(X,Y,224) \
-    TF_RADIO_ID(X,Y,225) \
-    TF_RADIO_ID(X,Y,226) \
-    TF_RADIO_ID(X,Y,227) \
-    TF_RADIO_ID(X,Y,228) \
-    TF_RADIO_ID(X,Y,229) \
-    TF_RADIO_ID(X,Y,230) \
-    TF_RADIO_ID(X,Y,231) \
-    TF_RADIO_ID(X,Y,232) \
-    TF_RADIO_ID(X,Y,233) \
-    TF_RADIO_ID(X,Y,234) \
-    TF_RADIO_ID(X,Y,235) \
-    TF_RADIO_ID(X,Y,236) \
-    TF_RADIO_ID(X,Y,237) \
-    TF_RADIO_ID(X,Y,238) \
-    TF_RADIO_ID(X,Y,239) \
-    TF_RADIO_ID(X,Y,240) \
-    TF_RADIO_ID(X,Y,241) \
-    TF_RADIO_ID(X,Y,242) \
-    TF_RADIO_ID(X,Y,243) \
-    TF_RADIO_ID(X,Y,244) \
-    TF_RADIO_ID(X,Y,245) \
-    TF_RADIO_ID(X,Y,246) \
-    TF_RADIO_ID(X,Y,247) \
-    TF_RADIO_ID(X,Y,248) \
-    TF_RADIO_ID(X,Y,249) \
-    TF_RADIO_ID(X,Y,250) \
-    TF_RADIO_ID(X,Y,251) \
-    TF_RADIO_ID(X,Y,252) \
-    TF_RADIO_ID(X,Y,253) \
-    TF_RADIO_ID(X,Y,254) \
-    TF_RADIO_ID(X,Y,255) \
-    TF_RADIO_ID(X,Y,256) \
-    TF_RADIO_ID(X,Y,257) \
-    TF_RADIO_ID(X,Y,258) \
-    TF_RADIO_ID(X,Y,259) \
-    TF_RADIO_ID(X,Y,260) \
-    TF_RADIO_ID(X,Y,261) \
-    TF_RADIO_ID(X,Y,262) \
-    TF_RADIO_ID(X,Y,263) \
-    TF_RADIO_ID(X,Y,264) \
-    TF_RADIO_ID(X,Y,265) \
-    TF_RADIO_ID(X,Y,266) \
-    TF_RADIO_ID(X,Y,267) \
-    TF_RADIO_ID(X,Y,268) \
-    TF_RADIO_ID(X,Y,269) \
-    TF_RADIO_ID(X,Y,270) \
-    TF_RADIO_ID(X,Y,271) \
-    TF_RADIO_ID(X,Y,272) \
-    TF_RADIO_ID(X,Y,273) \
-    TF_RADIO_ID(X,Y,274) \
-    TF_RADIO_ID(X,Y,275) \
-    TF_RADIO_ID(X,Y,276) \
-    TF_RADIO_ID(X,Y,277) \
-    TF_RADIO_ID(X,Y,278) \
-    TF_RADIO_ID(X,Y,279) \
-    TF_RADIO_ID(X,Y,280) \
-    TF_RADIO_ID(X,Y,281) \
-    TF_RADIO_ID(X,Y,282) \
-    TF_RADIO_ID(X,Y,283) \
-    TF_RADIO_ID(X,Y,284) \
-    TF_RADIO_ID(X,Y,285) \
-    TF_RADIO_ID(X,Y,286) \
-    TF_RADIO_ID(X,Y,287) \
-    TF_RADIO_ID(X,Y,288) \
-    TF_RADIO_ID(X,Y,289) \
-    TF_RADIO_ID(X,Y,290) \
-    TF_RADIO_ID(X,Y,291) \
-    TF_RADIO_ID(X,Y,292) \
-    TF_RADIO_ID(X,Y,293) \
-    TF_RADIO_ID(X,Y,294) \
-    TF_RADIO_ID(X,Y,295) \
-    TF_RADIO_ID(X,Y,296) \
-    TF_RADIO_ID(X,Y,297) \
-    TF_RADIO_ID(X,Y,298) \
-    TF_RADIO_ID(X,Y,299) \
-    TF_RADIO_ID(X,Y,300) \
-    TF_RADIO_ID(X,Y,301) \
-    TF_RADIO_ID(X,Y,302) \
-    TF_RADIO_ID(X,Y,303) \
-    TF_RADIO_ID(X,Y,304) \
-    TF_RADIO_ID(X,Y,305) \
-    TF_RADIO_ID(X,Y,306) \
-    TF_RADIO_ID(X,Y,307) \
-    TF_RADIO_ID(X,Y,308) \
-    TF_RADIO_ID(X,Y,309) \
-    TF_RADIO_ID(X,Y,310) \
-    TF_RADIO_ID(X,Y,311) \
-    TF_RADIO_ID(X,Y,312) \
-    TF_RADIO_ID(X,Y,313) \
-    TF_RADIO_ID(X,Y,314) \
-    TF_RADIO_ID(X,Y,315) \
-    TF_RADIO_ID(X,Y,316) \
-    TF_RADIO_ID(X,Y,317) \
-    TF_RADIO_ID(X,Y,318) \
-    TF_RADIO_ID(X,Y,319) \
-    TF_RADIO_ID(X,Y,320) \
-    TF_RADIO_ID(X,Y,321) \
-    TF_RADIO_ID(X,Y,322) \
-    TF_RADIO_ID(X,Y,323) \
-    TF_RADIO_ID(X,Y,324) \
-    TF_RADIO_ID(X,Y,325) \
-    TF_RADIO_ID(X,Y,326) \
-    TF_RADIO_ID(X,Y,327) \
-    TF_RADIO_ID(X,Y,328) \
-    TF_RADIO_ID(X,Y,329) \
-    TF_RADIO_ID(X,Y,330) \
-    TF_RADIO_ID(X,Y,331) \
-    TF_RADIO_ID(X,Y,332) \
-    TF_RADIO_ID(X,Y,333) \
-    TF_RADIO_ID(X,Y,334) \
-    TF_RADIO_ID(X,Y,335) \
-    TF_RADIO_ID(X,Y,336) \
-    TF_RADIO_ID(X,Y,337) \
-    TF_RADIO_ID(X,Y,338) \
-    TF_RADIO_ID(X,Y,339) \
-    TF_RADIO_ID(X,Y,340) \
-    TF_RADIO_ID(X,Y,341) \
-    TF_RADIO_ID(X,Y,342) \
-    TF_RADIO_ID(X,Y,343) \
-    TF_RADIO_ID(X,Y,344) \
-    TF_RADIO_ID(X,Y,345) \
-    TF_RADIO_ID(X,Y,346) \
-    TF_RADIO_ID(X,Y,347) \
-    TF_RADIO_ID(X,Y,348) \
-    TF_RADIO_ID(X,Y,349) \
-    TF_RADIO_ID(X,Y,350) \
-    TF_RADIO_ID(X,Y,351) \
-    TF_RADIO_ID(X,Y,352) \
-    TF_RADIO_ID(X,Y,353) \
-    TF_RADIO_ID(X,Y,354) \
-    TF_RADIO_ID(X,Y,355) \
-    TF_RADIO_ID(X,Y,356) \
-    TF_RADIO_ID(X,Y,357) \
-    TF_RADIO_ID(X,Y,358) \
-    TF_RADIO_ID(X,Y,359) \
-    TF_RADIO_ID(X,Y,360) \
-    TF_RADIO_ID(X,Y,361) \
-    TF_RADIO_ID(X,Y,362) \
-    TF_RADIO_ID(X,Y,363) \
-    TF_RADIO_ID(X,Y,364) \
-    TF_RADIO_ID(X,Y,365) \
-    TF_RADIO_ID(X,Y,366) \
-    TF_RADIO_ID(X,Y,367) \
-    TF_RADIO_ID(X,Y,368) \
-    TF_RADIO_ID(X,Y,369) \
-    TF_RADIO_ID(X,Y,370) \
-    TF_RADIO_ID(X,Y,371) \
-    TF_RADIO_ID(X,Y,372) \
-    TF_RADIO_ID(X,Y,373) \
-    TF_RADIO_ID(X,Y,374) \
-    TF_RADIO_ID(X,Y,375) \
-    TF_RADIO_ID(X,Y,376) \
-    TF_RADIO_ID(X,Y,377) \
-    TF_RADIO_ID(X,Y,378) \
-    TF_RADIO_ID(X,Y,379) \
-    TF_RADIO_ID(X,Y,380) \
-    TF_RADIO_ID(X,Y,381) \
-    TF_RADIO_ID(X,Y,382) \
-    TF_RADIO_ID(X,Y,383) \
-    TF_RADIO_ID(X,Y,384) \
-    TF_RADIO_ID(X,Y,385) \
-    TF_RADIO_ID(X,Y,386) \
-    TF_RADIO_ID(X,Y,387) \
-    TF_RADIO_ID(X,Y,388) \
-    TF_RADIO_ID(X,Y,389) \
-    TF_RADIO_ID(X,Y,390) \
-    TF_RADIO_ID(X,Y,391) \
-    TF_RADIO_ID(X,Y,392) \
-    TF_RADIO_ID(X,Y,393) \
-    TF_RADIO_ID(X,Y,394) \
-    TF_RADIO_ID(X,Y,395) \
-    TF_RADIO_ID(X,Y,396) \
-    TF_RADIO_ID(X,Y,397) \
-    TF_RADIO_ID(X,Y,398) \
-    TF_RADIO_ID(X,Y,399) \
-    TF_RADIO_ID(X,Y,400) \
-    TF_RADIO_ID(X,Y,401) \
-    TF_RADIO_ID(X,Y,402) \
-    TF_RADIO_ID(X,Y,403) \
-    TF_RADIO_ID(X,Y,404) \
-    TF_RADIO_ID(X,Y,405) \
-    TF_RADIO_ID(X,Y,406) \
-    TF_RADIO_ID(X,Y,407) \
-    TF_RADIO_ID(X,Y,408) \
-    TF_RADIO_ID(X,Y,409) \
-    TF_RADIO_ID(X,Y,410) \
-    TF_RADIO_ID(X,Y,411) \
-    TF_RADIO_ID(X,Y,412) \
-    TF_RADIO_ID(X,Y,413) \
-    TF_RADIO_ID(X,Y,414) \
-    TF_RADIO_ID(X,Y,415) \
-    TF_RADIO_ID(X,Y,416) \
-    TF_RADIO_ID(X,Y,417) \
-    TF_RADIO_ID(X,Y,418) \
-    TF_RADIO_ID(X,Y,419) \
-    TF_RADIO_ID(X,Y,420) \
-    TF_RADIO_ID(X,Y,421) \
-    TF_RADIO_ID(X,Y,422) \
-    TF_RADIO_ID(X,Y,423) \
-    TF_RADIO_ID(X,Y,424) \
-    TF_RADIO_ID(X,Y,425) \
-    TF_RADIO_ID(X,Y,426) \
-    TF_RADIO_ID(X,Y,427) \
-    TF_RADIO_ID(X,Y,428) \
-    TF_RADIO_ID(X,Y,429) \
-    TF_RADIO_ID(X,Y,430) \
-    TF_RADIO_ID(X,Y,431) \
-    TF_RADIO_ID(X,Y,432) \
-    TF_RADIO_ID(X,Y,433) \
-    TF_RADIO_ID(X,Y,434) \
-    TF_RADIO_ID(X,Y,435) \
-    TF_RADIO_ID(X,Y,436) \
-    TF_RADIO_ID(X,Y,437) \
-    TF_RADIO_ID(X,Y,438) \
-    TF_RADIO_ID(X,Y,439) \
-    TF_RADIO_ID(X,Y,440) \
-    TF_RADIO_ID(X,Y,441) \
-    TF_RADIO_ID(X,Y,442) \
-    TF_RADIO_ID(X,Y,443) \
-    TF_RADIO_ID(X,Y,444) \
-    TF_RADIO_ID(X,Y,445) \
-    TF_RADIO_ID(X,Y,446) \
-    TF_RADIO_ID(X,Y,447) \
-    TF_RADIO_ID(X,Y,448) \
-    TF_RADIO_ID(X,Y,449) \
-    TF_RADIO_ID(X,Y,450) \
-    TF_RADIO_ID(X,Y,451) \
-    TF_RADIO_ID(X,Y,452) \
-    TF_RADIO_ID(X,Y,453) \
-    TF_RADIO_ID(X,Y,454) \
-    TF_RADIO_ID(X,Y,455) \
-    TF_RADIO_ID(X,Y,456) \
-    TF_RADIO_ID(X,Y,457) \
-    TF_RADIO_ID(X,Y,458) \
-    TF_RADIO_ID(X,Y,459) \
-    TF_RADIO_ID(X,Y,460) \
-    TF_RADIO_ID(X,Y,461) \
-    TF_RADIO_ID(X,Y,462) \
-    TF_RADIO_ID(X,Y,463) \
-    TF_RADIO_ID(X,Y,464) \
-    TF_RADIO_ID(X,Y,465) \
-    TF_RADIO_ID(X,Y,466) \
-    TF_RADIO_ID(X,Y,467) \
-    TF_RADIO_ID(X,Y,468) \
-    TF_RADIO_ID(X,Y,469) \
-    TF_RADIO_ID(X,Y,470) \
-    TF_RADIO_ID(X,Y,471) \
-    TF_RADIO_ID(X,Y,472) \
-    TF_RADIO_ID(X,Y,473) \
-    TF_RADIO_ID(X,Y,474) \
-    TF_RADIO_ID(X,Y,475) \
-    TF_RADIO_ID(X,Y,476) \
-    TF_RADIO_ID(X,Y,477) \
-    TF_RADIO_ID(X,Y,478) \
-    TF_RADIO_ID(X,Y,479) \
-    TF_RADIO_ID(X,Y,480) \
-    TF_RADIO_ID(X,Y,481) \
-    TF_RADIO_ID(X,Y,482) \
-    TF_RADIO_ID(X,Y,483) \
-    TF_RADIO_ID(X,Y,484) \
-    TF_RADIO_ID(X,Y,485) \
-    TF_RADIO_ID(X,Y,486) \
-    TF_RADIO_ID(X,Y,487) \
-    TF_RADIO_ID(X,Y,488) \
-    TF_RADIO_ID(X,Y,489) \
-    TF_RADIO_ID(X,Y,490) \
-    TF_RADIO_ID(X,Y,491) \
-    TF_RADIO_ID(X,Y,492) \
-    TF_RADIO_ID(X,Y,493) \
-    TF_RADIO_ID(X,Y,494) \
-    TF_RADIO_ID(X,Y,495) \
-    TF_RADIO_ID(X,Y,496) \
-    TF_RADIO_ID(X,Y,497) \
-    TF_RADIO_ID(X,Y,498) \
-    TF_RADIO_ID(X,Y,499) \
-    TF_RADIO_ID(X,Y,500) \
-    TF_RADIO_ID(X,Y,501) \
-    TF_RADIO_ID(X,Y,502) \
-    TF_RADIO_ID(X,Y,503) \
-    TF_RADIO_ID(X,Y,504) \
-    TF_RADIO_ID(X,Y,505) \
-    TF_RADIO_ID(X,Y,506) \
-    TF_RADIO_ID(X,Y,507) \
-    TF_RADIO_ID(X,Y,508) \
-    TF_RADIO_ID(X,Y,509) \
-    TF_RADIO_ID(X,Y,510) \
-    TF_RADIO_ID(X,Y,511) \
-    TF_RADIO_ID(X,Y,512) \
-    TF_RADIO_ID(X,Y,513) \
-    TF_RADIO_ID(X,Y,514) \
-    TF_RADIO_ID(X,Y,515) \
-    TF_RADIO_ID(X,Y,516) \
-    TF_RADIO_ID(X,Y,517) \
-    TF_RADIO_ID(X,Y,518) \
-    TF_RADIO_ID(X,Y,519) \
-    TF_RADIO_ID(X,Y,520) \
-    TF_RADIO_ID(X,Y,521) \
-    TF_RADIO_ID(X,Y,522) \
-    TF_RADIO_ID(X,Y,523) \
-    TF_RADIO_ID(X,Y,524) \
-    TF_RADIO_ID(X,Y,525) \
-    TF_RADIO_ID(X,Y,526) \
-    TF_RADIO_ID(X,Y,527) \
-    TF_RADIO_ID(X,Y,528) \
-    TF_RADIO_ID(X,Y,529) \
-    TF_RADIO_ID(X,Y,530) \
-    TF_RADIO_ID(X,Y,531) \
-    TF_RADIO_ID(X,Y,532) \
-    TF_RADIO_ID(X,Y,533) \
-    TF_RADIO_ID(X,Y,534) \
-    TF_RADIO_ID(X,Y,535) \
-    TF_RADIO_ID(X,Y,536) \
-    TF_RADIO_ID(X,Y,537) \
-    TF_RADIO_ID(X,Y,538) \
-    TF_RADIO_ID(X,Y,539) \
-    TF_RADIO_ID(X,Y,540) \
-    TF_RADIO_ID(X,Y,541) \
-    TF_RADIO_ID(X,Y,542) \
-    TF_RADIO_ID(X,Y,543) \
-    TF_RADIO_ID(X,Y,544) \
-    TF_RADIO_ID(X,Y,545) \
-    TF_RADIO_ID(X,Y,546) \
-    TF_RADIO_ID(X,Y,547) \
-    TF_RADIO_ID(X,Y,548) \
-    TF_RADIO_ID(X,Y,549) \
-    TF_RADIO_ID(X,Y,550) \
-    TF_RADIO_ID(X,Y,551) \
-    TF_RADIO_ID(X,Y,552) \
-    TF_RADIO_ID(X,Y,553) \
-    TF_RADIO_ID(X,Y,554) \
-    TF_RADIO_ID(X,Y,555) \
-    TF_RADIO_ID(X,Y,556) \
-    TF_RADIO_ID(X,Y,557) \
-    TF_RADIO_ID(X,Y,558) \
-    TF_RADIO_ID(X,Y,559) \
-    TF_RADIO_ID(X,Y,560) \
-    TF_RADIO_ID(X,Y,561) \
-    TF_RADIO_ID(X,Y,562) \
-    TF_RADIO_ID(X,Y,563) \
-    TF_RADIO_ID(X,Y,564) \
-    TF_RADIO_ID(X,Y,565) \
-    TF_RADIO_ID(X,Y,566) \
-    TF_RADIO_ID(X,Y,567) \
-    TF_RADIO_ID(X,Y,568) \
-    TF_RADIO_ID(X,Y,569) \
-    TF_RADIO_ID(X,Y,570) \
-    TF_RADIO_ID(X,Y,571) \
-    TF_RADIO_ID(X,Y,572) \
-    TF_RADIO_ID(X,Y,573) \
-    TF_RADIO_ID(X,Y,574) \
-    TF_RADIO_ID(X,Y,575) \
-    TF_RADIO_ID(X,Y,576) \
-    TF_RADIO_ID(X,Y,577) \
-    TF_RADIO_ID(X,Y,578) \
-    TF_RADIO_ID(X,Y,579) \
-    TF_RADIO_ID(X,Y,580) \
-    TF_RADIO_ID(X,Y,581) \
-    TF_RADIO_ID(X,Y,582) \
-    TF_RADIO_ID(X,Y,583) \
-    TF_RADIO_ID(X,Y,584) \
-    TF_RADIO_ID(X,Y,585) \
-    TF_RADIO_ID(X,Y,586) \
-    TF_RADIO_ID(X,Y,587) \
-    TF_RADIO_ID(X,Y,588) \
-    TF_RADIO_ID(X,Y,589) \
-    TF_RADIO_ID(X,Y,590) \
-    TF_RADIO_ID(X,Y,591) \
-    TF_RADIO_ID(X,Y,592) \
-    TF_RADIO_ID(X,Y,593) \
-    TF_RADIO_ID(X,Y,594) \
-    TF_RADIO_ID(X,Y,595) \
-    TF_RADIO_ID(X,Y,596) \
-    TF_RADIO_ID(X,Y,597) \
-    TF_RADIO_ID(X,Y,598) \
-    TF_RADIO_ID(X,Y,599) \
-    TF_RADIO_ID(X,Y,600) \
-    TF_RADIO_ID(X,Y,601) \
-    TF_RADIO_ID(X,Y,602) \
-    TF_RADIO_ID(X,Y,603) \
-    TF_RADIO_ID(X,Y,604) \
-    TF_RADIO_ID(X,Y,605) \
-    TF_RADIO_ID(X,Y,606) \
-    TF_RADIO_ID(X,Y,607) \
-    TF_RADIO_ID(X,Y,608) \
-    TF_RADIO_ID(X,Y,609) \
-    TF_RADIO_ID(X,Y,610) \
-    TF_RADIO_ID(X,Y,611) \
-    TF_RADIO_ID(X,Y,612) \
-    TF_RADIO_ID(X,Y,613) \
-    TF_RADIO_ID(X,Y,614) \
-    TF_RADIO_ID(X,Y,615) \
-    TF_RADIO_ID(X,Y,616) \
-    TF_RADIO_ID(X,Y,617) \
-    TF_RADIO_ID(X,Y,618) \
-    TF_RADIO_ID(X,Y,619) \
-    TF_RADIO_ID(X,Y,620) \
-    TF_RADIO_ID(X,Y,621) \
-    TF_RADIO_ID(X,Y,622) \
-    TF_RADIO_ID(X,Y,623) \
-    TF_RADIO_ID(X,Y,624) \
-    TF_RADIO_ID(X,Y,625) \
-    TF_RADIO_ID(X,Y,626) \
-    TF_RADIO_ID(X,Y,627) \
-    TF_RADIO_ID(X,Y,628) \
-    TF_RADIO_ID(X,Y,629) \
-    TF_RADIO_ID(X,Y,630) \
-    TF_RADIO_ID(X,Y,631) \
-    TF_RADIO_ID(X,Y,632) \
-    TF_RADIO_ID(X,Y,633) \
-    TF_RADIO_ID(X,Y,634) \
-    TF_RADIO_ID(X,Y,635) \
-    TF_RADIO_ID(X,Y,636) \
-    TF_RADIO_ID(X,Y,637) \
-    TF_RADIO_ID(X,Y,638) \
-    TF_RADIO_ID(X,Y,639) \
-    TF_RADIO_ID(X,Y,640) \
-    TF_RADIO_ID(X,Y,641) \
-    TF_RADIO_ID(X,Y,642) \
-    TF_RADIO_ID(X,Y,643) \
-    TF_RADIO_ID(X,Y,644) \
-    TF_RADIO_ID(X,Y,645) \
-    TF_RADIO_ID(X,Y,646) \
-    TF_RADIO_ID(X,Y,647) \
-    TF_RADIO_ID(X,Y,648) \
-    TF_RADIO_ID(X,Y,649) \
-    TF_RADIO_ID(X,Y,650) \
-    TF_RADIO_ID(X,Y,651) \
-    TF_RADIO_ID(X,Y,652) \
-    TF_RADIO_ID(X,Y,653) \
-    TF_RADIO_ID(X,Y,654) \
-    TF_RADIO_ID(X,Y,655) \
-    TF_RADIO_ID(X,Y,656) \
-    TF_RADIO_ID(X,Y,657) \
-    TF_RADIO_ID(X,Y,658) \
-    TF_RADIO_ID(X,Y,659) \
-    TF_RADIO_ID(X,Y,660) \
-    TF_RADIO_ID(X,Y,661) \
-    TF_RADIO_ID(X,Y,662) \
-    TF_RADIO_ID(X,Y,663) \
-    TF_RADIO_ID(X,Y,664) \
-    TF_RADIO_ID(X,Y,665) \
-    TF_RADIO_ID(X,Y,666) \
-    TF_RADIO_ID(X,Y,667) \
-    TF_RADIO_ID(X,Y,668) \
-    TF_RADIO_ID(X,Y,669) \
-    TF_RADIO_ID(X,Y,670) \
-    TF_RADIO_ID(X,Y,671) \
-    TF_RADIO_ID(X,Y,672) \
-    TF_RADIO_ID(X,Y,673) \
-    TF_RADIO_ID(X,Y,674) \
-    TF_RADIO_ID(X,Y,675) \
-    TF_RADIO_ID(X,Y,676) \
-    TF_RADIO_ID(X,Y,677) \
-    TF_RADIO_ID(X,Y,678) \
-    TF_RADIO_ID(X,Y,679) \
-    TF_RADIO_ID(X,Y,680) \
-    TF_RADIO_ID(X,Y,681) \
-    TF_RADIO_ID(X,Y,682) \
-    TF_RADIO_ID(X,Y,683) \
-    TF_RADIO_ID(X,Y,684) \
-    TF_RADIO_ID(X,Y,685) \
-    TF_RADIO_ID(X,Y,686) \
-    TF_RADIO_ID(X,Y,687) \
-    TF_RADIO_ID(X,Y,688) \
-    TF_RADIO_ID(X,Y,689) \
-    TF_RADIO_ID(X,Y,690) \
-    TF_RADIO_ID(X,Y,691) \
-    TF_RADIO_ID(X,Y,692) \
-    TF_RADIO_ID(X,Y,693) \
-    TF_RADIO_ID(X,Y,694) \
-    TF_RADIO_ID(X,Y,695) \
-    TF_RADIO_ID(X,Y,696) \
-    TF_RADIO_ID(X,Y,697) \
-    TF_RADIO_ID(X,Y,698) \
-    TF_RADIO_ID(X,Y,699) \
-    TF_RADIO_ID(X,Y,700) \
-    TF_RADIO_ID(X,Y,701) \
-    TF_RADIO_ID(X,Y,702) \
-    TF_RADIO_ID(X,Y,703) \
-    TF_RADIO_ID(X,Y,704) \
-    TF_RADIO_ID(X,Y,705) \
-    TF_RADIO_ID(X,Y,706) \
-    TF_RADIO_ID(X,Y,707) \
-    TF_RADIO_ID(X,Y,708) \
-    TF_RADIO_ID(X,Y,709) \
-    TF_RADIO_ID(X,Y,710) \
-    TF_RADIO_ID(X,Y,711) \
-    TF_RADIO_ID(X,Y,712) \
-    TF_RADIO_ID(X,Y,713) \
-    TF_RADIO_ID(X,Y,714) \
-    TF_RADIO_ID(X,Y,715) \
-    TF_RADIO_ID(X,Y,716) \
-    TF_RADIO_ID(X,Y,717) \
-    TF_RADIO_ID(X,Y,718) \
-    TF_RADIO_ID(X,Y,719) \
-    TF_RADIO_ID(X,Y,720) \
-    TF_RADIO_ID(X,Y,721) \
-    TF_RADIO_ID(X,Y,722) \
-    TF_RADIO_ID(X,Y,723) \
-    TF_RADIO_ID(X,Y,724) \
-    TF_RADIO_ID(X,Y,725) \
-    TF_RADIO_ID(X,Y,726) \
-    TF_RADIO_ID(X,Y,727) \
-    TF_RADIO_ID(X,Y,728) \
-    TF_RADIO_ID(X,Y,729) \
-    TF_RADIO_ID(X,Y,730) \
-    TF_RADIO_ID(X,Y,731) \
-    TF_RADIO_ID(X,Y,732) \
-    TF_RADIO_ID(X,Y,733) \
-    TF_RADIO_ID(X,Y,734) \
-    TF_RADIO_ID(X,Y,735) \
-    TF_RADIO_ID(X,Y,736) \
-    TF_RADIO_ID(X,Y,737) \
-    TF_RADIO_ID(X,Y,738) \
-    TF_RADIO_ID(X,Y,739) \
-    TF_RADIO_ID(X,Y,740) \
-    TF_RADIO_ID(X,Y,741) \
-    TF_RADIO_ID(X,Y,742) \
-    TF_RADIO_ID(X,Y,743) \
-    TF_RADIO_ID(X,Y,744) \
-    TF_RADIO_ID(X,Y,745) \
-    TF_RADIO_ID(X,Y,746) \
-    TF_RADIO_ID(X,Y,747) \
-    TF_RADIO_ID(X,Y,748) \
-    TF_RADIO_ID(X,Y,749) \
-    TF_RADIO_ID(X,Y,750) \
-    TF_RADIO_ID(X,Y,751) \
-    TF_RADIO_ID(X,Y,752) \
-    TF_RADIO_ID(X,Y,753) \
-    TF_RADIO_ID(X,Y,754) \
-    TF_RADIO_ID(X,Y,755) \
-    TF_RADIO_ID(X,Y,756) \
-    TF_RADIO_ID(X,Y,757) \
-    TF_RADIO_ID(X,Y,758) \
-    TF_RADIO_ID(X,Y,759) \
-    TF_RADIO_ID(X,Y,760) \
-    TF_RADIO_ID(X,Y,761) \
-    TF_RADIO_ID(X,Y,762) \
-    TF_RADIO_ID(X,Y,763) \
-    TF_RADIO_ID(X,Y,764) \
-    TF_RADIO_ID(X,Y,765) \
-    TF_RADIO_ID(X,Y,766) \
-    TF_RADIO_ID(X,Y,767) \
-    TF_RADIO_ID(X,Y,768) \
-    TF_RADIO_ID(X,Y,769) \
-    TF_RADIO_ID(X,Y,770) \
-    TF_RADIO_ID(X,Y,771) \
-    TF_RADIO_ID(X,Y,772) \
-    TF_RADIO_ID(X,Y,773) \
-    TF_RADIO_ID(X,Y,774) \
-    TF_RADIO_ID(X,Y,775) \
-    TF_RADIO_ID(X,Y,776) \
-    TF_RADIO_ID(X,Y,777) \
-    TF_RADIO_ID(X,Y,778) \
-    TF_RADIO_ID(X,Y,779) \
-    TF_RADIO_ID(X,Y,780) \
-    TF_RADIO_ID(X,Y,781) \
-    TF_RADIO_ID(X,Y,782) \
-    TF_RADIO_ID(X,Y,783) \
-    TF_RADIO_ID(X,Y,784) \
-    TF_RADIO_ID(X,Y,785) \
-    TF_RADIO_ID(X,Y,786) \
-    TF_RADIO_ID(X,Y,787) \
-    TF_RADIO_ID(X,Y,788) \
-    TF_RADIO_ID(X,Y,789) \
-    TF_RADIO_ID(X,Y,790) \
-    TF_RADIO_ID(X,Y,791) \
-    TF_RADIO_ID(X,Y,792) \
-    TF_RADIO_ID(X,Y,793) \
-    TF_RADIO_ID(X,Y,794) \
-    TF_RADIO_ID(X,Y,795) \
-    TF_RADIO_ID(X,Y,796) \
-    TF_RADIO_ID(X,Y,797) \
-    TF_RADIO_ID(X,Y,798) \
-    TF_RADIO_ID(X,Y,799) \
-    TF_RADIO_ID(X,Y,800) \
-    TF_RADIO_ID(X,Y,801) \
-    TF_RADIO_ID(X,Y,802) \
-    TF_RADIO_ID(X,Y,803) \
-    TF_RADIO_ID(X,Y,804) \
-    TF_RADIO_ID(X,Y,805) \
-    TF_RADIO_ID(X,Y,806) \
-    TF_RADIO_ID(X,Y,807) \
-    TF_RADIO_ID(X,Y,808) \
-    TF_RADIO_ID(X,Y,809) \
-    TF_RADIO_ID(X,Y,810) \
-    TF_RADIO_ID(X,Y,811) \
-    TF_RADIO_ID(X,Y,812) \
-    TF_RADIO_ID(X,Y,813) \
-    TF_RADIO_ID(X,Y,814) \
-    TF_RADIO_ID(X,Y,815) \
-    TF_RADIO_ID(X,Y,816) \
-    TF_RADIO_ID(X,Y,817) \
-    TF_RADIO_ID(X,Y,818) \
-    TF_RADIO_ID(X,Y,819) \
-    TF_RADIO_ID(X,Y,820) \
-    TF_RADIO_ID(X,Y,821) \
-    TF_RADIO_ID(X,Y,822) \
-    TF_RADIO_ID(X,Y,823) \
-    TF_RADIO_ID(X,Y,824) \
-    TF_RADIO_ID(X,Y,825) \
-    TF_RADIO_ID(X,Y,826) \
-    TF_RADIO_ID(X,Y,827) \
-    TF_RADIO_ID(X,Y,828) \
-    TF_RADIO_ID(X,Y,829) \
-    TF_RADIO_ID(X,Y,830) \
-    TF_RADIO_ID(X,Y,831) \
-    TF_RADIO_ID(X,Y,832) \
-    TF_RADIO_ID(X,Y,833) \
-    TF_RADIO_ID(X,Y,834) \
-    TF_RADIO_ID(X,Y,835) \
-    TF_RADIO_ID(X,Y,836) \
-    TF_RADIO_ID(X,Y,837) \
-    TF_RADIO_ID(X,Y,838) \
-    TF_RADIO_ID(X,Y,839) \
-    TF_RADIO_ID(X,Y,840) \
-    TF_RADIO_ID(X,Y,841) \
-    TF_RADIO_ID(X,Y,842) \
-    TF_RADIO_ID(X,Y,843) \
-    TF_RADIO_ID(X,Y,844) \
-    TF_RADIO_ID(X,Y,845) \
-    TF_RADIO_ID(X,Y,846) \
-    TF_RADIO_ID(X,Y,847) \
-    TF_RADIO_ID(X,Y,848) \
-    TF_RADIO_ID(X,Y,849) \
-    TF_RADIO_ID(X,Y,850) \
-    TF_RADIO_ID(X,Y,851) \
-    TF_RADIO_ID(X,Y,852) \
-    TF_RADIO_ID(X,Y,853) \
-    TF_RADIO_ID(X,Y,854) \
-    TF_RADIO_ID(X,Y,855) \
-    TF_RADIO_ID(X,Y,856) \
-    TF_RADIO_ID(X,Y,857) \
-    TF_RADIO_ID(X,Y,858) \
-    TF_RADIO_ID(X,Y,859) \
-    TF_RADIO_ID(X,Y,860) \
-    TF_RADIO_ID(X,Y,861) \
-    TF_RADIO_ID(X,Y,862) \
-    TF_RADIO_ID(X,Y,863) \
-    TF_RADIO_ID(X,Y,864) \
-    TF_RADIO_ID(X,Y,865) \
-    TF_RADIO_ID(X,Y,866) \
-    TF_RADIO_ID(X,Y,867) \
-    TF_RADIO_ID(X,Y,868) \
-    TF_RADIO_ID(X,Y,869) \
-    TF_RADIO_ID(X,Y,870) \
-    TF_RADIO_ID(X,Y,871) \
-    TF_RADIO_ID(X,Y,872) \
-    TF_RADIO_ID(X,Y,873) \
-    TF_RADIO_ID(X,Y,874) \
-    TF_RADIO_ID(X,Y,875) \
-    TF_RADIO_ID(X,Y,876) \
-    TF_RADIO_ID(X,Y,877) \
-    TF_RADIO_ID(X,Y,878) \
-    TF_RADIO_ID(X,Y,879) \
-    TF_RADIO_ID(X,Y,880) \
-    TF_RADIO_ID(X,Y,881) \
-    TF_RADIO_ID(X,Y,882) \
-    TF_RADIO_ID(X,Y,883) \
-    TF_RADIO_ID(X,Y,884) \
-    TF_RADIO_ID(X,Y,885) \
-    TF_RADIO_ID(X,Y,886) \
-    TF_RADIO_ID(X,Y,887) \
-    TF_RADIO_ID(X,Y,888) \
-    TF_RADIO_ID(X,Y,889) \
-    TF_RADIO_ID(X,Y,890) \
-    TF_RADIO_ID(X,Y,891) \
-    TF_RADIO_ID(X,Y,892) \
-    TF_RADIO_ID(X,Y,893) \
-    TF_RADIO_ID(X,Y,894) \
-    TF_RADIO_ID(X,Y,895) \
-    TF_RADIO_ID(X,Y,896) \
-    TF_RADIO_ID(X,Y,897) \
-    TF_RADIO_ID(X,Y,898) \
-    TF_RADIO_ID(X,Y,899) \
-    TF_RADIO_ID(X,Y,900) \
-    TF_RADIO_ID(X,Y,901) \
-    TF_RADIO_ID(X,Y,902) \
-    TF_RADIO_ID(X,Y,903) \
-    TF_RADIO_ID(X,Y,904) \
-    TF_RADIO_ID(X,Y,905) \
-    TF_RADIO_ID(X,Y,906) \
-    TF_RADIO_ID(X,Y,907) \
-    TF_RADIO_ID(X,Y,908) \
-    TF_RADIO_ID(X,Y,909) \
-    TF_RADIO_ID(X,Y,910) \
-    TF_RADIO_ID(X,Y,911) \
-    TF_RADIO_ID(X,Y,912) \
-    TF_RADIO_ID(X,Y,913) \
-    TF_RADIO_ID(X,Y,914) \
-    TF_RADIO_ID(X,Y,915) \
-    TF_RADIO_ID(X,Y,916) \
-    TF_RADIO_ID(X,Y,917) \
-    TF_RADIO_ID(X,Y,918) \
-    TF_RADIO_ID(X,Y,919) \
-    TF_RADIO_ID(X,Y,920) \
-    TF_RADIO_ID(X,Y,921) \
-    TF_RADIO_ID(X,Y,922) \
-    TF_RADIO_ID(X,Y,923) \
-    TF_RADIO_ID(X,Y,924) \
-    TF_RADIO_ID(X,Y,925) \
-    TF_RADIO_ID(X,Y,926) \
-    TF_RADIO_ID(X,Y,927) \
-    TF_RADIO_ID(X,Y,928) \
-    TF_RADIO_ID(X,Y,929) \
-    TF_RADIO_ID(X,Y,930) \
-    TF_RADIO_ID(X,Y,931) \
-    TF_RADIO_ID(X,Y,932) \
-    TF_RADIO_ID(X,Y,933) \
-    TF_RADIO_ID(X,Y,934) \
-    TF_RADIO_ID(X,Y,935) \
-    TF_RADIO_ID(X,Y,936) \
-    TF_RADIO_ID(X,Y,937) \
-    TF_RADIO_ID(X,Y,938) \
-    TF_RADIO_ID(X,Y,939) \
-    TF_RADIO_ID(X,Y,940) \
-    TF_RADIO_ID(X,Y,941) \
-    TF_RADIO_ID(X,Y,942) \
-    TF_RADIO_ID(X,Y,943) \
-    TF_RADIO_ID(X,Y,944) \
-    TF_RADIO_ID(X,Y,945) \
-    TF_RADIO_ID(X,Y,946) \
-    TF_RADIO_ID(X,Y,947) \
-    TF_RADIO_ID(X,Y,948) \
-    TF_RADIO_ID(X,Y,949) \
-    TF_RADIO_ID(X,Y,950) \
-    TF_RADIO_ID(X,Y,951) \
-    TF_RADIO_ID(X,Y,952) \
-    TF_RADIO_ID(X,Y,953) \
-    TF_RADIO_ID(X,Y,954) \
-    TF_RADIO_ID(X,Y,955) \
-    TF_RADIO_ID(X,Y,956) \
-    TF_RADIO_ID(X,Y,957) \
-    TF_RADIO_ID(X,Y,958) \
-    TF_RADIO_ID(X,Y,959) \
-    TF_RADIO_ID(X,Y,960) \
-    TF_RADIO_ID(X,Y,961) \
-    TF_RADIO_ID(X,Y,962) \
-    TF_RADIO_ID(X,Y,963) \
-    TF_RADIO_ID(X,Y,964) \
-    TF_RADIO_ID(X,Y,965) \
-    TF_RADIO_ID(X,Y,966) \
-    TF_RADIO_ID(X,Y,967) \
-    TF_RADIO_ID(X,Y,968) \
-    TF_RADIO_ID(X,Y,969) \
-    TF_RADIO_ID(X,Y,970) \
-    TF_RADIO_ID(X,Y,971) \
-    TF_RADIO_ID(X,Y,972) \
-    TF_RADIO_ID(X,Y,973) \
-    TF_RADIO_ID(X,Y,974) \
-    TF_RADIO_ID(X,Y,975) \
-    TF_RADIO_ID(X,Y,976) \
-    TF_RADIO_ID(X,Y,977) \
-    TF_RADIO_ID(X,Y,978) \
-    TF_RADIO_ID(X,Y,979) \
-    TF_RADIO_ID(X,Y,980) \
-    TF_RADIO_ID(X,Y,981) \
-    TF_RADIO_ID(X,Y,982) \
-    TF_RADIO_ID(X,Y,983) \
-    TF_RADIO_ID(X,Y,984) \
-    TF_RADIO_ID(X,Y,985) \
-    TF_RADIO_ID(X,Y,986) \
-    TF_RADIO_ID(X,Y,987) \
-    TF_RADIO_ID(X,Y,988) \
-    TF_RADIO_ID(X,Y,989) \
-    TF_RADIO_ID(X,Y,990) \
-    TF_RADIO_ID(X,Y,991) \
-    TF_RADIO_ID(X,Y,992) \
-    TF_RADIO_ID(X,Y,993) \
-    TF_RADIO_ID(X,Y,994) \
-    TF_RADIO_ID(X,Y,995) \
-    TF_RADIO_ID(X,Y,996) \
-    TF_RADIO_ID(X,Y,997) \
-    TF_RADIO_ID(X,Y,998) \
-    TF_RADIO_ID(X,Y,999) \
-	TF_RADIO_ID(X,Y,1000)

addons/RD501_Compositions/config.cpp

@@ -31,7 +31,7 @@ class CfgGroups {
                     icon = "\a3\Ui_f\data\Map\Markers\NATO\n_unknown.paa";
                     #include "data\republic\bases\dakaar_base.hpp"
                 };
-				class RD501_Compositions_Republic_Base_2 {
+				class RD501_Compositions_Republic_Base_3 {
                     name="Sierra Base";
                     side = 8;
                     icon = "\a3\Ui_f\data\Map\Markers\NATO\n_unknown.paa";

addons/RD501_Droid_Dispenser/config.cpp

@@ -6,7 +6,7 @@ class CfgPatches {
 	{
 		name = QUOTE(Droid Dispenser);
 		author = "RD501";
-		requiredAddons[] = {};
+		requiredAddons[] = {"A3_Weapons_F_Orange"};
 		units[] = { 
 			QGVAR(moduleOrdnanceDroidDispenser),
 			GVAR(moduleDroidDispenser)

addons/RD501_Droids/B1/b1_common.hpp

@@ -1,8 +1,7 @@
 author = "RD501";
 scope = 2;
 
-faction = macro_cis_faction
-editorSubcategory = macro_editor_cat(B1)
+faction = macro_faction(CIS);
 
 linkeditems[]=
 {

addons/RD501_Droids/B1/backpacks.hpp

@@ -26,7 +26,7 @@ class macro_new_backpack_class(opfor,B1_AT_heavy): JLTS_B1_backpack
 		class _xx_at_heavy_mag
 		{
 			count=3;
-			magazine=macro_at_heavy_mag
+			magazine=macro_at_heavy_mag;
 		};
 	};
 };
@@ -39,12 +39,12 @@ class macro_new_backpack_class(opfor,B1_AT_light): JLTS_B1_backpack
 		class _xx_at_light_mag
 		{
 			count=2;
-			magazine=macro_at_light_mag
+			magazine=macro_at_light_mag;
 		};
 		class _xx_at_light_he_mag
 		{
 			count=2;
-			magazine=macro_at_light_he_mag
+			magazine=macro_at_light_he_mag;
 		};
 	};
 };

addons/RD501_Droids/B1/config.cpp

@@ -73,6 +73,7 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1): JLTS_Droid_B1_E5
 	{
 		displayName = "B1 Battledroid";
+		editorSubcategory = macro_editor_cat(B1);
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
@@ -81,6 +82,7 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1_marine): JLTS_Droid_B1_Marine
 	{
 		displayName="B1 Battledroid (Marine)";
+		editorSubcategory = macro_editor_cat(B1);
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
@@ -89,6 +91,7 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1_security): JLTS_Droid_B1_Security
 	{
 		displayName="B1 Battledroid (Security)";
+		editorSubcategory = macro_editor_cat(B1);
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
@@ -97,6 +100,7 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1_commander): JLTS_Droid_B1_Commander
 	{
 		displayName="B1 Battledroid (Commander)";
+		editorSubcategory = macro_editor_cat(B1);
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1_antenna);
@@ -105,6 +109,7 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1_pilot): JLTS_Droid_B1_Pilot
 	{
 		displayName="B1 Battledroid (Pilot)";
+		editorSubcategory = macro_editor_cat(B1);
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
@@ -113,6 +118,7 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1_crew): JLTS_Droid_B1_Crew
 	{
 		displayName="B1 Battledroid (Crew)";
+		editorSubcategory = macro_editor_cat(B1);
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
@@ -121,7 +127,7 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1_prototype): JLTS_Droid_B1_Prototype
 	{
 		displayName="B1 Battledroid (SpecOps)";
-		editorSubcategory = macro_editor_cat(CIS_SpecOps)
+		editorSubcategory = macro_editor_cat(CIS_SpecOps);
 		#include "b1_common.hpp"
 		weapons[]=
 		{
@@ -272,7 +278,6 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B1_AA): macro_new_unit_class(opfor,B1_pilot)
 	{
 		displayName="B1 Battledroid (AA)";
-		cost=2;
 		threat[]={0.2,0.1,1};
 		weapons[]=
 		{
@@ -375,13 +380,13 @@ class CfgVehicles
 			"\RD501_Droids\data\b1_jammer.paa"
 		};
 		cost=3;
-	}
+	};
 	class macro_new_unit_class(opfor,B1_E_Web): macro_new_unit_class(opfor,B1)
 	{
 		displayName="B1 Battledroid (E-Web Carrier)";
 		backpack = macro_backpack_eweb;
 		cost=3;
-	}
+	};
 	class macro_new_unit_class(opfor,B1_grenadier): macro_new_unit_class(opfor,B1_security)
 	{
 		displayName="B1 Battledroid (Grenadier)";
@@ -402,5 +407,5 @@ class CfgVehicles
 			macro_grenade_launcher_mags
 		};
 		cost=2;
-	}
+	};
 };

addons/RD501_Droids/BX/config.cpp

@@ -25,9 +25,9 @@ class CfgVehicles
         displayName = "BX Commando Droid";
 		author = "RD501";
 		scope = 2;
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(CIS_SpecOps)
-		cost = 4
+		faction = macro_faction(CIS);
+		editorSubcategory = macro_editor_cat(CIS_SpecOps);
+		cost = 4;
 
 		weapons[]=
 		{
@@ -93,9 +93,9 @@ class CfgVehicles
         displayName = "BX Commando Droid(Shield)";
 		author = "RD501";
 		scope = 2;
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(CIS_SpecOps)
-		cost = 4
+		faction = macro_faction(CIS);
+		editorSubcategory = macro_editor_cat(CIS_SpecOps);
+		cost = 4;
 
 		weapons[]=
 		{
@@ -162,4 +162,4 @@ class CfgVehicles
 			"JLTS_riot_shield_droid_item"
 		};
     };
-}
+};

addons/RD501_Droids/config.cpp

@@ -1,7 +1,5 @@
 #include "..\RD501_main\config_macros.hpp"
 
-
-
 class CfgPatches
 {
 	class macro_patch_name(droids_config)
@@ -25,7 +23,7 @@ class CfgGroups
 {
 	class EAST
 	{
-		class macro_cis_faction
+		class macro_faction(CIS)
 		{
 			name="RD501 C.I.S Faction";
 			class Fillers
@@ -35,7 +33,7 @@ class CfgGroups
 				{
 					name="HMP Filler";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -127,7 +125,7 @@ class CfgGroups
 				{
 					name="L.I.T Filler";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -226,7 +224,7 @@ class CfgGroups
 				{
 					name="Trojan Filler";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -289,12 +287,12 @@ class CfgGroups
 			};
 			class Sections
 			{
-				name="Droid Sections (10-13)"
+				name="Droid Sections (10-13)";
 				class macro_new_composition(opfor,heavy_assault_section)
 				{
 					name="Heavy Assault Section";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -379,7 +377,7 @@ class CfgGroups
 				{
 					name="Light Assault Section";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -457,7 +455,7 @@ class CfgGroups
 				{
 					name="Weapons Section";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -549,7 +547,7 @@ class CfgGroups
 				{
 					name="Loyalist Weapons Section";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -640,12 +638,12 @@ class CfgGroups
 			};
 			class Squads
 			{
-				name="Droid Squads (6-8)"
+				name="Droid Squads (6-8)";
 				class macro_new_composition(opfor,heavy_defense_squad)
 				{
 					name="Heavy Defense Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -696,7 +694,7 @@ class CfgGroups
 				{
 					name="Heavy Assault Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -761,7 +759,7 @@ class CfgGroups
 				{
 					name="AT Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -819,7 +817,7 @@ class CfgGroups
 				{
 					name="AA Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -876,7 +874,7 @@ class CfgGroups
 				{
 					name="Weapons Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -934,7 +932,7 @@ class CfgGroups
 				{
 					name="B1 Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -998,7 +996,7 @@ class CfgGroups
 				{
 					name="B2 Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1048,7 +1046,7 @@ class CfgGroups
 				{
 					name="Light Defense Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1105,7 +1103,7 @@ class CfgGroups
 				{
 					name="Light Assault Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1162,7 +1160,7 @@ class CfgGroups
 				{
 					name="Spec Ops Infiltration Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1226,7 +1224,7 @@ class CfgGroups
 				{
 					name="Company/Battalion Command Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1290,7 +1288,7 @@ class CfgGroups
 				{
 					name="Regiment/Division Command Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					// should be T-Series
@@ -1355,7 +1353,7 @@ class CfgGroups
 				{
 					name="Loyalist Rifle Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1412,7 +1410,7 @@ class CfgGroups
 				{
 					name="Loyalist Weapons Squad";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1468,12 +1466,12 @@ class CfgGroups
 			};
 			class Teams
 			{
-				name="Droid Teams (3-4)"
+				name="Droid Teams (3-4)";
 				class macro_new_composition(opfor,heavy_assault_team)
 				{
 					name="Heavy Assault Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1509,7 +1507,7 @@ class CfgGroups
 				{
 					name="Light Assault Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1538,7 +1536,7 @@ class CfgGroups
 				{
 					name="Super Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1574,7 +1572,7 @@ class CfgGroups
 				{
 					name="B1 Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1610,7 +1608,7 @@ class CfgGroups
 				{
 					name="CQC Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1639,7 +1637,7 @@ class CfgGroups
 				{
 					name="AT Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1668,7 +1666,7 @@ class CfgGroups
 				{
 					name="AA Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1697,7 +1695,7 @@ class CfgGroups
 				{
 					name="Weapons Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1733,7 +1731,7 @@ class CfgGroups
 				{
 					name="Marksmen Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1762,7 +1760,7 @@ class CfgGroups
 				{
 					name="Defense Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1798,7 +1796,7 @@ class CfgGroups
 				{
 					name="Spec Ops Light Infiltration Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1827,7 +1825,7 @@ class CfgGroups
 				{
 					name="Spec Ops Infiltration Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1863,7 +1861,7 @@ class CfgGroups
 				{
 					name="Spec Ops Strike Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1892,7 +1890,7 @@ class CfgGroups
 				{
 					name="Company/Battalion Command Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1928,7 +1926,7 @@ class CfgGroups
 				{
 					name="Regiment/Division Command Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0
@@ -1964,7 +1962,7 @@ class CfgGroups
 				{
 					name="Loyalist Team";
 					side=0;
-					faction = macro_cis_faction
+					faction = macro_faction(CIS);
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
 					class Unit0

addons/RD501_Droids/droid_inits.hpp

@@ -29,4 +29,4 @@ class Extended_Init_EventHandlers
 			init = "_this call rd501_fnc_jlts_shield_aiToggle";
 		};
 	};
-}
+};

addons/RD501_Helmets/airborne/config.cpp

@@ -7,11 +7,11 @@ class CfgPatches
 {
 	class macro_patch_name(airborne_helmets)
 	{
-		author=DANKAUTHORS
-		addonRootClass= macro_patch_name(helmets)
+		author=DANKAUTHORS;
+		addonRootClass= macro_patch_name(helmets);
 		requiredAddons[]=
 		{
-			macro_patch_name(helmets)
+			macro_quote(macro_patch_name(helmets))
 		};
 		requiredVersion=0.1;
 		units[]={};

addons/RD501_Helmets/aviation/config.cpp

@@ -7,12 +7,9 @@ class CfgPatches
 {
 	class macro_patch_name(aviation_helmets)
 	{
-		author=RD501
-		addonRootClass= macro_patch_name(helmets)
-		requiredAddons[]=
-		{
-			
-		};
+		author=RD501;
+		addonRootClass= macro_patch_name(helmets);
+		requiredAddons[]={};
 		requiredVersion=0.1;
 		units[]={};
 		weapons[]={};
@@ -189,10 +186,10 @@ class CfgWeapons
 
 	class macro_new_helmet(warden,501st):212th_Engineer_helm
 	{
-		author="RD501"
+		author="RD501";
 		scopeArsenal = 2;
 		DisplayName="[501st] WRDN HELM (Base)";
-		picture="RD501_Helmets\_textures\aviation\warden_ico.paa"
+		picture="RD501_Helmets\_textures\aviation\warden_ico.paa";
 		/*hiddenSelections[]=
 		{
 			"camo"

addons/RD501_Helmets/config.cpp

@@ -5,7 +5,7 @@ class CfgPatches
 {
 	class macro_patch_name(helmets)
 	{
-		author=DANKAUTHORS
+		author=DANKAUTHORS;
 		requiredAddons[]=
 		{
 			macro_lvl1_req
@@ -23,62 +23,6 @@ class CfgWeapons
 	class HeadgearItem;
 	class H_HelmetB;
 	
-	//pilots
-	class macro_new_helmet(pilot,base): H_HelmetB//RD501_501st_Pilot_Base
-	{
-		scope = 2;
-		scopeArsenal = 2;
-		author = "RD501";
-		weaponPoolAvailable = 1;       
-		ace_hearing_protection = 0.85; 		
-		ace_hearing_lowerVolume = 0;    
-		displayName = "[501st] PLT HELM (Base)";
-		//picture = "\SWOP_clones\data\helmets\ico\ico_pilot.paa";
-		//model = "SWOP_clones\helmet\CloneHelmetPilot.p3d";
-
-		model = "\501st_helmets\AB\AB_helmet_p1.p3d";	
-		hiddenSelections[] = {
-			"camo1",
-			"mat"
-		};
-
-		hiddenSelectionsTextures[]=
-        {
-            "RD501_Helmets\_textures\aviation\clonePilotHelmet_co.paa"
-        };
-        hiddenSelectionsMaterials[]=
-        {
-            "",
-            "501st_Helmets\AB\data\pilot_jlts.rvmat"
-        };
-
-
-		class ItemInfo: HeadgearItem
-		{
-			mass = 30;
-			uniformmodel = "\501st_helmets\AB\AB_helmet_p1.p3d";//"SWOP_clones\helmet\CloneHelmetPilot.p3d";
-			modelSides[] = {6};
-			hiddenSelections[] = {
-				"camo1",
-				"mat"
-			};
-			material = -1;
-			explosionShielding = 2.2;
-			minimalHit = 0.01;
-			passThrough = 0.01;
-			class HitpointsProtectionInfo
-			{
-				class Head
-				{
-					hitpointName = "HitHead";
-					armor = 50;
-					passThrough = 0.6;
-				};
-			};
-		};
-
-		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-	};
 	class macro_new_helmet(empire_rg,boi) : H_HelmetB
 	{
 		scope = 2;
@@ -120,8 +64,7 @@ class CfgWeapons
 		scope = 2;
 		scopeArsenal = 2;
 		author = "RD501";
-		weaponPoolAvailable = 1;       
-		subItems[] = {"G_B_Diving"};
+		weaponPoolAvailable = 1;
 		ace_hearing_protection = 0.85; 		
 		ace_hearing_lowerVolume = 0;    
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
@@ -158,8 +101,7 @@ class CfgWeapons
 		scope = 2;
 		scopeArsenal = 2;
 		author = "RD501";
-		weaponPoolAvailable = 1;       
-		subItems[] = {"G_B_Diving"};
+		weaponPoolAvailable = 1;
 		ace_hearing_protection = 0.85; 		
 		ace_hearing_lowerVolume = 0;    
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};

addons/RD501_Helmets/infantry/config.cpp

@@ -7,12 +7,9 @@ class CfgPatches
 {
 	class macro_patch_name(infantry_helmets)
 	{
-		author=DANKAUTHORS
-		addonRootClass= macro_patch_name(helmets)
-		requiredAddons[]=
-		{
-			
-		};
+		author=DANKAUTHORS;
+		addonRootClass= macro_patch_name(helmets);
+		requiredAddons[]={};
 		requiredVersion=0.1;
 		units[]={};
 		weapons[]={};
@@ -104,16 +101,11 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Dragon,Dragon,Dragon.paa)
 	NEW_501_Inf_Helm_JLTS(Fixit,Fixit,Fixit.paa)
 	NEW_501_Inf_Helm_JLTS(Legia,Legia,Legia.paa)
-	NEW_501_Inf_Helm_JLTS(Simon,Simon,Simon.paa)
 	NEW_501_Inf_Helm_JLTS(Sour,Sour,Sour.paa)
 	NEW_501_Inf_Helm_JLTS(Adhock,Adhock,Adhock.paa)
-	NEW_501_Inf_Helm_JLTS(Koda,Koda,Koda.paa)
 	NEW_501_Inf_Helm_JLTS(Rebellion,Rebellion,Rebellion.paa)
 	NEW_501_Inf_Helm_JLTS(Dadecoy,Dadecoy,Dadecoy.paa)
 	NEW_501_Inf_Helm_JLTS(Compo,Compo,Compo.paa)
-	NEW_501_Inf_Helm_JLTS(Shape,Shape,Shape.paa)
-	NEW_501_Inf_Helm_JLTS(Drammon,Drammon,Drammon.paa)
-	NEW_501_Inf_Helm_JLTS(Spectre,Spectre,Spectre.paa)
 	NEW_501_Inf_Helm_JLTS(Hackett,Hackett,Hackett.paa)
     NEW_501_Inf_Helm_JLTS(Phoenix,Phoenix,Phoenix.paa)
 	NEW_501_Inf_Helm_JLTS(Storm,Storm,Storm.paa)

addons/RD501_Main/config.cpp

@@ -133,7 +133,7 @@ class Extended_PostInit_EventHandlers {
 
 class cfgFactionClasses
 {
-	class macro_cis_faction
+	class macro_faction(CIS)
 	{
 		displayName="RD501 C.I.S Faction";
 		priority=3;

addons/RD501_Main/config_macros.hpp

@@ -35,7 +35,8 @@
 
 	#define macro_cis_faction MODNAME##_CIS_Faction
 	#define macro_empire_faction MODNAME##_Empire_Faction
-	
+	#define macro_faction(name) MODNAME_##name##_Faction
+
 	#define macro_first_order_faction MODNAME##_First_Order
 	#define macro_ind_faction MODNAME##_Independent_Faction
 	#define macro_civ_faction MODNAME##_Civ_Faction
@@ -75,13 +76,13 @@
 
 //---Patches---
 	#define macro_patch_name(component) MODNAME##_patch_##component
-	#define macro_A3_patch "A3_Data_F_Tank_Loadorder"
-	#define macro_root_req macro_patch_name(main)
-	#define macro_lvl2_req macro_patch_name(weapons),macro_patch_name(jumppack),macro_patch_name(helmets),macro_patch_name(vehicle_weapons)
-	#define macro_lvl3_req macro_patch_name(units),macro_patch_name(vehicles),macro_patch_name(zeus)
-	#define macro_lvl1_req macro_patch_name(particle_effects),RD501_patch_VenatorMK2,macro_patch_name(emp)
-	#define macro_lvl4_req macro_patch_name(droids_config),macro_patch_name(laat_variants)
-	#define macro_lvl5_req macro_patch_name(legacy_classnames)
+	#define macro_A3_patch macro_quote(A3_Data_F_Tank_Loadorder)
+	#define macro_root_req macro_quote(macro_patch_name(main))
+	#define macro_lvl2_req macro_quote(macro_patch_name(weapons)), macro_quote(macro_patch_name(jumppack)), macro_quote(macro_patch_name(helmets)), macro_quote(macro_patch_name(vehicle_weapons))
+	#define macro_lvl3_req macro_quote(macro_patch_name(units)), macro_quote(macro_patch_name(vehicles)), macro_quote(macro_patch_name(zeus))
+	#define macro_lvl1_req macro_quote(macro_patch_name(particle_effects)), macro_quote(RD501_patch_VenatorMK2), macro_quote(macro_patch_name(emp))
+	#define macro_lvl4_req macro_quote(macro_patch_name(droids_config)), macro_quote(macro_patch_name(laat_variants))
+	#define macro_lvl5_req macro_quote(macro_patch_name(legacy_classnames))
 	#define macro_end_patches macro_lvl5_req
 
 	

addons/RD501_Units/opfor/B2/config.cpp

@@ -45,7 +45,7 @@ class CfgVehicles
 	class O_Soldier_F;
 class macro_new_unit_class(opfor,B2_droid_Standard): O_Soldier_F
 	{
-		faction=macro_cis_faction
+		faction=macro_faction(CIS)
 		editorSubcategory=macro_editor_cat(B2)
 		displayname = "B2 Mk2";
 		scope=2;

addons/RD501_Units/opfor/Humans/config.cpp

@@ -29,7 +29,7 @@ class CfgVehicles
 		scope = 2;
 		side=0;
 		backpack="JLTS_Clone_belt_bag";
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(CIS_Humans)
 		cost = 4
 

addons/RD501_Vehicles/air/HMP/common.hpp

@@ -1,4 +1,4 @@
-faction = macro_cis_faction
+faction = macro_faction(CIS);
 editorSubcategory = macro_editor_cat_air(CIS_heli)
 vehicleClass = macro_editor_vehicle_type_air(CIS)
 airBrakeFrictionCoef = 80.4;

addons/RD501_Vehicles/air/Vulture/config.cpp

@@ -99,7 +99,7 @@ class CfgVehicles
 		displayName="CIS Vulture Elite Droid"
 		maxSpeed=750;
 		airBrake=20;
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
 		radarTargetSize = 0.7;
@@ -157,7 +157,7 @@ class CfgVehicles
 		displayName="CIS Vulture Droid"
 		maxSpeed=750;
 		airBrake=20;
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
 		radarTargetSize = 0.7;

addons/RD501_Vehicles/air/drones/config.cpp

@@ -68,7 +68,7 @@ class CfgVehicles
 		altFullForce = 1000;
 		altNoForce = 1100;
 		LODTurnedIn = -1;
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory="EdSubcat_Drones";
 		vehicleClass="Autonomous";
 

addons/RD501_Vehicles/air/hyena/config.cpp

@@ -53,7 +53,7 @@ class CfgPatches
 
 		airBrakeFrictionCoef = 80.4;
 
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
 

addons/RD501_Vehicles/land/AAT/aat_templates.hpp

@@ -6,7 +6,7 @@
 #define AAT_CREW macro_new_unit_class(opfor,B1_crew)
 #define AAT_VEHICLE_CLASS macro_editor_vehicle_type(tank)
 #define AAT_EDITOR_CATEGORY macro_editor_cat(tank)
-#define AAT_FACTION macro_cis_faction
+#define AAT_FACTION macro_faction(CIS)
 #define AAT_WEAPON_ROTATION \
 minElev = -10;\
 maxElev = 40;\

addons/RD501_Vehicles/land/AAT/common.hpp

@@ -6,7 +6,7 @@
 
 		crew=macro_new_unit_class(opfor,B1_crew)
 		
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
 

addons/RD501_Vehicles/land/ADSD/config.cpp

@@ -61,7 +61,7 @@ class CfgVehicles
         displayName = "CIS ADSD";
         crew = macro_new_unit_class(opfor,B1_crew)
         side = 0;
-        faction = macro_cis_faction
+        faction = macro_faction(CIS);
         editorSubcategory = macro_editor_cat(tank)
         vehicleClass = macro_editor_vehicle_type(tank)
         scope = 2;

addons/RD501_Vehicles/land/GAT/config.cpp

@@ -120,7 +120,7 @@ class CfgVehicles
 		displayName = "CIS GAT"
 		crew = macro_new_unit_class(opfor,B1_crew)
         side = 0;
-        faction = macro_cis_faction
+        faction = macro_faction(CIS);
         editorSubcategory = macro_editor_cat(tank)
         vehicleClass = macro_editor_vehicle_type(tank)
         scopeCurator = 2;
@@ -265,7 +265,7 @@ class CfgVehicles
 		displayName = "CIS GAT AA"
 		crew = macro_new_unit_class(opfor,B1_crew)
         side = 0;
-        faction = macro_cis_faction
+        faction = macro_faction(CIS);
         editorSubcategory = macro_editor_cat(AA)
         vehicleClass = macro_editor_vehicle_type(AA)
         scopeCurator = 2;

addons/RD501_Vehicles/land/Hailfire/config.cpp

@@ -81,7 +81,7 @@ class Tank_F: Tank {
 		side=0;
 		scopeCurator=2;
 		forceInGarage = 1;
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(APC)
 		vehicleClass = macro_editor_vehicle_type(APC)
 		crew=macro_new_unit_class(opfor,B1_crew)
@@ -115,7 +115,7 @@ class Tank_F: Tank {
 		side=0;
 		scopeCurator=2;
 		forceInGarage = 1;
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(APC)
 		vehicleClass = macro_editor_vehicle_type(APC)
 		crew=macro_new_unit_class(opfor,B1_crew)

addons/RD501_Vehicles/land/Loyalist/config.cpp

@@ -52,7 +52,7 @@ class CfgVehicles
 		side = 0;
 		crew=macro_new_unit_class(opfor,human_rifleman)
 
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(car)
 		vehicleClass = macro_editor_vehicle_type(Car)
 		class Turrets: Turrets
@@ -132,7 +132,7 @@ class CfgVehicles
 		enginePower=422.5;
 		peakTorque=2433.75;
 		armor=380;
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(APC)
 		vehicleClass = macro_editor_vehicle_type(APC)
 		class Turrets: Turrets
@@ -198,7 +198,7 @@ class CfgVehicles
 
 		enginePower=585;
 		peakTorque=3610;
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(APC)
 		vehicleClass = macro_editor_vehicle_type(APC)
 		hiddenSelectionsTextures[]=

addons/RD501_Vehicles/land/MTT/config.cpp

@@ -51,7 +51,7 @@ class CfgVehicles
 		scopeCurator=2;
 		armor=4000;
 
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
 

addons/RD501_Vehicles/land/Praetorian/config.cpp

@@ -117,7 +117,7 @@ class CfgVehicles
 		irTargetSize = 0;
 		countermeasureActivationRadius = 2000;
 
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(AA)
 		vehicleClass = macro_editor_vehicle_type(AA)
 		//faction = "RD501FactionOpfor";

addons/RD501_Vehicles/land/droideka/config.cpp

@@ -34,7 +34,7 @@ class CfgVehicles
 		displayName = "Static Droideka";
 		class EventHandlers: DefaultEventhandlers {}; 
 
-		faction = macro_cis_faction;
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(heavy_armored_infantry);
 		vehicleClass = macro_editor_vehicle_type(heavy_armored_infantry);
 		ace_dragging_canCarry = 0;

addons/RD501_Vehicles/land/dwarf_spider_droid/config.cpp

@@ -79,7 +79,7 @@ class CfgVehicles
 		forceInGarage = 1;
 
 		class EventHandlers: DefaultEventhandlers {}; 
-		faction = macro_cis_faction;
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(heavy_armored_infantry);
 		vehicleClass = macro_editor_vehicle_type(heavy_armored_infantry);
 		ace_dragging_canCarry = 0;
@@ -216,7 +216,7 @@ class CfgVehicles
 		class EventHandlers: DefaultEventhandlers {}; 
 		ace_dragging_canCarry = 0;
 		ace_dragging_canDrag = 0;
-		faction = macro_cis_faction;
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(heavy_armored_infantry);
 		vehicleClass = macro_editor_vehicle_type(heavy_armored_infantry);
 		class Turrets: Turrets

addons/RD501_Vehicles/land/heavy_ordinance_tank/config.cpp

@@ -52,7 +52,7 @@ class CfgVehicles
 		side=0;
 		scopeCurator=2;
 
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(arty)
 		vehicleClass = macro_editor_vehicle_type(arty)
 

addons/RD501_Vehicles/land/homing_spider_droid/config.cpp

@@ -53,7 +53,7 @@ class CfgVehicles
 		author= "RD501";
 		displayName="OG-10 H.S.D 'The Eye'";
 
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(turrets)
 		vehicleClass = macro_editor_vehicle_type(turrets)
 		

addons/RD501_Vehicles/land/jammer_truck/config.cpp

@@ -32,7 +32,7 @@ class CfgVehicles
         displayName = "CIS Enigma (Jammer)";
         crew = macro_new_unit_class(opfor,B1_crew)
         side = 0;
-        faction = macro_cis_faction
+        faction = macro_faction(CIS);
         editorSubcategory = macro_editor_cat(car)
         vehicleClass = macro_editor_vehicle_type(Car)
         scope = 2;

addons/RD501_Vehicles/land/light_infantry_transport/config.cpp

@@ -51,7 +51,7 @@ class CfgVehicles
 		forceInGarage = 1;
 		displayName="CIS Tempest"
 		crew=macro_new_unit_class(opfor,B1_crew)
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
         editorSubcategory = macro_editor_cat(car)
         vehicleClass = macro_editor_vehicle_type(Car)
 

addons/RD501_Vehicles/land/static_cis/config.cpp

@@ -68,7 +68,7 @@ class CfgVehicles
 		displayname = "CIS Field Cannon";
 		scopeCurator = 2;
 		crew=macro_new_unit_class(opfor,B1_crew)
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(turrets)
 		vehicleClass = macro_editor_vehicle_type(turrets)
 		ace_dragging_canCarry = 0;
@@ -186,7 +186,7 @@ class CfgVehicles
 		displayname = "CIS Field Repeater";
 		scopeCurator = 2;
 		crew=macro_new_unit_class(opfor,B1_crew)
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(turrets)
 		vehicleClass = macro_editor_vehicle_type(turrets)
 		class Turrets: Turrets
@@ -321,7 +321,7 @@ class CfgVehicles
 		displayname = "CIS Field Mortar";
 		scopeCurator = 2;
 		crew=macro_new_unit_class(opfor,B1_crew)
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		editorSubcategory = macro_editor_cat(arty)
 		vehicleClass = macro_editor_vehicle_type(arty)
 	}

addons/RD501_Vehicles/sea/speed_boat/config.cpp

@@ -60,7 +60,7 @@ class CfgVehicles
 		displayName = "Speedboat CIS";
 		_generalMacro = macro_new_vehicle(speedboat,cis)
 		scope=2;
-		faction = macro_cis_faction
+		faction = macro_faction(CIS);
 		// editorSubcategory = macro_editor_cat(tank)
 		// vehicleClass = macro_editor_vehicle_type(tank)
 		side=0;