Merge pull request #148 from ARCOMM/arcMiscV2Update

Framework update for Arc Misc 2.0
ARCOMM · Oct 15, 2024 · 17d5d35 · 17d5d35
2 parents 999956a + 8cbe4b0
commit 17d5d35
Show file tree

Hide file tree

Showing 9 changed files with 3,963 additions and 26,756 deletions.
diff --git a/.version.html b/.version.html
@@ -5,6 +5,6 @@
 
 <body>
 <p>
-Latest version: v4.0.2  
+Latest version: v5.0.0
 </p>
 </body>
diff --git a/ARCMT.vr/briefing/admin.sqf → ...eWithNoSpace_Author.vr/briefing/admin.sqf b/ARCMT.vr/briefing/admin.sqf → ...eWithNoSpace_Author.vr/briefing/admin.sqf
diff --git a/ARCMT.vr/briefing/briefing_blu.sqf → ...Space_Author.vr/briefing/briefing_blu.sqf b/ARCMT.vr/briefing/briefing_blu.sqf → ...Space_Author.vr/briefing/briefing_blu.sqf
diff --git a/ARCMT.vr/briefing/briefing_ind.sqf → ...Space_Author.vr/briefing/briefing_ind.sqf b/ARCMT.vr/briefing/briefing_ind.sqf → ...Space_Author.vr/briefing/briefing_ind.sqf
diff --git a/ARCMT.vr/briefing/briefing_opf.sqf → ...Space_Author.vr/briefing/briefing_opf.sqf b/ARCMT.vr/briefing/briefing_opf.sqf → ...Space_Author.vr/briefing/briefing_opf.sqf
diff --git a/ARCMT.vr/cba_settings.sqf → ...ameWithNoSpace_Author.vr/cba_settings.sqf b/ARCMT.vr/cba_settings.sqf → ...ameWithNoSpace_Author.vr/cba_settings.sqf
diff --git a/ARCMT.vr/description.ext → ...NameWithNoSpace_Author.vr/description.ext b/ARCMT.vr/description.ext → ...NameWithNoSpace_Author.vr/description.ext
@@ -24,23 +24,11 @@ class CfgDebriefing {
 };
 
 // DO NOT REMOVE. Include the macros for custom loadouts.
-#include "\x\arc_misc\addons\tmf_loadouts\macros.inc"
+#include "\z\arc_tmf\addons\loadout\macros.inc"
 
 class CfgLoadouts {
 	class EXAMPLE_LOADOUT {
 		displayName = "Example Loadout";
 		#include "loadouts\example_loadout.hpp"
 	};
-
-	// Example import and modification of loadout
-	import BLU_F from CfgLoadouts;
-	class BLU_F: BLU_F {
-		// Add some explosives to the engineer
-		class eng: eng {
-			backpackitems[] += {
-				"SatchelCharge_Remote_Mag",
-				LIST_3("DemoCharge_Remote_Mag")
-			};
-		};
-	};
 };
diff --git a/ARCMT.vr/loadouts/example_loadout.hpp → ...ce_Author.vr/loadouts/example_loadout.hpp b/ARCMT.vr/loadouts/example_loadout.hpp → ...ce_Author.vr/loadouts/example_loadout.hpp
@@ -36,7 +36,8 @@ class baseMan {// Weaponless baseclass
 	items[] = {
 		MEDICAL_R,
 		"ACE_EntrenchingTool",
-		LIST_3("ACE_CableTie")
+		LIST_3("ACE_CableTie"),
+		"ACE_Canteen"
 	};
 	// These are added directly into their respective slots
 	linkedItems[] = {
@@ -106,7 +107,10 @@ class smg : r {
 		LIST_2("HandGrenade"),
 		LIST_2("SmokeShell")
 	};
-	items[] = { MEDICAL_R };
+	items[] = {
+		MEDICAL_R,
+		"ACE_Canteen"
+	};
 };
 
 class ftl : g {
@@ -170,7 +174,8 @@ class ar : r {
 class aar : r {
 	displayName = "Assistant Automatic Rifleman";
 	backpackItems[] = {
-		LIST_4("100Rnd_65x39_caseless_mag")
+		LIST_4("100Rnd_65x39_caseless_mag"),
+		"ACE_SpareBarrel"
 	};
 	linkedItems[] += {"Binocular"};
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,6 @@ @@
     <body>
     <p>
-    Latest version: v4.0.2
+    Latest version: v5.0.0
     </p>
     </body>