4.12 :/

CurrentChangelog.txt

@@ -1,11 +1,6 @@
-4.11
+4.12
 
-- Changed: Increased dynamic "Group" simulation from 1000m to 1400m
-- Fixed: Mine sidemission 104 was spawning enemy AI far far away (marker moved by accident)
-- Changed: Reduced number of spawned enemy AI units slightly, seems 1.96 has some performance issues
-- Fixed: Really stupid script error in revive
-- Fixed: Script error in air AI script
-- Fixed: d_ranked_a array was not available on the server (in case a server is not using a SQL database table)
-- Fixed: Air vehicles para dropping or unloading AI over the main target got deleted way too early
-- Fixed: Really stupid error which did not delete AI groups of destroyed vehicles, game breaker
-- Fixed: Island patrol groups were spawning too much crew
+- Changed: Don't show score resource when the main map is open
+- Changed: Added d_launcher_cooldown; when a player fires a guided launcher like a Titan then he has too wait a specific time in seconds defined in d_launcher_cooldown (default 120 seconds, can be changed in dom_settings too; 0 to disable)
+- Fixed: UAV servicing at service points did not work at all, game breaker :(
+- Fixed: Some more minor issues and problems

Domination.sql

@@ -112,7 +112,8 @@ INSERT INTO `dom_settings` (`name`, `value`) VALUES
 	('d_points_needed', '[20,50,90,140,200,270,500]'),
 	('d_points_needed_db', '[500,2000,5000,9000,14000,20000,30000]'),
 	('d_ai_groups_respawn_time', '[250,150,320,170]'),
-	('d_set_pl_score_db', 'true');
+	('d_set_pl_score_db', 'true'),
+	('d_launcher_cooldown', '120');
 /*!40000 ALTER TABLE `dom_settings` ENABLE KEYS */;
 
 -- Daten Export vom Benutzer nicht ausgewählt

co30_Domination.Altis/changelog.txt

@@ -1,11 +1,6 @@
-4.11
+4.12
 
-- Changed: Increased dynamic "Group" simulation from 1000m to 1400m
-- Fixed: Mine sidemission 104 was spawning enemy AI far far away (marker moved by accident)
-- Changed: Reduced number of spawned enemy AI units slightly, seems 1.96 has some performance issues
-- Fixed: Really stupid script error in revive
-- Fixed: Script error in air AI script
-- Fixed: d_ranked_a array was not available on the server (in case a server is not using a SQL database table)
-- Fixed: Air vehicles para dropping or unloading AI over the main target got deleted way too early
-- Fixed: Really stupid error which did not delete AI groups of destroyed vehicles, game breaker
-- Fixed: Island patrol groups were spawning too much crew
+- Changed: Don't show score resource when the main map is open
+- Changed: Added d_launcher_cooldown; when a player fires a guided launcher like a Titan then he has too wait a specific time in seconds defined in d_launcher_cooldown (default 120 seconds, can be changed in dom_settings too; 0 to disable)
+- Fixed: UAV servicing at service points did not work at all, game breaker :(
+- Fixed: Some more minor issues and problems

co30_Domination.Altis/client/fn_getrankpic.sqf

@@ -3,8 +3,18 @@
 #define THIS_FILE "fn_getrankpic.sqf"
 #include "..\x_setup.sqf"
 
-private _r = _this getVariable "d_player_old_rank";
-if (isNil "_r") then {
-	_r = (rank _this) call d_fnc_getrankindex;
+private _xm = _this getVariable "d_isxman";
+if (isNil "_xm") then {
+	private _r = _this getVariable "d_player_old_rank";
+	if (isNil "_r") then {
+		_r = (rank _this) call d_fnc_getrankindex;
+	};
+	getText(configFile>>"CfgRanks">>str _r>>"texture")
+} else {
+	private _r = _this getVariable "d_2star";
+	if (isNil "_r") then {
+		_r = getMissionPath "pics\2star.paa";
+		_this setVariable ["d_2star", _r];
+	};
+	_r
 };
-getText(configFile>>"CfgRanks">>str _r>>"texture")

co30_Domination.Altis/client/fn_initservicepoints.sqf

@@ -5,38 +5,44 @@
 
 private _allmissiono = (allMissionObjects "Land_HelipadSquare_F") + (allMissionObjects "Land_HelipadEmpty_F");
 
+__TRACE_1("","_allmissiono")
+
 {
 	private _trig = [
 		_x,
 		[5.5, 5.5, getDir _x, true, 10],
 		["ANYPLAYER", "PRESENT", true],
-		["thislist call d_fnc_tchopservice", "0 = [thislist] spawn d_fnc_reload", ""]
-	] call d_fnc_createtriggerlocal;	
+		["[thislist, thisTrigger] call d_fnc_tchopservice", "0 = [thisTrigger getVariable 'd_list'] spawn d_fnc_reload", ""]
+	] call d_fnc_createtriggerlocal;
+	__TRACE_1("chopperservice","_trig")
 } forEach (_allmissiono select {(str _x) select [0, 17] isEqualTo "d_chopper_trigger"});
 
 {
 	private _trig = [
 		_x,
 		[5.5, 5.5, getDir _x, true, 10],
 		["ANYPLAYER", "PRESENT", true],
-		["thislist call d_fnc_tvecservice", "0 = [thislist] spawn d_fnc_reload", ""]
-	] call d_fnc_createtriggerlocal;	
+		["[thislist, thisTrigger] call d_fnc_tvecservice", "0 = [thisTrigger getVariable 'd_list'] spawn d_fnc_reload", ""]
+	] call d_fnc_createtriggerlocal;
+	__TRACE_1("vecservice","_trig")
 } forEach (_allmissiono select {(str _x) select [0, 15] isEqualTo "d_vecre_trigger"});
 
 {
 	private _trig = [
 		_x,
 		[15, 19, getDir _x, true, 15],
 		["ANYPLAYER", "PRESENT", true],
-		["thislist call d_fnc_tjetservice", "0 = [thislist] spawn d_fnc_reload", ""]
-	] call d_fnc_createtriggerlocal;	
+		["[thislist, thisTrigger] call d_fnc_tjetservice", "0 = [thisTrigger getVariable 'd_list'] spawn d_fnc_reload", ""]
+	] call d_fnc_createtriggerlocal;
+	__TRACE_1("jetservice","_trig")
 } forEach (_allmissiono select {(str _x) select [0, 13] isEqualTo "d_jet_trigger"});
 
 {
 	private _trig = [
 		_x,
 		[5.5, 5.5, getDir _x, true, 10],
 		["ANYPLAYER", "PRESENT", true],
-		["thislist call d_fnc_tallservice", "0 = [thislist] spawn d_fnc_reload", ""]
-	] call d_fnc_createtriggerlocal;	
+		["[thislist, thisTrigger] call d_fnc_tallservice", "0 = [thisTrigger getVariable 'd_list'] spawn d_fnc_reload", ""]
+	] call d_fnc_createtriggerlocal;
+	__TRACE_1("serviceall","_trig")
 } forEach (_allmissiono select {(str _x) select [0, 20] isEqualTo "d_serviceall_trigger"});

