Skip to content

Commit ebcec4a

Browse files
fritogotlayedfritogotlayed
committed
Merge pull request #7 from fritogotlayed/MiscCleanup1
Made the code indented closer to java / C# standards. Merging since this is reformatting work.
2 parents 4d63664 + 4901947 commit ebcec4a

21 files changed

+919
-998
lines changed

‎source/INIT.sqf‎

Lines changed: 205 additions & 226 deletions
Large diffs are not rendered by default.

‎source/captured.sqf‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ _markername = _this select 2;
44
_markername2 = _this select 3;
55
_triggerPos = _this select 4;
66

7-
87
amount_zones_captured = amount_zones_captured + 1;
98
publicVariable "amount_zones_captured";
109
["us_takencontrol",[_place]] call bis_fnc_showNotification;
@@ -15,19 +14,18 @@ WARCOM_zones_controled_by_BLUFOR = WARCOM_zones_controled_by_BLUFOR + [_triggerP
1514
// REMOVE A ZONE FROM OPFOR CONTROL
1615
_index = 0;
1716
{
18-
if ((_x select 0 == _triggerPos select 0) && (_x select 1 == _triggerPos select 1) && (_x select 2 == _triggerPos select 2)) exitWith {
19-
WARCOM_zones_controled_by_OPFOR set [_index,-1];
20-
WARCOM_zones_controled_by_OPFOR = WARCOM_zones_controled_by_OPFOR - [-1];
21-
};
22-
_index = _index + 1;
17+
if ((_x select 0 == _triggerPos select 0) && (_x select 1 == _triggerPos select 1) && (_x select 2 == _triggerPos select 2)) exitWith {
18+
WARCOM_zones_controled_by_OPFOR set [_index,-1];
19+
WARCOM_zones_controled_by_OPFOR = WARCOM_zones_controled_by_OPFOR - [-1];
20+
};
21+
_index = _index + 1;
2322
} forEach WARCOM_zones_controled_by_OPFOR;
2423

25-
2624
// ADD POINTS
2725
if (isServer) then {
28-
_points = round(_points/3);
29-
commandpointsblu1 = commandpointsblu1 + _points;
30-
publicVariable "commandpointsblu1";
26+
_points = round(_points/3);
27+
commandpointsblu1 = commandpointsblu1 + _points;
28+
publicVariable "commandpointsblu1";
3129
};
3230

3331
// ADD NUMBER OF CONTROLLED ZONES
@@ -44,7 +42,7 @@ _addzone = [] execVM "persistent\persistent_stats_zones_add.sqf";
4442

4543
// MODIFY MARKER ICON
4644
str(_markername) setMarkerColor "ColorGreen";
47-
// hint str(_markername);
45+
4846
// MODIFY MARKER ELLIPSE
4947
str(_markername2) setMarkerColor "ColorGreen";
5048

@@ -58,7 +56,4 @@ call compile format["_trg = trigger%1%2",round (_triggerPos select 0),round (_tr
5856

5957
//// MAKE THE TRIGGER CAPTURABLE FOR OPFOR
6058
_trg setTriggerActivation["EAST SEIZED","PRESENT",true];
61-
_trg setTriggerStatements["this", format["[""%1"",%2,""%3"",""%4"",%5] execvm 'zonescap\opfor_cap.sqf'",_place,_points,_markername,_markername2,_triggerPos], ""];
62-
63-
64-
59+
_trg setTriggerStatements["this", format["[""%1"",%2,""%3"",""%4"",%5] execvm 'zonescap\opfor_cap.sqf'",_place,_points,_markername,_markername2,_triggerPos], ""];

‎source/createopfortified.sqf‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
_position = _this select 0;
22

3-
43
// hint format["%1",_position];
54

6-
_group = [_position, EAST, ["O_Soldier_SL_F","O_Soldier_AA_F","O_Soldier_AT_F","O_Soldier_GL_F","O_Soldier_TL_F","O_Soldier_AR_F","O_Soldier_LAT_F","O_Soldier_GL_F"],[],[],opfor_ai_skill] call BIS_fnc_spawnGroup;
5+
_group = [
6+
_position,
7+
EAST, [
8+
"O_Soldier_SL_F",
9+
"O_Soldier_AA_F",
10+
"O_Soldier_AT_F",
11+
"O_Soldier_GL_F",
12+
"O_Soldier_TL_F",
13+
"O_Soldier_AR_F",
14+
"O_Soldier_LAT_F",
15+
"O_Soldier_GL_F"],
16+
[],
17+
[],
18+
opfor_ai_skill] call BIS_fnc_spawnGroup;
719
[_group, _position] call bis_fnc_taskDefend;
820

921
// ADD QRF eventhandler

‎source/createopteam.sqf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
_position = _this select 0;
55
_radius = _this select 1;
66

7-
87
// hint format["%1",_position];
98

109
_group = [_position, EAST, ["O_Soldier_TL_F","O_Soldier_AR_F","O_Soldier_LAT_F","O_Soldier_GL_F"],[],[],opfor_ai_skill] call BIS_fnc_spawnGroup;

‎source/createpatrol.sqf‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
_position = _this select 0;
55
_radius = _this select 1;
66

7-
8-
97
_group = [_position, WEST, ["B_Soldier_TL_F","B_Soldier_F"]] call BIS_fnc_spawnGroup;
108
_patrolRadius = round(_radius/3);
11-
[_group, _position, _patrolRadius] call bis_fnc_taskPatrol;
12-
13-
9+
[_group, _position, _patrolRadius] call bis_fnc_taskPatrol;

‎source/debriefing.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class CfgDebriefing
99
picture = "\a3\ui_f\data\gui\cfg\hints\UnitType_ca.paa";
1010
pictureColor[] = {0.0,0,1,1};
1111
};
12+
1213
class officerkilled
1314
{
1415
title = "HQ Officer Killed";

‎source/description.ext‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ onLoadName = "Dynamic Universal WAR System - Rebirth (DUWS-R)";
33
dev = "dev";
44
author = "DUWS-R Team";
55
//briefingName = "briefingname";
6-
overviewText = "A procedurally generated campaign where you earn resources, execute missions and lead the BLUFOR forces to capture the island and win the war. Play the way you want: be a spec ops, a squad leader or control a whole army, the choice is yours. (In the future, the DUWS-R will feature persistent elements that allow you to play a single campaign throughout multiple islands.)";
6+
overviewText = "A procedurally generated campaign where you earn resources, execute missions and lead the BLUFOR forces to capture the island and win the war. Play the way you want: be a spec ops, a squad leader or control a whole army, the choice is yours.";
77
//overviewPicture = "\a3\Missions_F_Beta\data\img\showcase_commanding_I_overview_ca.paa";
88
overviewPicture = "rtipic.paa";
99
LoadScreen = "rtipic.paa";
@@ -40,4 +40,4 @@ class CfgFunctions
4040
#include "taw_vd\CfgFunctions.hpp"
4141
};
4242

43-
// VAS INIT END --
43+
// VAS INIT END --

‎source/enterlocation.sqf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sleep 0.5;
66
["location_enter",[_place]] call bis_fnc_showNotification;
77

88
waitUntil {
9-
count _trigger < 1;
9+
count _trigger < 1;
1010
};
11-
["location_leave",[_place]] call bis_fnc_showNotification;
1211

12+
["location_leave",[_place]] call bis_fnc_showNotification;

‎source/hints.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
class CfgHints
22
{
3-
class Mainclass
4-
{
5-
displayName = "Main class";
6-
class wtf
7-
{
8-
arguments[] = {[["MoveForward"]],[["SwimUp"]],[["SwimDown"]],[["MoveForward"]],[["MoveBack"]],[["TurnLeft"]],[["TurnRight"]]};
9-
description = "%1%2Aim down and move forward %11 to dive.%1%2Ascend with %12.%1%2Descend with %13.%1%2Move with %14, %15, %16, %17.";
10-
displayName = "DERPING";
11-
image = "\a3\ui_f\data\gui\cfg\hints\BasicDive_ca.paa";
12-
tip = "Equip a re-breather to a vest slot to supply oxygen for longer dives. For clear underwater vision, equip diving goggles to the goggles slot.";
13-
};
14-
};
3+
class Mainclass
4+
{
5+
displayName = "Main class";
6+
class wtf
7+
{
8+
arguments[] = {[["MoveForward"]],[["SwimUp"]],[["SwimDown"]],[["MoveForward"]],[["MoveBack"]],[["TurnLeft"]],[["TurnRight"]]};
9+
description = "%1%2Aim down and move forward %11 to dive.%1%2Ascend with %12.%1%2Descend with %13.%1%2Move with %14, %15, %16, %17.";
10+
displayName = "DERPING";
11+
image = "\a3\ui_f\data\gui\cfg\hints\BasicDive_ca.paa";
12+
tip = "Equip a re-breather to a vest slot to supply oxygen for longer dives. For clear underwater vision, equip diving goggles to the goggles slot.";
13+
};
14+
};
1515
};

0 commit comments

Comments
 (0)