Skip to content
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

Convert ACE_settings to CBA_settings #4895

Merged
merged 18 commits into from
Nov 11, 2017
Merged

Convert ACE_settings to CBA_settings #4895

merged 18 commits into from
Nov 11, 2017

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented Feb 12, 2017

Converts ACE_settings to CBA_settings

  • Offers BWC with modules and missionConfig ace_settings.
    So old missions should continue to function as before.
  • Dropping support for ace_server, as that can be handled by CBA server programming.

I'm sure we'll want to eventually convert them by hand to sqf.
The main downside to this is that SCALAR gets converted to SLIDER, which requires a min/max.
So max needs to be big for a distance in meters, but would make no sense for a bleeding coefficent.
But for now it will let us convert all 275 settings at once.

ToDo:

Converting is less than ~100ms; Opening game options with all these settings is ~2 sec lockup.

@PabstMirror PabstMirror added this to the CBA Settings milestone Feb 12, 2017
@jonpas
Copy link
Member

jonpas commented Feb 13, 2017

keep debug / headbug fix somehow?

Have that button where "ACE Options" button is current in main menu? Too open and visible?

@jonpas
Copy link
Member

jonpas commented Apr 11, 2017

Headbug fix and Debug buttons could act like the main menu vanilla buttons do:

ACE OPTIONS
    DEBUG
    HEADBUG FIX

where the indented ones show upon clicking the "ACE OPTIONS".

Similar to what @commy2 has done to the vanilla menu at CBATeam/CBA_A3#634.

 Conflicts:
	addons/common/functions/fnc_addSetting.sqf
	addons/common/functions/fnc_loadSettingsFromProfile.sqf
	addons/common/functions/fnc_loadSettingsLocalizedText.sqf
	addons/common/functions/fnc_loadSettingsOnServer.sqf
	addons/common/functions/fnc_setSettingFromConfig.sqf
@PabstMirror
Copy link
Contributor Author

This should be mostly usable,

@commy2
With a lot of settings, opening the CBA "addon options" menu will cause a long hard lock
(5202.00 ms for 365 settings on my machine)
makes it difficult to tweak settings

Looking at CBA's fnc_initDisplayGameOptions.sqf/gui_createMenu.sqf
It seems to be creating all controls at once,
We might be able to make that more dynamic and just create controls for whatever category/machine list is open?

@commy2
Copy link
Contributor

commy2 commented Sep 1, 2017

ref CBATeam/CBA_A3#739

@jonpas jonpas modified the milestones: CBA Settings, 3.12.0 Nov 10, 2017
@jonpas
Copy link
Member

jonpas commented Nov 10, 2017

Moving to 3.12.0, "CBA Settings" milestone will stay for manual conversion of components from 3.13.0 onwards.

@jonpas
Copy link
Member

jonpas commented Nov 10, 2017

Moved Debug and HeadBug Fix to Pause Menu under Options with the new CBA function and removed "ACE Options" Main Menu button. I didn't cleanup all the functions, that can be done later.

ACE3 Pause Menu Options

Too obvious / in the open? I guess it can be improved later down the line.

@jonpas
Copy link
Member

jonpas commented Nov 10, 2017

Used regex to change scope:
(?s)ACE_Module {(.+?)scope = (.); -> ACE_Module {$1scope = 1;
and changed some manually.

Left modules that don't have Eden counterparts. Can be cleaned up later.

Left-Over Modules

@jonpas jonpas removed the status/WIP label Nov 10, 2017
@jonpas
Copy link
Member

jonpas commented Nov 10, 2017

Only this warning shows at the moment:

16:01:31 [ACE] (common) WARNING: Setting [ace_medical_enableAdvancedWounds] - value type [BOOL] is missing number z\ace\addons\common\functions\fnc_cbaSettings_loadFromConfig.sqf:65

@PabstMirror
Copy link
Contributor Author

isNumber (configFile >> "ACE_settings" >> "ace_medical_enableAdvancedWounds") = false

    class GVAR(enableAdvancedWounds) {
        value = false;

I think it will be ok on the make.py version, in either case the default value (0) is fine

@jonpas jonpas merged commit cd30b09 into master Nov 11, 2017
@jonpas jonpas deleted the convertSettings branch November 11, 2017 19:22
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants