Merge pull request #22 from 501st-Aux-Mod-Team/add-infantry-platoon-markers

Add GI Platoon Markers

addons - Copy/RD501_Markers/config.cpp

@@ -1,335 +1,57 @@
+
+/*
+* Structure:
+* - ui/markers/logo/some_fixed_colour_logo.paa
+* - ui/markers/outline/some_variable_colour_outline.paa
+*/
+#include "rd501_marker_macros.hpp"
 class CfgPatches
 {
-	class 501stMarkers
+	class RD501_Markers
 	{
-		author = "Purdy";
-		name = "501st Markers";
-		requiredaddons[] = {};
-		requiredversion = 0.1;
+		author = "m3ales";
+		name = "501st Legion Map Markers";
+		requiredversion =0.1;
 		units[] = {};
 		weapons[] = {};
+		requiredaddons[] = 
+		{
+			"A3_Characters_F",
+			"A3_soft_f"
+		};
 	};
 };
-class CfgMarkers
+class CfgMarkerClasses
 {
-	class 501st_Marker
-	{
-		name = "501st";
-		icon = "RD501_Markers\markers\501st.paa";
-		color[] = {1,1,1,1};
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class AvalancheHQ_Marker
-	{
-		name = "Avalanche Company";
-		icon = "RD501_Markers\markers\AvalancheHQ.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Avalanche1_Marker
-	{
-		name = "Avalanche 1st Platoon";
-		icon = "RD501_Markers\markers\Avalanche1.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Avalanche2_Marker
-	{
-		name = "Avalanche 2nd Platoon";
-		icon = "RD501_Markers\markers\Avalanche2.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Kryat_Marker
-	{
-		name = "Kryat";
-		icon = "RD501_Markers\markers\Kryat.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Cyclone_Marker
-	{
-		name = "Cyclone Company";
-		icon = "RD501_Markers\markers\Cyclone.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Cyclone1_Marker
-	{
-		name = "Cyclone 1st Platoon";
-		icon = "RD501_Markers\markers\Cyclone1.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Cyclone3_Marker
-	{
-		name = "Cyclone 3rd Platoon";
-		icon = "RD501_Markers\markers\Cyclone3.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Acklay_Marker
-	{
-		name = "Acklay";
-		icon = "RD501_Markers\markers\Acklay.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Mynock_Marker
-	{
-		name = "Mynock";
-		icon = "RD501_Markers\markers\Mynock.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Razor_Marker
-	{
-		name = "Razor";
-		icon = "RD501_Markers\markers\Razor.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Zeta_Marker
-	{
-		name = "Zeta";
-		icon = "RD501_Markers\markers\Zeta.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class RTO_Marker
-	{
-		name = "RTO";
-		icon = "RD501_Markers\markers\Radio2.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Medic_Marker
-	{
-		name = "Medic";
-		icon = "RD501_Markers\markers\Medic.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class LAAT_Marker
-	{
-		name = "LAAT";
-		icon = "RD501_Markers\markers\LAAT.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class ARC170_Marker
-	{
-		name = "Arc-170";
-		icon = "RD501_Markers\markers\Arc170.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Saber_Marker
-	{
-		name = "Saber";
-		icon = "RD501_Markers\markers\Saber.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
+	// Used to group markers and provide ordering in the marker dropdown -- is alphabetical
+	class RD501_unitMarkers{
+		displayname="RD501 Markers";
 	};
-	class CIS_Marker
-	{
-		name = "CIS";
-		icon = "RD501_Markers\markers\CIS.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class B1_Marker
-	{
-		name = "B1";
-		icon = "RD501_Markers\markers\B1.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class B1Heavy_Marker
-	{
-		name = "B1 Heavy";
-		icon = "RD501_Markers\markers\B1Heavy.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Indepent_Marker
-	{
-		name = "B1 Independent";
-		icon = "RD501_Markers\markers\IndepentB1.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class B2_Marker
-	{
-		name = "B2";
-		icon = "RD501_Markers\markers\B2.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class BX_Marker
-	{
-		name = "BX";
-		icon = "RD501_Markers\markers\BX.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Magna_Marker
-	{
-		name = "Magna";
-		icon = "RD501_Markers\markers\Magna.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class DSD_Marker
-	{
-		name = "DSD";
-		icon = "RD501_Markers\markers\DSD.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Deka_Marker
-	{
-		name = "Deka";
-		icon = "RD501_Markers\markers\Deka.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class HMP_Marker
-	{
-		name = "HMP";
-		icon = "RD501_Markers\markers\HMP.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class Vulture_Marker
-	{
-		name = "Vulture";
-		icon = "RD501_Markers\markers\Vulture.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class AAT_Marker
-	{
-		name = "AAT";
-		icon = "RD501_Markers\markers\AAT.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class KingAAT_Marker
-	{
-		name = "King AAT";
-		icon = "RD501_Markers\markers\KingAAT.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class MTT_Marker
-	{
-		name = "MTT";
-		icon = "RD501_Markers\markers\MTT.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-	class TomasTheMTT_Marker
-	{
-		name = "Tomas The MTT";
-		icon = "RD501_Markers\markers\TomasTheMTT.paa";
-		color[] = { 1,1,1,1 };
-		size = 32;
-		shadow = 0;
-		scope = 2;
-		markerClass = "501st Markers";
-	};
-};
+};
+class CfgMarkers
+{
+	// Default Emblem Size
+	#define RD501_MARKERS_EMBLEM_SIZE 48
+
+	// Marker definitions, ensure link to marker CfgMarker
+	// Avalanche Company Markers [Colourable]
+	RD501_MARKER_ANYCOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(avalanche_1,outline),"Avalanche 1",RD501_MARKER_OUTLINE_PATH(avalanche_1),RD501_MARKERS_EMBLEM_SIZE);
+	RD501_MARKER_ANYCOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(avalanche_2,outline),"Avalanche 2",RD501_MARKER_OUTLINE_PATH(avalanche_2),RD501_MARKERS_EMBLEM_SIZE);
+	RD501_MARKER_ANYCOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(avalanche_3,outline),"Avalanche 3",RD501_MARKER_OUTLINE_PATH(avalanche_3),RD501_MARKERS_EMBLEM_SIZE);
+
+	// Cyclone Company Markers [Colourable]
+	RD501_MARKER_ANYCOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(cyclone_1,outline),"Cyclone 1",RD501_MARKER_OUTLINE_PATH(cyclone_1),RD501_MARKERS_EMBLEM_SIZE);
+	RD501_MARKER_ANYCOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(cyclone_2,outline),"Cyclone 2",RD501_MARKER_OUTLINE_PATH(cyclone_2),RD501_MARKERS_EMBLEM_SIZE);
+	RD501_MARKER_ANYCOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(cyclone_3,outline),"Cyclone 3",RD501_MARKER_OUTLINE_PATH(cyclone_3),RD501_MARKERS_EMBLEM_SIZE);
+
+	// Avalanche Company Logos [Fixed Colour]
+	RD501_MARKER_SOURCECOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(avalanche_1,logo),"Avalanche 1 Logo",RD501_MARKER_LOGO_PATH(avalanche_1),RD501_MARKERS_EMBLEM_SIZE);
+	RD501_MARKER_SOURCECOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(avalanche_2,logo),"Avalanche 2 Logo",RD501_MARKER_LOGO_PATH(avalanche_2),RD501_MARKERS_EMBLEM_SIZE);
+	RD501_MARKER_SOURCECOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(avalanche_3,logo),"Avalanche 3 Logo",RD501_MARKER_LOGO_PATH(avalanche_3),RD501_MARKERS_EMBLEM_SIZE);
+	
+	// Cyclone Company Logos [Fixed Colour]
+	RD501_MARKER_SOURCECOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(cyclone_1,logo),"Cyclone 1 Logo",RD501_MARKER_LOGO_PATH(cyclone_1),RD501_MARKERS_EMBLEM_SIZE);
+	RD501_MARKER_SOURCECOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(cyclone_2,logo),"Cyclone 2 Logo",RD501_MARKER_LOGO_PATH(cyclone_2),RD501_MARKERS_EMBLEM_SIZE);
+	RD501_MARKER_SOURCECOLOUR_NOSHADOW_GROUPED_PUBLIC(RD501_MARKER_CLASSNAME(cyclone_3,logo),"Cyclone 3 Logo",RD501_MARKER_LOGO_PATH(cyclone_3),RD501_MARKERS_EMBLEM_SIZE);
+};
+

addons - Copy/RD501_Markers/rd501_marker_macros.hpp

@@ -0,0 +1,33 @@
+
+#ifndef RD501_MARKER_CONFIG_MACROS
+#define RD501_MARKER_CONFIG_MACROS
+#define RD501_MARKER_ADDON RD501_Markers
+#define RD501_MARKER_QUOTE(target) #target
+#define RD501_MARKER_CONCAT(a,b) a##b
+//Convention: ui\markers\outline\rd501_marker_name_outline.paa
+#define RD501_MARKER_OUTLINE_PATH(name) RD501_MARKER_CONCAT(RD501_MARKER_ADDON,RD501_MARKER_CONCAT(\ui\markers\outline\rd501_marker_,RD501_MARKER_CONCAT(name,_outline.paa)))
+//Convention: ui\markers\logo\rd501_marker_name_logo.paa
+#define RD501_MARKER_LOGO_PATH(name) RD501_MARKER_CONCAT(RD501_MARKER_ADDON,RD501_MARKER_CONCAT(\ui\markers\logo\rd501_marker_,RD501_MARKER_CONCAT(name,_logo.paa)))
+#define RD501_MARKER_ARR_4(a,b,c,d) a, b, c, d
+//CfgMarker class, accepts typical vars and sets them, is wrapped by others below
+#define RD501_MARKER_CLASS_BASE(className,displayName,iconPath,hasShadow,markerSize,markerColour,markerGroup,markerScope) class className\
+	{\
+		name = displayName;\
+		icon = iconPath;\
+		texture = iconPath;\
+		color[] = markerColour;\
+		size = markerSize;\
+		shadow = hasShadow;\
+		markerClass = markerGroup;\
+		scope = markerScope;\
+	}
+// Group used for ordering in the marker menu
+#define RD501_MARKER_GROUP RD501_unitMarkers
+#define RD501_MARKER_GROUP_QUOTED RD501_MARKER_QUOTE(RD501_MARKER_GROUP)
+// SOURCECOLOUR -> Logos, things that need to keep their colour, generally only are white.
+// RD501_Marker_name_type
+#define RD501_MARKER_CLASSNAME(name,type) RD501_MARKER_CONCAT(RD501_Marker_,RD501_MARKER_CONCAT(name,RD501_MARKER_CONCAT(_,type)))
+#define RD501_MARKER_SOURCECOLOUR_NOSHADOW_GROUPED_PUBLIC(className,displayName,iconPath,markerSize) RD501_MARKER_CLASS_BASE(className,displayName,iconPath,false,markerSize,{RD501_MARKER_ARR_4(0,0,0,1)},RD501_MARKER_GROUP_QUOTED,2)
+// ANYCOLOUR -> Normal Map Markers, things that are colourable, or atleast survive being coloured well.
+#define RD501_MARKER_ANYCOLOUR_NOSHADOW_GROUPED_PUBLIC(className,displayName,iconPath,markerSize) RD501_MARKER_CLASS_BASE(className,displayName,iconPath,false,markerSize,{RD501_MARKER_ARR_4(0,0,0,1)},RD501_MARKER_GROUP_QUOTED,2)
+#endif