Skip to content

Commit f438e7e

Browse files
committed
final tweaks
1 parent ce80c43 commit f438e7e

6 files changed

Lines changed: 10 additions & 8 deletions

File tree

addons/overthrow_main.pbo

11 Bytes
Binary file not shown.

addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/data/towns.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ OT_townData = [
6161
[[12317.8,13929.5,0],"Ipota"]
6262
];
6363

64-
OT_spawnTowns = ["Savaka","Namuvaka","Cerebu","Koumac","Laikoro","Tavu","Muaceba","Leqa","La Foa","Tobakoro","Lösi","Lailai"];
64+
OT_spawnTowns = ["Savaka","Namuvaka","Cerebu","Tavu","Muaceba","Leqa","La Foa","Tobakoro","Lösi","Lailai"];
6565
OT_capitals = ["Georgetown","Lijnhaven","Katkoula","Balavu","Tuvanaka"]; //region capitals
6666
OT_sprawling = ["Blue Pearl industrial port"];

addons/overthrow_main/campaign/missions/OverthrowSpTanoa.Tanoa/data/towns.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ OT_townData = [
6161
[[12317.8,13929.5,0],"Ipota"]
6262
];
6363

64-
OT_spawnTowns = ["Savaka","Namuvaka","Cerebu","Koumac","Laikoro","Tavu","Muaceba","Leqa","La Foa","Tobakoro","Lösi","Lailai"];
64+
OT_spawnTowns = ["Savaka","Namuvaka","Cerebu","Tavu","Muaceba","Leqa","La Foa","Tobakoro","Lösi","Lailai"];
6565
OT_capitals = ["Georgetown","Lijnhaven","Katkoula","Balavu","Tuvanaka"]; //region capitals
6666
OT_sprawling = ["Blue Pearl industrial port"];

addons/overthrow_main/functions/actions/fn_fastTravel.sqf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ if !("ItemMap" in assignedItems player) exitWith {hint "You need a map to fast t
99
if(_ftrules > 0 && !((primaryWeapon player) isEqualTo "" && (secondaryWeapon player) isEqualTo "" && (handgunWeapon player) isEqualTo "")) exitWith {hint "You cannot fast travel holding a weapon"};
1010

1111
_foundweapon = false;
12-
{
13-
if(_diff > 0 && !((primaryWeapon _x) isEqualTo "" && (secondaryWeapon _x) isEqualTo "" && (handgunWeapon _x) isEqualTo "")) exitWith {_foundweapon = true};
14-
}foreach(crew vehicle player);
12+
if((vehicle player) != player && _ftrules > 0) then {
13+
{
14+
if(!((primaryWeapon _x) isEqualTo "" && (secondaryWeapon _x) isEqualTo "" && (handgunWeapon _x) isEqualTo "")) exitWith {_foundweapon = true};
15+
}foreach(crew vehicle player);
16+
};
1517
if(_foundweapon) exitWith {hint "A passenger is holding a weapon"};
1618

1719
private _hasdrugs = false;

addons/overthrow_main/functions/fn_initVar.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ OT_allBLUOffensiveVehicles = [];
565565
if(_itemType isEqualTo "MachineGun") exitWith {OT_allBLUMachineGuns pushBackUnique _base};
566566
if((_this select [0,7]) == "srifle_" || (_this isKindOf ["Rifle_Long_Base_F", configFile >> "CfgWeapons"])) exitWith {OT_allBLUSniperRifles pushBackUnique _base};
567567
if((_this find "_GL_") > -1) exitWith {OT_allBLUGLRifles pushBackUnique _base};
568-
if(_mass < 65) exitWith {OT_allBLUSMG pushBackUnique _base};
568+
if(_mass < 61) exitWith {OT_allBLUSMG pushBackUnique _base};
569569
OT_allBLURifles pushBackUnique _base
570570
};
571571
};

addons/overthrow_main/ui/dialogs/main.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,9 +1627,9 @@ class OT_dialog_newgame
16271627
idc = 1606;
16281628
text = "Start Game"; //--- ToDo: Localize;
16291629
x = 0.577344 * safezoneW + safezoneX;
1630-
y = 0.676 * safezoneH + safezoneY;
1630+
y = 0.708 * safezoneH + safezoneY;
16311631
w = 0.0876563 * safezoneW;
1632-
h = 0.077 * safezoneH;
1632+
h = 0.045 * safezoneH;
16331633
action = "closeDialog 0;[] remoteExec [""OT_fnc_newGame"",2,false]";
16341634
};
16351635
////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)