Skip to content

Commit 5a536d2

Browse files
armazacarmazac
committed
bugfixes
1 parent 95e5c09 commit 5a536d2

20 files changed

Lines changed: 161 additions & 129 deletions

File tree

‎addons/overthrow_main/CfgFunctions.hpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,10 @@ class CfgFunctions
459459
file = "\ot\functions\buildings";
460460
class initBuilding {};
461461
class initObservationPost {};
462-
462+
class initPoliceStation {};
463+
class initWorkshop {};
464+
class initTrainingCamp {};
465+
class initWarehouse {};
463466
};
464467

465468
/*

‎addons/overthrow_main/campaign/missions/Overthrow.Altis/data/templates/NATOcheckpoint.sqf‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[
2-
["Land_CncBarrierMedium4_F",[-3.02409,6.0177,0],0,1,0,[],"","",true,false],
3-
["Land_CncBarrierMedium4_F",[2.97591,-5.9823,0],0,1,0,[],"","",true,false],
4-
["B_GMG_01_A_F",[-5,8,-0.0749998],40,1,0,[],"","",true,false],
5-
["B_GMG_01_A_F",[5,-8,-0.0749998],220,1,0,[],"","",true,false],
6-
["B_HMG_01_high_F",[-9,6,-0.0749998],0,1,0,[],"","",true,false],
7-
["B_HMG_01_high_F",[9,-6,-0.0749998],180,1,0,[],"","",true,false],
8-
["Land_BagFence_Round_F",[-10.2304,4.77464,-0.00130129],40,1,0,[],"","",true,false],
9-
["Land_BagFence_Round_F",[10.2304,-4.77464,-0.00130129],220,1,0,[],"","",true,false],
10-
["Land_BagBunker_Small_F",[8.99989,-7.55552,0],0,1,0,[],"","",true,false],
11-
["Land_BagBunker_Small_F",[-8.99989,7.55552,0],180,1,0,[],"","",true,false],
12-
["Land_Razorwire_F",[-12.8371,7.28104,-2.38419e-006],130,1,0,[],"","",true,false],
13-
["Land_Razorwire_F",[15.1629,-4.71896,-2.38419e-006],130,1,0,[],"","",true,false],
14-
["Land_Razorwire_F",[-15.0596,-7.13234,-2.38419e-006],50,1,0,[],"","",true,false],
15-
["Land_Razorwire_F",[12.9404,9.86766,-2.38419e-006],50,1,0,[],"","",true,false],
16-
["Land_Razorwire_F",[16.5674,3.22882,-2.38419e-006],90,1,0,[],"","",true,false],
17-
["Land_Razorwire_F",[-16.4326,0.228816,-2.38419e-006],90,1,0,[],"","",true,false],
18-
["Site_Minefield",[50,0,0],0,1,0,[],"","",true,false],
19-
["Site_Minefield",[-50,0,0],0,1,0,[],"","",true,false]
2+
["Land_CncBarrierMedium4_F",[-3.02409,9.0177,0],0,1,0,[],"","",true,false],
3+
["Land_CncBarrierMedium4_F",[2.97591,-8.9823,0],0,1,0,[],"","",true,false],
4+
["Land_BagFence_Round_F",[10.2304,-7.77464,-0.00130129],220,1,0,[],"","",true,false],
5+
["Land_BagFence_Round_F",[-10.2304,7.77464,-0.00130129],40,1,0,[],"","",true,false],
6+
["B_HMG_01_high_F",[-9,9,-0.0749998],0,1,0,[],"","",true,false],
7+
["B_HMG_01_high_F",[9,-9,-0.0749998],180,1,0,[],"","",true,false],
8+
["Land_BagBunker_Small_F",[8.99989,-10.5555,0],0,1,0,[],"","",true,false],
9+
["Land_BagBunker_Small_F",[-8.99989,10.5555,0],180,1,0,[],"","",true,false],
10+
["B_GMG_01_A_F",[4,-13,-0.0749998],220,1,0,[],"","",true,false],
11+
["B_GMG_01_A_F",[-4,13,-0.0749998],40,1,0,[],"","",true,false],
12+
["Land_Razorwire_F",[15.1629,-4.71896,-2.38419e-006],130,1,0,[],"","",true,false],
13+
["Land_Razorwire_F",[-12.8371,7.28104,-2.38419e-006],130,1,0,[],"","",true,false],
14+
["Land_Razorwire_F",[-15.0596,-7.13234,-2.38419e-006],50,1,0,[],"","",true,false],
15+
["Land_Razorwire_F",[12.9404,9.86766,-2.38419e-006],50,1,0,[],"","",true,false],
16+
["Land_Razorwire_F",[16.5674,3.22882,-2.38419e-006],90,1,0,[],"","",true,false],
17+
["Land_Razorwire_F",[-16.4326,0.228816,-2.38419e-006],90,1,0,[],"","",true,false],
18+
["Site_Minefield",[-50,0,0],0,1,0,[],"","",true,false],
19+
["Site_Minefield",[50,0,0],0,1,0,[],"","",true,false]
2020
]

‎addons/overthrow_main/campaign/missions/Overthrow.Tanoa/data/templates/NATOcheckpoint.sqf‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
[
2-
["Land_HBarrier_01_wall_4_green_F",[-3.99975,-7.99956,0],180,1,0,[],"","",true,false],
3-
["Land_HBarrier_01_wall_4_green_F",[3.99975,7.99956,0],0,1,0,[],"","",true,false],
4-
["Land_HBarrier_01_wall_6_green_F",[11.3664,-0.525286,0],90,1,0,[],"","",true,false],
5-
["Land_HBarrier_01_wall_6_green_F",[-11.3664,0.525285,0],270,1,0,[],"","",true,false],
6-
["Land_HBarrier_01_big_tower_green_F",[-9.20051,7.09834,0],180,1,0,[],"","",true,false],
7-
["Land_HBarrier_01_big_tower_green_F",[9.20051,-7.09834,0],0,1,0,[],"","",true,false],
8-
["Land_HBarrier_01_line_5_green_F",[11.4962,5.01875,0],90,1,0,[],"","",true,false],
9-
["Land_HBarrier_01_line_5_green_F",[-11.5038,-4.98125,0],90,1,0,[],"","",true,false],
10-
["Land_HBarrier_01_tower_green_F",[10.0169,11.9685,0],180,1,0,[],"","",true,false],
11-
["Land_HBarrier_01_tower_green_F",[-10.0169,-11.9685,0],0,1,0,[],"","",true,false],
12-
["Land_HBarrier_01_line_5_green_F",[-10.0038,14.5187,0],90,1,0,[],"","",true,false],
13-
["Land_HBarrier_01_line_5_green_F",[9.99615,-14.4813,0],90,1,0,[],"","",true,false],
14-
["Land_BarGate_F",[3.43774,18,0],0,1,0,[],"","",true,false],
15-
["Land_BarGate_F",[3.43774,-18,0],0,1,0,[],"","",true,false],
16-
["Land_BagBunker_01_small_green_F",[7.00011,18.5555,0],180,1,0,[],"","",true,false],
17-
["Land_BagBunker_01_small_green_F",[-7.00011,-18.5555,0],0,1,0,[],"","",true,false],
18-
["B_HMG_01_high_F",[7,18,-0.0749998],0,1,0,[],"","",true,false],
19-
["B_HMG_01_high_F",[-7,-18,-0.0749998],180,1,0,[],"","",true,false],
20-
["Land_HBarrier_01_line_5_green_F",[7.98125,-18.0038,0],0,1,0,[],"","",true,false],
21-
["Land_HBarrier_01_line_5_green_F",[-8.01875,17.9962,0],0,1,0,[],"","",true,false]
2+
["Land_CncBarrierMedium4_F",[2.97591,-8.9823,0],0,1,0,[],"","",true,false],
3+
["Land_CncBarrierMedium4_F",[-3.02409,9.0177,0],0,1,0,[],"","",true,false],
4+
["Land_BagFence_01_round_green_F",[10.0375,-8.00446,-0.00130129],220,1,0,[],"","",true,false],
5+
["Land_BagFence_01_round_green_F",[-10.0375,8.00446,-0.00130129],40,1,0,[],"","",true,false],
6+
["B_HMG_01_high_F",[-9,9,-0.0749998],0,1,0,[],"","",true,false],
7+
["B_HMG_01_high_F",[9,-9,-0.0749998],180,1,0,[],"","",true,false],
8+
["Land_BagBunker_01_small_green_F",[-8.99989,10.5555,0],180,1,0,[],"","",true,false],
9+
["Land_BagBunker_01_small_green_F",[8.99989,-10.5555,0],0,1,0,[],"","",true,false],
10+
["B_GMG_01_A_F",[-4,13,-0.0749998],40,1,0,[],"","",true,false],
11+
["B_GMG_01_A_F",[4,-13,-0.0749998],220,1,0,[],"","",true,false],
12+
["Land_Razorwire_F",[15.1629,-4.71896,-2.38419e-006],130,1,0,[],"","",true,false],
13+
["Land_Razorwire_F",[-12.8371,7.28104,-2.38419e-006],130,1,0,[],"","",true,false],
14+
["Land_Razorwire_F",[12.9404,9.86766,-2.38419e-006],50,1,0,[],"","",true,false],
15+
["Land_Razorwire_F",[-15.0596,-7.13234,-2.38419e-006],50,1,0,[],"","",true,false],
16+
["Land_Razorwire_F",[-16.4326,0.228816,-2.38419e-006],90,1,0,[],"","",true,false],
17+
["Land_Razorwire_F",[16.5674,3.22882,-2.38419e-006],90,1,0,[],"","",true,false],
18+
["Site_Minefield",[-50,0,0],0,1,0,[],"","",true,false],
19+
["Site_Minefield",[50,0,0],0,1,0,[],"","",true,false]
2220
]

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

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class EditorData
1616
};
1717
class LayerIndexProvider
1818
{
19-
nextID=344;
19+
nextID=349;
2020
};
2121
class Camera
2222
{
@@ -706,78 +706,79 @@ class Mission
706706
class Item0
707707
{
708708
dataType="Marker";
709-
position[]={9456.0127,0,10045.463};
709+
position[]={9472.6641,0,9829.0195};
710710
name="island_1";
711-
markerType="RECTANGLE";
711+
markerType="ELLIPSE";
712712
type="mil_box";
713713
colorName="ColorPink";
714714
alpha=0;
715-
a=5186.9771;
716-
b=3900;
715+
a=5886.9771;
716+
b=4500;
717717
angle=5.2220001;
718718
id=392;
719-
atlOffset=-37.576813;
719+
atlOffset=-60.215149;
720720
};
721721
class Item1
722722
{
723723
dataType="Marker";
724-
position[]={10653.594,0,3599.8821};
724+
position[]={11136.429,0,3400.0869};
725725
name="island_2";
726726
markerType="RECTANGLE";
727727
type="mil_box";
728728
colorName="ColorBlue";
729729
alpha=0;
730-
a=2601.116;
731-
b=1945.116;
730+
a=2801.116;
731+
b=2145.116;
732732
id=393;
733-
atlOffset=-123.38461;
733+
atlOffset=-35.822216;
734734
};
735735
class Item2
736736
{
737737
dataType="Marker";
738-
position[]={4227.0801,0,3495.281};
738+
position[]={4027.2871,0,3395.385};
739739
name="island_3";
740740
markerType="RECTANGLE";
741741
type="mil_box";
742742
colorName="ColorOrange";
743743
alpha=0;
744-
a=3098.604;
745-
b=1876.465;
744+
a=3798.604;
745+
b=2076.4651;
746746
id=394;
747-
atlOffset=-38.245327;
747+
atlOffset=-13.445448;
748748
};
749749
class Item3
750750
{
751751
dataType="Marker";
752-
position[]={2362.061,0,7032.438};
752+
position[]={2445.3081,0,6849.2949};
753753
name="island_4";
754-
markerType="RECTANGLE";
754+
markerType="ELLIPSE";
755755
type="mil_box";
756756
colorName="ColorBrown";
757757
alpha=0;
758-
a=1693.395;
758+
a=2393.395;
759759
b=1670.512;
760+
angle=45;
760761
id=395;
761-
atlOffset=-30.79781;
762+
atlOffset=-21.241955;
762763
};
763764
class Item4
764765
{
765766
dataType="Marker";
766-
position[]={2990.5691,1.2723444e+038,12211.5};
767+
position[]={3007.218,0,12211.5};
767768
name="island_5";
768769
markerType="RECTANGLE";
769770
type="mil_box";
770771
colorName="ColorWEST";
771772
alpha=0;
772773
a=1517.953;
773-
b=2059.5359;
774+
b=2259.5359;
774775
id=396;
775-
atlOffset=1.2723444e+038;
776+
atlOffset=-80.464539;
776777
};
777778
class Item5
778779
{
779780
dataType="Marker";
780-
position[]={2831.7351,-7.3066407e-025,9153.3379};
781+
position[]={2831.7351,0,9153.3379};
781782
name="island_6";
782783
markerType="RECTANGLE";
783784
type="mil_box";
@@ -791,15 +792,15 @@ class Mission
791792
class Item6
792793
{
793794
dataType="Marker";
794-
position[]={12661.745,-0.55836368,14108.499};
795+
position[]={12661.745,0,14108.499};
795796
name="island_7";
796797
markerType="RECTANGLE";
797798
type="mil_box";
798799
alpha=0;
799800
a=779.711;
800801
b=484.405;
801802
id=437;
802-
atlOffset=-48.558083;
803+
atlOffset=-47.999718;
803804
};
804805
class Item7
805806
{
@@ -890,13 +891,13 @@ class Mission
890891
class Item6
891892
{
892893
dataType="Marker";
893-
position[]={4196.5679,-4.819768e-018,3228.6899};
894+
position[]={4146.6191,0,2762.5051};
894895
name="control_8";
895896
type="mil_triangle";
896897
colorName="ColorWEST";
897898
alpha=0;
898899
id=1141;
899-
atlOffset=-29.631226;
900+
atlOffset=-31.570078;
900901
};
901902
class Item7
902903
{
@@ -912,13 +913,13 @@ class Mission
912913
class Item8
913914
{
914915
dataType="Marker";
915-
position[]={9815.7168,-1.6071203e-014,9720.9639};
916+
position[]={9898.9639,65.677246,10107.305};
916917
name="control_10";
917918
type="mil_triangle";
918919
colorName="ColorWEST";
919920
alpha=0;
920921
id=1143;
921-
atlOffset=-73.829048;
922+
atlOffset=-42.765892;
922923
};
923924
class Item9
924925
{
@@ -1017,7 +1018,7 @@ class Mission
10171018
};
10181019
};
10191020
id=1139;
1020-
atlOffset=34.490166;
1021+
atlOffset=34.536148;
10211022
};
10221023
class Item9
10231024
{

‎addons/overthrow_main/functions/UI/dialogs/fn_importDialog.sqf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ _numitems = 0;
2626

2727
if(_price > 0) then {
2828
_numitems = _numitems + 1;
29+
if(_cls isKindOf ["None",configFile >> "CfgGlasses"]) then {
30+
_name = _cls call OT_fnc_glassesGetName;
31+
_pic = _cls call OT_fnc_glassesGetPic;
32+
};
2933
if(_cls isKindOf ["Default",configFile >> "CfgWeapons"]) then {
3034
_name = _cls call OT_fnc_weaponGetName;
3135
_pic = _cls call OT_fnc_weaponGetPic;

‎addons/overthrow_main/functions/UI/fn_notifyVehicle.sqf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
_txt = format["<t align='left' size='1.2' color='#ffffff'>%1</t><br/><t size='0.5' color='#bbbbbb' align='left'>Owner: %2</t>",(typeof vehicle player) call OT_fnc_vehicleGetName,server getVariable "name"+((vehicle player) call OT_fnc_getOwner)];
1+
_owner = server getVariable "name"+((vehicle player) call OT_fnc_getOwner);
2+
if(isNil "_owner") then {_owner = "Someone"};
3+
_txt = format["<t align='left' size='1.2' color='#ffffff'>%1</t><br/><t size='0.5' color='#bbbbbb' align='left'>Owner: %2</t>",(typeof vehicle player) call OT_fnc_vehicleGetName,_owner];
24
[_txt, -0.5, 1, 5, 1, 0, 5] spawn bis_fnc_dynamicText;

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ _total = 0;
2222
_num = _x select 1;
2323
if(_doillegal or _cls in (OT_allItems + OT_allBackpacks + OT_Resources + OT_allClothing)) then {
2424
_baseprice = [OT_nation,_cls,0] call OT_fnc_getSellPrice;
25-
_costprice = round(_baseprice * 0.4); //The cost of export
25+
_costprice = round(_baseprice * 0.6); //The cost of export
26+
if(_cls in OT_allDrugs) then {
27+
_costprice = round(_baseprice * 0.5);
28+
};
29+
if(_cls in OT_illegalItems) then {
30+
_costprice = round(_baseprice * 0.3);
31+
};
2632

2733
_total = _total + (_costprice * _num);
2834
call {

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
if !(captive player) exitWith {"You cannot fast travel while wanted" call OT_fnc_notifyMinor};
22
if !("ItemMap" in assignedItems player) exitWith {"You need a map to fast travel" call OT_fnc_notifyMinor};
3+
private _hasdrugs = false;
34

5+
{
6+
if(_x in OT_allDrugs) exitWith {_hasdrugs = true};
7+
}foreach(items player);
8+
9+
if(_hasdrugs) exitWith {"You cannot fast travel while carrying drugs" call OT_fnc_notifyMinor};
410

511
if((vehicle player) != player) then {
612
if (driver (vehicle player) != player) exitWith {"You are not the driver of this vehicle" call OT_fnc_notifyMinor};
@@ -9,6 +15,8 @@ if((vehicle player) != player) then {
915

1016
if(((vehicle player) != player) and (vehicle player) isKindOf "Ship") exitWith {"You cannot fast travel in a boat" call OT_fnc_notifyMinor};
1117

18+
if !((vehicle player) call OT_fnc_vehicleCanMove) exitWith {"This vehicle is unable to move" call OT_fnc_notifyMinor};
19+
1220
"Click near a friendly base/camp or a building you own" call OT_fnc_notifyMinor;
1321
openMap true;
1422

@@ -56,7 +64,6 @@ openMap true;
5664
if(OT_adminMode) then {_handled = true};
5765

5866
if !(_handled) then {
59-
6067
"You must click near a friendly base/camp or a building you own" call OT_fnc_notifyMinor;
6168
openMap false;
6269
}else{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
_town = (getpos player) call OT_fnc_nearestTown;
22
_standing = player getVariable format['rep%1',_town];
33

4-
if(_standing < 10 and count (player nearObjects [OT_refugeeCamp,20]) == 0) exitWith {
5-
"+10 Standing required to recruit. Try building a refugee camp at an FOB." call OT_fnc_notifyMinor
4+
if(_standing < 10 and count (player nearObjects [OT_refugeeCamp,50]) == 0) exitWith {
5+
"+10 Standing required to recruit, or you must be within 50m of a refugee camp" call OT_fnc_notifyMinor
66
};
77

88
if(({side _x == west or side _x == east} count (player nearEntities 50)) > 0) exitWith {"You cannot recruit with enemies nearby" call OT_fnc_notifyMinor};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if (_canLocMission) then {
5959
if (_canMission) then {
6060
_factionName = _civ getvariable ["factionrepname",""];
6161
_faction = _civ getvariable ["faction",""];
62-
private _standing = [_town] call OT_fnc_standing;
62+
private _standing = server getVariable [format["standing%1",_faction],0];
6363
_options pushback format["<t align='center' size='2'>%1</t><br/><br/><t align='center' size='0.8'>Current Standing: +%2",_factionName,_standing];
6464
_options pushBack [format["Request Mission"], {
6565
private _civ = OT_interactingWith;

0 commit comments

Comments
 (0)