Skip to content

Commit 2ffe81d

Browse files
committed
4.71 maintenance release
1 parent 4be382e commit 2ffe81d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+140
-99
lines changed

OldChangelogs.txt

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,58 @@ Changelogs
22

33
Old...
44

5+
4.70
6+
7+
- Added: Civilian east Asian types from CFP and CUP mods, by longtimegamer
8+
- Added: Some fighting vehicles are now available via airdrop if d_with_airdrop == 2 (ammo truck, APC, MRAP), by longtimegamer
9+
- Added: 2.16 overrideHazeQuality is set to VeryLow in description.ext (check https://community.bistudio.com/wiki/Description.ext#overrideHazeQuality )
10+
- Added: Faction for CUP Russian Ground Forces Winter, by longtimegamer
11+
- Added: Faction Russian Armed Forces Summer (woodland/jungle), by longtimegamer
12+
- Added: ION PMC Security Detail as INDFOR unit types, by longtimegamer
13+
- Added: AI enhanced RPG attack on players when d_ai_aggressiveshoot == 2, by longtimegamer
14+
- Added: Chance for sniper positions in tall buildings (not just overall max elevation), by longtimegamer
15+
- Added: More initial viewdistance options, by longtimegamer
16+
- Added: Destroyed vehicles persist until end of target when d_ai_persistent_corpses == 0, by longtimegamer
17+
- Added: Server parameter to disable Domination weapon and inventory management (d_disable_dom_weapon_mgmt, "Disable Domination weapon and inventory management" in server lobby), by longtimegamer
18+
- Added: Server parameter "extra" isle defense includes AA if d_WithIsleDefense == 2, by longtimegamer
19+
- Added: Server parameter to enable or disable randomized guard and patrol groups to allow more administrator control over the number of enemy units, by longtimegamer
20+
- Added: Notify the players when there are no parajump restrictions, by longtimegamer
21+
- Added: Civilian cars parked closely together, less intersections blocked, some car types severely damaged, by longtimegamer
22+
- Added: Faction Islamic State updated vehicles, updated infantry AT, by longtimegamer
23+
- Added: Pylon loadout change for spawned drones
24+
- Added: Rabbit rescue will announce if a player killed the rabbit, by longtimegamer
25+
- Changed: Added new 2.18 scripting commands and scripting command changes
26+
- Changed: AI group respawn times increased again
27+
- Changed: Better messages if farp/mash position is too close to base or slope is too steep
28+
- Changed: Filtering out handleDamage firing when no damage occurs and fake head hits
29+
- Changed: JSDF Overhauled data for 4.69, by schalldampfer
30+
- Changed: Additional no-HUD support, by longtimegamer
31+
- Fixed: d_sum_camps > 0 before spawning target clear, by longtimegamer
32+
- Fixed: Do not show virtual arsenal 3dmarker, flagpole beacon when streaming friendly or server-forced no-HUD, by longtimegamer
33+
- Fixed: Statusbar rank did not show General
34+
- Fixed: Unloaded static weapons created partially underground, by longtimegamer
35+
- Fixed: Do not show airdrop message if streamfriendly is enabled, by longtimegamer
36+
- Fixed: If tower under radio got deleted (for whatever reason) main target mission did not end
37+
- Fixed: If an air taxi was also a vehicle available as bonus vehicle (side mission or main target bonus) player without enough points could not enter it when database is available
38+
- Fixed: All mission start air vehicles at base can now be flown if you have 0 points (if database is enabled)
39+
- Fixed: Proper random movement during "rabbit rescue" event, by longtimegamer
40+
- Fixed: Small variation in direction of spawned civilian cars, by longtimegamer
41+
- Fixed: Spawning a UAV is only available away from the the MHQ when d_enable_extra_cas == 1, by longtimegamer
42+
- Fixed: Minor bug when spawning civilians and group limit is reached, by longtimegamer
43+
- Fixed: Air Drop Aircraft map marker should be Air Drop Zone, by longtimegamer
44+
- Fixed: If maintarget votes are a tie then target is selected randomly, by longtimegamer
45+
- Fixed: texts array was missing in the SPE version in description.ext class Params -> class d_MainTargets_num
46+
- Fixed: The "Team Alpha MG Gunner" slot still had the vanilla A3 mg gunner class instead of the SPE class in the SPE GER version
47+
- Fixed: If a unit is in Team Delta (engineer) and the class doesn't have the trait "engineer" it is added now (for example the SPE version had the problem)
48+
- Fixed: Smokeshells were missing in the CUP versions
49+
- Fixed: Using CUP UAV now instead of vanilla ones in the CUP blufor versions
50+
- Fixed: Respawning at SQL in a vehicle after beeing unconscious caused the player to stand in the vehicle
51+
- Updated: Added new SPE 1.1 classes and missing CfgRemoteExec entries
52+
- Updated: Korean translation, by kkim
53+
- Workaround: Zeus was not transfered to a logged in admin player object after respawn
54+
- Workaround: If some 3rd party mod/addon kills a camp at the main target (happens with some bombs using setdamage) change the camp to captured so that the main target can end
55+
- Opimizations (script profiling)
56+
557
4.69
658

759
- Added: Lights at base and main target illumination (SPE flares module) in the SPE version because nights were too dark
Lines changed: 9 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,10 @@
1-
4.70
1+
4.71
22

3-
- Added: Civilian east Asian types from CFP and CUP mods, by longtimegamer
4-
- Added: Some fighting vehicles are now available via airdrop if d_with_airdrop == 2 (ammo truck, APC, MRAP), by longtimegamer
5-
- Added: 2.16 overrideHazeQuality is set to VeryLow in description.ext (check https://community.bistudio.com/wiki/Description.ext#overrideHazeQuality )
6-
- Added: Faction for CUP Russian Ground Forces Winter, by longtimegamer
7-
- Added: Faction Russian Armed Forces Summer (woodland/jungle), by longtimegamer
8-
- Added: ION PMC Security Detail as INDFOR unit types, by longtimegamer
9-
- Added: AI enhanced RPG attack on players when d_ai_aggressiveshoot == 2, by longtimegamer
10-
- Added: Chance for sniper positions in tall buildings (not just overall max elevation), by longtimegamer
11-
- Added: More initial viewdistance options, by longtimegamer
12-
- Added: Destroyed vehicles persist until end of target when d_ai_persistent_corpses == 0, by longtimegamer
13-
- Added: Server parameter to disable Domination weapon and inventory management (d_disable_dom_weapon_mgmt, "Disable Domination weapon and inventory management" in server lobby), by longtimegamer
14-
- Added: Server parameter "extra" isle defense includes AA if d_WithIsleDefense == 2, by longtimegamer
15-
- Added: Server parameter to enable or disable randomized guard and patrol groups to allow more administrator control over the number of enemy units, by longtimegamer
16-
- Added: Notify the players when there are no parajump restrictions, by longtimegamer
17-
- Added: Civilian cars parked closely together, less intersections blocked, some car types severely damaged, by longtimegamer
18-
- Added: Faction Islamic State updated vehicles, updated infantry AT, by longtimegamer
19-
- Added: Pylon loadout change for spawned drones
20-
- Added: Rabbit rescue will announce if a player killed the rabbit, by longtimegamer
21-
- Changed: Added new 2.18 scripting commands and scripting command changes
22-
- Changed: AI group respawn times increased again
23-
- Changed: Better messages if farp/mash position is too close to base or slope is too steep
24-
- Changed: Filtering out handleDamage firing when no damage occurs and fake head hits
25-
- Changed: JSDF Overhauled data for 4.69, by schalldampfer
26-
- Changed: Additional no-HUD support, by longtimegamer
27-
- Fixed: d_sum_camps > 0 before spawning target clear, by longtimegamer
28-
- Fixed: Do not show virtual arsenal 3dmarker, flagpole beacon when streaming friendly or server-forced no-HUD, by longtimegamer
29-
- Fixed: Statusbar rank did not show General
30-
- Fixed: Unloaded static weapons created partially underground, by longtimegamer
31-
- Fixed: Do not show airdrop message if streamfriendly is enabled, by longtimegamer
32-
- Fixed: If tower under radio got deleted (for whatever reason) main target mission did not end
33-
- Fixed: If an air taxi was also a vehicle available as bonus vehicle (side mission or main target bonus) player without enough points could not enter it when database is available
34-
- Fixed: All mission start air vehicles at base can now be flown if you have 0 points (if database is enabled)
35-
- Fixed: Proper random movement during "rabbit rescue" event, by longtimegamer
36-
- Fixed: Small variation in direction of spawned civilian cars, by longtimegamer
37-
- Fixed: Spawning a UAV is only available away from the the MHQ when d_enable_extra_cas == 1, by longtimegamer
38-
- Fixed: Minor bug when spawning civilians and group limit is reached, by longtimegamer
39-
- Fixed: Air Drop Aircraft map marker should be Air Drop Zone, by longtimegamer
40-
- Fixed: If maintarget votes are a tie then target is selected randomly, by longtimegamer
41-
- Fixed: texts array was missing in the SPE version in description.ext class Params -> class d_MainTargets_num
42-
- Fixed: The "Team Alpha MG Gunner" slot still had the vanilla A3 mg gunner class instead of the SPE class in the SPE GER version
43-
- Fixed: If a unit is in Team Delta (engineer) and the class doesn't have the trait "engineer" it is added now (for example the SPE version had the problem)
44-
- Fixed: Smokeshells were missing in the CUP versions
45-
- Fixed: Using CUP UAV now instead of vanilla ones in the CUP blufor versions
46-
- Fixed: Respawning at SQL in a vehicle after beeing unconscious caused the player to stand in the vehicle
47-
- Updated: Added new SPE 1.1 classes and missing CfgRemoteExec entries
48-
- Updated: Korean translation, by kkim
49-
- Workaround: Zeus was not transfered to a logged in admin player object after respawn
50-
- Workaround: If some 3rd party mod/addon kills a camp at the main target (happens with some bombs using setdamage) change the camp to captured so that the main target can end
51-
- Opimizations (script profiling)
3+
- Fixed: Distribution to headless clients did not work at all anymore
4+
- Fixed: Currator status was gone after respawn
5+
- Fixed: Jail didn't work anymore ("Respawn" button disabled as long as a player is in jail to avoid further issues)
6+
- Fixed: Rollback fn_moduleCAS_guidedmissile.sqf to 4.69 to resolve problems with bomb drop skipping in a loop, by longtimegamer
7+
- Fixed: When creating an ambush group do not spawn an accompanying overwatch group, too many groups, by longtimegamer
8+
- Fixed: Do not create static, guard, patrol groups when preemptive event is running, by longtimegamer
9+
- Fixed: Some INDFOR groups did not have sniper, AT capabilities (RWR, ION, ION Arctic), by longtimegamer
10+
- Fixed: Disabled Dom menu UAV for DLCs withoutg UAVs (like SPE)

co30_Domination.Altis/client/fn_createdomusermenu.sqf

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,14 @@ if (d_with_ranked && {d_transf_allow == 0}) then {
117117
};
118118

119119
if (!d_with_ranked && {d_enable_extra_cas == 1}) then {
120-
d_DomUserMenu pushBack ["-", [0], "", -1, [["expression", ""]], "1", "1"];
121-
// create uav
122-
d_DomUserMenu pushBack [localize "STR_DOM_MISSIONSTRING_1327a", [call _fnc_inc_num], "", -5, [["expression", "60 call d_fnc_DomCommandingMenuExec"]], "1", "1"];
123-
};
120+
if (!d_d_gmcwg && {!d_gmcwgwinter && {!d_unsung && {!d_csla && {!d_vn && {!d_spe}}}}}) then {
121+
d_DomUserMenu pushBack ["-", [0], "", -1, [["expression", ""]], "1", "1"];
122+
// create uav
123+
d_DomUserMenu pushBack [localize "STR_DOM_MISSIONSTRING_1327a", [call _fnc_inc_num], "", -5, [["expression", "60 call d_fnc_DomCommandingMenuExec"]], "1", "1"];
124124

125-
if (!d_with_ranked && {d_player_can_call_arti > 0 && {d_enable_extra_cas == 1}}) then {
126-
// create combat uav
127-
d_DomUserMenu pushBack [localize "STR_DOM_MISSIONSTRING_1327b", [call _fnc_inc_num], "", -5, [["expression", "70 call d_fnc_DomCommandingMenuExec"]], "1", "1"];
125+
if (d_player_can_call_arti > 0) then {
126+
// create combat uav
127+
d_DomUserMenu pushBack [localize "STR_DOM_MISSIONSTRING_1327b", [call _fnc_inc_num], "", -5, [["expression", "70 call d_fnc_DomCommandingMenuExec"]], "1", "1"];
128+
};
129+
};
128130
};

co30_Domination.Altis/client/fn_intro.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ switch (d_MissionType) do {
119119
};
120120
};
121121

122-
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.70 </t>"], [safeZoneX + 0.1,safeZoneY + safeZoneH - 0.2,0.9,0.3], nil, 5, 1, 0] spawn BIS_fnc_textTiles;
122+
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.71 </t>"], [safeZoneX + 0.1,safeZoneY + safeZoneH - 0.2,0.9,0.3], nil, 5, 1, 0] spawn BIS_fnc_textTiles;
123123

124124
_camera camSetTarget player;
125125
_p_tpos = [_pspsxx # 0, _pspsxx # 1, (player modelToWorld [0,0,2]) # 2];

co30_Domination.Altis/client/fn_intro2.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ sleep 1;
7272
sleep 2;
7373
"d_rscmtexts" cutRsc ["d_rscmtexts", "PLAIN"];
7474

75-
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.70 </t>"], [safeZoneX + 0.1, safeZoneY + safeZoneH - 0.2, 0.9, 0.3], nil, 5, 1, 0] spawn BIS_fnc_textTiles;
75+
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.71 </t>"], [safeZoneX + 0.1, safeZoneY + safeZoneH - 0.2, 0.9, 0.3], nil, 5, 1, 0] spawn BIS_fnc_textTiles;
7676

7777
waitUntil {scriptDone _bfehandle};
7878
enableSaving [false, false];

co30_Domination.Altis/client/fn_jail.sqf

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,37 +90,45 @@ if (_todelete != -1) then {
9090

9191
["aj", d_player_uid, _jailobjects] remoteExecCall ["d_fnc_p_o_ar", 2];
9292

93+
__TRACE_1("","_pmovepos")
94+
9395
player setPos _pmovepos;
9496

9597
sleep 0.1;
9698
player setDamage 0;
9799

98-
private _movecheck_fnc = _pmovepos spawn {
100+
private _movecheck_fnc = [_pmovepos] spawn {
101+
params ["_pmovepos"];
102+
__TRACE_1("_movecheck_fnc","_pmovepos")
99103
scriptname "spawn jail3";
100104
private _notfirst = false;
101105
while {true} do {
102-
if (player distance _this > 12) then {
103-
player setPos _pmovepos;
104-
if (!_notfirst) then {
105-
_notfirst = true;
106-
(getPlayerUID player) remoteExecCall ["d_fnc_incjail", 2];
107-
d_player_jescape = d_player_jescape + 1;
108-
if (d_player_jescape > 10) then {
109-
0 spawn {
110-
scriptname "spawn jail4";
111-
"d_jescape" cutText [format ["<t color='#ffffff' size='2'>%1</t>", localize "STR_DOM_MISSIONSTRING_2043"], "PLAIN DOWN", -1, true, true];
112-
sleep 5;
113-
endMission "End2";
114-
forceEnd;
106+
if (alive player) then {
107+
if (player distance _pmovepos > 14) then {
108+
player setPos _pmovepos;
109+
if (!_notfirst) then {
110+
_notfirst = true;
111+
(getPlayerUID player) remoteExecCall ["d_fnc_incjail", 2];
112+
d_player_jescape = d_player_jescape + 1;
113+
if (d_player_jescape > 10) then {
114+
0 spawn {
115+
scriptname "spawn jail4";
116+
"d_jescape" cutText [format ["<t color='#ffffff' size='2'>%1</t>", localize "STR_DOM_MISSIONSTRING_2043"], "PLAIN DOWN", -1, true, true];
117+
sleep 5;
118+
endMission "End2";
119+
forceEnd;
120+
};
115121
};
116122
};
117123
};
118124
};
119125
sleep 1;
120126
};
127+
__TRACE_1("_movecheck_fnc","alive player")
121128
};
122129

123130
sleep 2;
131+
__TRACE("1 BLACK IN")
124132
cutText ["", "BLACK IN", 2];
125133
sleep 2;
126134

@@ -140,6 +148,7 @@ while {_secs > 0} do {
140148
"d_jail" cutText ["", "PLAIN"];
141149
"d_jail2" cutText ["", "PLAIN DOWN"];
142150

151+
__TRACE("2 BLACK OUT")
143152
cutText [localize "STR_DOM_MISSIONSTRING_2000", "BLACK OUT", 0];
144153

145154
sleep 2;
@@ -163,6 +172,7 @@ if (!d_carrier) then {
163172
} else {
164173
_respawn_pos set [2, (getPosASL D_FLAG_BASE) # 2];
165174
};
175+
__TRACE_1("","_respawn_pos")
166176
d_player_in_base = true;
167177
if (surfaceIsWater _respawn_pos) then {
168178
__TRACE("is water")
@@ -175,6 +185,7 @@ player setDamage 0;
175185
d_goto_jail = nil;
176186
player allowDamage true;
177187

188+
__TRACE("3 BLACK IN")
178189
cutText ["", "BLACK IN", 0.2];
179190

180191
__TRACE("Deleting objects")
@@ -188,4 +199,4 @@ if (isNil "d_goto_jail") then {
188199

189200
if (_enhmm) then {
190201
(findDisplay 46) displayRemoveEventHandler ["KeyDown", _keyeh];
191-
};
202+
};

co30_Domination.Altis/client/fn_prespawned.sqf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,3 @@ if (d_WithMHQTeleport == 0 && {d_WithRevive == 1}) then {
2929
} forEach d_player_vecs;
3030

3131
d_player_vecs = d_player_vecs - [-1];
32-

co30_Domination.Altis/client/fn_setupplayer.sqf

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ d_points_needed_18 = (d_points_needed # 6) + 200000;
502502
}, 5.12] call d_fnc_eachframeadd;
503503
};
504504

505-
diag_log "Internal D Version: 4.70";
505+
diag_log "Internal D Version: 4.71";
506506

507507
if (!d_no_ai) then {
508508
if (d_with_ai) then {
@@ -1393,4 +1393,13 @@ if (isMultiplayer) then {
13931393
// disable the FIR AWS dialog, use the internal one. Weapons like the GBU24 cause too much FPS drops
13941394
AWS_AMS_Disable = true;
13951395

1396+
[missionNamespace, "onGameInterrupt", {
1397+
params ["_disp"];
1398+
if (!isNil "d_goto_jail") then {
1399+
(_disp displayCtrl 1010) ctrlEnable false;
1400+
} else {
1401+
(_disp displayCtrl 1010) ctrlEnable true;
1402+
};
1403+
}] call BIS_fnc_addScriptedEventHandler;
1404+
13961405
diag_log [diag_frameno, diag_ticktime, time, "Dom x_setupplayer.sqf processed"];

co30_Domination.Altis/description.ext

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1995,7 +1995,7 @@ class Params {
19951995
class d_maxnum_tks_forkick {
19961996
title = "$STR_DOM_MISSIONSTRING_1197";
19971997
values[] = {1,2,3,5,10,20,30,40,1000000};
1998-
default = 10;
1998+
default = 3;
19991999
texts[] = {"1","2","3","5","10","20","30","40","$STR_DOM_MISSIONSTRING_1198"};
20002000
};
20012001

co30_Domination.Altis/mission.sqm

2.01 KB
Binary file not shown.

0 commit comments

Comments
 (0)