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

Add Zeus Module for FRIES #4597

Merged
merged 12 commits into from
Dec 15, 2016
Merged

Add Zeus Module for FRIES #4597

merged 12 commits into from
Dec 15, 2016

Conversation

654wak654
Copy link
Contributor

@654wak654 654wak654 commented Oct 26, 2016

When merged this pull request will:

  • Adds a zeus module to add/remove FRIES from helicopters
  • It's called "add/remove" and not "toggle" because the FRIES isn't "toggled" but literally created or removed.
  • Needs translation.
  • I have a small zeus "cleanup" PR waiting on this.

Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some things that could be improved.

@@ -14,3 +14,4 @@ QGVAR(GlobalSkillAI) addPublicVariableEventHandler FUNC(moduleGlobalSetSkill);
[QGVAR(modulePatrolArea), CBA_fnc_taskPatrol] call CBA_fnc_addEventHandler;
[QGVAR(moduleSearchNearby), CBA_fnc_searchNearby] call CBA_fnc_addEventHandler;
[QGVAR(moduleSearchArea), CBA_fnc_taskSearchArea] call CBA_fnc_addEventHandler;
[QGVAR(equipFries), EFUNC(fastroping,equipFRIES)] call CBA_fnc_addEventHandler;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can just be added on server I guess since it won't be called outside of server.

<English>%1 is not fastrope compatible.</English>
</Key>
<Key ID="STR_ACE_Zeus_CantRemoveFRIES">
<English>Can't remove FRIES, ropes are deployed.</English>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Unable to remove..." would be better.

};

class ACE_Curator {
GVAR(captives) = "ace_captives";
GVAR(medical) = "ace_medical";
GVAR(cargoAndRepair)[] = {"ace_cargo", "ace_repair"};
GVAR(fastRoping) = "ace_fastroping";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still think this should be GVAR(fastroping) like the module, everywhere else as well, fastRoping capitalization looks weird IMO. GVAR(cargoAndRepair) is exception because it's for 2 components.

@jonpas jonpas added the kind/feature Release Notes: **ADDED:** label Oct 26, 2016
@jonpas jonpas added this to the 3.9.0 milestone Oct 26, 2016
@jonpas
Copy link
Member

jonpas commented Oct 26, 2016

Also, don't worry about translations, those come later by translators. ;)

@654wak654
Copy link
Contributor Author

654wak654 commented Oct 26, 2016

Figured so, just thought I'd point it out.

Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some missing privates still.

if !(alive _mouseOverUnit) then {
[LSTRING(OnlyAlive)] call EFUNC(common,displayTextStructured);
} else {
_config = configFile >> "CfgVehicles" >> typeOf _mouseOverUnit;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing private.

[LSTRING(OnlyAlive)] call EFUNC(common,displayTextStructured);
} else {
_config = configFile >> "CfgVehicles" >> typeOf _mouseOverUnit;
_displayName = getText (_config >> "displayName");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing private.

if !(isNumber (_config >> QEGVAR(fastroping,enabled))) then {
[format [localize LSTRING(NotFastRopeCompatible), _displayName]] call EFUNC(common,displayTextStructured);
} else {
_fries = GETVAR(_mouseOverUnit,EGVAR(fastroping,FRIES),objNull);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing private.

@Avokadomos
Copy link
Contributor

Will this allow FRIES to be equipped on helicopters which are not configured for it?

@BaerMitUmlaut
Copy link
Member

No. That's simply not possible because fastroping has no idea where to attach it to.

@Avokadomos
Copy link
Contributor

There's no way to assign default positions for helicopters without support? The ropes would be hanging from the hull, but at least FRIES would be usable on more than 2 helicopters. 😃

@BaerMitUmlaut
Copy link
Member

There is no way to automatically detect a good position for the ropes, ensuring that they dont clip into the helo, are near doors etc.

Every vanilla helicopter except the Little Bird supports fastroping, CUP has their helicopter properly configured and we provide a compat for RHS which adds it to their helicopters as well. I have no idea where you got your "only 2 helicopters" from.

@Avokadomos
Copy link
Contributor

Gotcha. There's only a couple of them who has the FRIES checkbox in 3den, so I missed a dozen. 😆

@PabstMirror PabstMirror merged commit ef4d289 into acemod:master Dec 15, 2016
@654wak654 654wak654 deleted the fries-module branch December 15, 2016 06:17
@@ -2,7 +2,7 @@

["ace_settingsInitialized",{
// Only add an InitPost EH if setting is enabled (and apply retroactively)
if (isServer && GVAR(autoAddObjects)) then {
if (isServer && {GVAR(autoAddObjects)}) then {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't really matter, but would this not be slower in this case?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's always slower on the server, but faster on the clients. Since there are more clients than servers usually, this is overall faster.
Not that it matters.

@kymckay
Copy link
Member

kymckay commented Dec 16, 2016

👍 Forgot I meant to merge this one on monday

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants