Skip to content

Commit

Permalink
Added: RADIOPROTOCOL for the player can be disabled in the Status Dia…
Browse files Browse the repository at this point in the history 
…log (not sure yet if it really does what it should)
  • Loading branch information
@Xeno69
Xeno69 committed Jan 28, 2021
1 parent 67979f6 commit e7d8ceb
Show file tree
Hide file tree
Showing 20 changed files with 99 additions and 5 deletions.
1 change: 1 addition & 0 deletions CurrentChangelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ATTENTION: The following mission file(s) has/have changed: TT Malden
- Added: If a SQL database is available then number of player headshots and number of rounds fired are added to the database
- Added: Main target illumination flares when it is dark (can be disabled in lobby "Illuminate main target:" or d_IllumMainTarget in description.ext)
- Added: Parameter to enable/disable static weapon defenses at maintarget, by longtimegamer
- Added: RADIOPROTOCOL for the player can be disabled in the Status Dialog (not sure yet if it really does what it should)
- Changed: CAS with very short cooldown (90 secs) if artillery is set to unlimited, by longtimegamer
- Changed: Added visibility check for player and AI names over the head, means, players see the names above head if the unit is visible and not all the time
- Changed: Maintarget prisoner event now has a suicide bomb if the rescue is botched, by longtimegamer
Expand Down
1 change: 1 addition & 0 deletions co30_Domination.Altis/changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ATTENTION: The following mission file(s) has/have changed: TT Malden
- Added: If a SQL database is available then number of player headshots and number of rounds fired are added to the database
- Added: Main target illumination flares when it is dark (can be disabled in lobby "Illuminate main target:" or d_IllumMainTarget in description.ext)
- Added: Parameter to enable/disable static weapon defenses at maintarget, by longtimegamer
- Added: RADIOPROTOCOL for the player can be disabled in the Status Dialog (not sure yet if it really does what it should)
- Changed: CAS with very short cooldown (90 secs) if artillery is set to unlimited, by longtimegamer
- Changed: Added visibility check for player and AI names over the head, means, players see the names above head if the unit is visible and not all the time
- Changed: Maintarget prisoner event now has a suicide bomb if the rescue is botched, by longtimegamer
Expand Down
4 changes: 4 additions & 0 deletions co30_Domination.Altis/client/fn_setupplayer.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ if (isStreamFriendlyUIEnabled || {d_force_isstreamfriendlyui == 1}) then {

[player, "NoVoice"] remoteExecCall ["setSpeaker", -2, false];

if (d_player_radioprotocol) then {
player disableAI "RADIOPROTOCOL";
};

player setVariable ["d_tk_cutofft", time + 3];
player setVariable ["xr_pluncon", false];
["dom_alive_not_uncon", {call d_fnc_canu}] call d_fnc_eachframeadd;
Expand Down
2 changes: 2 additions & 0 deletions co30_Domination.Altis/clientui/fn_recruitbuttonaction.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ _unit addEventhandler ["getInMan", {call d_fnc_getinmanai}];

if (d_ai_silent == 1) then {
[_unit, "NoVoice"] remoteExecCall ["setSpeaker", -2, false];

_unit disableAI "RADIOPROTOCOL";
};

player setVariable ["d_recdbusy", false];
13 changes: 13 additions & 0 deletions co30_Domination.Altis/clientui/fn_statusdialoginit.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,19 @@ __ctrl2(1610) ctrlAddEventHandler ["CheckedChanged", {
}];
#endif

__ctrl2(1612) cbSetChecked d_player_radioprotocol;
__ctrl2(1612) ctrlAddEventHandler ["CheckedChanged", {
d_player_radioprotocol = !d_player_radioprotocol;
if (d_player_radioprotocol) then {
systemChat (localize "STR_DOM_MISSIONSTRING_2054");
player disableAI "RADIOPROTOCOL";
} else {
systemChat (localize "STR_DOM_MISSIONSTRING_2053");
player enableAI "RADIOPROTOCOL";
};
profileNamespace setVariable ["dom_player_radioprotocol", d_player_radioprotocol];
}];

for "_i" from 1 to 20 do {
private _usera = (str (actionKeysNamesArray format ["User%1", _i])) splitString "[,]";
private _endstr = (localize format ["str_usract_user_%1", _i]);
Expand Down
2 changes: 2 additions & 0 deletions co30_Domination.Altis/d_init.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ if (hasInterface) then {
d_ak_teamswitch = actionKeys "TeamSwitch";
d_ak_hra = actionKeys "HeliRopeAction";
d_ak_hslm = actionKeys "HeliSlingLoadManager";

d_player_radioprotocol = profileNamespace getVariable ["dom_player_radioprotocol", false];

if (isMultiplayer) then {
["d_server_name", [500, 500], "ICON", "ColorYellow", [2, 2], format ["%1 %2", localize "STR_DOM_MISSIONSTRING_1583a", serverName], 0, "hd_dot"] call d_fnc_CreateMarkerLocal;
Expand Down
2 changes: 1 addition & 1 deletion co30_Domination.Altis/description.ext
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ default = 7;
class d_with_ai {
title = "$STR_DOM_MISSIONSTRING_1023";
values[] = {0,1,2};
default = 1;
default = 0;
texts[] = {"$STR_DOM_MISSIONSTRING_922","$STR_DOM_MISSIONSTRING_1007","$STR_DOM_MISSIONSTRING_2038"};
};

Expand Down
16 changes: 14 additions & 2 deletions co30_Domination.Altis/dlg/StatusDialog.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,17 +393,29 @@ class D_StatusDialog {
#ifndef __TT__
class AutoVDCaption: ViewDistanceCaption {
idc = 1609;
y = "0.42 * safezoneH + safezoneY";
y = "0.40 * safezoneH + safezoneY";
text = "$STR_DOM_MISSIONSTRING_1964";
};
class AutoVDCheckBox: RscCheckBox {
idc = 1610;
x = "0.48 * safezoneW + safezoneX";
y = "0.424 * safezoneH + safezoneY";
y = "0.404 * safezoneH + safezoneY";
w = "0.02 * safezoneW";
h = "0.025 * safezoneH";
};
#endif
class RadioProtocolCaption: ViewDistanceCaption {
idc = 1611;
y = "0.43 * safezoneH + safezoneY";
text = "$STR_DOM_MISSIONSTRING_2052";
};
class RadioProtocolCheckBox: RscCheckBox {
idc = 1612;
x = "0.48 * safezoneW + safezoneX";
y = "0.434 * safezoneH + safezoneY";
w = "0.02 * safezoneW";
h = "0.025 * safezoneH";
};
class EarplugsUserCaption: ViewDistanceCaption {
idc = 3301;
y = "0.47 * safezoneH + safezoneY";
Expand Down
Binary file modified co30_Domination.Altis/mission.sqm
View file
Binary file not shown.
2 changes: 0 additions & 2 deletions co30_Domination.Altis/revive/fn_killedeh.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
#define THIS_FILE "fn_killedeh.sqf"
#include "..\x_macros.sqf"

if (!hasInterface) exitWith {};

__TRACE_1("start","_this")
player setVariable ["xr_presptime", 6];
setPlayerRespawnTime 6;
Expand Down
36 changes: 36 additions & 0 deletions co30_Domination.Altis/stringtable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13910,6 +13910,42 @@
<Chinesesimp>Disable ACE medical revive (if ACE is used) and use mission revive</Chinesesimp>
<French>Disable ACE medical revive (if ACE is used) and use mission revive</French>
</Key>
<Key ID="STR_DOM_MISSIONSTRING_2052">
<English>Disable RADIOPROTOCOL for the player unit:</English>
<Spanish>Disable RADIOPROTOCOL for the player unit:</Spanish>
<Portuguese>Disable RADIOPROTOCOL for the player unit:</Portuguese>
<Korean>Disable RADIOPROTOCOL for the player unit:</Korean>
<Japanese>Disable RADIOPROTOCOL for the player unit:</Japanese>
<Original>Disable RADIOPROTOCOL for the player unit:</Original>
<Russian>Disable RADIOPROTOCOL for the player unit:</Russian>
<Chinesesimp>Disable RADIOPROTOCOL for the player unit:</Chinesesimp>
<Chinese>Disable RADIOPROTOCOL for the player unit:</Chinese>
<French>Disable RADIOPROTOCOL for the player unit:</French>
</Key>
<Key ID="STR_DOM_MISSIONSTRING_2053">
<English>RADIOPROTOCOL for the player enabled!</English>
<Spanish>RADIOPROTOCOL for the player enabled!</Spanish>
<Portuguese>RADIOPROTOCOL for the player enabled!</Portuguese>
<Korean>RADIOPROTOCOL for the player enabled!</Korean>
<Japanese>RADIOPROTOCOL for the player enabled!</Japanese>
<Original>RADIOPROTOCOL for the player enabled!</Original>
<Russian>RADIOPROTOCOL for the player enabled!</Russian>
<Chinesesimp>RADIOPROTOCOL for the player enabled!</Chinesesimp>
<Chinese>RADIOPROTOCOL for the player enabled!</Chinese>
<French>RADIOPROTOCOL for the player enabled!</French>
</Key>
<Key ID="STR_DOM_MISSIONSTRING_2054">
<English>RADIOPROTOCOL for the player disabled!</English>
<Spanish>RADIOPROTOCOL for the player disabled!</Spanish>
<Portuguese>RADIOPROTOCOL for the player disabled!</Portuguese>
<Korean>RADIOPROTOCOL for the player disabled!</Korean>
<Japanese>RADIOPROTOCOL for the player disabled!</Japanese>
<Original>RADIOPROTOCOL for the player disabled!</Original>
<Russian>RADIOPROTOCOL for the player disabled!</Russian>
<Chinesesimp>RADIOPROTOCOL for the player disabled!</Chinesesimp>
<Chinese>RADIOPROTOCOL for the player disabled!</Chinese>
<French>RADIOPROTOCOL for the player disabled!</French>
</Key>
</Container>
</Package>
</Project>
1 change: 1 addition & 0 deletions dom_maker/co40_domination_4_42_blufor.altis.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Mikero=DePbo.dll
3 changes: 3 additions & 0 deletions missing_translations/Chinese.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,6 @@ STR_DOM_MISSIONSTRING_2048
STR_DOM_MISSIONSTRING_2049
STR_DOM_MISSIONSTRING_STATICWEAPONS
STR_DOM_MISSIONSTRING_2051
STR_DOM_MISSIONSTRING_2052
STR_DOM_MISSIONSTRING_2053
STR_DOM_MISSIONSTRING_2054
3 changes: 3 additions & 0 deletions missing_translations/Chinesesimp.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ STR_DOM_MISSIONSTRING_2048
STR_DOM_MISSIONSTRING_2049
STR_DOM_MISSIONSTRING_STATICWEAPONS
STR_DOM_MISSIONSTRING_2051
STR_DOM_MISSIONSTRING_2052
STR_DOM_MISSIONSTRING_2053
STR_DOM_MISSIONSTRING_2054
3 changes: 3 additions & 0 deletions missing_translations/French.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,6 @@ STR_DOM_MISSIONSTRING_2048
STR_DOM_MISSIONSTRING_2049
STR_DOM_MISSIONSTRING_STATICWEAPONS
STR_DOM_MISSIONSTRING_2051
STR_DOM_MISSIONSTRING_2052
STR_DOM_MISSIONSTRING_2053
STR_DOM_MISSIONSTRING_2054
3 changes: 3 additions & 0 deletions missing_translations/Japanese.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,3 +350,6 @@ STR_DOM_MISSIONSTRING_2049
STR_DOM_MISSIONSTRING_2050
STR_DOM_MISSIONSTRING_STATICWEAPONS
STR_DOM_MISSIONSTRING_2051
STR_DOM_MISSIONSTRING_2052
STR_DOM_MISSIONSTRING_2053
STR_DOM_MISSIONSTRING_2054
3 changes: 3 additions & 0 deletions missing_translations/Korean.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ STR_DOM_MISSIONSTRING_2049
STR_DOM_MISSIONSTRING_2050
STR_DOM_MISSIONSTRING_STATICWEAPONS
STR_DOM_MISSIONSTRING_2051
STR_DOM_MISSIONSTRING_2052
STR_DOM_MISSIONSTRING_2053
STR_DOM_MISSIONSTRING_2054
3 changes: 3 additions & 0 deletions missing_translations/Portuguese.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,6 @@ STR_DOM_MISSIONSTRING_2048
STR_DOM_MISSIONSTRING_2049
STR_DOM_MISSIONSTRING_STATICWEAPONS
STR_DOM_MISSIONSTRING_2051
STR_DOM_MISSIONSTRING_2052
STR_DOM_MISSIONSTRING_2053
STR_DOM_MISSIONSTRING_2054
3 changes: 3 additions & 0 deletions missing_translations/Russian.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
STR_DOM_MISSIONSTRING_2052
STR_DOM_MISSIONSTRING_2053
STR_DOM_MISSIONSTRING_2054
3 changes: 3 additions & 0 deletions missing_translations/Spanish.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,6 @@ STR_DOM_MISSIONSTRING_2048
STR_DOM_MISSIONSTRING_2049
STR_DOM_MISSIONSTRING_STATICWEAPONS
STR_DOM_MISSIONSTRING_2051
STR_DOM_MISSIONSTRING_2052
STR_DOM_MISSIONSTRING_2053
STR_DOM_MISSIONSTRING_2054

0 comments on commit e7d8ceb

Please sign in to comment.