Skip to content

Commit

Permalink
woodland camo, prp3 for brm1k, t72 nerf, delay in loadout, cssa3 exit
Browse files Browse the repository at this point in the history
jip fix
  • Loading branch information
nomisum committed Nov 9, 2015
1 parent d82cee7 commit fae1a40
Show file tree
Hide file tree
Showing 10 changed files with 38,049 additions and 11 deletions.
6,820 changes: 6,820 additions & 0 deletions 2342-out.log

Large diffs are not rendered by default.

88 changes: 88 additions & 0 deletions CSSA3/exitCSSA3.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
((findDisplay 49) displayCtrl 1010) ctrlEnable true;
with missionnamespace do {
_cam = missionnamespace getvariable ["CSSA3_mainCamera",objnull];
_cam cameraeffect ["terminate","back"];
vehicle player switchCamera "INTERNAL";
camdestroy _cam;

CSSA3_mainCamera = nil;
BIS_fnc_camera_target = nil;
};

//If task force radio is enabled, turn off spectator mode.
[
"CfgPatches",
"task_force_radio",
"[player, false] call TFAR_fnc_forceSpectator;"
] call CSSA3_fnc_classExists;

//If ACRE2 is enabled, turn off spectator mode.
[
"CfgPatches",
"acre_main",
"[false] call acre_api_fnc_setSpectator;"
] call CSSA3_fnc_classExists;

//Destroy variables. With fire... and pitchforks.
uiNameSpace setVariable ['CSSA3_mainHUD',nil];

if (!isNil {CSSA3_target} && {!isNull CSSA3_target}) then {deleteVehicle CSSA3_target};

CSSA3_LMB = nil;
CSSA3_RMB = nil;
CSSA3_lmbDown = nil;
CSSA3_fromRose = nil;
CSSA3_canChangeUnit = nil;
CSSA3_isDraggingLB = nil;
CSSA3_favourites = nil;
CSSA3_perspective = nil;
CSSA3_selectedTab = nil;
CSSA3_keys = nil;
CSSA3_LMBclick = nil;
CSSA3_RMBclick = nil;
CSSA3_pitchbank = nil;
CSSA3_fov = nil;
CSSA3_iconCamera = nil;
CSSA3_vision = nil;
CSSA3_visibleHUD = nil;
CSSA3_settings_shown = nil;
CSSA3_settings = nil;
CSSA_fnc_DrawLine3D = nil;
CSSA3_target = nil;
CSSA3_3dpCamPos = nil;
zamf_var_allUnitsPos = nil;

if !(isNil {CSSA3_fnc_DrawLine3D}) then
{
removemissioneventhandler ["draw3d",CSSA3_fnc_DrawLine3D];
CSSA3_fnc_DrawLine3D = nil;
};

camusenvg false;
false SetCamUseTi 0;

//Reapply underwater PP effects.
/*_null = [] spawn {
//suffocating
BIS_SuffCC = ppEffectCreate ["ColorCorrections", 1610];
// init PP to avoid artefacts after going under water.
BIS_SuffCC ppEffectAdjust [1,1,0,[0, 0, 0, 0 ],[1, 1, 1, 1],[0,0,0,0], [-1, -1, 0, 0, 0, 0.001, 0.5]];
BIS_SuffRadialBlur = ppEffectCreate ["RadialBlur", 270];
BIS_SuffBlur = ppEffectCreate ["DynamicBlur", 170];
};*/

cuttext ["","plain"];
deleteVehicle CSSA3_placeHolder;

enableradio true;

//Ensure that camera is set to player.
if (alive player && {cameraon != player}) then {
player switchCamera "INTERNAL";
};

// [] spawn CSSA3_fnc_forceReopen;

diag_log text "[CSSA3 Notice]: CSSA3 Exited. (fn_CSSA3_mainFunctions)";
1 change: 1 addition & 0 deletions GRAD_replay/playback/playback.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "\z\ace\addons\main\script_component.hpp"
[] execVM "CSSA3\exitCSSA3.sqf";

[{["Starting Replay."] call EFUNC(common,displayTextStructured);},"BIS_fnc_spawn",true,true] call BIS_fnc_MP;
[{openMap [true,false];},"BIS_fnc_spawn",true,true] call BIS_fnc_MP;
Expand Down
31,120 changes: 31,120 additions & 0 deletions arma3_2015-11-02_18-40-35.rpt

Large diffs are not rendered by default.

16 changes: 12 additions & 4 deletions init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ if (!isMultiplayer) then { // Editor
};



