Skip to content

Commit

Permalink
4.71 maintenance release
Browse files Browse the repository at this point in the history
  • Loading branch information
Xeno69 committed Jan 21, 2025
1 parent 4be382e commit 2ffe81d
Show file tree
Hide file tree
Showing 48 changed files with 140 additions and 99 deletions.
52 changes: 52 additions & 0 deletions OldChangelogs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,58 @@ Changelogs

Old...

4.70

- Added: Civilian east Asian types from CFP and CUP mods, by longtimegamer
- Added: Some fighting vehicles are now available via airdrop if d_with_airdrop == 2 (ammo truck, APC, MRAP), by longtimegamer
- Added: 2.16 overrideHazeQuality is set to VeryLow in description.ext (check https://community.bistudio.com/wiki/Description.ext#overrideHazeQuality )
- Added: Faction for CUP Russian Ground Forces Winter, by longtimegamer
- Added: Faction Russian Armed Forces Summer (woodland/jungle), by longtimegamer
- Added: ION PMC Security Detail as INDFOR unit types, by longtimegamer
- Added: AI enhanced RPG attack on players when d_ai_aggressiveshoot == 2, by longtimegamer
- Added: Chance for sniper positions in tall buildings (not just overall max elevation), by longtimegamer
- Added: More initial viewdistance options, by longtimegamer
- Added: Destroyed vehicles persist until end of target when d_ai_persistent_corpses == 0, by longtimegamer
- 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
- Added: Server parameter "extra" isle defense includes AA if d_WithIsleDefense == 2, by longtimegamer
- 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
- Added: Notify the players when there are no parajump restrictions, by longtimegamer
- Added: Civilian cars parked closely together, less intersections blocked, some car types severely damaged, by longtimegamer
- Added: Faction Islamic State updated vehicles, updated infantry AT, by longtimegamer
- Added: Pylon loadout change for spawned drones
- Added: Rabbit rescue will announce if a player killed the rabbit, by longtimegamer
- Changed: Added new 2.18 scripting commands and scripting command changes
- Changed: AI group respawn times increased again
- Changed: Better messages if farp/mash position is too close to base or slope is too steep
- Changed: Filtering out handleDamage firing when no damage occurs and fake head hits
- Changed: JSDF Overhauled data for 4.69, by schalldampfer
- Changed: Additional no-HUD support, by longtimegamer
- Fixed: d_sum_camps > 0 before spawning target clear, by longtimegamer
- Fixed: Do not show virtual arsenal 3dmarker, flagpole beacon when streaming friendly or server-forced no-HUD, by longtimegamer
- Fixed: Statusbar rank did not show General
- Fixed: Unloaded static weapons created partially underground, by longtimegamer
- Fixed: Do not show airdrop message if streamfriendly is enabled, by longtimegamer
- Fixed: If tower under radio got deleted (for whatever reason) main target mission did not end
- 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
- Fixed: All mission start air vehicles at base can now be flown if you have 0 points (if database is enabled)
- Fixed: Proper random movement during "rabbit rescue" event, by longtimegamer
- Fixed: Small variation in direction of spawned civilian cars, by longtimegamer
- Fixed: Spawning a UAV is only available away from the the MHQ when d_enable_extra_cas == 1, by longtimegamer
- Fixed: Minor bug when spawning civilians and group limit is reached, by longtimegamer
- Fixed: Air Drop Aircraft map marker should be Air Drop Zone, by longtimegamer
- Fixed: If maintarget votes are a tie then target is selected randomly, by longtimegamer
- Fixed: texts array was missing in the SPE version in description.ext class Params -> class d_MainTargets_num
- 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
- 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)
- Fixed: Smokeshells were missing in the CUP versions
- Fixed: Using CUP UAV now instead of vanilla ones in the CUP blufor versions
- Fixed: Respawning at SQL in a vehicle after beeing unconscious caused the player to stand in the vehicle
- Updated: Added new SPE 1.1 classes and missing CfgRemoteExec entries
- Updated: Korean translation, by kkim
- Workaround: Zeus was not transfered to a logged in admin player object after respawn
- 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
- Opimizations (script profiling)

4.69

- Added: Lights at base and main target illumination (SPE flares module) in the SPE version because nights were too dark
Expand Down
59 changes: 9 additions & 50 deletions co30_Domination.Altis/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,51 +1,10 @@
4.70
4.71

