Skip to content

GM Compat - Add CSW Compatability#10934

Merged
PabstMirror merged 7 commits intoacemod:masterfrom
lambdatiger:gmCompatCSW
May 31, 2025
Merged

GM Compat - Add CSW Compatability#10934
PabstMirror merged 7 commits intoacemod:masterfrom
lambdatiger:gmCompatCSW

Conversation

@lambdatiger
Copy link
Copy Markdown
Contributor

When merged this pull request will:

  • Add a CSW carryable:
    • MILAN
    • 9K111 Fagot
    • MG3
  • Add CSW weapon interactions for
    • 2B11 120mm Mortar
    • M120 120mm Mortar

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@lambdatiger
Copy link
Copy Markdown
Contributor Author

Looking for string table entries as well for this one.

disassembleWeapon = ""; // Carryable weapon created above
disassembleTurret = ""; // Which static tripod will appear when weapon is disassembled
disassembleTo = QGVAR(milan_backpack); // Abuse the tripods
magazineLocation = "[0.204429,0.696469,-0.680236]"; // Aseconds to load ammo into the weapon
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Comment doesn't match code.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 514fbbf

Copy link
Copy Markdown
Contributor

@johnb432 johnb432 May 31, 2025

Choose a reason for hiding this comment

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

I forgot to mention that this is the case pretty much everywhere these comments exist.

lambdatiger and others added 2 commits May 30, 2025 17:35
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

@PabstMirror PabstMirror left a comment

Choose a reason for hiding this comment

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

looks good overall

@PabstMirror
Copy link
Copy Markdown
Contributor

nitpick, images are wrong aspect ratio, but can't really fix without copying and modifying their content
20250530200717_1

@PabstMirror PabstMirror added this to the 3.20.0 milestone May 31, 2025
@PabstMirror PabstMirror merged commit 7d6e349 into acemod:master May 31, 2025
3 checks passed
OverlordZorn pushed a commit to OverlordZorn/ACE3 that referenced this pull request Jun 16, 2025
* initial commit

* Removed extra files

* removed extra include

* Apply suggestions from code review

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Fixed comments and adjusted load/unload time for MILAN

* Apply suggestions from code review

* Fix `magazineLocation` comments

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
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.

3 participants