Merge pull request '4.1.1 release' (#43 ) from develop into main

Reviewed-on: #43
Update CHANGELOG.md
2024-04-19 00:31:43 -05:00 · 2024-04-19 00:28:31 -05:00 · 2024-04-19 00:23:01 -05:00 · 2024-04-19 00:01:14 -05:00 · 2024-04-18 23:59:27 -05:00 · 2024-04-18 23:58:42 -05:00
5 changed files with 24 additions and 36 deletions
--- 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
--- 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

--- 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;
--- 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];

--- 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
 	[
Author	SHA1	Message	Date
hizumi	5a1e6dd1a1	Merge pull request '4.1.1 release' (#43 ) from develop into main Reviewed-on: #43	2024-04-19 00:31:43 -05:00
hizumi	0524af05b9	Update CHANGELOG.md All checks were successful Generate testing snapshot / Create testing release (push) Successful in 33s Details 4.1.1 release	2024-04-19 00:28:31 -05:00
hizumi	023550743d	Update BattalionInfo.hpp alpha callsign change	2024-04-19 00:23:01 -05:00
hizumi	ab28ed4e50	Update fn_bindVehicleActions.sqf All checks were successful Generate testing snapshot / Create testing release (push) Successful in 38s Details remove now unneeded custom tire patching ace interaction	2024-04-19 00:01:14 -05:00
hizumi	8794dc226d	Update fn_calculateServerStats.sqf remove unneeded publicVariable declaration to reduce network traffic	2024-04-18 23:59:27 -05:00
hizumi	2bfaaacfc6	Update fn_initServer.sqf disable zeus lightning bolt functionality first pass	2024-04-18 23:58:42 -05:00
hizumi	6c4740dd1f	Merge pull request 'develop' (#37 ) from develop into main Reviewed-on: #37	2024-03-02 01:08:33 -06:00
hizumi	f128e0fec8	Update on-release.yaml	2024-03-02 01:08:33 -06:00
hizumi	706794a114	Merge pull request 'Update on-release.yaml' (#36 ) from develop into main Reviewed-on: #36	2024-03-02 00:49:54 -06:00