- Added: Civilian east Asian types from CFP and CUP mods, by longtimegamer
- Added: Some fighting vehicles are now available via airdrop if d_with_airdrop == 2 (ammo truck, APC, MRAP), by longtimegamer
- Added: 2.16 overrideHazeQuality is set to VeryLow in description.ext (check https://community.bistudio.com/wiki/Description.ext#overrideHazeQuality )
- Added: Faction for CUP Russian Ground Forces Winter, by longtimegamer
- Added: Faction Russian Armed Forces Summer (woodland/jungle), by longtimegamer
- Added: ION PMC Security Detail as INDFOR unit types, by longtimegamer
- Added: AI enhanced RPG attack on players when d_ai_aggressiveshoot == 2, by longtimegamer
- Added: Chance for sniper positions in tall buildings (not just overall max elevation), by longtimegamer
- Added: More initial viewdistance options, by longtimegamer
- Added: Destroyed vehicles persist until end of target when d_ai_persistent_corpses == 0, by longtimegamer
- 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
- Added: Server parameter "extra" isle defense includes AA if d_WithIsleDefense == 2, by longtimegamer
- 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
- Added: Notify the players when there are no parajump restrictions, by longtimegamer
- Added: Civilian cars parked closely together, less intersections blocked, some car types severely damaged, by longtimegamer
- Added: Faction Islamic State updated vehicles, updated infantry AT, by longtimegamer
- Added: Pylon loadout change for spawned drones
- Added: Rabbit rescue will announce if a player killed the rabbit, by longtimegamer
- Changed: Added new 2.18 scripting commands and scripting command changes
- Changed: AI group respawn times increased again
- Changed: Better messages if farp/mash position is too close to base or slope is too steep
- Changed: Filtering out handleDamage firing when no damage occurs and fake head hits
- Changed: JSDF Overhauled data for 4.69, by schalldampfer
- Changed: Additional no-HUD support, by longtimegamer
- Fixed: d_sum_camps > 0 before spawning target clear, by longtimegamer
- Fixed: Do not show virtual arsenal 3dmarker, flagpole beacon when streaming friendly or server-forced no-HUD, by longtimegamer
- Fixed: Statusbar rank did not show General
- Fixed: Unloaded static weapons created partially underground, by longtimegamer
- Fixed: Do not show airdrop message if streamfriendly is enabled, by longtimegamer
- Fixed: If tower under radio got deleted (for whatever reason) main target mission did not end
- 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
- Fixed: All mission start air vehicles at base can now be flown if you have 0 points (if database is enabled)
- Fixed: Proper random movement during "rabbit rescue" event, by longtimegamer
- Fixed: Small variation in direction of spawned civilian cars, by longtimegamer
- Fixed: Spawning a UAV is only available away from the the MHQ when d_enable_extra_cas == 1, by longtimegamer
- Fixed: Minor bug when spawning civilians and group limit is reached, by longtimegamer
- Fixed: Air Drop Aircraft map marker should be Air Drop Zone, by longtimegamer
- Fixed: If maintarget votes are a tie then target is selected randomly, by longtimegamer
- Fixed: texts array was missing in the SPE version in description.ext class Params -> class d_MainTargets_num
- 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
- 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)
- Fixed: Smokeshells were missing in the CUP versions
- Fixed: Using CUP UAV now instead of vanilla ones in the CUP blufor versions
- Fixed: Respawning at SQL in a vehicle after beeing unconscious caused the player to stand in the vehicle
- Updated: Added new SPE 1.1 classes and missing CfgRemoteExec entries
- Updated: Korean translation, by kkim
- Workaround: Zeus was not transfered to a logged in admin player object after respawn
- 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
- Opimizations (script profiling)
- Fixed: Distribution to headless clients did not work at all anymore
- Fixed: Currator status was gone after respawn
- Fixed: Jail didn't work anymore ("Respawn" button disabled as long as a player is in jail to avoid further issues)
- Fixed: Rollback fn_moduleCAS_guidedmissile.sqf to 4.69 to resolve problems with bomb drop skipping in a loop, by longtimegamer
- Fixed: When creating an ambush group do not spawn an accompanying overwatch group, too many groups, by longtimegamer
- Fixed: Do not create static, guard, patrol groups when preemptive event is running, by longtimegamer
- Fixed: Some INDFOR groups did not have sniper, AT capabilities (RWR, ION, ION Arctic), by longtimegamer
- Fixed: Disabled Dom menu UAV for DLCs withoutg UAVs (like SPE)
16 changes: 9 additions & 7 deletions co30_Domination.Altis/client/fn_createdomusermenu.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,14 @@ if (d_with_ranked && {d_transf_allow == 0}) then {
};

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

if (!d_with_ranked && {d_player_can_call_arti > 0 && {d_enable_extra_cas == 1}}) then {
// create combat uav
d_DomUserMenu pushBack [localize "STR_DOM_MISSIONSTRING_1327b", [call _fnc_inc_num], "", -5, [["expression", "70 call d_fnc_DomCommandingMenuExec"]], "1", "1"];
if (d_player_can_call_arti > 0) then {
// create combat uav
d_DomUserMenu pushBack [localize "STR_DOM_MISSIONSTRING_1327b", [call _fnc_inc_num], "", -5, [["expression", "70 call d_fnc_DomCommandingMenuExec"]], "1", "1"];
};
};
};
2 changes: 1 addition & 1 deletion co30_Domination.Altis/client/fn_intro.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,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.70 </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.71 </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];
Expand Down
2 changes: 1 addition & 1 deletion co30_Domination.Altis/client/fn_intro2.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ sleep 1;
sleep 2;
"d_rscmtexts" cutRsc ["d_rscmtexts", "PLAIN"];

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

