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

Optics - Convert Optics to use CBA Optics #7273

Merged
merged 23 commits into from
Aug 15, 2024
Merged

Optics - Convert Optics to use CBA Optics #7273

merged 23 commits into from
Aug 15, 2024

Conversation

commy2
Copy link
Contributor

@commy2 commy2 commented Nov 17, 2019 •
edited by johnb432
Loading

When merged this pull request will:

@commy2 commy2 added this to the 3.13.0 milestone Nov 17, 2019
@commy2 commy2 self-assigned this Nov 17, 2019
@jonpas jonpas modified the milestones: 3.13.0, 3.14.0 Dec 7, 2019
@jonpas jonpas mentioned this pull request Apr 7, 2020
Open
@PabstMirror PabstMirror modified the milestones: 3.15.1, Ongoing May 24, 2022
@jonpas jonpas changed the title convert ace_optics to use cba_optics Convert Optics to use CBA Optics Sep 11, 2023
@jonpas
Copy link
Member

jonpas commented Sep 11, 2023

Would likely need to be redone, closing. Feel free to re-open though.

@jonpas jonpas closed this Sep 11, 2023
@jonpas jonpas added the status/outdated Issues and pull requests that lost their meaning. label Sep 11, 2023
@jonpas jonpas deleted the cba-scripted-optics branch September 11, 2023 00:58
@LinkIsGrim LinkIsGrim mentioned this pull request Sep 19, 2023
Closed
@johnb432 johnb432 restored the cba-scripted-optics branch July 25, 2024 16:33
@johnb432 johnb432 mentioned this pull request Jul 26, 2024
Closed
@johnb432 johnb432 reopened this Jul 26, 2024
@johnb432 johnb432 modified the milestones: Ongoing, 3.18.0 Jul 26, 2024
@johnb432 johnb432 added kind/enhancement Release Notes: **IMPROVED:** and removed status/WIP kind/task status/outdated Issues and pull requests that lost their meaning. labels Jul 26, 2024
@johnb432
Copy link
Contributor

small ring of non-pip on the outside of scope

Looks like it's something I oversaw on my end - I imagine I'll be able to find a good value that works for everyone.

seems like 2d and pip are both using pip now, not sure if intentional?

This, on the other hand, worries me because on my end it works fine.

johnb432
johnb432 previously approved these changes Jul 27, 2024
View reviewed changes
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

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

I've done rigorous testing (checked if all sights could be accessed, if sizes are good, if 2D and PIP work ok, magnification levels are the same as the Vanilla counter parts) and LGTM. Given I've contributed to this PR in a not insignificant manner, it would be wise for someone else to review it before merging.

@johnb432 johnb432 dismissed their stale review July 28, 2024 04:23

Zoom levels don't match reticle sizes

@johnb432

This comment was marked as outdated.

Sign in to view
@johnb432
Copy link
Contributor

johnb432 commented Aug 2, 2024 •
edited
Loading

I overhauled the magnification levels of all scripted optics: the HAMR, Elcan and Pitbull have been bumped up to 4x, as to make the mildot/ranging match in-game bullet drop-off. The HAMR isn't quite perfect, as it was either the mildot or the bullet drop-off (mildot was chosen to be more important).
Bullet drop-off was measured using the 6.5mm MX cartridge.
An added benefit of this change is that the scopes have the same magnification levels as their real-life counterparts.
The MOS and Nightforce scopes were adjusted to 2.75-5.5x and 5.5-22x respectively. I based myself off of the real-life Nightforce and adjusted the in-game version until something matched: now, when fully zoomed in, every wide line represents 1 mil.
For the MOS, I just took the lower magnification level of the Nightforce and halved it to get the minimum. If at a magnification level of 5.5x, you need to multiply the mils by 4 to get the proper value.
EDIT: Added continuous zoom levels to the MOS and restored to the Nightforce.

@johnb432
Copy link
Contributor

johnb432 commented Aug 13, 2024 •
edited
Loading

One last thing: As it stands, I've removed the PIP stringtables. However, realisticnames still renames the PIP scopes.
Do I remove the renaming from realisticnames or do I restore the PIP stringtable entries?

@johnb432 johnb432 merged commit 903f046 into master Aug 15, 2024
5 checks passed
@johnb432 johnb432 deleted the cba-scripted-optics branch August 15, 2024 08:17
blake8090 pushed a commit to blake8090/ACE3 that referenced this pull request Aug 18, 2024
@commy2 @johnb432
@PabstMirror @blake8090
Optics - Convert Optics to use CBA Optics (acemod#7273)
30432f8 
* convert ace_optics to use cba_optics

* convert ace optics to cba optics

* Remove duplicate

* Add PIP config

* Use optics index

* Fix pboProject build

* Update CfgWeapons.hpp

* Correct SOS, adjust sizes and fix build issues

* Update addons/optics/script_component.hpp

* Corrected sizes again

* Made the scripted optics the first optics mode, fixed PIP SOS not being able to use irons

* Remove unused test object

* Readd AI stuff

visionMode is already set

* Updated some info on binos

forceOptics also already set

* Overhaul of magnifications

* Adjusted MOS & Nightforce

* Maybe this time the optics sizes will be fine... surely?

* Replace heavy optics blur with CBA one

* Added PIP names back

---------

Co-authored-by: johnb432 <[email protected]>
Co-authored-by: PabstMirror <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PabstMirror PabstMirror PabstMirror approved these changes

@johnb432 johnb432 johnb432 left review comments

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

Assignees
No one assigned
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Milestone
3.18.0
5 participants
@commy2 @jonpas @johnb432 @PabstMirror @LinkIsGrim