Merge pull request #12 from Cre8or/develop

[Release] v0.16.794-beta

TO-DO.txt

@@ -1,11 +1,19 @@
 TO DO:
+	- Increase AI aggressivity:
+		+ Make AI more keen on moving into incoming fire to reach move positions
+		- Make AI increase their use of suppressive fire on targets
+	- Fix spawn menu camera not being used on JIP (camera is following the player, who gets teleported when switching sides)
+		- Also fix R2T camera not showing on JIP
 	- Fix occasional double-kill registration for an individual unit
 		- Maybe why kills/vehicle destruction sometimes awards double the points that it should (including headshot damage)?
 	- Fix loadouts sometimes not getting applied to AI units (same issue as gAI when locality changes?)
 	- Fix spotting animation not working (same issue as healing action)
 	- Implement resupply ability to support:
-		- Similar animations/UI icons to medic healing, but for rearming
+		+ Similar animations/UI icons to medic healing, but for rearming
 		- Prevent players from looting bodies/opening their gear
+		+ Add score to the resupplying unit
+		+ Resupply the recipient as a fraction of their overall ammunition
+		+ Calculate and cache ammo count in getOverallAmmo, and invalidate the cache via onInit, onReloaded, setRoleLoadout
 	- Add a repair ability to the engineer role
 		- Implement looping action logic
 		- Play a short unit gesture/animation
@@ -33,6 +41,14 @@ TO DO:
 	- Search for "DEBUG" and "TODO" keywords
 
 DONE:
+	- Flip kill feed horizontally (apparently it's not very readable from right to left)
+	- Add death/revive sounds
+	- Add resupplying action sounds
+	- Add medical action sounds
+	- Add automatic magazine repacking on reload
+	- Add a custom headshot sound (satisfaction factor)
+	- Fix being able to change role GVAR by selecting a new role in the spawnmenu post-spawn
+	- Fix AI medics spam-healing themselves on damage and immediately reviving unconscious units
 	- Fix unconsciousState AI subsystem referencing serverside variables (causing AI to not respawn)
 	- Fix spawn menu inconsistencies
 	 	+ Sides with no tickets don't get greyed out

description.ext

@@ -12,17 +12,19 @@ onLoadName    = __EVAL(MACRO_MISSION_NAME);
 onLoadMission = __EVAL(MACRO_MISSION_FRAMEWORK_GAMEMODE + " (v" + MACRO_MISSION_FRAMEWORK_VERSION + ")");
 overviewText  = __EVAL(MACRO_MISSION_FRAMEWORK_GAMEMODE + " - " + MACRO_MISSION_NAME + " (v" + MACRO_MISSION_FRAMEWORK_VERSION + ")<br /><br />Made by Cre8or<br />(C) 2019 - 2024");
 
-// TODO: Add custom overview and banner images
-//overviewPicture = MACRO_MISSION_OVERVIEW_IMAGE;
+overviewPicture = MACRO_MISSION_OVERVIEW_IMAGE;
 loadScreen = MACRO_MISSION_LOADING_BANNER;
 
 joinUnassigned = 0; // Auto-slot players
 disabledAI = 1;
 //briefing = 0;
 debriefing = 0;
 saving = 0;
+respawnDialog=0;
+respawn=3;
+respawnDelay=2;
 allowFunctionsRecompile = __EVAL((isServer and !isDedicated) or is3DENMultiplayer or is3DENPreview);
-
+/*
 showHUD[] = {
 	1,	// Scripted HUD (same as showHUD command)
 	1,	// Vehicle and unit info
@@ -36,7 +38,7 @@ showHUD[] = {
 	0,	// "x killed by y" systemChat messages
 	1	// force show drawIcon3D icons
 };
-
+*/
 
 
 

init3DEN.sqf

@@ -144,7 +144,6 @@ private _EH_eachFrame = addMissionEventHandler ["EachFrame", {
 		// Enforce a valid naming scheme
 		if (count _name != 8) then {
 			systemChat format ["WARNING: ""%1"" is not a valid sector name!", _name];
-			//breakTo QGVAR(eden_eachFrame);
 			continue;
 		};
 		_letter = _name select [7, 1];
@@ -176,31 +175,53 @@ private _EH_eachFrame = addMissionEventHandler ["EachFrame", {
 
 
 
+
 		// Update the flag's texture and position on the pole to match the sector parameters
-		_textureEmpty = "a3\data_f\flags\flag_white_co.paa";
 		_textureIcon  = "a3\ui_f\data\GUI\Rsc\RscDisplayMultiplayerSetup\flag_bluefor_empty_ca.paa";
-		_texture      = _textureEmpty;
+		_texture      = MACRO_TEXTURE_FLAG_EMPTY;
 		_level        = 0;
 		_activation   = (_sector get3DENAttribute "ActivationBy") # 0;
 		switch (_activation select [0, 4]) do {
 			case "EAST": {
-				_texture = MACRO_FLAG_TEXTURE_EAST;
+				#if __has_include("mission\sides\data_side_east.inc")
+					_texture = (
+						#include "mission\sides\data_side_east.inc"
+					) param [2, MACRO_TEXTURE_FLAG_EMPTY];
+				#else
+					_texture = "a3\data_f\flags\flag_red_co.paa";
+					systemChat "[CONQUEST] ERROR: A critical file is missing! (mission\sides\data_side_east.inc)";
+				#endif
+
 				_level = 1;
 			};
 			case "GUER": {
-				_texture = MACRO_FLAG_TEXTURE_RESISTANCE;
+				#if __has_include("mission\sides\data_side_resistance.inc")
+					_texture = (
+						#include "mission\sides\data_side_resistance.inc"
+					) param [2, MACRO_TEXTURE_FLAG_EMPTY];
+				#else
+					_texture = "a3\data_f\flags\flag_green_co.paa";
+					systemChat "[CONQUEST] ERROR: A critical file is missing! (mission\sides\data_side_resistance.inc)";
+				#endif
 				_level = 1;
 			};
 			case "WEST": {
-				_texture = MACRO_FLAG_TEXTURE_WEST;
+				#if __has_include("mission\sides\data_side_west.inc")
+					_texture = (
+						#include "mission\sides\data_side_west.inc"
+					) param [2, MACRO_TEXTURE_FLAG_EMPTY];
+				#else
+					_texture = "a3\data_f\flags\flag_blue_co.paa";
+					systemChat "[CONQUEST] ERROR: A critical file is missing! (mission\sides\data_side_west.inc)";
+				#endif
 				_level = 1;
 			};
 		};
 
 
 		// Validate the texture path
 		if (!fileExists _texture) then {
-			_texture = _textureEmpty;
+			_texture = MACRO_TEXTURE_FLAG_EMPTY;
 		} else {
 			_textureIcon = _texture;
 		};

mission.sqm

@@ -497,9 +497,6 @@ randomSeed=7845369;
 class ScenarioData
 {
 	author="Cre8or";
-	respawnDialog=0;
-	respawn=3;
-	respawnDelay=2;
 };
 class CustomAttributes
 {