Skip to content

Commit eb9afef

Browse files
armazacarmazac
authored
Merge pull request #188 from ArmaOverthrow/dev
Merging in Jaffa's PRs
2 parents 29659eb + d4fad84 commit eb9afef

5 files changed

Lines changed: 32 additions & 29 deletions

File tree

‎addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/initVar.sqf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";
139139
OT_NATO_Vehicles_AirSupport = ["B_Heli_Attack_01_F"];
140140
OT_NATO_Vehicles_AirSupport_Small = ["B_Heli_Light_01_armed_F"];
141141
OT_NATO_Vehicles_GroundSupport = ["B_T_MRAP_01_gmg_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F"];
142-
OT_NATO_Vehicles_TankSupport = ["B_MBT_01_TUSK_F","B_MBT_01_cannon_F"];
143-
OT_NATO_Vehicles_Convoy = ["B_UGV_01_rcws_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F"];
142+
OT_NATO_Vehicles_TankSupport = ["B_T_MBT_01_TUSK_F","B_T_MBT_01_cannon_F"];
143+
OT_NATO_Vehicles_Convoy = ["B_T_UGV_01_rcws_olive_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F"];
144144
OT_NATO_Vehicles_AirWingedSupport = ["B_Plane_CAS_01_F"];
145145
OT_NATO_Vehicle_AirTransport_Small = "B_Heli_Transport_01_camo_F";
146146
OT_NATO_Vehicle_AirTransport = ["B_Heli_Transport_03_F","B_Heli_Transport_01_F","B_Heli_Transport_01_F"];
147147
OT_NATO_Vehicle_AirTransport_Large = "B_Heli_Transport_03_F";
148-
OT_NATO_Vehicle_Boat_Small = "B_Boat_Armed_01_minigun_F";
148+
OT_NATO_Vehicle_Boat_Small = "B_T_Boat_Armed_01_minigun_F";
149149
OT_NATO_Vehicles_APC = ["B_T_APC_Wheeled_01_cannon_F"];
150150

151151
OT_NATO_Sandbag_Curved = "Land_BagFence_01_round_green_F";

‎addons/overthrow_main/campaign/missions/OverthrowSpTanoa.Tanoa/initVar.sqf‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ OT_clothes_mob = "U_I_C_Soldier_Camo_F";
8686

