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.

Sign up for GitHub

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

Jump to bottom

Revised CAS modules #319

Merged
merged 5 commits into from
Jun 11, 2018
Merged

Revised CAS modules #319

merged 5 commits into from
Jun 11, 2018

Conversation

Kexanone
Copy link
Member

When merged this pull request will:

@Kexanone Kexanone added fix PR that is a fixes a bug. priority/medium Issue or PR that impacts some portions of the user base and should be resolved with due time. labels Jun 10, 2018
@Kexanone Kexanone added this to the 1.1.0 milestone Jun 10, 2018
@Kexanone Kexanone self-assigned this Jun 10, 2018
@Kexanone Kexanone requested a review from CreepPork June 10, 2018 12:35
@Kexanone Kexanone changed the title Fix targeting and fire flares Revised CAS modules Jun 10, 2018
CreepPork
CreepPork requested changes Jun 10, 2018
View reviewed changes
...ModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleCAS_server.sqf Outdated
@@ -115,9 +115,10 @@ waituntil {
//--- Fire!
if ((getposasl _plane) distance _pos < 1000 && _fireNull) then {
//--- Create laser target
private _target = ((position _logic nearEntities ["LaserTarget",250])) param [0,objnull];
private _targetType = if (_planeSide getfriend west > 0.6) then {"LaserTargetW"} else {"LaserTargetE"};
Copy link
Member

Choose a reason for hiding this comment

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

select

CreepPork
CreepPork reviewed Jun 10, 2018
View reviewed changes
...ModAchillesExpansion/addons/modules_f_achilles/Replacement/functions/fn_moduleCAS_server.sqf Outdated
//--- Fire CM
if ({_x == "bomblauncher"} count _weaponTypes == 0) then {
for "_i" from 0 to 1 do {
driver _plane forceweaponfire ["CMFlareLauncher","Burst"];
Copy link
Member

Choose a reason for hiding this comment

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

It should be a single flare per second, otherwise, you dump all your flares and IR rockets will just go after you have dumped them.

Copy link
Member Author

Choose a reason for hiding this comment

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

I tested it. It works as intended.

CreepPork
CreepPork reviewed Jun 11, 2018
View reviewed changes
@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_LaunchCM.sqf Outdated
@@ -80,14 +76,14 @@ else
// If the vehicle is an aircraft
if (_isVehicleAir) then
{
[_vehicle,_CMWeapon] spawn
([_vehicle,_CMWeapon] + _flareParams) spawn
Copy link
Member

Choose a reason for hiding this comment

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

Why +?

Copy link
Member Author

Choose a reason for hiding this comment

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

Why not? Splitting it in two lines for the sake of using append or what?

Copy link
Member

@CreepPork CreepPork Jun 11, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Why don't you just put it inside the array?

Copy link
Member

@CreepPork CreepPork Jun 11, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Adding + just makes anybody reading the code wonder why and it's slower anyways.

You are adding _flareParams to the array anyways with the +, so why bother?

Copy link
Member Author

Choose a reason for hiding this comment

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

lol, screw micro-optimizations.

CreepPork
CreepPork requested changes Jun 11, 2018
View reviewed changes
@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_LaunchCM.sqf Outdated
@@ -80,14 +76,14 @@ else
// If the vehicle is an aircraft
if (_isVehicleAir) then
{
[_vehicle,_CMWeapon] spawn
([_vehicle,_CMWeapon] + _flareParams) spawn
Copy link
Member

Choose a reason for hiding this comment

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

Put it in the array.

@Kexanone Kexanone merged commit 7e61f3a into master Jun 11, 2018
@Kexanone Kexanone deleted the fixVanillaCAS branch June 11, 2018 15:46
@Kexanone Kexanone modified the milestones: 1.1.0, 1.0.3 Jun 15, 2018
Kexanone pushed a commit that referenced this pull request Jul 6, 2018
@CreepPork @Kexanone
Updated release branch (#334)
d297718 
* Update readme paths

* update links in readme (part 2)

* Readme: Get rid of Heroku webhooks.

* Update README.md

* Small fixes (#293)

* Remove duplicate IDC

* Missing localization

* Remote control module still used vanilla function

* Rename stringtable key for delta distribution

* Hint module is now shown as Advanced Hint (#294)

* Hint module is now shown as Advanced Hint

* Swapped the category

* Add fr/de translations

* Reorganize and fix Adv Hint (#308)

* use ace_common_fnc_setName (#305)

* Fix for the Damage Building Module (#304)

* Use remoteExecCall instead of broadcasting the entire function

* Specify the target

* Fix undefined var error if ace is not installed. (#311)

* Added DeliciousJaffa (#317)

* Replace nonsensical default value (#320)

* Revised CAS modules (#319)

* Fix targeting and fire flares

* Address review comments + additional launch CM params

* Fix launch CM

* extraordinary important optimization

* Add change log for 1.0.3

* Small features (#321)

* Add artillery precision option

* Add artillery precision option (resolves #133)

* Revise paradrop: Drops below 150 => HALO (resolves #112)

* Add spaces for readability

* Correct change log (#322)

* Reorganize Tools (#323)

* move priv key folder to Achilles and ignore it

* Reorganize Tools

* New mintty-tmux session launcher

* Revised AddonBuilder batch script

* AchillesConnectToServer

* Update gitignore

* Rename Tools folder and add bat extension to AchillesAddonBuilder

* Fix travis tools path

* Reintroduce the faction filter (#326)

* Reintroduce the faction filter

* Update changlog.md

* Fix filter by uncommenting the required parts

* HALO (#324)

* Fix backpack inventory duplication

* Improve paradrop accuracy

* Add HALO option for reinforcements

* Improved the fitted function for HALO

* Fix error in function for HALO parameter

* More frequent checking time for height, since 1 sec can make a lot of difference in height

* Achilles_fnc_chute: Add default value for delay and reset chute deploy height to 100m

* Reinforcement: Set aircraft to carless, restrict HALO for planes only

* Add HALO option to teleport module

* Address point in review

* Address points in review (part 2)

* update change log

* Reinforcment: Fix CUP planes

* Achilles_fnc_chute: change chute deployment height to 120m

* Update changelog.md

* Use proper syntax for link in changlog

* Remove the extra space in the changelog

* Change 1.0.3 to 1.1.0 (#327)

* Fix locality issue for HALO option in the teleport module (#328)

* Broadcast chute function and exec on local machine

* Code optimization
@CreepPork CreepPork mentioned this pull request Aug 3, 2018
Merged
Kexanone pushed a commit that referenced this pull request Aug 3, 2018
@CreepPork @Kexanone
Updated release branch (#334) (#349)
641fc94 
* Update readme paths

* update links in readme (part 2)

* Readme: Get rid of Heroku webhooks.

* Update README.md

* Small fixes (#293)

* Remove duplicate IDC

* Missing localization

* Remote control module still used vanilla function

* Rename stringtable key for delta distribution

* Hint module is now shown as Advanced Hint (#294)

* Hint module is now shown as Advanced Hint

* Swapped the category

* Add fr/de translations

* Reorganize and fix Adv Hint (#308)

* use ace_common_fnc_setName (#305)

* Fix for the Damage Building Module (#304)

* Use remoteExecCall instead of broadcasting the entire function

* Specify the target

* Fix undefined var error if ace is not installed. (#311)

* Added DeliciousJaffa (#317)

* Replace nonsensical default value (#320)

* Revised CAS modules (#319)

* Fix targeting and fire flares

* Address review comments + additional launch CM params

* Fix launch CM

* extraordinary important optimization

* Add change log for 1.0.3

* Small features (#321)

* Add artillery precision option

* Add artillery precision option (resolves #133)

* Revise paradrop: Drops below 150 => HALO (resolves #112)

* Add spaces for readability

* Correct change log (#322)

* Reorganize Tools (#323)

* move priv key folder to Achilles and ignore it

* Reorganize Tools

* New mintty-tmux session launcher

* Revised AddonBuilder batch script

* AchillesConnectToServer

* Update gitignore

* Rename Tools folder and add bat extension to AchillesAddonBuilder

* Fix travis tools path

* Reintroduce the faction filter (#326)

* Reintroduce the faction filter

* Update changlog.md

* Fix filter by uncommenting the required parts

* HALO (#324)

* Fix backpack inventory duplication

* Improve paradrop accuracy

* Add HALO option for reinforcements

* Improved the fitted function for HALO

* Fix error in function for HALO parameter

* More frequent checking time for height, since 1 sec can make a lot of difference in height

* Achilles_fnc_chute: Add default value for delay and reset chute deploy height to 100m

* Reinforcement: Set aircraft to carless, restrict HALO for planes only

* Add HALO option to teleport module

* Address point in review

* Address points in review (part 2)

* update change log

* Reinforcment: Fix CUP planes

* Achilles_fnc_chute: change chute deployment height to 120m

* Update changelog.md

* Use proper syntax for link in changlog

* Remove the extra space in the changelog

* Change 1.0.3 to 1.1.0 (#327)

* Fix locality issue for HALO option in the teleport module (#328)

* Broadcast chute function and exec on local machine

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

@CreepPork CreepPork CreepPork approved these changes

Assignees

@Kexanone Kexanone

Labels
fix PR that is a fixes a bug. priority/medium Issue or PR that impacts some portions of the user base and should be resolved with due time.
Projects
None yet
Milestone
1.1.0
Development

Successfully merging this pull request may close these issues.
2 participants
@Kexanone @CreepPork