if (isServer) then {
// allow view distance to be up to 10k

Expand Down Expand Up @@ -124,7 +125,9 @@ if (isServer) then {
[] execVM "server\russianMarker.sqf";
[] execVM "server\teleportListener.sqf";

{if (!isPlayer _x) then {[_x] execVM "loadouts\_client.sqf";};} forEach allUnits;
[] spawn {
{if (!isPlayer _x) then {sleep 0.5; [_x] execVM "loadouts\_client.sqf"};} forEach allUnits;
};

};
diag_log format ["setup: server done"];
Expand Down Expand Up @@ -157,9 +160,9 @@ if (hasInterface) then {
} else {
if (!didJIP) exitWith {[] call checkSpawnButton;};
if (playerSide == east) then {
[RUS_VEHICLE_SPAWN, 50] execVM "helpers\teleportPlayer.sqf";
[OPFOR_TELEPORT_TARGET, 50] execVM "helpers\teleportPlayer.sqf";
} else {
[US_VEHICLE_SPAWN, 50] execVM "helpers\teleportPlayer.sqf";
[BLUFOR_TELEPORT_TARGET, 50] execVM "helpers\teleportPlayer.sqf";
};
};
};
Expand Down Expand Up @@ -206,7 +209,12 @@ if (hasInterface) then {


[] execVM "player\allXXXSurrenderedListener.sqf"; diag_log format ["setup: surrenderlistener initiated"];
[player] execVM "loadouts\_client.sqf"; diag_log format ["setup: loadouts initiated"];
// [player] execVM "loadouts\_client.sqf";
[] spawn {
sleep (random 10);
[player] execVM "loadouts\_client.sqf"; diag_log format ["setup: loadout %1 initiated",player];
};


[] execVM "spawn\hedgehogAssemblingSystem.sqf";
[] execVM "spawn\addInteractions.sqf";
Expand Down
2 changes: 1 addition & 1 deletion islandConfig.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ISLANDS = [
];
// pos blufor, pos opfor, water around map?, woodcamo, name
ISLAND_TARGET_POSITIONS = [
[ [14300,16200], [14600, 16700], true, false, 'Altis'],
[ [14300,16200], [14600, 16700], true, true, 'Altis'],
[ [3000, 5400], [3900, 4900], true, true,'Bornholm' ],
[ [4100,11000], [4860, 9740], true, true,'Chernarus'],
[ [4100,11000], [4860, 9740], true, true,'Chernarus_Summer'],
Expand Down
2 changes: 1 addition & 1 deletion loadouts/_client.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ waitUntil { !isNull _unit };
//["loadouts processed for _unit %1",typeOf _unit] call BIS_fnc_logFormat;




switch (typeOf _unit) do {

Expand Down
2 changes: 1 addition & 1 deletion spawn/gui/_dialogs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class russianSupplyGUI
y = 3.5 * GUI_GRID_H + GUI_GRID_Y;
w = 7 * GUI_GRID_W;
h = 6 * GUI_GRID_H;
text = "spawn\gui\pic\rus_brm1k.paa";
text = "spawn\gui\pic\rus_prp3.paa";
};

class russian_gui_pic_6: RscPicture
Expand Down
9 changes: 5 additions & 4 deletions spawn/gui/addPublicVariableEventhandler.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ fillRussianSupplies = {
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6<br/>%7','Crew: 3','Seats: 15 (8 on top)','Speed: 83','','Weapons:','50x9 14.5mm','250x5 7.62mm']
],
[
"rhs_brm1k_vdv",
"BRM1K",
"rhs_prp3_vdv",
"PRP-3",
2,
2500,
"<t align='center'>2500 cr</t>",
Expand All @@ -127,7 +127,7 @@ fillRussianSupplies = {
clearBackpackCargoGlobal (_this select 0);
clearMagazineCargoGlobal (_this select 0);
},
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6<br/>%7,<br/>%8','Crew: 4','Seats: 2','Speed: 60','','Weapons:','20 PG15V (Cannon)','250x7 7.62mm','6 Smoke']
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6<br/>%7,<br/>%8','Crew: 4','Seats: 0','Speed: 60','','Weapons:','250x7 7.62mm','6 Smoke','Illumination Mortar']
],
[
"rhs_t72ba_tv",
Expand All @@ -142,8 +142,9 @@ fillRussianSupplies = {
clearItemCargoGlobal (_this select 0);
clearBackpackCargoGlobal (_this select 0);
clearMagazineCargoGlobal (_this select 0);
(_this select 0) removemagazinesturret ["rhs_mag_3of26_5",[0]];
},
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6<br/>%7,<br/>%8<br/>%9,<br/>%10','Crew: 3','Speed: 60','','Weapons:','4x3 9M119','4x7 3BM42 KE','6x3 3BK18M HEAT','5x3 30F26 HE','250x7 7.62mm','8 Smoke']
format['%1<br/>%2<br/>%3<br/>%4<br/>%5<br/>%6<br/>%7,<br/>%8<br/>%9,<br/>%10','Crew: 3','Speed: 60','','Weapons:','4x3 9M119','4x7 3BM42 KE','6x3 3BK18M HEAT','no HE!','250x7 7.62mm','8 Smoke']
],
[
"Ace_Box_Ammo",
Expand Down
Binary file added spawn/gui/pic/rus_prp3.paa
Binary file not shown.

0 comments on commit fae1a40

Please sign in to comment.