New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pylons - Separate settings for in-game and zeus #6365

Merged
merged 7 commits into from May 31, 2018

Conversation

3 participants
@654wak654
Contributor

654wak654 commented May 25, 2018

When merged this pull request will:

  • Switch pylons to CBA Settings
  • Split the "enabled" setting into "enabled for zeus" and "enabled for ammo trucks" settings (#6336).
@@ -1,46 +0,0 @@
class ACE_Settings {

This comment has been minimized.

@mharis001

mharis001 May 25, 2018

Contributor

movedToSQF = 1 for settings moved to use CBA_settings_fnc_init?

@PabstMirror PabstMirror added this to the 3.13.0 milestone May 30, 2018

@PabstMirror PabstMirror added this to To do in CBA Settings via automation May 30, 2018

@@ -6,4 +6,67 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
[

This comment has been minimized.

@PabstMirror

PabstMirror May 30, 2018

Collaborator

We have been putting settings into a file called initSettings.sqf
and then #include "initSettings.sqf"

private _filter = ["transportAmmo", QEGVAR(rearm,defaultSupply)] select (["ace_rearm"] call EFUNC(common,isModLoaded));
private _rearmVehicles = {(getNumber (configFile >> "CfgVehicles" >> typeOf _x >> _filter)) > 0} count _vehicles;
(_rearmVehicles > 0 && {[ace_player, _target] call FUNC(canConfigurePylons)} && {GVAR(enabledFromAmmoTrucks)})

This comment has been minimized.

@PabstMirror

PabstMirror May 30, 2018

Collaborator

I would add if (!GVAR(enabledFromAmmoTrucks)) exitWith {false} at the top of this condition to save a lot of time if it's disabled

addMissionEventHandler ["HandleDisconnect", LINKFUNC(handleDisconnect)];
};
GVAR(searchDistanceSqr) = GVAR(searchDistance) ^ 2;

This comment has been minimized.

@PabstMirror

PabstMirror May 30, 2018

Collaborator

needs to be back inside the ace_settingsInitialized event, or use settings changed code

654wak654 added some commits May 31, 2018

LSTRING(Category_Pylons),
[5, 50, 15, 0],
true,
{

This comment has been minimized.

@PabstMirror

PabstMirror May 31, 2018

Collaborator

tabs

@PabstMirror PabstMirror changed the title from Update Pylons to Pylons - Separate settings for in-game and zeus May 31, 2018

@PabstMirror PabstMirror merged commit a917d58 into acemod:master May 31, 2018

1 check passed

ci/circleci Your tests passed on CircleCI!
Details

CBA Settings automation moved this from To do to Done May 31, 2018

@654wak654 654wak654 deleted the 654wak654:pylons-modernize branch May 31, 2018

@654wak654

This comment has been minimized.

Contributor

654wak654 commented May 31, 2018

This closes #6336 btw @PabstMirror

@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.3 Jul 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment