Skip to content

Commit 7c9fd00

Browse files
armazacarmazac
committed
bugfixes
1 parent b882205 commit 7c9fd00

21 files changed

Lines changed: 139 additions & 60 deletions

‎addons/overthrow_main/campaign/missions/Overthrow.Altis/initVar.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ OT_airportTerminals = ["Land_Airport_01_terminal_F","Land_Airport_02_terminal_F"
157157
OT_portBuilding = "Land_WarehouseShelter_01_F";
158158
OT_policeStation = "Land_Cargo_House_V3_F";
159159
OT_warehouse = "Land_Warehouse_03_F";
160-
OT_warehouses = [OT_warehouse];
160+
OT_warehouses = [OT_warehouse,"Land_dp_smallFactory_F","Land_i_Shed_Ind_F"];
161161
OT_barracks = "Land_Barracks_01_grey_F";
162162
OT_workshopBuilding = "Land_Cargo_House_V4_F";
163163
OT_refugeeCamp = "Land_Medevac_house_V1_F";

‎addons/overthrow_main/campaign/missions/Overthrow.Malden/data/objectives.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OT_objectiveData = [
22
[[9346.16,3783.97,0],"Malden Naval Base",400],
33
[[9687.4,3910.9,0],"East Island Base",800],
4-
[[1263.34,689.933,0],"Faro Base",400],
4+
[[1216.21,621.646,0],"Faro Base",400],
55
[[4917.22,8658.72,0],"Larche Base",250],
66
[[5384.13,3698.11,0],"Chemical Plant",600],
77
[[5111.3,7349.41,0],"Arudy Base",250]

‎addons/overthrow_main/campaign/missions/Overthrow.Malden/initVar.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ OT_airportTerminals = ["Land_Airport_01_terminal_F","Land_Airport_02_terminal_F"
157157
OT_portBuilding = "Land_WarehouseShelter_01_F";
158158
OT_policeStation = "Land_Cargo_House_V3_F";
159159
OT_warehouse = "Land_Warehouse_03_F";
160-
OT_warehouses = [OT_warehouse];
160+
OT_warehouses = [OT_warehouse,"Land_dp_smallFactory_F","Land_i_Shed_Ind_F"];
161161
OT_barracks = "Land_Barracks_01_grey_F";
162162
OT_workshopBuilding = "Land_Cargo_House_V4_F";
163163
OT_refugeeCamp = "Land_Medevac_house_V1_F";

‎addons/overthrow_main/campaign/missions/Overthrow.Malden/mission.sqm‎

Lines changed: 52 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ class EditorData
88
toggles=521;
99
class ItemIDProvider
1010
{
11-
nextID=2185;
11+
nextID=2191;
1212
};
1313
class MarkerIDProvider
1414
{
1515
nextID=55;
1616
};
1717
class LayerIndexProvider
1818
{
19-
nextID=464;
19+
nextID=469;
2020
};
2121
class Camera
2222
{
23-
pos[]={9183.4248,278.67508,3141.479};
24-
dir[]={-0.83506131,-0.27595153,0.47605035};
25-
up[]={-0.23975331,0.96115732,0.13667786};
26-
aside[]={0.49527794,1.3224781e-007,0.868792};
23+
pos[]={7854.2075,43.982349,3087.0303};
24+
dir[]={-0.43173364,-0.42325979,0.79659659};
25+
up[]={-0.20169996,0.90598685,0.3721588};
26+
aside[]={0.87922704,6.5295171e-007,0.4765175};
2727
};
2828
};
2929
binarizationWanted=0;
@@ -55,13 +55,15 @@ addons[]=
5555
"ace_ui",
5656
"A3_Modules_F_Curator_Curator",
5757
"A3_Structures_F_Mil_Cargo",
58-
"A3_Structures_F_Ind_DieselPowerPlant"
58+
"A3_Structures_F_Ind_DieselPowerPlant",
59+
"A3_Structures_F_Exp_Industrial_Port",
60+
"A3_Structures_F_Ind_Cargo"
5961
};
6062
class AddonsMetaData
6163
{
6264
class List
6365
{
64-
items=24;
66+
items=25;
6567
class Item0
6668
{
6769
className="A3_Ui_F";
@@ -230,6 +232,13 @@ class AddonsMetaData
230232
author="Bohemia Interactive";
231233
url="https://www.arma3.com";
232234
};
235+
class Item24
236+
{
237+
className="A3_Structures_F_Exp_Industrial";
238+
name="Arma 3 Apex - Industrial Structures";
239+
author="Bohemia Interactive";
240+
url="https://www.arma3.com";
241+
};
233242
};
234243
};
235244
class DynamicSimulation
@@ -684,7 +693,7 @@ class Mission
684693
};
685694
class Entities
686695
{
687-
items=81;
696+
items=83;
688697
class Item0
689698
{
690699
dataType="Layer";
@@ -695,7 +704,7 @@ class Mission
695704
class Item1
696705
{
697706
dataType="Marker";
698-
position[]={7814.208,0,3132.3101};
707+
position[]={7817.9106,0,3111.6802};
699708
name="port_1";
700709
type="loc_Quay";
701710
id=1598;
@@ -6855,6 +6864,39 @@ class Mission
68556864
type="Land_Cargo_Patrol_V1_F";
68566865
atlOffset=-2.3841858e-007;
68576866
};
6867+
class Item81
6868+
{
6869+
dataType="Object";
6870+
class PositionInfo
6871+
{
6872+
position[]={7817.6577,9.1076508,3111.8335};
6873+
angles[]={0,4.4632244,0};
6874+
};
6875+
side="Empty";
6876+
flags=5;
6877+
class Attributes
6878+
{
6879+
};
6880+
id=2185;
6881+
type="Land_WarehouseShelter_01_F";
6882+
atlOffset=4.7683716e-007;
6883+
};
6884+
class Item82
6885+
{
6886+
dataType="Object";
6887+
class PositionInfo
6888+
{
6889+
position[]={7811.9946,7.59831,3111.0527};
6890+
angles[]={-0,1.2748219,0};
6891+
};
6892+
side="Empty";
6893+
flags=4;
6894+
class Attributes
6895+
{
6896+
};
6897+
id=2187;
6898+
type="Land_Cargo40_military_green_F";
6899+
};
68586900
};
68596901
class Connections
68606902
{

‎addons/overthrow_main/functions/AI/fn_initVCOMAI.sqf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ _Unit setSkill ["spotDistance",1];
7373
_Unit setSkill ["spotTime",1];
7474
_Unit setSkill ["courage",(0.7 + (random 0.3))];
7575
_Unit setSkill ["commanding",1.0];
76-
_Unit setSkill ["aimingSpeed",1];
76+
_Unit setSkill ["aimingSpeed",0.3];
7777
_Unit setSkill ["general",1.0];
7878
_Unit setSkill ["endurance",1.0];
7979
_Unit setSkill ["reloadSpeed",(0.2 + (random 0.3))];
@@ -88,7 +88,7 @@ _Unit setSkill ["spotDistance",1];
8888
_Unit setSkill ["spotTime",1];
8989
_Unit setSkill ["courage",(0.6 + (random 0.3))];
9090
_Unit setSkill ["commanding",1.0];
91-
_Unit setSkill ["aimingSpeed",0.8];
91+
_Unit setSkill ["aimingSpeed",0.3];
9292
_Unit setSkill ["general",1.0];
9393
_Unit setSkill ["endurance",1.0];
9494
_Unit setSkill ["reloadSpeed",(0.3 + (random 0.3))];
@@ -103,7 +103,7 @@ _Unit setSkill ["spotDistance",0.9];
103103
_Unit setSkill ["spotTime",1];
104104
_Unit setSkill ["courage",(0.5 + (random 0.3))];
105105
_Unit setSkill ["commanding",1.0];
106-
_Unit setSkill ["aimingSpeed",0.7];
106+
_Unit setSkill ["aimingSpeed",0.3];
107107
_Unit setSkill ["general",1.0];
108108
_Unit setSkill ["endurance",1.0];
109109
_Unit setSkill ["reloadSpeed",(0.4 + (random 0.3))];
@@ -118,7 +118,7 @@ _Unit setSkill ["spotDistance",0.8];
118118
_Unit setSkill ["spotTime",1];
119119
_Unit setSkill ["courage",(0.4 + (random 0.3))];
120120
_Unit setSkill ["commanding",1.0];
121-
_Unit setSkill ["aimingSpeed",0.6];
121+
_Unit setSkill ["aimingSpeed",0.3];
122122
_Unit setSkill ["general",1.0];
123123
_Unit setSkill ["endurance",0.9];
124124
_Unit setSkill ["reloadSpeed",(0.5 + (random 0.3))];
@@ -133,7 +133,7 @@ _Unit setSkill ["spotDistance",0.7];
133133
_Unit setSkill ["spotTime",1];
134134
_Unit setSkill ["courage",(0.3 + (random 0.3))];
135135
_Unit setSkill ["commanding",1.0];
136-
_Unit setSkill ["aimingSpeed",0.5];
136+
_Unit setSkill ["aimingSpeed",0.3];
137137
_Unit setSkill ["general",1.0];
138138
_Unit setSkill ["endurance",0.8];
139139
_Unit setSkill ["reloadSpeed",(0.6 + (random 0.3))];

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ if(_handled) then {
3333
_owned = player getVariable "owned";
3434

3535
if(_type == "buy") then {
36-
[_building,getPlayerUID player] call OT_fnc_setOwner;
36+
_id = [_building] call OT_fnc_getBuildID;
37+
[_id,getPlayerUID player] call OT_fnc_setOwner;
3738
[-_price] call OT_fnc_money;
3839

39-
_id = [_building] call OT_fnc_getBuildID;
4040
buildingpositions setVariable [_id,position _building,true];
4141
_owned pushback _id;
4242
[player,"Building Purchased",format["Bought: %1 in %2 for $%3",getText(configFile >> "CfgVehicles" >> (typeof _building) >> "displayName"),(getpos _building) call OT_fnc_nearestTown,_price]] call BIS_fnc_createLogRecord;
@@ -46,8 +46,8 @@ if(_handled) then {
4646
_building addEventHandler ["Dammaged",OT_fnc_buildingDamagedHandler];
4747
}else{
4848
if ((typeof _building) in OT_allRealEstate) then {
49-
[_building,nil] call OT_fnc_setOwner;
5049
_id = [_building] call OT_fnc_getBuildID;
50+
[_id,nil] call OT_fnc_setOwner;
5151
_leased = player getVariable ["leased",[]];
5252
_leased deleteAt (_leased find _id);
5353
player setVariable ["leased",_leased,true];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if(random 100 > 80) then {
1818
[_town,1] call OT_fnc_standing;
1919
};
2020

21-
_civ = player getvariable "hiringciv";
21+
_civ = OT_interactingWith;
2222
[_civ,getPlayerUID player] call OT_fnc_setOwner;
2323
_civ removeAllEventHandlers "FiredNear";
2424
[_civ] joinSilent nil;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ if (_canSellDrugs) then {
367367
};
368368
}] spawn OT_fnc_doConversation;
369369
}else{
370-
[_civ,player,["No, thank you"],{(player getvariable "hiringciv") setVariable ["OT_Talking",false,true];}] spawn OT_fnc_doConversation;
370+
[_civ,player,["No, thank you"],{OT_interactingWith setVariable ["OT_Talking",false,true];}] spawn OT_fnc_doConversation;
371371
};
372372
};
373373
}else{
@@ -379,7 +379,7 @@ if (_canSellDrugs) then {
379379
[_civ,player,[format["OK I'll give you $%1 for each",_price],"OK"],{[([OT_nation,OT_drugSelling] call OT_fnc_getDrugPrice) * OT_drugQty] call OT_fnc_money;for "_t" from 1 to OT_drugQty do {player removeItem OT_drugSelling};OT_interactingWith setVariable ["OT_Talking",false,true];}] spawn OT_fnc_doConversation;
380380
[_town,-OT_drugQty] call OT_fnc_stability;
381381
}else{
382-
[_civ,player,["No, go away!"],{(player getvariable "hiringciv") setVariable ["OT_Talking",false,true];player setCaptive false;}] spawn OT_fnc_doConversation;
382+
[_civ,player,["No, go away!"],{OT_interactingWith setVariable ["OT_Talking",false,true];player setCaptive false;}] spawn OT_fnc_doConversation;
383383
if(player call OT_fnc_unitSeenCRIM) then {
384384
hint "You are dealing on enemy turf";
385385
player setCaptive false;

‎addons/overthrow_main/functions/fn_setOwner.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ if(typename _obj == "STRING") exitWith {
88
if(typename _obj != "OBJECT") exitWith {};
99
if((getObjectType _obj) != 8 and (_obj isKindOf "Building")) exitWith {
1010
_id = [_obj] call OT_fnc_getBuildID;
11-
owners setVariable [str _id,_owner,true];
11+
owners setVariable [_id,_owner,true];
1212
};
1313
_obj setVariable ["owner",_owner,true];

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

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,19 @@ private _cc = 0;
2424
_set = true;
2525
if(_key == "civilians") then {
2626
{
27-
OT_civilians setVariable [_x select 0,_x select 1,true];
27+
_y = _x select 0;
28+
if((_y select [0,4]) != "ace_" and (_y select [0,4]) != "cba_" and (_y select [0,4]) != "bis_") then {
29+
OT_civilians setVariable [_x select 0,_x select 1,true];
30+
};
2831
}foreach(_val);
2932
_set = false;
3033
};
3134
if(_key == "buildingpositions") then {
3235
{
33-
buildingpositions setVariable [_x select 0,_x select 1,true];
36+
_y = _x select 0;
37+
if((_y select [0,4]) != "ace_" and (_y select [0,4]) != "cba_" and (_y select [0,4]) != "bis_") then {
38+
buildingpositions setVariable [_x select 0,_x select 1,true];
39+
};
3440
}foreach(_val);
3541
_set = false;
3642
};
@@ -59,7 +65,10 @@ private _cc = 0;
5965
_set = false;
6066
{
6167
if(typename _x == "ARRAY") then {
62-
warehouse setVariable [_x select 0,_x,true];
68+
_y = _x select 0;
69+
if((_y select [0,4]) != "ace_" and (_y select [0,4]) != "cba_" and (_y select [0,4]) != "bis_") then {
70+
warehouse setVariable [_x select 0,_x,true];
71+
};
6372
};
6473
}foreach(_val);
6574
};
@@ -217,15 +226,17 @@ private _cc = 0;
217226
};
218227

219228
if(_set and !(isNil "_val")) then {
220-
if(typename _val == "ARRAY") then {
221-
//make a copy
222-
_orig = _val;
223-
_val = [];
224-
{
225-
_val pushback _x;
226-
}foreach(_orig);
229+
if((_key select [0,4]) != "ace_" and (_key select [0,4]) != "cba_" and (_key select [0,4]) != "bis_") then {
230+
if(typename _val == "ARRAY") then {
231+
//make a copy
232+
_orig = _val;
233+
_val = [];
234+
{
235+
_val pushback _x;
236+
}foreach(_orig);
237+
};
238+
server setvariable [_key,_val,true];
227239
};
228-
server setvariable [_key,_val,true];
229240
};
230241
_cc = _cc + 1;
231242
if(_cc == 100) then {

0 commit comments

Comments
 (0)