diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c013ac..bd29508 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.1.1] - 2024-04-19 + +### Added + +- Function to remove lightning bolt from zeus + +### Changed + +- Alpha Callsign +- Allowed Equipment Definitions + +### Removed + +- Custom tire patch code +- Extraneous server performance calculation broadcast to all clients + ## [4.1.0] - 2024-03-01 ### Added diff --git a/defines/BattalionInfo.hpp b/defines/BattalionInfo.hpp index bcb4f8b..8be13e0 100644 --- a/defines/BattalionInfo.hpp +++ b/defines/BattalionInfo.hpp @@ -7,7 +7,7 @@ #define COMMAND_CALLSIGN SPARTAN #define RRC_CALLSIGN TIGER #define MEDIC_CALLSIGN LIFELINE -#define ALPHA_CALLSIGN BLACKJACK +#define ALPHA_CALLSIGN ROGUE #define ECHO_CALLSIGN FIREBRAND #define WPN_CALLSIGN BLACKFOOT diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index d10c79b..92a9325 100644 --- a/defines/DisallowedEquipment.hpp +++ b/defines/DisallowedEquipment.hpp @@ -13,7 +13,7 @@ class DisallowedEquipment { items[] = { "17BN_ANPVS14", // NVG AN/PVS-14 "ej_PVS15D", // NVG AN/PVS-15 - "ej_VPS15", // NVG AN/PVS-15 + "ej_PVS15", // NVG AN/PVS-15 "LMG_Mk200_black_F", //Mk200 Series "LMG_Mk200_F", //Mk200 Series "rhs_weap_g36c", // G36 Series @@ -34,11 +34,6 @@ class DisallowedEquipment { "rhs_weap_m14_wd", // M14 Series "rhs_weap_m14_weap_m14ebrri", // M14 Series "rhs_weap_m14", // M14 Series - "rhs_weap_m16a4_carryhandle_M203", // M16 Series - "rhs_weap_m16a4_carryhandle", // M16 Series - "rhs_weap_m16a4_imod_M203", // M16 Series - "rhs_weap_m16a4_imod", // M16 Series - "rhs_weap_m16a4", // M16 Series "rhs_weap_m27iar_grip", // M27 Series "rhs_weap_m27iar", // M27 Series "rhsusf_ANPVS_14", // NVG AN/PVS-14 @@ -100,12 +95,6 @@ class DisallowedEquipment { "UK3CB_M14DMR_Railed_BLK", // M14 Series "UK3CB_M14DMR_Railed", // M14 Series "UK3CB_M14DMR", // M14 Series - "UK3CB_M16_Carbine", // M16 Series - "UK3CB_M16A1_LSW", // M16 Series - "UK3CB_M16A1", // M16 Series - "UK3CB_M16A2_UGL", // M16 Series - "UK3CB_M16A2", // M16 Series - "UK3CB_M16A3", // M16 Series "USP_PVS_14", // NVG AN/PVS-14 "USP_PVS_15" // NVG AN/PVS-15 }; @@ -132,10 +121,9 @@ class DisallowedEquipment { "optic_lrps_tna_F", //Nightforce Series Optic "optic_lrps", //Nightforce Series Optic "optic_Nightstalker", // Thermal Optic - "optic_tws_mg", // Thermal Optic - "optic_tws", // Thermal Optic "rhsusf_acc_anpas13gv1", // Thermal Optic "rhsusf_acc_anpvs27", // Thermal Optic + "optic_tws_mg", // Thermal Optic "Tier1_ANPVS10_Tan", // Thermal Optic "Tier1_ATACR18_ADM_Black_Vanilla", //Nightforce Series Optic "Tier1_ATACR18_ADM_Black", //Nightforce Series Optic @@ -160,6 +148,7 @@ class DisallowedEquipment { label = "TABBED WEAPON"; description = "Items that are allowed for individuals with Ranger Tab."; items[] = { + "optic_tws", // Thermal Optic "arifle_MX_black_F", // MX Series "arifle_MX_F", // MX Series "arifle_MX_GL_black_F", // MX 3GL Series @@ -208,7 +197,90 @@ class DisallowedEquipment { "Tier1_SR25_ec_tan", // SR-25 Series "Tier1_SR25_ec", // SR-25 Series "Tier1_SR25_tan", // SR-25 Series - "Tier1_SR25" // SR-25 Series + "Tier1_SR25", // SR-25 Series + "rhsusf_weap_MP7A2", //MP7 Series + "rhsusf_weap_MP7A2_aor1", //MP7 Series + "rhsusf_weap_MP7A2_desert", //MP7 Series + "rhsusf_weap_MP7A2_folded", //MP7 Series + "rhsusf_weap_MP7A2_folded_aor1", //MP7 Series + "rhsusf_weap_MP7A2_folded_winter", //MP7 Series + "rhsusf_weap_MP7A2_folded_desert", //MP7 Series + "rhsusf_weap_MP7A2_winter", //MP7 Series + "UK3CB_MP510", //MP5 Series + "UK3CB_MP5A2", //MP5 Series + "UK3CB_MP5A3", //MP5 Series + "UK3CB_MP5A4", //MP5 Series + "UK3CB_MP5K", //MP5 Series + "UK3CB_MP5K_PDW", //MP5 Series + "UK3CB_MP5N", //MP5 Series + "UK3CB_MP5N_UGL", //MP5 Series + "UK3CB_MP5SD5", //MP5 Series + "UK3CB_MP5SD6", //MP5 Series + "SMG_03C_black", //P90 Series + "SMG_03C_camo", //P90 Series + "SMG_03C_hex", //P90 Series + "SMG_03C_khaki", //P90 Series + "SMG_03C_TR_black", //P90 Series + "SMG_03C_TR_camo", //P90 Series + "SMG_03C_TR_hex", //P90 Series + "SMG_03C_TR_khaki", //P90 Series + "UK3CB_P90C_black", //P90 Series + "UK3CB_P90C_camo", //P90 Series + "UK3CB_P90C_hex", //P90 Series + "UK3CB_P90C_khaki", //P90 Series + "UK3CB_P90C_TR_black", //P90 Series + "UK3CB_P90C_TR_camo", //P90 Series + "UK3CB_P90C_TR_hex", //P90 Series + "UK3CB_P90C_TR_khaki", //P90 Series + "UK3CB_P90_black", //P90 Series + "UK3CB_P90_camo", //P90 Series + "UK3CB_P90_hex", //P90 Series + "UK3CB_P90_khaki", //P90 Series + "UK3CB_P90_TR_black", //P90 Series + "UK3CB_P90_TR_camo", //P90 Series + "UK3CB_P90_TR_hex", //P90 Series + "UK3CB_P90_TR_khaki", //P90 Series + "UK3CB_M16_Carbine", //M16 Series + "UK3CB_M16_Carbine_eotech_552", //M16 Series + "UK3CB_M16_Carbine_sup", //M16 Series + "UK3CB_M16A1", //M16 Series + "UK3CB_M16A1_LSW", //M16 Series + "UK3CB_M16A2", //M16 Series + "UK3CB_M16A2_sup", //M16 Series + "UK3CB_M16A2_UGL", //M16 Series + "UK3CB_M16A2_UGL_eotech_552", //M16 Series + "UK3CB_M16A2_UGL_sup", //M16 Series + "UK3CB_M16A3", //M16 Series + "UK3CB_M16A3_eotech_552", //M16 Series + "UK3CB_M16A3_eotech_552_sup", //M16 Series + "UK3CB_M16A3_sup", //M16 Series + "UK3CB_M16A3_UGL", //M16 Series + "rhs_weap_m16a4", //M16 Series + "rhs_weap_m16a4_grip", //M16 Series + "rhs_weap_m16a4_grip_acog", //M16 Series + "rhs_weap_m16a4_grip2", //M16 Series + "rhs_weap_m16a4_grip3", //M16 Series + "rhs_weap_m16a4_bipod", //M16 Series + "rhs_weap_m16a4_acog_usmc", //M16 Series + "rhs_weap_m16a4_carryhandle", //M16 Series + "rhs_weap_m16a4_carryhandle_bipod", //M16 Series + "rhs_weap_m16a4_carryhandle_grip", //M16 Series + "rhs_weap_m16a4_carryhandle_M203", //M16 Series + "rhs_weap_m16a4_carryhandle_M203_grip", //M16 Series + "rhs_weap_m16a4_m203_acog_usmc", //M16 Series + "uk3cb_weap_m16a4_m203s_eotech_552_anpeq15_sup", //M16 Series + "rhs_weap_m16a4_imod", //M16 Series + "rhs_weap_m16a4_imod_grip", //M16 Series + "rhs_weap_m16a4_imod_grip2", //M16 Series + "rhs_weap_m16a4_imod_grip3", //M16 Series + "rhs_weap_m16a4_imod_M203", //M16 Series + "rhs_weap_m16a4_imod_M203_grip", //M16 Series + "rhs_weap_m16a4_carryhandle_grip2", //M16 Series + "rhs_weap_m16a4_carryhandle_grip3", //M16 Series + "rhs_weap_m16a4_grip_acog_usmc", //M16 Series + "rhs_weap_m16a4_grip_acog2_usmc", //M16 Series + "rhs_weap_m32", //M32/MGL Series + "rhs_weap_m32_usmc" //M32/MGL Series }; }; diff --git a/framework/client/functions/fn_bindVehicleActions.sqf b/framework/client/functions/fn_bindVehicleActions.sqf index 6947457..7718b77 100644 --- a/framework/client/functions/fn_bindVehicleActions.sqf +++ b/framework/client/functions/fn_bindVehicleActions.sqf @@ -29,39 +29,6 @@ _unflip = ["LandVehicle", 0, ["ACE_MainActions"], _unflip, true] call ace_interact_menu_fnc_addActionToClass; -_patchTire = -[ - "patchTire", - "Patch Tire", - "\a3\ui_f\data\IGUI\Cfg\Actions\repair_ca.paa", - { - [_player, "AinvPknlMstpSnonWnonDr_medic5", 0] call ace_common_fnc_doAnimation; - - [ - 30, - [_player, _target], - { - params ["_args"]; - _args params ["_player", "_target"]; - hint "Tire Patched"; - _target setDamage 0.2; - _target setVariable["milsim_ace_repair_wheel_canPatch", false]; - }, - { - params ["_args"]; - _args params ["_player", "_target"]; - hint "Stopped repair"; - [_player, "", 0] call ace_common_fnc_doAnimation; - }, - "Patching" - ] call ace_common_fnc_progressBar - }, - { ( alive _target ) && ( [_player, "ToolKit"] call ace_common_fnc_hasItem ) && ( damage _target > 0.2 ) && ( _target getVariable["milsim_ace_repair_wheel_canPatch", true] ) } -] call ace_interact_menu_fnc_createAction; - -["ACE_Wheel", 0, ["ACE_MainActions"], _patchTire, true] call ace_interact_menu_fnc_addActionToClass; - - diag_log text "[MILSIM] (client) vehicle actions bound"; nil; \ No newline at end of file diff --git a/framework/init/functions/fn_initServer.sqf b/framework/init/functions/fn_initServer.sqf index c40180e..9523875 100644 --- a/framework/init/functions/fn_initServer.sqf +++ b/framework/init/functions/fn_initServer.sqf @@ -14,6 +14,13 @@ call EFUNC(common,logMissionInfo); call EFUNC(fbcb2_assets,initServer); call EFUNC(reinsert,initServer); +// globally disable zeus lightning bolt functionality +_curators = allMissionObjects "ModuleCurator_F"; +{ + _x removeCuratorAddons ["CuratorOnly_Modules_F_Curator_Lightning"]; + _x removeCuratorAddons ["A3_Modules_F_Curator_Lightning"]; +} foreach _curators; + // declare init complete to other modules missionNamespace setVariable [QGVARMAIN(complete), true, true]; diff --git a/framework/performance/functions/fn_calculateClientStats.sqf b/framework/performance/functions/fn_calculateClientStats.sqf index 24bd75c..d0c75cc 100644 --- a/framework/performance/functions/fn_calculateClientStats.sqf +++ b/framework/performance/functions/fn_calculateClientStats.sqf @@ -29,7 +29,7 @@ // log to RPT [ - {_this call EFUNC(common,log);}, + {_this remoteExec [QEFUNC(common,log), 2]}, [ LEVEL_INFO, QUOTE(COMPONENT), diff --git a/framework/performance/functions/fn_calculateServerStats.sqf b/framework/performance/functions/fn_calculateServerStats.sqf index f4a0a46..8fb45cc 100644 --- a/framework/performance/functions/fn_calculateServerStats.sqf +++ b/framework/performance/functions/fn_calculateServerStats.sqf @@ -12,7 +12,6 @@ private _rawCPS = _counter / (diag_frameNo - _frameNo); missionNamespace setVariable [QGVAR(server_raw_cps), _rawCPS]; - publicVariable QGVAR(server_raw_cps); // with suspension private _counter = 0; @@ -26,7 +25,6 @@ private _serverCPS = _counter / (diag_frameNo - _frameNo); missionNamespace setVariable [QGVAR(server_cps), _counter / (diag_frameNo - _frameNo)]; - publicVariable QGVAR(server_cps); // log to RPT [