waitUntil {scriptDone _bfehandle};
enableSaving [false, false];
Expand Down
41 changes: 26 additions & 15 deletions co30_Domination.Altis/client/fn_jail.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -90,37 +90,45 @@ if (_todelete != -1) then {

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

__TRACE_1("","_pmovepos")

player setPos _pmovepos;

sleep 0.1;
player setDamage 0;

private _movecheck_fnc = _pmovepos spawn {
private _movecheck_fnc = [_pmovepos] spawn {
params ["_pmovepos"];
__TRACE_1("_movecheck_fnc","_pmovepos")
scriptname "spawn jail3";
private _notfirst = false;
while {true} do {
if (player distance _this > 12) then {
player setPos _pmovepos;
if (!_notfirst) then {
_notfirst = true;
(getPlayerUID player) remoteExecCall ["d_fnc_incjail", 2];
d_player_jescape = d_player_jescape + 1;
if (d_player_jescape > 10) then {
0 spawn {
scriptname "spawn jail4";
"d_jescape" cutText [format ["<t color='#ffffff' size='2'>%1</t>", localize "STR_DOM_MISSIONSTRING_2043"], "PLAIN DOWN", -1, true, true];
sleep 5;
endMission "End2";
forceEnd;
if (alive player) then {
if (player distance _pmovepos > 14) then {
player setPos _pmovepos;
if (!_notfirst) then {
_notfirst = true;
(getPlayerUID player) remoteExecCall ["d_fnc_incjail", 2];
d_player_jescape = d_player_jescape + 1;
if (d_player_jescape > 10) then {
0 spawn {
scriptname "spawn jail4";
"d_jescape" cutText [format ["<t color='#ffffff' size='2'>%1</t>", localize "STR_DOM_MISSIONSTRING_2043"], "PLAIN DOWN", -1, true, true];
sleep 5;
endMission "End2";
forceEnd;
};
};
};
};
};
sleep 1;
};
__TRACE_1("_movecheck_fnc","alive player")
};

sleep 2;
__TRACE("1 BLACK IN")
cutText ["", "BLACK IN", 2];
sleep 2;

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

__TRACE("2 BLACK OUT")
cutText [localize "STR_DOM_MISSIONSTRING_2000", "BLACK OUT", 0];

sleep 2;
Expand All @@ -163,6 +172,7 @@ if (!d_carrier) then {
} else {
_respawn_pos set [2, (getPosASL D_FLAG_BASE) # 2];
};
__TRACE_1("","_respawn_pos")
d_player_in_base = true;
if (surfaceIsWater _respawn_pos) then {
__TRACE("is water")
Expand All @@ -175,6 +185,7 @@ player setDamage 0;
d_goto_jail = nil;
player allowDamage true;

__TRACE("3 BLACK IN")
cutText ["", "BLACK IN", 0.2];

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

if (_enhmm) then {
(findDisplay 46) displayRemoveEventHandler ["KeyDown", _keyeh];
};
};
1 change: 0 additions & 1 deletion co30_Domination.Altis/client/fn_prespawned.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ if (d_WithMHQTeleport == 0 && {d_WithRevive == 1}) then {
} forEach d_player_vecs;

d_player_vecs = d_player_vecs - [-1];

11 changes: 10 additions & 1 deletion co30_Domination.Altis/client/fn_setupplayer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ d_points_needed_18 = (d_points_needed # 6) + 200000;
}, 5.12] call d_fnc_eachframeadd;
};

diag_log "Internal D Version: 4.70";
diag_log "Internal D Version: 4.71";

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

[missionNamespace, "onGameInterrupt", {
params ["_disp"];
if (!isNil "d_goto_jail") then {
(_disp displayCtrl 1010) ctrlEnable false;
} else {
(_disp displayCtrl 1010) ctrlEnable true;
};
}] call BIS_fnc_addScriptedEventHandler;

diag_log [diag_frameno, diag_ticktime, time, "Dom x_setupplayer.sqf processed"];
2 changes: 1 addition & 1 deletion co30_Domination.Altis/description.ext
Original file line number Diff line number Diff line change
Expand Up @@ -1995,7 +1995,7 @@ class Params {
class d_maxnum_tks_forkick {
title = "$STR_DOM_MISSIONSTRING_1197";
values[] = {1,2,3,5,10,20,30,40,1000000};
default = 10;
default = 3;
texts[] = {"1","2","3","5","10","20","30","40","$STR_DOM_MISSIONSTRING_1198"};
};

Expand Down
Binary file modified co30_Domination.Altis/mission.sqm
Binary file not shown.
2 changes: 1 addition & 1 deletion co30_Domination.Altis/server/fn_acurator.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ private _ltime = _newu getVariable "d_lr_ti";

if (isNil "_ltime") exitWith {};

if (time - _ltime > 10) exitWith {};
if (time - _ltime < 10) exitWith {};

_newu assignCurator _cur;
14 changes: 14 additions & 0 deletions co30_Domination.Altis/server/fn_addgrp2hc.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,18 @@ if (d_hc_array isEqualTo []) exitWith {};

d_hc_array = d_hc_array - [objNull, grpNull];

__TRACE_1("","d_hc_array")

if (d_hc_array isEqualTo []) exitWith {};

if (count d_hc_array == 1) then {
_this setGroupOwner (owner (d_hc_array # 0));
#ifdef __DEBUG__
_this spawn {
sleep 5;
diag_log ["group move:", _this, "groupOwner :", groupOwner _this, "local:", local _this];
};
#endif
#ifdef __TT__
if (d_with_ace && {!isNil {_this getVariable "d_ktypett"}}) then {
_this remoteExecCall ["d_fnc_addgrhcace", owner (d_hc_array # 0)];
Expand All @@ -26,6 +34,12 @@ if (count d_hc_array == 1) then {
};

_this setGroupOwner (owner (d_hc_array # d_hc_counter));
#ifdef __DEBUG__
_this spawn {
sleep 5;
diag_log ["group move:", _this, "groupOwner :", groupOwner _this, "local:", local _this];
};
#endif
#ifdef __TT__
if (d_with_ace && {!isNil {_this getVariable "d_ktypett"}}) then {
_this remoteExecCall ["d_fnc_addgrhcace", owner (d_hc_array # d_hc_counter)];
Expand Down
5 changes: 2 additions & 3 deletions co30_Domination.Altis/server/fn_airai.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ while {true} do {
_grp allowFleeing 0;
_grp setCombatMode "RED";
_grp enableAttack true;
_grp call d_fnc_addgrp2hc;

while {true} do {
sleep 0.323;
Expand All @@ -169,7 +168,7 @@ while {true} do {
private _wp = _grp addWayPoint [d_cur_tgt_pos, 0];
_wp setWaypointType "SAD";
private _pat_pos =+ d_cur_tgt_pos;
[_grp, 1] setWaypointStatements ["never", ""];
[_grp, 1] setWaypointStatements ["true", ""];
_wp setWaypointCompletionRadius 50;
private _old_pos = [0,0,0];
private _xcounter = 0;
Expand Down Expand Up @@ -238,7 +237,7 @@ _pat_pos set [2, _cur_tgt_pos select 2]
_x flyInHeight _height;
_x flyInHeightASL _heightASL;
} forEach (_vehicles select {alive _x});
sleep 35.821 + random 15;
sleep 16.821 + random 15;
} else {
__patternpos;
_pat_pos = _pat_pos call d_fnc_WorldBoundsCheck;
Expand Down
1 change: 1 addition & 0 deletions co30_Domination.Altis/server/fn_createdrop.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ if (_may_exit) exitWith {
4 remoteExecCall ["d_fnc_dropansw", _player];
};
};
_unit doMove _end_pos;
sleep 30;
while {_chopper distance2D _end_pos > 600} do {
sleep 3.14;
Expand Down
12 changes: 6 additions & 6 deletions co30_Domination.Altis/server/fn_initPlayerServer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,14 @@ if (isNull _pl) exitWith {
diag_log "This may break scripts!!!!";
};

if (remoteExecutedOwner != owner _pl || {_pl isKindOf "VirtualSpectator_F"}) exitWith {
__TRACE_2("","_pl","owner _pl")
};

private _plid = getPlayerID _pl;

__TRACE_1("","_plid")
__TRACE_1("","getUserInfo _plid")

if (_plid getUserInfo 7) exitWith {
__TRACE_2("","_pl","owner _pl")
#ifdef __DEBUG__
diag_log ["Dom initplayerserver headleass client connected"];
diag_log ["Dom initplayerserver headless client connected"];
#endif
d_hc_array pushBack _pl;
if (time > 10) then {
Expand All @@ -40,6 +36,10 @@ if (_plid getUserInfo 7) exitWith {
};
};

if (remoteExecutedOwner != owner _pl || {_pl isKindOf "VirtualSpectator_F"}) exitWith {
__TRACE_2("","_pl","owner _pl")
};

private _uid = _plid getUserInfo 2;

if (_uid isEqualTo "") exitWith {
Expand Down
Loading

0 comments on commit 2ffe81d

Please sign in to comment.