From c02adb897b817171abf9de47a00921588c42c09d Mon Sep 17 00:00:00 2001 From: Jacob Schmidt Date: Wed, 1 Jan 2025 21:51:43 -0600 Subject: [PATCH] Updated naming convention to use FORGE --- campaign/cba_settings.sqf | 2 +- campaign/config.h | 2 +- campaign/configs/banks.h | 2 +- campaign/configs/cpofs.h | 2 +- campaign/configs/garages.h | 2 +- campaign/configs/lockers.h | 2 +- campaign/configs/paygrades.h | 2 +- campaign/configs/stores.h | 2 +- campaign/do_not_edit/description.ext | 2 +- campaign/do_not_edit/initPlayerLocal.sqf | 14 +++++++------- campaign/do_not_edit/script_component.hpp | 2 +- campaign/edit_me/description.ext | 4 ++-- campaign/init.sqf | 2 +- campaign/initServer.sqf | 2 +- campaign/script_component.hpp | 2 +- directAction/cba_settings.sqf | 2 +- directAction/config.h | 2 +- directAction/configs/banks.h | 2 +- directAction/configs/cpofs.h | 2 +- directAction/configs/garages.h | 2 +- directAction/configs/lockers.h | 2 +- directAction/configs/paygrades.h | 2 +- directAction/configs/stores.h | 2 +- directAction/do_not_edit/description.ext | 4 ++-- directAction/do_not_edit/initPlayerLocal.sqf | 14 +++++++------- directAction/do_not_edit/script_component.hpp | 2 +- directAction/edit_me/description.ext | 4 ++-- directAction/init.sqf | 2 +- directAction/initServer.sqf | 2 +- directAction/script_component.hpp | 2 +- operation/cba_settings.sqf | 2 +- operation/config.h | 2 +- operation/configs/banks.h | 2 +- operation/configs/cpofs.h | 2 +- operation/configs/garages.h | 2 +- operation/configs/lockers.h | 2 +- operation/configs/paygrades.h | 2 +- operation/configs/stores.h | 2 +- operation/do_not_edit/description.ext | 2 +- operation/do_not_edit/initPlayerLocal.sqf | 14 +++++++------- operation/do_not_edit/script_component.hpp | 2 +- operation/edit_me/description.ext | 4 ++-- operation/init.sqf | 2 +- operation/initServer.sqf | 2 +- operation/script_component.hpp | 2 +- 45 files changed, 67 insertions(+), 67 deletions(-) diff --git a/campaign/cba_settings.sqf b/campaign/cba_settings.sqf index fd60c51..7bcddce 100644 --- a/campaign/cba_settings.sqf +++ b/campaign/cba_settings.sqf @@ -1 +1 @@ -// SOF - Basic Settings \ No newline at end of file +// FORGE - Basic Settings \ No newline at end of file diff --git a/campaign/config.h b/campaign/config.h index c66ad03..4127844 100644 --- a/campaign/config.h +++ b/campaign/config.h @@ -20,4 +20,4 @@ class Params { #include "configs\paygrades.h" #include "configs\stores.h" -#include "\@pmcs\userconfig\pmcs_phone.hpp" \ No newline at end of file +#include "\@forge\userconfig\forge_phone.hpp" \ No newline at end of file diff --git a/campaign/configs/banks.h b/campaign/configs/banks.h index 2f72c11..8f13d70 100644 --- a/campaign/configs/banks.h +++ b/campaign/configs/banks.h @@ -1,4 +1,4 @@ -class PMCS_CfgBanks { +class CfgBanks { class banks { class bank1 { className = "Land_Atm_01_F"; diff --git a/campaign/configs/cpofs.h b/campaign/configs/cpofs.h index 85e90a1..0abb213 100644 --- a/campaign/configs/cpofs.h +++ b/campaign/configs/cpofs.h @@ -1,4 +1,4 @@ -class PMCS_CfgCpofs { +class CfgCpofs { class cpofs { class cpof1 { className = "Land_MultiScreenComputer_01_olive_F"; diff --git a/campaign/configs/garages.h b/campaign/configs/garages.h index d0499d1..ef45bb6 100644 --- a/campaign/configs/garages.h +++ b/campaign/configs/garages.h @@ -1,4 +1,4 @@ -class PMCS_CfgGarages { +class CfgGarages { locations[] = { {"garageAircraft", {4805,8075,0}, 0}, {"garageArmored", {4805,8075,0}, 0}, diff --git a/campaign/configs/lockers.h b/campaign/configs/lockers.h index 1b37912..7456559 100644 --- a/campaign/configs/lockers.h +++ b/campaign/configs/lockers.h @@ -1,4 +1,4 @@ -class PMCS_CfgLockers { +class CfgLockers { class lockers { class locker1 { className = "Box_NATO_Equip_F"; diff --git a/campaign/configs/paygrades.h b/campaign/configs/paygrades.h index 050af05..c1cef18 100644 --- a/campaign/configs/paygrades.h +++ b/campaign/configs/paygrades.h @@ -1,4 +1,4 @@ -class PMCS_CfgPaygrades { +class CfgPaygrades { payGrades[] = { // Army {"E1", 1000, "Enlisted"}, diff --git a/campaign/configs/stores.h b/campaign/configs/stores.h index a88b768..7a9e682 100644 --- a/campaign/configs/stores.h +++ b/campaign/configs/stores.h @@ -1,4 +1,4 @@ -class PMCS_CfgStores { +class CfgStores { class stores { class store1 { className = "Land_CashDesk_F"; diff --git a/campaign/do_not_edit/description.ext b/campaign/do_not_edit/description.ext index 1be4c9f..5a19391 100644 --- a/campaign/do_not_edit/description.ext +++ b/campaign/do_not_edit/description.ext @@ -1,7 +1,7 @@ // Do not edit this file // Version of mission template -pmcs_template = 3; +forge_template = 3; // Mission Settings onLoadIntroTime = 1; diff --git a/campaign/do_not_edit/initPlayerLocal.sqf b/campaign/do_not_edit/initPlayerLocal.sqf index ebf7c26..4941c45 100644 --- a/campaign/do_not_edit/initPlayerLocal.sqf +++ b/campaign/do_not_edit/initPlayerLocal.sqf @@ -1,11 +1,11 @@ -[] call pmcs_client_armory_fnc_initArmory; -[] spawn pmcs_client_init_fnc_initPlayer; -[] spawn pmcs_client_medical_fnc_initMedical; -[] spawn pmcs_client_phone_fnc_initPhone; -[] spawn pmcs_client_service_fnc_initService; -[] spawn pmcs_client_store_fnc_initStore; +[] call forge_client_arsenal_fnc_initArsenal; +[] spawn forge_client_init_fnc_initPlayer; +[] spawn forge_client_medical_fnc_initMedical; +[] spawn forge_client_phone_fnc_initPhone; +[] spawn forge_client_service_fnc_initService; +[] spawn forge_client_store_fnc_initStore; -player addItem "PMCS_Phone"; +player addItem "FORGE_Phone"; // TODO replace with function [player] call compile preprocessFileLineNumbers "do_not_edit\briefing.sqf"; \ No newline at end of file diff --git a/campaign/do_not_edit/script_component.hpp b/campaign/do_not_edit/script_component.hpp index 676c6db..367080e 100644 --- a/campaign/do_not_edit/script_component.hpp +++ b/campaign/do_not_edit/script_component.hpp @@ -1,4 +1,4 @@ -#define PREFIX sof +#define PREFIX forge #define COMPONENT mission // Mission diff --git a/campaign/edit_me/description.ext b/campaign/edit_me/description.ext index 375b827..2e69dbb 100644 --- a/campaign/edit_me/description.ext +++ b/campaign/edit_me/description.ext @@ -1,9 +1,9 @@ // Mission settings - title, description, author etc. -author = "YOUR_NAME, SOF"; +author = "YOUR_NAME, FORGE"; onLoadName = "MISSION_NAME"; onLoadMission = "MISSION_SUMMARY"; -pmcs_type = 0; // 0: Contract, 1: Sub-Contract, 2: Training, 3: Special +forge_type = 0; // 0: Contract, 1: Sub-Contract, 2: Training, 3: Special // Randomization disableRandomization[] = {}; // Disables randomization of units and vehicles based off of variable name or classname \ No newline at end of file diff --git a/campaign/init.sqf b/campaign/init.sqf index b405d78..cec1efd 100644 --- a/campaign/init.sqf +++ b/campaign/init.sqf @@ -5,7 +5,7 @@ enableSaving [false, false]; addMissionEventHandler ["ExtensionCallback", { params ["_name", "_function", "_data"]; - if (_name isEqualTo "ArmaSOFClient") then { + if (_name isEqualTo "ArmaFORGEClient") then { parseSimpleArray _data call (missionNamespace getVariable [_function, { hint "Function does not exist!" }]); diff --git a/campaign/initServer.sqf b/campaign/initServer.sqf index 46456ce..54ca007 100644 --- a/campaign/initServer.sqf +++ b/campaign/initServer.sqf @@ -1,4 +1,4 @@ if (isServer || isDedicated) then { true spawn dragonfly_db_fnc_init; - [] call pmcs_server_init_fnc_serverSetup; + [] call forge_server_init_fnc_serverSetup; }; \ No newline at end of file diff --git a/campaign/script_component.hpp b/campaign/script_component.hpp index 28047a3..92777b7 100644 --- a/campaign/script_component.hpp +++ b/campaign/script_component.hpp @@ -1,4 +1,4 @@ -#define PREFIX sof +#define PREFIX forge #define COMPONENT mission // Version diff --git a/directAction/cba_settings.sqf b/directAction/cba_settings.sqf index fd60c51..7bcddce 100644 --- a/directAction/cba_settings.sqf +++ b/directAction/cba_settings.sqf @@ -1 +1 @@ -// SOF - Basic Settings \ No newline at end of file +// FORGE - Basic Settings \ No newline at end of file diff --git a/directAction/config.h b/directAction/config.h index c66ad03..4127844 100644 --- a/directAction/config.h +++ b/directAction/config.h @@ -20,4 +20,4 @@ class Params { #include "configs\paygrades.h" #include "configs\stores.h" -#include "\@pmcs\userconfig\pmcs_phone.hpp" \ No newline at end of file +#include "\@forge\userconfig\forge_phone.hpp" \ No newline at end of file diff --git a/directAction/configs/banks.h b/directAction/configs/banks.h index 2f72c11..8f13d70 100644 --- a/directAction/configs/banks.h +++ b/directAction/configs/banks.h @@ -1,4 +1,4 @@ -class PMCS_CfgBanks { +class CfgBanks { class banks { class bank1 { className = "Land_Atm_01_F"; diff --git a/directAction/configs/cpofs.h b/directAction/configs/cpofs.h index 85e90a1..0abb213 100644 --- a/directAction/configs/cpofs.h +++ b/directAction/configs/cpofs.h @@ -1,4 +1,4 @@ -class PMCS_CfgCpofs { +class CfgCpofs { class cpofs { class cpof1 { className = "Land_MultiScreenComputer_01_olive_F"; diff --git a/directAction/configs/garages.h b/directAction/configs/garages.h index d0499d1..ef45bb6 100644 --- a/directAction/configs/garages.h +++ b/directAction/configs/garages.h @@ -1,4 +1,4 @@ -class PMCS_CfgGarages { +class CfgGarages { locations[] = { {"garageAircraft", {4805,8075,0}, 0}, {"garageArmored", {4805,8075,0}, 0}, diff --git a/directAction/configs/lockers.h b/directAction/configs/lockers.h index 1b37912..7456559 100644 --- a/directAction/configs/lockers.h +++ b/directAction/configs/lockers.h @@ -1,4 +1,4 @@ -class PMCS_CfgLockers { +class CfgLockers { class lockers { class locker1 { className = "Box_NATO_Equip_F"; diff --git a/directAction/configs/paygrades.h b/directAction/configs/paygrades.h index f7b717b..9694e66 100644 --- a/directAction/configs/paygrades.h +++ b/directAction/configs/paygrades.h @@ -1,4 +1,4 @@ -class PMCS_CfgPaygrades { +class CfgPaygrades { payGrades[] = { {"E1", 1000, "Enlisted"}, {"E2", 1250, "Enlisted"}, diff --git a/directAction/configs/stores.h b/directAction/configs/stores.h index eef04f1..7432348 100644 --- a/directAction/configs/stores.h +++ b/directAction/configs/stores.h @@ -1,4 +1,4 @@ -class PMCS_CfgStores { +class CfgStores { class stores { class store1 { className = "Land_CashDesk_F"; diff --git a/directAction/do_not_edit/description.ext b/directAction/do_not_edit/description.ext index dc7d772..de02954 100644 --- a/directAction/do_not_edit/description.ext +++ b/directAction/do_not_edit/description.ext @@ -1,7 +1,7 @@ // Do not edit this file // Version of mission template -pmcs_template = 3; +forge_template = 3; // Mission Settings onLoadIntroTime = 1; @@ -9,7 +9,7 @@ onLoadMissionTime = 1; // Game type and player count class Header { - gameType = PMCS_DA; + gameType = FORGE_DA; minPlayers = 1; maxPlayers = 32; }; diff --git a/directAction/do_not_edit/initPlayerLocal.sqf b/directAction/do_not_edit/initPlayerLocal.sqf index ebf7c26..4941c45 100644 --- a/directAction/do_not_edit/initPlayerLocal.sqf +++ b/directAction/do_not_edit/initPlayerLocal.sqf @@ -1,11 +1,11 @@ -[] call pmcs_client_armory_fnc_initArmory; -[] spawn pmcs_client_init_fnc_initPlayer; -[] spawn pmcs_client_medical_fnc_initMedical; -[] spawn pmcs_client_phone_fnc_initPhone; -[] spawn pmcs_client_service_fnc_initService; -[] spawn pmcs_client_store_fnc_initStore; +[] call forge_client_arsenal_fnc_initArsenal; +[] spawn forge_client_init_fnc_initPlayer; +[] spawn forge_client_medical_fnc_initMedical; +[] spawn forge_client_phone_fnc_initPhone; +[] spawn forge_client_service_fnc_initService; +[] spawn forge_client_store_fnc_initStore; -player addItem "PMCS_Phone"; +player addItem "FORGE_Phone"; // TODO replace with function [player] call compile preprocessFileLineNumbers "do_not_edit\briefing.sqf"; \ No newline at end of file diff --git a/directAction/do_not_edit/script_component.hpp b/directAction/do_not_edit/script_component.hpp index 676c6db..367080e 100644 --- a/directAction/do_not_edit/script_component.hpp +++ b/directAction/do_not_edit/script_component.hpp @@ -1,4 +1,4 @@ -#define PREFIX sof +#define PREFIX forge #define COMPONENT mission // Mission diff --git a/directAction/edit_me/description.ext b/directAction/edit_me/description.ext index 375b827..2e69dbb 100644 --- a/directAction/edit_me/description.ext +++ b/directAction/edit_me/description.ext @@ -1,9 +1,9 @@ // Mission settings - title, description, author etc. -author = "YOUR_NAME, SOF"; +author = "YOUR_NAME, FORGE"; onLoadName = "MISSION_NAME"; onLoadMission = "MISSION_SUMMARY"; -pmcs_type = 0; // 0: Contract, 1: Sub-Contract, 2: Training, 3: Special +forge_type = 0; // 0: Contract, 1: Sub-Contract, 2: Training, 3: Special // Randomization disableRandomization[] = {}; // Disables randomization of units and vehicles based off of variable name or classname \ No newline at end of file diff --git a/directAction/init.sqf b/directAction/init.sqf index 1d3e3b5..38374b4 100644 --- a/directAction/init.sqf +++ b/directAction/init.sqf @@ -15,7 +15,7 @@ addMissionEventHandler ["ExtensionCallback", { addMissionEventHandler ["ExtensionCallback", { params ["_name", "_function", "_data"]; - if (_name isEqualTo "ArmaSOFClient") then { + if (_name isEqualTo "ArmaFORGEClient") then { parseSimpleArray _data call (missionNamespace getVariable [_function, { hint "Function does not exist!" }]); diff --git a/directAction/initServer.sqf b/directAction/initServer.sqf index 46456ce..54ca007 100644 --- a/directAction/initServer.sqf +++ b/directAction/initServer.sqf @@ -1,4 +1,4 @@ if (isServer || isDedicated) then { true spawn dragonfly_db_fnc_init; - [] call pmcs_server_init_fnc_serverSetup; + [] call forge_server_init_fnc_serverSetup; }; \ No newline at end of file diff --git a/directAction/script_component.hpp b/directAction/script_component.hpp index 28047a3..92777b7 100644 --- a/directAction/script_component.hpp +++ b/directAction/script_component.hpp @@ -1,4 +1,4 @@ -#define PREFIX sof +#define PREFIX forge #define COMPONENT mission // Version diff --git a/operation/cba_settings.sqf b/operation/cba_settings.sqf index fd60c51..7bcddce 100644 --- a/operation/cba_settings.sqf +++ b/operation/cba_settings.sqf @@ -1 +1 @@ -// SOF - Basic Settings \ No newline at end of file +// FORGE - Basic Settings \ No newline at end of file diff --git a/operation/config.h b/operation/config.h index c66ad03..4127844 100644 --- a/operation/config.h +++ b/operation/config.h @@ -20,4 +20,4 @@ class Params { #include "configs\paygrades.h" #include "configs\stores.h" -#include "\@pmcs\userconfig\pmcs_phone.hpp" \ No newline at end of file +#include "\@forge\userconfig\forge_phone.hpp" \ No newline at end of file diff --git a/operation/configs/banks.h b/operation/configs/banks.h index 2f72c11..8f13d70 100644 --- a/operation/configs/banks.h +++ b/operation/configs/banks.h @@ -1,4 +1,4 @@ -class PMCS_CfgBanks { +class CfgBanks { class banks { class bank1 { className = "Land_Atm_01_F"; diff --git a/operation/configs/cpofs.h b/operation/configs/cpofs.h index 85e90a1..0abb213 100644 --- a/operation/configs/cpofs.h +++ b/operation/configs/cpofs.h @@ -1,4 +1,4 @@ -class PMCS_CfgCpofs { +class CfgCpofs { class cpofs { class cpof1 { className = "Land_MultiScreenComputer_01_olive_F"; diff --git a/operation/configs/garages.h b/operation/configs/garages.h index d0499d1..ef45bb6 100644 --- a/operation/configs/garages.h +++ b/operation/configs/garages.h @@ -1,4 +1,4 @@ -class PMCS_CfgGarages { +class CfgGarages { locations[] = { {"garageAircraft", {4805,8075,0}, 0}, {"garageArmored", {4805,8075,0}, 0}, diff --git a/operation/configs/lockers.h b/operation/configs/lockers.h index 1b37912..7456559 100644 --- a/operation/configs/lockers.h +++ b/operation/configs/lockers.h @@ -1,4 +1,4 @@ -class PMCS_CfgLockers { +class CfgLockers { class lockers { class locker1 { className = "Box_NATO_Equip_F"; diff --git a/operation/configs/paygrades.h b/operation/configs/paygrades.h index f7b717b..9694e66 100644 --- a/operation/configs/paygrades.h +++ b/operation/configs/paygrades.h @@ -1,4 +1,4 @@ -class PMCS_CfgPaygrades { +class CfgPaygrades { payGrades[] = { {"E1", 1000, "Enlisted"}, {"E2", 1250, "Enlisted"}, diff --git a/operation/configs/stores.h b/operation/configs/stores.h index a88b768..7a9e682 100644 --- a/operation/configs/stores.h +++ b/operation/configs/stores.h @@ -1,4 +1,4 @@ -class PMCS_CfgStores { +class CfgStores { class stores { class store1 { className = "Land_CashDesk_F"; diff --git a/operation/do_not_edit/description.ext b/operation/do_not_edit/description.ext index 1be4c9f..5a19391 100644 --- a/operation/do_not_edit/description.ext +++ b/operation/do_not_edit/description.ext @@ -1,7 +1,7 @@ // Do not edit this file // Version of mission template -pmcs_template = 3; +forge_template = 3; // Mission Settings onLoadIntroTime = 1; diff --git a/operation/do_not_edit/initPlayerLocal.sqf b/operation/do_not_edit/initPlayerLocal.sqf index ebf7c26..4941c45 100644 --- a/operation/do_not_edit/initPlayerLocal.sqf +++ b/operation/do_not_edit/initPlayerLocal.sqf @@ -1,11 +1,11 @@ -[] call pmcs_client_armory_fnc_initArmory; -[] spawn pmcs_client_init_fnc_initPlayer; -[] spawn pmcs_client_medical_fnc_initMedical; -[] spawn pmcs_client_phone_fnc_initPhone; -[] spawn pmcs_client_service_fnc_initService; -[] spawn pmcs_client_store_fnc_initStore; +[] call forge_client_arsenal_fnc_initArsenal; +[] spawn forge_client_init_fnc_initPlayer; +[] spawn forge_client_medical_fnc_initMedical; +[] spawn forge_client_phone_fnc_initPhone; +[] spawn forge_client_service_fnc_initService; +[] spawn forge_client_store_fnc_initStore; -player addItem "PMCS_Phone"; +player addItem "FORGE_Phone"; // TODO replace with function [player] call compile preprocessFileLineNumbers "do_not_edit\briefing.sqf"; \ No newline at end of file diff --git a/operation/do_not_edit/script_component.hpp b/operation/do_not_edit/script_component.hpp index 676c6db..367080e 100644 --- a/operation/do_not_edit/script_component.hpp +++ b/operation/do_not_edit/script_component.hpp @@ -1,4 +1,4 @@ -#define PREFIX sof +#define PREFIX forge #define COMPONENT mission // Mission diff --git a/operation/edit_me/description.ext b/operation/edit_me/description.ext index 375b827..2e69dbb 100644 --- a/operation/edit_me/description.ext +++ b/operation/edit_me/description.ext @@ -1,9 +1,9 @@ // Mission settings - title, description, author etc. -author = "YOUR_NAME, SOF"; +author = "YOUR_NAME, FORGE"; onLoadName = "MISSION_NAME"; onLoadMission = "MISSION_SUMMARY"; -pmcs_type = 0; // 0: Contract, 1: Sub-Contract, 2: Training, 3: Special +forge_type = 0; // 0: Contract, 1: Sub-Contract, 2: Training, 3: Special // Randomization disableRandomization[] = {}; // Disables randomization of units and vehicles based off of variable name or classname \ No newline at end of file diff --git a/operation/init.sqf b/operation/init.sqf index b405d78..cec1efd 100644 --- a/operation/init.sqf +++ b/operation/init.sqf @@ -5,7 +5,7 @@ enableSaving [false, false]; addMissionEventHandler ["ExtensionCallback", { params ["_name", "_function", "_data"]; - if (_name isEqualTo "ArmaSOFClient") then { + if (_name isEqualTo "ArmaFORGEClient") then { parseSimpleArray _data call (missionNamespace getVariable [_function, { hint "Function does not exist!" }]); diff --git a/operation/initServer.sqf b/operation/initServer.sqf index 46456ce..54ca007 100644 --- a/operation/initServer.sqf +++ b/operation/initServer.sqf @@ -1,4 +1,4 @@ if (isServer || isDedicated) then { true spawn dragonfly_db_fnc_init; - [] call pmcs_server_init_fnc_serverSetup; + [] call forge_server_init_fnc_serverSetup; }; \ No newline at end of file diff --git a/operation/script_component.hpp b/operation/script_component.hpp index 28047a3..92777b7 100644 --- a/operation/script_component.hpp +++ b/operation/script_component.hpp @@ -1,4 +1,4 @@ -#define PREFIX sof +#define PREFIX forge #define COMPONENT mission // Version