diff --git a/.github/release_drafter.yml b/.github/release_drafter.yml index d5bd4b8..2b46fad 100644 --- a/.github/release_drafter.yml +++ b/.github/release_drafter.yml @@ -1,7 +1,7 @@ branches: - master -name-template: "a3f_factions_v$NEXT_PATCH_VERSION" +name-template: "forge_factions_v$NEXT_PATCH_VERSION" tag-template: "$NEXT_PATCH_VERSION" categories: diff --git a/.hemtt/project.toml b/.hemtt/project.toml index 6557aa2..607441f 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -1,6 +1,6 @@ name = "FORGE Factions" author = "IDSolutions" -prefix = "a3f_factions" +prefix = "forge_factions" mainprefix = "z" [files] diff --git a/addons/main/$PBOPREFIX$ b/addons/main/$PBOPREFIX$ index 7c12866..b19683d 100644 --- a/addons/main/$PBOPREFIX$ +++ b/addons/main/$PBOPREFIX$ @@ -1 +1 @@ -z\a3f_factions\addons\main \ No newline at end of file +z\forge_factions\addons\main \ No newline at end of file diff --git a/addons/main/CfgMods.hpp b/addons/main/CfgMods.hpp index 55e4ff2..33a498a 100644 --- a/addons/main/CfgMods.hpp +++ b/addons/main/CfgMods.hpp @@ -1,6 +1,6 @@ class CfgMods { class PREFIX { - dir = "@a3f_factions"; + dir = "@forge_factions"; name = "FORGE Factions"; author = "IDSolutions"; picture = "A3\Ui_f\data\Logos\arma3_expansion_alpha_ca"; @@ -8,7 +8,7 @@ class CfgMods { hidePicture = "false"; action = "https://innovativedevsolutions.org"; actionName = "Website"; - description = "Innovative Dev Solutions"; + description = "FORGE Factions - Version 1.0.0"; dlcColor[] = {0.45, 0.47, 0.41, 1}; }; }; \ No newline at end of file diff --git a/addons/main/README.md b/addons/main/README.md index c3c9968..310094e 100644 --- a/addons/main/README.md +++ b/addons/main/README.md @@ -1,4 +1,4 @@ -a3f_factions_main +forge_factions_main ======== Backbone of other components, defining most of the commonly used macros. \ No newline at end of file diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index 167e4a7..e492b44 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -1,5 +1,5 @@ #define MAINPREFIX z -#define PREFIX a3f_factions +#define PREFIX forge_factions #include "script_version.hpp" @@ -9,7 +9,7 @@ #define REQUIRED_VERSION 2.12 #ifdef COMPONENT_BEAUTIFIED - #define COMPONENT_NAME QUOTE(IDS Factions - COMPONENT_BEAUTIFIED) + #define COMPONENT_NAME QUOTE(FORGE Factions - COMPONENT_BEAUTIFIED) #else - #define COMPONENT_NAME QUOTE(IDS Factions - COMPONENT) + #define COMPONENT_NAME QUOTE(FORGE Factions - COMPONENT) #endif \ No newline at end of file diff --git a/addons/pmc/$PBOPREFIX$ b/addons/pmc/$PBOPREFIX$ index e78170d..3e32577 100644 --- a/addons/pmc/$PBOPREFIX$ +++ b/addons/pmc/$PBOPREFIX$ @@ -1 +1 @@ -z\a3f_factions\addons\pmc \ No newline at end of file +z\forge_factions\addons\pmc \ No newline at end of file diff --git a/addons/pmc/CfgOrbat.hpp b/addons/pmc/CfgOrbat.hpp index b8e99cd..320d770 100644 --- a/addons/pmc/CfgOrbat.hpp +++ b/addons/pmc/CfgOrbat.hpp @@ -1,11 +1,11 @@ class CfgOrbat { class FORGE { - class A3F_Base { + class FORGE_Base { side = "West"; color[] = {0,0,0,1}; }; - class A3F_Departments_Base: A3F_Base { + class FORGE_Departments_Base: FORGE_Base { type = "HQ"; text = "FORGE PMC Departments"; textShort = "Departments"; @@ -13,7 +13,7 @@ class CfgOrbat { description = "FORGE PMC Departments."; }; - class A3F_Loki_Base: A3F_Base { + class FORGE_Loki_Base: FORGE_Base { type = "Recon"; size = "FireTeam"; description = "FORGE Element: LOKI"; @@ -21,18 +21,18 @@ class CfgOrbat { textShort = "LOKI"; }; - class A3F_CompanyHome { + class FORGE_CompanyHome { side = "West"; type = "HQ"; text = "FORGE Private Military Company"; textShort = "FORGE PMC"; - assets[] = {"B_A3F_suburban_PMC_01", "B_A3F_tahoe_UNM_PMC_01"}; + assets[] = {"B_FORGE_suburban_PMC_01", "B_FORGE_tahoe_UNM_PMC_01"}; color[] = {0,0,0,1}; description = "FORGE PMC Orbat Groups."; - subordinates[] = {"A3F_ShareHolders", "A3F_ExecutiveMembers", "A3F_Departments"}; + subordinates[] = {"FORGE_ShareHolders", "FORGE_ExecutiveMembers", "FORGE_Departments"}; }; - class A3F_ShareHolders { + class FORGE_ShareHolders { side = "West"; type = "HQ"; text = "FORGE PMC Shareholders"; @@ -41,7 +41,7 @@ class CfgOrbat { color[] = {0,0,0,1}; description = "FORGE PMC Shareholders."; }; - class A3F_ExecutiveMembers { + class FORGE_ExecutiveMembers { side = "West"; type = "HQ"; text = "FORGE PMC Executive Members"; @@ -51,7 +51,7 @@ class CfgOrbat { description = "FORGE PMC Executive Members."; }; - class A3F_Departments { + class FORGE_Departments { side = "West"; type = "HQ"; text = "FORGE PMC Departments"; @@ -59,75 +59,75 @@ class CfgOrbat { assets[] = {}; color[] = {0,0,0,1}; description = "FORGE PMC Departments."; - subordinates[] = {"A3F_DepartmentsOperations", "A3F_DepartmentsPersonnel", "A3F_DepartmentsTech", "A3F_DepartmentsMedia"}; + subordinates[] = {"FORGE_DepartmentsOperations", "FORGE_DepartmentsPersonnel", "FORGE_DepartmentsTech", "FORGE_DepartmentsMedia"}; }; - class A3F_DepartmentsOperations: A3F_Departments_Base { + class FORGE_DepartmentsOperations: FORGE_Departments_Base { text = "Operations Department"; textShort = "Operations Dept."; - subordinates[] = {"A3F_Command", "A3F_DepartmentsOperationsContracts"}; + subordinates[] = {"FORGE_Command", "FORGE_DepartmentsOperationsContracts"}; }; - class A3F_DepartmentsOperationsContracts: A3F_Departments_Base { + class FORGE_DepartmentsOperationsContracts: FORGE_Departments_Base { text = "Contract Acquisition"; textShort = "Contract Acquisition"; type = "Unknown"; }; - class A3F_DepartmentsPersonnel: A3F_Departments_Base { + class FORGE_DepartmentsPersonnel: FORGE_Departments_Base { text = "Personnel Department"; textShort = "Personnel Dept."; - subordinates[] = {"A3F_DepartmentsPersonnelTraining", "A3F_DepartmentsPersonnelEmployeeCare", "A3F_DepartmentsPersonnelPayroll"}; + subordinates[] = {"FORGE_DepartmentsPersonnelTraining", "FORGE_DepartmentsPersonnelEmployeeCare", "FORGE_DepartmentsPersonnelPayroll"}; }; - class A3F_DepartmentsPersonnelTraining: A3F_Departments_Base { + class FORGE_DepartmentsPersonnelTraining: FORGE_Departments_Base { text = "Training"; textShort = "Training"; type = "Unknown"; }; - class A3F_DepartmentsPersonnelEmployeeCare: A3F_Departments_Base { + class FORGE_DepartmentsPersonnelEmployeeCare: FORGE_Departments_Base { text = "Employee Care"; textShort = "Employee Care"; type = "Unknown"; }; - class A3F_DepartmentsPersonnelPayroll: A3F_Departments_Base { + class FORGE_DepartmentsPersonnelPayroll: FORGE_Departments_Base { text = "Payroll"; textShort = "Payroll"; type = "Unknown"; }; - class A3F_DepartmentsTech: A3F_Departments_Base { + class FORGE_DepartmentsTech: FORGE_Departments_Base { text = "Tech Department"; textShort = "Tech Dept."; - subordinates[] = {"A3F_DepartmentsTechWeaponMaintenance", "A3F_DepartmentsTechResearchDevelopment"}; + subordinates[] = {"FORGE_DepartmentsTechWeaponMaintenance", "FORGE_DepartmentsTechResearchDevelopment"}; }; - class A3F_DepartmentsTechWeaponMaintenance: A3F_Departments_Base { + class FORGE_DepartmentsTechWeaponMaintenance: FORGE_Departments_Base { text = "Weapon Maintenance"; textShort = "Weapon Maint."; type = "Unknown"; }; - class A3F_DepartmentsTechResearchDevelopment: A3F_Departments_Base { + class FORGE_DepartmentsTechResearchDevelopment: FORGE_Departments_Base { text = "Research and Development"; textShort = "R&D"; type = "Unknown"; }; - class A3F_DepartmentsMedia: A3F_Departments_Base { + class FORGE_DepartmentsMedia: FORGE_Departments_Base { text = "Media Department"; textShort = "Media Dept."; - subordinates[] = {"A3F_DepartmentsMediaCompanyRelations", "A3F_DepartmentsMediaNationalOutreach"}; + subordinates[] = {"FORGE_DepartmentsMediaCompanyRelations", "FORGE_DepartmentsMediaNationalOutreach"}; }; - class A3F_DepartmentsMediaCompanyRelations: A3F_Departments_Base { + class FORGE_DepartmentsMediaCompanyRelations: FORGE_Departments_Base { text = "Company Relations"; textShort = "Company Relations"; type = "Unknown"; }; - class A3F_DepartmentsMediaNationalOutreach: A3F_Departments_Base { + class FORGE_DepartmentsMediaNationalOutreach: FORGE_Departments_Base { text = "National Outreach"; textShort = "National Outreach"; type = "Unknown"; }; - class A3F_Command: A3F_Base { + class FORGE_Command: FORGE_Base { side = "West"; type = "HQ"; size = "Company"; @@ -135,16 +135,16 @@ class CfgOrbat { textShort = "FORGE Command"; color[] = {0,0,0,1}; description = "FORGE Command Group"; - subordinates[] = {"A3F_Loki_Command"}; + subordinates[] = {"FORGE_Loki_Command"}; }; - class A3F_Loki_Command: A3F_Loki_Base { + class FORGE_Loki_Command: FORGE_Loki_Base { size = "Brigade"; - // insignia = "\z\a3f_factions\addons\pmc\data\a3f_armpatch.paa"; + // insignia = "\z\forge_factions\addons\pmc\data\forge_armpatch.paa"; // texture = ""; - subordinates[] = {"A3F_Loki_Team1", "A3F_Loki_Team2", "A3F_Loki_Team3"}; + subordinates[] = {"FORGE_Loki_Team1", "FORGE_Loki_Team2", "FORGE_Loki_Team3"}; }; - class A3F_Loki_Team1: A3F_Loki_Base { + class FORGE_Loki_Team1: FORGE_Loki_Base { text = "Field Operatives"; TextShort = "Field Operatives"; size = "Squad"; @@ -152,13 +152,13 @@ class CfgOrbat { commander = "J. Schmidt"; commanderRank = "Captain"; }; - class A3F_Loki_Team2: A3F_Loki_Base { + class FORGE_Loki_Team2: FORGE_Loki_Base { text = "Intelligence Analysts"; TextShort = "Intelligence Analysts"; size = "Squad"; type = "Unknown"; }; - class A3F_Loki_Team3: A3F_Loki_Base { + class FORGE_Loki_Team3: FORGE_Loki_Base { text = "Strike Team Echo"; TextShort = "Strike Team Echo"; size = "Squad"; diff --git a/addons/pmc/CfgVehicles.hpp b/addons/pmc/CfgVehicles.hpp index 9ca0aa2..480901b 100644 --- a/addons/pmc/CfgVehicles.hpp +++ b/addons/pmc/CfgVehicles.hpp @@ -13,14 +13,19 @@ respawnItems[] = {}; \ linkedItems[] = {}; \ respawnLinkedItems[] = {}; \ + facewear = ""; \ + allowedFacewear[] = {}; \ + allowedHeadgear[] = {}; \ + allowedHeadgearB[] = {}; \ + headgearList[] = {}; \ DLC = QUOTE(PREFIX); \ tLightInfluence = 0.015; \ - class Eventhandlers; + class EventHandlers; class CfgVehicles { class Man; class CAManBase: Man { - class Eventhandlers; + class EventHandlers; class ACE_Actions; class ACE_SelfActions; }; @@ -34,27 +39,27 @@ class CfgVehicles { class CLASS(Unit_Combat_LS_PMC_RGR): CLASS(Unit_Combat_LS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_LS_PMC_RGR); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; }; class CLASS(Unit_Combat_LS_PMC_TN): CLASS(Unit_Combat_LS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_LS_PMC_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; }; class CLASS(Unit_Combat_LS_PMC_BLK_TN): CLASS(Unit_Combat_LS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_LS_PMC_BLK_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; }; class CLASS(Unit_Combat_LS_PMC_RGR_TN): CLASS(Unit_Combat_LS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_LS_PMC_RGR_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; }; class CLASS(Unit_Combat_LS_PMC_BLK): CLASS(Unit_Combat_LS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_LS_PMC_BLK); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; }; class B_CTRG_Soldier_2_F; @@ -65,27 +70,27 @@ class CfgVehicles { class CLASS(Unit_Combat_TS_PMC_RGR): CLASS(Unit_Combat_TS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_TS_PMC_RGR); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; }; class CLASS(Unit_Combat_TS_PMC_TN): CLASS(Unit_Combat_TS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_TS_PMC_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; }; class CLASS(Unit_Combat_TS_PMC_BLK_TN): CLASS(Unit_Combat_TS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_TS_PMC_BLK_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; }; class CLASS(Unit_Combat_TS_PMC_RGR_TN): CLASS(Unit_Combat_TS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_TS_PMC_RGR_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; }; class CLASS(Unit_Combat_TS_PMC_BLK): CLASS(Unit_Combat_TS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_TS_PMC_BLK); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa","\A3\Characters_F\Common\Data\basicbody_black_co.paa"}; }; class B_CTRG_Soldier_3_F; @@ -96,27 +101,27 @@ class CfgVehicles { class CLASS(Unit_Combat_RS_PMC_RGR): CLASS(Unit_Combat_RS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_RS_PMC_RGR); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; }; class CLASS(Unit_Combat_RS_PMC_TN): CLASS(Unit_Combat_RS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_RS_PMC_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; }; class CLASS(Unit_Combat_RS_PMC_BLK_TN): CLASS(Unit_Combat_RS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_RS_PMC_BLK_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; }; class CLASS(Unit_Combat_RS_PMC_RGR_TN): CLASS(Unit_Combat_RS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_RS_PMC_RGR_TN); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; }; class CLASS(Unit_Combat_RS_PMC_BLK): CLASS(Unit_Combat_RS_Base) { scope = 1; uniformClass = QCLASS(Uniform_Combat_RS_PMC_BLK); - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; }; #include "CfgVehicles_GroundItems.hpp" diff --git a/addons/pmc/CfgVehicles_PublicUnits.hpp b/addons/pmc/CfgVehicles_PublicUnits.hpp index 0b57db8..ed10886 100644 --- a/addons/pmc/CfgVehicles_PublicUnits.hpp +++ b/addons/pmc/CfgVehicles_PublicUnits.hpp @@ -5,6 +5,10 @@ class CLASS(Unit_I_Contractor_RGR): CLASS(Unit_Combat_RS_PMC_RGR) { editorCategory = QCLASS(Loki); editorSubcategory = QUOTE(EdSubcat_Personnel); displayName = "Contractor (Ranger Green, No Equipment)"; + + class EventHandlers: EventHandlers { + init = "(_this select 0) setVariable [""BIS_enableRandomization"", false];"; + }; }; class CLASS(Unit_I_Contractor_TN): CLASS(Unit_Combat_RS_PMC_TN) { @@ -14,6 +18,10 @@ class CLASS(Unit_I_Contractor_TN): CLASS(Unit_Combat_RS_PMC_TN) { editorCategory = QCLASS(Loki); editorSubcategory = QUOTE(EdSubcat_Personnel); displayName = "Contractor (Tan, No Equipment)"; + + class EventHandlers: EventHandlers { + init = "(_this select 0) setVariable [""BIS_enableRandomization"", false];"; + }; }; class CLASS(Unit_I_Contractor_BLK_TN): CLASS(Unit_Combat_RS_PMC_BLK_TN) { @@ -23,6 +31,10 @@ class CLASS(Unit_I_Contractor_BLK_TN): CLASS(Unit_Combat_RS_PMC_BLK_TN) { editorCategory = QCLASS(Loki); editorSubcategory = QUOTE(EdSubcat_Personnel); displayName = "Contractor (Black, Tan, No Equipment)"; + + class EventHandlers: EventHandlers { + init = "(_this select 0) setVariable [""BIS_enableRandomization"", false];"; + }; }; class CLASS(Unit_I_Contractor_RGR_TN): CLASS(Unit_Combat_RS_PMC_RGR_TN) { @@ -32,6 +44,10 @@ class CLASS(Unit_I_Contractor_RGR_TN): CLASS(Unit_Combat_RS_PMC_RGR_TN) { editorCategory = QCLASS(Loki); editorSubcategory = QUOTE(EdSubcat_Personnel); displayName = "Contractor (Ranger Green, Tan, No Equipment)"; + + class EventHandlers: EventHandlers { + init = "(_this select 0) setVariable [""BIS_enableRandomization"", false];"; + }; }; class CLASS(Unit_I_Contractor_BLK): CLASS(Unit_Combat_RS_PMC_BLK) { @@ -41,4 +57,8 @@ class CLASS(Unit_I_Contractor_BLK): CLASS(Unit_Combat_RS_PMC_BLK) { editorCategory = QCLASS(Loki); editorSubcategory = QUOTE(EdSubcat_Personnel); displayName = "Contractor (Black, No Equipment)"; + + class EventHandlers: EventHandlers { + init = "(_this select 0) setVariable [""BIS_enableRandomization"", false];"; + }; }; \ No newline at end of file diff --git a/addons/pmc/CfgWeapons.hpp b/addons/pmc/CfgWeapons.hpp index 9bbd2af..120796a 100644 --- a/addons/pmc/CfgWeapons.hpp +++ b/addons/pmc/CfgWeapons.hpp @@ -4,7 +4,7 @@ class CfgWeapons { class CLASS(Uniform_Base): Uniform_Base { DLC = QUOTE(PREFIX); scope = 0; - picture = "\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_ca.paa"; + picture = "\z\forge_factions\addons\pmc\data\uniform_combat_pmc_ca.paa"; model ="\A3\Characters_F\Common\Suitpacks\suitpack_original_F.p3d"; class ItemInfo: UniformItem { @@ -20,7 +20,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Long (PMC, Ranger Green)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_LS_PMC_RGR); @@ -31,7 +31,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform TShirt (PMC, Ranger Green)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_TS_PMC_RGR); @@ -42,7 +42,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Rolled (PMC, Ranger Green)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_RS_PMC_RGR); @@ -55,7 +55,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Long (PMC, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_LS_PMC_TN); @@ -66,7 +66,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform TShirt (PMC, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_TS_PMC_TN); @@ -77,7 +77,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Rolled (PMC, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_RS_PMC_TN); @@ -90,7 +90,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Long (PMC, Black, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_LS_PMC_BLK_TN); @@ -101,7 +101,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform TShirt (PMC, Black, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_TS_PMC_BLK_TN); @@ -112,7 +112,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Rolled (PMC, Black, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_RS_PMC_BLK_TN); @@ -125,7 +125,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Long (PMC, Ranger Green, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_LS_PMC_RGR_TN); @@ -136,7 +136,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform TShirt (PMC, Ranger Green, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_TS_PMC_RGR_TN); @@ -147,7 +147,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Rolled (PMC, Ranger Green, Tan)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_rgr_tn_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_RS_PMC_RGR_TN); @@ -160,7 +160,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Long (PMC, Black)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_LS_PMC_BLK); @@ -171,7 +171,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform TShirt (PMC, Black)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_TS_PMC_BLK); @@ -182,7 +182,7 @@ class CfgWeapons { scope = 2; displayName = "Combat Uniform Rolled (PMC, Black)"; hiddenSelections[] = {"camo"}; - hiddenSelectionsTextures[] = {"\z\a3f_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; + hiddenSelectionsTextures[] = {"\z\forge_factions\addons\pmc\data\uniform_combat_pmc_blk_co.paa"}; class ItemInfo: ItemInfo { uniformClass = QCLASS(Unit_Combat_RS_PMC_BLK); diff --git a/addons/pmc/config.cpp b/addons/pmc/config.cpp index bc4769f..b15387b 100644 --- a/addons/pmc/config.cpp +++ b/addons/pmc/config.cpp @@ -51,7 +51,7 @@ class CfgPatches { QCLASS(Uniform_Combat_RS_PMC_BLK) }; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"a3f_factions_main"}; + requiredAddons[] = {"forge_factions_main"}; authors[] = {"J. Schmidt", "Creedcoder"}; author = "IDSolutions"; VERSION_CONFIG; diff --git a/addons/pmc/script_component.hpp b/addons/pmc/script_component.hpp index 2860506..21493de 100644 --- a/addons/pmc/script_component.hpp +++ b/addons/pmc/script_component.hpp @@ -1,6 +1,6 @@ #define COMPONENT pmc #define COMPONENT_BEAUTIFIED PMC -#include "\z\a3f_factions\addons\main\script_mod.hpp" +#include "\z\forge_factions\addons\main\script_mod.hpp" // #define DEBUG_MODE_FULL // #define DISABLE_COMPILE_CACHE @@ -13,4 +13,4 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_PMC #endif -#include "\z\a3f_factions\addons\main\script_macros.hpp" \ No newline at end of file +#include "\z\forge_factions\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/frg_factions_version.json b/forge_factions_version.json similarity index 100% rename from frg_factions_version.json rename to forge_factions_version.json diff --git a/main.go b/main.go index fa7e5e6..ee68ee7 100644 --- a/main.go +++ b/main.go @@ -38,7 +38,7 @@ func main() { } // Construct the filename using the version - artifactFilename := fmt.Sprintf("a3f_factions-%s.zip", version) + artifactFilename := fmt.Sprintf("forge_factions-%s.zip", version) artifactPath := filepath.Join("releases", artifactFilename) if err := uploadArtifact(client, repoOwner, repoName, release.ID, artifactPath); err != nil { @@ -55,7 +55,7 @@ func updateVersionFile(version string) error { return fmt.Errorf("error marshaling version info: %w", err) } - err = os.WriteFile("a3f_factions_version.json", jsonData, 0644) + err = os.WriteFile("forge_factions_version.json", jsonData, 0644) if err != nil { return fmt.Errorf("error writing version file: %w", err) }