Skip to content

Commit accd400

Browse files
committed
Fixed other instances of incorrect parameters in mission dialogue
Changed other instances of 'PAPABEAR sideChat ...' into proper format
1 parent e236ce1 commit accd400

File tree

7 files changed

+10
-11
lines changed

7 files changed

+10
-11
lines changed

source/WARCOM/WARCOM_gps_marker.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ WARCOM_marker_num = WARCOM_marker_num + 1;
2222
if (_units_alive<=0) exitWith { // IF ALL DEAD, EXIT.
2323
str(_markername) setMarkerColor "ColorRed";
2424
str(_markername) setMarkerType "waypoint";
25-
PAPABEAR sidechat format["To all units, this is HQ, Task force %1 just got wiped out. Stay alert",_TFname];
25+
[west, "PAPA_BEAR"] sidechat format["To all units, this is HQ, Task force %1 just got wiped out. Stay alert",_TFname];
2626
sleep 600;
2727
deleteMarker str(_markername);
2828
};

source/initHQ/BluHQinit.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ _trg5 setTriggerStatements["this", format["[""%1"",thislist] execvm 'enterlocati
2828
_trgWarning=createTrigger["EmptyDetector",_hqblu];
2929
_trgWarning setTriggerArea[300,300,0,false];
3030
_trgWarning setTriggerActivation["EAST","PRESENT",true];
31-
_trgWarning setTriggerStatements["this","PAPABEAR sidechat 'This is HQ, there are enemies near our main base!'", ""];
31+
_trgWarning setTriggerStatements["this","[west, ""PAPA_BEAR""] sidechat 'This is HQ, there are enemies near our main base!'", ""];
3232

3333
// CREATE THE OFFICER
3434
_group = createGroup west;

source/missions/stratmap.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _allFound = false;
44
_counter = 0;
55

66
if (isnil ("Mission_timeout_request")) then {Mission_timeout_request = true;};
7-
if (!Mission_timeout_request) exitWith {PAPABEAR=[West,"HQ"]; PAPABEAR SideChat "We don't have any other missions for you right now.";};
7+
if (!Mission_timeout_request) exitWith {[west, "PAPA_BEAR"] SideChat "We don't have any other missions for you right now.";};
88
if (!((vehiclevarname player) in game_master)) exitWith {hint "Only the host can request side missions for now"};
99

1010
startLoadingScreen ["Loading zones..."];

source/serverinit.sqf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ can_get_mission = true;publicVariable "can_get_mission";
8686
failsafe_zones_not_found = false;publicVariable "failsafe_zones_not_found";
8787
createcenter sideLogic;
8888
LogicGroup = createGroup SideLogic;publicVariable "LogicGroup";
89-
PAPABEAR=[West,"HQ"];publicVariable "PAPABEAR";
9089
locator_hq_actived = false;publicVariable "locator_hq_actived";
9190
op_zones_index = 0;publicVariable "op_zones_index";
9291
clientisSync = false;publicVariable "clientisSync";

source/support/fob.sqf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if (0 == _foundPickupPos select 0 && 0 == _foundPickupPos select 1) exitWith {
5454

5555
commandpointsblu1 = commandpointsblu1 - 10;
5656
publicVariable "commandpointsblu1";
57-
PAPABEAR sidechat "Roger that, the FOB is being deployed...";
57+
[west, "PAPA_BEAR"] sidechat "Roger that, the FOB is being deployed...";
5858

5959
_fobname = [1] call compile preprocessFile "random_name.sqf";
6060
// create marker on FOB
@@ -96,7 +96,7 @@ _fob addaction ["<t color='#ff0000'>Fortify FOB(4CP)</t>","inithq\fortifyFOB.sqf
9696
[_foundPickupPos, _size] execvm "createpatrol.sqf";
9797
[_foundPickupPos, _size] execvm "createpatrol.sqf";
9898

99-
PAPABEAR sidechat "The FOB has been deployed.";
99+
[west, "PAPA_BEAR"] sidechat "The FOB has been deployed.";
100100

101101
_handle = [_foundPickupPos, _fob] execVM "initHQ\guardsFOB.sqf";
102102

@@ -113,7 +113,7 @@ _trg23 setTriggerStatements["this", format["[""FOB %1"",thislist] execvm 'enterl
113113
_trgWarning=createTrigger["EmptyDetector",_foundPickupPos];
114114
_trgWarning setTriggerArea[300,300,0,false];
115115
_trgWarning setTriggerActivation["EAST","PRESENT",true];
116-
_trgWarning setTriggerStatements["this",format["PAPABEAR sidechat 'This is HQ, enemies have been reported around FOB %1'",_fobname], ""];
116+
_trgWarning setTriggerStatements["this",format["[west, ""PAPA_BEAR""] sidechat 'This is HQ, enemies have been reported around FOB %1'",_fobname], ""];
117117

118118
//ADD THE FOB TO Array_of_FOBS
119119
fobSwitch = true; // tell that this is the player who created the FOB (to avoid variableEventHandler to trigger)

source/support/sitrep.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ saveGame;
1010

1111
sleep 0.5;
1212
["sitrepinfo",["SITREP","The game has been saved"]] call bis_fnc_showNotification;
13-
PAPABEAR sidechat format["SITREP received, we have %1 command points and our army power is at %2",commandpointsblu1,WARCOM_blufor_ap];
13+
[west, "PAPA_BEAR"] sidechat format["SITREP received, we have %1 command points and our army power is at %2",commandpointsblu1,WARCOM_blufor_ap];
1414
sleep 1;
1515
[] execVM "misc\bottom_right_message.sqf";
1616
};

source/support/uav_map.sqf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ str(_markername) setMarkerSize [_checkedRadius, _checkedRadius];
1414
str(_markername) setMarkerAlpha 0.5;
1515

1616

17-
PAPABEAR SideChat "The UAV has been sent at the designated coordinates, please standby for further intel.";
17+
[west, "PAPA_BEAR"] SideChat "The UAV has been sent at the designated coordinates, please standby for further intel.";
1818
sleep 20;
19-
PAPABEAR SideChat "Collecting data from the UAV...";
19+
[west, "PAPA_BEAR"] SideChat "Collecting data from the UAV...";
2020
sleep 7;
21-
PAPABEAR SideChat "We've sent the last known location of the enemy to your map. The UAV is returning to the base";
21+
[west, "PAPA_BEAR"] SideChat "We've sent the last known location of the enemy to your map. The UAV is returning to the base";
2222

2323

2424
/////////////////// THIS PART IS EAST /////

0 commit comments

Comments
 (0)