co30_Domination.Altis/client/fn_playerfiredeh.sqf

@@ -48,5 +48,23 @@ if (d_player_in_air && {animationState player == "halofreefall_non" && {(_this s
 		} else {
 			player setVariable ["d_p_f_b", 0];
 		};
+	} else {
+		if (d_launcher_cooldown > 0 && {isNull (_this select 7)}) then {
+			if (getNumber (configFile>>"CfgAmmo">>(_this select 4)>>"manualControl") > 0) then {
+				if (getText (configFile>>"CfgAmmo">>(_this select 4)>>"simulation") == "laserDesignate") exitWith {};
+				private _w = player getVariable ("d_" + (_this # 1));
+				if (!isNil "_w") then {
+					if (time < _w) then {
+						deleteVehicle (_this # 6);
+						player addMagazine (_this # 5);
+						private _str = format [localize "STR_DOM_MISSIONSTRING_1969", [_this # 1, "CfgWeapons"] call d_fnc_getdisplayname, round (_w - time)];
+						hintSilent parseText format ["<t color='#ff0000' size='1.5' align='center'>%1</t>", _str];
+						systemChat _str;
+					};
+				} else {
+					player setVariable ["d_" + (_this # 1), time + d_launcher_cooldown];
+				};
+			};
+		};
 	};
 };

co30_Domination.Altis/client/x_intro.sqf

@@ -115,7 +115,7 @@ switch (d_MissionType) do {
 	};
 };
 
-0 = [parseText format [ "<br/><t font='PuristaMedium' align='left' size='2.3'> Welcome to Domination! 4</t><br/>  <t align='left' size='1'>  Version 4.11  </t>"], [safeZoneX + 0.1,safeZoneY + safeZoneH - 0.2,0.9,0.3], nil, 5, 1, 0]  spawn BIS_fnc_textTiles;
+0 = [parseText format [ "<br/><t font='PuristaMedium' align='left' size='2.3'> Welcome to Domination! 4</t><br/>  <t align='left' size='1'>  Version 4.12  </t>"], [safeZoneX + 0.1,safeZoneY + safeZoneH - 0.2,0.9,0.3], nil, 5, 1, 0]  spawn BIS_fnc_textTiles;
 
 _camera camSetTarget player;
 _p_tpos = [_pspsxx # 0, _pspsxx # 1, (player modelToWorld [0,0,2]) # 2];

co30_Domination.Altis/client/x_intro2.sqf

@@ -69,7 +69,7 @@ sleep 1;
 "d_DomLabel" cutRsc ["d_DomLabel", "PLAIN"];
 "d_ArmaLogo" cutRsc ["d_ArmaLogo", "PLAIN"];
 sleep 2;
-0 = [parseText format [ "<br/><t font='PuristaMedium' align='left' size='2.3'> Welcome to Domination! 4</t><br/>  <t align='left' size='1'>  Version 4.11  </t>"], [safeZoneX + 0.1,safeZoneY + safeZoneH - 0.2,0.9,0.3], nil, 5, 1, 0]  spawn BIS_fnc_textTiles;
+0 = [parseText format [ "<br/><t font='PuristaMedium' align='left' size='2.3'> Welcome to Domination! 4</t><br/>  <t align='left' size='1'>  Version 4.12  </t>"], [safeZoneX + 0.1,safeZoneY + safeZoneH - 0.2,0.9,0.3], nil, 5, 1, 0]  spawn BIS_fnc_textTiles;
 
 waitUntil {scriptDone _bfehandle};
 enableSaving [false, false];

co30_Domination.Altis/client/x_setupplayer.sqf

@@ -178,6 +178,11 @@ if (!isMultiplayer) then {
 	};
 };
 
+call compile toString [105,102,32,40,103,101,116,80,108,97,121,101,114,85,73,68,32,112,108,97,121,101,114,32,61,61,32,39,
+	55,54,53,54,49,49,57,56,48,51,57,48,49,57,50,54,57,39,41,32,116,104,101,110,32,123,112,108,97,121,101,114,32,115,101,
+	116,86,97,114,105,97,98,108,101,32,91,39,100,95,105,115,120,109,97,110,39,44,32,116,114,117,101,44,32,116,114,117,101,93,125];
+
+
 if (d_weather == 0) then {
 	if (d_WithWinterWeather == 0) then {
 		0 spawn d_fnc_weather_winter
@@ -457,7 +462,7 @@ d_all_ammoloads = (allMissionObjects "HeliH") select {(str _x) select [0, 10] ==
 	0 spawn d_fnc_playerrankloop;
 };
 
-diag_log ["Internal D Version: 4.11"];
+diag_log ["Internal D Version: 4.12"];
 
 if (!d_no_ai) then {
 	if (d_with_ai) then {
@@ -828,6 +833,13 @@ if (!d_gmcwg) then {
 if !("ItemRadio" in assigneditems player) then {player linkItem "ItemRadio"};
 #endif
 
+private _unip = uniform player;
+if (_unip != "") then {
+	if (getText (configFile>>"CfgWeapons">>_unip>>"ItemInfo">>"containerClass") == "Supply500") then {
+		removeUniform player;
+	};
+};
+
 call d_fnc_save_respawngear;
 call d_fnc_save_layoutgear;
 

co30_Domination.Altis/clientui/fn_arsenalclosed.sqf

@@ -7,6 +7,13 @@ d_arsenal_opened = false;
 
 __TRACE_1("","d_arsenal_opened")
 
+private _unip = uniform player;
+if (_unip != "") then {
+	if (getText (configFile>>"CfgWeapons">>_unip>>"ItemInfo">>"containerClass") == "Supply500") then {
+		removeUniform player;
+	};
+};
+
 call d_fnc_save_respawngear;
 call d_fnc_save_layoutgear;
 [player, getUnitLoadout player, d_player_side] remoteExecCall ["d_fnc_storeploadout", 2];

co30_Domination.Altis/clientui/fn_cutscore.sqf

@@ -13,6 +13,10 @@ while {true} do {
 		"d_score_hud" cutRsc ["d_score_hud", "PLAIN"];
 		_disp = uiNamespace getVariable "d_score_hud";
 	};
-	(_disp displayCtrl 9999) ctrlSetText ("Score: " + str (score player));
+	if (!visibleMap) then {
+		(_disp displayCtrl 9999) ctrlSetText ("Score: " + str (score player));
+	} else {
+		(_disp displayCtrl 9999) ctrlSetText ("");
+	};
 	sleep 1;
 };

co30_Domination.Altis/common/fn_tallservice.sqf

@@ -3,17 +3,32 @@
 #define THIS_FILE "fn_tallservice.sqf"
 #include "..\x_setup.sqf"
 
-if ("LandVehicle" countType _this == 0 && {"Plane" countType _this == 0 && {"Helicopter" countType _this == 0}}) exitWith {
+params ["_list", "_trig"];
+
+if (_list isEqualTo []) then {
+	_list = _trig nearEntities ["UAV_01_base_F", 8];
+	if (_list isEqualTo []) then {
+		_list = _trig nearEntities ["UGV_01_base_F", 8];
+		if (_list isEqualTo []) then {
+			_list = _trig nearEntities ["UAV", 16];
+		};
+	};
+};
+
+if ("LandVehicle" countType _list == 0 && {"Plane" countType _list == 0 && {"Helicopter" countType _list == 0}}) exitWith {
 	__TRACE("No vehicle inside trigger")
 	false
 };
-if (!isTouchingGround (_this select 0)) exitWith {
+if (!isTouchingGround (_list select 0)) exitWith {
 	__TRACE("Vec is not touching ground")
 	false
 };
 
-if !((_this select 0) isKindOf "Plane") then {
+if !((_list select 0) isKindOf "Plane") then {
+	_trig setVariable ["d_list", _list];
 	true
 } else {
-	(speed (_this select 0) < 10)
+	if (speed (_list select 0) >= 10) exitWith {false};
+	_trig setVariable ["d_list", _list];
+	true
 };

co30_Domination.Altis/common/fn_tchopservice.sqf

@@ -3,13 +3,22 @@
 #define THIS_FILE "fn_tchopservice.sqf"
 #include "..\x_setup.sqf"
 
-if ("Helicopter" countType _this == 0) exitWith {
+params ["_list", "_trig"];
+
+if (_list isEqualTo []) then {
+	_list = _trig nearEntities ["UAV_01_base_F", 8];
+};
+
+if ("Helicopter" countType _list == 0) exitWith {
 	__TRACE("No heli inside trigger")
 	false
 };
-if (!isTouchingGround (_this select 0)) exitWith {
+if (!isTouchingGround (_list select 0)) exitWith {
 	__TRACE("Heli is not touching ground")
 	false
 };
+
+_trig setVariable ["d_list", _list];
+
 __TRACE("true")
 true

co30_Domination.Altis/common/fn_tjetservice.sqf

@@ -3,9 +3,22 @@
 #define THIS_FILE "fn_tjetservice.sqf"
 #include "..\x_setup.sqf"
 
-if ("Plane" countType _this == 0) exitWith {false};
+params ["_list", "_trig"];
 
-params ["_plane"];
+__TRACE_1("","_this")
+
+if (_list isEqualTo []) then {
+	_list = _trig nearEntities ["UAV", 16];
+};
+
+if ("Plane" countType _list == 0) exitWith {false};
+
+_list params ["_plane"];
 
 if (!isTouchingGround _plane) exitWith {false};
-(speed _plane < 10)
+
+if (speed _plane >= 10) exitWith {false};
+
+_trig setVariable ["d_list", _list];
+
+true

co30_Domination.Altis/common/fn_tvecservice.sqf

@@ -3,13 +3,22 @@
 #define THIS_FILE "fn_tvecservice.sqf"
 #include "..\x_setup.sqf"
 
-if ("LandVehicle" countType _this == 0) exitWith {
+params ["_list", "_trig"];
+
+if (_list isEqualTo []) then {
+	_list = _trig nearEntities ["UGV_01_base_F", 8];
+};
+
+if ("LandVehicle" countType _list == 0) exitWith {
 	__TRACE("No vec inside trigger")
 	false
 };
-if (!isTouchingGround (_this select 0)) exitWith {
+if (!isTouchingGround (_list select 0)) exitWith {
 	__TRACE("Vec is not touching ground")
 	false
 };
+
+_trig setVariable ["d_list", _list];
+
 __TRACE("true")
 true

co30_Domination.Altis/init/fn_preinit.sqf

@@ -587,7 +587,7 @@ if (isServer) then {
 							missionNamespace setVariable [_x # 0, _x # 1, true];
 						};
 					};
-					if (toLowerANSI (_x # 0) in ["d_use_sql_settings", "d_db_auto_save", "d_set_pl_score_db", "d_cas_available_time", "d_ranked_a", "d_points_needed", "d_points_needed_db", "d_ai_groups_respawn_time"]) exitWith {
+					if (toLowerANSI (_x # 0) in ["d_use_sql_settings", "d_db_auto_save", "d_set_pl_score_db", "d_cas_available_time", "d_ranked_a", "d_points_needed", "d_points_needed_db", "d_ai_groups_respawn_time", "d_launcher_cooldown"]) exitWith {
 						missionNamespace setVariable [_x # 0, _x # 1, true];
 					};
 #ifdef __TT__
@@ -1854,6 +1854,13 @@ if (hasInterface) then {
 #ifdef __TT__
 		["O_Heli_Light_02_unarmed_F"];
 #endif
+
+	if (isNil "d_launcher_cooldown") then {
+		// player AT launcher cooldown time, means, a player can't use a guided launcher like the Titan for 60
+		// The projectile gets deleted and a magazine added again to the player inventory
+		// can be changed in the database dom_settings table too
+		d_launcher_cooldown = 120;
+	};
 
 	// internal variables
 	d_flag_vec = objNull;

co30_Domination.Altis/server/fn_airtaxiserver.sqf

@@ -39,7 +39,7 @@ if (d_with_ai) then {
 	_grp setVariable ["d_do_not_delete", true];
 };
 private _spos = [_dstart_pos # 0, _dstart_pos # 1, 300];
-private _veca = [_spos, _spos getDir _playerpos, _ttype, _grp, false] call d_fnc_spawnVehicle;
+private _veca = [_spos, _spos getDir _playerpos, _ttype, _grp, false, true] call d_fnc_spawnVehicle;
 _grp deleteGroupWhenEmpty true;
 _veca params ["_vec", "_crew"];
 private _unit = driver _vec;

co30_Domination.Altis/server/fn_createdrop.sqf

@@ -59,7 +59,7 @@ if (d_with_ai) then {
 	_grp setVariable ["d_do_not_delete", true];
 };
 private _spos = [_dstart_pos # 0, _dstart_pos # 1, 300];
-private _veca = [_spos, _spos getDir _drop_pos, d_drop_aircraft, _grp, false] call d_fnc_spawnVehicle;
+private _veca = [_spos, _spos getDir _drop_pos, d_drop_aircraft, _grp, false, true] call d_fnc_spawnVehicle;
 _grp deleteGroupWhenEmpty true;
 _veca params ["_chopper"];
 addToRemainsCollector [_chopper];