8787
//NATO stuff
8888
OT_NATO_HMG = "B_HMG_01_high_F";
89-
9089
OT_NATO_Vehicles_AirGarrison = [
9190
["B_T_VTOL_01_vehicle_F",1],
9291
["B_T_VTOL_01_infantry_F",1],
@@ -97,15 +96,15 @@ OT_NATO_Vehicles_AirGarrison = [
9796
["B_Heli_Transport_01_F",2]
9897
];
9998

100-
OT_NATO_Vehicles_JetGarrison = [
101-
["B_Plane_CAS_01_F",1]
102-
];
103-
10499
OT_NATO_Vehicles_StaticAAGarrison = [
105100
"B_T_static_AA_F",
106101
"B_T_static_AA_F"
107102
]; //Added to every airfield
108103

104+
OT_NATO_Vehicles_JetGarrison = [
105+
["B_Plane_CAS_01_F",1]
106+
];
107+
109108
if(OT_hasJetsDLC) then {
110109
OT_NATO_Vehicles_JetGarrison pushback ["B_Plane_Fighter_01_F",1];
111110
OT_NATO_Vehicles_JetGarrison pushback ["B_Plane_Fighter_01_Stealth_F",1];
@@ -140,13 +139,13 @@ OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";
140139
OT_NATO_Vehicles_AirSupport = ["B_Heli_Attack_01_F"];
141140
OT_NATO_Vehicles_AirSupport_Small = ["B_Heli_Light_01_armed_F"];
142141
OT_NATO_Vehicles_GroundSupport = ["B_T_MRAP_01_gmg_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F"];
143-
OT_NATO_Vehicles_TankSupport = ["B_MBT_01_TUSK_F","B_MBT_01_cannon_F"];
144-
OT_NATO_Vehicles_Convoy = ["B_UGV_01_rcws_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F"];
142+
OT_NATO_Vehicles_TankSupport = ["B_T_MBT_01_TUSK_F","B_T_MBT_01_cannon_F"];
143+
OT_NATO_Vehicles_Convoy = ["B_T_UGV_01_rcws_olive_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F"];
145144
OT_NATO_Vehicles_AirWingedSupport = ["B_Plane_CAS_01_F"];
146145
OT_NATO_Vehicle_AirTransport_Small = "B_Heli_Transport_01_camo_F";
147146
OT_NATO_Vehicle_AirTransport = ["B_Heli_Transport_03_F","B_Heli_Transport_01_F","B_Heli_Transport_01_F"];
148147
OT_NATO_Vehicle_AirTransport_Large = "B_Heli_Transport_03_F";
149-
OT_NATO_Vehicle_Boat_Small = "B_Boat_Armed_01_minigun_F";
148+
OT_NATO_Vehicle_Boat_Small = "B_T_Boat_Armed_01_minigun_F";
150149
OT_NATO_Vehicles_APC = ["B_T_APC_Wheeled_01_cannon_F"];
151150

152151
OT_NATO_Sandbag_Curved = "Land_BagFence_01_round_green_F";

‎addons/overthrow_main/functions/actions/fn_recruitSpawnCiv.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(({side _x isEqualTo west || side _x isEqualTo east} count ((getpos player) ne
77
private _price = [OT_nation,"CIV",100] call OT_fnc_getPrice;
88
private _money = player getVariable ["money",0];
99

10-
if(_money < _price) exitWith {format ["You need $%1",_cost] call OT_fnc_notifyMinor};
10+
if(_money < _price) exitWith {format ["You need $%1",_price] call OT_fnc_notifyMinor};
1111
playSound "3DEN_notificationDefault";
1212
[-_price] call OT_fnc_money;
1313

‎addons/overthrow_main/functions/player/fn_statsSystemLoop.sqf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ if(!isNil "_qrfstart" && (time - _qrfstart) < 600) then {
2929
_mins = floor(_secs / 60);
3030
_secs = round(_secs % 60);
3131
};
32+
if(_mins < 10) then {_mins = format["0%1",_mins]};
3233
if(_secs < 10) then {_secs = format["0%1",_secs]};
33-
_qrf = format["<t size='0.7'>Battle of %1</t><br/>Starting (0%2:%3)",_attacking,_mins,_secs];
34+
_qrf = format["<t size='0.7'>Battle of %1</t><br/>Starting (%2:%3)",_attacking,_mins,_secs];
3435
};
3536

3637
if(!isNil "_qrfstart" && (time - _qrfstart) > 600) then {

‎addons/overthrow_main/functions/save/fn_savePlayerData.sqf‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,32 @@ private _uid = getPlayerUid _player;
44
private _data = [];
55

66
{
7-
private _v = _player getVariable [_x,""];
8-
if(_x isEqualTo "home" && !(_v isEqualType [])) then {
9-
_owned = (_player getVariable "owned");
10-
if(count _owned isEqualTo 0) then {
11-
diag_log format["Warning: Player %1 owns no buildings to be set as home",name _player];
12-
//fallback to current pos
13-
_v = getpos _player;
14-
}else{
15-
_buildid = _owned select 0;
16-
_pos = buildingpositions getVariable [_buildid,[]];
17-
if(count _pos isEqualTo 0) then {
7+
private _v = _player getVariable _x;
8+
if (!isNil "_v") then {
9+
if(_x isEqualTo "home" && !(_v isEqualType [])) then {
10+
_owned = (_player getVariable "owned");
11+
if(count _owned isEqualTo 0) then {
12+
diag_log format["Warning: Player %1 owns no buildings to be set as home",name _player];
1813
//fallback to current pos
19-
_v = getpos player;
14+
_v = getpos _player;
2015
}else{
21-
_v = _pos;
16+
_buildid = _owned select 0;
17+
_pos = buildingpositions getVariable [_buildid,[]];
18+
if(count _pos isEqualTo 0) then {
19+
//fallback to current pos
20+
_v = getpos player;
21+
}else{
22+
_v = _pos;
23+
};
2224
};
2325
};
26+
_data pushback [_x,_v];
2427
};
25-
_data pushback [_x,_v];
2628
}foreach(allVariables _player select {
2729
_x = toLower _x;
28-
!(_x in ["ot_loaded", "morale", "player_uid", "sa_tow_actions_loaded", "hiding", "randomValue", "saved3deninventory", "babe_em_vars"])
29-
&& { !((_x select [0,4]) in ["ace_", "cba_", "bis_"]) }
30+
!(_x in ["ot_loaded", "morale", "player_uid", "hiding", "randomValue", "saved3deninventory", "babe_em_vars"])
31+
&& { !((_x select [0,4]) in ["ace_", "cba_", "bis_", "aur_"]) }
32+
&& { !((_x select [0,3]) in ["sa_", "ar_"]) }
3033
&& { (_x select [0,11]) != "missiondata" }
3134
&& { (_x select [0,9]) != "seencache"}
3235
});

0 commit comments

Comments
 (0)