Skip to content

Commit

Permalink
transmission lost, russians see progress
Browse files Browse the repository at this point in the history
  • Loading branch information
nomisum committed Nov 14, 2015
1 parent fae1a40 commit 8ddbcba
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 1 deletion.
9 changes: 9 additions & 0 deletions description.ext
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,13 @@ class CfgSounds
// subtitle delay in seconds, subtitle text
titles[] = {1, ""};
};
class signal_lost
{
// how the sound is referred to in the editor (e.g. trigger effects)
name = "signal_lost";
// filename, volume, pitch
sound[] = {"sounds\signal_lost.ogg", 1, 1};
// subtitle delay in seconds, subtitle text
titles[] = {1, ""};
};
};
1 change: 1 addition & 0 deletions init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ if (hasInterface) then {
[] execVM "player\russianMarker.sqf"; diag_log format ["setup: russianmarker initiated"];
[] execVM "player\opforBluforTeleportListener.sqf"; diag_log format ["setup: opforBluforTeleportListener initiated"];
[] execVM "player\opforOpforTeleportListener.sqf"; diag_log format ["setup: opforOpforTeleportListener initiated"];
[] execVM "player\bluforRussianPointsListener.sqf";
[] spawn checkJIP; diag_log format ["setup: createStartHints initiated"];
};

Expand Down
Binary file added pic/rus_satellite_badge_lost.paa
Binary file not shown.
Binary file added pic/us_satellite_badge_lost.paa
Binary file not shown.
2 changes: 1 addition & 1 deletion player/bluforRussianPointsListener.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bluforShowPointsWarning = {
_points = _this;
_pointsRatio = _points / POINTS_NEEDED_FOR_VICTORY;
if (_pointsRatio >= bluforShowPointsNextWarning) then { // alle 10% die Warnung
_string = "Die Russen haben schon " + (str (round(_pointsRatio * 100))) + " Prozent gesendet.";
_string = localize "str_GRAD_transmissionTime_1" + (str (round(_pointsRatio * 100))) + localize "str_GRAD_transmissionTime_2";
[_string] call EFUNC(common,displayTextStructured);
bluforShowPointsNextWarning = bluforShowPointsNextWarning + 0.1;
};
Expand Down
11 changes: 11 additions & 0 deletions player/russianMarker.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ markerAnimation = {
};

markerAnimationIsRunning = false;
call endTransmissionEffects;
};

ensureMarkerAnimation = {
Expand All @@ -52,6 +53,16 @@ ensureMarkerAnimation = {
};
};

endTransmissionEffects = {
playSound "signal_lost";
if (playerSide == west) then {
cutRsc ["gui_intel_paper_us_lost","PLAIN",0];
} else {
cutRsc ["gui_intel_paper_rus_lost","PLAIN",0];
};

};

_RUSSIAN_MARKER_POS_listener = {
"opfor_marker" setMarkerPosLocal (_this select 1);
};
Expand Down
Binary file added sounds/signal_lost.ogg
Binary file not shown.
40 changes: 40 additions & 0 deletions spawn/gui/_dialogs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1273,6 +1273,26 @@ class RscTitles {
};
};

class gui_intel_paper_us_lost
{
idd = -1;
duration = 10;
name = "gui_intel_paper_us_lost";
fadeOut = 5;

class controls {
class gui_intel_paper_pic: RscPicture
{
idc = -1;
x = safeZoneX + safeZoneW - 0.3;
y = safeZoneY + safeZoneH - 1.5;
w = 0.3;
h = 0.4;
text = "pic\us_satellite_badge_lost.paa";
};
};
};

class gui_intel_paper_rus
{
idd = -1;
Expand All @@ -1293,6 +1313,26 @@ class RscTitles {
};
};

class gui_intel_paper_rus_lost
{
idd = -1;
duration = 10;
name = "gui_intel_paper_rus_lost";
fadeOut = 5;

class controls {
class gui_intel_paper_pic: RscPicture
{
idc = -1;
x = safeZoneX + safeZoneW - 0.3;
y = safeZoneY + safeZoneH - 1.5;
w = 0.3;
h = 0.4;
text = "pic\rus_satellite_badge_lost.paa";
};
};
};

class gui_blufor_pleasewait
{
idd = -1;
Expand Down
10 changes: 10 additions & 0 deletions stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,16 @@
<English>OPFOR spawned. BLUFOR may spawn now.</English>
<German>OPFOR ist gespawned. BLUFOR kann jetzt spawnen.</German>
</Key>
<Key ID="str_GRAD_transmissionTime_1">
<Original>The Russians already sent </Original>
<English>The Russians already sent</English>
<German>Die Russen haben schon </German>
</Key>
<Key ID="str_GRAD_transmissionTime_2">
<Original>percent.</Original>
<English>percent.</English>
<German>Prozent gesendet.</German>
</Key>
<Key ID="str_GRAD_endPlacement">
<Original>End Placement</Original>
<English>End Placement</English>
Expand Down

0 comments on commit 8ddbcba

Please sign in to comment.