Add activate sector button, fix civs healing self, update docs

DomT602 · DomT602 · commit e5cc178e1e27 · 2021-11-11T22:58:15.000Z
diff --git a/AW_Server/Secondary/fn_provideAid.sqf b/AW_Server/Secondary/fn_provideAid.sqf
@@ -45,7 +45,7 @@ _marker setMarkerSize [1.5,1.5];
 				[_civilian,0.25,(selectRandom _bodyParts),(selectRandom _damageTypes)] call ace_medical_fnc_addDamageToUnit;
 			};
 			[_civilian,true,150,true] call ace_medical_fnc_setUnconscious;
-			_civilian setVariable ["ace_medical_ai_lastFired",300];
+			_civilian setVariable ["ace_medical_ai_lastFired",(CBA_missionTime + 300)];
 		};
 		[[_group],_sectorCentre] call AW_fnc_initSectorPatrol;
 
diff --git a/AW_Server/Sectors/fn_monitorSector.sqf b/AW_Server/Sectors/fn_monitorSector.sqf
@@ -57,7 +57,7 @@ if (_captureRatio > _requiredCaptureRatio) then {
 				[_civilian,0.25,(selectRandom _bodyParts),(selectRandom _damageTypes)] call ace_medical_fnc_addDamageToUnit;
 			};
 			[_civilian,true,150,true] call ace_medical_fnc_setUnconscious;
-			_civilian setVariable ["ace_medical_ai_lastFired",300];
+			_civilian setVariable ["ace_medical_ai_lastFired",(CBA_missionTime + 300)];
 			
 			private _position = (getPosATL _civilian) getPos [random 25,random 360];
 			private _marker = createMarker [format["downedCiv%1",_i],_position];
diff --git a/Frontlines.Malden/Client/GUI/fn_manualZeusAction.sqf b/Frontlines.Malden/Client/GUI/fn_manualZeusAction.sqf
@@ -85,6 +85,17 @@ switch _action do {
 		["Reinforcements have been called in - they will arrive in the configured time."] call AW_fnc_notify;
 	};
 
