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

Rearm - Pylon Support and Dynamically Add Supply Actions #5183

Merged
merged 8 commits into from
Jun 8, 2017

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented May 20, 2017

Merge after #5182

  • Support the new 1.70 pylon vehicle loadouts
  • Dynamically add re-supply actions to vehicles. Simplifies CfgVehicles and allows setting a rearm vic via a setVariable.

Progress on issue #5180 and #5173

@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label May 20, 2017
@PabstMirror PabstMirror added this to the Ongoing milestone May 20, 2017
@654wak654 654wak654 mentioned this pull request Jun 3, 2017
3 tasks
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.

Pylon support 👍
Pylon hardpoint caching 👍
Dynamic actions 👍
One file with borked indentation 👎

Don't really like how every single function checks for argument input correctness and how they are spread into multiple lines because of that, but I won't make that stop the merge, just a comment. Not sure about performance at all.

*
* Arguments:
* 0: Ammo Truck <OBJECT>
* 1: Vehicle object or Vehicle class <OBJECT><STRING>
Copy link
Member

Choose a reason for hiding this comment

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

Not true, params only accepts object.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For 2nd arg string is fine
params [["_truck", objNull, [objNull]], ["_vehicle", objNull, [objNull, ""]]];

Copy link
Member

Choose a reason for hiding this comment

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

Clearly I am blind.


private _turretConfig = _this call CBA_fnc_getTurret;

getArray (_turretConfig >> "magazines")
Copy link
Member

Choose a reason for hiding this comment

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

2 lines seem a bit redundant, just getArray (_this call CBA_fnc_getTurret >> "magazines") would do.



private _actionReadSupplyCounter = [ // GVAR(supply) > 0
QGVAR(ReadSupplyCounter),
Copy link
Member

Choose a reason for hiding this comment

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

Indent? (whole file)

@654wak654
Copy link
Contributor

Are the _pylontMagazine variables typos?

@PabstMirror PabstMirror merged commit f35f80e into master Jun 8, 2017
@PabstMirror PabstMirror deleted the rearm-dynamic branch June 8, 2017 16:47
@@ -3,7 +3,7 @@
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE
#define DISABLE_COMPILE_CACHE
Copy link
Member

Choose a reason for hiding this comment

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

eh?

Copy link
Member

Choose a reason for hiding this comment

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

Was commented out again in #5260.

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

Successfully merging this pull request may close these issues.

4 participants