+	case "activateSector": {
+		private _index = lbCurSel _sectorListbox;
+		if (_index isEqualTo -1) exitWith {};
+
+		private _sector = _sectorListbox lbData _index;
+		if (_sector in AW_bluforSectors) exitWith {["This sector is already captured."] call AW_fnc_notify};
+		if (_sector in AW_activeSectors) exitWith {["Sector must be inactive."] call AW_fnc_notify};
+
+		[_sector] remoteExecCall ["AW_fnc_activateSector",2];
+	};
+
 	case "captureSector": {
 		private _index = lbCurSel _sectorListbox;
 		if (_index isEqualTo -1) exitWith {};
diff --git a/Frontlines.Malden/GUI/zeusMenu.hpp b/Frontlines.Malden/GUI/zeusMenu.hpp
@@ -128,7 +128,7 @@ class AW_zeusMenu {
 			idc = 2409;
 			text = "Call Reinforcements"; //--- ToDo: Localize;
 			x = 0.5825 * safezoneW + safezoneX;
-			y = 0.335 * safezoneH + safezoneY;
+			y = 0.368 * safezoneH + safezoneY;
 			w = 0.118594 * safezoneW;
 			h = 0.022 * safezoneH;
 		};
@@ -139,7 +139,7 @@ class AW_zeusMenu {
 			idc = 2410;
 			text = "Capture Sector"; //--- ToDo: Localize;
 			x = 0.5825 * safezoneW + safezoneX;
-			y = 0.269 * safezoneH + safezoneY;
+			y = 0.302 * safezoneH + safezoneY;
 			w = 0.118594 * safezoneW;
 			h = 0.022 * safezoneH;
 		};
@@ -150,7 +150,7 @@ class AW_zeusMenu {
 			idc = 2411;
 			text = "Lose Sector"; //--- ToDo: Localize;
 			x = 0.5825 * safezoneW + safezoneX;
-			y = 0.302 * safezoneH + safezoneY;
+			y = 0.335 * safezoneH + safezoneY;
 			w = 0.118594 * safezoneW;
 			h = 0.022 * safezoneH;
 		};
@@ -161,7 +161,7 @@ class AW_zeusMenu {
 			idc = 2412;
 			text = "FOB Assault"; //--- ToDo: Localize;
 			x = 0.5825 * safezoneW + safezoneX;
-			y = 0.368 * safezoneH + safezoneY;
+			y = 0.401 * safezoneH + safezoneY;
 			w = 0.118594 * safezoneW;
 			h = 0.022 * safezoneH;
 		};
@@ -172,7 +172,7 @@ class AW_zeusMenu {
 			idc = 2413;
 			text = "Convoy Ambush"; //--- ToDo: Localize;
 			x = 0.5825 * safezoneW + safezoneX;
-			y = 0.401 * safezoneH + safezoneY;
+			y = 0.434 * safezoneH + safezoneY;
 			w = 0.118594 * safezoneW;
 			h = 0.022 * safezoneH;
 		};
@@ -183,7 +183,7 @@ class AW_zeusMenu {
 			idc = 2414;
 			text = "Counter-Attack"; //--- ToDo: Localize;
 			x = 0.5825 * safezoneW + safezoneX;
-			y = 0.434 * safezoneH + safezoneY;
+			y = 0.467 * safezoneH + safezoneY;
 			w = 0.118594 * safezoneW;
 			h = 0.022 * safezoneH;
 		};
@@ -262,6 +262,17 @@ class AW_zeusMenu {
 			w = 0.0721875 * safezoneW;
 			h = 0.022 * safezoneH;
 		};
+		class RscButtonMenu_2422: AW_RscButtonGeneral
+		{
+			onButtonClick="[""activateSector""] call AW_fnc_manualZeusAction";
+
+			idc = 2422;
+			text = "Activate Sector"; //--- ToDo: Localize;
+			x = 0.5825 * safezoneW + safezoneX;
+			y = 0.269 * safezoneH + safezoneY;
+			w = 0.118594 * safezoneW;
+			h = 0.022 * safezoneH;
+		};
 		class RscListbox_1500: RscListbox
 		{
 			idc = 1500;
diff --git a/Frontlines.Malden/initPlayerLocal.sqf b/Frontlines.Malden/initPlayerLocal.sqf
@@ -49,6 +49,7 @@ if (AW_showIntro) then {
 		<t align='center' size='6' shadow='0'><br/>Frontlines</t><br/>
 		Welcome to Frontlines, a gamemode made for Ahoyworld by Dom and the Ahoyworld Team.<br/><br/>
 		<a color='#00DFFF'>•</a> Github: <a href='https://github.com/DomT602/Frontlines' color='#56BDD6'> https://github.com/DomT602/Frontlines</a><br/>
+		<a color='#00DFFF'>•</a> Discord: <a href='https://discord.gg/82tAKdsT79' color='#56BDD6'> https://discord.gg/82tAKdsT79</a>
 	";
 
 	_text ctrlSetStructuredText (parseText _message);
diff --git a/Frontlines.Malden/initServer.sqf b/Frontlines.Malden/initServer.sqf
@@ -1,4 +1,3 @@
-#include "\arma3_readme.txt"
 AW_serverReady = false;
 publicVariable "AW_serverReady";
 
diff --git a/README.md b/README.md
@@ -14,9 +14,28 @@ Frontlines is a highly configurable persistent sector control game-mode to invad
 
 ## Reccommended Mods
 - <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2512672547">View Distance Menu</a>
+- <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1638341685">DUI - Squad Radar</a>
 
 ## Features
-- Coming soon
+Need 1 line Intro here
+- Fight along the Frontline, with all activity focused around this area to provide logical progress
+- Different sector types which all have specific characteristics and interactions
+- A simple building system to enable FOBs to be built and expanded upon, utilising three different resources
+- An enemy which counters you with 'side' missions which will hinder your progress
+- A variety of 'secondary' missions which can provide various benefits if completed successfully
+- An enemy threat system which increases by your actions, which will increase the enemy difficulty and reactiveness
+- A civilian reputation system which dictates how the local population will help, or hinder, your progress
+- Guerillas who can be called upon for a variety of supports through a simple to use menu
+- Ambient civilian and opfor providing each map additional life and surprises around any corner
+- A persistent campaign saved on the profile of the server to maintain your progress
+- A zeus menu to allow admins to gain direct access to a variety of Frontline specific features
+- All features seemlessly integrated into ACE providing a consistent experience
+- Various user settings which can be customised via CBA Addon Options
+- In-built support for 1 headless client
 
 ## Factions
 Each faction provided in the Map and Factions folder has differing mod requirements, so please check what they use and edit as necessary. You can make your own factions which is detailed in this <a href="https://github.com/DomT602/Frontlines/blob/DomT602-patch-1/Map%20and%20Factions/New_Config_Map_Guide.md">guide</a>.
+
+<p align="center">
+	![Discord Banner 2](https://discordapp.com/api/guilds/908047463141761036/widget.png?style=banner2)
+</p>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "\arma3_readme.txt"`
`2`	`1`	`AW_serverReady = false;`
`3`	`2`	`publicVariable "AW_serverReady";`
`4`	`3`