diff --git a/.editorconfig b/.editorconfig
index e4ab4a9fd38..4ca23b300fd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,5 +11,8 @@ trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false
+[*.yml]
+indent_size = 2
+
[Makefile]
indent_style = tab
diff --git a/.github/workflows/arma.yml b/.github/workflows/arma.yml
index d0649a0adec..1af2e7e0602 100644
--- a/.github/workflows/arma.yml
+++ b/.github/workflows/arma.yml
@@ -27,15 +27,6 @@ jobs:
- name: Validate function headers
run: python3 docs/tools/document_functions.py --debug
- lint:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout the source code
- uses: actions/checkout@v4
- - name: Lint (sqflint)
- uses: arma-actions/sqflint@master
- continue-on-error: true # No failure due to many false-positives
-
build:
runs-on: ubuntu-latest
steps:
@@ -52,3 +43,4 @@ jobs:
with:
name: ace3-${{ github.sha }}-nobin
path: .hemttout/@*
+ include-hidden-files: true # Because .hemttout is a hidden directory
diff --git a/.github/workflows/extensions.yml b/.github/workflows/extensions.yml
index 9693d2df22b..ce475e5a006 100644
--- a/.github/workflows/extensions.yml
+++ b/.github/workflows/extensions.yml
@@ -1,29 +1,65 @@
name: Extensions
on:
- pull_request:
+ push:
paths:
- - 'extensions/**'
+ - 'extension/**'
+ - 'Cargo.toml'
+ - 'Cargo.lock'
+ - '.github/workflows/extensions.yml'
jobs:
+ lint:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout the source code
+ uses: actions/checkout@master
+ - name: Install dependencies
+ run: |
+ rustup toolchain update stable --no-self-update
+ rustup default stable
+ rustup component add clippy rustfmt
+ - name: Run rustfmt
+ run: cargo fmt -- --check
+ - name: Run clippy
+ run: cargo clippy --all -- -Dwarnings
+
+ test:
+ runs-on: ubuntu-latest
+ container:
+ image: xd009642/tarpaulin
+ options: --security-opt seccomp=unconfined
+ steps:
+ - name: Checkout the source code
+ uses: actions/checkout@master
+ - name: Test & Coverage
+ run: cargo tarpaulin --verbose --no-default-features --workspace --timeout 240
+
build:
- runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [windows-latest]
-
+ arrays: [
+ os: { tag: "windows-latest", target: "i686-pc-windows-msvc" },
+ os: { tag: "windows-latest", target: "x86_64-pc-windows-msvc" },
+ ]
+ runs-on: ${{ matrix.arrays.os.tag }}
steps:
- name: Checkout the source code
uses: actions/checkout@v4
+ - name: Install stable Rust
+ uses: actions-rs/toolchain@v1
+ with:
+ target: ${{ matrix.arrays.os.target }}
+ toolchain: stable
+ default: true
+ - name: Rust Cache
+ uses: Swatinem/rust-cache@v2
- name: Build
- shell: cmd
- run: |
- cd extensions
- mkdir build
- cd build
- cmake .. && cmake --build .
- - name: Upload Artifact
+ run: cargo build --verbose
+ - name: Upload
uses: actions/upload-artifact@v4
with:
- name: ace3_extensions-${{ matrix.os }}-debug
- path: extensions/build
+ name: ${{ matrix.arrays.os.target }}
+ path: target/debug/ace.dll
+ if-no-files-found: error
+ retention-days: 30
diff --git a/.github/workflows/hemtt.yml b/.github/workflows/hemtt.yml
index e606852285d..79286fc45c3 100644
--- a/.github/workflows/hemtt.yml
+++ b/.github/workflows/hemtt.yml
@@ -33,6 +33,8 @@ jobs:
xcopy /e /h /q pullrequest\addons addons\
xcopy /e /h /q pullrequest\optionals optionals\
xcopy /e /h /q pullrequest\include include\
+ xcopy /y /h /q pullrequest\ace.dll ace.dll
+ xcopy /y /h /q pullrequest\ace_x64.dll ace_x64.dll
- name: Run HEMTT build
run: hemtt build
- name: Rename build folder
@@ -42,3 +44,4 @@ jobs:
with:
name: ace3-${{ github.sha }}
path: .hemttout/@*
+ include-hidden-files: true # Because .hemttout is a hidden directory
diff --git a/.gitignore b/.gitignore
index 4ad0a5e1eb9..15cc59d0d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,6 @@
*.zip
release/*
releases/*
-extensions/vcproj32/*
-extensions/vcproj64/*
.vscode/*
hemtt
hemtt.exe
@@ -20,4 +18,5 @@ CHANGELOG.md
sqfvm.exe
ArmaScriptCompiler.exe
*.sqfc
+target/
!extras/**/*.zip
diff --git a/.hemtt/launch.toml b/.hemtt/launch.toml
new file mode 100644
index 00000000000..d0726cbdded
--- /dev/null
+++ b/.hemtt/launch.toml
@@ -0,0 +1,31 @@
+[default]
+workshop = [
+ "450814997", # CBA_A3
+]
+
+[spe]
+extends = "default"
+dlc = [
+ "Spearhead 1944"
+]
+
+[vn]
+extends = "default"
+dlc = [
+ "S.O.G. Prairie Fire",
+]
+
+[ws]
+extends = "default"
+dlc = [
+ "Western Sahara",
+]
+
+[rhs]
+extends = "default"
+workshop = [
+ "843425103", # RHS AFRF Workshop ID
+ "843577117", # RHS USAF Workshop ID
+ "843593391", # RHS GREF Workshop ID
+ "843632231", # RHS SAF Workshop ID
+]
diff --git a/.hemtt/lints.toml b/.hemtt/lints.toml
new file mode 100644
index 00000000000..eac28147c00
--- /dev/null
+++ b/.hemtt/lints.toml
@@ -0,0 +1,5 @@
+[sqf.banned_commands]
+options.ignore = [
+ "addPublicVariableEventHandler", # Alt syntax is broken, we are using main syntax
+ "createSoundSource", # Greatly attenuated when in first person and in a vehicle
+]
diff --git a/.hemtt/project.toml b/.hemtt/project.toml
index f5ed361e3e1..6ab1c3a1afc 100644
--- a/.hemtt/project.toml
+++ b/.hemtt/project.toml
@@ -27,41 +27,3 @@ exclude = [
"common/functions/fnc_dummy.sqf",
"zeus/functions/fnc_zeusAttributes.sqf",
]
-
-[hemtt.launch.default]
-workshop = [
- "450814997", # CBA_A3
-]
-
-[hemtt.launch.spe]
-workshop = [
- "450814997", # CBA_A3
-]
-dlc = [
- "spe"
-]
-
-[hemtt.launch.vn]
-workshop = [
- "450814997", # CBA_A3's Workshop ID
-]
-dlc = [
- "S.O.G. Prairie Fire",
-]
-
-[hemtt.launch.ws]
-workshop = [
- "450814997", # CBA_A3's Workshop ID
-]
-dlc = [
- "Western Sahara",
-]
-
-[hemtt.launch.rhs]
-workshop = [
- "450814997", # CBA_A3's Workshop ID
- "843425103", # RHS AFRF Workshop ID
- "843577117", # RHS USAF Workshop ID
- "843593391", # RHS GREF Workshop ID
- "843632231", # RHS SAF Workshop ID
-]
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 00000000000..9ce88373eeb
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,1410 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ace"
+version = "0.1.0"
+dependencies = [
+ "arboard",
+ "arma-rs",
+ "git2",
+ "rand",
+ "rand_chacha",
+ "rayon",
+ "uuid",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "arboard"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
+dependencies = [
+ "clipboard-win",
+ "core-graphics",
+ "image",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "parking_lot",
+ "windows-sys 0.48.0",
+ "x11rb",
+]
+
+[[package]]
+name = "arma-rs"
+version = "1.11.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e722ed20b6266ceccf4334d32a528fcef9a2dca341b8bbcceb99eb7152081239"
+dependencies = [
+ "arma-rs-proc",
+ "crossbeam-channel",
+ "libc",
+ "link_args",
+ "log",
+ "seq-macro",
+ "state",
+ "uuid",
+ "winapi",
+ "windows 0.58.0",
+]
+
+[[package]]
+name = "arma-rs-proc"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936ed035ff4e775bd50ff94ccdb44f236d1ca012c376347b048fb6b9861833b7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+dependencies = [
+ "objc2",
+]
+
+[[package]]
+name = "bytemuck"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "cc"
+version = "1.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
+dependencies = [
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clipboard-win"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
+dependencies = [
+ "error-code",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "error-code"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "generator"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustversion",
+ "windows 0.48.0",
+]
+
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "git2"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "openssl-probe",
+ "openssl-sys",
+ "url",
+]
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "image"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "num-traits",
+ "png",
+ "tiff",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "jobserver"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.158"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+
+[[package]]
+name = "libgit2-sys"
+version = "0.17.0+1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+dependencies = [
+ "cc",
+ "libc",
+ "libssh2-sys",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+]
+
+[[package]]
+name = "libssh2-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "link_args"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c7721e472624c9aaad27a5eb6b7c9c6045c7a396f2efb6dabaec1b640d5e89b"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "loom"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-foundation",
+ "objc2-quartz-core",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "libc",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "png"
+version = "0.17.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "seq-macro"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
+
+[[package]]
+name = "serde"
+version = "1.0.208"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.208"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.125"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "state"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
+dependencies = [
+ "loom",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tiff"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "url"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "uuid"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "weezl"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "x11rb"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
+dependencies = [
+ "gethostname",
+ "rustix",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000000..a13ce613fd6
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,11 @@
+[workspace]
+resolver = "2"
+members = [
+ "extension"
+]
+
+[profile.release]
+opt-level = "z"
+lto = true
+codegen-units = 1
+strip = true
diff --git a/README.md b/README.md
index feb9194d65a..e5df6556e02 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
- Carrying and dragging
- Realistic names for vehicles and weapons
- A fire control system (FCS) for armored vehicles and helicopters
-- Realistic ballistics/FCS calculated in C/C++ extensions
+- Realistic ballistics/FCS calculated in Rust extensions
- Backblast area and overpressure simulation
- Disposable launchers
- Realistic G-forces
diff --git a/ace.dll b/ace.dll
new file mode 100644
index 00000000000..088ffda15ba
Binary files /dev/null and b/ace.dll differ
diff --git a/ace_advanced_ballistics.dll b/ace_advanced_ballistics.dll
deleted file mode 100644
index f5686a5a3f8..00000000000
Binary files a/ace_advanced_ballistics.dll and /dev/null differ
diff --git a/ace_advanced_ballistics_x64.dll b/ace_advanced_ballistics_x64.dll
deleted file mode 100644
index f1802ce5e88..00000000000
Binary files a/ace_advanced_ballistics_x64.dll and /dev/null differ
diff --git a/ace_artillerytables.dll b/ace_artillerytables.dll
deleted file mode 100644
index 2f5855c81a3..00000000000
Binary files a/ace_artillerytables.dll and /dev/null differ
diff --git a/ace_artillerytables_x64.dll b/ace_artillerytables_x64.dll
deleted file mode 100644
index 97a061c2570..00000000000
Binary files a/ace_artillerytables_x64.dll and /dev/null differ
diff --git a/ace_break_line.dll b/ace_break_line.dll
deleted file mode 100644
index 8fc92175fe2..00000000000
Binary files a/ace_break_line.dll and /dev/null differ
diff --git a/ace_break_line_x64.dll b/ace_break_line_x64.dll
deleted file mode 100644
index d021bf25d23..00000000000
Binary files a/ace_break_line_x64.dll and /dev/null differ
diff --git a/ace_clipboard.dll b/ace_clipboard.dll
deleted file mode 100644
index 8cf6744964f..00000000000
Binary files a/ace_clipboard.dll and /dev/null differ
diff --git a/ace_clipboard_x64.dll b/ace_clipboard_x64.dll
deleted file mode 100644
index db7730f0fed..00000000000
Binary files a/ace_clipboard_x64.dll and /dev/null differ
diff --git a/ace_fcs.dll b/ace_fcs.dll
deleted file mode 100644
index 9c2a871b3d9..00000000000
Binary files a/ace_fcs.dll and /dev/null differ
diff --git a/ace_fcs_x64.dll b/ace_fcs_x64.dll
deleted file mode 100644
index 4ee8dc1d896..00000000000
Binary files a/ace_fcs_x64.dll and /dev/null differ
diff --git a/ace_x64.dll b/ace_x64.dll
new file mode 100644
index 00000000000..98d675bde45
Binary files /dev/null and b/ace_x64.dll differ
diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf
index 9d0dd0ee4b9..25545d02aa0 100644
--- a/addons/advanced_ballistics/XEH_postInit.sqf
+++ b/addons/advanced_ballistics/XEH_postInit.sqf
@@ -1,10 +1,10 @@
#include "script_component.hpp"
-GVAR(currentbulletID) = -1;
+#include "initKeybinds.inc.sqf"
GVAR(Protractor) = false;
GVAR(ProtractorStart) = CBA_missionTime;
-GVAR(allBullets) = [];
+GVAR(allBullets) = createHashMap;
GVAR(currentGrid) = 0;
if (!hasInterface) exitWith {};
@@ -24,22 +24,6 @@ if (!hasInterface) exitWith {};
// Register Perframe Handler
[LINKFUNC(handleFirePFH), GVAR(simulationInterval)] call CBA_fnc_addPerFrameHandler;
-
- //Add warnings for missing compat PBOs (only if AB is on)
- {
- _x params ["_modPBO", "_compatPBO"];
- if ([_modPBO] call EFUNC(common,isModLoaded) && {!([_compatPBO] call EFUNC(common,isModLoaded))}) then {
- WARNING_2("Weapon Mod [%1] missing ace compat pbo [%2] (from @ace\optionals)",_modPBO,_compatPBO);
- };
- } forEach [
- ["RH_acc","ace_compat_rh_acc"],
- ["RH_de_cfg","ace_compat_rh_de"],
- ["RH_m4_cfg","ace_compat_rh_m4"],
- ["RH_PDW","ace_compat_rh_pdw"],
- ["RKSL_PMII","ace_compat_rksl_pm_ii"],
- ["iansky_opt","ace_compat_sma3_iansky"],
- ["R3F_Armes","ace_compat_r3f"]
- ];
}] call CBA_fnc_addEventHandler;
#ifdef DEBUG_MODE_FULL
diff --git a/addons/advanced_ballistics/config.cpp b/addons/advanced_ballistics/config.cpp
index 17647d0647d..e3fe6957d78 100644
--- a/addons/advanced_ballistics/config.cpp
+++ b/addons/advanced_ballistics/config.cpp
@@ -18,10 +18,3 @@ class CfgPatches {
#include "CfgVehicles.hpp"
#include "RscTitles.hpp"
#include "ACE_Settings.hpp"
-
-class ACE_Extensions {
- class ace_advanced_ballistics {
- windows = 1;
- client = 1;
- };
-};
diff --git a/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf b/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
index a2156349f6d..b3f4053bdd9 100644
--- a/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
+++ b/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
@@ -80,7 +80,7 @@ for "_i" from 0 to (count _cfgWeapons)-1 do {
diag_log text format ["AB_Diagnose_barrelTwist,%1,%2,%3,%4,%5",_weapon,_magazine,_ammo,_twistDirection,_barrelTwist];
};
if (_barrelLength == 0) then {
- diag_log text format ["AB_Diagnose_barrelLength,%1,%2,%3,%4,%5",_weapon,_magazine,_ammo,_barrelLength];
+ diag_log text format ["AB_Diagnose_barrelLength,%1,%2,%3,%4",_weapon,_magazine,_ammo,_barrelLength];
};
};
} forEach _magazines;
@@ -108,16 +108,16 @@ for "_i" from 0 to (count _cfgWeapons)-1 do {
};
if (_weapons find _weapon == -1) then {
_weapons pushBack _weapon;
- _magIndex = _magazines find _magazine;
- _magSpeed = _magazineInitSpeeds select _magIndex;
+ private _magIndex = _magazines find _magazine;
+ private _magSpeed = _magazineInitSpeeds select _magIndex;
_weaponInitSpeeds pushBack (_abInitialSpeed / _magSpeed);
};
} forEach _data;
{
_x params ["_magazineIndex", "_abInitialSpeed", "_magazine", "_weapon"];
- _magIndex = _magazines find _magazine;
- _magSpeed = _magazineInitSpeeds select _magIndex;
- _wepIndex = _weapons find _weapon;
+ private _magIndex = _magazines find _magazine;
+ private _magSpeed = _magazineInitSpeeds select _magIndex;
+ private _wepIndex = _weapons find _weapon;
_wepSpeed = _weaponInitSpeeds select _wepIndex;
} forEach _data;
{
diff --git a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
index ceaef17badf..a426f6ba99a 100644
--- a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
+++ b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
@@ -50,7 +50,7 @@ GVAR(Protractor) = true;
__ctrl1 ctrlSetTextColor [1, 1, 1, 1];
__ctrl2 ctrlSetScale 1;
- __ctrl2 ctrlSetPosition [SafeZoneX + 0.001, SafeZoneY - 0.001 - 0.1074 * (-0.86 max ((ACE_player weaponDirection currentWeapon ACE_player) select 2) min 0.86), 0.2, 0.2 * 4/3];
+ __ctrl2 ctrlSetPosition [safeZoneX + 0.001, safeZoneY - 0.001 - 0.1074 * (-0.86 max ((ACE_player weaponDirection currentWeapon ACE_player) select 2) min 0.86), 0.2, 0.2 * 4/3];
__ctrl2 ctrlCommit 0;
__ctrl2 ctrlSetText QPATHTOF(UI\protractor_marker.paa);
__ctrl2 ctrlSetTextColor [1, 1, 1, 1];
diff --git a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
index e9180cb1c44..9c359bf833e 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
@@ -1,6 +1,6 @@
#include "..\script_component.hpp"
/*
- * Author: Glowbal, Ruthberg, joko // Jonas
+ * Author: Glowbal, Ruthberg, joko // Jonas, Brett Mayson
* Handle the PFH for Bullets
*
* Arguments:
@@ -17,7 +17,7 @@
private _deleted = false;
{
- _x params ["_bullet","_caliber","_bulletTraceVisible","_index"];
+ _y params ["_bullet","_caliber","_bulletTraceVisible"];
if (alive _bullet) then {
private _bulletVelocity = velocity _bullet;
@@ -27,13 +27,21 @@ private _deleted = false;
drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
};
- _bullet setVelocity (_bulletVelocity vectorAdd (parseSimpleArray ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6", _index, _bulletVelocity, _bulletPosition, wind, ASLToATL(_bulletPosition) select 2, CBA_missionTime toFixed 6])));
+ (
+ "ace" callExtension ["ballistics:bullet:simulate", [
+ _x,
+ _bulletVelocity,
+ _bulletPosition,
+ wind,
+ ASLToATL(_bulletPosition) select 2,
+ CBA_missionTime toFixed 6
+ ]]
+ ) params ["_data", "_code"];
+ if (_code == 0) then {
+ _bullet setVelocity (_bulletVelocity vectorAdd (parseSimpleArray (_data)));
+ };
} else {
- GVAR(allBullets) set [_forEachIndex, objNull];
- _deleted = true;
+ GVAR(allBullets) deleteAt _x;
+ "ace" callExtension ["ballistics:bullet:delete", [_x]];
};
-} forEach GVAR(allBullets);
-
-if (_deleted) then {
- GVAR(allBullets) = GVAR(allBullets) - [objNull];
-};
+} forEach GVAR(allBullets)
diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
index ff2fe85ae4f..7d00168160f 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@@ -1,6 +1,6 @@
#include "..\script_component.hpp"
/*
- * Author: Glowbal, Ruthberg
+ * Author: Glowbal, Ruthberg, Brett Mayson
*
* Handles advanced ballistics for (BulletBase) projectiles. Called from the unified fired EH only for players.
*
@@ -62,11 +62,11 @@ if (_abort) exitWith {};
// Get Weapon and Ammo Configurations
private _AmmoCacheEntry = uiNamespace getVariable format[QGVAR(%1), _ammo];
if (isNil "_AmmoCacheEntry") then {
- _AmmoCacheEntry = _ammo call FUNC(readAmmoDataFromConfig);
+ _AmmoCacheEntry = _ammo call FUNC(readAmmoDataFromConfig);
};
private _WeaponCacheEntry = uiNamespace getVariable format[QGVAR(%1), _weapon];
if (isNil "_WeaponCacheEntry") then {
- _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig);
+ _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig);
};
_AmmoCacheEntry params ["_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocityVariationSD"];
@@ -120,8 +120,26 @@ if (_caliber * _bulletLength * _bulletMass * _barrelTwist > 0) then {
_stabilityFactor = [_caliber, _bulletLength, _bulletMass, _barrelTwist, _muzzleVelocity, _temperature, _barometricPressure] call FUNC(calculateStabilityFactor);
};
-GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000;
-
-"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _ammoCount, _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _transonicStabilityCoef, getPosASL _projectile, _bulletVelocity, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), EGVAR(weather,currentOvercast), CBA_missionTime toFixed 6];
-
-GVAR(allBullets) pushBack [_projectile, _caliber, _bulletTraceVisible, GVAR(currentbulletID)];
+("ace" callExtension [
+ "ballistics:bullet:new", [
+ _ammoCount,
+ _airFriction,
+ _ballisticCoefficients,
+ _velocityBoundaries,
+ _atmosphereModel,
+ _dragModel,
+ _stabilityFactor,
+ _twistDirection,
+ _transonicStabilityCoef,
+ _bulletVelocity,
+ EGVAR(common,mapLatitude),
+ EGVAR(weather,currentTemperature),
+ EGVAR(common,mapAltitude),
+ EGVAR(weather,currentHumidity),
+ EGVAR(weather,currentOvercast),
+ CBA_missionTime toFixed 6
+ ]
+]) params ["_id", "_code"];
+if (_code == 0) then {
+ GVAR(allBullets) set [_id, [_projectile, _caliber, _bulletTraceVisible]];
+};
diff --git a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
index 89e89b9f7ea..8c908639c30 100644
--- a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
+++ b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
@@ -21,7 +21,14 @@ if (!GVAR(enabled)) exitWith {};
private _initStartTime = diag_tickTime;
private _mapSize = worldSize;
-if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
+(
+ "ace" callExtension ["ballistics:map:init", [worldName, _mapSize]]
+) params ["_data", "_code"];
+if (_code != 0) exitWith {
+ ERROR("Error initializing map")
+};
+
+if (_data == "true") exitWith {
INFO_1("Terrain already initialized [world: %1]",worldName);
#ifdef DEBUG_MODE_FULL
systemChat "AdvancedBallistics: Terrain already initialized";
@@ -53,8 +60,7 @@ INFO_2("Starting Terrain Extension [cells: %1] [world: %2]",_gridCells,worldName
private _gridCenter = [_x + 25, _y + 25];
private _gridHeight = round(getTerrainHeightASL _gridCenter);
private _gridNumObjects = count (_gridCenter nearObjects ["Building", 50]);
- private _gridSurfaceIsWater = parseNumber (surfaceIsWater _gridCenter);
- "ace_advanced_ballistics" callExtension format["set:%1:%2:%3", _gridHeight, _gridNumObjects, _gridSurfaceIsWater];
+ "ace" callExtension ["ballistics:map:set", [GVAR(currentGrid), _gridHeight, _gridNumObjects, surfaceIsWater _gridCenter]];
GVAR(currentGrid) = GVAR(currentGrid) + 1;
if (GVAR(currentGrid) >= _gridCells) exitWith {};
};
diff --git a/addons/advanced_ballistics/initSettings.inc.sqf b/addons/advanced_ballistics/initSettings.inc.sqf
index 957044f343a..28a1d6d8262 100644
--- a/addons/advanced_ballistics/initSettings.inc.sqf
+++ b/addons/advanced_ballistics/initSettings.inc.sqf
@@ -5,7 +5,9 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)];
[LSTRING(enabled_DisplayName), LSTRING(enabled_Description)],
_category,
false,
- 1
+ 1,
+ {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
+ true // Needs mission restart
] call CBA_fnc_addSetting;
[
@@ -45,5 +47,7 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)];
[LSTRING(simulationInterval_DisplayName), LSTRING(simulationInterval_Description)],
_category,
[0, 0.2, 0.05, 2],
- 1
+ 1,
+ {[QGVAR(simulationInterval), _this] call EFUNC(common,cbaSettings_settingChanged)},
+ true // Needs mission restart
] call CBA_fnc_addSetting;
diff --git a/addons/advanced_ballistics/stringtable.xml b/addons/advanced_ballistics/stringtable.xml
index b077f53b6ae..67022f7deba 100644
--- a/addons/advanced_ballistics/stringtable.xml
+++ b/addons/advanced_ballistics/stringtable.xml
@@ -46,7 +46,7 @@
Fejlett ballisztika
Продвинутая баллистика
Balistica Avanzata
- アドバンスド弾道計算
+ 高度な弾道計算
고급 탄도학
先進彈道系統
进阶弹道系统
@@ -63,7 +63,7 @@
Fejlett ballisztika
Продвинутая баллистика
Balistica Avanzata
- アドバンスド弾道計算を有効化
+ 高度な弾道計算を有効化
고급 탄도학
先進彈道系統
进阶弹道系统
@@ -80,7 +80,7 @@
Engedélyezi a fejlett ballisztikát
Включает продвинутую баллистику
Abilita Balistica Avanzata
- アドバンスド弾道計算は高度な弾道計算処理を有効化します。
+ 高度な弾道計算を有効化します。
고급 탄도학을 적용합니다
啟用先進彈道系統
启用进阶弹道系统
@@ -280,7 +280,7 @@
Meghatározza a játékos körüli hatókört (méterben), ahol a lövedékek fejlett ballisztikát használnak
Определяет радиус вокруг игрока (в метрах), в котором продвинутая баллистика применяется к снарядам
Definisce il raggio attorno al giocatore (in metri) entro il quale la Balistica Avanzata è applicata ai proiettili
- アドバンスド弾道計算の適用半径範囲 (プレイヤー中心、メートル単位) を定義します。
+ 高度な弾道計算が飛翔体に適用される半径距離 (プレイヤー中心、メートル単位) を定義します。
플레이어 주위의 발사체를 고급 탄도학으로 정의하는 범위를 정합니다(미터)
以玩家的半徑距離(公尺)定義先進彈道系統啟用範圍
定义玩家周围的半径（米），在这个半径内，进阶弹道系统会被启用
@@ -297,7 +297,7 @@
Этот модуль включает симуляцию продвинутой баллистики - при этом на траекторию полета снаряда влияют различные параметры, такие как температура воздуха, атмосферное давление, влажность, гравитация, тип боеприпаса и оружия, из которого произвели выстрел.
Este módulo permite la simulación balística avanzada - es decir, la trayectoria de los proyectiles está influenciada por variables como la temperatura del aire, la presión atmosférica, la humedad, la gravedad, el tipo de municiones y el arma desde el que fue disparada.
Questo modulo abilita la simulazione della Balistica Avanzata - essa comporta che la traiettoria dei proiettili è influenzata da variabili come la temperatura dell'aria, pressione atmosferica, umidità, gravità, il tipo di munizione e l'arma da cui è sparata.
- アドバンスド弾道計算のシミュレーションを有効化します。 弾道は気温・気圧・湿度・重力・弾薬の種類・発射する武器などの変化による影響を受けるようになります。
+ 高度な弾道計算のシミュレーションを有効化します。 弾道は気温・気圧・湿度・重力・弾薬の種類・発射する武器などの変化による影響を受けるようになります。
이 모듈은 고급 탄도학을 적용시킵니다 - 이는 발사체의 궤적이 기온, 대기압, 습도, 중력, 탄환의 종류와 어느 무기에서 발사되는지에 따라 영향을 받습니다.
該模塊實現先進的彈道仿真 - 這意味著子彈的軌跡是由空氣溫度、大氣壓力、濕度、重力、彈藥類型以及射擊的武器所影響
该模块实现增强的弹道模拟—子弹的轨迹由空气温度、大气压力、湿度、重力、弹药类型和射击的武器等变量所影响
diff --git a/addons/advanced_fatigue/CfgEden.hpp b/addons/advanced_fatigue/CfgEden.hpp
index 8307c8a2a57..50147c8e8c6 100644
--- a/addons/advanced_fatigue/CfgEden.hpp
+++ b/addons/advanced_fatigue/CfgEden.hpp
@@ -2,9 +2,35 @@ class Cfg3DEN {
class Attributes {
class Slider;
class GVAR(slider): Slider {
- attributeLoad = "params [""_ctrlGroup""]; private _slider = _ctrlGroup controlsGroupCtrl 100; private _edit = _ctrlGroup controlsGroupCtrl 101; _slider sliderSetPosition _value; _edit ctrlSetText ([_value, 1, 1] call CBA_fnc_formatNumber); ";
- attributeSave = "params [""_ctrlGroup""]; sliderPosition (_ctrlGroup controlsGroupCtrl 100); ";
- onLoad = "params [""_ctrlGroup""]; private _slider = _ctrlGroup controlsGroupCtrl 100; private _edit = _ctrlGroup controlsGroupCtrl 101; _slider sliderSetRange [0, 2]; _slider ctrlAddEventHandler [""SliderPosChanged"", { params [""_slider""]; private _edit = (ctrlParentControlsGroup _slider) controlsGroupCtrl 101; private _value = sliderPosition _slider; _edit ctrlSetText ([_value, 1, 1] call CBA_fnc_formatNumber); }]; _edit ctrlAddEventHandler [""KillFocus"", { params [""_edit""]; private _slider = (ctrlParentControlsGroup _edit) controlsGroupCtrl 100; private _value = ((parseNumber ctrlText _edit) min 2) max 0; _slider sliderSetPosition _value; _edit ctrlSetText str _value; }];";
+ #pragma hemtt suppress pw3_padded_arg
+ attributeLoad = QUOTE(\
+ params ['_ctrlGroup']; \
+ private _slider = _ctrlGroup controlsGroupCtrl 100; \
+ private _edit = _ctrlGroup controlsGroupCtrl 101; \
+ _slider sliderSetPosition _value; \
+ _edit ctrlSetText ([ARR_3(_value,1,1)] call CBA_fnc_formatNumber); \
+ );
+ attributeSave = QUOTE(params ['_ctrlGroup']; sliderPosition (_ctrlGroup controlsGroupCtrl 100));
+ #pragma hemtt suppress pw3_padded_arg
+ onLoad = QUOTE(\
+ params ['_ctrlGroup']; \
+ private _slider = _ctrlGroup controlsGroupCtrl 100; \
+ private _edit = _ctrlGroup controlsGroupCtrl 101; \
+ _slider sliderSetRange [ARR_2(0,MAX_PERFORMANCE_FACTOR)]; \
+ _slider ctrlAddEventHandler [ARR_2('SliderPosChanged',{ \
+ params ['_slider']; \
+ private _edit = (ctrlParentControlsGroup _slider) controlsGroupCtrl 101; \
+ private _value = sliderPosition _slider; \
+ _edit ctrlSetText ([ARR_3(_value,1,1)] call CBA_fnc_formatNumber); \
+ })]; \
+ _edit ctrlAddEventHandler [ARR_2('KillFocus',{ \
+ params ['_edit']; \
+ private _slider = (ctrlParentControlsGroup _edit) controlsGroupCtrl 100; \
+ private _value = ((parseNumber ctrlText _edit) min MAX_PERFORMANCE_FACTOR) max 0; \
+ _slider sliderSetPosition _value; \
+ _edit ctrlSetText str _value; \
+ })]; \
+ );
};
};
class Object {
diff --git a/addons/advanced_fatigue/Dialog.hpp b/addons/advanced_fatigue/Dialog.hpp
index df019f3800c..7b57e00ced9 100644
--- a/addons/advanced_fatigue/Dialog.hpp
+++ b/addons/advanced_fatigue/Dialog.hpp
@@ -2,18 +2,18 @@ class RscControlsGroupNoScrollbars;
class RscPicture;
class GVAR(StaminaBarContainer): RscControlsGroupNoScrollbars {
- x = "(profilenamespace getvariable [""IGUI_GRID_STAMINA_X"", ((safezoneX + safezoneW) - (10 * (((safezoneW / safezoneH) min 1.2) / 40)) - 4.3 * (((safezoneW / safezoneH) min 1.2) / 40))])";
- y = "(profilenamespace getvariable [""IGUI_GRID_STAMINA_Y"", (safezoneY + 4.05 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))])";
- w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.15 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
+ x = "(profilenamespace getvariable [""IGUI_GRID_STAMINA_X"", ((safeZoneX + safeZoneW) - (10 * (((safeZoneW / safeZoneH) min 1.2) / 40)) - 4.3 * (((safeZoneW / safeZoneH) min 1.2) / 40))])";
+ y = "(profilenamespace getvariable [""IGUI_GRID_STAMINA_Y"", (safeZoneY + 4.05 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25))])";
+ w = "10 * (((safeZoneW / safeZoneH) min 1.2) / 40)";
+ h = "0.15 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
class Controls {
class StaminaBar: RscPicture {
idc = 10;
x = 0;
y = 0;
- w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "0.15 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
+ w = "10 * (((safeZoneW / safeZoneH) min 1.2) / 40)";
+ h = "0.15 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
text = "\A3\Ui_f\data\IGUI\RscIngameUI\RscUnitInfo\stamina_ca.paa";
};
};
diff --git a/addons/advanced_fatigue/XEH_PREP.hpp b/addons/advanced_fatigue/XEH_PREP.hpp
index 22bb99617a7..509c85e3755 100644
--- a/addons/advanced_fatigue/XEH_PREP.hpp
+++ b/addons/advanced_fatigue/XEH_PREP.hpp
@@ -10,3 +10,4 @@ PREP(mainLoop);
PREP(moduleSettings);
PREP(removeDutyFactor);
PREP(renderDebugLines);
+PREP(updateStaminaBar);
diff --git a/addons/advanced_fatigue/XEH_postInit.sqf b/addons/advanced_fatigue/XEH_postInit.sqf
index 519d218b8cd..e3b75a64a61 100644
--- a/addons/advanced_fatigue/XEH_postInit.sqf
+++ b/addons/advanced_fatigue/XEH_postInit.sqf
@@ -14,6 +14,8 @@ call FUNC(renderDebugLines);
["CBA_settingsInitialized", {
if (!GVAR(enabled)) exitWith {};
+ [QEGVAR(ui,hideHud), LINKFUNC(updateStaminaBar)] call CBA_fnc_addEventHandler;
+
["baseline", {
private _fatigue = ACE_player getVariable [QGVAR(aimFatigue), 0];
switch (stance ACE_player) do {
diff --git a/addons/advanced_fatigue/XEH_preInit.sqf b/addons/advanced_fatigue/XEH_preInit.sqf
index 643b7b0be00..ed1bd966229 100644
--- a/addons/advanced_fatigue/XEH_preInit.sqf
+++ b/addons/advanced_fatigue/XEH_preInit.sqf
@@ -8,7 +8,7 @@ PREP_RECOMPILE_END;
#include "initSettings.inc.sqf"
-GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40);
+GVAR(staminaBarWidth) = 10 * (((safeZoneW / safeZoneH) min 1.2) / 40);
GVAR(dutyList) = createHashMap;
GVAR(setAnimExclusions) = [];
GVAR(inertia) = 0;
diff --git a/addons/advanced_fatigue/functions/fnc_mainLoop.sqf b/addons/advanced_fatigue/functions/fnc_mainLoop.sqf
index a07abae7944..e6327a3fa56 100644
--- a/addons/advanced_fatigue/functions/fnc_mainLoop.sqf
+++ b/addons/advanced_fatigue/functions/fnc_mainLoop.sqf
@@ -27,9 +27,18 @@ if (!alive ACE_player) exitWith {
private _velocity = velocity ACE_player;
private _normal = surfaceNormal (getPosWorld ACE_player);
private _movementVector = vectorNormalized _velocity;
-private _sideVector = vectorNormalized (_movementVector vectorCrossProduct _normal);
private _fwdAngle = asin (_movementVector select 2);
-private _sideAngle = asin (_sideVector select 2);
+private _sideAngle = if ((getPosATL ACE_player) select 2 > 0.01) then {
+ 0 // ignore terrain normal if not touching it
+} else {
+ private _sideVector = vectorNormalized (_movementVector vectorCrossProduct _normal);
+ asin (_sideVector select 2);
+};
+if (GVAR(isSwimming)) then { // ignore when floating
+ _fwdAngle = 0;
+ _sideAngle = 0;
+};
+
private _currentWork = REE;
private _currentSpeed = (vectorMagnitude _velocity) min 6;
@@ -62,7 +71,7 @@ if (isNull objectParent ACE_player && {_currentSpeed > 0.1} && {isTouchingGround
};
// Used to simulate the unevenness/roughness of the terrain
- if ((getPosATL ACE_player) select 2 < 0.01) then {
+ if (_sideAngle != 0) then {
private _sideGradient = abs (_sideAngle / 45) min 1;
_terrainFactor = 1 + _sideGradient ^ 4;
@@ -140,7 +149,7 @@ systemChat format ["---- velocity %1 - respiratoryRate: %2 ----", (vectorMagnitu
[ACE_player, _perceivedFatigue, GVAR(anReserve) == 0, _fwdAngle, _sideAngle] call FUNC(handleEffects);
-if (GVAR(enableStaminaBar)) then {
+if (GVAR(enableStaminaBarRealized)) then {
[GVAR(anReserve) / AN_MAXRESERVE] call FUNC(handleStaminaBar);
};
diff --git a/addons/advanced_fatigue/functions/fnc_updateStaminaBar.sqf b/addons/advanced_fatigue/functions/fnc_updateStaminaBar.sqf
new file mode 100644
index 00000000000..627430c8201
--- /dev/null
+++ b/addons/advanced_fatigue/functions/fnc_updateStaminaBar.sqf
@@ -0,0 +1,25 @@
+#include "..\script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Updates the stamina bar state
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [] call ace_advanced_fatigue_fnc_updateStaminaBar
+ *
+ * Public: No
+ */
+
+GVAR(enableStaminaBarRealized) = GVAR(enabled) && GVAR(enableStaminaBar) && {!(missionNamespace getVariable [QEGVAR(ui,hideHud), false])};
+TRACE_1("updateStaminaBar",GVAR(enableStaminaBarRealized));
+
+private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
+if (isNull _staminaBarContainer) exitWith {};
+
+_staminaBarContainer ctrlSetFade ([1, 0] select GVAR(enableStaminaBarRealized));
+_staminaBarContainer ctrlCommit 0;
diff --git a/addons/advanced_fatigue/initSettings.inc.sqf b/addons/advanced_fatigue/initSettings.inc.sqf
index 01eba8652dc..bd8bd7d9281 100644
--- a/addons/advanced_fatigue/initSettings.inc.sqf
+++ b/addons/advanced_fatigue/initSettings.inc.sqf
@@ -6,12 +6,7 @@
true,
1,
{
- if (!_this) then {
- private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
- _staminaBarContainer ctrlSetFade 1;
- _staminaBarContainer ctrlCommit 0;
- };
-
+ call FUNC(updateStaminaBar);
[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)
},
true // Needs mission restart
@@ -24,13 +19,7 @@
LSTRING(DisplayName),
true,
1,
- {
- if (!_this) then {
- private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
- _staminaBarContainer ctrlSetFade 1;
- _staminaBarContainer ctrlCommit 0;
- };
- }
+ {call FUNC(updateStaminaBar)}
] call CBA_fnc_addSetting;
[
@@ -54,7 +43,7 @@
"SLIDER",
[LSTRING(PerformanceFactor), LSTRING(PerformanceFactor_Description)],
LSTRING(DisplayName),
- [0, 10, 1, 2],
+ [0, MAX_PERFORMANCE_FACTOR, 1, 2],
1,
{
// Recalculate values if the setting is changed mid-mission
diff --git a/addons/advanced_fatigue/script_component.hpp b/addons/advanced_fatigue/script_component.hpp
index 7e3255439ff..11228ff3f25 100644
--- a/addons/advanced_fatigue/script_component.hpp
+++ b/addons/advanced_fatigue/script_component.hpp
@@ -41,3 +41,5 @@
#define AE1_MAXRESERVE 4000000 // mmol
#define AE2_MAXRESERVE 84000 // mmol
#define AN_MAXRESERVE 2300 // mmol
+
+#define MAX_PERFORMANCE_FACTOR 10
diff --git a/addons/advanced_fatigue/stringtable.xml b/addons/advanced_fatigue/stringtable.xml
index 5cd36ffce60..76e33a64e5f 100644
--- a/addons/advanced_fatigue/stringtable.xml
+++ b/addons/advanced_fatigue/stringtable.xml
@@ -7,7 +7,7 @@
ACE Erweiterte Ausdauer
ACE 進階疲勞
ACE 进阶体力
- ACE アドバンスド疲労
+ ACE 高度な疲労
ACE Fatica Avanzata
ACE 고급 피로도
ACE Fatigue avancée
@@ -173,7 +173,7 @@
Enables/disables Advanced Fatigue.
Activa/desactiva la fatiga avanzada
Aktiviert/deaktiviert Advanced Fatigue.
- アドバンスド疲労は高度な疲労管理システムを有効化します。
+ 高度な疲労を有効/無効化します。
Włącza/wyłącza zaawansowaną wytrzymałość
고급 피로도 활성화/비활성화
Active/Désactive la fatigue avancée.
diff --git a/addons/advanced_throwing/functions/fnc_throw.sqf b/addons/advanced_throwing/functions/fnc_throw.sqf
index d6b38a6a0c7..d1773373411 100644
--- a/addons/advanced_throwing/functions/fnc_throw.sqf
+++ b/addons/advanced_throwing/functions/fnc_throw.sqf
@@ -89,7 +89,7 @@ GVAR(flightPath) = [];
GVAR(flightRotation) = [];
(_unit getVariable QGVAR(activeThrowable)) spawn {
while {!isNull _this && {(getPosATL _this) select 2 > 0.05}} do {
- GVAR(flightPath) pushBack [ASLtoAGL (getPosASL _this), vectorUp _this];
+ GVAR(flightPath) pushBack [ASLToAGL (getPosASL _this), vectorUp _this];
sleep 0.05;
};
};
diff --git a/addons/advanced_throwing/stringtable.xml b/addons/advanced_throwing/stringtable.xml
index fc9cf2705a5..99fba866305 100644
--- a/addons/advanced_throwing/stringtable.xml
+++ b/addons/advanced_throwing/stringtable.xml
@@ -5,7 +5,7 @@
Advanced Throwing
Lanzamiento Avanzado
Улучшенный бросок гранат
- アドバンスド投擲
+ 高度な投擲
Zaawansowane rzucanie
Erweitertes Wurfsystem
고급 투척
@@ -21,7 +21,7 @@
Allows changing advanced throwing behaviour.
Permite modificar el comportamiento del lanzamiento avanzado
Позволяет настраивать поведение улучшенного броска гранат.
- アドバンスド投擲は投擲の高度な動作挙動を変更可能にします。
+ 高度な投擲挙動への変更を可能にします。
Zezwala na zmianę zachowania zaawansowanego trybu rzucania.
Erlaubt es, das Verhalten des erweiterten Wurfsystems zu ändern.
고급 투척 행위를 허가합니다
@@ -36,7 +36,7 @@
Enable Advanced Throwing
Activar Lanzamiento Avanzado
Вкл. улучшенный бросок
- アドバンスド投擲を有効化
+ 高度な投擲を有効化
Aktywuj zaawansowane rzucanie
Aktiviere erweitertes Wurfsystem
고급 투척 활성화
@@ -52,7 +52,7 @@
Enables advanced throwing system.
Activa el Lanzamiento Avanzado
Включает систему улучшенного броска.
- アドバンスド投擲は高度な投擲システムを有効化します。
+ 高度な投擲システムを有効化します。
Aktywuje system zaawansowanego rzucania.
Aktiviert das erweiterte Wurfsystem.
고급 투척을 활성화 합니다
diff --git a/addons/ai/functions/fnc_drawCuratorGarrisonPathing.sqf b/addons/ai/functions/fnc_drawCuratorGarrisonPathing.sqf
index 561c8748a65..8a312d95cc5 100644
--- a/addons/ai/functions/fnc_drawCuratorGarrisonPathing.sqf
+++ b/addons/ai/functions/fnc_drawCuratorGarrisonPathing.sqf
@@ -16,10 +16,11 @@
*/
if (isNull findDisplay 312) exitWith {
+ //IGNORE_PRIVATE_WARNING ["_thisEventHandler"];
removeMissionEventHandler ["Draw3D", _thisEventHandler];
};
-private _unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []];
+private _unitMoveList = missionNamespace getVariable [QGVAR(garrison_unitMoveList), []];
{
_x params ["_unit", "_pos"];
@@ -27,9 +28,9 @@ private _unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveLis
switch (true) do {
case (surfaceIsWater (getPos _unit) && {surfaceIsWater _pos}) : {
for "_i" from 0 to 3 do {
- drawLine3D [_unit modelToWorldVisualWorld [0,0,1], (AGLtoASL _pos), [1,0,0,1]];
+ drawLine3D [_unit modelToWorldVisualWorld [0,0,1], (AGLToASL _pos), [1,0,0,1]];
};
- drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], (AGLtoASL _pos), 0.75, 0.75, 0.75];
+ drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], (AGLToASL _pos), 0.75, 0.75, 0.75];
};
case (!surfaceIsWater (getPos _unit) && {!surfaceIsWater _pos}) : {
@@ -43,7 +44,7 @@ private _unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveLis
for "_i" from 0 to 3 do {
drawLine3D [_unit modelToWorldVisual [0,0,1], (AGLToASL _pos), [1,0,0,1]];
};
- drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], (AGLtoASL _pos), 0.75, 0.75, 0.75];
+ drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], (AGLToASL _pos), 0.75, 0.75, 0.75];
};
case (surfaceIsWater (getPos _unit) && {!surfaceIsWater _pos}) : {
diff --git a/addons/ai/functions/fnc_garrison.sqf b/addons/ai/functions/fnc_garrison.sqf
index 4b8f84fce63..042c4fde3cb 100644
--- a/addons/ai/functions/fnc_garrison.sqf
+++ b/addons/ai/functions/fnc_garrison.sqf
@@ -26,7 +26,7 @@ params [["_startingPos",[0,0,0], [[]], 3], ["_buildingTypes", ["Building"], [[]]
TRACE_6("fnc_garrison: Start",_startingPos,_buldingTypes,count _unitsArray,_fillingRadius,_fillingTYpe,_topDownFilling);
_unitsArray = _unitsArray select {alive _x && {!isPlayer _x}};
-private _currentUnitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []];
+private _currentUnitMoveList = missionNamespace getVariable [QGVAR(garrison_unitMoveList), []];
if (_startingPos isEqualTo [0,0,0]) exitWith {
TRACE_1("fnc_garrison: StartingPos error",_startingPos);
@@ -57,38 +57,38 @@ if (_topDownFilling) then {
// Those reverse are necessary, as dumb as it is there's no better way to sort those subarrays in sqf
{
reverse _x;
- } foreach _buildingPos;
+ } forEach _buildingPos;
_buildingPos sort false;
{
reverse _x;
- } foreach _buildingPos;
+ } forEach _buildingPos;
_buildingsIndex pushBack _buildingPos;
- } foreach _buildings;
+ } forEach _buildings;
} else {
{
_buildingsIndex pushBack (_x buildingPos -1);
- } foreach _buildings;
+ } forEach _buildings;
};
// Remove buildings without positions
{
_buildingsIndex deleteAt (_buildingsIndex find _x);
-} foreach (_buildingsIndex select {count _x == 0});
+} forEach (_buildingsIndex select {count _x == 0});
//Remove positions units are already pathing to
_buildingsIndex = _buildingsIndex apply {
_x select {
private _testedPos = _x;
- ({(_x select 1) isEqualTo _testedPos} count (missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []])) == 0
+ ({(_x select 1) isEqualTo _testedPos} count (missionNamespace getVariable [QGVAR(garrison_unitMoveList), []])) == 0
}
};
// Warn the user that there's not enough positions to place all units
private _count = 0;
-{_count = _count + count _x} foreach _buildingsIndex;
+{_count = _count + count _x} forEach _buildingsIndex;
if ( (count _unitsArray) - _count > 0) then {
TRACE_4("fnc_garrison: Not enough spots to place all units",_unitsArray,count _unitsArray,_count,((count _unitsArray) - _count > 0));
[LSTRING(GarrisonNotEnoughPos)] call EFUNC(common,displayTextStructured);
@@ -104,7 +104,7 @@ private _fnc_comparePos = {
params ["_nearestUnits", "_pos"];
({
if (surfaceIsWater getPos _x) then {
- floor ((getPosASL _x) select 2) == floor ((AGLtoASL _pos) select 2)
+ floor ((getPosASL _x) select 2) == floor ((AGLToASL _pos) select 2)
} else {
floor ((getPosATL _x) select 2) == floor (_pos select 2)
};
@@ -141,7 +141,7 @@ switch (_fillingType) do {
if (_teleport) then {
doStop _unit;
if (_posSurface) then {
- _unit setPosASL (AGLtoASL _pos);
+ _unit setPosASL (AGLToASL _pos);
} else {
_unit setPosATL _pos;
};
@@ -190,7 +190,7 @@ switch (_fillingType) do {
if (_teleport) then {
doStop _unit;
if (_posSurface) then {
- _unit setPosASL (AGLtoASL _pos);
+ _unit setPosASL (AGLToASL _pos);
} else {
_unit setPosATL _pos;
};
@@ -237,7 +237,7 @@ switch (_fillingType) do {
if (_teleport) then {
doStop _unit;
if (_posSurface) then {
- _unit setPosASL (AGLtoASL _pos);
+ _unit setPosASL (AGLToASL _pos);
} else {
_unit setPosATL _pos;
};
@@ -261,7 +261,7 @@ switch (_fillingType) do {
TRACE_1(format [ARR_2("fnc_garrison: while loop ended | %1 units ready to be treated by PFH",count _unitMoveList)],_teleport);
// Update the unit list and remove duplicate positions and units
-private _garrison_unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []];
+private _garrison_unitMoveList = missionNamespace getVariable [QGVAR(garrison_unitMoveList), []];
_garrison_unitMoveList = _garrison_unitMoveList select {
_x params ["_testedUnit", "_testedPos"];
@@ -270,7 +270,7 @@ _garrison_unitMoveList = _garrison_unitMoveList select {
_garrison_unitMoveList append _unitMoveList;
-missionNameSpace setVariable [QGVAR(garrison_unitMoveList), _garrison_unitMoveList, true];
+missionNamespace setVariable [QGVAR(garrison_unitMoveList), _garrison_unitMoveList, true];
if (_teleport) then {
[QGVAR(AISection), [_placedUnits, ["PATH"], false], _placedUnits] call CBA_fnc_targetEvent;
diff --git a/addons/ai/functions/fnc_garrisonMove.sqf b/addons/ai/functions/fnc_garrisonMove.sqf
index 4d1c471a0ea..46313f12e38 100644
--- a/addons/ai/functions/fnc_garrisonMove.sqf
+++ b/addons/ai/functions/fnc_garrisonMove.sqf
@@ -31,21 +31,21 @@ private _unitMoveListUnits = (_unitMoveList apply {_x select 0});
{
_x setVariable [QGVAR(garrisonMove_failSafe), nil, true];
_x setVariable [QGVAR(garrisonMove_unitPosMemory), nil, true];
-} foreach _unitMoveListUnits;
+} forEach _unitMoveListUnits;
// Avoid duplicate PFHs
if (isNil QGVAR(garrison_moveUnitPFH)) then {
- missionNameSpace setVariable [QGVAR(garrison_moveUnitPFH), true, true];
+ missionNamespace setVariable [QGVAR(garrison_moveUnitPFH), true, true];
// PFH checking if the units have reached their destination
[{
params ["_args", "_pfhID"];
- private _unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []];
+ private _unitMoveList = missionNamespace getVariable [QGVAR(garrison_unitMoveList), []];
// End PFH if all units are placed / unable to reach position
if (_unitMoveList isEqualTo []) then {
- missionNameSpace setVariable [QGVAR(garrison_moveUnitPFH), nil, true];
+ missionNamespace setVariable [QGVAR(garrison_moveUnitPFH), nil, true];
LOG("garrisonMove PFH: PFH finished it's job | deleting PFH");
_pfhID call CBA_fnc_removePerFrameHandler;
@@ -91,7 +91,7 @@ if (isNil QGVAR(garrison_moveUnitPFH)) then {
} else {
private _unitPos = getPos _unit;
- if (surfaceisWater _unitPos) then {
+ if (surfaceIsWater _unitPos) then {
_unitPos = getPosASL _unit;
} else {
_unitPos = getPosATL _unit;
@@ -131,9 +131,9 @@ if (isNil QGVAR(garrison_moveUnitPFH)) then {
};
};
};
- } foreach _unitMoveList;
+ } forEach _unitMoveList;
- missionNameSpace setVariable [QGVAR(garrison_unitMoveList), _unitMoveList, true];
+ missionNamespace setVariable [QGVAR(garrison_unitMoveList), _unitMoveList, true];
};
}, 0.5, []] call CBA_fnc_addPerFrameHandler;
};
diff --git a/addons/ai/functions/fnc_unGarrison.sqf b/addons/ai/functions/fnc_unGarrison.sqf
index 09ebc3e63da..f17d9aa4ab7 100644
--- a/addons/ai/functions/fnc_unGarrison.sqf
+++ b/addons/ai/functions/fnc_unGarrison.sqf
@@ -32,7 +32,7 @@ _units = _units select {local _x};
_unit setVariable [QGVAR(garrisonned), false, true];
- private _unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []];
+ private _unitMoveList = missionNamespace getVariable [QGVAR(garrison_unitMoveList), []];
_unitMoveList deleteAt (_unitMoveList findIf {_x select 0 == _unit});
if (_leader != _unit) then {
@@ -43,9 +43,9 @@ _units = _units select {local _x};
_unit doMove ((nearestBuilding (getPos _unit)) buildingExit 0);
};
- if ((units _unit) findif {(_x getVariable [QGVAR(garrisonned), false]) && !isPlayer _x} == -1) then {
+ if ((units _unit) findIf {(_x getVariable [QGVAR(garrisonned), false]) && !isPlayer _x} == -1) then {
LOG("fnc_ungarrison: enableAttack true");
(group _unit) enableAttack true;
};
};
-} foreach _units;
+} forEach _units;
diff --git a/addons/aircraft/functions/fnc_droneSetWaypoint.sqf b/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
index 953b99a357a..45c18c63da2 100644
--- a/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
+++ b/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
@@ -62,6 +62,8 @@ if (_type == "FOLLOW" && {["CAManBase", "LandVehicle", "Ship"] findIf {_target i
_waypoint setWaypointPosition [getPosASL _target, -1];
};
}, 3, [_vehicle, _group, _waypoint, _target]] call CBA_fnc_addPerFrameHandler;
+} else {
+ _waypoint setWaypointType _type;
};
TRACE_3("",_currentHeight,_currentLoiterRadius,_currentLoiterType);
diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml
index 041653fe2b2..a3abe94a810 100644
--- a/addons/aircraft/stringtable.xml
+++ b/addons/aircraft/stringtable.xml
@@ -182,14 +182,18 @@
Distanza di seguimento
Folge-Entfernung
따라가는 거리
+ Distance de suivi
追跡距離
+ Расстояние отслеживания
Following unit within %1m
Seguendo unità entro %1m
Folgt Einheit bis zu %1m
%1m 이내로 유닛을 따라갑니다
+ Suivre l'unité jusqu'à %1m
%1m 間隔で 目標を追跡します
+ Отслеживание в пределах %1m
diff --git a/addons/arsenal/XEH_PREP.hpp b/addons/arsenal/XEH_PREP.hpp
index 94d4739b604..d0819056f25 100644
--- a/addons/arsenal/XEH_PREP.hpp
+++ b/addons/arsenal/XEH_PREP.hpp
@@ -78,6 +78,7 @@ PREP(removeStat);
PREP(removeVirtualItems);
PREP(renameDefaultLoadout);
PREP(replaceUniqueItemsLoadout);
+PREP(saveLoadout);
PREP(scanConfig);
PREP(showItem);
PREP(sortPanel);
diff --git a/addons/arsenal/XEH_preInit.sqf b/addons/arsenal/XEH_preInit.sqf
index 10cc3989e94..248fc16db2c 100644
--- a/addons/arsenal/XEH_preInit.sqf
+++ b/addons/arsenal/XEH_preInit.sqf
@@ -85,10 +85,10 @@ private _insigniaCondition = toString {
// Ref fnc_addListBoxItem, 0/nil = configFile, 1 = campaignConfigFile, 2 = missionConfigFile
{
- GVAR(insigniaCache) set [_x, 1];
+ GVAR(insigniaCache) set [configName _x, 1];
} forEach (_insigniaCondition configClasses (campaignConfigFile >> "CfgUnitInsignia"));
{
- GVAR(insigniaCache) set [_x, 2];
+ GVAR(insigniaCache) set [configName _x, 2];
} forEach (_insigniaCondition configClasses (missionConfigFile >> "CfgUnitInsignia"));
ADDON = true;
diff --git a/addons/arsenal/defines.hpp b/addons/arsenal/defines.hpp
index cd6d937426a..5b8a733724b 100644
--- a/addons/arsenal/defines.hpp
+++ b/addons/arsenal/defines.hpp
@@ -3,7 +3,7 @@
#define GRID_W (pixelW * pixelGridNoUIScale * pixelScale)
#define GRID_H (pixelH * pixelGridNoUIScale * pixelScale)
-#define WIDTH_TOTAL (safezoneW - 2 * (93 * GRID_W))
+#define WIDTH_TOTAL (safeZoneW - 2 * (93 * GRID_W))
#define WIDTH_GAP (WIDTH_TOTAL / 100)
#define WIDTH_SINGLE ((WIDTH_TOTAL - 7 * WIDTH_GAP) / 6)
@@ -154,6 +154,8 @@
#define IDC_statsPreviousPage 52
#define IDC_statsNextPage 53
#define IDC_statsCurrentPage 54
+#define IDC_statsBoxTitleBackground 55
+#define IDC_statsBoxBackground 56
#define IDC_actionsBox 90
#define IDC_actionsBackground1 90010
#define IDC_actionsBackground2 90011
@@ -360,10 +362,10 @@ _buttonCurrentMag2Ctrl ctrlCommit FADE_DELAY;\
{\
_x = _display displayCtrl _x;\
_x ctrlSetPosition [\
- safezoneX + safezoneW - 93 * GRID_W,\
- safezoneY + 14 * GRID_H,\
+ safeZoneX + safeZoneW - 93 * GRID_W,\
+ safeZoneY + 14 * GRID_H,\
80 * GRID_W,\
- safezoneH - 28 * GRID_H\
+ safeZoneH - 28 * GRID_H\
];\
_x ctrlCommit 0;\
} forEach [\
@@ -406,10 +408,10 @@ _buttonCurrentMag2Ctrl ctrlCommit FADE_DELAY;\
{\
_x = _display displayCtrl _x;\
_x ctrlSetPosition [\
- safezoneX + safezoneW - 93 * GRID_W,\
- safezoneY + 14 * GRID_H,\
+ safeZoneX + safeZoneW - 93 * GRID_W,\
+ safeZoneY + 14 * GRID_H,\
80 * GRID_W,\
- safezoneH - 34 * GRID_H\
+ safeZoneH - 34 * GRID_H\
];\
_x ctrlCommit 0;\
} forEach [\
@@ -426,16 +428,16 @@ if (!isNil QGVAR(customRightPanelButtons)) then {\
if (isNull (_display displayCtrl (60 + _plusId))) then {\
private _ctrl = _display ctrlCreate [QGVAR(customArsenalButton_Background), 60 + _plusId];\
_ctrl ctrlSetPosition [\
- safezoneW + safezoneX - 13 * GRID_W,\
- safezoneY + (88 + (10 * _forEachIndex)) * GRID_H\
+ safeZoneW + safeZoneX - 13 * GRID_W,\
+ safeZoneY + (88 + (10 * _forEachIndex)) * GRID_H\
];\
_ctrl ctrlCommit 0;\
};\
if (isNull (_display displayCtrl (61 + _plusId))) then {\
- _ctrl = _display ctrlCreate [QGVAR(customArsenalButton_Button), 61 + _plusId];\
+ private _ctrl = _display ctrlCreate [QGVAR(customArsenalButton_Button), 61 + _plusId];\
_ctrl ctrlSetPosition [\
- safezoneW + safezoneX - 10 * GRID_W,\
- safezoneY + (88 + (10 * _forEachIndex)) * GRID_H\
+ safeZoneW + safeZoneX - 10 * GRID_W,\
+ safeZoneY + (88 + (10 * _forEachIndex)) * GRID_H\
];\
_ctrl ctrlSetText _picture;\
_ctrl ctrlSetTooltip _tooltip;\
@@ -446,8 +448,8 @@ if (!isNil QGVAR(customRightPanelButtons)) then {\
{\
_x = _display displayCtrl _x;\
_x ctrlSetPosition [\
- safezoneW + safezoneX - (10 + (3 * _forEachIndex)) * GRID_W,\
- safezoneY + (88 + (10 * _miscOffset)) * GRID_H\
+ safeZoneW + safeZoneX - (10 + (3 * _forEachIndex)) * GRID_W,\
+ safeZoneY + (88 + (10 * _miscOffset)) * GRID_H\
];\
_x ctrlCommit 0;\
} forEach [IDC_buttonMisc, IDC_iconBackgroundMisc];\
diff --git a/addons/arsenal/functions/fnc_baseAttachment.sqf b/addons/arsenal/functions/fnc_baseAttachment.sqf
index 968fd05d9b8..1d6155c9ee2 100644
--- a/addons/arsenal/functions/fnc_baseAttachment.sqf
+++ b/addons/arsenal/functions/fnc_baseAttachment.sqf
@@ -22,7 +22,7 @@ TRACE_1("looking up base attachment",_item);
private _switchableClasses = [];
-private _cfgWeapons = configfile >> "CfgWeapons";
+private _cfgWeapons = configFile >> "CfgWeapons";
private _config = _cfgWeapons >> _item;
_item = configName _config;
diff --git a/addons/arsenal/functions/fnc_baseWeapon.sqf b/addons/arsenal/functions/fnc_baseWeapon.sqf
index abeb0e0ab9b..2b1b219e65c 100644
--- a/addons/arsenal/functions/fnc_baseWeapon.sqf
+++ b/addons/arsenal/functions/fnc_baseWeapon.sqf
@@ -20,7 +20,7 @@ params [["_weapon", "", [""]]];
// Check if item is cached
(uiNamespace getVariable QGVAR(baseWeaponNameCache)) getOrDefaultCall [toLowerANSI _weapon, {
- private _cfgWeapons = configfile >> "CfgWeapons";
+ private _cfgWeapons = configFile >> "CfgWeapons";
private _config = _cfgWeapons >> _weapon;
// If class doesn't exist, exit
diff --git a/addons/arsenal/functions/fnc_buttonExport.sqf b/addons/arsenal/functions/fnc_buttonExport.sqf
index 3e5039a5040..abf7c7d6fcb 100644
--- a/addons/arsenal/functions/fnc_buttonExport.sqf
+++ b/addons/arsenal/functions/fnc_buttonExport.sqf
@@ -26,28 +26,27 @@ if (GVAR(shiftState)) then {
switch (true) do {
// Beginning
case (_index == -1): {
- "ace_clipboard" callExtension (format ["[%1", endl]);
+ "ace" callExtension ["clipboard:append", [format ["[%1", endl]]];
};
// End
case (_index == _listLength): {
- "ace_clipboard" callExtension "];";
+ "ace" callExtension ["clipboard:append", ["];"]];
};
// Rest
default {
- "ace_clipboard" callExtension ([" ", str (GVAR(defaultLoadoutsList) select _index), [",", ""] select (_index == _listLength - 1), endl] joinString "");
+ "ace" callExtension ["clipboard:append", [[" ", str (GVAR(defaultLoadoutsList) select _index), [",", ""] select (_index == _listLength - 1), endl] joinString ""]];
};
};
};
- "ace_clipboard" callExtension "--COMPLETE--";
+ "ace" callExtension ["clipboard:complete", []];
[_display, LLSTRING(exportDefault)] call FUNC(message);
} else {
// Export singular loadout
private _export = str (GVAR(center) call CBA_fnc_getLoadout);
-
- "ace_clipboard" callExtension (_export + ";");
- "ace_clipboard" callExtension "--COMPLETE--";
+ "ace" callExtension ["clipboard:append", [_export]];
+ "ace" callExtension ["clipboard:complete", []];
[_display, LLSTRING(exportCurrent)] call FUNC(message);
};
diff --git a/addons/arsenal/functions/fnc_buttonImport.sqf b/addons/arsenal/functions/fnc_buttonImport.sqf
index 8a83fe3ff0c..494bf159daa 100644
--- a/addons/arsenal/functions/fnc_buttonImport.sqf
+++ b/addons/arsenal/functions/fnc_buttonImport.sqf
@@ -16,7 +16,13 @@
params ["_display"];
// Can be either a singular loadout or an array of loadouts
-private _extendedLoadout = call compile copyFromClipboard;
+private _extendedLoadout = if (isMultiplayer) then {
+ ("ace" callExtension ["clipboard:loadout", []]) params ["_loadout", "_code"];
+ if (_code != 0) exitWith {};
+ parseSimpleArray _loadout
+} else {
+ call compile copyFromClipboard
+};
// If error, exit
if (isNil "_extendedLoadout" || {!(_extendedLoadout isEqualType [])}) exitWith {
diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf
index b5d435a101e..0511c05a25a 100644
--- a/addons/arsenal/functions/fnc_handleStats.sqf
+++ b/addons/arsenal/functions/fnc_handleStats.sqf
@@ -19,6 +19,8 @@
params ["_display", "_control", "_curSel", ["_itemCfg", configNull]];
private _statsBoxCtrl = _display displayCtrl IDC_statsBox;
+private _statsBoxTitleBackgroundCtrl = _display displayCtrl IDC_statsBoxTitleBackground;
+private _statsBoxBackgroundCtrl = _display displayCtrl IDC_statsBoxBackground;
private _statsPreviousPageCtrl = _display displayCtrl IDC_statsPreviousPage;
private _statsNextPageCtrl = _display displayCtrl IDC_statsNextPage;
private _statsCurrentPageCtrl = _display displayCtrl IDC_statsCurrentPage;
@@ -53,7 +55,7 @@ private _fnc_hideEverything = {
// Hide the stats box
_statsBoxCtrl ctrlSetPosition [
(0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
- safezoneY + 1.8 * GRID_H,
+ safeZoneY + 1.8 * GRID_H,
0,
0
];
@@ -62,7 +64,7 @@ private _fnc_hideEverything = {
// Move action display
private _ctrl = _display displayCtrl IDC_actionsBox;
private _pos = ctrlPosition _ctrl;
- _pos set [1, safezoneY + 1.8 * GRID_H];
+ _pos set [1, safeZoneY + 1.8 * GRID_H];
_ctrl ctrlSetPosition _pos;
_ctrl ctrlCommit 0;
@@ -111,6 +113,7 @@ private _fnc_handleStats = {
private _statsBarCtrl = controlNull;
private _statsTextCtrl = controlNull;
private _textStatementResult = "";
+ private _lastCtrl = _statsBoxTitleBackgroundCtrl;
{
_x params ["", "_configEntry", "_title", "_bools", "_statements"];
@@ -127,6 +130,17 @@ private _fnc_handleStats = {
_statsTitleCtrl ctrlSetText _title;
_statsTitleCtrl ctrlSetFade 0;
+ // Vertical Position
+ ctrlPosition _lastCtrl params ["", "_lastPosY", "", "_lastPosH"];
+ _statsTitleCtrl ctrlSetPositionY (_lastPosY + _lastPosH + GRID_H);
+ {
+ _x ctrlSetPositionY (_lastPosY + _lastPosH + GRID_H + (5 * GRID_H));
+ } forEach [
+ _statsBackgroundCtrl,
+ _statsBarCtrl,
+ _statsTextCtrl
+ ];
+
// Handle bars
if (_showBar) then {
_statsBarCtrl progressSetPosition ([_configEntry, _itemCfg] call _barStatement);
@@ -140,18 +154,39 @@ private _fnc_handleStats = {
// Handle text entries
if (_showText) then {
_textStatementResult = [_configEntry, _itemCfg] call _textStatement;
-
- if !(_textStatementResult isEqualtype "") then {
- _textStatementResult = str _textStatementResult;
+ if (_textStatementResult isEqualType []) then {
+ _textStatementResult = _textStatementResult joinString endl;
+ } else {
+ if !(_textStatementResult isEqualType "") then {
+ _textStatementResult = str _textStatementResult;
+ };
};
_statsTextCtrl ctrlSetText _textStatementResult;
_statsTextCtrl ctrlSetTextColor ([[1, 1, 1, 1], [0, 0, 0, 1]] select (_showBar));
+
+ //Height based on Text lines
+ {
+ _x ctrlSetPositionH (ctrlTextHeight _statsTextCtrl);
+ } forEach [
+ _statsBackgroundCtrl,
+ _statsBarCtrl,
+ _statsTextCtrl
+ ];
+
_statsTextCtrl ctrlSetFade 0;
} else {
_statsTextCtrl ctrlSetFade 1;
+ //Ensure default height
+ {
+ _x ctrlSetPositionH (5 * GRID_H);
+ } forEach [
+ _statsBackgroundCtrl,
+ _statsBarCtrl,
+ _statsTextCtrl
+ ];
};
-
+
{
_x ctrlCommit 0;
} forEach [
@@ -160,24 +195,29 @@ private _fnc_handleStats = {
_statsBarCtrl,
_statsTextCtrl
];
+
+ _lastCtrl = _statsTextCtrl;
+
} forEach _statsToDisplay;
// Resize the window
(5 - _statsCount) call _fnc_hideUnused;
- private _height = 10 * _statsCount + 5;
+ ctrlPosition _lastCtrl params ["", "_lastPosY", "", "_lastPosH"];
_statsBoxCtrl ctrlSetPosition [
(0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
- safezoneY + 1.8 * GRID_H,
+ safeZoneY + 1.8 * GRID_H,
47 * GRID_W,
- _height * GRID_H
+ _lastPosY + _lastPosH + GRID_H
];
+ _statsBoxBackgroundCtrl ctrlSetPositionH (_lastPosY + _lastPosH + GRID_H);
+ _statsBoxBackgroundCtrl ctrlCommit 0;
_statsBoxCtrl ctrlCommit 0;
// Move the actions box
private _ctrl = _display displayCtrl IDC_actionsBox;
private _pos = ctrlPosition _ctrl;
- _pos set [1, safezoneY + (_height + 3.6) * GRID_H];
+ _pos set [1, safeZoneY + (_lastPosY + _lastPosH + GRID_H + (3.6 * GRID_H))];
_ctrl ctrlSetPosition _pos;
_ctrl ctrlCommit 0;
diff --git a/addons/arsenal/functions/fnc_itemInfo.sqf b/addons/arsenal/functions/fnc_itemInfo.sqf
index 676783a8b54..2662600aaee 100644
--- a/addons/arsenal/functions/fnc_itemInfo.sqf
+++ b/addons/arsenal/functions/fnc_itemInfo.sqf
@@ -32,11 +32,11 @@ if (isClass _itemCfg) then {
(_display displayCtrl IDC_infoName) ctrlSetText ([_control lbText _curSel, _control lnbText [_curSel, 1]] select (ctrlType _control == CT_LISTNBOX));
private _itemAuthor = getText (_itemCfg >> "author");
- (_display displayctrl IDC_infoAuthor) ctrlSetText ([localize "STR_AUTHOR_UNKNOWN", format [localize "STR_FORMAT_AUTHOR_SCRIPTED", _itemAuthor]] select (_itemAuthor != ""));
+ (_display displayCtrl IDC_infoAuthor) ctrlSetText ([localize "STR_AUTHOR_UNKNOWN", format [localize "STR_FORMAT_AUTHOR_SCRIPTED", _itemAuthor]] select (_itemAuthor != ""));
// DLC / mod icon
- private _ctrlDLC = _display displayctrl IDC_DLCIcon;
- private _ctrlDLCBackground = _display displayctrl IDC_DLCBackground;
+ private _ctrlDLC = _display displayCtrl IDC_DLCIcon;
+ private _ctrlDLCBackground = _display displayCtrl IDC_DLCBackground;
private _dlc = _itemCfg call EFUNC(common,getAddon);
if (_dlc != "") then {
@@ -48,7 +48,7 @@ if (isClass _itemCfg) then {
_ctrlDLC ctrlSetFade 0;
// If an item is from a DLC, set it so when you press the icon on the bottom right it opens the DLC page
- if ((getNumber (configfile >> "CfgMods" >> _dlc >> "appId")) > 0) then {
+ if ((getNumber (configFile >> "CfgMods" >> _dlc >> "appId")) > 0) then {
_ctrlDLC ctrlSetEventHandler ["MouseExit", format ["(_this select 0) ctrlSetText '%1';", _logo]];
_ctrlDLC ctrlSetEventHandler ["MouseEnter", format ["(_this select 0) ctrlSetText '%1';", _logoOver]];
_ctrlDLC ctrlSetEventHandler [
diff --git a/addons/arsenal/functions/fnc_message.sqf b/addons/arsenal/functions/fnc_message.sqf
index b20689f6b9c..5d2846bafc6 100644
--- a/addons/arsenal/functions/fnc_message.sqf
+++ b/addons/arsenal/functions/fnc_message.sqf
@@ -25,6 +25,7 @@ if (!isNil "_handle") then {
};
_handle = [_display, _messageBoxCtrl, time + 5, _message, FADE_DELAY] spawn {
+ //IGNORE_PRIVATE_WARNING ["_thisScript"];
disableSerialization;
params ["_display", "_control", "_timer", "_message", "_delay"];
diff --git a/addons/arsenal/functions/fnc_onArsenalOpen.sqf b/addons/arsenal/functions/fnc_onArsenalOpen.sqf
index 0f0a5817c6e..2a2d8716c84 100644
--- a/addons/arsenal/functions/fnc_onArsenalOpen.sqf
+++ b/addons/arsenal/functions/fnc_onArsenalOpen.sqf
@@ -121,7 +121,7 @@ _mouseBlockCtrl ctrlEnable false;
private _statsBoxCtrl = _display displayCtrl IDC_statsBox;
_statsBoxCtrl ctrlSetPosition [
(0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
- safezoneY + 1.8 * GRID_H,
+ safeZoneY + 1.8 * GRID_H,
47 * GRID_W,
11 * GRID_H
];
@@ -132,20 +132,12 @@ _statsBoxCtrl ctrlCommit 0;
private _actionsBoxCtrl = _display displayCtrl IDC_actionsBox;
_actionsBoxCtrl ctrlSetPosition [
(0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
- safezoneY + 58.6 * GRID_H,
+ safeZoneY + 58.6 * GRID_H,
47 * GRID_W,
11 * GRID_H
];
_actionsBoxCtrl ctrlCommit 0;
-// Disable import in MP
-if (isMultiplayer) then {
- private _importButtonCtrl = _display displayCtrl IDC_buttonImport;
- _importButtonCtrl ctrlEnable false;
- _importButtonCtrl ctrlSetFade 0.6;
- _importButtonCtrl ctrlCommit 0;
-};
-
//--------------- Camera prep
cutText ["", "PLAIN"];
showCommandingMenu "";
diff --git a/addons/arsenal/functions/fnc_onKeyDown.sqf b/addons/arsenal/functions/fnc_onKeyDown.sqf
index 4d62075f78f..fe69bb3486d 100644
--- a/addons/arsenal/functions/fnc_onKeyDown.sqf
+++ b/addons/arsenal/functions/fnc_onKeyDown.sqf
@@ -94,8 +94,8 @@ if (!isNull _loadoutsDisplay) then {
};
} params ["_className"];
- "ace_clipboard" callExtension (_className + ";");
- "ace_clipboard" callExtension "--COMPLETE--";
+ "ace" callExtension ["clipboard:append", [_className]];
+ "ace" callExtension ["clipboard:complete", []];
[_display, LLSTRING(exportedClassnameText)] call FUNC(message);
} else {
diff --git a/addons/arsenal/functions/fnc_onSelChangedLeft.sqf b/addons/arsenal/functions/fnc_onSelChangedLeft.sqf
index e25016b303d..a5a32a85188 100644
--- a/addons/arsenal/functions/fnc_onSelChangedLeft.sqf
+++ b/addons/arsenal/functions/fnc_onSelChangedLeft.sqf
@@ -17,7 +17,7 @@
params ["_control", "_curSel"];
-if (_curSel < 0) exitwith {};
+if (_curSel < 0) exitWith {};
private _display = ctrlParent _control;
private _item = [_control lbData _curSel, _control lnbData [_curSel, 0]] select (ctrlType _control == CT_LISTNBOX);
@@ -33,6 +33,7 @@ private _fnc_clearCurrentWeaponMags = {
// If nothing was selected, remove all magazines from the current weapon
if (_item != "") then {
+ //IGNORE_PRIVATE_WARNING ["_compatibleMags"];
_compatibleMagsCurrentWeapon = _compatibleMagsCurrentWeapon - _compatibleMags;
};
diff --git a/addons/arsenal/functions/fnc_onSelChangedRight.sqf b/addons/arsenal/functions/fnc_onSelChangedRight.sqf
index abec68ceeef..66315f7dc79 100644
--- a/addons/arsenal/functions/fnc_onSelChangedRight.sqf
+++ b/addons/arsenal/functions/fnc_onSelChangedRight.sqf
@@ -16,7 +16,7 @@
params ["_control", "_curSel"];
-if (_curSel < 0) exitwith {};
+if (_curSel < 0) exitWith {};
private _display = ctrlParent _control;
private _item = _control lbData _curSel;
diff --git a/addons/arsenal/functions/fnc_saveLoadout.sqf b/addons/arsenal/functions/fnc_saveLoadout.sqf
new file mode 100644
index 00000000000..05e712e45f6
--- /dev/null
+++ b/addons/arsenal/functions/fnc_saveLoadout.sqf
@@ -0,0 +1,37 @@
+#include "..\script_component.hpp"
+/*
+ * Author: DartRuffian
+ * Saves a given loadout to the client's profile.
+ *
+ * Arguments:
+ * 0: Name of loadout
+ * 1: CBA extended loadout or getUnitLoadout array
+ * 2: Replace existing loadout (default: false)
+ *
+ * Return Value:
+ * True if loadout was saved, otherwise false
+ *
+ * Example:
+ * ["Current Loadout", getUnitLoadout ACE_player] call ace_arsenal_fnc_saveLoadout
+ *
+ * Public: Yes
+ */
+
+params [["_name", "", [""]], ["_loadout", [], [[]]], ["_replaceExisting", false, [false]]];
+
+if (_name == "" || {_loadout isEqualTo []}) exitWith { false };
+
+private _loadouts = profileNamespace getVariable [QGVAR(saved_loadouts), []];
+private _loadoutIndex = _loadouts findIf {(_x#0) == _name};
+
+// If a loadout with same name already exists and no overwriting enabled, quit
+if (!_replaceExisting && {_loadoutIndex != -1}) exitWith { false };
+
+if (_loadoutIndex == -1) then {
+ _loadouts pushBack [_name, _loadout];
+} else {
+ _loadouts set [_loadoutIndex, [_name, _loadout]];
+};
+
+profileNamespace setVariable [QGVAR(saved_loadouts), _loadouts];
+true
diff --git a/addons/arsenal/functions/fnc_scanConfig.sqf b/addons/arsenal/functions/fnc_scanConfig.sqf
index fef97e8bd85..b5c6627cc7a 100644
--- a/addons/arsenal/functions/fnc_scanConfig.sqf
+++ b/addons/arsenal/functions/fnc_scanConfig.sqf
@@ -228,10 +228,10 @@ private _faceCategory = "";
_faceCache set [configName _x, [getText (_x >> "displayName"), _modPicture, _faceCategory]];
};
} forEach ("true" configClasses _x);
-} forEach ("true" configClasses (configfile >> "CfgFaces"));
+} forEach ("true" configClasses (configFile >> "CfgFaces"));
// Get all voices
-private _voiceCache = (configProperties [configFile >> "CfgVoice", "isClass _x && {getNumber (_x >> 'scope') == 2}", true]) - [configfile >> "CfgVoice" >> "NoVoice"];
+private _voiceCache = (configProperties [configFile >> "CfgVoice", "isClass _x && {getNumber (_x >> 'scope') == 2}", true]) - [configFile >> "CfgVoice" >> "NoVoice"];
_voiceCache = _voiceCache apply {configName _x};
// Get all insignia
diff --git a/addons/arsenal/functions/fnc_sortPanel.sqf b/addons/arsenal/functions/fnc_sortPanel.sqf
index f9803a429e7..e47ece9d17b 100644
--- a/addons/arsenal/functions/fnc_sortPanel.sqf
+++ b/addons/arsenal/functions/fnc_sortPanel.sqf
@@ -155,6 +155,7 @@ private _for = if (_right) then {
for "_i" from 0 to (lbSize _panel) - 1
};
+//IGNORE_PRIVATE_WARNING ["_i"];
_for do {
// Get item
_item = if (_right) then {
diff --git a/addons/arsenal/functions/fnc_sortStatement_mod.sqf b/addons/arsenal/functions/fnc_sortStatement_mod.sqf
index ab945202171..063aba0dbc4 100644
--- a/addons/arsenal/functions/fnc_sortStatement_mod.sqf
+++ b/addons/arsenal/functions/fnc_sortStatement_mod.sqf
@@ -14,4 +14,9 @@
params ["_config"];
-(modParams [_config call EFUNC(common,getAddon), ["name"]]) param [0, ""]
+private _addon = _config call EFUNC(common,getAddon);
+
+// Calling modParams with "" prints 'ModParams - Undefined or empty mod directory' in RPT
+if (_addon == "") exitWith {""};
+
+(modParams [_addon, ["name"]]) param [0, ""]
diff --git a/addons/arsenal/functions/fnc_statTextStatement_load.sqf b/addons/arsenal/functions/fnc_statTextStatement_load.sqf
index 032019f5825..a7a132b1844 100644
--- a/addons/arsenal/functions/fnc_statTextStatement_load.sqf
+++ b/addons/arsenal/functions/fnc_statTextStatement_load.sqf
@@ -17,7 +17,7 @@ params ["_stats", "_config"];
TRACE_2("statTextStatement_load",_stats,_config);
if (!isNull (_config >> "ItemInfo" >> "containerClass")) then { // Uniform/Vest
- _config = configfile >> "CfgVehicles" >> getText (_config >> "ItemInfo" >> "containerClass");
+ _config = configFile >> "CfgVehicles" >> getText (_config >> "ItemInfo" >> "containerClass");
};
private _load = getNumber (_config >> (_stats # 0));
diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp
index dc70caa0c27..b487cffd617 100644
--- a/addons/arsenal/ui/RscAttributes.hpp
+++ b/addons/arsenal/ui/RscAttributes.hpp
@@ -15,14 +15,14 @@ class GVAR(display) {
class ControlsBackground {
class blackLeft: ctrlStatic {
colorBackground[] = {0,0,0,1};
- x = QUOTE(safezoneXAbs);
- y = QUOTE(safezoneY);
- w = QUOTE(safezoneXAbs - safezoneX);
- h = QUOTE(safezoneH);
+ x = QUOTE(safeZoneXAbs);
+ y = QUOTE(safeZoneY);
+ w = QUOTE(safeZoneXAbs - safeZoneX);
+ h = QUOTE(safeZoneH);
};
class blackRight: blackLeft {
- x = QUOTE(safezoneX + safezoneW);
+ x = QUOTE(safeZoneX + safeZoneW);
};
class mouseArea: ctrlStatic {
@@ -31,10 +31,10 @@ class GVAR(display) {
onMouseMoving = QUOTE([ARR_3('onMouseMoving',_this,GVAR(display))] call FUNC(handleMouse));
onMouseHolding = QUOTE([ARR_3('onMouseHolding',_this,GVAR(display))] call FUNC(handleMouse));
onMouseZChanged = QUOTE([ARR_3('onMouseZChanged',_this,GVAR(display))] call FUNC(handleScrollWheel));
- x = QUOTE(safezoneX);
- y = QUOTE(safezoneY);
- w = QUOTE(safezoneW);
- h = QUOTE(safezoneH);
+ x = QUOTE(safeZoneX);
+ y = QUOTE(safeZoneY);
+ w = QUOTE(safeZoneW);
+ h = QUOTE(safeZoneH);
};
};
class controls {
@@ -58,34 +58,34 @@ class GVAR(display) {
};
class blockLeftFrame: RscFrame {
idc = IDC_blockLeftFrame;
- x = QUOTE(safezoneX + 13 * GRID_W);
- y = QUOTE(safezoneY + 14 * GRID_H);
+ x = QUOTE(safeZoneX + 13 * GRID_W);
+ y = QUOTE(safeZoneY + 14 * GRID_H);
w = QUOTE(80 * GRID_W);
- h = QUOTE(safezoneH - 24 * GRID_H);
+ h = QUOTE(safeZoneH - 24 * GRID_H);
colorText[] = {0,0,0,1};
};
class blockLeftBackground: ctrlStaticBackground {
idc = IDC_blockLeftBackground;
- x = QUOTE(safezoneX + 13 * GRID_W);
- y = QUOTE(safezoneY + 14 * GRID_H);
+ x = QUOTE(safeZoneX + 13 * GRID_W);
+ y = QUOTE(safeZoneY + 14 * GRID_H);
w = QUOTE(80 * GRID_W);
- h = QUOTE(safezoneH - 24 * GRID_H);
+ h = QUOTE(safeZoneH - 24 * GRID_H);
colorBackground[] = {0,0,0,0.5};
};
class blockRightFrame: blockLeftFrame {
idc = IDC_blockRightFrame;
- x = QUOTE(safezoneX + safezoneW - 93 * GRID_W);
- h = QUOTE(safezoneH - 34 * GRID_H);
+ x = QUOTE(safeZoneX + safeZoneW - 93 * GRID_W);
+ h = QUOTE(safeZoneH - 34 * GRID_H);
};
class blockRighttBackground: blockLeftBackground {
idc = IDC_blockRighttBackground;
- x = QUOTE(safezoneX + safezoneW - 93 * GRID_W);
- h = QUOTE(safezoneH - 34 * GRID_H);
+ x = QUOTE(safeZoneX + safeZoneW - 93 * GRID_W);
+ h = QUOTE(safeZoneH - 34 * GRID_H);
};
class loadIndicator: RscControlsGroupNoScrollbars {
idc = IDC_loadIndicator;
- x = QUOTE(safezoneX + safezoneW - 93 * GRID_W);
- y = QUOTE(safeZoneH + safezoneY - 20 * GRID_H);
+ x = QUOTE(safeZoneX + safeZoneW - 93 * GRID_W);
+ y = QUOTE(safeZoneH + safeZoneY - 20 * GRID_H);
w = QUOTE(80 * GRID_W);
h = QUOTE(6 * GRID_H);
class controls {
@@ -112,8 +112,8 @@ class GVAR(display) {
};
class totalWeight: RscControlsGroupNoScrollbars {
idc = IDC_totalWeight;
- x = QUOTE(safezoneX + 13 * GRID_W);
- y = QUOTE(safeZoneH + safezoneY - 10 * GRID_H);
+ x = QUOTE(safeZoneX + 13 * GRID_W);
+ y = QUOTE(safeZoneH + safeZoneY - 10 * GRID_H);
w = QUOTE(80 * GRID_W);
h = QUOTE(8 * GRID_H);
class controls {
@@ -154,7 +154,7 @@ class GVAR(display) {
colorBackground[] = {0,0,0,0.69999999};
text = "";
x = QUOTE(0.5 - WIDTH_TOTAL / 2);
- y = QUOTE(safeZoneH + safezoneY - 25 * GRID_H);
+ y = QUOTE(safeZoneH + safeZoneY - 25 * GRID_H);
w = QUOTE(WIDTH_TOTAL);
h = QUOTE(10 * GRID_H);
sizeEx = QUOTE(5 * GRID_H);
@@ -162,7 +162,7 @@ class GVAR(display) {
class menuBar: RscControlsGroupNoScrollbars {
idc = IDC_menuBar;
x = QUOTE(0.5 - WIDTH_TOTAL / 2);
- y = QUOTE(safezoneH + safezoneY - 9 * GRID_H);
+ y = QUOTE(safeZoneH + safeZoneY - 9 * GRID_H);
w = QUOTE(WIDTH_TOTAL);
h = QUOTE(7 * GRID_H);
class controls {
@@ -223,8 +223,8 @@ class GVAR(display) {
class infoBox: RscControlsGroupNoScrollbars {
idc = IDC_infoBox;
fade = 1;
- x = QUOTE(safezoneX + safezoneW - 93 * GRID_W);
- y = QUOTE(safeZoneH + safezoneY - 14 * GRID_H);
+ x = QUOTE(safeZoneX + safeZoneW - 93 * GRID_W);
+ y = QUOTE(safeZoneH + safeZoneY - 14 * GRID_H);
w = QUOTE(92 * GRID_W);
h = QUOTE(12 * GRID_H);
class controls {
@@ -278,12 +278,12 @@ class GVAR(display) {
class statsBox: RscControlsGroupNoScrollbars {
idc = IDC_statsBox;
x = QUOTE((0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP);
- y = QUOTE(safezoneY + 1.8 * GRID_H);
+ y = QUOTE(safeZoneY + 1.8 * GRID_H);
w = QUOTE(47 * GRID_W);
h = QUOTE(55 * GRID_H);
class controls {
class statsStaticBackground1: ctrlStaticBackground {
- idc = -1;
+ idc = IDC_statsBoxBackground;
x = QUOTE(0);
y = QUOTE(0);
w = QUOTE(47 * GRID_W);
@@ -291,7 +291,7 @@ class GVAR(display) {
colorBackground[] = {0.1,0.1,0.1,0.5};
};
class statsStaticBackground2: ctrlStaticBackground {
- idc = -1;
+ idc = IDC_statsBoxTitleBackground;
x = QUOTE(0);
y = QUOTE(0);
w = QUOTE(47 * GRID_W);
@@ -316,7 +316,7 @@ class GVAR(display) {
x = QUOTE(1 * GRID_W);
y = QUOTE(10 * GRID_H);
w = QUOTE(45 * GRID_W);
- h = QUOTE(4 * GRID_H);
+ h = QUOTE(5 * GRID_H);
colorBackground[] = {1,1,1,0.15};
};
class statsBar1: ctrlProgress {
@@ -329,9 +329,9 @@ class GVAR(display) {
x = QUOTE(1 * GRID_W);
y = QUOTE(10 * GRID_H);
w = QUOTE(45 * GRID_W);
- h = QUOTE(4 * GRID_H);
+ h = QUOTE(5 * GRID_H);
};
- class statsText1: RscText {
+ class statsText1: RscTextMulti {
idc = IDC_statsText1;
shadow = 0;
fade = 1;
@@ -340,7 +340,7 @@ class GVAR(display) {
x = QUOTE(0 * GRID_W);
y = QUOTE(10 * GRID_H);
w = QUOTE(45 * GRID_W);
- h = QUOTE(4 * GRID_H);
+ h = QUOTE(5 * GRID_H);
sizeEx = QUOTE(5 * GRID_H);
text = "";
};
@@ -419,7 +419,7 @@ class GVAR(display) {
colorBackgroundDisabled[] = {0,0,0,0};
onButtonClick = QUOTE([ARR_2(QQGVAR(statsChangePage),[ARR_3(ctrlParent (_this select 0),_this select 0,false)])] call CBA_fnc_localEvent);
x = QUOTE((0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP);
- y = QUOTE(safezoneY + 1.8 * GRID_H);
+ y = QUOTE(safeZoneY + 1.8 * GRID_H);
w = QUOTE(5 * GRID_W);
h = QUOTE(5 * GRID_H);
sizeEx = QUOTE(5.5 * GRID_H);
@@ -434,7 +434,7 @@ class GVAR(display) {
idc = IDC_statsCurrentPage;
style = ST_CENTER;
x = QUOTE((0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP + 5 * GRID_W);
- y = QUOTE(safezoneY + 1.8 * GRID_H);
+ y = QUOTE(safeZoneY + 1.8 * GRID_H);
w = QUOTE(37 * GRID_W);
h = QUOTE(5 * GRID_H);
colorBackground[] = {0,0,0,0};
@@ -445,7 +445,7 @@ class GVAR(display) {
class actionsBox: RscControlsGroupNoScrollbars {
idc = IDC_actionsBox;
x = QUOTE((0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP);
- y = QUOTE(safezoneY + 58.6 * GRID_H);
+ y = QUOTE(safeZoneY + 58.6 * GRID_H);
w = QUOTE(47 * GRID_W);
h = QUOTE(55 * GRID_H);
class controls {
@@ -482,7 +482,7 @@ class GVAR(display) {
x = QUOTE(1 * GRID_W);
y = QUOTE(6 * GRID_H);
w = QUOTE(45 * GRID_W);
- h = QUOTE(4 * GRID_H);
+ h = QUOTE(5 * GRID_H);
};
class actionsText2: actionsText1 {
idc = IDC_actionsText2;
@@ -550,10 +550,10 @@ class GVAR(display) {
class mouseBlock: RscText {
idc = IDC_mouseBlock;
style = 16;
- x = QUOTE(safezoneX);
- y = QUOTE(safezoneY);
- w = QUOTE(safezoneW);
- h = QUOTE(safezoneH);
+ x = QUOTE(safeZoneX);
+ y = QUOTE(safeZoneY);
+ w = QUOTE(safeZoneW);
+ h = QUOTE(safeZoneH);
};
class leftTabContent: RscListBox {
idc = IDC_leftTabContent;
@@ -569,10 +569,10 @@ class GVAR(display) {
onLBDblClick = QUOTE(_this call FUNC(onPanelDblClick));
onSetFocus = QUOTE(GVAR(leftTabFocus) = true);
onKillFocus = QUOTE(GVAR(leftTabFocus) = false);
- x = QUOTE(safezoneX + 13 * GRID_W);
- y = QUOTE(safezoneY + 14 * GRID_H);
+ x = QUOTE(safeZoneX + 13 * GRID_W);
+ y = QUOTE(safeZoneY + 14 * GRID_H);
w = QUOTE(80 * GRID_W);
- h = QUOTE(safezoneH - 24.5 * GRID_H);
+ h = QUOTE(safeZoneH - 24.5 * GRID_H);
sizeEx = QUOTE(7 * GRID_H);
};
class rightTabContent: leftTabContent {
@@ -583,8 +583,8 @@ class GVAR(display) {
onLBDblClick = QUOTE(_this call FUNC(onPanelDblClick));
onSetFocus = QUOTE(GVAR(rightTabFocus) = true);
onKillFocus = QUOTE(GVAR(rightTabFocus) = false);
- x = QUOTE(safezoneX + safezoneW - 93 * GRID_W);
- h = QUOTE(safezoneH - 28 * GRID_H);
+ x = QUOTE(safeZoneX + safeZoneW - 93 * GRID_W);
+ h = QUOTE(safeZoneH - 28 * GRID_H);
};
class rightTabContentListnBox: RscListNBox {
idc = IDC_rightTabContentListnBox;
@@ -605,16 +605,16 @@ class GVAR(display) {
onLBDblClick = QUOTE(_this call FUNC(onPanelDblClick));
onSetFocus = QUOTE(GVAR(rightTabLnBFocus) = true);
onKillFocus = QUOTE(GVAR(rightTabLnBFocus) = false);
- x = QUOTE(safezoneX + safezoneW - 93 * GRID_W);
- y = QUOTE(safezoneY + 14 * GRID_H);
+ x = QUOTE(safeZoneX + safeZoneW - 93 * GRID_W);
+ y = QUOTE(safeZoneY + 14 * GRID_H);
w = QUOTE(80 * GRID_W);
- h = QUOTE(safezoneH - 34 * GRID_H);
+ h = QUOTE(safeZoneH - 34 * GRID_H);
sizeEx = QUOTE(7 * GRID_H);
};
class sortLeftTab: RscCombo {
idc = IDC_sortLeftTab;
- x = QUOTE(safezoneX + 13 * GRID_W);
- y = QUOTE(safezoneY + 8 * GRID_H);
+ x = QUOTE(safeZoneX + 13 * GRID_W);
+ y = QUOTE(safeZoneY + 8 * GRID_H);
w = QUOTE(40 * GRID_W);
h = QUOTE(6 * GRID_H);
onLBSelChanged = QUOTE(_this call FUNC(sortPanel));
@@ -622,16 +622,16 @@ class GVAR(display) {
};
class sortLeftTabDirection: sortLeftTab {
idc = IDC_sortLeftTabDirection;
- x = QUOTE(safezoneX + 53 * GRID_W);
+ x = QUOTE(safeZoneX + 53 * GRID_W);
w = QUOTE(40 * GRID_W);
};
class sortRightTab: sortLeftTab {
idc = IDC_sortRightTab;
- x = QUOTE(safezoneX + safezoneW - 93 * GRID_W);
+ x = QUOTE(safeZoneX + safeZoneW - 93 * GRID_W);
};
class sortRightTabDirection: sortLeftTabDirection {
idc = IDC_sortRightTabDirection;
- x = QUOTE(safezoneX + safezoneW - 53 * GRID_W);
+ x = QUOTE(safeZoneX + safeZoneW - 53 * GRID_W);
};
class leftSearchbar: ctrlEdit {
idc = IDC_leftSearchbar;
@@ -639,8 +639,8 @@ class GVAR(display) {
onKillFocus = QUOTE(GVAR(leftSearchbarFocus) = false);
onMouseButtonClick = QUOTE([ARR_3(ctrlParent (_this select 0),_this select 0,_this select 1)] call FUNC(clearSearchbar));
onEditChanged = QUOTE(call FUNC(handleSearchInputChanged));
- x = QUOTE(safezoneX + 13 * GRID_W);
- y = QUOTE(safezoneY + 1.8 * GRID_H);
+ x = QUOTE(safeZoneX + 13 * GRID_W);
+ y = QUOTE(safeZoneY + 1.8 * GRID_H);
w = QUOTE(74 * GRID_W);
h = QUOTE(6 * GRID_H);
sizeEx = QUOTE(6 * GRID_H);
@@ -652,8 +652,8 @@ class GVAR(display) {
colorBackground[] = {0,0,0,0.5};
onButtonClick = QUOTE([ARR_2(ctrlParent (_this select 0),ctrlParent (_this select 0) displayCtrl IDC_leftSearchbar)] call FUNC(handleSearchbar));
onMouseButtonDown = QUOTE(call FUNC(handleSearchModeToggle));
- x = QUOTE(safezoneX + 87 * GRID_W);
- y = QUOTE(safezoneY + 1.8 * GRID_H);
+ x = QUOTE(safeZoneX + 87 * GRID_W);
+ y = QUOTE(safeZoneY + 1.8 * GRID_H);
w = QUOTE(6 * GRID_W);
h = QUOTE(6 * GRID_H);
};
@@ -661,17 +661,17 @@ class GVAR(display) {
idc = IDC_rightSearchbar;
onSetFocus = QUOTE(GVAR(rightSearchbarFocus) = true);
onKillFocus = QUOTE(GVAR(rightSearchbarFocus) = false);
- x = QUOTE(safezoneX + safezoneW - 87 * GRID_W);
+ x = QUOTE(safeZoneX + safeZoneW - 87 * GRID_W);
};
class rightSearchbarButton: leftSearchbarButton {
idc = IDC_rightSearchbarButton;
onButtonClick = QUOTE([ARR_2(ctrlParent (_this select 0),ctrlParent (_this select 0) displayCtrl IDC_rightSearchbar)] call FUNC(handleSearchbar));
- x = QUOTE(safezoneX + safezoneW - 93 * GRID_W);
+ x = QUOTE(safeZoneX + safeZoneW - 93 * GRID_W);
};
class tabLeft: RscControlsGroupNoScrollbars {
idc = IDC_tabLeft;
- x = QUOTE(safezoneX + 1 * GRID_W);
- y = QUOTE(safezoneY + 8 * GRID_H);
+ x = QUOTE(safeZoneX + 1 * GRID_W);
+ y = QUOTE(safeZoneY + 8 * GRID_H);
w = QUOTE(12 * GRID_W);
h = QUOTE(200 * GRID_H);
class controls {
@@ -873,8 +873,8 @@ class GVAR(display) {
colorBackground[] = {0,0,0,1};
fade = 1;
enable = 0;
- x = QUOTE(safezoneW + safezoneX - 13 * GRID_W);
- y = QUOTE(safezoneY + 8 * GRID_H);
+ x = QUOTE(safeZoneW + safeZoneX - 13 * GRID_W);
+ y = QUOTE(safeZoneY + 8 * GRID_H);
w = QUOTE(12 * GRID_W);
h = QUOTE(9 * GRID_H);
};
@@ -884,110 +884,110 @@ class GVAR(display) {
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\ItemOptic_ca.paa";
onButtonClick = QUOTE([ARR_2(ctrlParent (_this select 0),_this select 0)] call FUNC(fillRightPanel));
colorBackground[] = {0,0,0,0.5};
- x = QUOTE(safezoneW + safezoneX - 10 * GRID_W);
- y = QUOTE(safezoneY + 8 * GRID_H);
+ x = QUOTE(safeZoneW + safeZoneX - 10 * GRID_W);
+ y = QUOTE(safeZoneY + 8 * GRID_H);
w = QUOTE(9 * GRID_W);
h = QUOTE(9 * GRID_H);
};
class iconBackgroundItemAcc: iconBackgroundOptic {
idc = IDC_iconBackgroundItemAcc;
- y = QUOTE(safezoneY + 18 * GRID_H);
+ y = QUOTE(safeZoneY + 18 * GRID_H);
};
class buttonItemAcc: buttonOptic {
idc = IDC_buttonItemAcc;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\ItemAcc_ca.paa";
tooltip = "$STR_A3_RscDisplayArsenal_tab_ItemAcc";
- y = QUOTE(safezoneY + 18 * GRID_H);
+ y = QUOTE(safeZoneY + 18 * GRID_H);
};
class iconBackgroundMuzzle: iconBackgroundOptic {
idc = IDC_iconBackgroundMuzzle;
- y = QUOTE(safezoneY + 28 * GRID_H);
+ y = QUOTE(safeZoneY + 28 * GRID_H);
};
class buttonMuzzle: buttonOptic {
idc = IDC_buttonMuzzle;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\ItemMuzzle_ca.paa";
tooltip = "$STR_A3_RscDisplayArsenal_tab_ItemMuzzle";
- y = QUOTE(safezoneY + 28 * GRID_H);
+ y = QUOTE(safeZoneY + 28 * GRID_H);
};
class iconBackgroundBipod: iconBackgroundOptic {
idc = IDC_iconBackgroundBipod;
- y = QUOTE(safezoneY + 38 * GRID_H);
+ y = QUOTE(safeZoneY + 38 * GRID_H);
};
class buttonBipod: buttonOptic {
idc = IDC_buttonBipod;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\ItemBipod_ca.paa";
tooltip = "$STR_A3_RscDisplayArsenal_tab_ItemBipod";
- y = QUOTE(safezoneY + 38 * GRID_H);
+ y = QUOTE(safeZoneY + 38 * GRID_H);
};
class iconBackgroundCurrentMag: iconBackgroundOptic {
idc = IDC_iconBackgroundCurrentMag;
- y = QUOTE(safezoneY + 48 * GRID_H);
+ y = QUOTE(safeZoneY + 48 * GRID_H);
};
class buttonCurrentMag: buttonOptic {
idc = IDC_buttonCurrentMag;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\CargoMag_ca.paa";
tooltip = CSTRING(buttonCurrentMagTooltip);
- y = QUOTE(safezoneY + 48 * GRID_H);
+ y = QUOTE(safeZoneY + 48 * GRID_H);
};
class iconBackgroundCurrentMag2: iconBackgroundOptic {
idc = IDC_iconBackgroundCurrentMag2;
- y = QUOTE(safezoneY + 58 * GRID_H);
+ y = QUOTE(safeZoneY + 58 * GRID_H);
};
class buttonCurrentMag2: buttonOptic {
idc = IDC_buttonCurrentMag2;
text = QPATHTOF(data\iconSecondaryMuzzle);
tooltip = CSTRING(buttonCurrentMag2Tooltip);
- y = QUOTE(safezoneY + 58 * GRID_H);
+ y = QUOTE(safeZoneY + 58 * GRID_H);
};
class iconBackgroundMag: iconBackgroundOptic {
idc = IDC_iconBackgroundMag;
- y = QUOTE(safezoneY + 48 * GRID_H);
+ y = QUOTE(safeZoneY + 48 * GRID_H);
};
class buttonMag: buttonOptic {
idc = IDC_buttonMag;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\CargoMag_ca.paa";
tooltip = "$STR_A3_RscDisplayArsenal_tab_CargoMag";
- y = QUOTE(safezoneY + 48 * GRID_H);
+ y = QUOTE(safeZoneY + 48 * GRID_H);
};
class iconBackgroundMagALL: iconBackgroundOptic {
idc = IDC_iconBackgroundMagALL;
- y = QUOTE(safezoneY + 58 * GRID_H);
+ y = QUOTE(safeZoneY + 58 * GRID_H);
};
class buttonMagALL: buttonOptic {
idc = IDC_buttonMagALL;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\CargoMagAll_ca.paa";
tooltip = "$STR_A3_RscDisplayArsenal_tab_CargoMagAll";
- y = QUOTE(safezoneY + 58 * GRID_H);
+ y = QUOTE(safeZoneY + 58 * GRID_H);
};
class iconBackgroundThrow: iconBackgroundOptic {
idc = IDC_iconBackgroundThrow;
- y = QUOTE(safezoneY + 68 * GRID_H);
+ y = QUOTE(safeZoneY + 68 * GRID_H);
};
class buttonThrow: buttonOptic {
idc = IDC_buttonThrow;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\CargoThrow_ca.paa";
tooltip = "$STR_A3_RscDisplayArsenal_tab_CargoThrow";
- y = QUOTE(safezoneY + 68 * GRID_H);
+ y = QUOTE(safeZoneY + 68 * GRID_H);
};
class iconBackgroundPut: iconBackgroundOptic {
idc = IDC_iconBackgroundPut;
- y = QUOTE(safezoneY + 78 * GRID_H);
+ y = QUOTE(safeZoneY + 78 * GRID_H);
};
class buttonPut: buttonOptic {
idc = IDC_buttonPut;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\CargoPut_ca.paa";
tooltip = "$STR_A3_RscDisplayArsenal_tab_CargoPut";
- y = QUOTE(safezoneY + 78 * GRID_H);
+ y = QUOTE(safeZoneY + 78 * GRID_H);
};
class iconBackgroundMisc: iconBackgroundOptic {
idc = IDC_iconBackgroundMisc;
- y = QUOTE(safezoneY + 88 * GRID_H);
+ y = QUOTE(safeZoneY + 88 * GRID_H);
};
class buttonMisc: buttonOptic {
idc = IDC_buttonMisc;
text = "\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\CargoMisc_ca.paa";
tooltip = "$STR_A3_RscDisplayArsenal_tab_CargoMisc";
- y = QUOTE(safezoneY + 88 * GRID_H);
+ y = QUOTE(safeZoneY + 88 * GRID_H);
};
class buttonRemoveAll: ctrlButtonPicture {
@@ -998,8 +998,8 @@ class GVAR(display) {
onButtonClick = QUOTE(ctrlParent (_this select 0) call FUNC(buttonClearAll));
fade = 1;
enable = 0;
- x = QUOTE(safezoneW + safezoneX - 11 * GRID_W);
- y = QUOTE(safeZoneH + safezoneY - 29 * GRID_H);
+ x = QUOTE(safeZoneW + safeZoneX - 11 * GRID_W);
+ y = QUOTE(safeZoneH + safeZoneY - 29 * GRID_H);
w = QUOTE(9 * GRID_W);
h = QUOTE(9 * GRID_H);
};
@@ -1013,17 +1013,17 @@ class GVAR(loadoutsDisplay) {
class controls {
class centerBox: ctrlControlsGroupNoScrollbars {
idc = IDC_centerBox;
- x = QUOTE(safezoneW + safezoneX - (180 * GRID_W));
- y = QUOTE(safezoneY + (5 * GRID_H));
+ x = QUOTE(safeZoneW + safeZoneX - (180 * GRID_W));
+ y = QUOTE(safeZoneY + (5 * GRID_H));
w = QUOTE(160 * GRID_W);
- h = QUOTE(safezoneH - (34 * GRID_H));
+ h = QUOTE(safeZoneH - (34 * GRID_H));
class controls {
class centerFrame: RscFrame {
idc = -1;
x = QUOTE(0 * GRID_W);
y = QUOTE(0 * GRID_H);
w = QUOTE(160 * GRID_W);
- h = QUOTE(safezoneH - (45 * GRID_H));
+ h = QUOTE(safeZoneH - (45 * GRID_H));
colorText[] = {0,0,0,1};
};
class centerBackground: ctrlStaticBackground {
@@ -1031,7 +1031,7 @@ class GVAR(loadoutsDisplay) {
x = QUOTE(0);
y = QUOTE(0);
w = QUOTE(160 * GRID_W);
- h = QUOTE(safezoneH - (45 * GRID_H));
+ h = QUOTE(safeZoneH - (45 * GRID_H));
colorBackground[] = {0.13,0.13,0.13,0.9};
};
class centerTitle: ctrlStaticTitle {
@@ -1056,14 +1056,14 @@ class GVAR(loadoutsDisplay) {
x = QUOTE(0);
y = QUOTE(5 * GRID_H);
w = QUOTE(160 * GRID_W);
- h = QUOTE(safezoneH - (57 * GRID_H));
+ h = QUOTE(safeZoneH - (57 * GRID_H));
sizeEx = QUOTE(7 * GRID_H);
};
class textTitle: RscText {
idc = -1;
text = "$STR_DISP_GAME_NAME";
x = QUOTE(0 * GRID_W);
- y = QUOTE(safezoneH - (51 * GRID_H));
+ y = QUOTE(safeZoneH - (51 * GRID_H));
w = QUOTE(15 * GRID_W);
h = QUOTE(5 * GRID_H);
sizeEx = QUOTE(5 * GRID_H);
@@ -1072,7 +1072,7 @@ class GVAR(loadoutsDisplay) {
class textEditBox: ctrlEdit {
idc = IDC_textEditBox;
x = QUOTE(15 * GRID_W);
- y = QUOTE(safezoneH - (51 * GRID_H));
+ y = QUOTE(safeZoneH - (51 * GRID_H));
w = QUOTE(65 * GRID_W);
h = QUOTE(5 * GRID_H);
sizeEx = QUOTE(6 * GRID_H);
@@ -1083,7 +1083,7 @@ class GVAR(loadoutsDisplay) {
onKillFocus = QUOTE(GVAR(loadoutsSearchbarFocus) = false);
onMouseButtonClick = QUOTE([ARR_3(ctrlParent (_this select 0),_this select 0,_this select 1)] call FUNC(clearSearchbar));
x = QUOTE(83 * GRID_W);
- y = QUOTE(safezoneH - (51 * GRID_H));
+ y = QUOTE(safeZoneH - (51 * GRID_H));
w = QUOTE(72 * GRID_W);
h = QUOTE(5 * GRID_H);
sizeEx = QUOTE(6 * GRID_H);
@@ -1094,14 +1094,14 @@ class GVAR(loadoutsDisplay) {
colorBackground[] = {0,0,0,0.5};
onButtonClick = QUOTE([ARR_2(ctrlParent (_this select 0),ctrlParent (_this select 0) displayCtrl IDC_loadoutsSearchbar)] call FUNC(handleLoadoutsSearchbar));
x = QUOTE(155 * GRID_W);
- y = QUOTE(safezoneH - (51 * GRID_H));
+ y = QUOTE(safeZoneH - (51 * GRID_H));
w = QUOTE(5 * GRID_W);
h = QUOTE(5 * GRID_H);
};
class buttonSave: ctrlButton {
idc = IDC_buttonSave;
x = QUOTE(0 * GRID_W);
- y = QUOTE(safezoneH - (44 * GRID_H));
+ y = QUOTE(safeZoneH - (44 * GRID_H));
w = QUOTE(30 * GRID_W);
h = QUOTE(10 * GRID_H);
text = CSTRING(buttonSaveText);
@@ -1143,8 +1143,8 @@ class GVAR(loadoutsDisplay) {
};
class buttonClose: ctrlButton {
idc = -1;
- x = QUOTE(safezoneW + safezoneX - 32 * GRID_W);
- y = QUOTE(safezoneH + safezoneY - 9 * GRID_H);
+ x = QUOTE(safeZoneW + safeZoneX - 32 * GRID_W);
+ y = QUOTE(safeZoneH + safeZoneY - 9 * GRID_H);
w = QUOTE(30 * GRID_W);
h = QUOTE(7 * GRID_H);
sizeEx = QUOTE(5 * GRID_H);
@@ -1154,8 +1154,8 @@ class GVAR(loadoutsDisplay) {
};
class buttonBar: ctrlControlsGroupNoScrollbars {
idc = -1;
- x = QUOTE((safezoneW * 0.5) + safezoneX - (80.5 * GRID_W));
- y = QUOTE(safezoneH + safezoneY - 9 * GRID_H);
+ x = QUOTE((safeZoneW * 0.5) + safeZoneX - (80.5 * GRID_W));
+ y = QUOTE(safeZoneH + safeZoneY - 9 * GRID_H);
w = QUOTE(161 * GRID_W);
h = QUOTE(7 * GRID_H);
class controls {
diff --git a/addons/arsenal/ui/RscCommon.hpp b/addons/arsenal/ui/RscCommon.hpp
index f74326bcfb7..cb36a67aed3 100644
--- a/addons/arsenal/ui/RscCommon.hpp
+++ b/addons/arsenal/ui/RscCommon.hpp
@@ -86,12 +86,12 @@
#define TR_AUTOCOLLAPSE 2
// Default grid
-#define GUI_GRID_WAbs ((safezoneW / safezoneH) min 1.2)
+#define GUI_GRID_WAbs ((safeZoneW / safeZoneH) min 1.2)
#define GUI_GRID_HAbs (GUI_GRID_WAbs / 1.2)
#define GUI_GRID_W (GUI_GRID_WAbs / 40)
#define GUI_GRID_H (GUI_GRID_HAbs / 25)
-#define GUI_GRID_X (safezoneX)
-#define GUI_GRID_Y (safezoneY + safezoneH - GUI_GRID_HAbs)
+#define GUI_GRID_X (safeZoneX)
+#define GUI_GRID_Y (safeZoneY + safeZoneH - GUI_GRID_HAbs)
// Default text sizes
#define GUI_TEXT_SIZE_SMALL (GUI_GRID_H * 0.8)
diff --git a/addons/arsenal/ui/RscCustomArsenalButton.hpp b/addons/arsenal/ui/RscCustomArsenalButton.hpp
index 0aa077f424c..e745203e7ea 100644
--- a/addons/arsenal/ui/RscCustomArsenalButton.hpp
+++ b/addons/arsenal/ui/RscCustomArsenalButton.hpp
@@ -1,6 +1,6 @@
class GVAR(customArsenalButton_Button): RscButtonArsenal {
- x = QUOTE(safezoneW + safezoneX - 10 * GRID_W);
- y = QUOTE(safezoneY + 88 * GRID_H);
+ x = QUOTE(safeZoneW + safeZoneX - 10 * GRID_W);
+ y = QUOTE(safeZoneY + 88 * GRID_H);
w = QUOTE(9 * GRID_W);
h = QUOTE(9 * GRID_H);
@@ -11,8 +11,8 @@ class GVAR(customArsenalButton_Button): RscButtonArsenal {
};
class GVAR(customArsenalButton_Background): ctrlStaticBackground {
- x = QUOTE(safezoneW + safezoneX - 13 * GRID_W);
- y = QUOTE(safezoneY + 88 * GRID_H);
+ x = QUOTE(safeZoneW + safeZoneX - 13 * GRID_W);
+ y = QUOTE(safeZoneY + 88 * GRID_H);
w = QUOTE(12 * GRID_W);
h = QUOTE(9 * GRID_H);
diff --git a/addons/artillerytables/RscRangeTable.hpp b/addons/artillerytables/RscRangeTable.hpp
index ef11d7eac82..a24aa503cb5 100644
--- a/addons/artillerytables/RscRangeTable.hpp
+++ b/addons/artillerytables/RscRangeTable.hpp
@@ -8,16 +8,16 @@ class GVAR(rangeTableDialog) {
class TableBackground: RscPicture {
idc = -1;
text = QPATHTOF(UI\RangeTable_background.paa);
- x = "18 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
- y = "1 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)";
+ x = "18 *(safeZoneH / 40) + (safeZoneX + (safeZoneW - safeZoneH) / 2)";
+ y = "1 * ((safeZoneH / 1.2) / 25) + (safeZoneY + (safeZoneH - (safeZoneH / 1.2)) / 2)";
w = "16.2634559672906 * (safeZoneH / 40)";
h = "23 * ((safeZoneH / 1.2) / 25)";
colorBackground[] = {1,1,1,1};
};
class LeftSideBackground: RscText {
idc = -1;
- x = "13 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
- y = "1 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)";
+ x = "13 *(safeZoneH / 40) + (safeZoneX + (safeZoneW - safeZoneH) / 2)";
+ y = "1 * ((safeZoneH / 1.2) / 25) + (safeZoneY + (safeZoneH - (safeZoneH / 1.2)) / 2)";
w = "5 * (safeZoneH / 40)";
h = "23 * ((safeZoneH / 1.2) / 25)";
colorBackground[] = {0,0,0,0.8};
@@ -26,8 +26,8 @@ class GVAR(rangeTableDialog) {
class controls {
class TheTable: RscListNBox {
idc = IDC_TABLE;
- x = "18 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
- y = "3.76 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)";
+ x = "18 *(safeZoneH / 40) + (safeZoneX + (safeZoneW - safeZoneH) / 2)";
+ y = "3.76 * ((safeZoneH / 1.2) / 25) + (safeZoneY + (safeZoneH - (safeZoneH / 1.2)) / 2)";
w = "16.2634559672906 * (safeZoneH / 40)";
h = "20.24 * ((safeZoneH / 1.2) / 25)";
columns[] = {"10/867", "86/867", "171/867", "238/867", "320/867", "405/867", "485/867", "546/867", "607/867", "668/867", "729/867", "790/867"};
@@ -48,8 +48,8 @@ class GVAR(rangeTableDialog) {
};
class ChargeListBox: RscListBox {
idc = IDC_CHARGELIST;
- x = "13 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
- y = "2 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)";
+ x = "13 *(safeZoneH / 40) + (safeZoneX + (safeZoneW - safeZoneH) / 2)";
+ y = "2 * ((safeZoneH / 1.2) / 25) + (safeZoneY + (safeZoneH - (safeZoneH / 1.2)) / 2)";
w = "5 * (safeZoneH / 40)";
h = "22 * ((safeZoneH / 1.2) / 25)";
onLBSelChanged = QUOTE([] call FUNC(rangeTableUpdate));
@@ -58,8 +58,8 @@ class GVAR(rangeTableDialog) {
idc = IDC_BUTTON_ELEV_HIGH;
text = "High";
onButtonClick = QUOTE([true] call FUNC(rangeTableUpdate));
- x = "13.1 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
- y = "1.1 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)";
+ x = "13.1 *(safeZoneH / 40) + (safeZoneX + (safeZoneW - safeZoneH) / 2)";
+ y = "1.1 * ((safeZoneH / 1.2) / 25) + (safeZoneY + (safeZoneH - (safeZoneH / 1.2)) / 2)";
w = "2.3 * (safeZoneH / 40)";
h = "0.8 * ((safeZoneH / 1.2) / 25)";
};
@@ -67,12 +67,12 @@ class GVAR(rangeTableDialog) {
idc = IDC_BUTTON_ELEV_LOW;
text = "Low";
onButtonClick = QUOTE([false] call FUNC(rangeTableUpdate));
- x = "15.6 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
+ x = "15.6 *(safeZoneH / 40) + (safeZoneX + (safeZoneW - safeZoneH) / 2)";
};
class CloseBackground: RscText {
idc = -1;
- x = "33.7634559672906 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
- y = "1 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)";
+ x = "33.7634559672906 *(safeZoneH / 40) + (safeZoneX + (safeZoneW - safeZoneH) / 2)";
+ y = "1 * ((safeZoneH / 1.2) / 25) + (safeZoneY + (safeZoneH - (safeZoneH / 1.2)) / 2)";
w = "0.5 * (safeZoneH / 40)";
h = "0.5 * ((safeZoneH / 1.2) / 25)";
colorBackground[] = {0,0,0,0.5};
@@ -82,8 +82,8 @@ class GVAR(rangeTableDialog) {
style = 48;
color[] = {1,1,1,0.7};
text = "A3\Ui_f\data\GUI\Rsc\RscDisplayArcadeMap\icon_exit_cross_ca.paa";
- x = "33.7634559672906 *(safeZoneH / 40) + (safezoneX + (safezoneW - safeZoneH) / 2)";
- y = "1 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)";
+ x = "33.7634559672906 *(safeZoneH / 40) + (safeZoneX + (safeZoneW - safeZoneH) / 2)";
+ y = "1 * ((safeZoneH / 1.2) / 25) + (safeZoneY + (safeZoneH - (safeZoneH / 1.2)) / 2)";
w = "0.5 * (safeZoneH / 40)";
h = "0.5 * ((safeZoneH / 1.2) / 25)";
colorText[] = {1,1,1,0.7};
diff --git a/addons/artillerytables/RscTitles.hpp b/addons/artillerytables/RscTitles.hpp
index c26f302a00f..e0c4cc34495 100644
--- a/addons/artillerytables/RscTitles.hpp
+++ b/addons/artillerytables/RscTitles.hpp
@@ -9,10 +9,10 @@ class RscTitles {
class controls {
class ModeControlGroup: RscControlsGroupNoScrollbars {
idc = IDC_MODECONTROLGROUP;
- x = "3.8 * (((safezoneW / safezoneH) min 1.2) / 40) + (profilenamespace getvariable ['IGUI_GRID_WEAPON_X',((safezoneX + safezoneW) - (10 * (((safezoneW / safezoneH) min 1.2) / 40)) - 4.3 * (((safezoneW / safezoneH) min 1.2) / 40))])";
- y = "2.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (profilenamespace getVariable ['IGUI_GRID_WEAPON_Y', (safezoneY + 0.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))])";
- w = "10 * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
+ x = "3.8 * (((safeZoneW / safeZoneH) min 1.2) / 40) + (profilenamespace getvariable ['IGUI_GRID_WEAPON_X',((safeZoneX + safeZoneW) - (10 * (((safeZoneW / safeZoneH) min 1.2) / 40)) - 4.3 * (((safeZoneW / safeZoneH) min 1.2) / 40))])";
+ y = "2.5 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25) + (profilenamespace getVariable ['IGUI_GRID_WEAPON_Y', (safeZoneY + 0.5 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25))])";
+ w = "10 * (((safeZoneW / safeZoneH) min 1.2) / 40)";
+ h = "1 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
class controls {
class Charge: RscText {
@@ -21,18 +21,18 @@ class RscTitles {
colorBackground[] = {0, 0, 0, 0};
x = "0";
y = "0";
- w = "(2) * (((safezoneW / safezoneH) min 1.2) / 40)";
- h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- sizeEx = "0.8 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
+ w = "(2) * (((safeZoneW / safeZoneH) min 1.2) / 40)";
+ h = "1 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
+ sizeEx = "0.8 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
};
class Azimuth: Charge {
idc = IDC_AZIMUTH;
- x = "(2) * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- w = "(3) * (((safezoneW / safezoneH) min 1.2) / 40)";
+ x = "(2) * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
+ w = "(3) * (((safeZoneW / safeZoneH) min 1.2) / 40)";
};
class Elevation: Azimuth {
idc = IDC_ELEVATION;
- x = "(5) * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
+ x = "(5) * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)";
};
};
};
diff --git a/addons/artillerytables/XEH_PREP.hpp b/addons/artillerytables/XEH_PREP.hpp
index 7ef48b61dd8..7f977dd6b32 100644
--- a/addons/artillerytables/XEH_PREP.hpp
+++ b/addons/artillerytables/XEH_PREP.hpp
@@ -1,8 +1,14 @@
TRACE_1("prep",_this);
+PREP(adjustFire);
+PREP(calculateElevation);
+PREP(calculateMaxAngle);
+PREP(calculateMuzzleVelocity);
+PREP(calculateSolution);
PREP(firedEH);
PREP(interactMenuOpened);
PREP(rangeTableOpen);
PREP(rangeTableUpdate);
+PREP(simulateShot);
PREP(turretChanged);
PREP(turretPFEH);
diff --git a/addons/artillerytables/XEH_postInit.sqf b/addons/artillerytables/XEH_postInit.sqf
index 4f0e2032088..0696302ea9b 100644
--- a/addons/artillerytables/XEH_postInit.sqf
+++ b/addons/artillerytables/XEH_postInit.sqf
@@ -4,10 +4,13 @@
TRACE_2("CBA_settingsInitialized",GVAR(advancedCorrections),GVAR(disableArtilleryComputer));
if (hasInterface) then {
- // Add hud overlay for actuall azimuth and elevation:
+ // Add hud overlay for actual azimuth and elevation:
GVAR(pfID) = -1;
["turret", LINKFUNC(turretChanged), true] call CBA_fnc_addPlayerEventHandler;
+ // Handles being teleported from one vehicle to another
+ ["vehicle", {[_this select 0, (_this select 1) unitTurret (_this select 0)] call FUNC(turretChanged)}] call CBA_fnc_addPlayerEventHandler;
+
// Add ability to dynamically open rangetables:
["ace_interactMenuOpened", LINKFUNC(interactMenuOpened)] call CBA_fnc_addEventHandler;
};
@@ -30,6 +33,33 @@
};
}] call CBA_fnc_addEventHandler;
+addMissionEventHandler ["ExtensionCallback", {
+ params ["_name", "_function", "_data"];
+ if (_name == "ace:artillery" && {_function == "calculate_table"}) then {
+ (parseSimpleArray _data) params ["_line", "_data"];
+ if (_data isEqualType []) then {
+ GVAR(tableData) set [_line, _data];
+ };
+ GVAR(tableSizeReceived) = GVAR(tableSizeReceived) + 1;
+ if (GVAR(tableSizeReceived) == GVAR(tableSizeActual)) then {
+ private _dialog = uiNamespace getVariable [QGVAR(rangeTableDialog), displayNull];
+ private _ctrlRangeTable = _dialog displayCtrl IDC_TABLE;
+ if (isNull _dialog) exitWith {true};
+ for "_i" from 0 to GVAR(tableSizeActual) do {
+ private _row = GVAR(tableData) getOrDefault [_i, []];
+ if (count _row == 12) then {
+ _ctrlRangeTable lnbAddRow _row;
+ };
+ };
+ private _dialog = uiNamespace getVariable [QGVAR(rangeTableDialog), displayNull];
+ private _ctrlRangeTable = _dialog displayCtrl IDC_TABLE;
+ if (isNull _dialog) exitWith {TRACE_1("dialog closed",_this);};
+ _ctrlRangeTable lnbAddRow ["", "", "", "", "", "", "", "", "", "", ""];
+ TRACE_1("table filled",_ctrlRangeTable);
+ };
+ };
+}];
+
#ifdef DEBUG_MODE_FULL
#include "dev\showShotInfo.inc.sqf"
#include "dev\checkConfigs.inc.sqf"
diff --git a/addons/artillerytables/config.cpp b/addons/artillerytables/config.cpp
index 1f6fa9f74e7..5aafdfb9b2e 100644
--- a/addons/artillerytables/config.cpp
+++ b/addons/artillerytables/config.cpp
@@ -14,13 +14,6 @@ class CfgPatches {
};
};
-class ACE_Extensions {
- class ace_artillerytables {
- windows = 1;
- client = 1;
- };
-};
-
#include "CfgEventHandlers.hpp"
#include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"
diff --git a/addons/artillerytables/dev/showShotInfo.inc.sqf b/addons/artillerytables/dev/showShotInfo.inc.sqf
index ac99acbdc16..6945e95ba0b 100644
--- a/addons/artillerytables/dev/showShotInfo.inc.sqf
+++ b/addons/artillerytables/dev/showShotInfo.inc.sqf
@@ -35,7 +35,7 @@ INFO("showing shot info");
private _diff = _lastPos vectorDiff _shootPos;
_mkrB setMarkerText format ["%1", _diff apply {round _x}];
- private _dist2d = _shootPos distance2d _lastPos;
+ private _dist2d = _shootPos distance2D _lastPos;
private _dir = _shootPos getDir _lastPos;
private _height = (_lastPos select 2) - (_shootPos select 2);
_mkrB setMarkerText format ["Dist: %1m Az: %2[%3] Height:%4", _dist2d toFixed 0, _dir toFixed 2, ((6400 / 360) * _dir) toFixed 0, _height toFixed 0];
diff --git a/addons/artillerytables/functions/fnc_adjustFire.sqf b/addons/artillerytables/functions/fnc_adjustFire.sqf
new file mode 100644
index 00000000000..1e07c5ca212
--- /dev/null
+++ b/addons/artillerytables/functions/fnc_adjustFire.sqf
@@ -0,0 +1,41 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LorenLuke
+ * Adjusts a target point north and east, and recalculates a solution in air based on atmospheric conditions
+ *
+ * Arguments:
+ * 0: Gun Position ASL
+ * 1: Target Position ASL
+ * 2: Adjustment to the East (negative is West); meters
+ * 3: Adjustment to the North (negative is South); meters
+ * 4: Adjustment vertically (negative is Down); meters
+ * 5: Muzzle velocity; meters/second
+ * 6: Air Friction; meters^-1 (m/s^2)/(m^2/s^2)
+ * 7: High angle boolean (true is high angle)
+ * 8: Temperature; degrees Celsius
+ * 9: Atmospheric Density; kg/(meters^3)
+ * 10: Direction of wind; degrees clockwise from north
+ * 11: Speed of wind; meters/second
+ *
+ * Return Value:
+ * Array of returns
+ * 0: Angle of shot; Milliradians
+ * 1: Angle adjust left or right; Milliradians
+ * 2: Time of flight; seconds
+ *
+ * Example:
+ * [getposASL vehicle player, targetPos, 20, 50, 0, 200, -0.0001, true, 15, 1.225, 225, 5] call ace_artilleryTables_fnc_adjustFire
+ *
+ * Public: No
+ */
+
+params ["_gunPos", "_targetPos", "_adjustEast", "_adjustNorth", "_adjustUp", "_muzzleVelocity", "_airFriction", ["_highAngle", true], ["_temperature", 15], ["_airDensity", 1.225], ["_windDir", 0], ["_windSpeed", 0]];
+
+//DEFAULT_AIR_FRICTION == -0.00006
+//MK6_82mm_AIR_FRICTION == -0.0001
+
+private _resultPos = [_adjustEast + _targetPos select 0, _adjustNorth + _targetPos select 1, _adjustUp + _targetPos select 2];
+
+private _returns = [_gunPos, _resultPos, _muzzleVelocity, _highAngle, _airFriction, _temperature, _airDensity, _windDir, _windSpeed] call FUNC(calculateSolution);
+
+_returns
diff --git a/addons/artillerytables/functions/fnc_calculateElevation.sqf b/addons/artillerytables/functions/fnc_calculateElevation.sqf
new file mode 100644
index 00000000000..977253eff93
--- /dev/null
+++ b/addons/artillerytables/functions/fnc_calculateElevation.sqf
@@ -0,0 +1,71 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LorenLuke
+ * Adjusts a target point north and east, and recalculates a solution in air based on atmospheric conditions
+ *
+ * Arguments:
+ * 0: Distance to Target; meters
+ * 1: Height of target; meters, relative to gun altitude (positive means target higher than gun)
+ * 2: Muzzle velocity; meters/second
+ * 3: High angle boolean (true is high angle)
+ * 4: Air Friction; meters^-1 [(m/s^2)/(m^2/s^2)]
+ * 5: Temperature; degrees Celsius
+ * 6: Atmospheric Density; kg/(meters^3)
+ * 7: Cross wind; meters/second (negative is Right to Left)
+ * 8: Tail wind; meters/second (negative is flying against the wind)
+ *
+ * Return Value:
+ * Array of returns
+ * 0: Angle of shot; Milliradians
+ * 1: Angle adjust left or right; Milliradians
+ * 2: Time of flight; seconds
+ *
+ * Example:
+ * [myPos, 0, 200, true, -0.0001, 15, 1.225, 5, -10] call ace_artilleryTables_fnc_calculateElevation
+ *
+ * Public: No
+ */
+
+params ["_targetDistance", "_targetHeight", "_muzzleVelocity", ["_highArc", true], ["_airFriction", 0], ["_temperature", 15], ["_airDensity", 1.225], ["_crossWind", 0], ["_tailWind", 0]];
+
+//DEFAULT_AIR_FRICTION == -0.00006
+//MK6_82mm_AIR_FRICTION == -0.0001
+
+if (_airFriction != 0) then {
+ _muzzleVelocity = [_muzzleVelocity, _temperature, _airDensity] call FUNC(calculateMuzzleVelocity);
+};
+private _maxResults = [_muzzleVelocity, _airFriction] call FUNC(calculateMaxAngle);
+
+private _testShot = [_maxResults select 0, _targetHeight, _muzzleVelocity, _airFriction, _crossWind, _tailWind, _temperature, _airDensity] call FUNC(simulateShot);
+if (_testShot select 1 < _targetDistance) exitWith {
+ //No way we can hit it so don't bother;
+ [-1, -1, -1]
+};
+
+private _useDistance = _targetDistance;
+private _useAngle = 0;
+private _resultDistance = 0;
+private _xDeviation = 0;
+private _tof = 0;
+
+while {abs(_resultDistance - _targetDistance) > 0.5} do {
+ TRACE_7("callExtension:artillery:simulate_find_solution",_useDistance,_targetHeight,_muzzleVelocity,_airFriction,_higharc,DEFAULT_MIN_ELEV,DEFAULT_MAX_ELEV);
+ (
+ "ace" callExtension ["artillery:simulate_find_solution", [_useDistance, _targetHeight, _muzzleVelocity, _airFriction, _higharc, DEFAULT_MIN_ELEV, DEFAULT_MAX_ELEV]]
+ ) params ["_data", "_code"];
+ TRACE_1("",_code);
+ (parseSimpleArray _data) params ["", "_useAngleRad", ""];
+ _useAngle = deg(_useAngleRad) * DEGTOMILS;
+
+ private _shotResults = [_useAngle, _targetHeight, _muzzleVelocity, _airFriction, _crossWind, _tailWind, _temperature, _airDensity] call FUNC(simulateShot);
+
+ _xDeviation = _shotResults select 0;
+ _resultDistance = _shotResults select 1;
+ _tof = _shotResults select 2;
+ _useDistance = (2 * _targetDistance) - _resultDistance;
+};
+
+private _angleOffsetDeg = _xDeviation atan2 _resultDistance;
+private _angleOffset = _angleOffsetDeg * DEGTOMILS;
+
+[_useAngle, -_angleOffset, _tof]
diff --git a/addons/artillerytables/functions/fnc_calculateMaxAngle.sqf b/addons/artillerytables/functions/fnc_calculateMaxAngle.sqf
new file mode 100644
index 00000000000..9866ec4b28e
--- /dev/null
+++ b/addons/artillerytables/functions/fnc_calculateMaxAngle.sqf
@@ -0,0 +1,28 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LorenLuke
+ * Calculates the best possible angle to shoot farthest based on muzzle velocity and air friction.
+ *
+ * Arguments:
+ * 0: Initial Muzzle Velocity; meters/second
+ * 1: Air Friction; meters^-1 (m/s^2)/(m^2/s^2)
+ *
+ * Return Values:
+ * 1: Best Angle; Milliradians
+ * 2: Furthest Distance; Meters
+ *
+ * Example:
+ * [200, -0.00006] call ace_artilleryTables_fnc_calculateMaxAngle
+ *
+ * Public: No
+ */
+
+params ["_muzzleVelocity", "_airFriction"];
+
+TRACE_2("callExtension:artillery:find_max_angle",_muzzleVelocity,_airFriction);
+(
+ "ace" callExtension ["artillery:find_max_angle", [_muzzleVelocity, _airFriction]]
+) params ["_data", "_code"];
+TRACE_1("",_code);
+(parseSimpleArray _data) params ["_bestAngle", "_bestDistance"];
+[deg _bestAngle * 6400 / 360, _bestDistance] // return
diff --git a/addons/artillerytables/functions/fnc_calculateMuzzleVelocity.sqf b/addons/artillerytables/functions/fnc_calculateMuzzleVelocity.sqf
new file mode 100644
index 00000000000..6f00f74c148
--- /dev/null
+++ b/addons/artillerytables/functions/fnc_calculateMuzzleVelocity.sqf
@@ -0,0 +1,28 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LorenLuke
+ * Calculates the muzzleVelocity change with advanced calculations.
+ *
+ * Arguments:
+ * 0: Initial Muzzle velocity; meters/second
+ * 1: Temperature; degrees Celsius
+ * 2: Atmospheric Density; kg/(meters^3)
+ *
+ * Return Value:
+ * Adjusted Muzzle Velocity; Meters
+ *
+ * Example:
+ * [200, 15, 1.225] call ace_artilleryTables_fnc_calculateMuzzleVelocity
+ *
+ * Public: No
+ */
+
+params ["_muzzleVelocity", "_temperature", "_airDensity"];
+
+// Calculate air density
+private _relativeDensity = _airDensity / 1.225;
+private _newMuzzleVelocityCoefficient = (((_temperature + 273.13) / 288.13 - 1) / 40 + 1);
+
+private _newMuzzleVelocity = _muzzleVelocity * _newMuzzleVelocityCoefficient;
+
+_newMuzzleVelocity
diff --git a/addons/artillerytables/functions/fnc_calculateSolution.sqf b/addons/artillerytables/functions/fnc_calculateSolution.sqf
new file mode 100644
index 00000000000..13e798568c4
--- /dev/null
+++ b/addons/artillerytables/functions/fnc_calculateSolution.sqf
@@ -0,0 +1,44 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LorenLuke
+ * Provides fire angle and deflection solutions on a target of set distance and height, including accounting for drag and atmospheric wind conditions.
+ *
+ * Arguments:
+ * 0: Gun Position ASL;
+ * 1: Target Position ASL;
+ * 2: Muzzle Velocity; meters/second
+ * 3: High angle boolean (true is high angle)
+ * 4: Air Friction; meters^-1 [(m/s^2)/(m^2/s^2)]
+ * 5: Temperature; degrees Celsius
+ * 6: Atmospheric Density; kg/(meters^3)
+ * 7: Direction of wind; degrees clockwise from north
+ * 8: Speed of wind; meters/second
+ *
+ * Return Value:
+ * array of returns
+ * 0: Angle of shot; Milliradians
+ * 1: Angle adjust left or right; Milliradians
+ * 2: Time of flight; seconds
+ *
+ * Example:
+ * [myPos, targetPos, 200, true, -0.0001, 15, 1.225, 225, 5] call ace_artilleryTables_fnc_calculateSolution
+ *
+ * Public: No
+ */
+
+params ["_ownPos", "_targetPos", "_muzzleVelocity", ["_highAngle", true], ["_airFriction", 0], ["_temperature", 15], ["_airDensity", 1.225], ["_windDir", 0], ["_windSpeed", 0]];
+
+//DEFAULT_AIR_FRICTION == -0.00006
+//MK6_82mm_AIR_FRICTION == -0.0001
+
+private _relPos = _targetPos vectorDiff _ownPos;
+
+private _targetDir = (_relpos select 0) atan2 (_relPos select 1);
+private _targetDist = sqrt( (_relPos select 0)^2 + (_relpos select 1)^2 );
+private _heightDif = _relPos select 2;
+private _crossWind = sin(_targetDir - _windDir) * _windSpeed;
+private _tailWind = -cos(_targetDir - _windDir) * _windSpeed;
+
+private _solutionReturns = [_targetDist, _heightDif, _muzzleVelocity, _highAngle, _airFriction, _crossWind, _tailWind, _temperature, _airDensity] call FUNC(calculateElevation);
+
+_solutionReturns
diff --git a/addons/artillerytables/functions/fnc_rangeTableOpen.sqf b/addons/artillerytables/functions/fnc_rangeTableOpen.sqf
index 508b8c894ce..3984e4dacb9 100644
--- a/addons/artillerytables/functions/fnc_rangeTableOpen.sqf
+++ b/addons/artillerytables/functions/fnc_rangeTableOpen.sqf
@@ -34,7 +34,7 @@ TRACE_2("created dialog",_dialog,_ctrlChargeList);
// Get Mags:
private _mags = [_weaponName] call CBA_fnc_compatibleMagazines;
-if (_mags isEqualTo []) exitWith {WARNING_1("No Mags",_weaponName);};
+if (_mags isEqualTo []) exitWith {WARNING_1("No Mags %1",_weaponName);};
private _magCfg = configFile >> "CfgMagazines";
private _magParamsArray = [];
_mags = _mags apply {
diff --git a/addons/artillerytables/functions/fnc_rangeTableUpdate.sqf b/addons/artillerytables/functions/fnc_rangeTableUpdate.sqf
index 3e50f9d7ad2..4cce2499cf4 100644
--- a/addons/artillerytables/functions/fnc_rangeTableUpdate.sqf
+++ b/addons/artillerytables/functions/fnc_rangeTableUpdate.sqf
@@ -34,31 +34,12 @@ _ctrlElevationLow ctrlSetTextColor ([[1,1,1,1],[0.25,0.25,0.25,1]] select GVAR(l
lnbClear _ctrlRangeTable;
// Call extension with current data and start workers
-TRACE_5("callExtension:start",_muzzleVelocity,_airFriction,_elevMin,_elevMax,GVAR(lastElevationMode));
-private _ret = "ace_artillerytables" callExtension ["start", [_muzzleVelocity,_airFriction,_elevMin,_elevMax,GVAR(lastElevationMode)]];
-TRACE_1("",_ret);
-
-// Non-blocking read data out of extension as it becomes availiable
-[{
- private _dialog = uiNamespace getVariable [QGVAR(rangeTableDialog), displayNull];
- private _ctrlRangeTable = _dialog displayCtrl IDC_TABLE;
- if (isNull _dialog) exitWith {true};
-
- private _status = 1; // 1 = data on line, 2 - data not ready, 3 - done
- while {_status == 1} do {
- private _ret = ("ace_artillerytables" callExtension ["getline", []]);
- // TRACE_1("callExtension:getline",_ret);
- _status = _ret select 1;
- if (_status == 1) then { _ctrlRangeTable lnbAddRow parseSimpleArray (_ret select 0) };
- };
-
- (_status == 3) // exit loop when all data read
-}, {
- // put dummy line at end because scrolling is problematic and can't see last line
- private _dialog = uiNamespace getVariable [QGVAR(rangeTableDialog), displayNull];
- private _ctrlRangeTable = _dialog displayCtrl IDC_TABLE;
- if (isNull _dialog) exitWith {TRACE_1("dialog closed",_this);};
-
- _ctrlRangeTable lnbAddRow ["", "", "", "", "", "", "", "", "", "", ""];
- TRACE_1("table filled",_ctrlRangeTable);
-}, []] call CBA_fnc_waitUntilAndExecute;
+TRACE_5("callExtension:artillery:calculate_table",_muzzleVelocity,_airFriction,_elevMin,_elevMax,GVAR(lastElevationMode));
+(
+ "ace" callExtension ["artillery:calculate_table", [_muzzleVelocity, _airFriction, _elevMin, _elevMax, GVAR(lastElevationMode)]]
+) params ["_data", "_code"];
+TRACE_1("",_code);
+
+GVAR(tableData) = createHashMap;
+GVAR(tableSizeActual) = (parseSimpleArray _data) select 1;
+GVAR(tableSizeReceived) = 0;
diff --git a/addons/artillerytables/functions/fnc_simulateShot.sqf b/addons/artillerytables/functions/fnc_simulateShot.sqf
new file mode 100644
index 00000000000..be747e862ae
--- /dev/null
+++ b/addons/artillerytables/functions/fnc_simulateShot.sqf
@@ -0,0 +1,47 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LorenLuke
+ * Simulates an indirect shot on a target of known height with given drag, wind, and atmospheric conditions
+ *
+ * Arguments:
+ * 0: Gun Elevation Angle; milliradians
+ * 1: Relative Target Height; meters, relative to gun altitude (positive means target higher than gun)
+ * 2: Muzzle Velocity; meters/second
+ * 3: Air Friction; meters^-1 [(m/s^2)/(m^2/s^2)]
+ * 4: Cross wind; meters/second (negative is Right to Left)
+ * 5: Tail wind; meters/second (negative is flying against the wind)
+ * 6: Temperature; degrees Celsius
+ * 7: Atmospheric Density; kg/(meters^3)
+ *
+ * Return Value:
+ * array of returns
+ * 0: Deflection Adjustment To Hit; Milliradians (negative is Left)
+ * 1: Distance of Shot; meters
+ * 2: Time of Flight; seconds
+ *
+ * Example:
+ * [900, 10, 200, -0.0001, 4, 0, 15, 1.225] call ace_artilleryTables_fnc_simulateShot
+ *
+ * Public: No
+ */
+
+params ["_angle", "_targetHeight", "_muzzleVelocity", ["_airFriction", 0], ["_crossWind", 0], ["_tailWind", 0], ["_temperature", 15], ["_atmosphericDensity", 1.225]];
+
+//DEFAULT_AIR_FRICTION == -0.00006
+//MK6_82mm_AIR_FRICTION == -0.0001
+
+if (_airFriction != 0) then {
+ _muzzleVelocity = [_muzzleVelocity, _temperature, _atmosphericDensity] call FUNC(calculateMuzzleVelocity);
+};
+
+private _atmosphericDensityRatio = _atmosphericDensity / 1.225;
+private _radAngle = rad(_angle / DEGTOMILS);
+
+TRACE_8("callExtension:artillery:simulate_shot",_radAngle,_targetHeight,_muzzleVelocity,_airFriction,_crossWind,_tailWind,_temperature,_atmosphericDensityRatio);
+(
+ "ace" callExtension ["artillery:simulate_shot", [_radAngle, _targetHeight, _muzzleVelocity, _airFriction, _crossWind, _tailWind, _temperature, _atmosphericDensityRatio]]
+) params ["_data", "_code"];
+TRACE_1("",_code);
+
+//[xDeviation, yDistance, timeOfFlight]
+parseSimpleArray _data
diff --git a/addons/artillerytables/functions/fnc_turretPFEH.sqf b/addons/artillerytables/functions/fnc_turretPFEH.sqf
index 9ad10de1aa8..5e4e6c94657 100644
--- a/addons/artillerytables/functions/fnc_turretPFEH.sqf
+++ b/addons/artillerytables/functions/fnc_turretPFEH.sqf
@@ -30,7 +30,10 @@ if (isNull (uiNamespace getVariable [QGVAR(display), displayNull])) then {
};
private _ctrlGroup = (uiNamespace getVariable [QGVAR(display), displayNull]) displayCtrl 1000;
-if (cameraView != "GUNNER") exitWith { // need to be in gunner mode, so we can check where the optics are aiming at
+
+// Need to be in gunner mode, so we can check where the optics are aiming at
+// However, if there are no optics, ignore the above
+if (!_invalidGunnerMem && {cameraView != "GUNNER"}) exitWith {
_ctrlGroup ctrlShow false;
};
_ctrlGroup ctrlShow true;
@@ -40,7 +43,7 @@ BEGIN_COUNTER(pfeh);
private _currentFireMode = (weaponState [_vehicle, _turret]) select 2;
private _currentChargeMode = _fireModes find _currentFireMode;
-private _lookVector = (AGLtoASL (positionCameraToWorld [0,0,0])) vectorFromTo (AGLtoASL (positionCameraToWorld [0,0,1]));
+private _lookVector = (AGLToASL (positionCameraToWorld [0,0,0])) vectorFromTo (AGLToASL (positionCameraToWorld [0,0,1]));
private _weaponDir = _vehicle weaponDirection (currentWeapon _vehicle);
// Calc real azimuth/elevation
@@ -48,7 +51,7 @@ private _weaponDir = _vehicle weaponDirection (currentWeapon _vehicle);
private _display = uiNamespace getVariable ["ACE_dlgArtillery", displayNull];
private _useRealWeaponDir = if ((isNull (_display displayCtrl 173)) || {(_vehicle ammo (currentWeapon _vehicle)) == 0}) then {
// With no ammo, distance display will be empty, but gun will still fire at wonky angle if aimed at ground
- private _testSeekerPosASL = AGLtoASL (positionCameraToWorld [0,0,0]);
+ private _testSeekerPosASL = AGLToASL (positionCameraToWorld [0,0,0]);
private _testPoint = _testSeekerPosASL vectorAdd (_lookVector vectorMultiply viewDistance);
!((terrainIntersectASL [_testSeekerPosASL, _testPoint]) || {lineIntersects [_testSeekerPosASL, _testPoint, _vehicle]});
} else {
@@ -81,8 +84,8 @@ private _ctrlCharge = (uiNamespace getVariable [QGVAR(display), displayNull]) di
private _ctrlAzimuth = (uiNamespace getVariable [QGVAR(display), displayNull]) displayCtrl IDC_AZIMUTH;
private _ctrlElevation = (uiNamespace getVariable [QGVAR(display), displayNull]) displayCtrl IDC_ELEVATION;
-_ctrlAzimuth ctrlSetText Format ["AZ: %1", [DEGTOMILS * _realAzimuth, 4, 0] call CBA_fnc_formatNumber];
-_ctrlElevation ctrlSetText Format ["EL: %1", [DEGTOMILS * _realElevation, 4, 0] call CBA_fnc_formatNumber];
+_ctrlAzimuth ctrlSetText format ["AZ: %1", [DEGTOMILS * _realAzimuth, 4, 0] call CBA_fnc_formatNumber];
+_ctrlElevation ctrlSetText format ["EL: %1", [DEGTOMILS * _realElevation, 4, 0] call CBA_fnc_formatNumber];
_ctrlCharge ctrlSetText format ["CH: %1", _currentChargeMode];
// avalible for other addons (mk6)
diff --git a/addons/artillerytables/script_component.hpp b/addons/artillerytables/script_component.hpp
index 128c3c17ff1..a2303b2a762 100644
--- a/addons/artillerytables/script_component.hpp
+++ b/addons/artillerytables/script_component.hpp
@@ -12,6 +12,10 @@
// This is a good fit for most large artillery, but a little low for lighter mortars
#define DEFAULT_AIR_FRICTION -0.00006
+#define DEFAULT_MIN_ELEV 0
+// 90 degrees in radians
+#define DEFAULT_MAX_ELEV 1.5708
+
#define DEGTOMILS 17.7777778
#define IDC_MODECONTROLGROUP 1000
diff --git a/addons/atragmx/RscTitles.hpp b/addons/atragmx/RscTitles.hpp
index 6196346c575..33b8c8036a0 100644
--- a/addons/atragmx/RscTitles.hpp
+++ b/addons/atragmx/RscTitles.hpp
@@ -157,8 +157,8 @@ class ATragMX_Display {
SizeEX="0.025";
idc=720000;
style=48;
- x="0.55*safezoneW+safezoneX-0.256";
- y="0.265*safezoneH+safezoneY-0.1";
+ x="0.55*safeZoneW+safeZoneX-0.256";
+ y="0.265*safeZoneH+safeZoneY-0.1";
w="1.024";
h="1.024*4/3";
colorBackground[]={1,1,1,1};
@@ -167,8 +167,8 @@ class ATragMX_Display {
};
class POWER: ATragMX_RscButton {
idc=-1;
- x="0.55*safezoneW+safezoneX+0.145";
- y="0.265*safezoneH+safezoneY+0.94";
+ x="0.55*safeZoneW+safeZoneX+0.145";
+ y="0.265*safeZoneH+safeZoneY+0.94";
w="0.045";
h="0.045*4/3";
colorBackground[]={0,0,0,0.0};
@@ -177,26 +177,26 @@ class ATragMX_Display {
class BACK: POWER {
idc=-1;
w="0.06";
- x="0.55*safezoneW+safezoneX+0.3122";
+ x="0.55*safeZoneW+safeZoneX+0.3122";
action=QUOTE(call FUNC(init); call FUNC(update_target_selection));
};
class WINDOWS: ATragMX_RscButton {
idc=-1;
- x="0.55*safezoneW+safezoneX+0.130";
- y="0.265*safezoneH+safezoneY+0.88";
+ x="0.55*safeZoneW+safeZoneX+0.130";
+ y="0.265*safeZoneH+safeZoneY+0.88";
w="0.035";
h="0.035*4/3";
colorBackground[]={0,0,0,0.0};
};
class OK: WINDOWS {
idc=-1;
- x="0.55*safezoneW+safezoneX+0.347";
- y="0.265*safezoneH+safezoneY+0.878";
+ x="0.55*safeZoneW+safeZoneX+0.347";
+ y="0.265*safeZoneH+safeZoneY+0.878";
};
class TOP: ATragMX_RscButton {
idc=-1;
- x="0.55*safezoneW+safezoneX+0.242";
- y="0.265*safezoneH+safezoneY+0.85";
+ x="0.55*safeZoneW+safeZoneX+0.242";
+ y="0.265*safeZoneH+safeZoneY+0.85";
w="0.03";
h="0.03";
colorBackground[]={0,0,0,0.0};
@@ -204,13 +204,13 @@ class ATragMX_Display {
};
class BOTTOM: TOP {
idc=-1;
- y="0.265*safezoneH+safezoneY+0.955";
+ y="0.265*safeZoneH+safeZoneY+0.955";
action=QUOTE(+1 call FUNC(cycle_gun_list));
};
class LEFT: ATragMX_RscButton {
idc=-1;
- x="0.55*safezoneW+safezoneX+0.1925";
- y="0.265*safezoneH+safezoneY+0.9";
+ x="0.55*safeZoneW+safeZoneX+0.1925";
+ y="0.265*safeZoneH+safeZoneY+0.9";
w="0.05";
h="0.03";
colorBackground[]={0,0,0,0};
@@ -218,50 +218,50 @@ class ATragMX_Display {
};
class RIGHT: LEFT {
idc=-1;
- x="0.55*safezoneW+safezoneX+0.2725";
+ x="0.55*safeZoneW+safeZoneX+0.2725";
action=QUOTE(((4 + GVAR(currentTarget) + 1) % 4) call FUNC(change_target_slot));
};
class TOP_LEFT: ATragMX_RscButton {
idc=-1;
- x="0.55*safezoneW+safezoneX+0.162";
- y="0.265*safezoneH+safezoneY+0.82";
+ x="0.55*safeZoneW+safeZoneX+0.162";
+ y="0.265*safeZoneH+safeZoneY+0.82";
w="0.031";
h="0.031*4/3";
colorBackground[]={0,0,0,0.0};
};
class TOP_RIGHT: TOP_LEFT {
idc=-1;
- x="0.55*safezoneW+safezoneX+0.315";
+ x="0.55*safeZoneW+safeZoneX+0.315";
};
class TEXT_GUN_FRAME: ATragMX_RscText {
idc=1001;
style=64;
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.25";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.25";
w="0.0925";
h="0.205";
text="";
};
class TEXT_ATMOSPHERE_FRAME: TEXT_GUN_FRAME {
idc=1002;
- x="0.550*safezoneW+safezoneX+0.205";
+ x="0.550*safeZoneW+safeZoneX+0.205";
};
class TEXT_TARGET_FRAME: TEXT_GUN_FRAME {
idc=1003;
- x="0.550*safezoneW+safezoneX+0.3";
+ x="0.550*safeZoneW+safeZoneX+0.3";
};
class TEXT_RESULT_FRAME: TEXT_GUN_FRAME {
idc=1004;
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.46";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.46";
w="0.2825";
h="0.15";
};
class TEXT_GUN_PROFILE: ATragMX_RscText {
idc=1000;
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.20";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.20";
w="0.18";
h="0.03";
style=ST_LEFT;
@@ -271,8 +271,8 @@ class ATragMX_Display {
class TEXT_D: ATragMX_RscButton {
idc=600;
w="0.0231";
- x="0.550*safezoneW+safezoneX+0.29";
- y="0.265*safezoneH+safezoneY+0.20";
+ x="0.550*safeZoneW+safeZoneX+0.29";
+ y="0.265*safeZoneH+safeZoneY+0.20";
colorText[]={0,0,0,1};
colorDisabled[]={0.8,0.8,0.8,1};
colorBackgroundDisabled[]={0,0,0,1};
@@ -282,20 +282,20 @@ class ATragMX_Display {
};
class TEXT_E: TEXT_D {
idc=601;
- x="0.550*safezoneW+safezoneX+0.3131";
+ x="0.550*safeZoneW+safeZoneX+0.3131";
text="E";
action=QUOTE(GVAR(currentUnit)=1; call FUNC(update_unit_selection));
};
class TEXT_M: TEXT_E {
idc=602;
- x="0.550*safezoneW+safezoneX+0.3362";
+ x="0.550*safeZoneW+safeZoneX+0.3362";
text="M";
action=QUOTE(GVAR(currentUnit)=2; call FUNC(update_unit_selection));
};
class TEXT_RANGE_CARD: TEXT_D {
idc=603;
w="0.03";
- x="0.550*safezoneW+safezoneX+0.36";
+ x="0.550*safeZoneW+safeZoneX+0.36";
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
text="RC";
@@ -305,8 +305,8 @@ class ATragMX_Display {
class TEXT_GUN: ATragMX_RscButton {
idc=4000;
w="0.0925";
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.25";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.25";
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
text="Gun";
@@ -315,41 +315,41 @@ class ATragMX_Display {
class TEXT_BORE_HEIGHT: TEXT_GUN_PROFILE {
idc=10;
style=ST_LEFT;
- y="0.265*safezoneH+safezoneY+0.285";
+ y="0.265*safeZoneH+safeZoneY+0.285";
text="BH";
};
class TEXT_BORE_HEIGHT_OUTPUT: TEXT_BORE_HEIGHT {
idc=100;
style=ST_RIGHT;
w="0.058";
- x="0.550*safezoneW+safezoneX+0.145";
- y="0.265*safezoneH+safezoneY+0.285";
+ x="0.550*safeZoneW+safeZoneX+0.145";
+ y="0.265*safeZoneH+safeZoneY+0.285";
};
class TEXT_BULLET_MASS: TEXT_BORE_HEIGHT {
idc=11;
style=ST_LEFT;
- y="0.265*safezoneH+safezoneY+0.320";
+ y="0.265*safeZoneH+safeZoneY+0.320";
text="BW";
};
class TEXT_BULLET_MASS_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT {
idc=110;
- y="0.265*safezoneH+safezoneY+0.320";
+ y="0.265*safeZoneH+safeZoneY+0.320";
};
class TEXT_AIR_FRICTION: TEXT_BORE_HEIGHT {
idc=12;
- y="0.265*safezoneH+safezoneY+0.355";
+ y="0.265*safeZoneH+safeZoneY+0.355";
text="C1";
};
class TEXT_AIR_FRICTION_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT {
idc=120;
- y="0.265*safezoneH+safezoneY+0.355";
+ y="0.265*safeZoneH+safeZoneY+0.355";
};
class TEXT_MUZZLE_VELOCITY: ATragMX_RscButton {
idc=13;
style=0;
w="0.03";
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.390";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.390";
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
text="MV";
@@ -357,69 +357,69 @@ class ATragMX_Display {
};
class TEXT_MUZZLE_VELOCITY_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT {
idc=130;
- y="0.265*safezoneH+safezoneY+0.390";
+ y="0.265*safeZoneH+safeZoneY+0.390";
};
class TEXT_ZERO_RANGE: TEXT_BORE_HEIGHT {
idc=14;
- y="0.265*safezoneH+safezoneY+0.425";
+ y="0.265*safeZoneH+safeZoneY+0.425";
text="ZR";
};
class TEXT_ZERO_RANGE_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT {
idc=140;
- y="0.265*safezoneH+safezoneY+0.425";
+ y="0.265*safeZoneH+safeZoneY+0.425";
};
class TEXT_ATMOSPHERE: TEXT_GUN {
idc=4001;
- x="0.550*safezoneW+safezoneX+0.205";
+ x="0.550*safeZoneW+safeZoneX+0.205";
text="Atmsphr";
action=QUOTE(0 call FUNC(toggle_atmo_env_data));
};
class TEXT_TEMPERATURE: TEXT_BULLET_MASS {
idc=20;
- x="0.550*safezoneW+safezoneX+0.20";
+ x="0.550*safeZoneW+safeZoneX+0.20";
text="Tmp";
};
class TEXT_TEMPERATURE_OUTPUT: TEXT_TEMPERATURE {
idc=200;
style=ST_RIGHT;
w="0.050";
- x="0.550*safezoneW+safezoneX+0.245";
- y="0.265*safezoneH+safezoneY+0.320";
+ x="0.550*safeZoneW+safeZoneX+0.245";
+ y="0.265*safeZoneH+safeZoneY+0.320";
text="";
};
class TEXT_BAROMETRIC_PRESSURE: TEXT_TEMPERATURE {
idc=21;
- x="0.550*safezoneW+safezoneX+0.20";
- y="0.265*safezoneH+safezoneY+0.355";
+ x="0.550*safeZoneW+safeZoneX+0.20";
+ y="0.265*safeZoneH+safeZoneY+0.355";
text="BP";
};
class TEXT_BAROMETRIC_PRESSURE_OUTPUT: TEXT_TEMPERATURE_OUTPUT {
idc=210;
- y="0.265*safezoneH+safezoneY+0.355";
+ y="0.265*safeZoneH+safeZoneY+0.355";
};
class TEXT_RELATIVE_HUMIDITY: TEXT_BAROMETRIC_PRESSURE {
idc=22;
- y="0.265*safezoneH+safezoneY+0.390";
+ y="0.265*safeZoneH+safeZoneY+0.390";
text="RH";
};
class TEXT_RELATIVE_HUMIDITY_OUTPUT: TEXT_TEMPERATURE_OUTPUT {
idc=220;
- y="0.265*safezoneH+safezoneY+0.390";
+ y="0.265*safeZoneH+safeZoneY+0.390";
};
class TEXT_ALTITUDE: TEXT_BORE_HEIGHT {
idc=23;
- x="0.550*safezoneW+safezoneX+0.20";
+ x="0.550*safeZoneW+safeZoneX+0.20";
text="Alt";
};
class TEXT_ALTITUDE_OUTPUT: TEXT_TEMPERATURE_OUTPUT {
idc=230;
- y="0.265*safezoneH+safezoneY+0.285";
+ y="0.265*safeZoneH+safeZoneY+0.285";
};
class TEXT_TARGET_A: ATragMX_RscButton {
idc=500;
w="0.0231";
- x="0.550*safezoneW+safezoneX+0.205";
- y="0.265*safezoneH+safezoneY+0.425";
+ x="0.550*safeZoneW+safeZoneX+0.205";
+ y="0.265*safeZoneH+safeZoneY+0.425";
colorText[]={0,0,0,1};
colorDisabled[]={0.8,0.8,0.8,1};
colorBackgroundDisabled[]={0,0,0,1};
@@ -429,103 +429,103 @@ class ATragMX_Display {
};
class TEXT_TARGET_B: TEXT_TARGET_A {
idc=501;
- x="0.550*safezoneW+safezoneX+0.2281";
+ x="0.550*safeZoneW+safeZoneX+0.2281";
text="B";
action=QUOTE(1 call FUNC(change_target_slot));
};
class TEXT_TARGET_C: TEXT_TARGET_A {
idc=502;
- x="0.550*safezoneW+safezoneX+0.2512";
+ x="0.550*safeZoneW+safeZoneX+0.2512";
text="C";
action=QUOTE(2 call FUNC(change_target_slot));
};
class TEXT_TARGET_D: TEXT_TARGET_A {
idc=503;
- x="0.550*safezoneW+safezoneX+0.2743";
+ x="0.550*safeZoneW+safeZoneX+0.2743";
text="D";
action=QUOTE(3 call FUNC(change_target_slot));
};
class TEXT_TARGET: TEXT_GUN {
idc=4002;
- x="0.550*safezoneW+safezoneX+0.3";
+ x="0.550*safeZoneW+safeZoneX+0.3";
text="Target";
action=QUOTE(0 call FUNC(toggle_target_data));
};
class TEXT_WIND_SPEED: TEXT_BORE_HEIGHT {
idc=30;
- x="0.550*safezoneW+safezoneX+0.3";
+ x="0.550*safeZoneW+safeZoneX+0.3";
text="WS";
};
class TEXT_WIND_SPEED_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT {
idc=300;
w="0.058";
- x="0.550*safezoneW+safezoneX+0.335";
- y="0.265*safezoneH+safezoneY+0.285";
+ x="0.550*safeZoneW+safeZoneX+0.335";
+ y="0.265*safeZoneH+safeZoneY+0.285";
text="0";
};
class TEXT_WIND_DIRECTION: TEXT_BULLET_MASS {
idc=31;
- x="0.550*safezoneW+safezoneX+0.3";
+ x="0.550*safeZoneW+safeZoneX+0.3";
text="WD";
};
class TEXT_WIND_DIRECTION_OUTPUT: TEXT_WIND_SPEED_OUTPUT {
idc=310;
- y="0.265*safezoneH+safezoneY+0.32";
+ y="0.265*safeZoneH+safeZoneY+0.32";
};
class TEXT_INCLINATION_ANGLE: TEXT_AIR_FRICTION {
idc=32;
- x="0.550*safezoneW+safezoneX+0.3";
+ x="0.550*safeZoneW+safeZoneX+0.3";
text="IA";
};
class TEXT_INCLINATION_ANGLE_OUTPUT: TEXT_WIND_SPEED_OUTPUT {
idc=320;
- y="0.265*safezoneH+safezoneY+0.355";
+ y="0.265*safeZoneH+safeZoneY+0.355";
};
class TEXT_TARGET_SPEED: TEXT_MUZZLE_VELOCITY {
idc=33;
- x="0.550*safezoneW+safezoneX+0.3";
+ x="0.550*safeZoneW+safeZoneX+0.3";
text="TS";
action=QUOTE(0 call FUNC(toggle_target_speed_assist));
};
class TEXT_TARGET_SPEED_OUTPUT: TEXT_WIND_SPEED_OUTPUT {
idc=330;
- y="0.265*safezoneH+safezoneY+0.39";
+ y="0.265*safeZoneH+safeZoneY+0.39";
};
class TEXT_TARGET_RANGE: TEXT_TARGET_SPEED {
idc=34;
- y="0.265*safezoneH+safezoneY+0.425";
+ y="0.265*safeZoneH+safeZoneY+0.425";
text="TR";
action=QUOTE(0 call FUNC(toggle_target_range_assist));
};
class TEXT_TARGET_RANGE_INPUT: TEXT_WIND_SPEED_OUTPUT {
idc=340;
- y="0.265*safezoneH+safezoneY+0.425";
+ y="0.265*safeZoneH+safeZoneY+0.425";
};
class TEXT_ELEVATION: TEXT_GUN_PROFILE {
idc=40;
w="0.05";
- x="0.550*safezoneW+safezoneX+0.115";
- y="0.265*safezoneH+safezoneY+0.50";
+ x="0.550*safeZoneW+safeZoneX+0.115";
+ y="0.265*safeZoneH+safeZoneY+0.50";
text="Elev";
};
class TEXT_ABSOLUTE: TEXT_GUN_PROFILE {
idc=4003;
w="0.07";
style=ST_CENTER;
- x="0.550*safezoneW+safezoneX+0.17";
- y="0.265*safezoneH+safezoneY+0.47";
+ x="0.550*safeZoneW+safeZoneX+0.17";
+ y="0.265*safeZoneH+safeZoneY+0.47";
text="Abs";
};
class TEXT_RELATIVE: TEXT_ABSOLUTE {
idc=4004;
- x="0.550*safezoneW+safezoneX+0.245";
+ x="0.550*safeZoneW+safeZoneX+0.245";
text="Rel";
};
class TEXT_CURRENT: TEXT_ABSOLUTE {
idc=4005;
- x="0.550*safezoneW+safezoneX+0.32";
+ x="0.550*safeZoneW+safeZoneX+0.32";
text="Cur";
};
class TEXT_ELEVATION_OUTPUT_ABSOLUTE: ATragMX_RscText {
@@ -534,67 +534,67 @@ class ATragMX_Display {
sizeEx="0.025";
w="0.065";
h="0.032";
- x="0.550*safezoneW+safezoneX+0.17";
- y="0.265*safezoneH+safezoneY+0.50";
+ x="0.550*safeZoneW+safeZoneX+0.17";
+ y="0.265*safeZoneH+safeZoneY+0.50";
text="";
};
class TEXT_ELEVATION_OUTPUT_RELATIVE: TEXT_ELEVATION_OUTPUT_ABSOLUTE {
idc=401;
- x="0.550*safezoneW+safezoneX+0.2465";
+ x="0.550*safeZoneW+safeZoneX+0.2465";
};
class TEXT_ELEVATION_INPUT_CURRENT: TEXT_ELEVATION_OUTPUT_ABSOLUTE {
idc=402;
- x="0.550*safezoneW+safezoneX+0.323";
+ x="0.550*safeZoneW+safeZoneX+0.323";
};
class TEXT_WINDAGE: TEXT_ELEVATION {
idc=41;
- y="0.265*safezoneH+safezoneY+0.535";
+ y="0.265*safeZoneH+safeZoneY+0.535";
text="Wind";
};
class TEXT_WINDAGE_OUTPUT_ABSOLUTE: TEXT_ELEVATION_OUTPUT_ABSOLUTE {
idc=410;
- y="0.265*safezoneH+safezoneY+0.535";
+ y="0.265*safeZoneH+safeZoneY+0.535";
};
class TEXT_WINDAGE_OUTPUT_RELATIVE: TEXT_WINDAGE_OUTPUT_ABSOLUTE {
idc=411;
- x="0.550*safezoneW+safezoneX+0.2465";
+ x="0.550*safeZoneW+safeZoneX+0.2465";
};
class TEXT_WINDAGE_INPUT_CURRENT: TEXT_WINDAGE_OUTPUT_ABSOLUTE {
idc=412;
- x="0.550*safezoneW+safezoneX+0.323";
+ x="0.550*safeZoneW+safeZoneX+0.323";
};
class TEXT_LEAD: TEXT_GUN {
idc=42;
w="0.05";
- x="0.550*safezoneW+safezoneX+0.115";
- y="0.265*safezoneH+safezoneY+0.57";
+ x="0.550*safeZoneW+safeZoneX+0.115";
+ y="0.265*safeZoneH+safeZoneY+0.57";
text="Lead";
action=QUOTE(GVAR(showWind2) = !GVAR(showWind2); call FUNC(update_result); call FUNC(update_target));
};
class TEXT_LEAD_OUTPUT: TEXT_ELEVATION_OUTPUT_ABSOLUTE {
idc=420;
- y="0.265*safezoneH+safezoneY+0.57";
+ y="0.265*safeZoneH+safeZoneY+0.57";
};
class TEXT_RESET_SCOPE_ZERO: TEXT_GUN {
idc=4006;
w="0.07";
style=ST_CENTER;
colorBackground[]={0,0,0,0};
- x="0.550*safezoneW+safezoneX+0.2465";
- y="0.265*safezoneH+safezoneY+0.57";
+ x="0.550*safeZoneW+safeZoneX+0.2465";
+ y="0.265*safeZoneH+safeZoneY+0.57";
text="Reset";
action=QUOTE(call FUNC(reset_relative_click_memory));
};
class TEXT_UPDATE_SCOPE_ZERO: TEXT_RESET_SCOPE_ZERO {
idc=4007;
- x="0.550*safezoneW+safezoneX+0.323";
+ x="0.550*safeZoneW+safeZoneX+0.323";
text="Update";
action=QUOTE(call FUNC(update_relative_click_memory));
};
class TEXT_GUN_LIST: TEXT_GUN {
idc=4008;
style=ST_LEFT;
- y="0.265*safezoneH+safezoneY+0.65";
+ y="0.265*safeZoneH+safeZoneY+0.65";
text="GunList";
action=QUOTE(call FUNC(toggle_gun_list));
};
@@ -602,7 +602,7 @@ class ATragMX_Display {
idc=2000;
style=ST_CENTER;
w="0.06";
- x="0.550*safezoneW+safezoneX+0.205";
+ x="0.550*safeZoneW+safeZoneX+0.205";
colorBackground[]={0,0,0,0};
text="TMOA";
action=QUOTE(call FUNC(cycle_scope_unit));
@@ -611,14 +611,14 @@ class ATragMX_Display {
idc=2001;
style=ST_CENTER;
w="0.025";
- x="0.550*safezoneW+safezoneX+0.27";
+ x="0.550*safeZoneW+safeZoneX+0.27";
text="4";
action=QUOTE(call FUNC(toggle_solution_setup));
};
class TEXT_OPTIONS: TEXT_GUN_LIST {
idc=3000;
style=ST_RIGHT;
- x="0.550*safezoneW+safezoneX+0.3";
+ x="0.550*safeZoneW+safeZoneX+0.3";
text="Options";
action=QUOTE(false call FUNC(toggle_option_menu));
};
@@ -627,8 +627,8 @@ class ATragMX_Display {
colorBackground[]={0.15,0.21,0.23,0.2};
colorBackgroundActive[]={0.15,0.21,0.23,0.2};
colorFocused[]={0.15,0.21,0.23,0.2};
- x="0.550*safezoneW+safezoneX+0.105";
- y="0.265*safezoneH+safezoneY+0.17";
+ x="0.550*safeZoneW+safeZoneX+0.105";
+ y="0.265*safeZoneH+safeZoneY+0.17";
w="0.3";
h="0.535";
offsetPressedX="0.0";
@@ -640,8 +640,8 @@ class ATragMX_Display {
style=0;
w="0.17";
h="0.28";
- x="0.550*safezoneW+safezoneX+0.225";
- y="0.265*safezoneH+safezoneY+0.355";
+ x="0.550*safeZoneW+safeZoneX+0.225";
+ y="0.265*safeZoneH+safeZoneY+0.355";
sizeEx="0.025";
onMouseButtonClick=QUOTE(true call FUNC(toggle_option_menu));
};
@@ -653,8 +653,8 @@ class ATragMX_Display {
class TEXT_RANGE_CARD_SETUP: ATragMX_RscButton {
idc=5001;
w="0.055675";
- x="0.550*safezoneW+safezoneX+0.28";
- y="0.265*safezoneH+safezoneY+0.20";
+ x="0.550*safeZoneW+safeZoneX+0.28";
+ y="0.265*safeZoneH+safeZoneY+0.20";
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
text="Setup";
@@ -662,7 +662,7 @@ class ATragMX_Display {
};
class TEXT_RANGE_CARD_DONE: TEXT_RANGE_CARD_SETUP {
idc=5002;
- x="0.550*safezoneW+safezoneX+0.3362";
+ x="0.550*safeZoneW+safeZoneX+0.3362";
text="Done";
action=QUOTE(call FUNC(toggle_range_card));
};
@@ -670,24 +670,24 @@ class ATragMX_Display {
idc=5003;
style=ST_LEFT;
w="0.07";
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.24";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.24";
colorBackground[]={0.15,0.21,0.23,0.3};
text="Meters";
};
class TEXT_RANGE_CARD_COLUMN_2_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION {
idc=5004;
- x="0.550*safezoneW+safezoneX+0.180625";
+ x="0.550*safeZoneW+safeZoneX+0.180625";
text="Elev";
};
class TEXT_RANGE_CARD_COLUMN_3_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION {
idc=5005;
- x="0.550*safezoneW+safezoneX+0.25125";
+ x="0.550*safeZoneW+safeZoneX+0.25125";
text="Wind";
};
class TEXT_RANGE_CARD_COLUMN_4_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION {
idc=5006;
- x="0.550*safezoneW+safezoneX+0.321875";
+ x="0.550*safeZoneW+safeZoneX+0.321875";
text="TmFlt";
action=QUOTE(call FUNC(cycle_range_card_columns));
};
@@ -698,8 +698,8 @@ class ATragMX_Display {
idcRight=50062;
w="0.285";
h="0.42";
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.27";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.27";
};
class TEXT_GUN_LIST_OUTPUT: ATragMX_RscListNBox {
@@ -707,8 +707,8 @@ class ATragMX_Display {
columns[]={-0.05};
w="0.16";
h="0.45";
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.24";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.24";
sizeEx="0.018";
colorSelectBackground[]={0.15,0.21,0.23,0.3};
colorSelectBackground2[]={0.15,0.21,0.23,0.3};
@@ -724,8 +724,8 @@ class ATragMX_Display {
idc=6002;
style=ST_RIGHT;
w="0.115";
- x="0.550*safezoneW+safezoneX+0.28";
- y="0.265*safezoneH+safezoneY+0.20";
+ x="0.550*safeZoneW+safeZoneX+0.28";
+ y="0.265*safeZoneH+safeZoneY+0.20";
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
sizeEx="0.024";
@@ -734,30 +734,30 @@ class ATragMX_Display {
};
class TEXT_GUN_LIST_SAVE_GUN: TEXT_GUN_LIST_OPEN_GUN {
idc=6003;
- y="0.265*safezoneH+safezoneY+0.24";
+ y="0.265*safeZoneH+safeZoneY+0.24";
text="Save Gun";
action=QUOTE(call FUNC(save_gun));
};
class TEXT_GUN_LIST_ADD_NEW_GUN: TEXT_GUN_LIST_OPEN_GUN {
idc=6004;
- y="0.265*safezoneH+safezoneY+0.28";
+ y="0.265*safeZoneH+safeZoneY+0.28";
text="Add New Gun";
action=QUOTE(false call FUNC(show_gun_list); true call FUNC(show_add_new_gun));
};
class TEXT_GUN_LIST_DELETE_GUN: TEXT_GUN_LIST_OPEN_GUN {
idc=6005;
- y="0.265*safezoneH+safezoneY+0.34";
+ y="0.265*safeZoneH+safeZoneY+0.34";
text="Delete Gun";
action=QUOTE(call FUNC(delete_gun));
};
class TEXT_GUN_LIST_NOTE: TEXT_GUN_LIST_OPEN_GUN {
idc=6006;
- y="0.265*safezoneH+safezoneY+0.40";
+ y="0.265*safeZoneH+safeZoneY+0.40";
text="Note";
};
class TEXT_GUN_LIST_DONE: TEXT_GUN_LIST_OPEN_GUN {
idc=6007;
- y="0.265*safezoneH+safezoneY+0.65";
+ y="0.265*safeZoneH+safeZoneY+0.65";
text="Done";
action=QUOTE(false call FUNC(toggle_gun_list));
};
@@ -766,8 +766,8 @@ class ATragMX_Display {
idc=7000;
style="16+0x200";
lineSpacing=1.0;
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.24";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.24";
w="0.29";
h="0.10";
sizeEx="0.022";
@@ -776,8 +776,8 @@ class ATragMX_Display {
class TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD: TEXT_TARGET_RANGE_ASSIST_CAPTION {
idc=7001;
style=ST_LEFT;
- x="0.550*safezoneW+safezoneX+0.115";
- y="0.265*safezoneH+safezoneY+0.35";
+ x="0.550*safeZoneW+safeZoneX+0.115";
+ y="0.265*safeZoneH+safeZoneY+0.35";
w="0.12";
h="0.03";
sizeEx="0.027";
@@ -786,8 +786,8 @@ class ATragMX_Display {
class TEXT_TARGET_RANGE_ASSIST_WIDTH_HEIGHT: ATragMX_RscToolbox {
idc=7002;
w="0.14";
- x="0.550*safezoneW+safezoneX+0.24";
- y="0.265*safezoneH+safezoneY+0.35";
+ x="0.550*safeZoneW+safeZoneX+0.24";
+ y="0.265*safeZoneH+safeZoneY+0.35";
strings[]={"Height","Width"};
values[]={1,0};
onToolBoxSelChanged=QUOTE(GVAR(rangeAssistUseTargetHeight) = ((_this select 1) == 0));
@@ -795,73 +795,73 @@ class ATragMX_Display {
class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE: TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD {
idc=7003;
style=ST_RIGHT;
- x="0.550*safezoneW+safezoneX+0.092";
- y="0.265*safezoneH+safezoneY+0.4";
+ x="0.550*safeZoneW+safeZoneX+0.092";
+ y="0.265*safeZoneH+safeZoneY+0.4";
w="0.128";
text="Target Size";
};
class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE {
idc=7004;
- y="0.265*safezoneH+safezoneY+0.45";
+ y="0.265*safeZoneH+safeZoneY+0.45";
text="Image Size";
};
class TEXT_TARGET_RANGE_ASSIST_ANGLE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE {
idc=7005;
- y="0.265*safezoneH+safezoneY+0.5";
+ y="0.265*safeZoneH+safeZoneY+0.5";
text="Angle";
};
class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE {
idc=7006;
- y="0.265*safezoneH+safezoneY+0.55";
+ y="0.265*safeZoneH+safeZoneY+0.55";
text="Est Range";
};
class TEXT_TARGET_RANGE_ASSIST_CALC_1: TEXT_MUZZLE_VELOCITY {
idc=7007;
w="0.0231";
- x="0.550*safezoneW+safezoneX+0.22";
- y="0.265*safezoneH+safezoneY+0.4";
+ x="0.550*safeZoneW+safeZoneX+0.22";
+ y="0.265*safeZoneH+safeZoneY+0.4";
sizeEx="0.03";
text="!";
action=QUOTE(0 call FUNC(calculate_target_range_assist));
};
class TEXT_TARGET_RANGE_ASSIST_CALC_2: TEXT_TARGET_RANGE_ASSIST_CALC_1 {
idc=7008;
- y="0.265*safezoneH+safezoneY+0.45";
+ y="0.265*safeZoneH+safeZoneY+0.45";
action=QUOTE(1 call FUNC(calculate_target_range_assist));
};
class TEXT_TARGET_RANGE_ASSIST_CALC_3: TEXT_TARGET_RANGE_ASSIST_CALC_1 {
idc=7009;
- y="0.265*safezoneH+safezoneY+0.55";
+ y="0.265*safeZoneH+safeZoneY+0.55";
action=QUOTE(2 call FUNC(calculate_target_range_assist));
};
class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT: ATragMX_RscEdit {
idc=7010;
w="0.065";
- x="0.550*safezoneW+safezoneX+0.2475";
- y="0.265*safezoneH+safezoneY+0.4";
+ x="0.550*safeZoneW+safeZoneX+0.2475";
+ y="0.265*safeZoneH+safeZoneY+0.4";
};
class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT {
idc=7011;
- y="0.265*safezoneH+safezoneY+0.45";
+ y="0.265*safeZoneH+safeZoneY+0.45";
};
class TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT {
idc=7012;
- y="0.265*safezoneH+safezoneY+0.5";
+ y="0.265*safeZoneH+safeZoneY+0.5";
};
class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT {
idc=7013;
- y="0.265*safezoneH+safezoneY+0.55";
+ y="0.265*safeZoneH+safeZoneY+0.55";
};
class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_CALC_1 {
idc=7014;
w="0.07";
- x="0.550*safezoneW+safezoneX+0.32";
+ x="0.550*safeZoneW+safeZoneX+0.32";
text="cm";
action=QUOTE(call FUNC(cycle_target_size_units));
};
class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT {
idc=7015;
- y="0.265*safezoneH+safezoneY+0.45";
+ y="0.265*safeZoneH+safeZoneY+0.45";
text="MIL";
action=QUOTE(call FUNC(cycle_image_size_units));
};
@@ -869,15 +869,15 @@ class ATragMX_Display {
idc=7016;
style=ST_LEFT;
w="0.07";
- x="0.550*safezoneW+safezoneX+0.32";
+ x="0.550*safeZoneW+safeZoneX+0.32";
text="Meters";
};
class TEXT_TARGET_RANGE_ASSIST_DONE: ATragMX_RscButton {
idc=7017;
style=ST_CENTER;
w="0.07";
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.60";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.60";
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
text="Done";
@@ -885,41 +885,41 @@ class ATragMX_Display {
};
class TEXT_TARGET_RANGE_ASSIST_CANCEL: TEXT_TARGET_RANGE_ASSIST_DONE {
idc=7018;
- x="0.550*safezoneW+safezoneX+0.180625";
+ x="0.550*safeZoneW+safeZoneX+0.180625";
text="Cancel";
action=QUOTE(0 call FUNC(toggle_target_range_assist));
};
class TEXT_TARGET_RANGE_ASSIST_PREV: TEXT_TARGET_RANGE_ASSIST_DONE {
idc=7019;
- x="0.550*safezoneW+safezoneX+0.25125";
+ x="0.550*safeZoneW+safeZoneX+0.25125";
text="Prev";
action="";
};
class TEXT_TARGET_RANGE_ASSIST_NEXT: TEXT_TARGET_RANGE_ASSIST_DONE {
idc=7020;
- x="0.550*safezoneW+safezoneX+0.321875";
+ x="0.550*safeZoneW+safeZoneX+0.321875";
text="Next";
action="";
};
class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE {
idc=8000;
- x="0.550*safezoneW+safezoneX+0.12";
+ x="0.550*safeZoneW+safeZoneX+0.12";
text="Target Range";
};
class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE {
idc=8001;
- x="0.550*safezoneW+safezoneX+0.12";
+ x="0.550*safeZoneW+safeZoneX+0.12";
text="Num Ticks";
};
class TEXT_TARGET_SPEED_ASSIST_TIME: TEXT_TARGET_RANGE_ASSIST_ANGLE {
idc=8002;
- x="0.550*safezoneW+safezoneX+0.12";
+ x="0.550*safeZoneW+safeZoneX+0.12";
text="Time (secs)";
};
class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE {
idc=8003;
- x="0.550*safezoneW+safezoneX+0.12";
+ x="0.550*safeZoneW+safeZoneX+0.12";
text="Est Speed";
};
class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT {
@@ -937,14 +937,14 @@ class ATragMX_Display {
class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_OUTPUT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE {
idc=8007;
w="0.065";
- x="0.550*safezoneW+safezoneX+0.2475";
- y="0.265*safezoneH+safezoneY+0.55";
+ x="0.550*safeZoneW+safeZoneX+0.2475";
+ y="0.265*safeZoneH+safeZoneY+0.55";
colorBackground[]={0.15,0.21,0.23,0.3};
text="0";
};
class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT {
idc=8008;
- y="0.265*safezoneH+safezoneY+0.4";
+ y="0.265*safeZoneH+safeZoneY+0.4";
text="Meters";
};
class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS_UNIT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT {
@@ -954,7 +954,7 @@ class ATragMX_Display {
};
class TEXT_TARGET_SPEED_ASSIST_TIMER_START: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT {
idc=8010;
- y="0.265*safezoneH+safezoneY+0.5";
+ y="0.265*safeZoneH+safeZoneY+0.5";
text="Start";
action=QUOTE(call FUNC(target_speed_assist_timer));
};
@@ -981,16 +981,16 @@ class ATragMX_Display {
idc=9000;
w="0.285";
h="0.49";
- x="0.550*safezoneW+safezoneX+0.11";
- y="0.265*safezoneH+safezoneY+0.2";
+ x="0.550*safeZoneW+safeZoneX+0.11";
+ y="0.265*safeZoneH+safeZoneY+0.2";
colorBackground[]={0,0,0,0};
colorBackgroundActive[]={0,0,0,0};
action=QUOTE(GVAR(speedAssistTimer)=false);
};
class TEXT_TARGET_SPEED_ASSIST_TIME_OUTPUT: ATragMX_RscText {
idc=9001;
- x="0.550*safezoneW+safezoneX+0.22";
- y="0.265*safezoneH+safezoneY+0.51";
+ x="0.550*safeZoneW+safeZoneX+0.22";
+ y="0.265*safeZoneH+safeZoneY+0.51";
w="0.08";
h="0.09";
style=ST_CENTER;
@@ -1002,8 +1002,8 @@ class ATragMX_Display {
style=ST_CENTER;
w="0.07";
h="0.04";
- x="0.550*safezoneW+safezoneX+0.225";
- y="0.265*safezoneH+safezoneY+0.60";
+ x="0.550*safeZoneW+safeZoneX+0.225";
+ y="0.265*safeZoneH+safeZoneY+0.60";
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
text="Stop";
@@ -1012,17 +1012,17 @@ class ATragMX_Display {
class TEXT_RANGE_CARD_SETUP_START_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE {
idc=10000;
- x="0.550*safezoneW+safezoneX+0.12";
+ x="0.550*safeZoneW+safeZoneX+0.12";
text="Start Range";
};
class TEXT_RANGE_CARD_SETUP_END_RANGE: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE {
idc=10001;
- x="0.550*safezoneW+safezoneX+0.12";
+ x="0.550*safeZoneW+safeZoneX+0.12";
text="End Range";
};
class TEXT_RANGE_CARD_SETUP_INCREMENT: TEXT_TARGET_RANGE_ASSIST_ANGLE {
idc=10002;
- x="0.550*safezoneW+safezoneX+0.12";
+ x="0.550*safeZoneW+safeZoneX+0.12";
text="Increment";
};
class TEXT_RANGE_CARD_SETUP_START_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT {
@@ -1057,8 +1057,8 @@ class ATragMX_Display {
style=ST_LEFT;
w="0.25";
h="0.04";
- x="0.550*safezoneW+safezoneX+0.12";
- y="0.265*safezoneH+safezoneY+0.24";
+ x="0.550*safeZoneW+safeZoneX+0.12";
+ y="0.265*safeZoneH+safeZoneY+0.24";
sizeEx="0.025";
text="New Gun Name";
};
@@ -1067,8 +1067,8 @@ class ATragMX_Display {
style=ST_LEFT;
w="0.225";
h="0.04";
- x="0.550*safezoneW+safezoneX+0.12";
- y="0.265*safezoneH+safezoneY+0.28";
+ x="0.550*safeZoneW+safeZoneX+0.12";
+ y="0.265*safeZoneH+safeZoneY+0.28";
text="";
onKeyDown=QUOTE(call FUNC(trim_gun_name));
onKeyUp=QUOTE(call FUNC(trim_gun_name));
@@ -1078,8 +1078,8 @@ class ATragMX_Display {
style=ST_CENTER;
w="0.1";
h="0.04";
- x="0.550*safezoneW+safezoneX+0.12";
- y="0.265*safezoneH+safezoneY+0.33";
+ x="0.550*safeZoneW+safeZoneX+0.12";
+ y="0.265*safeZoneH+safeZoneY+0.33";
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
text="OK";
@@ -1087,7 +1087,7 @@ class ATragMX_Display {
};
class TEXT_ADD_NEW_GUN_CANCEL: TEXT_ADD_NEW_GUN_OK {
idc=11003;
- x="0.550*safezoneW+safezoneX+0.245";
+ x="0.550*safeZoneW+safeZoneX+0.245";
text="Cancel";
action=QUOTE(false call FUNC(show_add_new_gun); true call FUNC(show_gun_list));
};
@@ -1095,74 +1095,74 @@ class ATragMX_Display {
class TEXT_GUN_AMMO_DATA_BORE_HEIGHT: TEXT_BORE_HEIGHT {
idc=12000;
w="0.22";
- y="0.265*safezoneH+safezoneY+0.28";
+ y="0.265*safeZoneH+safeZoneY+0.28";
text="Bore (cm)";
};
class TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT: ATragMX_RscEdit {
idc=120000;
w="0.06";
- x="0.550*safezoneW+safezoneX+0.335";
- y="0.265*safezoneH+safezoneY+0.28";
+ x="0.550*safeZoneW+safeZoneX+0.335";
+ y="0.265*safeZoneH+safeZoneY+0.28";
};
class TEXT_GUN_AMMO_DATA_BULLET_MASS: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
idc=12001;
- y="0.265*safezoneH+safezoneY+0.320";
+ y="0.265*safeZoneH+safeZoneY+0.320";
text="Bullet Weight (grams)";
};
class TEXT_GUN_AMMO_DATA_BULLET_MASS_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT {
idc=120010;
- y="0.265*safezoneH+safezoneY+0.320";
+ y="0.265*safeZoneH+safeZoneY+0.320";
};
class TEXT_GUN_AMMO_DATA_BULLET_DIAMETER: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
idc=12002;
- y="0.265*safezoneH+safezoneY+0.360";
+ y="0.265*safeZoneH+safeZoneY+0.360";
text="Bullet Diam (cm)";
};
class TEXT_GUN_AMMO_DATA_BULLET_DIAMETER_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT {
idc=120020;
- y="0.265*safezoneH+safezoneY+0.360";
+ y="0.265*safeZoneH+safeZoneY+0.360";
};
class TEXT_GUN_AMMO_DATA_AIR_FRICTION: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
idc=12003;
- y="0.265*safezoneH+safezoneY+0.400";
+ y="0.265*safeZoneH+safeZoneY+0.400";
text="C1 Coefficient";
};
class TEXT_GUN_AMMO_DATA_AIR_FRICTION_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT {
idc=120030;
- y="0.265*safezoneH+safezoneY+0.400";
+ y="0.265*safeZoneH+safeZoneY+0.400";
};
class TEXT_GUN_AMMO_DATA_RIFLE_TWIST: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
idc=12004;
- y="0.265*safezoneH+safezoneY+0.440";
+ y="0.265*safeZoneH+safeZoneY+0.440";
text="Rifle Twist (cm/trn)";
};
class TEXT_GUN_AMMO_DATA_RIFLE_TWIST_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT {
idc=120040;
- y="0.265*safezoneH+safezoneY+0.440";
+ y="0.265*safeZoneH+safeZoneY+0.440";
};
class TEXT_GUN_AMMO_DATA_MUZZLE_VELOCITY: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
idc=12005;
- y="0.265*safezoneH+safezoneY+0.480";
+ y="0.265*safeZoneH+safeZoneY+0.480";
text="Muzzle Velocity (m/s)";
};
class TEXT_GUN_AMMO_DATA_MUZZLE_VELOCITY_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT {
idc=120050;
- y="0.265*safezoneH+safezoneY+0.480";
+ y="0.265*safeZoneH+safeZoneY+0.480";
};
class TEXT_GUN_AMMO_DATA_ZERO_RANGE: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
idc=12006;
- y="0.265*safezoneH+safezoneY+0.520";
+ y="0.265*safeZoneH+safeZoneY+0.520";
text="Zero Range (meters)";
};
class TEXT_GUN_AMMO_DATA_ZERO_RANGE_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT {
idc=120060;
- y="0.265*safezoneH+safezoneY+0.520";
+ y="0.265*safeZoneH+safeZoneY+0.520";
};
class TEXT_GUN_AMMO_DATA_ZERO_RANGE_METER_INDICATOR: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
idc=120061;
w="0.05";
- x="0.550*safezoneW+safezoneX+0.315";
- y="0.265*safezoneH+safezoneY+0.520";
+ x="0.550*safeZoneW+safeZoneX+0.315";
+ y="0.265*safeZoneH+safeZoneY+0.520";
text="";
};
class TEXT_GUN_AMMO_DATA_DONE: TEXT_TARGET_SPEED_ASSIST_DONE {
@@ -1183,62 +1183,62 @@ class ATragMX_Display {
class TEXT_ATMO_ENV_DATA_DEFAULT: TEXT_LEAD {
idc=13000;
w="0.08";
- x="0.550*safezoneW+safezoneX+0.15";
- y="0.265*safezoneH+safezoneY+0.320";
+ x="0.550*safeZoneW+safeZoneX+0.15";
+ y="0.265*safeZoneH+safeZoneY+0.320";
text="Default";
action=QUOTE(call FUNC(restore_atmo_default));
};
class TEXT_ATMO_ENV_DATA_AT: TEXT_TARGET_A {
idc=13001;
w="0.04";
- x="0.550*safezoneW+safezoneX+0.24";
- y="0.265*safezoneH+safezoneY+0.320";
+ x="0.550*safeZoneW+safeZoneX+0.24";
+ y="0.265*safeZoneH+safeZoneY+0.320";
text="AT";
action=QUOTE(GVAR(atmosphereModeTBH) = false; call FUNC(update_atmo_selection));
};
class TEXT_ATMO_ENV_DATA_TBH: TEXT_ATMO_ENV_DATA_AT {
idc=13002;
- x="0.550*safezoneW+safezoneX+0.28";
+ x="0.550*safeZoneW+safeZoneX+0.28";
text="TBH";
action=QUOTE(GVAR(atmosphereModeTBH) = true; call FUNC(update_atmo_selection));
};
class TEXT_ATMO_ENV_DATA_ALTITUDE: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
idc=13003;
- x="0.550*safezoneW+safezoneX+0.115";
- y="0.265*safezoneH+safezoneY+0.400";
+ x="0.550*safeZoneW+safeZoneX+0.115";
+ y="0.265*safeZoneH+safeZoneY+0.400";
text="Altitude (ft)";
};
class TEXT_ATMO_ENV_DATA_ALTITUDE_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT {
idc=130030;
- x="0.550*safezoneW+safezoneX+0.330";
- y="0.265*safezoneH+safezoneY+0.400";
+ x="0.550*safeZoneW+safeZoneX+0.330";
+ y="0.265*safeZoneH+safeZoneY+0.400";
};
class TEXT_ATMO_ENV_DATA_TEMPERATURE: TEXT_ATMO_ENV_DATA_ALTITUDE {
idc=13004;
- y="0.265*safezoneH+safezoneY+0.440";
+ y="0.265*safeZoneH+safeZoneY+0.440";
text="temperature (F)";
};
class TEXT_ATMO_ENV_DATA_TEMPERATURE_INPUT: TEXT_ATMO_ENV_DATA_ALTITUDE_INPUT {
idc=130040;
- y="0.265*safezoneH+safezoneY+0.440";
+ y="0.265*safeZoneH+safeZoneY+0.440";
};
class TEXT_ATMO_ENV_DATA_BAROMETRIC_PRESSURE: TEXT_ATMO_ENV_DATA_ALTITUDE {
idc=13005;
- y="0.265*safezoneH+safezoneY+0.480";
+ y="0.265*safeZoneH+safeZoneY+0.480";
text="Barom Pres (in.merc.)";
};
class TEXT_ATMO_ENV_DATA_BAROMETRIC_PRESSURE_INPUT: TEXT_ATMO_ENV_DATA_ALTITUDE_INPUT {
idc=130050;
- y="0.265*safezoneH+safezoneY+0.480";
+ y="0.265*safeZoneH+safeZoneY+0.480";
};
class TEXT_ATMO_ENV_DATA_RELATIVE_HUMIDITY: TEXT_ATMO_ENV_DATA_ALTITUDE {
idc=13006;
- y="0.265*safezoneH+safezoneY+0.520";
+ y="0.265*safeZoneH+safeZoneY+0.520";
text="Relative Humidity (%)";
};
class TEXT_ATMO_ENV_DATA_RELATIVE_HUMIDITY_INPUT: TEXT_ATMO_ENV_DATA_ALTITUDE_INPUT {
idc=130060;
- y="0.265*safezoneH+safezoneY+0.520";
+ y="0.265*safeZoneH+safeZoneY+0.520";
};
class TEXT_ATMO_ENV_DATA_DONE: TEXT_TARGET_SPEED_ASSIST_DONE {
idc=13007;
@@ -1259,36 +1259,36 @@ class ATragMX_Display {
style=64;
w="0.14";
h="0.07";
- x="0.550*safezoneW+safezoneX+0.235";
- y="0.265*safezoneH+safezoneY+0.29";
+ x="0.550*safeZoneW+safeZoneX+0.235";
+ y="0.265*safeZoneH+safeZoneY+0.29";
text="Calc Method";
};
class TEXT_TARGET_DATA_LATITUDE: TEXT_BORE_HEIGHT {
idc=14000;
w="0.22";
- y="0.265*safezoneH+safezoneY+0.28";
+ y="0.265*safeZoneH+safeZoneY+0.28";
text="Latitude";
};
class TEXT_TARGET_DATA_LATITUDE_INPUT: ATragMX_RscEdit {
idc=140000;
w="0.06";
- x="0.550*safezoneW+safezoneX+0.335";
- y="0.265*safezoneH+safezoneY+0.28";
+ x="0.550*safeZoneW+safeZoneX+0.335";
+ y="0.265*safeZoneH+safeZoneY+0.28";
};
class TEXT_TARGET_DATA_DIR_OF_FIRE: TEXT_TARGET_DATA_LATITUDE {
idc=14001;
- y="0.265*safezoneH+safezoneY+0.320";
+ y="0.265*safeZoneH+safeZoneY+0.320";
text="Dir of Fire (deg from N)";
};
class TEXT_TARGET_DATA_DIR_OF_FIRE_INPUT: TEXT_TARGET_DATA_LATITUDE_INPUT {
idc=140010;
- y="0.265*safezoneH+safezoneY+0.320";
+ y="0.265*safeZoneH+safeZoneY+0.320";
};
class TEXT_TARGET_DATA_WIND_SPEED: TEXT_TARGET_DATA_LATITUDE {
idc=14002;
w="1.2";
- y="0.265*safezoneH+safezoneY+0.360";
+ y="0.265*safeZoneH+safeZoneY+0.360";
text="Wind Speed (m/s)";
};
class TEXT_TARGET_DATA_WIND_SPEED_1: TEXT_TARGET_DATA_LATITUDE {
@@ -1297,40 +1297,40 @@ class ATragMX_Display {
w="0.05";
h="0.03";
sizeEx="0.025";
- x="0.550*safezoneW+safezoneX+0.270";
- y="0.265*safezoneH+safezoneY+0.357";
+ x="0.550*safeZoneW+safeZoneX+0.270";
+ y="0.265*safeZoneH+safeZoneY+0.357";
text="1";
};
class TEXT_TARGET_DATA_WIND_SPEED_INPUT_1: TEXT_TARGET_DATA_LATITUDE_INPUT {
idc=140020;
w="0.045";
- x="0.550*safezoneW+safezoneX+0.290";
- y="0.265*safezoneH+safezoneY+0.360";
+ x="0.550*safeZoneW+safeZoneX+0.290";
+ y="0.265*safeZoneH+safeZoneY+0.360";
};
class TEXT_TARGET_DATA_WIND_SPEED_2: TEXT_TARGET_DATA_WIND_SPEED_1 {
idc=141021;
- x="0.550*safezoneW+safezoneX+0.330";
+ x="0.550*safeZoneW+safeZoneX+0.330";
text="2";
};
class TEXT_TARGET_DATA_WIND_SPEED_INPUT_2: TEXT_TARGET_DATA_LATITUDE_INPUT {
idc=140021;
w="0.045";
- x="0.550*safezoneW+safezoneX+0.350";
- y="0.265*safezoneH+safezoneY+0.360";
+ x="0.550*safeZoneW+safeZoneX+0.350";
+ y="0.265*safeZoneH+safeZoneY+0.360";
};
class TEXT_TARGET_DATA_WIND_DIRECTION: TEXT_TARGET_DATA_LATITUDE {
idc=14003;
- y="0.265*safezoneH+safezoneY+0.400";
+ y="0.265*safeZoneH+safeZoneY+0.400";
text="Wind Direction (clock)";
};
class TEXT_TARGET_DATA_WIND_DIRECTION_INPUT: TEXT_TARGET_DATA_LATITUDE_INPUT {
idc=140030;
- y="0.265*safezoneH+safezoneY+0.400";
+ y="0.265*safeZoneH+safeZoneY+0.400";
};
class TEXT_TARGET_DATA_INCLINATION_ANGLE: TEXT_TARGET_DATA_LATITUDE {
idc=14004;
w="1.2";
- y="0.265*safezoneH+safezoneY+0.440";
+ y="0.265*safeZoneH+safeZoneY+0.440";
text="Inclination Angle";
};
class TEXT_TARGET_DATA_INCLINATION_ANGLE_COSINE: TEXT_TARGET_DATA_LATITUDE {
@@ -1339,62 +1339,62 @@ class ATragMX_Display {
w="0.05";
h="0.03";
sizeEx="0.025";
- x="0.550*safezoneW+safezoneX+0.270";
- y="0.265*safezoneH+safezoneY+0.437";
+ x="0.550*safeZoneW+safeZoneX+0.270";
+ y="0.265*safeZoneH+safeZoneY+0.437";
text="c";
};
class TEXT_TARGET_DATA_INCLINATION_ANGLE_INPUT_COSINE: TEXT_TARGET_DATA_LATITUDE_INPUT {
idc=140041;
w="0.045";
- x="0.550*safezoneW+safezoneX+0.290";
- y="0.265*safezoneH+safezoneY+0.440";
+ x="0.550*safeZoneW+safeZoneX+0.290";
+ y="0.265*safeZoneH+safeZoneY+0.440";
onKeyUp=QUOTE(if (_this select 1 == 28) then {0 call FUNC(update_inclination_angle)});
};
class TEXT_TARGET_DATA_INCLINATION_ANGLE_DEGREE: TEXT_TARGET_DATA_INCLINATION_ANGLE_COSINE {
idc=141040;
- x="0.550*safezoneW+safezoneX+0.330";
+ x="0.550*safeZoneW+safeZoneX+0.330";
text="d";
};
class TEXT_TARGET_DATA_INCLINATION_ANGLE_INPUT_DEGREE: TEXT_TARGET_DATA_LATITUDE_INPUT {
idc=140040;
w="0.045";
- x="0.550*safezoneW+safezoneX+0.350";
- y="0.265*safezoneH+safezoneY+0.440";
+ x="0.550*safeZoneW+safeZoneX+0.350";
+ y="0.265*safeZoneH+safeZoneY+0.440";
onKeyUp=QUOTE(if (_this select 1 == 28) then {1 call FUNC(update_inclination_angle)});
};
class TEXT_TARGET_DATA_TARGET_SPEED: TEXT_TARGET_DATA_LATITUDE {
idc=14005;
- y="0.265*safezoneH+safezoneY+0.480";
+ y="0.265*safeZoneH+safeZoneY+0.480";
text="Target Speed (m/s)";
};
class TEXT_TARGET_DATA_TARGET_SPEED_INPUT: TEXT_TARGET_DATA_LATITUDE_INPUT {
idc=140050;
- y="0.265*safezoneH+safezoneY+0.480";
+ y="0.265*safeZoneH+safeZoneY+0.480";
};
class TEXT_TARGET_DATA_TARGET_SPEED_DIRECTION: ATragMX_RscButton {
idc=140051;
colorBackground[]={0.15,0.21,0.23,0.3};
colorFocused[]={0.15,0.21,0.23,0.2};
w="0.0231";
- x="0.550*safezoneW+safezoneX+0.305";
- y="0.265*safezoneH+safezoneY+0.480";
+ x="0.550*safeZoneW+safeZoneX+0.305";
+ y="0.265*safeZoneH+safeZoneY+0.480";
text=">";
action=QUOTE(call FUNC(cycle_target_speed_direction));
};
class TEXT_TARGET_DATA_TARGET_RANGE: TEXT_TARGET_DATA_LATITUDE {
idc=14006;
- y="0.265*safezoneH+safezoneY+0.520";
+ y="0.265*safeZoneH+safeZoneY+0.520";
text="Target Range (meters)";
};
class TEXT_TARGET_DATA_TARGET_RANGE_INPUT: TEXT_TARGET_DATA_LATITUDE_INPUT {
idc=140060;
- y="0.265*safezoneH+safezoneY+0.520";
+ y="0.265*safeZoneH+safeZoneY+0.520";
};
class TEXT_TARGET_DATA_TARGET_RANGE_METER_INDICATOR: TEXT_TARGET_DATA_LATITUDE {
idc=140061;
w="0.05";
- x="0.550*safezoneW+safezoneX+0.315";
- y="0.265*safezoneH+safezoneY+0.520";
+ x="0.550*safeZoneW+safeZoneX+0.315";
+ y="0.265*safeZoneH+safeZoneY+0.520";
text="";
};
class TEXT_TARGET_DATA_DONE: TEXT_TARGET_SPEED_ASSIST_DONE {
@@ -1417,45 +1417,45 @@ class ATragMX_Display {
style=64;
w="0.25";
h="0.07";
- x="0.550*safezoneW+safezoneX+0.13";
- y="0.265*safezoneH+safezoneY+0.32";
+ x="0.550*safeZoneW+safeZoneX+0.13";
+ y="0.265*safeZoneH+safeZoneY+0.32";
text="Show result in";
};
class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1: TEXT_TARGET_A {
idc=15001;
w="0.04";
- x="0.550*safezoneW+safezoneX+0.14";
- y="0.265*safezoneH+safezoneY+0.35";
+ x="0.550*safeZoneW+safeZoneX+0.14";
+ y="0.265*safeZoneH+safeZoneY+0.35";
text="1";
action=QUOTE(GVAR(currentScopeClickNumberTemp) = 1; call FUNC(update_solution_setup));
};
class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_2: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 {
idc=15002;
- x="0.550*safezoneW+safezoneX+0.18";
+ x="0.550*safeZoneW+safeZoneX+0.18";
text="2";
action=QUOTE(GVAR(currentScopeClickNumberTemp) = 2; call FUNC(update_solution_setup));
};
class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_3: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 {
idc=15003;
- x="0.550*safezoneW+safezoneX+0.22";
+ x="0.550*safeZoneW+safeZoneX+0.22";
text="3";
action=QUOTE(GVAR(currentScopeClickNumberTemp) = 3; call FUNC(update_solution_setup));
};
class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_4: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 {
idc=15004;
- x="0.550*safezoneW+safezoneX+0.26";
+ x="0.550*safeZoneW+safeZoneX+0.26";
text="4";
action=QUOTE(GVAR(currentScopeClickNumberTemp) = 4; call FUNC(update_solution_setup));
};
class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_8: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 {
idc=15005;
- x="0.550*safezoneW+safezoneX+0.30";
+ x="0.550*safeZoneW+safeZoneX+0.30";
text="8";
action=QUOTE(GVAR(currentScopeClickNumberTemp) = 8; call FUNC(update_solution_setup));
};
class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_10: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 {
idc=15006;
- x="0.550*safezoneW+safezoneX+0.34";
+ x="0.550*safeZoneW+safeZoneX+0.34";
text="10";
action=QUOTE(GVAR(currentScopeClickNumberTemp) = 10; call FUNC(update_solution_setup));
};
@@ -1464,53 +1464,53 @@ class ATragMX_Display {
style=64;
w="0.25";
h="0.07";
- x="0.550*safezoneW+safezoneX+0.13";
- y="0.265*safezoneH+safezoneY+0.42";
+ x="0.550*safeZoneW+safeZoneX+0.13";
+ y="0.265*safeZoneH+safeZoneY+0.42";
text="Clicks per";
};
class TEXT_SOLUTION_SETUP_CLICKS_PER_TMOA: TEXT_TARGET_A {
idc=15008;
w="0.05";
- x="0.550*safezoneW+safezoneX+0.15";
- y="0.265*safezoneH+safezoneY+0.45";
+ x="0.550*safeZoneW+safeZoneX+0.15";
+ y="0.265*safeZoneH+safeZoneY+0.45";
text="TMOA";
action=QUOTE(GVAR(currentScopeClickUnitTemp) = 0; call FUNC(update_solution_setup));
};
class TEXT_SOLUTION_SETUP_CLICKS_PER_SMOA: TEXT_SOLUTION_SETUP_CLICKS_PER_TMOA {
idc=15009;
- x="0.550*safezoneW+safezoneX+0.23";
+ x="0.550*safeZoneW+safeZoneX+0.23";
text="SMOA";
action=QUOTE(GVAR(currentScopeClickUnitTemp) = 1; call FUNC(update_solution_setup));
};
class TEXT_SOLUTION_SETUP_CLICKS_PER_MILS: TEXT_SOLUTION_SETUP_CLICKS_PER_TMOA {
idc=15010;
- x="0.550*safezoneW+safezoneX+0.31";
+ x="0.550*safeZoneW+safeZoneX+0.31";
text="MILS";
action=QUOTE(GVAR(currentScopeClickUnitTemp) = 2; call FUNC(update_solution_setup));
};
class TEXT_SOLUTION_SETUP_DONE: TEXT_TARGET_SPEED_ASSIST_DONE {
idc=15011;
- x="0.550*safezoneW+safezoneX+0.18";
- y="0.265*safezoneH+safezoneY+0.55";
+ x="0.550*safeZoneW+safeZoneX+0.18";
+ y="0.265*safeZoneH+safeZoneY+0.55";
action=QUOTE(1 call FUNC(toggle_solution_setup));
};
class TEXT_SOLUTION_SETUP_CANCEL: TEXT_TARGET_SPEED_ASSIST_CANCEL {
idc=15012;
- x="0.550*safezoneW+safezoneX+0.26";
- y="0.265*safezoneH+safezoneY+0.55";
+ x="0.550*safeZoneW+safeZoneX+0.26";
+ y="0.265*safeZoneH+safeZoneY+0.55";
action=QUOTE(0 call FUNC(toggle_solution_setup));
};
class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE: TEXT_BORE_HEIGHT {
idc=16000;
w="0.22";
- y="0.265*safezoneH+safezoneY+0.25";
+ y="0.265*safeZoneH+safeZoneY+0.25";
sizeEx="0.022";
text="Temperature";
};
class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE {
idc=16001;
- x="0.550*safezoneW+safezoneX+0.215";
+ x="0.550*safeZoneW+safeZoneX+0.215";
sizeEx="0.022";
text="Muzzle velocity";
};
@@ -1518,73 +1518,73 @@ class ATragMX_Display {
idc=160021;
w="0.082";
h="0.035";
- x="0.550*safezoneW+safezoneX+0.128";
- y="0.265*safezoneH+safezoneY+0.29";
+ x="0.550*safeZoneW+safeZoneX+0.128";
+ y="0.265*safeZoneH+safeZoneY+0.29";
text="0";
};
class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_2: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
idc=160022;
- y="0.265*safezoneH+safezoneY+0.325";
+ y="0.265*safeZoneH+safeZoneY+0.325";
};
class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_3: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
idc=160023;
- y="0.265*safezoneH+safezoneY+0.360";
+ y="0.265*safeZoneH+safeZoneY+0.360";
};
class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_4: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
idc=160024;
- y="0.265*safezoneH+safezoneY+0.395";
+ y="0.265*safeZoneH+safeZoneY+0.395";
};
class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_5: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
idc=160025;
- y="0.265*safezoneH+safezoneY+0.430";
+ y="0.265*safeZoneH+safeZoneY+0.430";
};
class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_6: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
idc=160026;
- y="0.265*safezoneH+safezoneY+0.465";
+ y="0.265*safeZoneH+safeZoneY+0.465";
};
class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_7: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
idc=160027;
- y="0.265*safezoneH+safezoneY+0.500";
+ y="0.265*safeZoneH+safeZoneY+0.500";
};
class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_1: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
idc=160031;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_2: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_2 {
idc=160032;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_3: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_3 {
idc=160033;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_4: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_4 {
idc=160034;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_5: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_5 {
idc=160035;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_6: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_6 {
idc=160036;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_7: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_7 {
idc=160037;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_MUZZLE_VELOCITY_DATA_CLEAR: TEXT_TARGET_DATA_NEXT {
idc=16004;
style=ST_CENTER;
h="0.035";
- y="0.265*safezoneH+safezoneY+0.3625";
+ y="0.265*safeZoneH+safeZoneY+0.3625";
text="Clear";
action=QUOTE(call FUNC(clear_muzzle_velocity_data));
};
class TEXT_MUZZLE_VELOCITY_DATA_QUESTIONMARK: TEXT_MUZZLE_VELOCITY_DATA_CLEAR {
idc=16005;
- y="0.265*safezoneH+safezoneY+0.430";
+ y="0.265*safeZoneH+safeZoneY+0.430";
text="?";
action="";
};
@@ -1606,14 +1606,14 @@ class ATragMX_Display {
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE: TEXT_BORE_HEIGHT {
idc=17000;
w="0.22";
- x="0.550*safezoneW+safezoneX+0.15";
- y="0.265*safezoneH+safezoneY+0.25";
+ x="0.550*safeZoneW+safeZoneX+0.15";
+ y="0.265*safeZoneH+safeZoneY+0.25";
sizeEx="0.022";
text="Meters";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE {
idc=17001;
- x="0.550*safezoneW+safezoneX+0.235";
+ x="0.550*safeZoneW+safeZoneX+0.235";
sizeEx="0.022";
text="BC-Coef";
};
@@ -1621,75 +1621,75 @@ class ATragMX_Display {
idc=170021;
w="0.082";
h="0.035";
- x="0.550*safezoneW+safezoneX+0.128";
- y="0.265*safezoneH+safezoneY+0.29";
+ x="0.550*safeZoneW+safeZoneX+0.128";
+ y="0.265*safeZoneH+safeZoneY+0.29";
text="0";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_2: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
idc=170022;
- y="0.265*safezoneH+safezoneY+0.325";
+ y="0.265*safeZoneH+safeZoneY+0.325";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_3: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
idc=170023;
- y="0.265*safezoneH+safezoneY+0.360";
+ y="0.265*safeZoneH+safeZoneY+0.360";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_4: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
idc=170024;
- y="0.265*safezoneH+safezoneY+0.395";
+ y="0.265*safeZoneH+safeZoneY+0.395";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_5: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
idc=170025;
- y="0.265*safezoneH+safezoneY+0.430";
+ y="0.265*safeZoneH+safeZoneY+0.430";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_6: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
idc=170026;
- y="0.265*safezoneH+safezoneY+0.465";
+ y="0.265*safeZoneH+safeZoneY+0.465";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_7: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
idc=170027;
- y="0.265*safezoneH+safezoneY+0.500";
+ y="0.265*safeZoneH+safeZoneY+0.500";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_1: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
idc=170031;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_2: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_2 {
idc=170032;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_3: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_3 {
idc=170033;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_4: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_4 {
idc=170034;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_5: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_5 {
idc=170035;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_6: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_6 {
idc=170036;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_7: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_7 {
idc=170037;
- x="0.550*safezoneW+safezoneX+0.225";
+ x="0.550*safeZoneW+safeZoneX+0.225";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_QUESTIONMARK: TEXT_TARGET_DATA_NEXT {
idc=17004;
style=ST_CENTER;
w="0.04";
h="0.035";
- y="0.265*safezoneH+safezoneY+0.35";
+ y="0.265*safeZoneH+safeZoneY+0.35";
text="?";
action="";
};
class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_CLEAR: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_QUESTIONMARK {
idc=17005;
w="0.07";
- y="0.265*safezoneH+safezoneY+0.4175";
+ y="0.265*safeZoneH+safeZoneY+0.4175";
text="Clear";
action=QUOTE(call FUNC(clear_c1_ballistic_coefficient_data));
};
@@ -1711,8 +1711,8 @@ class ATragMX_Display {
class TEXT_TRUING_DROP_ZERO_RANGE: ATragMX_RscText {
idc=18000;
style=ST_LEFT;
- x="0.550*safezoneW+safezoneX+0.115";
- y="0.265*safezoneH+safezoneY+0.220";
+ x="0.550*safeZoneW+safeZoneX+0.115";
+ y="0.265*safeZoneH+safeZoneY+0.220";
w="0.135";
h="0.03";
sizeEx="0.025";
@@ -1721,29 +1721,29 @@ class ATragMX_Display {
class TEXT_TRUING_DROP_DROP_UNIT: TEXT_TRUING_DROP_ZERO_RANGE {
idc=18001;
style=ST_LEFT;
- x="0.550*safezoneW+safezoneX+0.25";
+ x="0.550*safeZoneW+safeZoneX+0.25";
text="Drop=mil";
};
class TEXT_TRUING_DROP_TARGET_RANGE: TEXT_TRUING_DROP_ZERO_RANGE {
idc=18002;
- y="0.265*safezoneH+safezoneY+0.35";
+ y="0.265*safeZoneH+safeZoneY+0.35";
sizeEx="0.027";
text="Target Range";
};
class TEXT_TRUING_DROP_DROP: TEXT_TRUING_DROP_TARGET_RANGE {
idc=18003;
w="0.07";
- y="0.265*safezoneH+safezoneY+0.40";
+ y="0.265*safeZoneH+safeZoneY+0.40";
text="Drop";
};
class TEXT_TRUING_DROP_MUZZLE_VELOCITY: TEXT_TRUING_DROP_DROP {
idc=18004;
- y="0.265*safezoneH+safezoneY+0.50";
+ y="0.265*safeZoneH+safeZoneY+0.50";
text="MV";
};
class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT: TEXT_TRUING_DROP_DROP {
idc=18005;
- y="0.265*safezoneH+safezoneY+0.55";
+ y="0.265*safeZoneH+safeZoneY+0.55";
text="C1";
};
class TEXT_TRUING_DROP_DROP_OUTPUT: ATragMX_RscEdit {
@@ -1752,31 +1752,31 @@ class ATragMX_Display {
colorBackground[]={0.15,0.21,0.23,0.3};
colorDisabled[]={0,0,0,1};
w="0.06";
- y="0.265*safezoneH+safezoneY+0.40";
- x="0.550*safezoneW+safezoneX+0.17";
+ y="0.265*safeZoneH+safeZoneY+0.40";
+ x="0.550*safeZoneW+safeZoneX+0.17";
text="";
};
class TEXT_TRUING_DROP_MUZZLE_VELOCITY_OUTPUT: TEXT_TRUING_DROP_DROP_OUTPUT {
idc=18007;
- y="0.265*safezoneH+safezoneY+0.50";
+ y="0.265*safeZoneH+safeZoneY+0.50";
text="";
};
class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT_OUTPUT: TEXT_TRUING_DROP_DROP_OUTPUT {
idc=18008;
- y="0.265*safezoneH+safezoneY+0.55";
+ y="0.265*safeZoneH+safeZoneY+0.55";
text="";
};
class TEXT_TRUING_DROP_SUPER: TEXT_TARGET_A {
idc=18009;
w="0.06";
- x="0.550*safezoneW+safezoneX+0.25";
- y="0.265*safezoneH+safezoneY+0.30";
+ x="0.550*safeZoneW+safeZoneX+0.25";
+ y="0.265*safeZoneH+safeZoneY+0.30";
text="SUPER";
action=QUOTE(GVAR(truingDropMode) = 0; call FUNC(update_truing_drop_selection));
};
class TEXT_TRUING_DROP_SUB: TEXT_TRUING_DROP_SUPER {
idc=18010;
- x="0.550*safezoneW+safezoneX+0.32";
+ x="0.550*safeZoneW+safeZoneX+0.32";
text="SUB";
action=QUOTE(GVAR(truingDropMode) = 1; call FUNC(update_truing_drop_selection));
};
@@ -1785,56 +1785,56 @@ class ATragMX_Display {
style=QUOTE(ST_WITH_RECT+ST_RIGHT);
colorDisabled[]={0,0,0,0.6};
w="0.06";
- x="0.550*safezoneW+safezoneX+0.25";
- y="0.265*safezoneH+safezoneY+0.35";
+ x="0.550*safeZoneW+safeZoneX+0.25";
+ y="0.265*safeZoneH+safeZoneY+0.35";
};
class TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT {
idc=18012;
- x="0.550*safezoneW+safezoneX+0.32";
+ x="0.550*safeZoneW+safeZoneX+0.32";
};
class TEXT_TRUING_DROP_DROP_SUPER_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT {
idc=18013;
- y="0.265*safezoneH+safezoneY+0.40";
+ y="0.265*safeZoneH+safeZoneY+0.40";
};
class TEXT_TRUING_DROP_DROP_SUB_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT {
idc=18014;
- y="0.265*safezoneH+safezoneY+0.40";
+ y="0.265*safeZoneH+safeZoneY+0.40";
};
class TEXT_TRUING_DROP_CALC: TEXT_GUN_LIST {
idc=18015;
style=ST_CENTER;
w="0.11";
- x="0.550*safezoneW+safezoneX+0.26";
- y="0.265*safezoneH+safezoneY+0.45";
+ x="0.550*safeZoneW+safeZoneX+0.26";
+ y="0.265*safeZoneH+safeZoneY+0.45";
text="Calc";
action=QUOTE(true call FUNC(calculate_truing_drop));
};
class TEXT_TRUING_DROP_MV_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT {
idc=18016;
- y="0.265*safezoneH+safezoneY+0.50";
+ y="0.265*safeZoneH+safeZoneY+0.50";
};
class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT {
idc=18017;
- y="0.265*safezoneH+safezoneY+0.55";
+ y="0.265*safeZoneH+safeZoneY+0.55";
};
class TEXT_TRUING_DROP_ACCEPT: TEXT_GUN_LIST {
idc=18018;
w="0.085";
h="0.04";
- x="0.550*safezoneW+safezoneX+0.125";
- y="0.265*safezoneH+safezoneY+0.60";
+ x="0.550*safeZoneW+safeZoneX+0.125";
+ y="0.265*safeZoneH+safeZoneY+0.60";
text="Accept";
action=QUOTE(1 call FUNC(toggle_truing_drop));
};
class TEXT_TRUING_DROP_CANCEL: TEXT_TRUING_DROP_ACCEPT {
idc=18019;
- x="0.550*safezoneW+safezoneX+0.210";
+ x="0.550*safeZoneW+safeZoneX+0.210";
text="Cancel";
action=QUOTE(0 call FUNC(toggle_truing_drop));
};
class TEXT_TRUING_DROP_RESTORE: TEXT_TRUING_DROP_CANCEL {
idc=18020;
- x="0.550*safezoneW+safezoneX+0.29525";
+ x="0.550*safeZoneW+safeZoneX+0.29525";
text="Restore";
action=QUOTE(true call FUNC(restore_truing_drop));
};
diff --git a/addons/atragmx/config.cpp b/addons/atragmx/config.cpp
index 125d4a488e0..9b02aba4919 100644
--- a/addons/atragmx/config.cpp
+++ b/addons/atragmx/config.cpp
@@ -6,7 +6,7 @@ class CfgPatches {
units[] = {"ACE_Item_ATragMX"};
weapons[] = {"ACE_ATragMX"};
requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"ACE_Advanced_Ballistics", "ACE_common", "ACE_weather"};
+ requiredAddons[] = {"ace_advanced_ballistics", "ace_common", "ace_weather"};
author = ECSTRING(common,ACETeam);
authors[] = {"Ruthberg"};
url = ECSTRING(main,URL);
diff --git a/addons/atragmx/functions/fnc_calculate_distance_at_velocity.sqf b/addons/atragmx/functions/fnc_calculate_distance_at_velocity.sqf
index 9fe18a258d6..e667d22e75e 100644
--- a/addons/atragmx/functions/fnc_calculate_distance_at_velocity.sqf
+++ b/addons/atragmx/functions/fnc_calculate_distance_at_velocity.sqf
@@ -30,9 +30,16 @@ while {_velocity > _thresholdVelocity} do {
private _bc = GVAR(targetSolutionInput) select 14;
private _dragModel = GVAR(targetSolutionInput) select 15;
private _temperature = GVAR(targetSolutionInput) select 5;
- private _drag = parseNumber(("ace_advanced_ballistics" callExtension format["retard:%1:%2:%3:%4", _dragModel, _bc, _velocity, _temperature]));
_distance = _distance + _velocity * __DELTA_T;
- _velocity = _velocity - (_drag * __DELTA_T);
+ private _data = (
+ "ace" callExtension ["ballistics:retard", [
+ _dragModel,
+ _bc,
+ _velocity,
+ _temperature
+ ]]
+ ) select 0;
+ _velocity = _velocity - ((parseNumber _data) * __DELTA_T);
};
_distance
diff --git a/addons/atragmx/functions/fnc_calculate_solution.sqf b/addons/atragmx/functions/fnc_calculate_solution.sqf
index 7efc25ebbf4..e910017f2fc 100644
--- a/addons/atragmx/functions/fnc_calculate_solution.sqf
+++ b/addons/atragmx/functions/fnc_calculate_solution.sqf
@@ -90,7 +90,14 @@ private _wind1 = [cos(270 - _windDirection * 30) * _windSpeed1, sin(270 - _windD
private _wind2 = [cos(270 - _windDirection * 30) * _windSpeed2, sin(270 - _windDirection * 30) * _windSpeed2, 0];
private _windDrift = 0;
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
- _bc = parseNumber(("ace_advanced_ballistics" callExtension format["atmosphericCorrection:%1:%2:%3:%4:%5", _bc, _temperature, _barometricPressure, _relativeHumidity, _atmosphereModel]));
+ _bc = parseNumber (("ace" callExtension ["ballistics:atmospheric_correction", [
+ _bc,
+ _temperature,
+ _barometricPressure,
+ _relativeHumidity,
+ _atmosphereModel
+ ]]
+ ) select 0);
};
private _eoetvoesMultiplier = 0;
@@ -103,8 +110,8 @@ _bulletPos set [1, 0];
_bulletPos set [2, -(_boreHeight / 100)];
_bulletVelocity set [0, 0];
-_bulletVelocity set [1, Cos(_scopeBaseAngle) * _muzzleVelocity];
-_bulletVelocity set [2, Sin(_scopeBaseAngle) * _muzzleVelocity];
+_bulletVelocity set [1, cos(_scopeBaseAngle) * _muzzleVelocity];
+_bulletVelocity set [2, sin(_scopeBaseAngle) * _muzzleVelocity];
while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do {
_bulletSpeed = vectorMagnitude _bulletVelocity;
@@ -113,8 +120,15 @@ while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do {
_trueSpeed = vectorMagnitude _trueVelocity;
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
- private _drag = parseNumber(("ace_advanced_ballistics" callExtension format["retard:%1:%2:%3:%4", _dragModel, _bc, _trueSpeed, _temperature]));
- _bulletAccel = (vectorNormalized _trueVelocity) vectorMultiply (-1 * _drag);
+ private _data = (
+ "ace" callExtension ["ballistics:retard", [
+ _dragModel,
+ _bc,
+ _trueSpeed,
+ _temperature
+ ]]
+ ) select 0;
+ _bulletAccel = (vectorNormalized _trueVelocity) vectorMultiply (-1 * (parseNumber _data));
} else {
_bulletAccel = _trueVelocity vectorMultiply (_trueSpeed * _airFriction);
};
@@ -139,9 +153,9 @@ while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do {
_windage1 = - atan(_tx / _trueRange);
_windDrift = (_wind2 select 0) * (_TOF - _trueRange / _muzzleVelocity);
_windage2 = - atan(_windDrift / _trueRange);
- _lead = (_targetSpeed * _TOF) / (Tan(MRAD_TO_DEG(1)) * _trueRange);
+ _lead = (_targetSpeed * _TOF) / (tan(MRAD_TO_DEG(1)) * _trueRange);
};
- _kineticEnergy = 0.5 * (_bulletMass / 1000 * (_bulletSpeed ^ 2));
+ private _kineticEnergy = 0.5 * (_bulletMass / 1000 * (_bulletSpeed ^ 2));
_kineticEnergy = _kineticEnergy * 0.737562149;
if ((missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) && (_bulletPos select 1) > 0) then {
@@ -174,10 +188,10 @@ if (_targetRange != 0) then {
_windage1 = - atan(_tx / _targetRange);
_windDrift = (_wind2 select 0) * (_TOF - _targetRange / _muzzleVelocity);
_windage2 = - atan(_windDrift / _targetRange);
- _lead = (_targetSpeed * _TOF) / (Tan(MRAD_TO_DEG(1)) * _targetRange);
+ _lead = (_targetSpeed * _TOF) / (tan(MRAD_TO_DEG(1)) * _targetRange);
};
-_kineticEnergy = 0.5 * (_bulletMass / 1000 * (_bulletSpeed ^ 2));
+private _kineticEnergy = 0.5 * (_bulletMass / 1000 * (_bulletSpeed ^ 2));
_kineticEnergy = _kineticEnergy * 0.737562149;
if ((missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) && (_bulletPos select 1) > 0) then {
diff --git a/addons/atragmx/functions/fnc_calculate_target_range_assist.sqf b/addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
index dc9c62c3fc5..5ad543ccc94 100644
--- a/addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
+++ b/addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
@@ -68,7 +68,7 @@ switch (_this) do {
};
};
- ctrlSetText [7010, Str(Round(_targetSize * 100) / 100)];
+ ctrlSetText [7010, str(round(_targetSize * 100) / 100)];
};
case 1: {
if (_estRange > 0) then {
@@ -87,13 +87,13 @@ switch (_this) do {
};
};
- ctrlSetText [7011, Str(Round(_imageSize * 100) / 100)];
+ ctrlSetText [7011, str(round(_imageSize * 100) / 100)];
};
case 2: {
if (tan(_imageSize) != 0) then {
_estRange = _targetSize / tan(_imageSize);
};
- ctrlSetText [7013, Str(Round(_estRange))];
+ ctrlSetText [7013, str(round(_estRange))];
};
};
diff --git a/addons/atragmx/functions/fnc_calculate_target_speed_assist.sqf b/addons/atragmx/functions/fnc_calculate_target_speed_assist.sqf
index 69af9eba165..25106c794e9 100644
--- a/addons/atragmx/functions/fnc_calculate_target_speed_assist.sqf
+++ b/addons/atragmx/functions/fnc_calculate_target_speed_assist.sqf
@@ -44,4 +44,4 @@ if (GVAR(currentUnit) != 2) then {
_estSpeed = _estSpeed * 2.23693629;
};
-ctrlSetText [8007, Str(Round(_estSpeed * 10) / 10)];
+ctrlSetText [8007, str(round(_estSpeed * 10) / 10)];
diff --git a/addons/atragmx/functions/fnc_calculate_truing_drop.sqf b/addons/atragmx/functions/fnc_calculate_truing_drop.sqf
index 5191848d050..5f7adee2838 100644
--- a/addons/atragmx/functions/fnc_calculate_truing_drop.sqf
+++ b/addons/atragmx/functions/fnc_calculate_truing_drop.sqf
@@ -29,8 +29,8 @@ if (_parseInput) then {
_transonicRange = _transonicRange * 0.9144;
_subsonicRange = _subsonicRange * 0.9144;
};
- _transonicRange = Round(_transonicRange);
- _subsonicRange = Round(_subsonicRange);
+ _transonicRange = round(_transonicRange);
+ _subsonicRange = round(_subsonicRange);
_subsonicRange = _transonicRange max _subsonicRange;
@@ -54,8 +54,8 @@ if (_parseInput) then {
_subsonicDrop = _subsonicDrop / 1.047;
};
};
- _transonicDrop = Round(_transonicDrop * 100) / 100;
- _subsonicDrop = Round(_subsonicDrop * 100) / 100;
+ _transonicDrop = round(_transonicDrop * 100) / 100;
+ _subsonicDrop = round(_subsonicDrop * 100) / 100;
_subsonicDrop = _transonicDrop max _subsonicDrop;
};
@@ -67,11 +67,11 @@ if ((GVAR(truingDropDropData) select 0) == 0 || {[_transonicRange, _subsonicRang
private _solutionInput = +GVAR(targetSolutionInput);
if (_transonicRange == 0) then {
- _transonicRange = Round(403 call FUNC(calculate_distance_at_velocity));
+ _transonicRange = round(403 call FUNC(calculate_distance_at_velocity));
};
_solutionInput set [13, _transonicRange];
private _result1 = _solutionInput call FUNC(calculate_solution);
- _transonicDrop = Round((_result1 select 0) * 100) / 100;
+ _transonicDrop = round((_result1 select 0) * 100) / 100;
GVAR(truingDropRangeData) set [0, _transonicRange];
GVAR(truingDropDropData) set [1, _transonicDrop];
GVAR(truingDropReferenceDropData) set [0, _transonicDrop];
@@ -84,11 +84,11 @@ if ((GVAR(truingDropDropData) select 0) == 0 || {[_transonicRange, _subsonicRang
} else {
_subsonicRange = _subsonicRange + 200 * 1.0936133;
};
- _subsonicRange = Round(_subsonicRange);
+ _subsonicRange = round(_subsonicRange);
};
_solutionInput set [13, _subsonicRange];
private _result2 = _solutionInput call FUNC(calculate_solution);
- _subsonicDrop = Round((_result2 select 0) * 100) / 100;
+ _subsonicDrop = round((_result2 select 0) * 100) / 100;
GVAR(truingDropRangeData) set [1, _subsonicRange];
GVAR(truingDropDropData) set [2, _subsonicDrop];
GVAR(truingDropReferenceDropData) set [1, _subsonicDrop];
diff --git a/addons/atragmx/functions/fnc_parse_input.sqf b/addons/atragmx/functions/fnc_parse_input.sqf
index 1c3ea3398a5..4f62f301160 100644
--- a/addons/atragmx/functions/fnc_parse_input.sqf
+++ b/addons/atragmx/functions/fnc_parse_input.sqf
@@ -100,11 +100,11 @@ if (GVAR(currentUnit) == 1) then {
_targetRange = 25 max _targetRange min 3700;
};
GVAR(targetRangeDirtyFlag) = GVAR(targetRangeDirtyFlag) || {_targetRange != GVAR(targetRange) select GVAR(currentTarget)};
-GVAR(latitude) set [GVAR(currentTarget), -90 max Round(parseNumber(ctrlText 140000)) min 90];
-GVAR(directionOfFire) set [GVAR(currentTarget), 0 max abs(Round(parseNumber(ctrlText 140010))) min 359];
+GVAR(latitude) set [GVAR(currentTarget), -90 max round(parseNumber(ctrlText 140000)) min 90];
+GVAR(directionOfFire) set [GVAR(currentTarget), 0 max abs(round(parseNumber(ctrlText 140010))) min 359];
GVAR(windSpeed1) set [GVAR(currentTarget), _windSpeed1];
GVAR(windSpeed2) set [GVAR(currentTarget), _windSpeed2];
-GVAR(windDirection) set [GVAR(currentTarget), 1 max Round(parseNumber(ctrlText 140030)) min 12];
+GVAR(windDirection) set [GVAR(currentTarget), 1 max round(parseNumber(ctrlText 140030)) min 12];
GVAR(targetSpeed) set [GVAR(currentTarget), _targetSpeed];
GVAR(targetRange) set [GVAR(currentTarget), _targetRange];
private _inclinationAngleCosine = 0.5 max parseNumber(ctrlText 140041) min 1;
@@ -112,7 +112,7 @@ private _inclinationAngleDegree = -60 max round(parseNumber(ctrlText 140040)) mi
if (_inclinationAngleDegree != GVAR(inclinationAngle) select GVAR(currentTarget)) then {
GVAR(inclinationAngle) set [GVAR(currentTarget), _inclinationAngleDegree];
} else {
- if (_inclinationAngleCosine != Round(cos(GVAR(inclinationAngle) select GVAR(currentTarget)) * 100) / 100) then {
+ if (_inclinationAngleCosine != round(cos(GVAR(inclinationAngle) select GVAR(currentTarget)) * 100) / 100) then {
GVAR(inclinationAngle) set [GVAR(currentTarget), round(acos(_inclinationAngleCosine))];
};
};
diff --git a/addons/atragmx/functions/fnc_recalculate_muzzle_velocity.sqf b/addons/atragmx/functions/fnc_recalculate_muzzle_velocity.sqf
index f7e4709cc11..0d5c83ae01c 100644
--- a/addons/atragmx/functions/fnc_recalculate_muzzle_velocity.sqf
+++ b/addons/atragmx/functions/fnc_recalculate_muzzle_velocity.sqf
@@ -45,7 +45,7 @@ for "_index" from 1 to (_lookupTableSize - 1) do {
(_lookupTable select _lowerIndex) params ["_lowerDistance", "_lowerMuzzleVelocity"];
(_lookupTable select _upperIndex) params ["_upperDistance", "_upperMuzzleVelocity"];
-_muzzleVelocity = 100 max (linearConversion [_lowerDistance, _upperDistance, GVAR(temperature), _lowerMuzzleVelocity, _upperMuzzleVelocity]) min 1400;
+private _muzzleVelocity = 100 max (linearConversion [_lowerDistance, _upperDistance, GVAR(temperature), _lowerMuzzleVelocity, _upperMuzzleVelocity]) min 1400;
if (_muzzleVelocity != GVAR(workingMemory) select 1) then {
GVAR(workingMemory) set [1, _muzzleVelocity];
diff --git a/addons/atragmx/functions/fnc_show_range_card_setup.sqf b/addons/atragmx/functions/fnc_show_range_card_setup.sqf
index 15558ceb983..a4301f5b761 100644
--- a/addons/atragmx/functions/fnc_show_range_card_setup.sqf
+++ b/addons/atragmx/functions/fnc_show_range_card_setup.sqf
@@ -22,7 +22,7 @@ GVAR(showRangeCardSetup) = _this;
if (_this) then {
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 10006);
- ctrlSetText [10003, Str(Round(GVAR(rangeCardStartRange)))];
- ctrlSetText [10004, Str(Round(GVAR(rangeCardEndRange)))];
- ctrlSetText [10005, Str(Round(GVAR(rangeCardIncrement)))];
+ ctrlSetText [10003, str(round(GVAR(rangeCardStartRange)))];
+ ctrlSetText [10004, str(round(GVAR(rangeCardEndRange)))];
+ ctrlSetText [10005, str(round(GVAR(rangeCardIncrement)))];
};
diff --git a/addons/atragmx/functions/fnc_show_target_range_assist.sqf b/addons/atragmx/functions/fnc_show_target_range_assist.sqf
index 83516ef5c6a..b13352d22f9 100644
--- a/addons/atragmx/functions/fnc_show_target_range_assist.sqf
+++ b/addons/atragmx/functions/fnc_show_target_range_assist.sqf
@@ -21,8 +21,8 @@ GVAR(showTargetRangeAssist) = _this;
if (_this) then {
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 7018);
- ctrlSetText [7012, Str(parseNumber(ctrlText 320))];
- ctrlSetText [7013, Str(parseNumber(ctrlText 340))];
+ ctrlSetText [7012, str(parseNumber(ctrlText 320))];
+ ctrlSetText [7013, str(parseNumber(ctrlText 340))];
if (GVAR(currentUnit) == 1) then {
ctrlSetText [7016, "Yards"];
diff --git a/addons/atragmx/functions/fnc_show_target_speed_assist.sqf b/addons/atragmx/functions/fnc_show_target_speed_assist.sqf
index 3efa6ed6d43..c2b34bd9081 100644
--- a/addons/atragmx/functions/fnc_show_target_speed_assist.sqf
+++ b/addons/atragmx/functions/fnc_show_target_speed_assist.sqf
@@ -22,7 +22,7 @@ GVAR(showTargetSpeedAssist) = _this;
if (_this) then {
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 8012);
- ctrlSetText [8004, Str(Round((GVAR(targetRange) select GVAR(currentTarget))))];
+ ctrlSetText [8004, str(round((GVAR(targetRange) select GVAR(currentTarget))))];
if (GVAR(currentUnit) == 1) then {
ctrlSetText [8008, "Yards"];
diff --git a/addons/atragmx/functions/fnc_show_truing_drop.sqf b/addons/atragmx/functions/fnc_show_truing_drop.sqf
index 5e7f60f4d4e..f75d3f7758c 100644
--- a/addons/atragmx/functions/fnc_show_truing_drop.sqf
+++ b/addons/atragmx/functions/fnc_show_truing_drop.sqf
@@ -21,9 +21,9 @@ GVAR(showTruingDrop) = _this;
if (_this) then {
if (GVAR(currentUnit) == 2) then {
- ctrlSetText [18000, format["ZR=%1meters", Round(GVAR(workingMemory) select 2)]];
+ ctrlSetText [18000, format["ZR=%1meters", round(GVAR(workingMemory) select 2)]];
} else {
- ctrlSetText [18000, format["ZR=%1yards", Round((GVAR(workingMemory) select 2) * 1.0936133)]];
+ ctrlSetText [18000, format["ZR=%1yards", round((GVAR(workingMemory) select 2) * 1.0936133)]];
};
private _dropUnit = GVAR(currentScopeUnit);
if (_dropUnit == 3) then {
diff --git a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
index 5408edee3af..40c0ac7cd8f 100644
--- a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
+++ b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
@@ -29,7 +29,7 @@ if !(ctrlVisible 9000) then {
if !(GVAR(speedAssistTimer)) exitWith {
GVAR(speedAssistTimer) = true;
- ctrlSetText [8006, Str(Round((CBA_missionTime - _startTime) * 10) / 10)];
+ ctrlSetText [8006, str(round((CBA_missionTime - _startTime) * 10) / 10)];
[] call FUNC(calculate_target_speed_assist);
@@ -39,7 +39,7 @@ if !(ctrlVisible 9000) then {
[_this select 1] call CBA_fnc_removePerFrameHandler;
};
- ctrlSetText [9001, Str(Round((CBA_missionTime - _startTime) * 10) / 10)];
+ ctrlSetText [9001, str(round((CBA_missionTime - _startTime) * 10) / 10)];
}, 0.1, [CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
};
diff --git a/addons/atragmx/functions/fnc_toggle_range_card_setup.sqf b/addons/atragmx/functions/fnc_toggle_range_card_setup.sqf
index 5c499b8b826..29c856013b4 100644
--- a/addons/atragmx/functions/fnc_toggle_range_card_setup.sqf
+++ b/addons/atragmx/functions/fnc_toggle_range_card_setup.sqf
@@ -20,9 +20,9 @@ if (ctrlVisible 10000) then {
true call FUNC(show_range_card);
if (_this == 1) then {
- GVAR(rangeCardStartRange) = 0 max Round(parseNumber(ctrlText 10003)) min 3000;
- GVAR(rangeCardEndRange) = 0 max Round(parseNumber(ctrlText 10004)) min 3000;
- GVAR(rangeCardIncrement) = 1 max Round(parseNumber(ctrlText 10005)) min 3000;
+ GVAR(rangeCardStartRange) = 0 max round(parseNumber(ctrlText 10003)) min 3000;
+ GVAR(rangeCardEndRange) = 0 max round(parseNumber(ctrlText 10004)) min 3000;
+ GVAR(rangeCardIncrement) = 1 max round(parseNumber(ctrlText 10005)) min 3000;
[] call FUNC(calculate_range_card);
[] call FUNC(update_range_card);
diff --git a/addons/atragmx/functions/fnc_toggle_target_range_assist.sqf b/addons/atragmx/functions/fnc_toggle_target_range_assist.sqf
index 1e6c485e995..dd14f2ddcd0 100644
--- a/addons/atragmx/functions/fnc_toggle_target_range_assist.sqf
+++ b/addons/atragmx/functions/fnc_toggle_target_range_assist.sqf
@@ -20,10 +20,10 @@ if (ctrlVisible 7000) then {
true call FUNC(show_main_page);
if (_this == 1) then {
- ctrlSetText [320, Str(parseNumber(ctrlText 7012))];
- ctrlSetText [140040, Str(parseNumber(ctrlText 7012))];
- ctrlSetText [340, Str(parseNumber(ctrlText 7013))];
- ctrlSetText [140060, Str(parseNumber(ctrlText 7013))];
+ ctrlSetText [320, str(parseNumber(ctrlText 7012))];
+ ctrlSetText [140040, str(parseNumber(ctrlText 7012))];
+ ctrlSetText [340, str(parseNumber(ctrlText 7013))];
+ ctrlSetText [140060, str(parseNumber(ctrlText 7013))];
[] call FUNC(calculate_target_solution);
};
} else {
diff --git a/addons/atragmx/functions/fnc_toggle_target_speed_assist.sqf b/addons/atragmx/functions/fnc_toggle_target_speed_assist.sqf
index 009074105e8..fec9e528e57 100644
--- a/addons/atragmx/functions/fnc_toggle_target_speed_assist.sqf
+++ b/addons/atragmx/functions/fnc_toggle_target_speed_assist.sqf
@@ -23,8 +23,8 @@ if (ctrlVisible 8000) then {
[] call FUNC(calculate_target_speed_assist);
private _targetSpeed = parseNumber(ctrlText 8007);
if (_targetSpeed != 0) then {
- ctrlSetText [330, Str(_targetSpeed)];
- ctrlSetText [140050, Str(_targetSpeed)];
+ ctrlSetText [330, str(_targetSpeed)];
+ ctrlSetText [140050, str(_targetSpeed)];
[] call FUNC(calculate_target_solution);
};
};
diff --git a/addons/atragmx/functions/fnc_true_c1_ballistic_coefficient.sqf b/addons/atragmx/functions/fnc_true_c1_ballistic_coefficient.sqf
index 84371ca8527..06824cc7a20 100644
--- a/addons/atragmx/functions/fnc_true_c1_ballistic_coefficient.sqf
+++ b/addons/atragmx/functions/fnc_true_c1_ballistic_coefficient.sqf
@@ -18,7 +18,7 @@
private _referenceDrop = GVAR(truingDropDropData) select 0;
private _actualDrop = GVAR(truingDropDropData) select 2;
-if (Round(_actualDrop * 10) / 10 == Round(_referenceDrop * 10) / 10) exitWith {};
+if (round(_actualDrop * 10) / 10 == round(_referenceDrop * 10) / 10) exitWith {};
private _step = 0.01;
if (_actualDrop > _referenceDrop) then {
diff --git a/addons/atragmx/functions/fnc_true_muzzle_velocity.sqf b/addons/atragmx/functions/fnc_true_muzzle_velocity.sqf
index f8fb9e621c4..75e1fbdc78d 100644
--- a/addons/atragmx/functions/fnc_true_muzzle_velocity.sqf
+++ b/addons/atragmx/functions/fnc_true_muzzle_velocity.sqf
@@ -18,7 +18,7 @@
private _referenceDrop = GVAR(truingDropDropData) select 0;
private _actualDrop = GVAR(truingDropDropData) select 1;
-if (Round(_actualDrop * 10) / 10 == Round(_referenceDrop * 10) / 10) exitWith {};
+if (round(_actualDrop * 10) / 10 == round(_referenceDrop * 10) / 10) exitWith {};
private _step = 10;
if (_actualDrop > _referenceDrop) then {
diff --git a/addons/atragmx/functions/fnc_update_atmo_env_data.sqf b/addons/atragmx/functions/fnc_update_atmo_env_data.sqf
index 340924b5aa7..3118bee2233 100644
--- a/addons/atragmx/functions/fnc_update_atmo_env_data.sqf
+++ b/addons/atragmx/functions/fnc_update_atmo_env_data.sqf
@@ -18,20 +18,20 @@
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 13007);
if (GVAR(currentUnit) == 2) then {
- ctrlSetText [130040, Str(Round(GVAR(temperature) * 10) / 10)];
+ ctrlSetText [130040, str(round(GVAR(temperature) * 10) / 10)];
} else {
- ctrlSetText [130040, Str(Round((GVAR(temperature) * 1.8 + 32) * 10) / 10)];
+ ctrlSetText [130040, str(round((GVAR(temperature) * 1.8 + 32) * 10) / 10)];
};
if (GVAR(currentUnit) == 2) then {
- ctrlSetText [130050, Str(Round(GVAR(barometricPressure)))];
+ ctrlSetText [130050, str(round(GVAR(barometricPressure)))];
} else {
- ctrlSetText [130050, Str(Round(GVAR(barometricPressure) / 33.8638866667 * 100) / 100)];
+ ctrlSetText [130050, str(round(GVAR(barometricPressure) / 33.8638866667 * 100) / 100)];
};
-ctrlSetText [130060, Str(Round(GVAR(relativeHumidity) * 100 * 10) / 10)];
+ctrlSetText [130060, str(round(GVAR(relativeHumidity) * 100 * 10) / 10)];
if (GVAR(currentUnit) == 2) then {
- ctrlSetText [130030, Str(Round(GVAR(altitude)))];
+ ctrlSetText [130030, str(round(GVAR(altitude)))];
} else {
- ctrlSetText [130030, Str(Round(GVAR(altitude) * 3.2808399))];
+ ctrlSetText [130030, str(round(GVAR(altitude) * 3.2808399))];
};
if (GVAR(currentUnit) == 2) then {
diff --git a/addons/atragmx/functions/fnc_update_atmosphere.sqf b/addons/atragmx/functions/fnc_update_atmosphere.sqf
index 7d523158925..ac04d19ba9a 100644
--- a/addons/atragmx/functions/fnc_update_atmosphere.sqf
+++ b/addons/atragmx/functions/fnc_update_atmosphere.sqf
@@ -16,18 +16,18 @@
*/
if (GVAR(currentUnit) == 2) then {
- ctrlSetText [200, Str(Round(GVAR(temperature) * 10) / 10)];
+ ctrlSetText [200, str(round(GVAR(temperature) * 10) / 10)];
} else {
- ctrlSetText [200, Str(Round((GVAR(temperature) * 1.8 + 32) * 10) / 10)];
+ ctrlSetText [200, str(round((GVAR(temperature) * 1.8 + 32) * 10) / 10)];
};
if (GVAR(currentUnit) == 2) then {
- ctrlSetText [210, Str(Round(GVAR(barometricPressure)))];
+ ctrlSetText [210, str(round(GVAR(barometricPressure)))];
} else {
- ctrlSetText [210, Str(Round(GVAR(barometricPressure) / 33.8638866667 * 100) / 100)];
+ ctrlSetText [210, str(round(GVAR(barometricPressure) / 33.8638866667 * 100) / 100)];
};
-ctrlSetText [220, Str(Round(GVAR(relativeHumidity) * 100 * 10) / 10)];
+ctrlSetText [220, str(round(GVAR(relativeHumidity) * 100 * 10) / 10)];
if (GVAR(currentUnit) == 2) then {
- ctrlSetText [230, Str(Round(GVAR(altitude)))];
+ ctrlSetText [230, str(round(GVAR(altitude)))];
} else {
- ctrlSetText [230, Str(Round(GVAR(altitude) * 3.2808399))];
+ ctrlSetText [230, str(round(GVAR(altitude) * 3.2808399))];
};
diff --git a/addons/atragmx/functions/fnc_update_c1_ballistic_coefficient_data.sqf b/addons/atragmx/functions/fnc_update_c1_ballistic_coefficient_data.sqf
index 4c0c6d7175b..886ad33ba97 100644
--- a/addons/atragmx/functions/fnc_update_c1_ballistic_coefficient_data.sqf
+++ b/addons/atragmx/functions/fnc_update_c1_ballistic_coefficient_data.sqf
@@ -17,9 +17,9 @@
// Distances
if (GVAR(currentUnit) != 1) then {
- {ctrlSetText [_x, Str(Round(((GVAR(workingMemory) select 19) select _forEachIndex) select 0))]} forEach [170021, 170022, 170023, 170024, 170025, 170026, 170027];
+ {ctrlSetText [_x, str(round(((GVAR(workingMemory) select 19) select _forEachIndex) select 0))]} forEach [170021, 170022, 170023, 170024, 170025, 170026, 170027];
} else {
- {ctrlSetText [_x, Str(Round((((GVAR(workingMemory) select 19) select _forEachIndex) select 0) * 1.0936133))]} forEach [170021, 170022, 170023, 170024, 170025, 170026, 170027];
+ {ctrlSetText [_x, str(round((((GVAR(workingMemory) select 19) select _forEachIndex) select 0) * 1.0936133))]} forEach [170021, 170022, 170023, 170024, 170025, 170026, 170027];
};
// Ballistic coefficients
-{ctrlSetText [_x, Str(Round((((GVAR(workingMemory) select 19) select _forEachIndex) select 1) * 1000) / 1000)]} forEach [170031, 170032, 170033, 170034, 170035, 170036, 170037];
+{ctrlSetText [_x, str(round((((GVAR(workingMemory) select 19) select _forEachIndex) select 1) * 1000) / 1000)]} forEach [170031, 170032, 170033, 170034, 170035, 170036, 170037];
diff --git a/addons/atragmx/functions/fnc_update_gun.sqf b/addons/atragmx/functions/fnc_update_gun.sqf
index 5a5dab00fa8..67f726e92e6 100644
--- a/addons/atragmx/functions/fnc_update_gun.sqf
+++ b/addons/atragmx/functions/fnc_update_gun.sqf
@@ -17,34 +17,34 @@
ctrlSetText [1000, GVAR(workingMemory) select 0];
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [100, Str(Round((GVAR(workingMemory) select 5) / 2.54 * 100) / 100)];
+ ctrlSetText [100, str(round((GVAR(workingMemory) select 5) / 2.54 * 100) / 100)];
} else {
- ctrlSetText [100, Str(Round((GVAR(workingMemory) select 5) * 100) / 100)];
+ ctrlSetText [100, str(round((GVAR(workingMemory) select 5) * 100) / 100)];
};
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [110, Str(Round((GVAR(workingMemory) select 12) * 15.4323584))];
+ ctrlSetText [110, str(round((GVAR(workingMemory) select 12) * 15.4323584))];
} else {
- ctrlSetText [110, Str(Round((GVAR(workingMemory) select 12) * 10) / 10)];
+ ctrlSetText [110, str(round((GVAR(workingMemory) select 12) * 10) / 10)];
};
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
- ctrlSetText [120, Str(Round((GVAR(workingMemory) select 15) * 1000) / 1000)];
+ ctrlSetText [120, str(round((GVAR(workingMemory) select 15) * 1000) / 1000)];
} else {
- ctrlSetText [120, Str(Round((GVAR(workingMemory) select 4) * -1000 * 1000) / 1000)];
+ ctrlSetText [120, str(round((GVAR(workingMemory) select 4) * -1000 * 1000) / 1000)];
};
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [130, Str(Round((GVAR(workingMemory) select 1) * 3.2808399))];
+ ctrlSetText [130, str(round((GVAR(workingMemory) select 1) * 3.2808399))];
} else {
- ctrlSetText [130, Str(Round(GVAR(workingMemory) select 1))];
+ ctrlSetText [130, str(round(GVAR(workingMemory) select 1))];
};
switch (GVAR(currentUnit)) do {
case 0: {
- ctrlSetText [140, format["*%1", Round(GVAR(workingMemory) select 2)]];
+ ctrlSetText [140, format["*%1", round(GVAR(workingMemory) select 2)]];
};
case 1: {
- ctrlSetText [140, Str(Round((GVAR(workingMemory) select 2) * 1.0936133))];
+ ctrlSetText [140, str(round((GVAR(workingMemory) select 2) * 1.0936133))];
};
case 2: {
- ctrlSetText [140, Str(Round(GVAR(workingMemory) select 2))];
+ ctrlSetText [140, str(round(GVAR(workingMemory) select 2))];
};
};
[] call FUNC(update_scope_unit);
diff --git a/addons/atragmx/functions/fnc_update_gun_ammo_data.sqf b/addons/atragmx/functions/fnc_update_gun_ammo_data.sqf
index 59bd0149733..56347ac6db6 100644
--- a/addons/atragmx/functions/fnc_update_gun_ammo_data.sqf
+++ b/addons/atragmx/functions/fnc_update_gun_ammo_data.sqf
@@ -18,39 +18,39 @@
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 12008);
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [120000, Str(Round((GVAR(workingMemory) select 5) / 2.54 * 100) / 100)];
+ ctrlSetText [120000, str(round((GVAR(workingMemory) select 5) / 2.54 * 100) / 100)];
} else {
- ctrlSetText [120000, Str(Round((GVAR(workingMemory) select 5) * 100) / 100)];
+ ctrlSetText [120000, str(round((GVAR(workingMemory) select 5) * 100) / 100)];
};
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [120010, Str(Round((GVAR(workingMemory) select 12) * 15.4323584))];
+ ctrlSetText [120010, str(round((GVAR(workingMemory) select 12) * 15.4323584))];
} else {
- ctrlSetText [120010, Str(Round((GVAR(workingMemory) select 12) * 10) / 10)];
+ ctrlSetText [120010, str(round((GVAR(workingMemory) select 12) * 10) / 10)];
};
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [120020, Str(Round((GVAR(workingMemory) select 13) / 10 / 2.54 * 1000) / 1000)];
+ ctrlSetText [120020, str(round((GVAR(workingMemory) select 13) / 10 / 2.54 * 1000) / 1000)];
} else {
- ctrlSetText [120020, Str(Round((GVAR(workingMemory) select 13) / 10 * 1000) / 1000)];
+ ctrlSetText [120020, str(round((GVAR(workingMemory) select 13) / 10 * 1000) / 1000)];
};
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
- ctrlSetText [120030, Str(Round((GVAR(workingMemory) select 15) * 1000) / 1000)];
+ ctrlSetText [120030, str(round((GVAR(workingMemory) select 15) * 1000) / 1000)];
} else {
- ctrlSetText [120030, Str(Round((GVAR(workingMemory) select 4) * -1000 * 1000) / 1000)];
+ ctrlSetText [120030, str(round((GVAR(workingMemory) select 4) * -1000 * 1000) / 1000)];
};
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [120040, Str(Round((GVAR(workingMemory) select 14) / 2.54 * 10) / 10)];
+ ctrlSetText [120040, str(round((GVAR(workingMemory) select 14) / 2.54 * 10) / 10)];
} else {
- ctrlSetText [120040, Str(Round((GVAR(workingMemory) select 14) * 100) / 100)];
+ ctrlSetText [120040, str(round((GVAR(workingMemory) select 14) * 100) / 100)];
};
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [120050, Str(Round((GVAR(workingMemory) select 1) * 3.2808399))];
+ ctrlSetText [120050, str(round((GVAR(workingMemory) select 1) * 3.2808399))];
} else {
- ctrlSetText [120050, Str(Round(GVAR(workingMemory) select 1))];
+ ctrlSetText [120050, str(round(GVAR(workingMemory) select 1))];
};
if (GVAR(currentUnit) == 1) then {
- ctrlSetText [120060, Str(Round((GVAR(workingMemory) select 2) * 1.0936133))];
+ ctrlSetText [120060, str(round((GVAR(workingMemory) select 2) * 1.0936133))];
} else {
- ctrlSetText [120060, Str(Round(GVAR(workingMemory) select 2))];
+ ctrlSetText [120060, str(round(GVAR(workingMemory) select 2))];
};
if (GVAR(currentUnit) == 0) then {
ctrlSetText [120061, "*"];
diff --git a/addons/atragmx/functions/fnc_update_inclination_angle.sqf b/addons/atragmx/functions/fnc_update_inclination_angle.sqf
index 532b3d94e8f..b7ae40160c6 100644
--- a/addons/atragmx/functions/fnc_update_inclination_angle.sqf
+++ b/addons/atragmx/functions/fnc_update_inclination_angle.sqf
@@ -19,7 +19,7 @@ private _inclinationAngleCosine = 0.5 max parseNumber(ctrlText 140041) min 1;
private _inclinationAngleDegree = -60 max parseNumber(ctrlText 140040) min 60;
if (_this == 0) then {
- ctrlSetText [140040, Str(round(acos(_inclinationAngleCosine)))];
+ ctrlSetText [140040, str(round(acos(_inclinationAngleCosine)))];
} else {
- ctrlSetText [140041, Str(round(cos(_inclinationAngleDegree) * 100) / 100)];
+ ctrlSetText [140041, str(round(cos(_inclinationAngleDegree) * 100) / 100)];
};
diff --git a/addons/atragmx/functions/fnc_update_muzzle_velocity_data.sqf b/addons/atragmx/functions/fnc_update_muzzle_velocity_data.sqf
index 23193aa9036..36af09d6427 100644
--- a/addons/atragmx/functions/fnc_update_muzzle_velocity_data.sqf
+++ b/addons/atragmx/functions/fnc_update_muzzle_velocity_data.sqf
@@ -17,12 +17,12 @@
if (GVAR(currentUnit) == 2) then {
// Temperatures
- {ctrlSetText [_x, Str(Round((((GVAR(workingMemory) select 18) select _forEachIndex) select 0) * 10) / 10)]} forEach [160021, 160022, 160023, 160024, 160025, 160026, 160027];
+ {ctrlSetText [_x, str(round((((GVAR(workingMemory) select 18) select _forEachIndex) select 0) * 10) / 10)]} forEach [160021, 160022, 160023, 160024, 160025, 160026, 160027];
// Muzzle velocities
- {ctrlSetText [_x, Str(Round(((GVAR(workingMemory) select 18) select _forEachIndex) select 1))]} forEach [160031, 160032, 160033, 160034, 160035, 160036, 160037];
+ {ctrlSetText [_x, str(round(((GVAR(workingMemory) select 18) select _forEachIndex) select 1))]} forEach [160031, 160032, 160033, 160034, 160035, 160036, 160037];
} else {
// Temperatures
- {ctrlSetText [_x, Str(Round(((((GVAR(workingMemory) select 18) select _forEachIndex) select 0) * 1.8 + 32) * 10) / 10)]} forEach [160021, 160022, 160023, 160024, 160025, 160026, 160027];
+ {ctrlSetText [_x, str(round(((((GVAR(workingMemory) select 18) select _forEachIndex) select 0) * 1.8 + 32) * 10) / 10)]} forEach [160021, 160022, 160023, 160024, 160025, 160026, 160027];
// Muzzle velocities
- {ctrlSetText [_x, Str(Round((((GVAR(workingMemory) select 18) select _forEachIndex) select 1) * 3.2808399))]} forEach [160031, 160032, 160033, 160034, 160035, 160036, 160037];
+ {ctrlSetText [_x, str(round((((GVAR(workingMemory) select 18) select _forEachIndex) select 1) * 3.2808399))]} forEach [160031, 160032, 160033, 160034, 160035, 160036, 160037];
};
diff --git a/addons/atragmx/functions/fnc_update_range_card.sqf b/addons/atragmx/functions/fnc_update_range_card.sqf
index 066bd651746..e280c7d137a 100644
--- a/addons/atragmx/functions/fnc_update_range_card.sqf
+++ b/addons/atragmx/functions/fnc_update_range_card.sqf
@@ -59,16 +59,16 @@ private _speedOfSound = GVAR(temperature) call EFUNC(weather,calculateSpeedOfSou
private _clickNumber = GVAR(workingMemory) select 8;
private _clickInterval = _clickSize / _clickNumber;
- _elevation = Round(_elevation / _clickInterval);
- _windage1 = Round(_windage1 / _clickInterval);
- _windage2 = Round(_windage2 / _clickInterval);
+ _elevation = round(_elevation / _clickInterval);
+ _windage1 = round(_windage1 / _clickInterval);
+ _windage2 = round(_windage2 / _clickInterval);
};
};
- private _elevationOutput = Str(Round(_elevation * 100) / 100);
- private _windageOutput = Str(Round(_windage1 * 100) / 100);
+ private _elevationOutput = str(round(_elevation * 100) / 100);
+ private _windageOutput = str(round(_windage1 * 100) / 100);
- private _rangeOutput = Str(_range);
+ private _rangeOutput = str(_range);
if (_velocity < _speedOfSound) then {
_rangeOutput = _rangeOutput + "*";
};
@@ -80,19 +80,19 @@ private _speedOfSound = GVAR(temperature) call EFUNC(weather,calculateSpeedOfSou
switch (GVAR(rangeCardCurrentColumn)) do {
case 0: {
if (GVAR(showWind2)) then {
- _lastColumnOutput = Str(Round(_windage2 * 100) / 100);
+ _lastColumnOutput = str(round(_windage2 * 100) / 100);
} else {
- _lastColumnOutput = Str(Round(_lead * 100) / 100);
+ _lastColumnOutput = str(round(_lead * 100) / 100);
};
};
case 1: {
- _lastColumnOutput = Str(Round(_velocity));
+ _lastColumnOutput = str(round(_velocity));
};
case 2: {
- _lastColumnOutput = Str(Round(_kineticEnergy));
+ _lastColumnOutput = str(round(_kineticEnergy));
};
case 3: {
- _lastColumnOutput = Str(Round(_TOF * 100) / 100);
+ _lastColumnOutput = str(round(_TOF * 100) / 100);
}
};
diff --git a/addons/atragmx/functions/fnc_update_result.sqf b/addons/atragmx/functions/fnc_update_result.sqf
index cfd8f460a93..3e8d4ef9bd3 100644
--- a/addons/atragmx/functions/fnc_update_result.sqf
+++ b/addons/atragmx/functions/fnc_update_result.sqf
@@ -69,16 +69,16 @@ switch (GVAR(currentScopeUnit)) do {
private _clickNumber = GVAR(workingMemory) select 8;
private _clickInterval = _clickSize / _clickNumber;
- _elevationAbs = Round(_elevationAbs / _clickInterval);
- _windageAbs = Round(_windageAbs / _clickInterval);
+ _elevationAbs = round(_elevationAbs / _clickInterval);
+ _windageAbs = round(_windageAbs / _clickInterval);
- _wind2 = Round(_wind2 / _clickInterval);
+ _wind2 = round(_wind2 / _clickInterval);
- _elevationRel = Round(_elevationRel / _clickInterval);
- _windageRel = Round(_windageRel / _clickInterval);
+ _elevationRel = round(_elevationRel / _clickInterval);
+ _windageRel = round(_windageRel / _clickInterval);
- _elevationCur = Round(_elevationCur / _clickInterval);
- _windageCur = Round(_windageCur / _clickInterval);
+ _elevationCur = round(_elevationCur / _clickInterval);
+ _windageCur = round(_windageCur / _clickInterval);
};
};
@@ -88,7 +88,7 @@ if (GVAR(showWind2)) then {
ctrlSetText [42, "Lead"];
};
-_elevationAbs = Round(_elevationAbs * 100) / 100;
+_elevationAbs = round(_elevationAbs * 100) / 100;
if (_elevationAbs > 0) then {
ctrlSetText [400, str abs _elevationAbs];
} else {
@@ -98,7 +98,7 @@ if (_elevationAbs > 0) then {
ctrlSetText [400, "0.0"];
};
};
-_elevationRel = Round(_elevationRel * 100) / 100;
+_elevationRel = round(_elevationRel * 100) / 100;
if (_elevationRel > 0) then {
ctrlSetText [401, str abs _elevationRel];
} else {
@@ -108,7 +108,7 @@ if (_elevationRel > 0) then {
ctrlSetText [401, "0.0"];
};
};
-_elevationCur = Round(_elevationCur * 100) / 100;
+_elevationCur = round(_elevationCur * 100) / 100;
if (_elevationCur > 0) then {
ctrlSetText [402, str abs _elevationCur];
} else {
@@ -119,7 +119,7 @@ if (_elevationCur > 0) then {
};
};
-_windageAbs = Round(_windageAbs * 100) / 100;
+_windageAbs = round(_windageAbs * 100) / 100;
if (_windageAbs > 0) then {
ctrlSetText [410, format["%1R", abs(_windageAbs)]];
} else {
@@ -129,7 +129,7 @@ if (_windageAbs > 0) then {
ctrlSetText [410, "0.0"];
};
};
-_windageRel = Round(_windageRel * 100) / 100;
+_windageRel = round(_windageRel * 100) / 100;
if (_windageRel > 0) then {
ctrlSetText [411, format["%1R", abs(_windageRel)]];
} else {
@@ -139,7 +139,7 @@ if (_windageRel > 0) then {
ctrlSetText [411, "0.0"];
};
};
-_windageCur = Round(_windageCur * 100) / 100;
+_windageCur = round(_windageCur * 100) / 100;
if (_windageCur > 0) then {
ctrlSetText [412, format["%1R", abs(_windageCur)]];
} else {
@@ -151,7 +151,7 @@ if (_windageCur > 0) then {
};
if (GVAR(showWind2)) then {
- _wind2 = Round(_wind2 * 100) / 100;
+ _wind2 = round(_wind2 * 100) / 100;
if (_wind2 > 0) then {
ctrlSetText [420, format["%1R", abs(_wind2)]];
} else {
@@ -162,7 +162,7 @@ if (GVAR(showWind2)) then {
};
};
} else {
- _lead = Round(_lead * 100) / 100;
+ _lead = round(_lead * 100) / 100;
if (_lead > 0) then {
if ((GVAR(targetSpeedDirection) select GVAR(currentTarget)) == 1) then {
ctrlSetText [420, format["%1R", abs(_lead)]];
diff --git a/addons/atragmx/functions/fnc_update_scope_unit.sqf b/addons/atragmx/functions/fnc_update_scope_unit.sqf
index d1f0e9cf170..e72b490ef03 100644
--- a/addons/atragmx/functions/fnc_update_scope_unit.sqf
+++ b/addons/atragmx/functions/fnc_update_scope_unit.sqf
@@ -16,7 +16,7 @@
*/
ctrlSetText [2000, GVAR(scopeUnits) select GVAR(currentScopeUnit)];
-ctrlSetText [2001, Str(GVAR(currentScopeClickNumber))];
+ctrlSetText [2001, str(GVAR(currentScopeClickNumber))];
if (GVAR(currentScopeUnit) == 3) then {
ctrlSetText [5000, format["Clicks=%1", GVAR(currentScopeClickNumber)]];
diff --git a/addons/atragmx/functions/fnc_update_target.sqf b/addons/atragmx/functions/fnc_update_target.sqf
index a87ba9ba54f..df37e7848e4 100644
--- a/addons/atragmx/functions/fnc_update_target.sqf
+++ b/addons/atragmx/functions/fnc_update_target.sqf
@@ -17,32 +17,32 @@
if (GVAR(showWind2)) then {
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [300, format["%1/%2", Round((GVAR(windSpeed1) select GVAR(currentTarget)) * 2.23693629), Round((GVAR(windSpeed2) select GVAR(currentTarget)) * 2.23693629)]];
+ ctrlSetText [300, format["%1/%2", round((GVAR(windSpeed1) select GVAR(currentTarget)) * 2.23693629), round((GVAR(windSpeed2) select GVAR(currentTarget)) * 2.23693629)]];
} else {
- ctrlSetText [300, format["%1/%2", Round(GVAR(windSpeed1) select GVAR(currentTarget)), Round(GVAR(windSpeed2) select GVAR(currentTarget))]];
+ ctrlSetText [300, format["%1/%2", round(GVAR(windSpeed1) select GVAR(currentTarget)), round(GVAR(windSpeed2) select GVAR(currentTarget))]];
};
} else {
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [300, Str(Round((GVAR(windSpeed1) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
+ ctrlSetText [300, str(round((GVAR(windSpeed1) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
} else {
- ctrlSetText [300, Str(Round((GVAR(windSpeed1) select GVAR(currentTarget)) * 100) / 100)];
+ ctrlSetText [300, str(round((GVAR(windSpeed1) select GVAR(currentTarget)) * 100) / 100)];
};
};
-ctrlSetText [310, Str(Round((GVAR(windDirection) select GVAR(currentTarget))))];
-ctrlSetText [320, Str(Round((GVAR(inclinationAngle) select GVAR(currentTarget))))];
+ctrlSetText [310, str(round((GVAR(windDirection) select GVAR(currentTarget))))];
+ctrlSetText [320, str(round((GVAR(inclinationAngle) select GVAR(currentTarget))))];
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [330, Str(Round((GVAR(targetSpeed) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
+ ctrlSetText [330, str(round((GVAR(targetSpeed) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
} else {
- ctrlSetText [330, Str(Round((GVAR(targetSpeed) select GVAR(currentTarget)) * 100) / 100)];
+ ctrlSetText [330, str(round((GVAR(targetSpeed) select GVAR(currentTarget)) * 100) / 100)];
};
switch (GVAR(currentUnit)) do {
case 0: {
- ctrlSetText [340, format["*%1", Round((GVAR(targetRange) select GVAR(currentTarget)))]];
+ ctrlSetText [340, format["*%1", round((GVAR(targetRange) select GVAR(currentTarget)))]];
};
case 1: {
- ctrlSetText [340, Str(Round((GVAR(targetRange) select GVAR(currentTarget)) * 1.0936133))];
+ ctrlSetText [340, str(round((GVAR(targetRange) select GVAR(currentTarget)) * 1.0936133))];
};
case 2: {
- ctrlSetText [340, Str(Round((GVAR(targetRange) select GVAR(currentTarget))))];
+ ctrlSetText [340, str(round((GVAR(targetRange) select GVAR(currentTarget))))];
};
};
diff --git a/addons/atragmx/functions/fnc_update_target_data.sqf b/addons/atragmx/functions/fnc_update_target_data.sqf
index 92b5df50a06..f47d0401ddb 100644
--- a/addons/atragmx/functions/fnc_update_target_data.sqf
+++ b/addons/atragmx/functions/fnc_update_target_data.sqf
@@ -15,22 +15,22 @@
* Public: No
*/
-ctrlSetText [140000, Str(Round((GVAR(latitude) select GVAR(currentTarget)) * 100) / 100)];
-ctrlSetText [140010, Str(Round((GVAR(directionOfFire) select GVAR(currentTarget)) * 100) / 100)];
+ctrlSetText [140000, str(round((GVAR(latitude) select GVAR(currentTarget)) * 100) / 100)];
+ctrlSetText [140010, str(round((GVAR(directionOfFire) select GVAR(currentTarget)) * 100) / 100)];
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [140020, Str(Round((GVAR(windSpeed1) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
- ctrlSetText [140021, Str(Round((GVAR(windSpeed2) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
+ ctrlSetText [140020, str(round((GVAR(windSpeed1) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
+ ctrlSetText [140021, str(round((GVAR(windSpeed2) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
} else {
- ctrlSetText [140020, Str(Round((GVAR(windSpeed1) select GVAR(currentTarget)) * 100) / 100)];
- ctrlSetText [140021, Str(Round((GVAR(windSpeed2) select GVAR(currentTarget)) * 100) / 100)];
+ ctrlSetText [140020, str(round((GVAR(windSpeed1) select GVAR(currentTarget)) * 100) / 100)];
+ ctrlSetText [140021, str(round((GVAR(windSpeed2) select GVAR(currentTarget)) * 100) / 100)];
};
-ctrlSetText [140030, Str(Round((GVAR(windDirection) select GVAR(currentTarget))))];
-ctrlSetText [140040, Str(Round((GVAR(inclinationAngle) select GVAR(currentTarget))))];
-ctrlSetText [140041, Str(Round(cos(GVAR(inclinationAngle) select GVAR(currentTarget)) * 100) / 100)];
+ctrlSetText [140030, str(round((GVAR(windDirection) select GVAR(currentTarget))))];
+ctrlSetText [140040, str(round((GVAR(inclinationAngle) select GVAR(currentTarget))))];
+ctrlSetText [140041, str(round(cos(GVAR(inclinationAngle) select GVAR(currentTarget)) * 100) / 100)];
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [140050, Str(Round((GVAR(targetSpeed) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
+ ctrlSetText [140050, str(round((GVAR(targetSpeed) select GVAR(currentTarget)) * 2.23693629 * 100) / 100)];
} else {
- ctrlSetText [140050, Str(Round((GVAR(targetSpeed) select GVAR(currentTarget)) * 100) / 100)];
+ ctrlSetText [140050, str(round((GVAR(targetSpeed) select GVAR(currentTarget)) * 100) / 100)];
};
if ((GVAR(targetSpeedDirection) select GVAR(currentTarget)) == 1) then {
ctrlSetText [140051, ">"];
@@ -38,9 +38,9 @@ if ((GVAR(targetSpeedDirection) select GVAR(currentTarget)) == 1) then {
ctrlSetText [140051, "<"];
};
if (GVAR(currentUnit) == 1) then {
- ctrlSetText [140060, Str(Round((GVAR(targetRange) select GVAR(currentTarget)) * 1.0936133))];
+ ctrlSetText [140060, str(round((GVAR(targetRange) select GVAR(currentTarget)) * 1.0936133))];
} else {
- ctrlSetText [140060, Str(Round((GVAR(targetRange) select GVAR(currentTarget))))];
+ ctrlSetText [140060, str(round((GVAR(targetRange) select GVAR(currentTarget))))];
};
if (GVAR(currentUnit) == 0) then {
ctrlSetText [140061, "*"];
diff --git a/addons/atragmx/functions/fnc_update_truing_drop_data.sqf b/addons/atragmx/functions/fnc_update_truing_drop_data.sqf
index ad0f0dda0e8..1180b689cd0 100644
--- a/addons/atragmx/functions/fnc_update_truing_drop_data.sqf
+++ b/addons/atragmx/functions/fnc_update_truing_drop_data.sqf
@@ -16,11 +16,11 @@
*/
if (GVAR(currentUnit) == 2) then {
- ctrlSetText [18011, Str(Round(GVAR(truingDropRangeData) select 0))];
- ctrlSetText [18012, Str(Round(GVAR(truingDropRangeData) select 1))];
+ ctrlSetText [18011, str(round(GVAR(truingDropRangeData) select 0))];
+ ctrlSetText [18012, str(round(GVAR(truingDropRangeData) select 1))];
} else {
- ctrlSetText [18011, Str(Round((GVAR(truingDropRangeData) select 0) * 1.0936133))];
- ctrlSetText [18012, Str(Round((GVAR(truingDropRangeData) select 1) * 1.0936133))];
+ ctrlSetText [18011, str(round((GVAR(truingDropRangeData) select 0) * 1.0936133))];
+ ctrlSetText [18012, str(round((GVAR(truingDropRangeData) select 1) * 1.0936133))];
};
if (GVAR(truingDropMode) == 0) then {
@@ -53,25 +53,25 @@ switch (_dropUnit) do {
};
};
-ctrlSetText [18006, Str(Round((_dropData select 0) * 100) / 100)];
-ctrlSetText [18013, Str(Round((_dropData select 1) * 100) / 100)];
-ctrlSetText [18014, Str(Round((_dropData select 2) * 100) / 100)];
+ctrlSetText [18006, str(round((_dropData select 0) * 100) / 100)];
+ctrlSetText [18013, str(round((_dropData select 1) * 100) / 100)];
+ctrlSetText [18014, str(round((_dropData select 2) * 100) / 100)];
if (GVAR(currentUnit) != 2) then {
- ctrlSetText [18007, Str(Round((GVAR(workingMemory) select 1) * 3.2808399))];
- ctrlSetText [18016, Str(Round((GVAR(workingMemory) select 1) * 3.2808399))];
+ ctrlSetText [18007, str(round((GVAR(workingMemory) select 1) * 3.2808399))];
+ ctrlSetText [18016, str(round((GVAR(workingMemory) select 1) * 3.2808399))];
if (GVAR(truingDropMuzzleVelocity) > 0) then {
- ctrlSetText [18016, Str(Round(GVAR(truingDropMuzzleVelocity) * 3.2808399))];
+ ctrlSetText [18016, str(round(GVAR(truingDropMuzzleVelocity) * 3.2808399))];
};
} else {
- ctrlSetText [18007, Str(Round(GVAR(workingMemory) select 1))];
- ctrlSetText [18016, Str(Round(GVAR(workingMemory) select 1))];
+ ctrlSetText [18007, str(round(GVAR(workingMemory) select 1))];
+ ctrlSetText [18016, str(round(GVAR(workingMemory) select 1))];
if (GVAR(truingDropMuzzleVelocity) > 0) then {
- ctrlSetText [18016, Str(Round(GVAR(truingDropMuzzleVelocity)))];
+ ctrlSetText [18016, str(round(GVAR(truingDropMuzzleVelocity)))];
};
};
-ctrlSetText [18008, Str(Round((GVAR(workingMemory) select 15) * 1000) / 1000)];
-ctrlSetText [18017, Str(Round((GVAR(workingMemory) select 15) * 1000) / 1000)];
+ctrlSetText [18008, str(round((GVAR(workingMemory) select 15) * 1000) / 1000)];
+ctrlSetText [18017, str(round((GVAR(workingMemory) select 15) * 1000) / 1000)];
if (GVAR(truingDropC1) > 0) then {
- ctrlSetText [18017, Str(Round(GVAR(truingDropC1) * 1000) / 1000)];
+ ctrlSetText [18017, str(round(GVAR(truingDropC1) * 1000) / 1000)];
};
diff --git a/addons/atragmx/functions/fnc_update_zero_range.sqf b/addons/atragmx/functions/fnc_update_zero_range.sqf
index 8a3eca13448..d29ad18b688 100644
--- a/addons/atragmx/functions/fnc_update_zero_range.sqf
+++ b/addons/atragmx/functions/fnc_update_zero_range.sqf
@@ -36,11 +36,25 @@ if (!GVAR(atmosphereModeTBH)) then {
};
private _scopeBaseAngle = if !(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
- private _zeroAngle = "ace_advanced_ballistics" callExtension format ["calcZero:%1:%2:%3:%4", _zeroRange, _muzzleVelocity, _airFriction, _boreHeight];
- (parseNumber _zeroAngle)
+ parseNumber (("ace" callExtension ["ballistics:zero_vanilla", [
+ _zeroRange,
+ _muzzleVelocity,
+ _airFriction,
+ _boreHeight
+ ]]) select 0)
} else {
- private _zeroAngle = "ace_advanced_ballistics" callExtension format ["calcZeroAB:%1:%2:%3:%4:%5:%6:%7:%8:%9", _zeroRange, _muzzleVelocity, _boreHeight, _temperature, _barometricPressure, _relativeHumidity, _bc, _dragModel, _atmosphereModel];
- (parseNumber _zeroAngle)
+ parseNumber (("ace" callExtension ["ballistics:zero_advanced", [
+ _zeroRange,
+ _muzzleVelocity,
+ _airFriction,
+ _boreHeight,
+ _temperature,
+ _barometricPressure,
+ _relativeHumidity,
+ _bc,
+ _dragModel,
+ _atmosphereModel
+ ]]) select 0)
};
GVAR(workingMemory) set [2, _zeroRange];
diff --git a/addons/attach/functions/fnc_attach.sqf b/addons/attach/functions/fnc_attach.sqf
index 6a0c4082711..d1e9f129875 100644
--- a/addons/attach/functions/fnc_attach.sqf
+++ b/addons/attach/functions/fnc_attach.sqf
@@ -50,8 +50,8 @@ if (_unit == _attachToVehicle) then { //Self Attachment
} else {
GVAR(placeAction) = PLACE_WAITING;
- [_unit, "forceWalk", "ACE_Attach", true] call EFUNC(common,statusEffect_set);
- [_unit, "blockThrow", "ACE_Attach", true] call EFUNC(common,statusEffect_set);
+ [_unit, "forceWalk", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
+ [_unit, "blockThrow", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
[{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, []] call CBA_fnc_execNextFrame;
_unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = PLACE_APPROVE;}] call EFUNC(common,AddActionEventHandler)];
@@ -88,8 +88,8 @@ if (_unit == _attachToVehicle) then { //Self Attachment
{!([_attachToVehicle, _unit, _itemClassname] call FUNC(canAttach))}) then {
[_idPFH] call CBA_fnc_removePerFrameHandler;
- [_unit, "forceWalk", "ACE_Attach", false] call EFUNC(common,statusEffect_set);
- [_unit, "blockThrow", "ACE_Attach", false] call EFUNC(common,statusEffect_set);
+ [_unit, "forceWalk", QUOTE(ADDON), false] call EFUNC(common,statusEffect_set);
+ [_unit, "blockThrow", QUOTE(ADDON), false] call EFUNC(common,statusEffect_set);
[] call EFUNC(interaction,hideMouseHint);
[_unit, "DefaultAction", (_unit getVariable [QGVAR(placeActionEH), -1])] call EFUNC(common,removeActionEventHandler);
_unit removeAction _actionID;
diff --git a/addons/attach/functions/fnc_canDetach.sqf b/addons/attach/functions/fnc_canDetach.sqf
index 7202ba410fc..9b70d35ff4e 100644
--- a/addons/attach/functions/fnc_canDetach.sqf
+++ b/addons/attach/functions/fnc_canDetach.sqf
@@ -32,7 +32,7 @@ private _inRange = false;
_attachedList deleteAt _forEachIndex;
_attachToVehicle setVariable [QGVAR(attached), _attachedList, true];
};
- if (((getPos _unit) distance2d (getPos _xObject)) < 4) exitWith {_inRange = true};
+ if (((getPos _unit) distance2D (getPos _xObject)) < 4) exitWith {_inRange = true};
} forEach _attachedList;
_inRange &&
diff --git a/addons/attach/functions/fnc_detach.sqf b/addons/attach/functions/fnc_detach.sqf
index d953b02bd16..8eab98e0720 100644
--- a/addons/attach/functions/fnc_detach.sqf
+++ b/addons/attach/functions/fnc_detach.sqf
@@ -31,8 +31,8 @@ private _minDistance = 1000;
{
_x params ["_xObject", "_xItemName"];
- if (((getPos _unit) distance2d (getPos _xObject)) < _minDistance) then {
- _minDistance = ((getPos _unit) distance2d (getPos _xObject));
+ if (((getPos _unit) distance2D (getPos _xObject)) < _minDistance) then {
+ _minDistance = ((getPos _unit) distance2D (getPos _xObject));
_attachedObject = _xObject;
_itemName = _xItemName;
_attachedIndex = _forEachIndex;
diff --git a/addons/attach/functions/fnc_placeApprove.sqf b/addons/attach/functions/fnc_placeApprove.sqf
index 2f0c4d6b751..9e9f8effba4 100644
--- a/addons/attach/functions/fnc_placeApprove.sqf
+++ b/addons/attach/functions/fnc_placeApprove.sqf
@@ -48,10 +48,10 @@ while {(_closeInMax - _closeInMin) > 0.01} do {
{
if (_doesIntersect) exitWith {};
private _startingPosShifted = _startingPosition vectorAdd _x;
- private _startASL = if (surfaceIsWater _startingPosShifted) then {_startingPosShifted} else {ATLtoASL _startingPosShifted};
+ private _startASL = if (surfaceIsWater _startingPosShifted) then {_startingPosShifted} else {ATLToASL _startingPosShifted};
{
private _endPosShifted = _endPosTest vectorAdd _x;
- private _endASL = if (surfaceIsWater _startingPosShifted) then {_endPosShifted} else {ATLtoASL _endPosShifted};
+ private _endASL = if (surfaceIsWater _startingPosShifted) then {_endPosShifted} else {ATLToASL _endPosShifted};
#ifdef DRAW_ATTACH_SCAN
[{
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 71377352338..58d46f0d4f9 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -256,7 +256,7 @@
Chumbo Grosso #0 Calibre Doze 2 Tiros
12 Калибр 2 патр. #0 Картечь
12 kalibre 2 mermi #0 İrisaçma
- 12 게이지 2발 #00 벅샷
+ 12 게이지 2발 #0 벅샷
12 Gauge 2Rnd #1 Buckshot
@@ -479,7 +479,7 @@
Carregador 6.5x47 mm com 20 cartuchos (HPBT Scenar)
6,5x47 mm 20-lövedékes tár (HPBT Scenar)
6.5x47 mm 20Rnd マガジン (HPBT Scenar)
- 20발 들이 6.5x47mm (HPBT Scenar)
+ 6.5x47mm 20발 들이 탄창 (Scenar제 HPBT)
6.5x47毫米 20發 彈匣 (拉普 空尖艇尾狙擊專用彈)
6.5x47 mm 20发 弹匣（HPBT Scenar）
6.5x47 mm 20Rnd Mag (HPBT Scenar)
@@ -513,7 +513,7 @@
Calibre: 6.5x47 mm (HPBT Scenar)<br/>Cartuchos: 20<br/>Usado em: QBU-88
Kaliber: 6,5x47 mm (HPBT Scenar)<br />Lövedékek: 20<br />Használható: QBU-88
口径: 6.5x47 mm (HPBT Scenar)<br />装填数: 20<br />次で使用: QBU-88
- 구경: 6.5x47mm (HPBT Scenar)<br/>장탄수: 20<br/>사용처: QBU-88
+ 구경: 6.5x47mm (Scenar제 보트 테일 할로우 포인트)<br/>장탄수: 20<br/>사용처: QBU-88
口徑: 6.5x47毫米 (拉普 空尖艇尾狙擊專用彈)<br />發數: 20<br />使用於: QBU-88
口径：6.5x47 mm（HPBT Scenar）<br />发数：20<br />使用于：QBU-88
Kalibre: 6.5x47 mm (HPBT Scenar)<br />Mermi: 20<br />Kullanıyor: QBU-88
@@ -530,7 +530,7 @@
Carregador 6.5 mm com 20 cartuchos Creedmor
6,5 mm Creedmor 20-lövedékes tár
6.5 mm クリードモア 20Rnd マガジン
- 20발 들이 6.5mm 크리드무어 탄창
+ 6.5mm 크리드무어 20발 들이 탄창
6.5毫米 20發 彈匣 (克里德莫爾(CM) 狙擊專用彈)
6.5 mm 20发 弹匣（Creedmor）
6.5 mm Creedmor 20Rnd Mag
@@ -581,7 +581,7 @@
Carregador 5.8 mm com 10 cartuchos DBP88
5,8 mm DBP88 10-lövedékes tár
5.8 mm DBP88 10Rnd マガジン
- 10발 들이 5.8mm DBP88 탄창
+ 5.8mm 10발 들이 탄창 (DBP88)
5.8毫米 10發 彈匣 (DBP88)
5.8 mm 10发 弹匣（DBP88）
5.8 mm DBP88 10Rnd Mag
@@ -633,7 +633,7 @@
Caricatore 6.5 mm 30cp Traccianti IR-DIM
Магазин из 30-ти 6,5 мм ИК-трассирующих
6.5 mm 30Rnd IR-DIM トレーサー ケースレスマガジン
- 30발 들이 6.5mm IR-DIM 예광탄 탄창
+ 6.5mm 30발 들이 탄창 (IR-DIM 예광탄)
6.5毫米 30發 低視度紅外線曳光彈 彈匣
6.5 mm 30发 弹匣（红外曳光）
6.5 mm 30Rnd Tracer IR-DIM Mag
@@ -667,7 +667,7 @@
Calibro: 6.5x39 mm Tracciante IR-DIM <br />Munizioni: 30<br />In uso su: MX/C/M/SW/3GL
Калибр: 6,5x39 мм ИК-трассирующие<br />Патронов: 30<br />Используются с: MX/C/M/SW/3GL
口径: 6.5x39 mm IR-DIM トレーサー<br />装填数: 30<br />次で使用: MX/C/M/SW/3GL
- 구경: 6.5x39mm IR-DIM 예광탄<br/>장탄수: 30<br/>사용처: MX/C/M/SW/3GL
+ 구경: 6.5x39mm IR-DIM 적외선 예광탄<br/>장탄수: 30<br/>사용처: MX/C/M/SW/3GL
口徑: 6.5x39毫米 低視度紅外線曳光彈<br />發數: 30<br />使用於: MX/C/M/SW/3GL
口径：6.5x39 mm 红外曳光<br />发数：30<br />使用于：MX/C/M/SW/3GL
Kalibre: 6.5x39 mm Tracer IR-DIM<br />Mermi: 30<br />Kullanıyor: MX/C/M/SW/3GL
@@ -684,7 +684,7 @@
Caricatore 6.5 mm 30cp Sil.
Магазин из 30-ти 6,5 мм дозвуковых
6.5 mm 30Rnd 亜音速弾 マガジン
- 30발 들이 6.5mm 아음속탄 탄창
+ 6.5mm 30발 들이 탄창 (아음속탄)
6.5毫米 30發 消音彈 彈匣
6.5 mm 30发 弹匣（亚音速）
6.5 mm 30Rnd SD Mag
@@ -735,7 +735,7 @@
Caricatore 6.5 mm 30cp AP
Магазин из 30-ти 6,5 мм бронебойных
6.5 mm 30Rnd 徹甲弾 マガジン
- 30발 들이 6.5mm 철갑탄 탄창
+ 6.5mm 30발 들이 탄창 (철갑탄)
6.5毫米30發 穿甲彈 彈匣
6.5 mm 30发 弹匣（穿甲）
6.5 mm 30Rnd AP Mag
@@ -787,7 +787,7 @@
Caricatore 6.5 mm 30cp Traccianti IR-DIM
Магазин из 30-ти 6,5 мм ИК-трассирующих
6.5 mm 30Rnd IR-DIM トレーサー マガジン
- 30발 들이 6.5mm IR-DIM 예광탄 탄창
+ 6.5mm 30발 들이 탄창 (IR-DIM 예광탄)
6.5毫米 30發 低視度紅外線曳光彈 彈匣
6.5 mm 30发 弹匣（红外曳光）
6.5 mm 30Rnd Tracer IR-DIM Mag
@@ -821,7 +821,7 @@
Calibro: 6.5x39 mm Tracciant IR-DIM<br />Munizioni: 30<br />In uso su: Katiba
Калибр: 6,5x39 мм ИК-трассирующие<br />Патронов: 30<br />Используются с: Katiba
口径: 6.5x39 mm IR-DIM トレーサー<br />装填数: 30<br />次で使用: Katiba
- 구경: 6.5x39mm IR-DIM 예광탄<br/>장탄수: 30<br/>사용처: KH-2002
+ 구경: 6.5x39mm IR-DIM 적외선 예광탄<br/>장탄수: 30<br/>사용처: KH-2002
口徑: 6.5x39毫米 低視度紅外線曳光彈<br />發數: 30<br />使用於: Katiba
口径：6.5x39 mm 红外曳光<br />发数：30<br />使用于：Katiba
Kalibre: 6.5x39 mm Tracer IR-DIM<br />Mermi: 30<br />Kullanıyor: Katiba
@@ -838,7 +838,7 @@
Caricatore 6.5 mm 30cp Sil.
Магазин из 30-ти 6,5 мм дозвуковых
6.5 mm 30Rnd 亜音速弾 マガジン
- 30발 들이 6.5mm 아음속탄 탄창
+ 6.5mm 30발 들이 탄창 (아음속탄)
6.5毫米 30發 消音彈 彈匣
6.5 mm 30发 弹匣（亚音速）
6.5 mm 30Rnd SD Mag
@@ -889,7 +889,7 @@
Caricatore 6.5 mm 30cp AP
Магазин из 30-ти 6,5 мм бронебойных
6.5 mm 30Rnd 徹甲弾 マガジン
- 30발 들이 6.5mm 철갑탄 탄창
+ 6.5mm 30발 들이 탄창 (철갑탄)
6.5毫米 30發 穿甲彈 彈匣
6.5 mm 30发 弹匣（穿甲）
6.5 mm 30Rnd AP Mag
@@ -941,7 +941,7 @@
Caricatore 5.56 mm 30cp Traccianti IR-DIM
Магазин из 30-ти 5,56 мм ИК-трассирующих
5.56mm 30Rnd IR-DIM トレーサー マガジン
- 30발 들이 5.56mm IR-DIM 예광탄 탄창
+ 5.56mm 30발 들이 탄창 (IR-DIM 예광탄)
5.56毫米 30發 低視度紅外線曳光彈 彈匣
5.56 mm 30发 弹匣（红外曳光）
5.56 mm 30rnd Tracer IR-DIM Mag
@@ -975,7 +975,7 @@
Calibro: 5.56x45 mm Tracciante IR-DIM<br />Munizioni: 30<br />In uso su: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Калибр: 5,56x45 мм ИК-трассирующие<br />Патронов: 30<br />Используются с: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
口径: 5.56x45 mm IR-DIM トレーサー<br />装填数: 30<br />次で使用: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- 구경: 5.56x45 mm IR-DIM 예광탄<br/>장탄수: 30<br/>사용처: CTAR-21, TAR-21/GTAR-21 EGLM, F2000/택티컬/EGLM, SDAR
+ 구경: 5.56x45 mm IR-DIM 적외선 예광탄<br/>장탄수: 30<br/>사용처: CTAR-21, TAR-21/GTAR-21 EGLM, F2000/택티컬/EGLM, SDAR
口徑: 5.56x45毫米 低視度紅外線曳光彈<br />發數: 30<br />使用於: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
口径：5.56x45 mm 红外曳光<br />发数：30<br />使用于：TRG-20，TRG-21/EGLM, Mk20/C/EGLM, SDAR
Kalibre: 5.56x45 mm Tracer IR-DIM<br />Mermi: 30<br />Kullanıyor: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
@@ -993,7 +993,7 @@
Caricatore 7.62 mm 20cp Traccianti
Магазин из 20-ти 7,62 мм трассирующих
7.62mm 20Rnd マガジン (トレーサー)
- 20발 들이 7.62mm 예광탄 탄창
+ 7.62mm 20발 들이 탄창 (예광탄)
7.62毫米 20發 曳光彈 彈匣
7.62 mm 20发 弹匣（曳光）
7.62 mm 20Rnd Mag (Tracer)
@@ -1044,7 +1044,7 @@
Caricatore 7.62 mm 20cp Traccianti IR-DIM
Магазин из 20-ти 7,62 мм ИК-трассирующих
7.62mm 20Rnd マガジン (IR-DIM)
- 20발 들이 7.62mm IR-DIM 예광탄 탄창
+ 7.62mm 20발 들이 탄창 (IR-DIM 예광탄)
7.62毫米 20發 低視度紅外線曳光彈 彈匣
7.62 mm 20发 弹匣（红外曳光）
7.62 mm 20Rnd Mag (IR-DIM)
@@ -1095,7 +1095,7 @@
Caricatore 7.62 mm 20cp Sil.
Магазин из 20-ти 7,62 мм дозвуковых
7.62mm 20Rnd マガジン (亜音速弾)
- 20발 들이 7.62mm 아음속탄 탄창
+ 7.62mm 20발 들이 탄창 (아음속탄)
7.62毫米 20發 消音彈 彈匣
7.62 mm 20发 弹匣（亚音速）
7.62 mm 20Rnd Mag (SD)
@@ -1146,7 +1146,7 @@
Caricatore 7.62 mm 10cp Traccianti
Магазин из 10-ти 7,62 мм трассирующих
7.62mm 10Rnd マガジン (トレーサー)
- 10발 들이 7.62mm 예광탄 탄창
+ 7.62mm 10발 들이 탄창 (예광탄)
7.62毫米 10發 曳光彈 彈匣
7.62 mm 10发 弹匣（曳光）
7.62 mm 10Rnd Mag (Tracer)
@@ -1197,7 +1197,7 @@
Caricatore 7.62 mm 10cp Traccianti IR-DIM
Магазин из 10-ти 7,62 мм ИК-трассирующих
7.62mm 10Rnd マガジン (IR-DIM)
- 10발 들이 7.62mm IR-DIM 예광탄 탄창
+ 7.62mm 10발 들이 탄창 (IR-DIM 예광탄)
7.62毫米 10發 低視度紅外線曳光彈 彈匣
7.62 mm 10发 弹匣（红外曳光）
7.62 mm 10Rnd Mag (IR-DIM)
@@ -1231,7 +1231,7 @@
Calibro: 7.62x51 mm Tracciante IR-DIM<br />Munizioni: 10<br />In uso su: Mk18 ABR
Калибр: 7,62x51 мм ИК-трассирующие<br />Патронов: 10<br />Используются с: Mk18 ABR
口径: 7.62x51 mm IR-DIM トレーサー<br />装填数: 10<br />次で使用: Mk18 ABR
- 구경: 7.62x51mm IR-DIM 예광탄<br/>장탄수: 10<br/>사용처: Mk.14 Mod 1 EBR
+ 구경: 7.62x51mm IR-DIM 적외선 예광탄<br/>장탄수: 10<br/>사용처: Mk.14 Mod 1 EBR
口徑: 7.62x51毫米 低視度紅外線曳光彈<br />發數: 10<br />使用於: Mk18 ABR
口径：7.62x51 mm 红外曳光<br />发数：10<br />使用于：Mk18 ABR
Kalibre: 7.62x51 mm Tracer IR-DIM<br />Mermi: 10<br />Kullanıyor: Mk18 ABR
@@ -1248,7 +1248,7 @@
Caricatore 7.62 mm 10cp Sil.
Магазин из 10-ти 7,62 мм дозвуковых
7.62mm 10Rnd マガジン (亜音速弾)
- 10발 들이 7.62mm 아음속탄 탄창
+ 7.62mm 10발 들이 탄창 (아음속탄)
7.62毫米 10發 消音彈 彈匣
7.62 mm 10发 弹匣（亚音速）
7.62 mm 10Rnd Mag (SD)
@@ -1300,7 +1300,7 @@
Cinto de munição .338 NM com 130 cartuchos
.338 NM 130-lövedékes nyomkövető heveder
.338 NM 130Rnd トレーサー ベルト
- 130발 들이 .338구경 노르마 매그넘 예광탄 벨트
+ .338구경 노르마 매그넘 130발 들이 벨트 (예광탄)
.338 拉普麥格農(NM) 130發 曳光彈 彈鏈
.338 NM 130发 弹链（曳光）
.338 NM 130Rnd Tracer Belt
@@ -1351,7 +1351,7 @@
Cinto de munição traçante .338 NM IR-DIM com 130 cartuchos
.338 NM 130-lövedékes infravörös nyomkövető heveder
.338 NM 130Rnd IR-DIM ベルト
- 130발 들이 .338rnrud 노르마 매그넘 IR-DIM 예광탄 벨트
+ .338구경 노르마 매그넘 130발 들이 벨트 (IR-DIM 예광탄)
.338 拉普麥格農(NM) 130發 低視度紅外線曳光彈 彈鏈
.338 NM 130发 弹链（红外曳光）
.338 NM 130Rnd IR-DIM Belt
@@ -1385,7 +1385,7 @@
Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartuchos: 130<br />Usado em: SPMG
Kaliber: .338 Norma Magnum infravörös nyomkövető<br />Lövedékek: 130<br />Használható: SPMG
口径: .338 Norma Magnum IR-DIM トレーサー<br />装填数: 130<br />次で使用: SPMG
- 구경: .338구경 노르마 매그넘 IR-DIM 예광탄<br/>장탄수: 130<br/>사용처: LWMMG
+ 구경: .338구경 노르마 매그넘 IR-DIM 적외선 예광탄<br/>장탄수: 130<br/>사용처: LWMMG
口徑: .338 拉普麥格農 低視度紅外線曳光彈<br />發數: 130<br />使用於: SPMG
口径：.338 Norma Magnum 红外曳光<br />发数：130<br />使用于：SPMG
Kalibre: .338 Norma Magnum Tracer IR-DIM<br />Mermi: 130<br />Kullanıyor: SPMG
@@ -1402,7 +1402,7 @@
Cinto de munição .338 NM com 130 cartuchos AP
.338 NM 130-lövedékes páncéltörő heveder
.338 NM 130Rnd 徹甲弾 ベルト
- 130발 들이 .338구경 노르마 매그넘 철갑탄 벨트
+ .338구경 노르마 매그넘 130발 들이 벨트 (철갑탄)
.338 拉普麥格農(NM) 130發 穿甲彈 彈鏈
.338 NM 130发 弹链（穿甲）
.338 NM 130Rnd AP Belt
@@ -1454,7 +1454,7 @@
Carregador de 10 cartuchos 9.3 mm traçantes
9,3 mm 10-lövedékes nyomkövető tár
9.3mm 10Rnd トレーサー マガジン
- 10발 들이 9.3 mm 예광탄 탄창
+ 9.3mm 10발 들이 탄창 (예광탄)
9.3毫米 10發 曳光彈 彈匣
9.3 mm 10发 弹匣（曳光）
9.3 mm 10Rnd Tracer Mag
@@ -1505,7 +1505,7 @@
Carregador de 10 cartuchos 9.3 mm traçantes IR-DIM
9,3 mm 10-lövedékes infravörös nyomkövető tár
9.3mm 10Rnd IR-DIM トレーサー マガジン
- 10발 들이 9.3mm IR-DIM 예광탄 탄창
+ 9.3mm 10발 들이 탄창 (IR-DIM 예광탄)
9.3毫米 10發 低視度紅外線曳光彈 彈匣
9.3 mm 10发 弹匣（红外曳光）
9.3 mm 10Rnd Tracer IR-DIM Mag
@@ -1539,7 +1539,7 @@
Calibre: 9.3x64 mm Traçante IR-DIM<br />Cartuchos: 10<br />Usado em: Cyrus
Kaliber: 9,3x64 mm infravörös nyomkövető<br />Lövedékek: 10<br /> Használható: Cyrus
口径: 9.3x64 mm IR-DIM トレーサー<br />装填数: 10<br />次で使用: Cyrus
- 구경: 9.3x64mm IR-DIM 예광탄<br/>장탄수: 10<br/>사용처: 사이러스
+ 구경: 9.3x64mm IR-DIM 적외선 예광탄<br/>장탄수: 10<br/>사용처: 사이러스
口徑: 9.3x64毫米 低視度紅外線曳光彈<br />發數: 10<br />使用於: Cyrus
口径：9.3x64 mm 红外曳光<br />发数：10<br />使用于："居鲁士"
Kalibre: 9.3x64 mm Tracer IR-DIM<br />Mermi: 10<br />Kullanıyor: Cyrus
@@ -1557,7 +1557,7 @@
Cinto de munição traçante 9.3 mm com 150 cartuchos
9,3 mm 150-lövedékes nyomkövető heveder
9.3mm 150Rnd トレーサー ベルト
- 150발 들이 9.3mm 예광탄 벨트
+ 9.3mm 150발 들이 벨트 (예광탄)
9.3毫米 150發 曳光彈 彈鏈
9.3 mm 150发 弹链（曳光）
9.3 mm 150Rnd Tracer Belt
@@ -1608,7 +1608,7 @@
Cinto de munição traçante 9.3 mm IR-DIM com 150 cartuchos
9,3 mm 150-lövedékes infravörös nyomkövető heveder
9.3mm 150Rnd IR-DIM トレーサー ベルト
- 150발 들이 9.3mm IR-DIM 예광탄 벨트
+ 9.3mm 150발 들이 벨트 (IR-DIM 예광탄)
9.3毫米 150發 低視度紅外線曳光彈 彈鏈
9.3 mm 150发 弹链（红外曳光）
9.3 mm 150Rnd Tracer IR-DIM Belt
@@ -1642,7 +1642,7 @@
Calibre: 9.3x64 mm Traçante IR-DIM<br />Cartuchos: 150<br />Usado em: Navid
Kaliber: 9,3x64 mm infravörös nyomkövető<br />Lövedékek: 150<br />Használható: Navid
口径: 9.3x64 mm IR-DIM トレーサー<br />装填数: 150<br />次で使用: Navid
- 구경: 9.3x64mm IR-DIM 예광탄<br/>장탄수: 150<br/>사용처: HK121
+ 구경: 9.3x64mm IR-DIM 적외선 예광탄<br/>장탄수: 150<br/>사용처: HK121
口徑: 9.3x64毫米 低視度紅外線曳光彈<br />發數: 150<br />使用於: Navid
口径：9.3x64 mm 红外曳光<br />发数：150<br />使用于：Navid
Kalibre: 9.3x64 mm Tracer IR-DIM<br />Mermi: 150<br />Kullanıyor: Navid
@@ -1659,7 +1659,7 @@
Cinto de munição 9.3 mm AP com 150 cartuchos
9,3 mm 150-lövedékes páncéltörő heveder
9.3mm 150Rnd 徹甲弾 ベルト
- 150발 들이 9.3mm 철갑탄 벨트
+ 9.3mm 150발 들이 벨트 (철갑탄)
9.3毫米 150發 穿甲彈 彈鏈
9.3 mm 150发 弹链（穿甲）
9.3 mm 150Rnd AP Belt
@@ -1710,7 +1710,7 @@
Carregador de 16 cartuchos 9x19 mm
9x19 mm 16-lövedékes tár
9x19 mm 16Rnd マガジン
- 16발 들이 9x19mm 탄창
+ 9x19mm 16발 들이 탄창
9x19毫米 16發 彈匣
9x19 mm 16发 弹匣
9x19 mm 16Rnd Mag
@@ -1744,7 +1744,7 @@
Carregador de 16 cartuchos 9x19 mm
9x19 mm 16-lövedékes tár
9x19 mm 30Rnd マガジン
- 30발 들이 9x19mm 탄창
+ 9x19mm 30발 들이 탄창
9x19毫米 30發 彈匣
9x19 mm 30发 弹匣
9x19 mm 30Rnd Mag
@@ -1761,7 +1761,7 @@
Carregador de 30 cartuchos 9x19 mm
9x19 mm 30-lövedékes tár
9x19 mm 30Rnd マガジン
- 30발 들이 9x19mm 탄창
+ 9x19mm 30발 들이 탄창
9x19毫米 30發 彈匣
9x19 mm 30发 弹匣
9x19 mm 30Rnd Mag
@@ -1795,7 +1795,7 @@
Carregador de 30 cartuchos 9x19 mm
9x19 mm 30-lövedékes tár
9x19 mm 30Rnd マガジン
- 30발 들이 9x19mm 탄창
+ 9x19mm 30발 들이 탄창
9x19毫米 30發 彈匣
9x19 mm 30发 弹匣
9x19 mm 30Rnd Mag
@@ -1812,7 +1812,7 @@
Carregador com 10 cartuchos 7.62x54 mm Traçante
7,62x54 mm 10-lövedékes nyomkövető tár
7.62mm 10Rnd マガジン (トレーサー)
- 10발 들이 7.62x54mm 예광탄 탄창
+ 7.62x54mmR 10발 들이 탄창 (예광탄)
7.62x54毫米 10發 曳光彈 彈匣
7.62x54 mm 10发 弹匣（曳光）
7.62x54 mm 10Rnd Tracer Mag
@@ -1846,7 +1846,7 @@
Carregador com 10 cartuchos 7.62x54 mm Traçante
7,62x54 mm 10-lövedékes nyomkövető tár
口径: 7.62x54 mm トレーサー<br />弾薬: 10<br />使用: ラヒム
- 10발 들이 7.62x54mm 예광탄 탄창
+ 7.62x54mmR 10발 들이 탄창 (예광탄)
7.62x54毫米 10發 曳光彈 彈匣
7.62x54 mm 10发 弹匣（曳光）
7.62x54 mm 10Rnd Tracer Mag
@@ -1863,7 +1863,7 @@
Carregador com 100 cartuchos 6.5 mm IR-DIM Traçante
6,5 mm 100-lövedékes infravörös nyomkövető tár
6.5mm 100Rnd IR-DIM トレーサー マガジン
- 100발 들이 6.5mm IR-DIM 예광탄 탄창
+ 6.5mm 100발 들이 탄창 (IR-DIM 예광탄)
6.5毫米 100發 低視度紅外線曳光彈 彈匣
6.5 mm 100发 弹匣（红外曳光）
6.5 mm 100Rnd Tracer IR-DIM Mag
@@ -1897,7 +1897,7 @@
Carregador 6.5 mm 100 Cartuchos Traçantes IR-DIM<br />Cartuchos: 100<br />Usado em: MX LSW
6.5 mm 100-lövedékes infravörös nyomkövető tár<br />Lövedékek: 100<br />Használható: MX LSW
6.5 mm 100Rnd IR-DIM トレーサー マガジン<br />装填数: 100<br />次で使用: MX LSW
- 6.5mm IR-DIM 예광탄<br/>장탄수: 100<br/>사용처: MX LSW
+ 6.5mm IR-DIM 적외선 예광탄<br/>장탄수: 100<br/>사용처: MX LSW
6.5毫米 100發 低視度紅外線曳光彈<br />發數: 100<br />使用於: MX LSW
口径：6.5 mm 100发 红外曳光<br />发数：100<br />使用于：MX LSW
6.5 mm 100Rnd Tracer IR-DIM Mag<br />Mermi: 100<br />Kullanıyor: MX LSW
@@ -1914,7 +1914,7 @@
Cinto de munição traçante 6.5 mm IR-DIM com 200 cartuchos
6,5 mm 200-lövedékes infravörös nyomkövető heveder
6.5mm 200Rnd ベルト トレーサー（IR-DIM）
- 200발 들이 6.5mm IR-DIM 예광탄 탄창
+ 6.5mm 200발 들이 탄창 (IR-DIM 예광탄)
6.5毫米 200發 低視度紅外線曳光彈 彈鏈
6.5 mm 200发 弹链（红外曳光）
6.5 mm 200Rnd Belt Tracer (IR-DIM)
@@ -1948,7 +1948,7 @@
Cinto de munição traçante 6.5 mm IR-DIM com 200 cartuchos<br />Cartuchos: 200<br />Usado em: Stoner 99 LMG
6.5 mm 200-lövedékes infravörös nyomkövető heveder<br />Lövedékek: 200<br />Használható: Stoner 99 LMG
6.5 mm 200Rnd ベルト トレーサー (IR-DIM)<br />装填数: 200<br />次で使用: Stoner 99 LMG
- 200발 들이 6.5mm IR-DIM 예광탄 벨트<br/>장탄수: 200<br/>사용처: 스토너 99 LMG
+ 6.5mm IR-DIM 적외선 예광탄 벨트<br/>장탄수: 200<br/>사용처: 스토너 99 LMG
6.5毫米 200發 低視度紅外線曳光彈<br />發數: 200<br />使用於: Stoner 99 重機槍
口径：6.5 mm 200发 红外曳光<br />发数：200<br />使用于：Stoner 99 LMG
6.5 mm 200Rnd Belt Tracer (IR-DIM)<br />Mermi: 200<br />Kullanıyor: Stoner 99 LMG
@@ -1965,7 +1965,7 @@
Carregador 5.56 mm com 30 cartuchos (Mk262)
5,56 mm 30-lövedékes tár (Mk262)
5.56mm 30Rnd マガジン (Mk262)
- 30발 들이 5.56mm 탄창 (Mk.262)
+ 5.56mm 30발 들이 탄창 (Mk.262)
5.56毫米 30發 彈匣 (Mk262 狙擊專用彈)
5.56 mm 30发 弹匣（Mk262）
5.56 mm 30Rnd Mag (Mk262)
@@ -1999,7 +1999,7 @@
Calibre: 5.56x45 mm NATO (Mk262)<br/>Cartuchos: 30
Kaliber: 5,56x45 mm NATO (Mk262)<br />Lövedékek: 30
口径: 5.56x45 mm NATO (Mk262)<br />装填数: 30
- 구경: 5.56x45mm NATO (Mk.262)<br/>장탄수: 30
+ 구경: 5.56x45mm NATO (Mk.262 매치그레이드)<br/>장탄수: 30
口徑: 5.56x45毫米 NATO標準 (Mk262 狙擊專用彈)<br />發數: 30
口径：5.56x45 mm 北约（Mk262 狙击专用弹）<br />发数：30
Kalibre: 5.56x45 mm NATO (Mk262)<br />Mermi: 30
@@ -2016,7 +2016,7 @@
Carregador 5.56 mm com 30 cartuchos (Mk318)
5,56 mm 30-lövedékes tár (Mk318)
5.56mm 30Rnd マガジン (Mk318)
- 30발 들이 5.56mm 탄창 (Mk.318)
+ 5.56mm 30발 들이 탄창 (Mk.318)
5.56毫米 30發 彈匣 (Mk318 特戰專用彈)
5.56 mm 30发 弹匣（Mk318）
5.56 mm 30Rnd Mag (Mk318)
@@ -2067,7 +2067,7 @@
Carregador 5.56 mm com 30 cartuchos (M995 AP)
5,56 mm 30-lövedékes tár (M995 páncéltörő)
5.56mm 30Rnd マガジン (M995 徹甲弾)
- 30발 들이 5.56mm 탄창 (M995 철갑탄)
+ 5.56mm 30발 들이 탄창 (M995)
5.56毫米 30發 彈匣 (M995 穿甲彈)
5.56 mm 30发 弹匣（M995 穿甲）
5.56 mm 30Rnd Mag (M995 AP)
@@ -2118,7 +2118,7 @@
Carregador 7.62 mm com 10 cartuchos (M118LR)
7,62 mm 10-lövedékes tár (M118LR)
7.62mm 10Rnd マガジン (M118LR)
- 10발 들이 7.62mm 탄창 (M118LR)
+ 7.62mm 10발 들이 탄창 (M118LR)
7.62毫米 10發 彈匣 (M118LR 狙擊專用彈)
7.62 mm 10发 弹匣（M118LR）
7.62 mm 10Rnd Mag (M118LR)
@@ -2152,7 +2152,7 @@
Calibre: 7.26x51 mm NATO (M118LR)<br/>Cartuchos: 10
Kaliber: 7,62x51 mm NATO (M118LR)<br />Lövedékek: 10
口径: 7.62x51 mm NATO (M118LR)<br />装填数: 10
- 구경: 7.62x51mm NATO (M118LR)<br/>장탄수: 10
+ 구경: 7.62x51mm NATO (M118LR 할로우 포인트 매치그레이드)<br/>장탄수: 10
口徑: 7.62x51毫米 NATO標準 (M118LR 狙擊專用彈)<br />發數: 10
口径：7.62x51 mm 北约（M118LR 狙击专用弹）<br />发数：10
Kalibre: 7.62x51 mm NATO (M118LR)<br />Mermi: 10
@@ -2169,7 +2169,7 @@
Carregador 7.62 mm com 20 cartuchos (M118LR)
7,62 mm 20-lövedékes tár (M118LR)
7.62mm 20Rnd マガジン (M118LR)
- 20발 들이 7.62mm 탄창 (M118LR)
+ 7.62mm 20발 들이 탄창 (M118LR)
7.62毫米 20發 彈匣 (M118LR 狙擊專用彈)
7.62 mm 20发 弹匣（M118LR）
7.62 mm 20Rnd Mag (M118LR)
@@ -2203,7 +2203,7 @@
Calibre: 7.26x51 mm NATO (M118LR)<br/>Cartuchos: 20
Kaliber: 7,62x51 mm NATO (M118LR)<br />Lövedékek: 20
口径: 7.62x51 mm NATO (M118LR)<br />装填数: 20
- 구경: 7.62x51mm NATO (M118LR)<br/>장탄수: 20
+ 구경: 7.62x51mm NATO (M118LR 할로우 포인트 매치그레이드)<br/>장탄수: 20
口徑: 7.62x51毫米 NATO標準 (M118LR 狙擊專用彈)<br />發數: 20
口径：7.62x51 mm 北约（M118LR 狙击专用弹）<br />发数：20
Kalibre: 7.62x51 mm NATO (M118LR)<br />Mermi: 20
@@ -2220,7 +2220,7 @@
Carregador 7.62 mm com 10 cartuchos (Mk316 Mod 0)
7,62 mm 10-lövedékes tár (Mk316 Mod 0)
7.62mm 10Rnd マガジン (Mk316 Mod 0)
- 10발 들이 7.62mm 탄창 (Mk.316 Mod 0)
+ 7.62mm 10발 들이 탄창 (Mk.316 Mod 0)
7.62毫米 10發 彈匣 (Mk316 Mod 0 狙擊專用彈)
7.62 mm 10发 弹匣（Mk316 Mod 0）
7.62 mm 10Rnd Mag (Mk316 Mod 0)
@@ -2271,7 +2271,7 @@
Carregador 7.62 mm com 20 cartuchos (Mk316 Mod 0)
7,62 mm 20-lövedékes tár (Mk316 Mod 0)
7.62mm 20Rnd マガジン (Mk316 Mod 0)
- 20발 들이 7.62mm 탄창 (Mk.316 Mod 0)
+ 7.62mm 20발 들이 탄창 (Mk.316 Mod 0)
7.62毫米 20發 彈匣 (Mk316 Mod 0 狙擊專用彈)
7.62 mm 20发 弹匣（Mk316 Mod 0）
7.62 mm 20Rnd Mag (Mk316 Mod 0)
@@ -2305,7 +2305,7 @@
Calibre: 7.26x51 mm NATO (Mk316 Mod 0)<br/>Cartuchos: 20
Kaliber: 7,62x51 mm NATO (Mk316 Mod 0)<br />Lövedékek: 20
口径: 7.62x51 mm NATO (Mk316 Mod 0)<br />装填数: 20
- 구경: 7.62x51mm NATO (Mk.316 Mod 0)<br/>장탄수: 20
+ 구경: 7.62x51mm NATO (Mk.316 Mod 0 특수작전용 장거리 저격 탄환)<br/>장탄수: 20
口徑: 7.62x51毫米 NATO標準 (Mk316 Mod 0 狙擊專用彈)<br />發數: 20
口径：7.62x51 mm 北约（Mk316 Mod 0 狙击专用弹）<br />发数：20
Kalibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Mermi: 20
@@ -2322,7 +2322,7 @@
Carregador 7.62 mm com 10 cartuchos (Mk319 Mod 0)
7,62 mm 10-lövedékes tár (Mk319 Mod 0)
7.62mm 10Rnd マガジン (Mk319 Mod 0)
- 10발 들이 7.62mm 탄창 (Mk.319 Mod 0)
+ 7.62mm 10발 들이 탄창 (Mk.319 Mod 0)
7.62毫米 10發 彈匣 (Mk319 Mod 0 特戰專用彈)
7.62 mm 10发 弹匣（Mk319 Mod 0）
7.62 mm 10Rnd Mag (Mk319 Mod 0)
@@ -2356,7 +2356,7 @@
Calibre: 7.26x51 mm NATO (Mk319 Mod 0)<br/>Cartuchos: 10
Kaliber: 7,62x51 mm NATO (Mk319 Mod 0)<br />Lövedékek: 10
口径: 7.62x51 mm NATO (Mk319 Mod 0)<br />装填数: 10
- 구경: 7.62x51mm NATO (Mk.319 Mod 0)<br/>장탄수: 10
+ 구경: 7.62x51mm NATO (Mk.319 Mod 0 단총신 카빈 성능향상 탄환)<br/>장탄수: 10
口徑: 7.62x51毫米 NATO標準 (Mk319 Mod 0 特戰專用彈)<br />發數: 10
口径：7.62x51 mm 北约（Mk319 Mod 0 特战专用弹）<br />发数：10
Kalibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Mermi: 20
@@ -2373,7 +2373,7 @@
Carregador 7.62 mm com 20 cartuchos (Mk319 Mod 0)
7,62 mm 20-lövedékes tár (Mk319 Mod 0)
7.62mm 20Rnd マガジン (Mk319 Mod 0)
- 20들이 7.62mm 탄창 (Mk.319 Mod 0)
+ 7.62mm 20발 들이 탄창 (Mk.319 Mod 0)
7.62毫米 20發 彈匣 (Mk319 Mod 0 特戰專用彈)
7.62 mm 20发 弹匣（Mk319 Mod 0）
7.62 mm 20Rnd Mag (Mk319 Mod 0)
@@ -2407,7 +2407,7 @@
Calibre: 7.26x51 mm NATO (Mk319 Mod 0)<br/>Cartuchos: 20
Kaliber: 7,62x51 mm NATO (Mk319 Mod 0)<br />Lövedékek: 20
口径: 7.62x51 mm NATO (Mk319 Mod 0)<br />装填数: 20
- 구경: 7.62x51mm NATO (Mk.319 Mod 0)<br/>장탄수: 20
+ 구경: 7.62x51mm NATO (Mk.319 Mod 0 단총신 카빈 성능향상 탄환)<br/>장탄수: 20
口徑: 7.62x51毫米 NATO標準 (Mk319 Mod 0 特戰專用彈)<br />發數: 20
口径：7.62x51 mm 北约（Mk319 Mod 0）<br />发数：20
Kalibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Mermi: 20
@@ -2424,7 +2424,7 @@
Carregador 7.62 mm com 10 cartuchos (M993 AP)
7,62 mm 10-lövedékes tár (M993 páncéltörő)
7.62mm 10Rnd マガジン (M993 徹甲弾)
- 10발 들이 7.62mm 탄창 (M993 철갑탄)
+ 7.62mm 10발 들이 탄창 (M993)
7.62毫米 10發 彈匣 (M993 穿甲專用彈)
7.62 mm 10发 弹匣（M993 穿甲）
7.62 mm 10Rnd Mag (M993 AP)
@@ -2475,7 +2475,7 @@
Carregador 7.62 mm com 20 cartuchos (M993 AP)
7,62 mm 20-lövedékes tár (M993 páncéltörő)
7.62mm 20Rnd マガジン (M993 徹甲弾)
- 20발 들이 7.62mm 탄창 (M993 철갑탄)
+ 7.62mm 20발 들이 탄창 (M993)
7.62毫米 20發 彈匣 (M993 穿甲專用彈)
7.62 mm 20发 弹匣（M993 穿甲）
7.62 mm 20Rnd Mag (M993 AP)
@@ -2526,7 +2526,7 @@
Carregador .300 WM com 20 cartuchos (Mk248 Mod 0)
.300 WM 20-lövedékes tár (Mk248 Mod 0)
.300 WM 20Rnd マガジン (Mk248 Mod 0)
- 20발 들이 .300구경 윈체스터 매그넘 탄창 (Mk.248 Mod 0)
+ .300구경 윈체스터 매그넘 20발 들이 탄창 (Mk.248 Mod 0)
.300 萬能(WM) 20發 彈匣 (Mk248 Mod 0 狙擊專用彈)
.300 WM 20发 弹匣（Mk248 Mod 0）
.300 WM 20Rnd Mag (Mk248 Mod 0)
@@ -2560,7 +2560,7 @@
Calibre: .300 WM NATO (Mk248 Mod 0)<br/>Cartuchos: 20
Kaliber: .300 WM NATO (Mk248 Mod 0)<br />Lövedékek: 20
口径: .300 WM NATO (Mk248 Mod 0)<br />装填数: 20
- 구경: .300 윈체스터 매그넘 (Mk.248 Mod 0)<br/>장탄수: 20
+ 구경: .300 윈체스터 매그넘 (Mk.248 Mod 0 장거리 저격용 탄환)<br/>장탄수: 20
口徑: .300 西米 NATO標準 (Mk248 Mod 0 狙擊專用彈)<br />發數: 20
口径：.300 WM 北约（Mk248 Mod 0 狙击专用弹）<br />发数：20
Kalibre: .300 WM NATO (Mk248 Mod 0)<br />Mermi: 20
@@ -2577,7 +2577,7 @@
Carregador .300 WM com 20 cartuchos (Mk248 Mod 1)
.300 WM 20-lövedékes tár (Mk248 Mod 1)
.300 WM 20Rnd マガジン (Mk248 Mod 1)
- 20발 들이 .300구경 윈체스터 매그넘 탄창 (Mk.248 Mod 1)
+ .300구경 윈체스터 매그넘 20발 들이 탄창 (Mk.248 Mod 1)
.300 西米 20發 彈匣 (Mk248 Mod 1 狙擊專用彈)
.300 WM 20发 弹匣（Mk248 Mod 1）
.300 WM 20Rnd Mag (Mk248 Mod 1)
@@ -2611,7 +2611,7 @@
Calibre: .300 WM NATO (Mk248 Mod 1)<br/>Cartuchos: 20
Kaliber: .300 WM NATO (Mk248 Mod 1)<br />Lövedékek: 20
口径: .300 WM NATO (Mk248 Mod 1)<br />装填数: 20
- 구경: .300구경 윈체스터 매그넘 (Mk.248 Mod 1)<br/>장탄수: 20
+ 구경: .300구경 윈체스터 매그넘 (Mk.248 Mod 1 개선판 장거리 저격용 탄환)<br/>장탄수: 20
口徑: .300 西米 NATO標準 (Mk248 Mod 1 狙擊專用彈)<br />發數: 20
口径：.300 WM 北约（Mk248 Mod 1 狙击专用弹）<br />发数：20
Kalibre: .300 WM NATO (Mk248 Mod 1)<br />Mermi: 20
@@ -2628,7 +2628,7 @@
Carregador .300 WM com 20 cartuchos (Berger Hybrid OTM)
.300 WM 20-lövedékes tár (Berger Hybrid OTM)
.300 WM 20Rnd マガジン (Berger Hybrid OTM)
- 20발 들이 .300구경 윈체스터 매그넘 탄창 (Berger Hybrid OTM)
+ .300구경 윈체스터 매그넘 20발 들이 탄창 (Berger제 하이브리드 OTM)
.300 西米 20發 彈匣 (Berger Hybrid 空尖比賽專用彈)
.300 WM 20发 弹匣（Berger Hybrid 空尖）
.300 WM 20Rnd Mag (Berger Hybrid OTM)
@@ -2662,7 +2662,7 @@
Calibre: .300 WM OTM NATO (Berger Hybrid OTM)<br/>Cartuchos: 20
Kaliber: .300 WM NATO (Berger Hybrid OTM)<br />Lövedékek: 20
口径: .300 WM NATO (Berger Hybrid OTM)<br />装填数: 20
- 구경: .300구경 윈체스터 매그넘 (Berger Hybrid OTM)<br/>장탄수: 20
+ 구경: .300구경 윈체스터 매그넘 (Berger제 하이브리드 오픈 팁 매치탄)<br/>장탄수: 20
口徑: .300 西米 NATO標準 (Berger Hybrid 空尖比賽專用彈)<br />發數: 20
口径：.300 WM 北约（Berger Hybrid 空尖）<br />发数：20
Kalibre: .300 WM NATO (Berger Hybrid OTM)<br />Mermi: 20
@@ -2679,7 +2679,7 @@
Carregador .300 WM com 10 cartuchos (Mk248 Mod 0)
.300 WM 10-lövedékes tár (Mk248 Mod 0)
.300 WM 10Rnd マガジン (Mk248 Mod 0)
- 10발 들이 .300구경 윈체스터 매그넘 탄창 (Mk.248 Mod 0)
+ .300구경 윈체스터 매그넘 10발 들이 탄창 (Mk.248 Mod 0)
.300 萬能(WM) 10發 彈匣 (Mk248 Mod 0 狙擊專用彈)
.300 WM 10发 弹匣（Mk248 Mod 0）
.300 WM 10Rnd Mag (Mk248 Mod 0)
@@ -2713,7 +2713,7 @@
Calibre: .300 WM NATO (Mk248 Mod 0)<br/>Cartuchos: 10
Kaliber: .300 WM NATO (Mk248 Mod 0)<br />Lövedékek: 10
口径: .300 WM NATO (Mk248 Mod 0)<br />装填数: 10
- 구경: .300구경 윈체스터 매그넘 (Mk.248 Mod 0)<br/>장탄수: 10
+ 구경: .300 윈체스터 매그넘 (Mk.248 Mod 0 장거리 저격용 탄환)<br/>장탄수: 10
口徑: .300 西米 NATO標準 (Mk248 Mod 0 狙擊專用彈)<br />發數: 10
口径：.300 WM 北约（Mk248 Mod 0 狙击专用弹）<br />发数：10
Kalibre: .300 WM NATO (Mk248 Mod 0)<br />Mermi: 10
@@ -2730,7 +2730,7 @@
Carregador .300 WM com 10 cartuchos (Mk248 Mod 1)
.300 WM 10-lövedékes tár (Mk248 Mod 1)
.300 WM 10Rnd マガジン (Mk248 Mod 1)
- 10발 들이 .300구경 윈체스터 매그넘 탄창 (Mk.248 Mod 1)
+ .300구경 윈체스터 매그넘 10발 들이 탄창 (Mk.248 Mod 1)
.300 西米 10發 彈匣 (Mk248 Mod 1 狙擊專用彈)
.300 WM 10发 弹匣（Mk248 Mod 1）
.300 WM 10Rnd Mag (Mk248 Mod 1)
@@ -2764,7 +2764,7 @@
Calibre: .300 WM NATO (Mk248 Mod 1)<br/>Cartuchos: 10
Kaliber: .300 WM NATO (Mk248 Mod 1)<br />Lövedékek: 10
口径: .300 WM NATO (Mk248 Mod 1)<br />装填数: 10
- 구경: .300구경 윈체스터 매그넘 (Mk.248 Mod 1)<br/>장탄수: 10
+ 구경: .300구경 윈체스터 매그넘 (Mk.248 Mod 1 개선판 장거리 저격용 탄환)<br/>장탄수: 10
口徑: .300 西米 NATO標準 (Mk248 Mod 1 狙擊專用彈)<br />發數: 10
口径：.300 WM 北约（Mk248 Mod 1 狙击专用弹）<br />发数：10
Kalibre: .300 WM NATO (Mk248 Mod 1)<br />Mermi: 10
@@ -2781,7 +2781,7 @@
Carregador .300 WM com 10 cartuchos (Berger Hybrid OTM)
.300 WM 10-lövedékes tár (Berger Hybrid OTM)
.300 WM 10Rnd マガジン (Berger Hybrid OTM)
- 10발 들이 .300구경 윈체스터 매그넘 탄창 (Berger Hybrid OTM)
+ .300구경 윈체스터 매그넘 10발 들이 탄창 (Berger제 하이브리드 OTM)
.300 西米 10發 彈匣 (Berger Hybrid 空尖比賽專用彈)
.300 WM 10发 弹匣（Berger Hybrid 空尖）
.300 WM 10Rnd Mag (Berger Hybrid OTM)
@@ -2815,7 +2815,7 @@
Calibre: .300 WM OTM NATO (Berger Hybrid OTM)<br/>Cartuchos: 10
Kaliber: .300 WM NATO (Berger Hybrid OTM)<br />Lövedékek: 10
口径: .300 WM NATO (Berger Hybrid OTM)<br />装填数: 10
- 구경: .300구경 윈체스터 매그넘 (Berger Hybrid OTM)<br/>장탄수: 10
+ 구경: .300구경 윈체스터 매그넘 (Berger제 하이브리드 오픈 팁 매치탄)<br/>장탄수: 10
口徑: .300 西米 NATO標準 (Berger Hybrid 空尖比賽專用彈)<br />發數: 10
口径：.300 WM 北约（Berger Hybrid 空尖）<br />发数：10
Kalibre: .300 WM NATO (Berger Hybrid OTM)<br />Mermi: 10
@@ -2828,7 +2828,7 @@
6.5x47 mm 30cp Sabbia (HPBT Scenar)
Magazynek 6.5x47 mm 30rd Piaskowy (HPBT Scenar)
6.5x47 mm 30发 沙色弹匣（HPBT Scenar）
- 6.5x47mm 30발 사막 탄창 (HPBT Scenar)
+ 6.5x47mm 30발 들이 탄창/모래 (HPBT Scenar)
Магазин из 30-ти 6.5x47 мм Песочный (HPBT Scenar)
Cargador de 30 balas de 6.5x47mm Arena (HPBT Scenar)
Carregador 6.5x47 mm com 30 cartuchos Areia (HPBT Scenar)
@@ -2841,7 +2841,7 @@
6.5x47 mm 30cp Car Promet (HPBT Scenar)
Magazynek 6.5x47 mm 30rd Promet (HPBT Scenar)
6.5x47 mm 30发 Promet 弹匣（HPBT Scenar）
- 6.5x47mm 30발 그롯 탄창 (HPBT Scenar)
+ 6.5x47mm 30발 들이 탄창/프로멧용 (Scenar제 HPBT)
Магазин из 30-ти 6.5x47 мм Promet (HPBT Scenar)
Cargador de 30 balas de 6.5x47mm Promet (HPBT Scenar)
Carregador 6.5x47 mm com 30 cartuchos Promet (HPBT Scenar)
@@ -2854,7 +2854,7 @@
6.5x47 mm 30cp Car Nero (HPBT Scenar)
Magazynek 6.5x47 mm 30rd Czarny (HPBT Scenar)
6.5x47 mm 30发 黑色弹匣（HPBT Scenar）
- 6.5x47mm 30발 검정 탄창 (HPBT Scenar)
+ 6.5x47mm 30발 들이 탄창/검정 (Scenar제 HPBT)
Магазин из 30-ти 6.5x47 мм Чёрный (HPBT Scenar)
Cargador de 30 balas de 6.5x47mm Negro (HPBT Scenar)
Carregador 6.5x47 mm com 30 cartuchos Preto (HPBT Scenar)
@@ -2867,7 +2867,7 @@
6.5x47 mm 30cp Car Cachi (HPBT Scenar)
Magazynek 6.5x47 mm 30rd Khaki (HPBT Scenar)
6.5x47 mm 30发 卡其色弹匣（HPBT Scenar）
- 6.5x47mm 30발 카키 탄창 (HPBT Scenar)
+ 6.5x47mm 30발 들이 탄창/카키 (Scenar제 HPBT)
Магазин из 30-ти 6.5x47 мм Хаки (HPBT Scenar)
Cargador de 30 balas de 6.5x47mm Caqui (HPBT Scenar)
Carregador 6.5x47 mm com 30 cartuchos Caqui (HPBT Scenar)
@@ -2901,7 +2901,7 @@
Calibre: 6.5x47 mm (HPBT Scenar)<br/>Cartuchos: 30<br/>Usado em: MXM
Kaliber: 6,5x47 mm (HPBT Scenar)<br />Lövedékek: 30<br />Használható: MXM
口径: 6.5x47 mm (HPBT Scenar)<br />装填数: 30<br />次で使用: MXM
- 구경: 6.5x47mm (HPBT Scenar)<br/>장탄수: 30<br/>사용처: MXM
+ 구경: 6.5x47mm (Scenar제 보트 테일 할로우 포인트)<br/>장탄수: 30<br/>사용처: MXM
口徑: 6.5x47毫米 (拉普 空尖艇尾狙擊專用彈)<br />發數: 30<br />使用於: MXM
口径：6.5x47 mm（HPBT Scenar 狙击专用弹）<br />发数：30<br />使用于：MXM
Kalibre: 6.5x47 mm (HPBT Scenar)<br />Mermi: 30<br />Kullanıyor: MXM
@@ -2918,7 +2918,7 @@
Calibre: 6.5x47 mm (HPBT Scenar)<br/>Cartuchos: 30<br/>Usado em: Promet MR
Kaliber: 6,5x47 mm (HPBT Scenar)<br />Lövedékek: 30<br />Használható: Promet MR
口径: 6.5x47 mm (HPBT Scenar)<br />装填数: 30<br />次で使用: Promet MR
- 구경: 6.5x47mm (HPBT Scenar)<br/>장탄수: 30<br/>사용처: MSBS 그롯/GL/MR/SG
+ 구경: 6.5x47mm (Scenar제 보트 테일 할로우 포인트)<br/>장탄수: 30<br/>사용처: MSBS 그롯/GL/MR/SG
口徑: 6.5x47毫米 (拉普 空尖艇尾狙擊專用彈)<br />發數: 30<br />使用於: Promet MR
口径：6.5x47 mm（HPBT Scenar 狙击专用弹）<br />发数：30<br />使用于：Promet MR
Kalibre: 6.5x47 mm (HPBT Scenar)<br />Mermi: 30<br />Kullanıyor: Promet MR
@@ -2931,7 +2931,7 @@
6.5 mm Creedmor 30cp Car Sabbia
Magazynek 6.5 mm Creedmor 30Rnd Piaskowy
6.5 mm 30发 沙色弹匣（Creedmor）
- 6.5mm 크리드무어 30발 사막 탄창
+ 6.5mm 크리드무어 30발 들이 탄창/사막
Магазин из 30-ти 6.5 мм Creedmor Песочный
Cargador de 30 balas de 6.5mm Creedmor Arena
Carregador 6.5 mm com 30 cartuchos Creedmor Areia
@@ -2944,7 +2944,7 @@
6.5 mm Creedmor 30cp Car Promet
Magazynek 6.5 mm Creedmor 30Rnd Promet
6.5 mm 30发 Promet 弹匣（Creedmor）
- 6.5mm 크리드무어 30발 프로멧 탄창
+ 6.5mm 크리드무어 30발 들이 탄창/프로멧용
Магазин из 30-ти 6.5 мм Creedmor Promet
Cargador de 30 balas de 6.5mm Creedmor Promet
Carregador 6.5 mm com 30 cartuchos Creedmor Promet
@@ -2957,7 +2957,7 @@
6.5 mm Creedmor 30cp Car Nero
Magazynek 6.5 mm Creedmor 30Rnd Czarny
6.5 mm 30发 黑色弹匣（Creedmor）
- 6.5mm 크리드무어 30발 검정 탄창
+ 6.5mm 크리드무어 30발 들이 탄창/검정
Магазин из 30-ти 6.5 мм Creedmor Чёрный
Cargador de 30 balas de 6.5mm Creedmor Negro
Carregador 6.5 mm com 30 cartuchos Creedmor Preto
@@ -2970,7 +2970,7 @@
6.5 mm Creedmor 30cp Car Cachi
Magazynek 6.5 mm Creedmor 30Rnd Khaki
6.5 mm 30发 卡其色弹匣（Creedmor）
- 6.5mm 크리드무어 30발 카키 탄창
+ 6.5mm 크리드무어 30발 들이 탄창/카키
Магазин из 30-ти 6.5 мм Creedmor Хаки
Cargador de 30 balas de 6.5mm Creedmor Caqui
Carregador 6.5 mm com 30 cartuchos Creedmor Caqui
@@ -3038,7 +3038,7 @@
Carregador .338 LM (300gr Lapua Scenar) com 10 cartuchos
.338 LM 10-lövedékes tár (300gr Lapua Scenar)
.338 LM 10Rnd マガジン (300gr Lapua Scenar)
- 10발 들이 .338구경 라푸아 매그넘 탄창 (300그레인 Scenar)
+ .338구경 라푸아 매그넘 10발 들이 탄창 (Scenar제 300그레인)
.338 10發 彈匣 (300公克 Lapua Scenar)
.338 LM 10发 弹匣（300gr Lapua Scenar）
.338 LM 10Rnd Mag (300gr Lapua Scenar)
@@ -3072,7 +3072,7 @@
Calibre: 8.6x70mm (300gr Lapua Scenar)<br/>Cartuchos: 10
Kaliber: 8,6x70mm (300gr Lapua Scenar)<br />Lövedékek: 10
口径: 8.6x70mm (300gr Lapua Scenar)<br />装填数: 10
- 구경: 8.6x70mm 라푸아 매그넘 (300그레인 Scenar)<br/>장탄수: 10
+ 구경: 8.6x70mm 라푸아 매그넘 (Scenar제 300그레인)<br/>장탄수: 10
口徑: 8.6x70毫米 (300公克 Lapua Scenar)<br />發數: 10
口径：8.6x70 mm（300gr Lapua Scenar）<br />发数：10
Kalibre: 8.6x70mm (300gr Lapua Scenar)<br />Mermi: 10
@@ -3089,7 +3089,7 @@
Carregador .338 LM (API526) com 10 cartuchos
.338 LM 10-lövedékes tár (API526)
.338 LM 10Rnd マガジン (API526)
- 10발 들이 .338구경 라푸아 매그넘 탄창 (API526)
+ .338구경 라푸아 매그넘 10발 들이 탄창 (API526)
.338 10發 彈匣 (API526 穿甲燃燒彈)
.338 LM 10发 弹匣（API526 穿燃）
.338 LM 10Rnd Mag (API526)
@@ -3106,7 +3106,7 @@
.338 AP
.338 páncéltörő
.338 AP
- .338구경 라푸아 매그넘 철갑탄
+ .338구경 라푸아 매그넘 철갑소이탄
.338 API526 穿甲燃燒彈
.338 穿燃
.338 AP
@@ -3123,7 +3123,7 @@
Calibre: 8.6x70mm (API526)<br/>Cartuchos: 10
Kaliber: 8,6x70mm (API526)<br />Lövedékek: 10
口径: 8.6x70mm (API526)<br />装填数: 10
- 구경: 8.6x70mm 라푸아 매그넘 (API526)<br/>장탄수: 10
+ 구경: 8.6x70mm 라푸아 매그넘 (API526 철갑소이탄)<br/>장탄수: 10
口徑: 8.6x70毫米 (API526 穿甲燃燒彈)<br />發數: 10
口径：8.6x70 mm（API526 穿燃）<br />发数：10
Kalibre: 8.6x70mm (API526)<br />Mermi: 10
@@ -3140,7 +3140,7 @@
Carregador .408 (305gr) com 7 cartuchos
.408 7-lövedékes tár (305gr)
.408 7Rnd マガジン (305gr)
- 7발 들이 .408구경 샤이택 탄창 (305그레인)
+ .408구경 샤이택 7발 들이 탄창 (305그레인)
.408 7發 彈匣 (305公克)
.408 7发 弹匣（305gr）
.408 7Rnd Mag (305gr)
@@ -3191,7 +3191,7 @@
Carregador 12.7x99 mm com 5 cartuchos
12,7x99 mm 5-lövedékes tár
12.7x99mm 5Rnd マガジン
- 5발 들이 12.7x99mm 탄창
+ 12.7x99mm 5발 들이 탄창
12.7x99毫米 5發 彈匣
12.7x99 mm 5发 弹匣
12.7x99 mm 5Rnd Mag
@@ -3225,7 +3225,7 @@
Carregador 12.7x99 mm com 10 cartuchos
12,7x99 mm 10-lövedékes tár
12.7x99mm 10Rnd マガジン
- 10발 들이 12.7x99mm 탄창
+ 12.7x99mm 10발 들이 탄창
12.7x99毫米 10發 彈匣
12.7x99 mm 10发 弹匣
12.7x99 mm 10Rnd Mag
@@ -3276,7 +3276,7 @@
Carregador 12.7x99 mm API com 5 cartuchos
12,7x99 mm 5-lövedékes tár (páncéltörő-gyújtó)
12.7x99mm 5Rnd 焼夷徹甲弾 マガジン
- 5발 들이 12.7x99mm 철갑소이탄 탄창
+ 12.7x99mm 5발 들이 탄창 (철갑소이탄)
12.7x99毫米 穿甲燃燒彈 5發 彈匣
12.7x99 mm 穿燃 5发 弹匣
12.7x99 mm API 5Rnd Mag
@@ -3310,7 +3310,7 @@
Carregador 12.7x99 mm API com 10 cartuchos
12,7x99 mm 10-lövedékes tár (páncéltörő-gyújtó)
12.7x99mm 10Rnd 焼夷徹甲弾 マガジン
- 10발 들이 12.7x99mm 철갑소이탄 탄창
+ 12.7x99mm 10발 들이 탄창 (철갑소이탄)
12.7x99毫米 穿甲燃燒彈 10發 彈匣
12.7x99 mm 穿燃 10发 弹匣
12.7x99 mm API 10Rnd Mag
@@ -3344,7 +3344,7 @@
Carregador 12.7x99 mm (AMAX) com 5 cartuchos
12,7x99 mm 5-lövedékes tár (AMAX)
12.7x99mm 5Rnd マガジン (AMAX)
- 5발 들이 12.7x99mm 탄창 (AMAX)
+ 12.7x99mm 5발 들이 탄창 (A-MAX)
12.7x99毫米 5發 彈匣 (AMAX 比賽專用彈)
12.7x99 mm 5发 弹匣（AMAX）
12.7x99 mm 5Rnd Şarjör (AMAX)
@@ -3361,7 +3361,7 @@
Calibre: 12.7x99 mm (AMAX)<br/>Cartuchos: 5
Kaliber: 12,7x99 mm (AMAX)<br />Lövedékek: 5
口径: 12.7x99 mm (AMAX)<br />装填数: 5
- 구경: 12.7x99mm (AMAX)<br/>장탄수: 5
+ 구경: 12.7x99mm (A-MAX 매치그레이드)<br/>장탄수: 5
口徑: 12.7x99毫米 (AMAX 比賽專用彈)<br />發數: 5
口径：12.7x99 mm（AMAX）<br />发数：5
Kalibre: 12.7x99 mm (AMAX)<br />Mermi: 5
@@ -3378,7 +3378,7 @@
Carregador 12.7x99 mm (AMAX) com 10 cartuchos
12,7x99 mm 10-lövedékes tár (AMAX)
12.7x99mm 10Rnd マガジン (AMAX)
- 10발 들이 12.7x99mm 탄창 (AMAX)
+ 12.7x99mm 10발 들이 탄창 (A-MAX)
12.7x99毫米 10發 彈匣 (AMAX 比賽專用彈)
12.7x99 mm 10发 弹匣（AMAX）
12.7x99 mm 10Rnd Şarjör (AMAX)
@@ -3395,7 +3395,7 @@
Calibre: 12.7x99 mm (AMAX)<br/>Cartuchos: 10
Kaliber: 12,7x99 mm (AMAX)<br />Lövedékek: 10
口径: 12.7x99 mm (AMAX)<br />装填数: 10
- 구경: 12.7x99mm (AMAX)<br/>장탄수: 10
+ 구경: 12.7x99mm (A-MAX 매치그레이드)<br/>장탄수: 10
口徑: 12.7x99毫米 (AMAX 比賽專用彈)<br />發數: 10
口径：12.7x99 mm（AMAX）<br />发数：10
Kalibre: 12.7x99 mm (AMAX)<br />Mermi: 10
@@ -3412,7 +3412,7 @@
12.7 mm AMAX
12,7 mm AMAX
12.7 mm AMAX
- 12.7mm AMAX
+ 12.7mm A-MAX
12.7毫米 AMAX 比賽專用彈
12.7 mm AMAX
12.7 mm AMAX
diff --git a/addons/captives/functions/fnc_handleRespawn.sqf b/addons/captives/functions/fnc_handleRespawn.sqf
index 1dc6ca7bfa3..f3c728d0538 100644
--- a/addons/captives/functions/fnc_handleRespawn.sqf
+++ b/addons/captives/functions/fnc_handleRespawn.sqf
@@ -40,12 +40,12 @@ if (_respawn > 3) then {
if (_unit getVariable [QGVAR(isHandcuffed), false]) then {
[_unit, false] call FUNC(setHandcuffed);
};
- [_unit, "setCaptive", QGVAR(Handcuffed), false] call EFUNC(common,statusEffect_set);
+ [_unit, "setCaptive", QGVAR(handcuffed), false] call EFUNC(common,statusEffect_set);
if (_unit getVariable [QGVAR(isSurrendering), false]) then {
[_unit, false] call FUNC(setSurrendered);
};
- [_unit, "setCaptive", QGVAR(Surrendered), false] call EFUNC(common,statusEffect_set);
+ [_unit, "setCaptive", QGVAR(surrendered), false] call EFUNC(common,statusEffect_set);
if (_unit getVariable [QGVAR(isEscorting), false]) then {
_unit setVariable [QGVAR(isEscorting), false, true];
diff --git a/addons/captives/functions/fnc_setHandcuffed.sqf b/addons/captives/functions/fnc_setHandcuffed.sqf
index d3d9fa4e6b6..2ccd36493c8 100644
--- a/addons/captives/functions/fnc_setHandcuffed.sqf
+++ b/addons/captives/functions/fnc_setHandcuffed.sqf
@@ -41,8 +41,8 @@ if ((_unit getVariable [QGVAR(isHandcuffed), false]) isEqualTo _state) exitWith
if (_state) then {
_unit setVariable [QGVAR(isHandcuffed), true, true];
- [_unit, "setCaptive", QGVAR(Handcuffed), true] call EFUNC(common,statusEffect_set);
- [_unit, "blockRadio", QGVAR(Handcuffed), true] call EFUNC(common,statusEffect_set);
+ [_unit, "setCaptive", QGVAR(handcuffed), true] call EFUNC(common,statusEffect_set);
+ [_unit, "blockRadio", QGVAR(handcuffed), true] call EFUNC(common,statusEffect_set);
if (_unit getVariable [QGVAR(isSurrendering), false]) then { //If surrendering, stop
[_unit, false] call FUNC(setSurrendered);
@@ -82,8 +82,8 @@ if (_state) then {
}, [_unit], 0.01] call CBA_fnc_waitAndExecute;
} else {
_unit setVariable [QGVAR(isHandcuffed), false, true];
- [_unit, "setCaptive", QGVAR(Handcuffed), false] call EFUNC(common,statusEffect_set);
- [_unit, "blockRadio", QGVAR(Handcuffed), false] call EFUNC(common,statusEffect_set);
+ [_unit, "setCaptive", QGVAR(handcuffed), false] call EFUNC(common,statusEffect_set);
+ [_unit, "blockRadio", QGVAR(handcuffed), false] call EFUNC(common,statusEffect_set);
//remove AnimChanged EH
private _animChangedEHID = _unit getVariable [QGVAR(handcuffAnimEHID), -1];
diff --git a/addons/captives/functions/fnc_setSurrendered.sqf b/addons/captives/functions/fnc_setSurrendered.sqf
index 887bfb26808..3a3724c94d2 100644
--- a/addons/captives/functions/fnc_setSurrendered.sqf
+++ b/addons/captives/functions/fnc_setSurrendered.sqf
@@ -44,8 +44,8 @@ if (_state) then {
_unit setVariable [QGVAR(isSurrendering), true, true];
- [_unit, "setCaptive", QGVAR(Surrendered), true] call EFUNC(common,statusEffect_set);
- [_unit, "blockRadio", QGVAR(Surrendered), true] call EFUNC(common,statusEffect_set);
+ [_unit, "setCaptive", QGVAR(surrendered), true] call EFUNC(common,statusEffect_set);
+ [_unit, "blockRadio", QGVAR(surrendered), true] call EFUNC(common,statusEffect_set);
if (_unit == ACE_player) then {
["captive", [false, false, false, false, false, false, false, false, false, true]] call EFUNC(common,showHud);
@@ -71,8 +71,8 @@ if (_state) then {
}, [_unit], 0.01] call CBA_fnc_waitAndExecute;
} else {
_unit setVariable [QGVAR(isSurrendering), false, true];
- [_unit, "setCaptive", QGVAR(Surrendered), false] call EFUNC(common,statusEffect_set);
- [_unit, "blockRadio", QGVAR(Surrendered), false] call EFUNC(common,statusEffect_set);
+ [_unit, "setCaptive", QGVAR(surrendered), false] call EFUNC(common,statusEffect_set);
+ [_unit, "blockRadio", QGVAR(surrendered), false] call EFUNC(common,statusEffect_set);
//remove AnimChanged EH
private _animChangedEHID = _unit getVariable [QGVAR(surrenderAnimEHID), -1];
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index 4fc86ec58fe..dfc293028dc 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -158,6 +158,7 @@
目隠しを外す
Снять повязку с глаз
Quitar vendas de los ojos
+ Remover a venda
Cable Tie
diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
index 66fa98159e3..9b4e316a19a 100644
--- a/addons/cargo/CfgVehicles.hpp
+++ b/addons/cargo/CfgVehicles.hpp
@@ -1,4 +1,3 @@
-
class CBA_Extended_EventHandlers;
class CfgVehicles {
@@ -55,7 +54,7 @@ class CfgVehicles {
GVAR(space) = 4;
GVAR(hasCargo) = 1;
};
- class Tank_F: Tank {};
+ class Tank_F;
class UGV_02_Base_F: Tank_F {
GVAR(space) = 0;
GVAR(hasCargo) = 0;
@@ -237,8 +236,6 @@ class CfgVehicles {
GVAR(hasCargo) = 1;
};
- class O_Heli_Transport_04_fuel_F: Heli_Transport_04_base_F {};
-
class O_Heli_Transport_04_medevac_F: Heli_Transport_04_base_F {
GVAR(space) = 10;
GVAR(hasCargo) = 1;
@@ -259,7 +256,7 @@ class CfgVehicles {
GVAR(hasCargo) = 0;
};
- class Plane_Base_F: Plane {};
+ class Plane_Base_F;
class Plane_Civil_01_base_F: Plane_Base_F { // Tanoa Civilian Prop Plane
GVAR(space) = 2;
GVAR(hasCargo) = 1;
@@ -300,7 +297,7 @@ class CfgVehicles {
GVAR(hasCargo) = 1;
};
- class Boat_F: Ship_F {};
+ class Boat_F;
class Rubber_duck_base_F: Boat_F {
GVAR(space) = 0;
GVAR(hasCargo) = 0;
@@ -356,7 +353,7 @@ class CfgVehicles {
};
// Slingload pallets
- class Slingload_base_F: ReammoBox_F {};
+ class Slingload_base_F;
class CargoNet_01_base_F: Slingload_base_F {
GVAR(size) = 6;
};
@@ -512,10 +509,6 @@ class CfgVehicles {
transportMaxWeapons = 12;
};
class Land_WoodenCrate_01_F: ThingX {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 3;
GVAR(hasCargo) = 1;
GVAR(size) = 3;
@@ -545,240 +538,141 @@ class CfgVehicles {
};
};
class Cargo10_base_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 14;
GVAR(size) = 15;
};
- class Land_Cargo20_blue_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
+ class Land_Cargo10_IDAP_F: ThingX {
+ GVAR(space) = 14;
+ GVAR(size) = 15;
+ };
+ class Land_Cargo20_blue_F: Cargo_base_F {
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_brick_red_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_cyan_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_grey_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_light_blue_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_light_green_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_military_green_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_orange_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_red_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_sand_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_vr_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_white_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo20_yellow_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 49;
GVAR(size) = 50;
};
- class Cargo_IDAP_base_F: Cargo_base_F {};
+
+ class Cargo_IDAP_base_F;
class Land_Cargo20_IDAP_F: Cargo_IDAP_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
+ GVAR(space) = 49;
+ GVAR(size) = 50;
+ };
+ class Cargo_EMP_base_F;
+ class Land_Cargo20_EMP_F: Cargo_EMP_base_F {
+ GVAR(space) = 49;
+ GVAR(size) = 50;
+ };
+ class Land_Cargo20_EMP_Training_F: Cargo_EMP_base_F {
GVAR(space) = 49;
GVAR(size) = 50;
};
class Land_Cargo40_blue_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_brick_red_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_cyan_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_grey_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_light_blue_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_light_green_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_military_green_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_orange_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_red_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
class Land_Cargo40_sand_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 99;
GVAR(size) = 100;
};
- class Land_Cargo40_vr_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
+ class Land_Cargo40_white_F: Cargo_base_F {
GVAR(space) = 99;
GVAR(size) = 100;
};
- class Land_Cargo40_white_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
+ class Land_Cargo40_yellow_F: Cargo_base_F {
GVAR(space) = 99;
GVAR(size) = 100;
};
- class Land_Cargo40_yellow_F: Cargo_base_F {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
+ class Land_Cargo40_IDAP_F: Cargo_IDAP_base_F {
GVAR(space) = 99;
GVAR(size) = 100;
};
// Small
class Land_CargoBox_V1_F: ThingX {
- class EventHandlers {
- class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
- };
-
GVAR(space) = 7;
GVAR(hasCargo) = 1;
GVAR(size) = 7;
diff --git a/addons/cargo/XEH_PREP.hpp b/addons/cargo/XEH_PREP.hpp
index 10281e29674..4632a401f17 100644
--- a/addons/cargo/XEH_PREP.hpp
+++ b/addons/cargo/XEH_PREP.hpp
@@ -5,6 +5,7 @@ PREP(canUnloadItem);
PREP(deployCancel);
PREP(deployConfirm);
PREP(getCargoSpaceLeft);
+PREP(getDelayItem);
PREP(getNameItem);
PREP(getSelectedItem);
PREP(getSizeItem);
diff --git a/addons/cargo/XEH_postInit.sqf b/addons/cargo/XEH_postInit.sqf
index f48849b50bc..45c1b9601a6 100644
--- a/addons/cargo/XEH_postInit.sqf
+++ b/addons/cargo/XEH_postInit.sqf
@@ -51,7 +51,7 @@
params ["_item", "_emptyPosAGL"];
_item hideObjectGlobal false;
- _item setPosASL (AGLtoASL _emptyPosAGL);
+ _item setPosASL (AGLToASL _emptyPosAGL);
// Let objects remain invulernable for a short while after placement
[EFUNC(common,statusEffect_set), [_item, "blockDamage", QUOTE(ADDON), false], 2] call CBA_fnc_waitAndExecute;
diff --git a/addons/cargo/functions/fnc_deployConfirm.sqf b/addons/cargo/functions/fnc_deployConfirm.sqf
index 27674b0515b..e4c87342f04 100644
--- a/addons/cargo/functions/fnc_deployConfirm.sqf
+++ b/addons/cargo/functions/fnc_deployConfirm.sqf
@@ -24,7 +24,7 @@ if (!isNull GVAR(itemPreviewObject) && {[GVAR(selectedItem), GVAR(interactionVeh
// Position is AGL for unloading event
private _position = ASLToAGL getPosASL GVAR(itemPreviewObject);
private _direction = getDir GVAR(itemPreviewObject);
- private _duration = GVAR(loadTimeCoefficient) * (GVAR(selectedItem) call FUNC(getSizeItem));
+ private _duration = [GVAR(selectedItem), false] call FUNC(getDelayItem);
// If unload time is 0, don't show a progress bar
if (_duration <= 0) exitWith {
diff --git a/addons/cargo/functions/fnc_getDelayItem.sqf b/addons/cargo/functions/fnc_getDelayItem.sqf
new file mode 100644
index 00000000000..7f1d6b4d401
--- /dev/null
+++ b/addons/cargo/functions/fnc_getDelayItem.sqf
@@ -0,0 +1,26 @@
+#include "..\script_component.hpp"
+/*
+ * Author: tcvm
+ * Gets the delay duration an item should take to load/unload.
+ *
+ * Arguments:
+ * 0: Item
@@ -1932,5 +1932,22 @@
Влияет на величину колебания прицела оружия при его развертывании.
Afecta la cantidad de oscilación del arma cuando se está desplegado.
+
+ Release
+ Отпустить
+ Soltar
+ Puść
+ Položit
+ Lâcher
+ Loslassen
+ Soltar
+ Lascia
+ Elengedés
+ 離す
+ 놓기
+ 放開
+ 放开
+ Bırak
+
diff --git a/addons/compat_aegis/$PBOPREFIX$ b/addons/compat_aegis/$PBOPREFIX$
new file mode 100644
index 00000000000..1fc86838473
--- /dev/null
+++ b/addons/compat_aegis/$PBOPREFIX$
@@ -0,0 +1 @@
+z\ace\addons\compat_aegis
diff --git a/addons/compat_aegis/compat_aegis_realisticnames/CfgVehicles.hpp b/addons/compat_aegis/compat_aegis_realisticnames/CfgVehicles.hpp
new file mode 100644
index 00000000000..19a1bef5104
--- /dev/null
+++ b/addons/compat_aegis/compat_aegis_realisticnames/CfgVehicles.hpp
@@ -0,0 +1,21 @@
+class CfgVehicles {
+ class APC_Wheeled_01_base_v2_F;
+ class B_APC_Wheeled_01_cannon_v2_F: APC_Wheeled_01_base_v2_F {
+ displayName = ECSTRING(realisticnames,APC_Wheeled_01_cannon_Name);
+ };
+
+ class B_APC_Wheeled_01_base_F;
+ class B_APC_Wheeled_01_medical_F: B_APC_Wheeled_01_base_F {
+ displayName = SUBCSTRING(APC_Wheeled_01_medical_Name);
+ };
+
+ class APC_Tracked_02_medical_base_F;
+ class O_R_APC_Tracked_02_medical_F: APC_Tracked_02_medical_base_F {
+ displayName = SUBCSTRING(APC_Tracked_02_medical_Name);
+ };
+
+ class APC_Tracked_03_base_v2_F;
+ class B_A_APC_tracked_03_cannon_v2_F: APC_Tracked_03_base_v2_F {
+ displayName = ECSTRING(realisticnames,APC_tracked_03_cannon_Name);
+ };
+};
diff --git a/addons/compat_aegis/compat_aegis_realisticnames/config.cpp b/addons/compat_aegis/compat_aegis_realisticnames/config.cpp
new file mode 100644
index 00000000000..add9f50a3a4
--- /dev/null
+++ b/addons/compat_aegis/compat_aegis_realisticnames/config.cpp
@@ -0,0 +1,26 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "A3_Aegis_Armor_F_Aegis_APC_Wheeled_01",
+ "A3_Aegis_Armor_F_Aegis_APC_Tracked_02",
+ "A3_Aegis_Armor_F_Aegis_APC_Tracked_03",
+ "ace_realisticnames"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ // this prevents any patched class from requiring this addon
+ addonRootClass = "A3_Characters_F";
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_aegis/compat_aegis_realisticnames/script_component.hpp b/addons/compat_aegis/compat_aegis_realisticnames/script_component.hpp
new file mode 100644
index 00000000000..b8d0682fa4f
--- /dev/null
+++ b/addons/compat_aegis/compat_aegis_realisticnames/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT realisticnames
+#define SUBCOMPONENT_BEAUTIFIED Realistic Names
+#include "..\script_component.hpp"
diff --git a/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml b/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml
new file mode 100644
index 00000000000..6d7dfa47a12
--- /dev/null
+++ b/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml
@@ -0,0 +1,37 @@
+
+
+
+
+ Badger IFV (Medical)
+ SPz Badger (Medizin)
+ Badger IFV (médico)
+ Badger IFV (sprzęt medyczny)
+ Badger IFV (zdravotnický)
+ Badger IFV (médical)
+ БМП Badger (медицинский)
+ Badger IFV (médico)
+ Badger IFV (medico)
+ バジャー IFV（医療）
+ 뱃져 보병전투차 (의료)
+ "蜜獾"步兵戰車（醫療用）
+ "蜜獾"（医疗）
+ Badger IFV (Sıhhiye)
+
+
+ BM-2T Stalker (Medical)
+ BM-2T Stalker (Medizin)
+ BM-2T Stalker (médico)
+ BM-2T Stalker (sprzęt medyczny)
+ BM-2T Stalker (zdravotnický)
+ BM-2T Stalker (médical)
+ БМ-2Т Сталкер (медицинский)
+ BM-2T Stalker (médico)
+ BM-2T Stalker (medico)
+ BM-2T ストーカー（医療）
+ BM-2T 스토커 (의료)
+ BM-2T"潛行者"步兵戰車（醫療用）
+ BM-2T "潜行者"（医疗）
+ BM-2T Stalker (Sıhhiye)
+
+
+
diff --git a/addons/compat_aegis/compat_aegis_vehicles/CfgVehicles.hpp b/addons/compat_aegis/compat_aegis_vehicles/CfgVehicles.hpp
new file mode 100644
index 00000000000..5d0e86faafd
--- /dev/null
+++ b/addons/compat_aegis/compat_aegis_vehicles/CfgVehicles.hpp
@@ -0,0 +1,95 @@
+class CfgVehicles {
+ class Tank;
+ class Tank_F: Tank {
+ class Turrets {
+ class MainTurret;
+ };
+ };
+
+ class APC_Tracked_03_base_F: Tank_F {
+ class Turrets: Turrets {
+ class MainTurret: MainTurret {};
+ };
+ };
+ class APC_Tracked_03_base_v2_F: APC_Tracked_03_base_F {
+ class Turrets: Turrets {
+ class MainTurret: MainTurret {
+ weapons[] = {"autocannon_40mm_CTWS", "ACE_LMG_coax_L94A1_mem3"}; // Aegis upgrades to a 40mm cannon, but we want realistic MG name
+ };
+ };
+ };
+
+ class MBT_01_base_F: Tank_F {
+ class Turrets: Turrets {
+ class MainTurret: MainTurret {
+ // Overwrite the changes Aegis makes for the .338 coax MG on the Slammer/Merkava
+ // The idea is:
+ // 1) keep it as realistic as possible
+ // 2) easier to overwrite something with skipWhenMissingDependencies than to not overwrite something if another mod is loaded
+ weapons[] = {"cannon_120mm", "ACE_LMG_coax_MAG58_mem3"}; // Base 1.82: "cannon_120mm","LMG_coax"
+ magazines[] = {
+ "24Rnd_120mm_APFSDS_shells_Tracer_Red",
+ "12Rnd_120mm_HE_shells_Tracer_Red",
+ "12Rnd_120mm_HEAT_MP_T_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "4Rnd_120mm_LG_cannon_missiles" // Aegis adds laser-guided munitions
+ };
+ };
+ };
+ };
+
+ class B_MBT_01_base_F: MBT_01_base_F {};
+ class B_MBT_01_cannon_F: B_MBT_01_base_F {};
+ class B_MBT_01_TUSK_F: B_MBT_01_cannon_F {
+ class Turrets: Turrets {
+ class MainTurret: MainTurret {
+ weapons[] = {"cannon_120mm", "ACE_LMG_coax_MAG58_mem3"}; // Base 1.82: "cannon_120mm","LMG_coax"
+ magazines[] = {
+ "24Rnd_120mm_APFSDS_shells_Tracer_Red",
+ "12Rnd_120mm_HE_shells_Tracer_Red",
+ "12Rnd_120mm_HEAT_MP_T_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "200Rnd_762x51_Belt_Red",
+ "4Rnd_120mm_LG_cannon_missiles" // Aegis adds laser-guided munitions
+ };
+ };
+ };
+ };
+};
diff --git a/addons/compat_aegis/compat_aegis_vehicles/config.cpp b/addons/compat_aegis/compat_aegis_vehicles/config.cpp
new file mode 100644
index 00000000000..fd16fa86865
--- /dev/null
+++ b/addons/compat_aegis/compat_aegis_vehicles/config.cpp
@@ -0,0 +1,25 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "A3_Aegis_Armor_F_Aegis_MBT_01",
+ "A3_Aegis_Armor_F_Aegis_APC_Tracked_03",
+ "ace_vehicles"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ // this prevents any patched class from requiring this addon
+ addonRootClass = "A3_Characters_F";
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_aegis/compat_aegis_vehicles/script_component.hpp b/addons/compat_aegis/compat_aegis_vehicles/script_component.hpp
new file mode 100644
index 00000000000..17370c415fd
--- /dev/null
+++ b/addons/compat_aegis/compat_aegis_vehicles/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT vehicles
+#define SUBCOMPONENT_BEAUTIFIED Vehicles
+#include "..\script_component.hpp"
diff --git a/addons/compat_aegis/config.cpp b/addons/compat_aegis/config.cpp
new file mode 100644
index 00000000000..2de723b9a48
--- /dev/null
+++ b/addons/compat_aegis/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class ADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {"ace_common"};
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ // this prevents any patched class from requiring this addon
+ addonRootClass = "A3_Characters_F";
+ };
+};
diff --git a/addons/compat_aegis/script_component.hpp b/addons/compat_aegis/script_component.hpp
new file mode 100644
index 00000000000..d6fb73bd462
--- /dev/null
+++ b/addons/compat_aegis/script_component.hpp
@@ -0,0 +1,5 @@
+#define COMPONENT compat_aegis
+#define COMPONENT_BEAUTIFIED Aegis Compatibility
+
+#include "\z\ace\addons\main\script_mod.hpp"
+#include "\z\ace\addons\main\script_macros.hpp"
diff --git a/addons/compat_csla/compat_csla_explosives/CfgMagazines.hpp b/addons/compat_csla/compat_csla_explosives/CfgMagazines.hpp
index b29f7e717dc..0c8a8aa6fd8 100644
--- a/addons/compat_csla/compat_csla_explosives/CfgMagazines.hpp
+++ b/addons/compat_csla/compat_csla_explosives/CfgMagazines.hpp
@@ -1,15 +1,15 @@
class CfgMagazines {
class US85_Magazine;
class US85_ATMine_mag: US85_Magazine {
- EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_ATMine_mag";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_US85_ATMine_mag";
useAction = 0;
};
class US85_M14Mine_mag: US85_Magazine {
- EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_M14Mine";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_US85_M14Mine";
useAction = 0;
};
class US85_SatchelCharge_Mag: US85_Magazine {
- EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_SatchelCharge_Mag";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_US85_SatchelCharge_Mag";
useAction = 0;
};
};
diff --git a/addons/compat_cup_vehicles/CfgVehicles.hpp b/addons/compat_cup_vehicles/CfgVehicles.hpp
index 5334987fff6..ce502abad53 100644
--- a/addons/compat_cup_vehicles/CfgVehicles.hpp
+++ b/addons/compat_cup_vehicles/CfgVehicles.hpp
@@ -1,4 +1,31 @@
class CfgVehicles {
+ class CUP_nHMMWV_Base;
+ class CUP_nM1025_SOV_Base: CUP_nHMMWV_Base {
+ class EGVAR(interaction,anims) {
+ class hide_backpacks {
+ positions[] = {
+ "(_target selectionPosition ['vhc_backpacks', 'ViewGeometry', 'AveragePoint']) vectorAdd [-1, 0, 0]",
+ "(_target selectionPosition ['vhc_backpacks', 'ViewGeometry', 'AveragePoint']) vectorAdd [1.3, 0, 0]"
+ };
+ items[] = {"CUP_B_USPack_Coyote", "CUP_B_USPack_Coyote", "CUP_B_AssaultPack_ACU", "CUP_B_AssaultPack_ACU", "CUP_B_AssaultPack_Coyote"};
+ name = "$STR_a3_cfgvehicleclasses_backpacks0";
+ text = "$STR_a3_cfgvehicleclasses_backpacks0";
+ };
+ };
+ };
+
+ class Car_F;
+ class CUP_ECVHMMWV_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_deploy2 {
+ positions[] = {"(_target selectionPosition ['vhc_rear_trunk_door', 'FireGeometry', 'AveragePoint']) vectorAdd [-0.7, 0, 0]"};
+ items[] = {"CUP_B_USPack_Coyote", "CUP_B_AssaultPack_ACU"};
+ name = "$STR_a3_cfgvehicleclasses_backpacks0";
+ text = "$STR_a3_cfgvehicleclasses_backpacks0";
+ };
+ };
+ };
+
class CUP_MTVR_Base;
class CUP_MTVR_Reammo_Base: CUP_MTVR_Base {
EGVAR(rearm,defaultSupply) = 1200;
@@ -106,6 +133,17 @@ class CfgVehicles {
class CUP_BTR90_HQ_Base: CUP_BTR90_Base { delete ace_viewports; }; // no cargo seats
class Tank_F;
+ class CUP_AAV_Base: Tank_F {
+ class EGVAR(interaction,anims) {
+ class Hide_Bags_Deployment {
+ positions[] = {{1.7, -0.7, -0.3}, {1.7, -2.55, -0.3}};
+ items[] = {"CUP_B_USPack_Coyote", "CUP_B_USPack_Coyote"};
+ name = "$STR_CUP_dn_USpack_coyote";
+ text = "$STR_CUP_dn_USpack_coyote";
+ };
+ };
+ };
+
class CUP_M2Bradley_Base: Tank_F {
ace_hunterkiller = 1;
class ace_viewports {
diff --git a/addons/compat_cup_vehicles/compat_cup_repair/CfgVehicles.hpp b/addons/compat_cup_vehicles/compat_cup_repair/CfgVehicles.hpp
new file mode 100644
index 00000000000..29a471f4516
--- /dev/null
+++ b/addons/compat_cup_vehicles/compat_cup_repair/CfgVehicles.hpp
@@ -0,0 +1,196 @@
+class CfgVehicles {
+ class Car_F;
+ class CUP_Datsun_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hideSpareTire {
+ positions[] = {{-0.23, -0.25, -0.8}};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ class CUP_Datsun_AA_Base: CUP_Datsun_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hideSpareTire: hideSpareTire {
+ enabled = 0;
+ };
+ };
+ };
+
+ class CUP_Tigr_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_ReserveWheel {
+ positions[] = {{0.57, -2.3, -0.55}};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ class CUP_Tigr_STS_PK_Base: CUP_Tigr_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_ReserveWheel: hide_ReserveWheel {};
+ };
+ };
+ class CUP_Tigr_233014_PK_Base: CUP_Tigr_STS_PK_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_ReserveWheel: hide_ReserveWheel {
+ positions[] = {{0.57, -2.3, -0.85}};
+ };
+ };
+ };
+ class CUP_Tigr_M_PK_Base: CUP_Tigr_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_ReserveWheel: hide_ReserveWheel {};
+ };
+ };
+ class CUP_Tigr_233114_PK_Base: CUP_Tigr_M_PK_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_ReserveWheel: hide_ReserveWheel {
+ positions[] = {{0.57, -2.3, -0.85}};
+ };
+ };
+ };
+
+ class CUP_LR_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class selection_wheelfront {
+ positions[] = {"_target selectionPosition ['selection_wheelfront', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ class selection_wheels {
+ positions[] = {
+ "(_target selectionPosition ['selection_wheels', 'ViewGeometry', 'AveragePoint']) vectorAdd [-1.1, 0, 0]",
+ "(_target selectionPosition ['selection_wheels', 'ViewGeometry', 'AveragePoint']) vectorAdd [1.1, 0, 0]"
+ };
+ items[] = {"ACE_Wheel", "ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class CUP_nHMMWV_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare_wheel {
+ positions[] = {"_target selectionPosition ['vhc_spare_wheel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ // Don't inherit, as it's easier for the main compat
+ class CUP_nM1025_SOV_Base: CUP_nHMMWV_Base {
+ class EGVAR(interaction,anims) {
+ class hide_spare_wheel {
+ positions[] = {"_target selectionPosition ['vhc_spare_wheel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class CUP_RG31_BASE: Car_F {
+ class EGVAR(interaction,anims) {
+ class left_spare {
+ positions[] = {"_target selectionPosition ['left_spare', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ class right_spare {
+ positions[] = {"_target selectionPosition ['right_spare', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class CUP_UAZ_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare_wheel {
+ positions[] = {"_target selectionPosition ['spare_wheel', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ class CUP_UAZ_Armed_Base: CUP_UAZ_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare_wheel: hide_spare_wheel {};
+ };
+ };
+ class CUP_UAZ_AA_Base: CUP_UAZ_Armed_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare_wheel: hide_spare_wheel {
+ positions[] = {{0.18, -1.8, 0.75}};
+ };
+ };
+ };
+ class CUP_UAZ_AGS30_Base: CUP_UAZ_Armed_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare_wheel: hide_spare_wheel {
+ positions[] = {{0.18, -1.9, 0.75}};
+ };
+ };
+ };
+ class CUP_UAZ_MG_Base: CUP_UAZ_Armed_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare_wheel: hide_spare_wheel {
+ positions[] = {{0.18, -1.9, 0.2}};
+ };
+ };
+ };
+ // Visual is bugged, but it works
+ class CUP_UAZ_METIS_Base: CUP_UAZ_Armed_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare_wheel: hide_spare_wheel {
+ positions[] = {{0.18, -1.9, 0.65}};
+ };
+ };
+ };
+ class CUP_UAZ_SPG9_Base: CUP_UAZ_Armed_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare_wheel: hide_spare_wheel {
+ positions[] = {{0.18, -1.9, 1.05}};
+ };
+ };
+ };
+
+ class CUP_UAZ_Unarmed_Base: CUP_UAZ_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare_wheel: hide_spare_wheel {};
+ };
+ };
+ class CUP_UAZ_Open_Base: CUP_UAZ_Unarmed_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare_wheel: hide_spare_wheel {
+ positions[] = {{0.135, -1.3, 0.7}};
+ };
+ };
+ };
+
+ class CUP_ECVHMMWV_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare_tire {
+ positions[] = {"(_target selectionPosition ['vhc_rear_trunk_door', 'FireGeometry', 'AveragePoint']) vectorAdd [0.05, -0.4, 0.2]"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ class hide_deploy1 {
+ positions[] = {"(_target selectionPosition ['vhc_rear_trunk_door', 'FireGeometry', 'AveragePoint']) vectorAdd [0.05, 0.5, 0.7]"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+};
diff --git a/addons/compat_cup_vehicles/compat_cup_repair/config.cpp b/addons/compat_cup_vehicles/compat_cup_repair/config.cpp
new file mode 100644
index 00000000000..9a2785e7ef2
--- /dev/null
+++ b/addons/compat_cup_vehicles/compat_cup_repair/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "CUP_Vehicles_LoadOrder",
+ "ace_repair"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ addonRootClass = QUOTE(ADDON);
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_cup_vehicles/compat_cup_repair/script_component.hpp b/addons/compat_cup_vehicles/compat_cup_repair/script_component.hpp
new file mode 100644
index 00000000000..1af928486c3
--- /dev/null
+++ b/addons/compat_cup_vehicles/compat_cup_repair/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT repair
+#define SUBCOMPONENT_BEAUTIFIED Repair
+#include "..\script_component.hpp"
diff --git a/addons/compat_cup_vehicles/compat_cup_trenches/CfgVehicles.hpp b/addons/compat_cup_vehicles/compat_cup_trenches/CfgVehicles.hpp
new file mode 100644
index 00000000000..9d9bc2d62ee
--- /dev/null
+++ b/addons/compat_cup_vehicles/compat_cup_trenches/CfgVehicles.hpp
@@ -0,0 +1,111 @@
+class CfgVehicles {
+ class Car_F;
+ class CUP_Tigr_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_tools {
+ positions[] = {{1.15, -1.5, -0.68}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+ class CUP_Tigr_STS_PK_Base: CUP_Tigr_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_tools: hide_tools {};
+ };
+ };
+ class CUP_Tigr_233014_PK_Base: CUP_Tigr_STS_PK_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_tools: hide_tools {
+ positions[] = {{1.15, -1.5, -1}};
+ };
+ };
+ };
+ class CUP_Tigr_M_PK_Base: CUP_Tigr_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_tools: hide_tools {};
+ };
+ };
+ class CUP_Tigr_233114_PK_Base: CUP_Tigr_M_PK_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_tools: hide_tools {
+ positions[] = {{1.15, -1.5, -1}};
+ };
+ };
+ };
+
+ // Interaction added to both sides, as the whole vehicle is mirrored if in left/right side
+ class CUP_LR_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class selection_tool {
+ positions[] = {{-0.53, 1.65, -0.2}, {0.53, 1.65, -0.2}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+ class CUP_LR_MG_Base: CUP_LR_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_tool: selection_tool {
+ positions[] = {{-0.6, 1.4, 1.4}, {0.45, 1.4, 1.4}};
+ };
+ };
+ };
+ class CUP_LR_SPG9_Base: CUP_LR_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_tool: selection_tool {};
+ };
+ };
+ class CUP_LR_AA_Base: CUP_LR_SPG9_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_tool: selection_tool {
+ positions[] = {{-0.55, 1.77, -0.75}, {0.55, 1.77, -0.75}};
+ };
+ };
+ };
+ class CUP_LR_Ambulance_Base: CUP_LR_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_tool: selection_tool {
+ positions[] = {{-0.55, 2.1, -0.2}, {0.55, 2.1, -0.2}};
+ };
+ };
+ };
+ class CUP_LR_Special_Base: CUP_LR_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_tool: selection_tool {
+ positions[] = {{-0.6, 1.4, 1.4}, {0.45, 1.4, 1.4}};
+ };
+ };
+ };
+
+ class CUP_ECVHMMWV_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_front_tool_rack {
+ positions[] = {"(_target selectionPosition ['vhc_rear_trunk_door', 'FireGeometry', 'AveragePoint']) vectorAdd [0.37, 4, 0.2]"};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+
+ class Tank_F;
+ class CUP_leopard_1A3_base: Tank_F {
+ class EGVAR(interaction,anims) {
+ class hide_Tools_L {
+ positions[] = {{-2.2, 0, 0.2}, {-2.2, -1.8, 0.2}};
+ items[] = {"ACE_EntrenchingTool", "ACE_wirecutter"};
+ name = "$STR_a3_cfgeditorsubcategories_edsubcat_tools0";
+ text = "$STR_a3_cfgeditorsubcategories_edsubcat_tools0";
+ };
+ class hide_Tools_R {
+ positions[] = {{0.9, -1.5, 0.23}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+};
diff --git a/addons/compat_cup_vehicles/compat_cup_trenches/config.cpp b/addons/compat_cup_vehicles/compat_cup_trenches/config.cpp
new file mode 100644
index 00000000000..8f05885bd6f
--- /dev/null
+++ b/addons/compat_cup_vehicles/compat_cup_trenches/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "CUP_Vehicles_LoadOrder",
+ "ace_trenches"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ addonRootClass = QUOTE(ADDON);
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_cup_vehicles/compat_cup_trenches/script_component.hpp b/addons/compat_cup_vehicles/compat_cup_trenches/script_component.hpp
new file mode 100644
index 00000000000..10b90eb71e5
--- /dev/null
+++ b/addons/compat_cup_vehicles/compat_cup_trenches/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT trenches
+#define SUBCOMPONENT_BEAUTIFIED Trenches
+#include "..\script_component.hpp"
diff --git a/addons/compat_cup_vehicles/compat_cup_vehicles_fastroping/config.cpp b/addons/compat_cup_vehicles/compat_cup_vehicles_fastroping/config.cpp
index 1abe0de6ea6..10eb5da69f0 100644
--- a/addons/compat_cup_vehicles/compat_cup_vehicles_fastroping/config.cpp
+++ b/addons/compat_cup_vehicles/compat_cup_vehicles_fastroping/config.cpp
@@ -15,6 +15,8 @@ class CfgPatches {
authors[] = {"Community Upgrade Project", "Mike"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
+
+ addonRootClass = QUOTE(ADDON);
};
};
diff --git a/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp b/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp
index 1042c0eacf3..60a83030df2 100644
--- a/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp
+++ b/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp
@@ -28,4 +28,90 @@ class CfgVehicles {
EGVAR(refuel,hooks)[] = {{-1.09, -0.01, -0.5},{1, -0.01, -0.5}};
EGVAR(refuel,fuelCargo) = 10000;
};
+
+ class Car_F;
+ class CUP_LR_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class selection_jerry {
+ positions[] = {{-0.65, 2.7, -0.55}, {0.65, 2.7, -0.55}, {-1, -0.25, -0.75}, {1, -0.25, -0.75}};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class CUP_LR_MG_Base: CUP_LR_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_jerry: selection_jerry {
+ positions[] = {{-0.55, 2.45, 1.05}, {0.55, 2.45, 1.05}, {-1, -0.53, 0.9}, {1, -0.53, 0.9}};
+ };
+ };
+ };
+ class CUP_LR_SPG9_Base: CUP_LR_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_jerry: selection_jerry {};
+ };
+ };
+ class CUP_LR_AA_Base: CUP_LR_SPG9_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_jerry: selection_jerry {
+ positions[] = {{-0.65, 2.8, -1.1}, {0.65, 2.8, -1.1}, {-1, -0.15, -1.3}, {1, -0.15, -1.3}};
+ };
+ };
+ };
+ class CUP_LR_Ambulance_Base: CUP_LR_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_jerry: selection_jerry {
+ positions[] = {{-0.65, 3.1, -0.55}, {0.65, 3.1, -0.55}};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ };
+ };
+ };
+ class CUP_LR_Special_Base: CUP_LR_Base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class selection_jerry: selection_jerry {
+ positions[] = {{-0.7, 2.45, 1.05}, {0.55, 2.45, 1.05}};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ };
+ };
+ };
+
+ class CUP_nHMMWV_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_jerrycans {
+ positions[] = {"(_target selectionPosition 'vhc_jerrycans') vectorAdd [0, 0, 0.15]"};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ // Don't inherit, as it's easier for the main compat
+ class CUP_nM1025_SOV_Base: CUP_nHMMWV_Base {
+ class EGVAR(interaction,anims) {
+ class hide_jerrycans {
+ positions[] = {"(_target selectionPosition 'vhc_jerrycans') vectorAdd [0, 0, 0.15]"};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class hide_rear_rack_content {
+ positions[] = {"_target selectionPosition ['vhc_rear_rack_content', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ class CUP_ECVHMMWV_Base: Car_F {
+ class EGVAR(interaction,anims) {
+ class hide_jerrycans {
+ positions[] = {"(_target selectionPosition ['vhc_rear_trunk_door', 'FireGeometry', 'AveragePoint']) vectorAdd [-0.85, -0.22, -0.1]"};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
};
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgVehicles.hpp b/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgVehicles.hpp
index 3924ae03861..c96253ec51c 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgVehicles.hpp
+++ b/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgVehicles.hpp
@@ -19,7 +19,7 @@ class CfgVehicles {
magazineLocation = "_target selectionPosition 'otochlaven'";
proxyWeapon = "CUP_proxy_mortar_82mm";
disassembleWeapon = "CUP_2b14_carry";
- disassembleTurret = "ace_csw_mortarBaseplate";
+ disassembleTurret = QEGVAR(csw,mortarBaseplate);
desiredAmmo = 1;
ammoLoadTime = 3;
ammoUnloadTime = 3;
@@ -29,14 +29,14 @@ class CfgVehicles {
class CUP_M252_base: CUP_2b14_82mm_Base {
class ace_csw: ace_csw {
disassembleWeapon = "CUP_m252_carry";
- disassembleTurret = "ace_csw_mortarBaseplate";
+ disassembleTurret = QEGVAR(csw,mortarBaseplate);
};
};
class CUP_L16A2_base: CUP_M252_base {
class ace_csw: ace_csw {
disassembleWeapon = "CUP_l16a2_carry";
- disassembleTurret = "ace_csw_mortarBaseplate";
+ disassembleTurret = QEGVAR(csw,mortarBaseplate);
};
};
@@ -47,7 +47,7 @@ class CfgVehicles {
proxyWeapon = "CUP_proxy_m2";
magazineLocation = "_target selectionPosition 'magazine'";
disassembleWeapon = "CUP_m2_carry";
- disassembleTurret = "ace_csw_m3Tripod";
+ disassembleTurret = QEGVAR(csw,m3Tripod);
desiredAmmo = 100;
ammoLoadTime = 10;
ammoUnloadTime = 8;
@@ -57,7 +57,7 @@ class CfgVehicles {
class CUP_M2StaticMG_MiniTripod_base: CUP_M2StaticMG_base {
class ace_csw: ace_csw {
enabled = 1;
- disassembleTurret = "ace_csw_m3TripodLow";
+ disassembleTurret = QEGVAR(csw,m3TripodLow);
};
};
@@ -65,9 +65,9 @@ class CfgVehicles {
class ace_csw {
enabled = 1;
proxyWeapon = "CUP_proxy_DSHKM";
- magazineLocation = "_target selectionPosition 'magazine'";
+ magazineLocation = "_target selectionPosition 'otocvez'";
disassembleWeapon = "CUP_DSHKM_carry";
- disassembleTurret = "ace_csw_kordTripod";
+ disassembleTurret = QEGVAR(csw,kordTripod);
desiredAmmo = 100;
ammoLoadTime = 10;
ammoUnloadTime = 8;
@@ -87,7 +87,7 @@ class CfgVehicles {
proxyWeapon = "CUP_proxy_KORD";
magazineLocation = "_target selectionPosition 'magazine'";
disassembleWeapon = "CUP_KORD_carry";
- disassembleTurret = "ace_csw_kordTripod";
+ disassembleTurret = QEGVAR(csw,kordTripod);
desiredAmmo = 100;
ammoLoadTime = 10;
ammoUnloadTime = 8;
@@ -97,7 +97,7 @@ class CfgVehicles {
class CUP_KORD_MiniTripod_Base: CUP_KORD_Base {
class ace_csw: ace_csw {
enabled = 1;
- disassembleTurret = "ace_csw_kordTripodLow";
+ disassembleTurret = QEGVAR(csw,kordTripodLow);
};
};
@@ -108,7 +108,7 @@ class CfgVehicles {
proxyWeapon = "CUP_proxy_AGS30";
magazineLocation = "_target selectionPosition 'otochlaven'";
disassembleWeapon = "CUP_AGS30_carry";
- disassembleTurret = "ace_csw_sag30Tripod";
+ disassembleTurret = QEGVAR(csw,sag30Tripod);
desiredAmmo = 29;
ammoLoadTime = 10;
ammoUnloadTime = 8;
@@ -119,9 +119,9 @@ class CfgVehicles {
class ace_csw {
enabled = 1;
proxyWeapon = "CUP_proxy_MK19";
- magazineLocation = "_target selectionPosition 'magazine'";
+ magazineLocation = "_target selectionPosition 'otochlaven'";
disassembleWeapon = "CUP_MK19_carry";
- disassembleTurret = "ace_csw_m3TripodLow";
+ disassembleTurret = QEGVAR(csw,m3TripodLow);
desiredAmmo = 48;
ammoLoadTime = 10;
ammoUnloadTime = 8;
@@ -148,7 +148,7 @@ class CfgVehicles {
proxyWeapon = "CUP_proxy_TOW";
magazineLocation = "_target selectionPosition 'otochlaven'";
disassembleWeapon = "CUP_TOW_carry";
- disassembleTurret = "ace_csw_m220Tripod";
+ disassembleTurret = QEGVAR(csw,m220Tripod);
desiredAmmo = 1;
ammoLoadTime = 8;
ammoUnloadTime = 5;
@@ -165,9 +165,9 @@ class CfgVehicles {
class ace_csw {
enabled = 1;
proxyWeapon = "CUP_proxy_SPG9";
- magazineLocation = "_target selectionPosition 'otochlaven'";
+ magazineLocation = "_target selectionPosition 'handle'";
disassembleWeapon = "CUP_SPG9_carry";
- disassembleTurret = "ace_csw_spg9Tripod";
+ disassembleTurret = QEGVAR(csw,spg9Tripod);
desiredAmmo = 1;
ammoLoadTime = 5;
ammoUnloadTime = 3;
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgWeapons.hpp b/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgWeapons.hpp
index 9ff8519ce11..56213219040 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgWeapons.hpp
+++ b/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgWeapons.hpp
@@ -60,6 +60,7 @@ class CfgWeapons {
class assembleTo {
ace_csw_m3Tripod = "CUP_I_M2StaticMG_AAF";
ace_csw_m3TripodLow = "CUP_I_M2StaticMG_MiniTripod_AAF";
+ EGVAR(compat_spe,m3Tripod) = "CUP_I_M2StaticMG_MiniTripod_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml b/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
index ea16be2905a..86e56ee3d90 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
+++ b/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
@@ -9,6 +9,8 @@
[CSW] AGS30 Gurt
[CSW] Cinta de AGS30
[CSW] Nastro AGS30
+ [CSW] Cinto de AGS30
+ [CSW] Ceinture AGS30
[CSW] MK19 Belt
@@ -18,6 +20,8 @@
[CSW] MK19 Gurt
[CSW] Cinta de MK19
[CSW] Nastro MK19
+ [CSW] Cinto de MK19
+ [CSW] Ceinture MK19
[CSW] TOW Tube
@@ -27,6 +31,8 @@
[CSW] TOW Rohr
[CSW] Tubo de TOW
[CSW] Tubo TOW
+ [CSW] Tubo de TOW
+ [CSW] Tube TOW
[CSW] TOW2 Tube
@@ -36,6 +42,8 @@
[CSW] TOW2 Rohr
[CSW] Tubo de TOW2
[CSW] Tubo TOW2
+ [CSW] Tubo de TOW2
+ [CSW] Tube TOW2
[CSW] PG-9 Round
@@ -45,6 +53,8 @@
[CSW] PG-9 Rakete
[CSW] Carga de PG-9
[CSW] Razzo PG-9
+ [CSW] Cartucho PG-9
+ [CSW] Projectile PG-9
[CSW] OG-9 Round
@@ -54,6 +64,8 @@
[CSW] OG-9 Rakete
[CSW] Carga de OG-9
[CSW] Razzo OG-9
+ [CSW] Cartucho OG-9
+ [CSW] Projectile OG-9.
[CSW] M1 HE
@@ -74,6 +86,7 @@
[CSW] M84 Rauch
[CSW] Humo M84
[CSW] M84 Fumogeno
+ [CSW] M84 Fumígeno
[CSW] M60A2 WP
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgAmmo.hpp b/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgAmmo.hpp
index 1658715ddbd..eeb7e6037f2 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgAmmo.hpp
+++ b/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgAmmo.hpp
@@ -4,18 +4,18 @@ class CfgAmmo {
hit = 3000;
indirectHit = 3000;
indirectHitRange = 5;
- ace_explosives_explodeOnDefuse = 0.02;
+ EGVAR(explosives,explodeOnDefuse) = 0.02;
};
class CUP_PipeBomb_Ammo: PipeBombBase {
hit = 3000;
indirectHit = 3000;
indirectHitRange = 5;
- ace_explosives_explodeOnDefuse = 0.02;
+ EGVAR(explosives,explodeOnDefuse) = 0.02;
};
class CUP_Mine_Ammo;
class CUP_IED_V1_Ammo: CUP_Mine_Ammo {
- ace_explosives_explodeOnDefuse = 0.06;
+ EGVAR(explosives,explodeOnDefuse) = 0.06;
triggerWhenDestroyed = 1;
};
};
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgMagazines.hpp b/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgMagazines.hpp
index 15df2f73335..51dc9d0d781 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgMagazines.hpp
+++ b/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgMagazines.hpp
@@ -2,9 +2,9 @@ class CfgMagazines {
class CA_Magazine;
class CUP_TimeBomb_M: CA_Magazine {
scope = 1;
- ace_explosives_placeable = 1;
+ EGVAR(explosives,placeable) = 1;
useAction = 0;
- ace_explosives_setupObject = "ACE_PipeBomb_place_CUP";
+ EGVAR(explosives,setupObject) = "ACE_PipeBomb_place_CUP";
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch", "Cellphone"};
class Timer {
@@ -16,9 +16,9 @@ class CfgMagazines {
};
};
class CUP_Mine_M: CUP_TimeBomb_M {
- ace_explosives_placeable = 1;
+ EGVAR(explosives,placeable) = 1;
useAction = 0;
- ace_explosives_setupObject = "ACE_Mine_place_CUP";
+ EGVAR(explosives,setupObject) = "ACE_Mine_place_CUP";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -27,9 +27,9 @@ class CfgMagazines {
};
};
class CUP_MineE_M: CUP_TimeBomb_M {
- ace_explosives_placeable = 1;
+ EGVAR(explosives,placeable) = 1;
useAction = 0;
- ace_explosives_setupObject = "ACE_MineE_place_CUP";
+ EGVAR(explosives,setupObject) = "ACE_MineE_place_CUP";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -39,20 +39,20 @@ class CfgMagazines {
};
class CUP_IED_V1_M: CUP_Mine_M {
- ace_explosives_placeable = 1;
+ EGVAR(explosives,placeable) = 1;
useAction = 0;
- ace_explosives_setupObject = "ACE_IED_V1_place_CUP";
+ EGVAR(explosives,setupObject) = "ACE_IED_V1_place_CUP";
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch", "Cellphone", "PressurePlate"};
};
};
class CUP_IED_V2_M: CUP_IED_V1_M {
useAction = 0;
- ace_explosives_setupObject = "ACE_IED_V2_place_CUP";
+ EGVAR(explosives,setupObject) = "ACE_IED_V2_place_CUP";
};
class CUP_IED_V3_M: CUP_IED_V1_M {
useAction = 0;
- ace_explosives_setupObject = "ACE_IED_V3_place_CUP";
+ EGVAR(explosives,setupObject) = "ACE_IED_V3_place_CUP";
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch", "Cellphone", "PressurePlate"};
class Timer {
@@ -77,7 +77,7 @@ class CfgMagazines {
};
class CUP_IED_V4_M: CUP_IED_V1_M {
useAction = 0;
- ace_explosives_setupObject = "ACE_IED_V4_place_CUP";
+ EGVAR(explosives,setupObject) = "ACE_IED_V4_place_CUP";
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch", "Cellphone", "PressurePlate"};
class Timer {
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgVehicles.hpp b/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgVehicles.hpp
index d10c315c3d7..17a7c59848e 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgVehicles.hpp
+++ b/addons/compat_cup_weapons/compat_cup_weapons_explosives/CfgVehicles.hpp
@@ -1,32 +1,31 @@
class CfgVehicles {
class ACE_Explosives_Place;
class ACE_PipeBomb_place_CUP: ACE_Explosives_Place {
- displayName = "Satchel Charge";
+ displayName = "$STR_CUP_dn_PipeBomb";
model = "\CUP\Weapons\CUP_Weapons_Put\CUP_Satchel.p3d";
- ace_explosives_offset[] = {0, 0, 0};
};
class ACE_Mine_place_CUP: ACE_Explosives_Place {
- displayName = "AT-15 Anti-Tank Mine";
+ displayName = "$STR_CUP_dn_Mine";
model = "\CUP\Weapons\CUP_Weapons_Put\CUP_AT15.p3d";
- ace_explosives_offset[] = {0, 0, 0};
};
class ACE_MineE_place_CUP: ACE_Explosives_Place {
- displayName = "TM46 Anti-Tank Mine";
+ displayName = "$STR_CUP_dn_MineE";
model = "\CUP\Weapons\CUP_Weapons_Put\CUP_TM46.p3d";
- ace_explosives_offset[] = {0, 0, 0};
};
class ACE_IED_V1_place_CUP: ACE_Explosives_Place {
- displayName = "IED";
+ displayName = "$STR_A3_CfgVehicles_IEDUrbanSmall_F";
model = "\CUP\Weapons\CUP_Weapons_Put\CUP_IED_V1.p3d";
- ace_explosives_offset[] = {0, 0, 0};
};
class ACE_IED_V2_place_CUP: ACE_IED_V1_place_CUP {
+ displayName = "$STR_A3_CfgVehicles_IEDUrbanBig_F";
model = "\CUP\Weapons\CUP_Weapons_Put\CUP_IED_V2.p3d";
};
class ACE_IED_V3_place_CUP: ACE_IED_V1_place_CUP {
+ displayName = "$STR_A3_CfgVehicles_IEDLandSmall_F";
model = "\CUP\Weapons\CUP_Weapons_Put\CUP_IED_V3.p3d";
};
class ACE_IED_V4_place_CUP: ACE_IED_V1_place_CUP {
+ displayName = "$STR_A3_CfgVehicles_IEDLandBig_F";
model = "\CUP\Weapons\CUP_Weapons_Put\CUP_IED_V4.p3d";
};
};
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_javelin/CfgAmmo.hpp b/addons/compat_cup_weapons/compat_cup_weapons_javelin/CfgAmmo.hpp
index 2632a43e61e..220af016575 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_javelin/CfgAmmo.hpp
+++ b/addons/compat_cup_weapons/compat_cup_weapons_javelin/CfgAmmo.hpp
@@ -7,20 +7,51 @@ class CfgAmmo {
class ace_missileguidance {
enabled = 1;
- minDeflection = 0.00005;
- maxDeflection = 0.025;
- incDeflection = 0.00005;
+
+ pitchRate = 120; // degrees per second
+ yawRate = 120;
+ stabilityCoefficient = 0.2;
+ bangBangGuidance = 0;
+
canVanillaLock = 0;
+
+ // Guidance type for munitions
defaultSeekerType = "Optic";
- seekerTypes[] = {"Optic"};
+ seekerTypes[] = { "Optic" };
+
defaultSeekerLockMode = "LOBL";
- seekerLockModes[] = {"LOBL"};
- seekerAngle = 180;
- seekerAccuracy = 1;
+ seekerLockModes[] = { "LOBL" };
+
+ defaultNavigationType = "Direct";
+ navigationTypes[] = { "Direct", "ZeroEffortMiss" };
+
+ navigationGain = 3;
+
+ seekerAngle = 180; // Angle in front of the missile which can be searched
+ seekerAccuracy = 1; // seeker accuracy multiplier
+
seekerMinRange = 0;
- seekerMaxRange = 2500;
+ seekerMaxRange = 2500; // Range from the missile which the seeker can visually search
+
+ seekLastTargetPos = 1; // seek last target position [if seeker loses LOS of target, continue to last known pos]
+
+ // Attack profile type selection
defaultAttackProfile = "JAV_TOP";
- attackProfiles[] = {"JAV_TOP", "JAV_DIR"};
+ attackProfiles[] = { "JAV_TOP", "JAV_DIR" };
+ useModeForAttackProfile = 1;
+
+ class navigationStates {
+ class initial {
+ transitionCondition = QEFUNC(missileguidance,javelin_midCourseTransition);
+ navigationType = "Direct";
+ };
+ class terminal {
+ transitionCondition = "";
+ navigationType = "ZeroEffortMiss";
+ };
+ // transitions from initial -> termimal
+ states[] = {"initial", "terminal"};
+ };
};
};
};
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_nightvision/CfgWeapons.hpp b/addons/compat_cup_weapons/compat_cup_weapons_nightvision/CfgWeapons.hpp
index 04d26b8ead8..5a8e1ca4e33 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_nightvision/CfgWeapons.hpp
+++ b/addons/compat_cup_weapons/compat_cup_weapons_nightvision/CfgWeapons.hpp
@@ -34,7 +34,7 @@ class CfgWeapons {
// Binocular
class CUP_NVG_PVS14: NVGoggles {
- NVG_BINO_PRESET;
+ NVG_MONO_PRESET(3);
NVG_GREEN_PRESET;
};
class CUP_NVG_PVS15_black: NVGoggles {
diff --git a/addons/compat_gm/CfgVehicles.hpp b/addons/compat_gm/CfgVehicles.hpp
index 6d03465cd7f..d470e8a615d 100644
--- a/addons/compat_gm/CfgVehicles.hpp
+++ b/addons/compat_gm/CfgVehicles.hpp
@@ -81,15 +81,242 @@ class CfgVehicles {
class gm_brdm2_base: gm_wheeled_APC_base {
EGVAR(refuel,fuelCapacity) = 290;
+
+ class EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_01', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ };
+ class AmmoBox_02_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_02', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ };
+ class AmmoBox_03_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_03', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ };
+ };
+ };
+ class gm_brdm2um_base: gm_brdm2_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide: AmmoBox_01_unhide {
+ positions[] = {{-0.1, -1.9, -0.5}};
+ };
+ class AmmoBox_02_unhide: AmmoBox_02_unhide {
+ positions[] = {{-0.55, -0.35, -0.35}};
+ };
+ class AmmoBox_03_unhide: AmmoBox_03_unhide {
+ positions[] = {{0.3, -1.85, -0.5}};
+ };
+ };
};
class gm_btr60_base: gm_wheeled_APC_base {
EGVAR(refuel,fuelCapacity) = 290;
EGVAR(cookoff,cookoffSelections)[] = {"commanderturret_hatch"};
+
+ class EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_01', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_02_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_02', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_03_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_03', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_04_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_04', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_05_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_05', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_06_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_06', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_07_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['ammobox_07', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ };
+ };
+ };
+
+ class gm_ural375d_base: gm_wheeled_truck_base {
+ EGVAR(refuel,fuelCapacity) = 360;
+
+ class EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide {
+ phase = 0;
+ positions[] = {{-0.55, 1.83, 0.7}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ distance = 2.5;
+ };
+ class AmmoBox_02_unhide {
+ phase = 0;
+ positions[] = {{0, 1.83, 0.7}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ distance = 3;
+ };
+ class AmmoBox_03_unhide {
+ phase = 0;
+ positions[] = {{0.55, 1.83, 0.7}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ distance = 2.5;
+ };
+ class AmmoBox_04_unhide {
+ phase = 0;
+ positions[] = {{-0.45, 1.83, 0.7}};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ distance = 2.5;
+ };
+ };
+ };
+ class gm_ural375d_mlrs_base: gm_ural375d_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide: AmmoBox_01_unhide {
+ positions[] = {{-0.55, 2, 0.5}};
+ };
+ class AmmoBox_02_unhide: AmmoBox_02_unhide {
+ positions[] = {{0, 2, 0.5}};
+ };
+ class AmmoBox_03_unhide: AmmoBox_03_unhide {
+ positions[] = {{0.55, 2, 0.5}};
+ };
+ class AmmoBox_04_unhide: AmmoBox_04_unhide {
+ positions[] = {{-0.45, 2, 0.5}};
+ };
+ };
+ };
+ class gm_ural375d_medic_base: gm_ural375d_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide: AmmoBox_01_unhide {
+ positions[] = {{-0.55, 2, 0.7}};
+ };
+ class AmmoBox_02_unhide: AmmoBox_02_unhide {
+ positions[] = {{0, 2, 0.7}};
+ };
+ class AmmoBox_03_unhide: AmmoBox_03_unhide {
+ positions[] = {{0.55, 2, 0.7}};
+ };
+ class AmmoBox_04_unhide: AmmoBox_04_unhide {
+ positions[] = {{-0.45, 2, 0.7}};
+ };
+ };
};
class gm_ural4320_base: gm_wheeled_truck_base {
EGVAR(refuel,fuelCapacity) = 360;
+
+ class EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide {
+ phase = 0;
+ positions[] = {{-0.55, 1.47, 0.7}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ distance = 2.5;
+ };
+ class AmmoBox_02_unhide {
+ phase = 0;
+ positions[] = {{0, 1.47, 0.7}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ distance = 3;
+ };
+ class AmmoBox_03_unhide {
+ phase = 0;
+ positions[] = {{0.55, 1.47, 0.7}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ distance = 2.5;
+ };
+ class AmmoBox_04_unhide {
+ phase = 0;
+ positions[] = {{-0.45, 1.47, 0.7}};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ distance = 2.5;
+ };
+ };
+ };
+ class gm_ural4320_repair_base: gm_ural4320_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide: AmmoBox_01_unhide {
+ positions[] = {{-0.55, 1.62, 0.7}};
+ };
+ class AmmoBox_02_unhide: AmmoBox_02_unhide {
+ positions[] = {{0, 1.62, 0.7}};
+ };
+ class AmmoBox_03_unhide: AmmoBox_03_unhide {
+ positions[] = {{0.55, 1.62, 0.7}};
+ };
+ class AmmoBox_04_unhide: AmmoBox_04_unhide {
+ positions[] = {{-0.45, 1.62, 0.7}};
+ };
+ };
+ };
+ class gm_ural44202_base: gm_ural4320_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide: AmmoBox_01_unhide {
+ positions[] = {{-0.55, 1.37, 0.7}};
+ };
+ class AmmoBox_02_unhide: AmmoBox_02_unhide {
+ positions[] = {{0, 1.37, 0.7}};
+ };
+ class AmmoBox_03_unhide: AmmoBox_03_unhide {
+ positions[] = {{0.55, 1.37, 0.7}};
+ };
+ class AmmoBox_04_unhide: AmmoBox_04_unhide {
+ positions[] = {{-0.45, 1.37, 0.7}};
+ };
+ };
};
class gm_ural4320_reammo_base: gm_ural4320_base {
@@ -190,9 +417,103 @@ class CfgVehicles {
EGVAR(refuel,fuelCapacity) = 460;
EGVAR(cookoff,cookoffSelections)[] = {"mainturret_hatch","commanderturret_hatch"};
};
+ class gm_bmp1sp2_base: gm_bmp1_base {
+ class EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide {
+ phase = 0;
+ positions[] = {{-1.2, -2.52, -1.2}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_02_unhide {
+ phase = 0;
+ positions[] = {{-1.3, -2, -1.2}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_03_unhide {
+ phase = 0;
+ positions[] = {{-1.35, -1.43, -1.2}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_04_unhide {
+ phase = 0;
+ positions[] = {{1.2, -2.52, -1.2}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_05_unhide {
+ phase = 0;
+ positions[] = {{1.3, -2, -1.2}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_06_unhide {
+ phase = 0;
+ positions[] = {{1.35, -1.43, -1.2}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_07_unhide {
+ phase = 0;
+ positions[] = {{-1.45, 0.1, -1.3}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_08_unhide {
+ phase = 0;
+ positions[] = {{-1.45, 2, -1.3}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ class AmmoBox_09_unhide {
+ phase = 0;
+ positions[] = {{1.45, 2, -1.3}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ };
+ };
+ };
class gm_pt76_base: gm_tracked_Tank_base {
EGVAR(refuel,fuelCapacity) = 250;
+
+ class EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide {
+ phase = 0;
+ positions[] = {{0.08, -1.75, -1}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ distance = 2.5;
+ };
+ class AmmoBox_02_unhide {
+ phase = 0;
+ positions[] = {{0.08, -1.38, -1}};
+ items[] = {"gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47"};
+ name = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ text = "$STR_DN_gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47";
+ distance = 2.5;
+ };
+ class AmmoBox_03_unhide {
+ phase = 0;
+ positions[] = {{0.08, -2.15, -1}};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ distance = 2.5;
+ };
+ };
};
class gm_t55_base: gm_tracked_Tank_base {
@@ -204,6 +525,21 @@ class CfgVehicles {
EGVAR(refuel,fuelCapacity) = 812;
};
+ class gm_tracked_Artillery_base;
+ class gm_2s1_base: gm_tracked_Artillery_base {
+ class EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, -1.3, 0] vectorAdd ([[0, -1.1, -0.35], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ distance = 2.5;
+ };
+ };
+ };
+
// WEST
class gm_Leopard1_base;
class gm_Leopard1a0_base: gm_Leopard1_base {
@@ -211,6 +547,27 @@ class CfgVehicles {
EGVAR(cookoff,cookoffSelections)[] = {"mainturret_hatch_1","commanderturret_hatch"};
};
+ class gm_Leopard1a1_base: gm_Leopard1a0_base {
+ class EGVAR(interaction,anims) {
+ class AmmoBox_01_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, -0.6, 0] vectorAdd ([[0.7, -2, -0.6], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ };
+ class AmmoBox_02_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, -0.6, 0] vectorAdd ([[-0.3, -1.95, -0.6], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"gm_AmmoBox_wood_04_empty"};
+ name = "$STR_DN_gm_AmmoBox_wood_04_base";
+ text = "$STR_DN_gm_AmmoBox_wood_04_base";
+ };
+ };
+ };
+
class gm_Gepard_base: gm_Leopard1_base {
EGVAR(refuel,fuelCapacity) = 985;
};
@@ -257,42 +614,39 @@ class CfgVehicles {
EGVAR(refuel,fuelCapacity) = 3700;
EGVAR(fastroping,enabled) = 0;
- // TODO: stringtables
class UserActions {
- class openDoor_L {
- displayNameDefault = "Open left Door";
- displayName = "Open left Door";
- position = "";
- radius = 2.7;
- onlyForPlayer = 1;
- condition = QUOTE((this animationSourcePhase 'door_2_1_unhide' > 0.5) && (this doorPhase 'door_2_1_source' < 0.5) && {alive this} && {!(this getVariable [ARR_2(QUOTE(QEGVAR(fastroping,doorsLocked)),false)])});
- statement = "this animateDoor ['door_2_1_source',1]";
- };
-
- class openDoor_R: openDoor_L {
- displayNameDefault = "Open right Door";
- displayName = "Open right Door";
- condition = QUOTE((this animationSourcePhase 'door_2_2_unhide' > 0.5) && (this doorPhase 'door_2_2_source' < 0.5) && {alive this} && {!(this getVariable [ARR_2(QUOTE(QEGVAR(fastroping,doorsLocked)),false)])});
- statement = "this animateDoor ['door_2_2_source',1]";
- };
-
- class closeDoor_L {
- displayNameDefault = "Close left Door";
- displayName = "Close left Door";
- position = "";
- radius = 2.7;
- onlyForPlayer = 1;
- condition = QUOTE((this animationSourcePhase 'door_2_1_unhide' > 0.5) && (this doorPhase 'door_2_1_source' > 0.5) && {alive this} && {!(this getVariable [ARR_2(QUOTE(QEGVAR(fastroping,doorsLocked)),false)])});
- statement = "this animateDoor ['door_2_1_source',0]";
- };
-
- class closeDoor_R: closeDoor_L {
- displayNameDefault = "Close right Door";
- displayName = "Close right Door";
- condition = QUOTE((this animationSourcePhase 'door_2_2_unhide' > 0.5) && (this doorPhase 'door_2_2_source' > 0.5) && {alive this} && {!(this getVariable [ARR_2(QUOTE(QEGVAR(fastroping,doorsLocked)),false)])});
- statement = "this animateDoor ['door_2_2_source',0]";
- };
+ class openDoor_L {
+ displayNameDefault = "$STR_a3_cfgvehicles_useractions_openldoor0";
+ displayName = "$STR_a3_cfgvehicles_useractions_openldoor0";
+ position = "";
+ radius = 2.7;
+ onlyForPlayer = 1;
+ condition = QUOTE((this animationSourcePhase 'door_2_1_unhide' > 0.5) && (this doorPhase 'door_2_1_source' < 0.5) && {alive this} && {!(this getVariable [ARR_2(QQEGVAR(fastroping,doorsLocked),false)])});
+ statement = "this animateDoor ['door_2_1_source',1]";
+ };
+ class openDoor_R: openDoor_L {
+ displayNameDefault = "$STR_a3_cfgvehicles_useractions_openrdoor0";
+ displayName = "$STR_a3_cfgvehicles_useractions_openrdoor0";
+ condition = QUOTE((this animationSourcePhase 'door_2_2_unhide' > 0.5) && (this doorPhase 'door_2_2_source' < 0.5) && {alive this} && {!(this getVariable [ARR_2(QQEGVAR(fastroping,doorsLocked),false)])});
+ statement = "this animateDoor ['door_2_2_source',1]";
+ };
+
+ class closeDoor_L {
+ displayNameDefault = "$STR_a3_cfgvehicles_useractions_closeldoor0";
+ displayName = "$STR_a3_cfgvehicles_useractions_closeldoor0";
+ position = "";
+ radius = 2.7;
+ onlyForPlayer = 1;
+ condition = QUOTE((this animationSourcePhase 'door_2_1_unhide' > 0.5) && (this doorPhase 'door_2_1_source' > 0.5) && {alive this} && {!(this getVariable [ARR_2(QQEGVAR(fastroping,doorsLocked),false)])});
+ statement = "this animateDoor ['door_2_1_source',0]";
+ };
+ class closeDoor_R: closeDoor_L {
+ displayNameDefault = "$STR_a3_cfgvehicles_useractions_closerdoor0";
+ displayName = "$STR_a3_cfgvehicles_useractions_closerdoor0";
+ condition = QUOTE((this animationSourcePhase 'door_2_2_unhide' > 0.5) && (this doorPhase 'door_2_2_source' > 0.5) && {alive this} && {!(this getVariable [ARR_2(QQEGVAR(fastroping,doorsLocked),false)])});
+ statement = "this animateDoor ['door_2_2_source',0]";
};
+ };
};
class gm_bo105p1m_vbh_base;
class gm_bo105p1m_vbh_swooper_base: gm_bo105p1m_vbh_base {
diff --git a/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp b/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp
index 3da49f45abe..a8f9ca632e5 100644
--- a/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp
+++ b/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp
@@ -1,9 +1,10 @@
class CfgAmmo {
- class PipeBombBase;
- class gm_explosive_petn_charge: PipeBombBase {
+ class gm_explosive_petn_base;
+ class gm_explosive_charge_petn: gm_explosive_petn_base {
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
};
- class gm_explosive_plnp_charge: PipeBombBase {
+ class gm_explosive_plnp_base;
+ class gm_explosive_charge_plnp: gm_explosive_plnp_base {
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
};
diff --git a/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp b/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp
index 17d51d3b457..f0afb3b90cd 100644
--- a/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp
+++ b/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp
@@ -2,9 +2,8 @@ class CfgMagazines {
// Explosives
class gm_explosive_petn_charge_base;
class gm_explosive_petn_charge: gm_explosive_petn_charge_base {
- EGVAR(explosives,DelayTime) = 1;
- EGVAR(explosives,Placeable) = 1;
- EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_petn);
+ EGVAR(explosives,placeable) = 1;
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_gm_explosive_petn);
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
@@ -21,9 +20,8 @@ class CfgMagazines {
class gm_explosive_plnp_charge_base;
class gm_explosive_plnp_charge: gm_explosive_plnp_charge_base {
- EGVAR(explosives,DelayTime) = 1;
- EGVAR(explosives,Placeable) = 1;
- EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_plnp);
+ EGVAR(explosives,placeable) = 1;
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_gm_explosive_plnp);
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
@@ -40,8 +38,8 @@ class CfgMagazines {
class gm_mine_at_base;
class gm_mine_at_tm46: gm_mine_at_base {
- EGVAR(explosives,Placeable) = 1;
- EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_mine_tm46);
+ EGVAR(explosives,placeable) = 1;
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_gm_mine_tm46);
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -51,8 +49,8 @@ class CfgMagazines {
};
};
class gm_mine_at_dm21: gm_mine_at_base {
- EGVAR(explosives,Placeable) = 1;
- EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_dm21);
+ EGVAR(explosives,placeable) = 1;
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_gm_explosive_dm21);
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -62,8 +60,8 @@ class CfgMagazines {
};
};
class gm_mine_at_mn111: gm_mine_at_base {
- EGVAR(explosives,Placeable) = 1;
- EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_m111);
+ EGVAR(explosives,placeable) = 1;
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_gm_explosive_m111);
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -74,8 +72,8 @@ class CfgMagazines {
};
class gm_mine_ap_dm31: gm_mine_at_base {
- EGVAR(explosives,Placeable) = 1;
- EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_dm31);
+ EGVAR(explosives,placeable) = 1;
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_gm_explosive_dm31);
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
diff --git a/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp b/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp
index bb279c82b94..ea201aa579a 100644
--- a/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp
+++ b/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
// CHARGE
class EGVAR(explosives,Place_gm_explosive_petn): EGVAR(explosives,Place) {
- displayName = "PETN Charge";
+ displayName = "$STR_DN_GM_EXPLOSIVE_PETN_CHARGE";
model = "gm\gm_weapons\gm_put\gm_explosive_charge_petn";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
@@ -18,7 +18,7 @@ class CfgVehicles {
};
};
class EGVAR(explosives,Place_gm_explosive_plnp): EGVAR(explosives,Place) {
- displayName = "PLNP Charge";
+ displayName = "$STR_DN_GM_EXPLOSIVE_PLNP_CHARGE";
model = "gm\gm_weapons\gm_put\gm_explosive_charge_plnp";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
@@ -28,7 +28,7 @@ class CfgVehicles {
};
// AT MINE
class EGVAR(explosives,Place_gm_mine_tm46): EGVAR(explosives,Place) {
- displayName = "AT Mine TM46";
+ displayName = "$STR_DN_GM_MINE_AT_TM46";
model = "gm\gm_weapons\gm_put\gm_mine_at_tm46";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
@@ -37,7 +37,7 @@ class CfgVehicles {
};
};
class EGVAR(explosives,Place_gm_explosive_dm21): EGVAR(explosives,Place) {
- displayName = "AT Mine DM21";
+ displayName = "$STR_DN_GM_MINE_AT_DM21";
model = "gm\gm_weapons\gm_put\gm_mine_at_dm21";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
@@ -46,7 +46,7 @@ class CfgVehicles {
};
};
class EGVAR(explosives,Place_gm_explosive_m111): EGVAR(explosives,Place) {
- displayName = "MN 111";
+ displayName = "$STR_DN_GM_MINE_AT_MN111";
model = "gm\gm_weapons\gm_launchers\gm_platan\gm_mine_at_mn111_disarmed";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
@@ -56,7 +56,7 @@ class CfgVehicles {
};
// AP
class EGVAR(explosives,Place_gm_explosive_dm31): EGVAR(explosives,Place) {
- displayName = "AP Mine DM31";
+ displayName = "$STR_DN_GM_MINE_AP_DM31";
model = "gm\gm_weapons\gm_put\gm_mine_ap_dm31";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
diff --git a/addons/compat_gm/compat_gm_explosives/config.cpp b/addons/compat_gm/compat_gm_explosives/config.cpp
index e240c283896..9b4d16a1e6c 100644
--- a/addons/compat_gm/compat_gm_explosives/config.cpp
+++ b/addons/compat_gm/compat_gm_explosives/config.cpp
@@ -8,6 +8,7 @@ class CfgPatches {
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"gm_core",
+ "gm_weapons_put",
"ace_explosives"
};
skipWhenMissingDependencies = 1;
diff --git a/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp b/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp
new file mode 100644
index 00000000000..aa51d469799
--- /dev/null
+++ b/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp
@@ -0,0 +1,336 @@
+class CfgVehicles {
+ class gm_typ2_base;
+ class gm_typ251_base: gm_typ2_base {
+ class EGVAR(interaction,anims) {
+ class canister_01_unhide {
+ phase = 0;
+ positions[] = {{-0.55, -0.17, 0.4}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class canister_02_unhide {
+ phase = 0;
+ positions[] = {{-0.55, -0.65, 0.4}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class gm_typ253_base: gm_typ2_base {
+ class EGVAR(interaction,anims) {
+ class canister_01_unhide {
+ phase = 0;
+ positions[] = {{-0.55, -0.19, 0.4}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class canister_02_unhide {
+ phase = 0;
+ positions[] = {{-0.55, -0.68, 0.4}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ class gm_wheeled_truck_base;
+ class gm_ural375d_base: gm_wheeled_truck_base {
+ class EGVAR(interaction,anims) {
+ class fuelcan_1_1_unhide {
+ phase = 0;
+ positions[] = {{-0.95, 3.15, -0.45}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class fuelcan_1_2_unhide {
+ phase = 0;
+ positions[] = {{0.9, 3.15, -0.45}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class gm_ural375d_mlrs_base: gm_ural375d_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class fuelcan_1_1_unhide: fuelcan_1_1_unhide {
+ positions[] = {{-0.95, 3.35, -0.55}};
+ };
+ class fuelcan_1_2_unhide: fuelcan_1_2_unhide {
+ positions[] = {{0.9, 3.35, -0.55}};
+ };
+ };
+ };
+ class gm_ural375d_medic_base: gm_ural375d_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class fuelcan_1_1_unhide: fuelcan_1_1_unhide {
+ positions[] = {{-0.95, 3.35, -0.45}};
+ };
+ class fuelcan_1_2_unhide: fuelcan_1_2_unhide {
+ positions[] = {{0.9, 3.35, -0.45}};
+ };
+ };
+ };
+
+ class gm_ural4320_base: gm_wheeled_truck_base {
+ class EGVAR(interaction,anims) {
+ class fuelcan_1_1_unhide {
+ phase = 0;
+ positions[] = {{-0.9, 3.1, -0.4}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class fuelcan_1_2_unhide {
+ phase = 0;
+ positions[] = {{0.9, 3.1, -0.4}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class gm_ural4320_repair_base: gm_ural4320_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class fuelcan_1_1_unhide: fuelcan_1_1_unhide {
+ positions[] = {{-0.9, 3.25, -0.4}};
+ };
+ class fuelcan_1_2_unhide: fuelcan_1_2_unhide {
+ positions[] = {{0.9, 3.25, -0.4}};
+ };
+ };
+ };
+ class gm_ural44202_base: gm_ural4320_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class fuelcan_1_1_unhide: fuelcan_1_1_unhide {
+ positions[] = {{-0.9, 3, -0.4}};
+ };
+ class fuelcan_1_2_unhide: fuelcan_1_2_unhide {
+ positions[] = {{0.9, 3, -0.4}};
+ };
+ };
+ };
+
+ class gm_wheeled_APC_base;
+ class gm_brdm2_base: gm_wheeled_APC_base {
+ class EGVAR(interaction,anims) {
+ class FuelCanister_01_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_01', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_02_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_02', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_03_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_03', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class gm_brdm2um_base: gm_brdm2_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class FuelCanister_01_unhide: FuelCanister_01_unhide {
+ positions[] = {{0.87, -3, -1.2}};
+ };
+ class FuelCanister_02_unhide: FuelCanister_02_unhide {
+ positions[] = {{-0.87, -3, -1.2}};
+ };
+ class FuelCanister_03_unhide: FuelCanister_03_unhide {
+ positions[] = {{-0.4, -1.85, -0.5}};
+ };
+ };
+ };
+
+ class gm_btr60_base: gm_wheeled_APC_base {
+ class EGVAR(interaction,anims) {
+ class FuelCanister_01_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_01', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_02_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_02', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_03_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_03', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_04_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_04', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_05_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_05', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_06_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['fuelcanister_06', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class gm_btr60pa_base: gm_btr60_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class FuelCanister_05_unhide: FuelCanister_05_unhide {
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ };
+ class FuelCanister_06_unhide: FuelCanister_06_unhide {
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ };
+ };
+ };
+ class gm_btr60pb_base: gm_btr60_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class FuelCanister_03_unhide: FuelCanister_03_unhide {
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ };
+ class FuelCanister_04_unhide: FuelCanister_04_unhide {
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ };
+ };
+ };
+ class gm_btr60pu12_base: gm_btr60_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class FuelCanister_03_unhide: FuelCanister_03_unhide {
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ };
+ class FuelCanister_04_unhide: FuelCanister_04_unhide {
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ };
+ };
+ };
+
+ class gm_bmp1_base;
+ class gm_bmp1sp2_base: gm_bmp1_base {
+ class EGVAR(interaction,anims) {
+ class FuelCanister_01_unhide {
+ phase = 0;
+ positions[] = {{-1.2, -2.52, -1.2}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_02_unhide {
+ phase = 0;
+ positions[] = {{1.2, -2.52, -1.2}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ class gm_zsu234_base;
+ class gm_zsu234v1_base: gm_zsu234_base {
+ class EGVAR(interaction,anims) {
+ class FuelCanister_01_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, 0.2, 0] vectorAdd ([[-0.85, -2.2, -0.9], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_02_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, 0.2, 0] vectorAdd ([[0.7, -2.25, -0.85], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_03_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, 0.2, 0] vectorAdd ([[0.92, -2.25, -0.85], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ class gm_tracked_Tank_base;
+ class gm_pt76_base: gm_tracked_Tank_base {
+ class EGVAR(interaction,anims) {
+ class FuelTank_01_unhide {
+ phase = 0;
+ positions[] = {{-1, -2.85, -1}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelTank_02_unhide {
+ phase = 0;
+ positions[] = {{1, -2.85, -1}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ class gm_Leopard1a0_base;
+ class gm_Leopard1a1_base: gm_Leopard1a0_base {
+ class EGVAR(interaction,anims) {
+ class FuelCanister_01_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, -0.6, 0] vectorAdd ([[0.25, -1.9, -0.55], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ distance = 2.5;
+ };
+ class FuelCanister_02_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, -0.6, 0] vectorAdd ([[-0.8, -1.65, -0.55], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ class FuelCanister_03_unhide {
+ phase = 0;
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, -0.6, 0] vectorAdd ([[0.8, -1.8, -0.55], [0, 0, 1], deg (_target animationPhase 'mainturret_trav_anim')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+};
diff --git a/addons/compat_gm/compat_gm_refuel/config.cpp b/addons/compat_gm/compat_gm_refuel/config.cpp
index 05688eff702..6becabe70a9 100644
--- a/addons/compat_gm/compat_gm_refuel/config.cpp
+++ b/addons/compat_gm/compat_gm_refuel/config.cpp
@@ -21,3 +21,4 @@ class CfgPatches {
};
#include "CfgEventHandlers.hpp"
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_gm/compat_gm_repair/CfgVehicles.hpp b/addons/compat_gm/compat_gm_repair/CfgVehicles.hpp
new file mode 100644
index 00000000000..12f9253bba6
--- /dev/null
+++ b/addons/compat_gm/compat_gm_repair/CfgVehicles.hpp
@@ -0,0 +1,100 @@
+class CfgVehicles {
+ class gm_wheeled_car_base;
+ class gm_uaz469_base: gm_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class spare_wheel_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['spare_wheel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class gm_wheeled_APC_base;
+ class gm_brdm2_base: gm_wheeled_APC_base {
+ class EGVAR(interaction,anims) {
+ class SpareWheel_01_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['sparewheel_01', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ distance = 2.5;
+ };
+ class SpareWheel_02_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['sparewheel_02', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ class gm_brdm2um_base: gm_brdm2_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class SpareWheel_01_unhide: SpareWheel_01_unhide {
+ positions[] = {{0.2, -0.7, -0.25}};
+ distance = 2;
+ };
+ class SpareWheel_02_unhide: SpareWheel_02_unhide {
+ positions[] = {{0, -1.6, -0.4}};
+ };
+ };
+ };
+
+ class gm_btr60_base: gm_wheeled_APC_base {
+ class EGVAR(interaction,anims) {
+ class SpareWheel_01_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['sparewheel_01', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ distance = 3;
+ };
+ class SpareWheel_02_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['sparewheel_02', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ class SpareWheel_03_unhide {
+ phase = 0;
+ positions[] = {"_target selectionPosition ['sparewheel_03', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class gm_bmp1_base;
+ class gm_bmp1sp2_base: gm_bmp1_base {
+ class EGVAR(interaction,anims) {
+ class spareTracks_1_1_unhide {
+ phase = 0;
+ positions[] = {"(_target selectionPosition ['door_1_1', 'FireGeometry', 'AveragePoint']) vectorAdd [0, 0, -0.15]"};
+ items[] = {"ACE_Track"};
+ name = ECSTRING(repair,RemoveTrack);
+ text = ECSTRING(repair,RemovingTrack);
+ };
+ class spareTracks_1_2_unhide {
+ phase = 0;
+ positions[] = {"(_target selectionPosition ['door_1_2', 'FireGeometry', 'AveragePoint']) vectorAdd [0, 0, -0.15]"};
+ items[] = {"ACE_Track"};
+ name = ECSTRING(repair,RemoveTrack);
+ text = ECSTRING(repair,RemovingTrack);
+ };
+ class spareTracks_2_1_unhide {
+ phase = 0;
+ positions[] = {{-1.1, -2.7, -1.3}, {1.1, -2.7, -1.3}};
+ items[] = {"ACE_Track", "ACE_Track"};
+ name = ECSTRING(repair,RemoveTrack);
+ text = ECSTRING(repair,RemovingTrack);
+ };
+ };
+ };
+};
diff --git a/addons/compat_gm/compat_gm_repair/config.cpp b/addons/compat_gm/compat_gm_repair/config.cpp
new file mode 100644
index 00000000000..6fae9858b4b
--- /dev/null
+++ b/addons/compat_gm/compat_gm_repair/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "gm_core",
+ "ace_repair"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ addonRootClass = QUOTE(ADDON);
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_gm/compat_gm_repair/script_component.hpp b/addons/compat_gm/compat_gm_repair/script_component.hpp
new file mode 100644
index 00000000000..1af928486c3
--- /dev/null
+++ b/addons/compat_gm/compat_gm_repair/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT repair
+#define SUBCOMPONENT_BEAUTIFIED Repair
+#include "..\script_component.hpp"
diff --git a/addons/compat_gm/compat_gm_trenches/CfgVehicles.hpp b/addons/compat_gm/compat_gm_trenches/CfgVehicles.hpp
new file mode 100644
index 00000000000..b5c32d8be1e
--- /dev/null
+++ b/addons/compat_gm/compat_gm_trenches/CfgVehicles.hpp
@@ -0,0 +1,47 @@
+class CfgVehicles {
+ class gm_wheeled_truck_base;
+ class gm_ural375d_base: gm_wheeled_truck_base {
+ class EGVAR(interaction,anims) {
+ class tools_unhide {
+ phase = 0;
+ positions[] = {{0.9, 3.15, -0.5}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+ class gm_ural375d_mlrs_base: gm_ural375d_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class tools_unhide: tools_unhide {
+ positions[] = {{0.9, 3.35, -0.65}};
+ };
+ };
+ };
+ class gm_ural375d_medic_base: gm_ural375d_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class tools_unhide: tools_unhide {
+ positions[] = {{0.9, 3.35, -0.5}};
+ };
+ };
+ };
+
+ class gm_ural4320_base: gm_wheeled_truck_base {
+ class EGVAR(interaction,anims) {
+ class tools_unhide {
+ phase = 0;
+ positions[] = {{0.93, 2.7, -0.5}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+ class gm_ural44202_base: gm_ural4320_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class tools_unhide: tools_unhide {
+ positions[] = {{0.9, 2.6, -0.5}};
+ };
+ };
+ };
+};
diff --git a/addons/compat_gm/compat_gm_trenches/config.cpp b/addons/compat_gm/compat_gm_trenches/config.cpp
new file mode 100644
index 00000000000..13c4dd0816d
--- /dev/null
+++ b/addons/compat_gm/compat_gm_trenches/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "gm_core",
+ "ace_trenches"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ addonRootClass = QUOTE(ADDON);
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_gm/compat_gm_trenches/script_component.hpp b/addons/compat_gm/compat_gm_trenches/script_component.hpp
new file mode 100644
index 00000000000..10b90eb71e5
--- /dev/null
+++ b/addons/compat_gm/compat_gm_trenches/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT trenches
+#define SUBCOMPONENT_BEAUTIFIED Trenches
+#include "..\script_component.hpp"
diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp
new file mode 100644
index 00000000000..fa0343908a9
--- /dev/null
+++ b/addons/compat_rf/CfgVehicles.hpp
@@ -0,0 +1,25 @@
+class CfgVehicles {
+ // Applies the offset to all RF Offroads which can have the optional tank in the back
+ class Offroad_01_unarmed_base_F;
+ class Pickup_01_base_rf: Offroad_01_unarmed_base_F {
+ EXGVAR(field_rations,offset)[] = {-0.04, -2.45, -0.9};
+ };
+
+ // Enable Water Source by Default
+ class C_IDAP_Pickup_rf;
+ class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf {
+ EXGVAR(field_rations,waterSupply) = 500;
+ };
+
+ class O_Truck_03_fuel_F;
+ class C_Truck_03_water_rf: O_Truck_03_fuel_F {
+ EXGVAR(field_rations,waterSupply) = 10000;
+ EXGVAR(field_rations,offset)[] = {0, -5.05, -0.3};
+ };
+
+ class B_Truck_01_fuel_F;
+ class C_Truck_01_water_rf: B_Truck_01_fuel_F {
+ EXGVAR(field_rations,waterSupply) = 10000;
+ EXGVAR(field_rations,offset)[] = {-0.41, -5.15, -0.3};
+ };
+};
diff --git a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
index 03d5003a620..16a6e927897 100644
--- a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
+++ b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
@@ -7,6 +7,7 @@
이오텍 MRDS (카키)
EOTech MRDS (Khaki)
EOTech MRDS (Cachi)
+ EOTech MRDS (Khaki)
EOTech MRDS (Tan)
@@ -14,6 +15,7 @@
이오텍 MRDS (황갈)
EOTech MRDS (Hellbraun)
EOTech MRDS (Marroncino)
+ EOTech MRDS (Marron)
C-More Railway (Green, Desert)
@@ -21,6 +23,7 @@
씨모어 레일웨이 (녹색, 사막)
C-More Railway (Grün, Wüste)
C-More Railway (Verde, Deserto)
+ C-More Railway (Vert, Désert)
C-More Railway (Green, Woodland)
@@ -28,6 +31,7 @@
씨모어 레일웨이 (녹색, 수풀 위장)
C-More Railway (Grün, Grünes Tarnmuster)
C-More Railway (Verde, Boschivo)
+ C-More Railway (Vert, Woodland)
C-More Railway (Red, Desert)
@@ -35,6 +39,7 @@
씨모어 레일웨이 (빨강, 사막)
C-More Railway (Rot, Wüste)
C-More Railway (Rosso, Desert)
+ C-More Railway (Rouge, Désert)
C-More Railway (Red, Woodland)
@@ -42,6 +47,7 @@
씨모어 레일웨이 (빨강, 수풀)
C-More Railway (Rot, Grünes Tarnmuster)
C-More Railway (Rosso, Boschivo)
+ C-More Railway (Rouge, Woodland)
Aimpoint Micro R-1
@@ -49,6 +55,7 @@
에임포인트 마이크로 R-1
Aimpoint Micro R-1
Aimpoint Micro R-1
+ Aimpoint Micro R-1
Vortex Spitfire Prism
@@ -56,6 +63,7 @@
버텍스 스핏파이어 프리즘
Vortex Spitfire Prism
Vortex Spitfire Prism
+ Vortex Spitfire Prism
Vortex Spitfire Prism (Tan)
@@ -63,6 +71,7 @@
버텍스 스핏파이어 프리즘 (황갈)
Vortex Spitfire Prism (Hellbraun)
Vortex Spitfire Prism (Marroncino)
+ Vortex Spitfire Prism (Marron)
Vortex Spitfire Prism (Khaki)
@@ -70,6 +79,7 @@
버텍스 스핏파이어 프리즘 (카키)
Vortex Spitfire Prism (Khaki)
Vortex Spitfire Prism (Cachi)
+ Vortex Spitfire Prism (Khaki)
Vortex Spitfire Prism (Pistol)
@@ -77,6 +87,7 @@
버텍스 스핏파이어 프리즘 (권총용)
Vortex Spitfire Prism (Pistole)
Vortex Spitfire Prism (Pistola)
+ Vortex Spitfire Prism (Pistol)
Glock 19X
@@ -84,6 +95,7 @@
글록 19X
Glock 19X
Glock 19X
+ Glock 19X
Glock 19X (Khaki)
@@ -91,6 +103,7 @@
글록 19X (카키)
Glock 19X (Khaki)
Glock 19X (Cachi)
+ Glock 19X (Khaki)
Glock 19X (Tan)
@@ -98,6 +111,7 @@
글록 19X (황갈)
Glock 19X (Hellbraun)
Glock 19X (Marroncino)
+ Glock 19X (Marron)
Glock 19X Auto
@@ -105,6 +119,7 @@
글록 19X 기관권총
Glock 19X Auto
Glock 19X Auto
+ Glock 19X Auto
Glock 19X Auto (Khaki)
@@ -112,6 +127,7 @@
글록 19X 기관권총 (카키)
Glock 19X Auto (Khaki)
Glock 19X Auto (Cachi)
+ Glock 19X Auto (Khaki)
Glock 19X Auto (Tan)
@@ -119,6 +135,7 @@
글록 19X 기관권총 (황갈)
Glock 19X Auto (Hellbraun)
Glock 19X Auto (Marroncino)
+ Glock 19X Auto (Marron)
Desert Eagle Mark XIX L5
@@ -126,6 +143,7 @@
데저트 이글 마크 XIX L5
Desert Eagle Mark XIX L5
Desert Eagle Mark XIX L5
+ Desert Eagle Mark XIX L5
Desert Eagle Mark XIX L5 (Classic)
@@ -133,6 +151,7 @@
데저트 이글 마크 XIX L5 (클래식)
Desert Eagle Mark XIX L5 (Klassisch)
Desert Eagle Mark XIX L5 (Classico)
+ Desert Eagle Mark XIX L5 (Classique)
Desert Eagle Mark XIX L5 (Bronze)
@@ -140,6 +159,7 @@
데저트 이글 마크 XIX L5 (브론즈)
Desert Eagle Mark XIX L5 (Bronze)
Desert Eagle Mark XIX L5 (Bronzo)
+ Desert Eagle Mark XIX L5 (Bronze)
Desert Eagle Mark XIX L5 (Copper)
@@ -147,6 +167,7 @@
데저트 이글 마크 XIX L5 (구리)
Desert Eagle Mark XIX L5 (Kupfer)
Desert Eagle Mark XIX L5 (Rame)
+ Desert Eagle Mark XIX L5 (Cuivre)
Desert Eagle Mark XIX L5 (Gold)
@@ -154,6 +175,7 @@
데저트 이글 마크 XIX L5 (금색)
Desert Eagle Mark XIX L5 (Gold)
Desert Eagle Mark XIX L5 (Oro)
+ Desert Eagle Mark XIX L5 (Or)
HERA H6 (Tan)
@@ -161,6 +183,7 @@
헤라 H6 (황갈)
HERA H6 (Hellbraun)
HERA H6 (Marroncino)
+ HERA H6 (Marron)
HERA H6 (Olive)
@@ -168,6 +191,7 @@
헤라 H6 (올리브)
HERA H6 (Olivgrün)
HERA H6 (Oliva)
+ HERA H6 (Olive)
HERA H6 (Black)
@@ -175,6 +199,7 @@
헤라 H6 (검정)
HERA H6 (Schwarz)
HERA H6 (Nero)
+ HERA H6 (Noir)
HERA H6 (Digital)
@@ -182,6 +207,7 @@
헤라 H6 (AAF 디지털)
HERA H6 (Digital)
HERA H6 (Digitale)
+ HERA H6 (Digital)
HERA H6 (Gold)
@@ -189,6 +215,7 @@
헤라 H6 (금색)
HERA H6 (Gold)
HERA H6 (Oro)
+ HERA H6 (Or)
VS-121 (Black)
@@ -196,6 +223,7 @@
VS-121 (검정)
VS-121 (Schwarz)
VS-121 (Nero)
+ VS-121 (Noir)
VS-121 (Tan)
@@ -203,6 +231,7 @@
VS-121 (황갈)
VS-121 (Hellbraun)
VS-121 (Marroncino)
+ VS-121 (Marron)
Vector SMG (Black)
@@ -210,6 +239,7 @@
벡터 SMG (검정)
Vector SMG (Schwarz)
Vector SMG (Nero)
+ Vector SMG (Noir)
ASh-12 (Black)
@@ -217,6 +247,7 @@
ASh-12 (검정)
ASh-12 (Schwarz)
ASh-12 (Nero)
+ ASh-12 (Noir)
ASh-12 (Desert)
@@ -224,6 +255,7 @@
ASh-12 (사막)
ASh-12 (Wüste)
ASh-12 (Deserto)
+ ASh-12 (Désert )
ASh-12 (Urban)
@@ -231,6 +263,7 @@
ASh-12 (도심)
ASh-12 (Urban)
ASh-12 (Urbano)
+ ASh-12 (Urbain)
ASh-12 (Woodland)
@@ -238,6 +271,7 @@
ASh-12 (수풀)
ASh-12 (Grünes Tarnmuster)
ASh-12 (Boschivo)
+ ASh-12 (Woodland)
ASh-12 GL (Black)
@@ -245,6 +279,7 @@
ASh-12 GL (검정)
ASh-12 GL (Schwarz)
ASh-12 GL (Nero)
+ ASh-12 GL (Noir)
ASh-12 GL (Desert)
@@ -252,6 +287,7 @@
ASh-12 GL (사막)
ASh-12 GL (Wüste)
ASh-12 GL (Deserto)
+ ASh-12 GL (Désert)
ASh-12 GL (Urban)
@@ -259,6 +295,7 @@
ASh-12 GL (도심)
ASh-12 GL (Urban)
ASh-12 GL (Urbano)
+ ASh-12 GL (Urbain)
ASh-12 GL (Woodland)
@@ -266,6 +303,7 @@
ASh-12 GL (수풀)
ASh-12 GL (Grünes Tarnmuster)
ASh-12 GL (Boschivo)
+ ASh-12 GL (Woodland)
ASh-12 LR (Black)
@@ -273,6 +311,7 @@
ASh-12 LR (검정)
ASh-12 LR (Schwarz)
ASh-12 LR (Nero)
+ ASh-12 LR (Noir)
ASh-12 LR (Desert)
@@ -280,6 +319,7 @@
ASh-12 LR (사막)
ASh-12 LR (Wüste)
ASh-12 LR (Deserto)
+ ASh-12 LR (Désert)
ASh-12 LR (Urban)
@@ -287,6 +327,7 @@
ASh-12 LR (도심)
ASh-12 LR (Urban)
ASh-12 LR (Urbano)
+ ASh-12 LR (Urbain)
ASh-12 LR (Woodland)
@@ -294,6 +335,7 @@
ASh-12 LR (수풀)
ASh-12 LR (Grünes Tarnmuster)
ASh-12 LR (Boschivo)
+ ASh-12 LR (Woodland)
AW159 Wildcat ASW
@@ -301,6 +343,7 @@
AW159 와일드캣 ASW
AW159 Wildcat ASW
AW159 Wildcat ASW
+ AW159 Wildcat ASW
AW159 Wildcat ASW (Unarmed)
@@ -308,6 +351,7 @@
AW159 와일드캣 ASW (비무장)
AW159 Wildcat ASW (Unbewaffnet)
AW159 Wildcat ASW (Disarmato)
+ AW159 Wildcat ASW (non armé)
H225 Super Puma (Transport)
@@ -315,6 +359,7 @@
H225 슈퍼 퓨마 (비무장)
H225 Super Puma (Transport)
H225 Super Puma (Trasporto)
+ H225 Super Puma (Transport )
H225 Super Puma (Civilian)
@@ -322,6 +367,7 @@
H225 슈퍼 퓨마 (비무장)
H225 Super Puma (Zivil)
H225 Super Puma (Civile)
+ H225 Super Puma (Civil)
H215 Super Puma (Transport)
@@ -329,6 +375,7 @@
H215 슈퍼 퓨마 (비무장)
H215 Super Puma (Transport)
H215 Super Puma (Trasporto)
+ H215 Super Puma (Transport)
H215 Super Puma (Civilian)
@@ -336,6 +383,7 @@
H215 슈퍼 퓨마 (비무장)
H215 Super Puma (Zivil)
H215 Super Puma (Civile)
+ H215 Super Puma (Civil)
H215 Super Puma (Unarmed)
@@ -343,6 +391,7 @@
H215 슈퍼 퓨마 (비무장)
H215 Super Puma (Unbewaffnet)
H215 Super Puma (Disarmato)
+ H215 Super Puma (non armé)
H225M Super Cougar SOCAT
@@ -350,6 +399,7 @@
H225M 슈퍼 쿠거 SOCAT
H225M Super Cougar SOCAT
H225M Super Cougar SOCAT
+ H225M Super Cougar SOCAT
H225M Super Cougar SOCAT
@@ -357,6 +407,7 @@
H225M 슈퍼 쿠거 SOCAT
H225M Super Cougar SOCAT
H225M Super Cougar SOCAT
+ H225M Super Cougar SOCAT
H225M Super Cougar
@@ -364,6 +415,7 @@
H225M 슈퍼 쿠거
H225M Super Cougar
H225M Super Cougar
+ H225M Super Cougar
H225 Super Puma SAR
@@ -371,6 +423,7 @@
H225 슈퍼 퓨마 SAR
H225 Super Puma SAR
H225 Super Puma SAR
+ H225 Super Puma SAR
H225M Super Cougar (Unarmed)
@@ -378,6 +431,7 @@
H225M Super Cougar (Unbewaffnet)
H225M Super Cougar (Disarmato)
H225M 슈퍼 쿠거 (비무장)
+ H225M Super Cougar (Non armé)
HEMTT Fire Truck
@@ -398,6 +452,7 @@
타이푼 급수
Typhoon Water
Typhoon Acqua
+ Typhoon Water
Ram 1500
@@ -405,6 +460,7 @@
램 1500
Ram 1500
Ram 1500
+ Ram 1500
Ram 1500 (Fuel)
@@ -412,6 +468,7 @@
램 1500 (연료)
Ram 1500 (Treibstoff)
Ram 1500 (Carburante)
+ Ram 1500 (Carburant)
Ram 1500 (Services)
@@ -419,6 +476,7 @@
램 1500 (서비스)
Ram 1500 (Pannenhilfe)
Ram 1500 (Servizi)
+ Ram 1500 (Dépannage)
Ram 1500 (Repair)
@@ -426,6 +484,7 @@
램 1500 (정비)
Ram 1500 (Instandsetzung)
Ram 1500 (Riparazioni)
+ Ram 1500 (Réparation)
Ram 1500 (Comms)
@@ -433,6 +492,7 @@
램 1500 (통신)
Ram 1500 (Kommunikation)
Ram 1500 (Comunicazioni)
+ Ram 1500 (Communication)
Ram 1500 (HMG)
@@ -440,6 +500,7 @@
램 1500 (중기관총)
Ram 1500 (HMG)
Ram 1500 (HMG)
+ Ram 1500 (HMG)
Ram 1500 (MMG)
@@ -447,6 +508,7 @@
램 1500 (중형기관총)
Ram 1500 (MMG)
Ram 1500 (MMG)
+ Ram 1500 (MMG)
Ram 1500 (MRL)
@@ -454,6 +516,7 @@
램 1500 (다연장로켓)
Ram 1500 (MRL)
Ram 1500 (MRL)
+ Ram 1500 (MRL)
Ram 1500 (AA)
@@ -461,6 +524,7 @@
램 1500 (대공)
Ram 1500 (AA)
Ram 1500 (AA)
+ Ram 1500 (AA)
Ram 1500 (Covered)
@@ -468,6 +532,7 @@
램 1500 (커버)
Ram 1500 (Abgedeckt)
Ram 1500 (Coperto)
+ Ram 1500 (couvert)
Ram 1500 (Water)
@@ -475,6 +540,7 @@
램 1500 (급수)
Ram 1500 (Wasser)
Ram 1500 (Acqua)
+ Ram 1500 (eau)
RSG60
@@ -482,6 +548,7 @@
RSG60
RSG60
RSG60
+ RSG60
AMOS Container
@@ -489,6 +556,7 @@
AMOS 컨테이너
AMOS Container
AMOS Container
+ AMOS Container
Drone40
@@ -496,6 +564,7 @@
드론40
Drone40
Drone40
+ Drone40
Drone40 Scout
@@ -503,6 +572,7 @@
드론40 정찰
Drone40 Scout
Drone40 Scout
+ Drone40 Scout
Drone40 HE
@@ -510,6 +580,7 @@
드론40 고폭
Drone40 HE
Drone40 HE
+ Drone40 HE
Drone40 Smoke (White)
@@ -517,6 +588,7 @@
드론40 연막 (백색)
Drone40 Smoke (Weiß)
Drone40 Smoke (Bianco)
+ Drone40 Fumée (Blanc)
Drone40 Smoke (Blue)
@@ -524,6 +596,7 @@
드론40 연막 (청색)
Drone40 Smoke (Blau)
Drone40 Smoke (Blu)
+ Drone40 Fumée (Bleu)
Drone40 Smoke (Red)
@@ -531,6 +604,7 @@
드론40 연막 (적색)
Drone40 Smoke (Rot)
Drone40 Smoke (Rosso)
+ Drone40 Fumée (Rouge)
Drone40 Smoke (Green)
@@ -538,6 +612,7 @@
드론40 연막 (녹색)
Drone40 Smoke (Grün)
Drone40 Smoke (Verde)
+ Drone40 Fumée (Vert)
Drone40 Smoke (Orange)
@@ -545,6 +620,7 @@
드론40 연막 (주황색)
Drone40 Smoke (Orange)
Drone40 Smoke (Arancione)
+ Drone40 Fumée (Orange)
diff --git a/addons/compat_rf/config.cpp b/addons/compat_rf/config.cpp
index ab6fb942751..52ef83c1b74 100644
--- a/addons/compat_rf/config.cpp
+++ b/addons/compat_rf/config.cpp
@@ -9,10 +9,11 @@ class CfgPatches {
requiredAddons[] = {"RF_Data_Loadorder"};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
- authors[] = {"Mike"};
+ authors[] = {"Mike", "OverlordZorn[CVO]"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};
#include "CfgWeapons.hpp"
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_afrf3/CfgVehicles.hpp b/addons/compat_rhs_afrf3/CfgVehicles.hpp
index 1cf5029bc34..2ba6caf56f9 100644
--- a/addons/compat_rhs_afrf3/CfgVehicles.hpp
+++ b/addons/compat_rhs_afrf3/CfgVehicles.hpp
@@ -60,6 +60,8 @@ class CfgVehicles {
EGVAR(vehicle_damage,turretFireProb) = 0.7;
EGVAR(vehicle_damage,engineFireProb) = 0.7;
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
+
+ class EGVAR(interaction,anims);
};
class rhs_infantry_msv_base;
@@ -156,68 +158,186 @@ class CfgVehicles {
EGVAR(vehicle_damage,engineFireProb) = 0.8;
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.8;
EGVAR(vehicle_damage,canHaveFireRing) = 1;
- };
+ };
class rhs_btr60_base: rhs_btr_base {
EGVAR(refuel,fuelCapacity) = 290;
+
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide {
+ positions[] = {{-1.1, 2, -0.3}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l2_unhide {
+ positions[] = {{-1.1, 1.05, -0.3}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l3_unhide {
+ positions[] = {{-1.1, -1.1, -0.3}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r1_unhide {
+ positions[] = {{1.1, 1.93, -0.3}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r2_unhide {
+ positions[] = {{1.1, 0.25, -0.3}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r3_unhide {
+ positions[] = {{1.1, -1.1, -0.3}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ };
};
class rhs_btr70_vmf: rhs_btr_base {
EGVAR(refuel,fuelCapacity) = 350;
+
class ace_viewports {
class view_0 {
camLocation[] = {0.478394, -0.575, -0.145};
camAttach = 90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_1 {
camLocation[] = {-1.38184, -0.575, -0.145};
camAttach = -90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
};
- };
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide {
+ positions[] = {{-1.7, 0.55, -0.4}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l2_unhide {
+ positions[] = {{-1.7, -0.95, -0.4}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l3_unhide {
+ positions[] = {{-1.7, -1.45, -0.4}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l4_unhide {
+ positions[] = {{-1.7, -2.7, -0.4}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r1_unhide {
+ positions[] = {{0.8, 1, -0.4}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r2_unhide {
+ positions[] = {{0.8, 0.12, -0.4}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r3_unhide {
+ positions[] = {{0.8, -0.7, -0.4}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r4_unhide {
+ positions[] = {{0.8, -1.85, -0.4}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ };
+ };
class rhs_btr70_msv: rhs_btr70_vmf {};
class rhs_btr80_msv: rhs_btr70_msv {
EGVAR(refuel,fuelCapacity) = 300;
+
class ace_viewports {
class view_0 {
camLocation[] = {0.534424, -0.336914, 0.636819};
camAttach = 45;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_1 {
camLocation[] = {0.760254, -0.459473, 0.526328};
camAttach = 90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_2 {
camLocation[] = {0.770508, -1.21924, 0.526954};
camAttach = 90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_3 {
camLocation[] = {-1.13, -1.2085, 0.490339};
camAttach = -90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_4 {
camLocation[] = {-1.14124, -0.416992, 0.460611};
camAttach = -90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_5 {
camLocation[] = {-0.932983, -0.326172, 0.647666};
camAttach = -45;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
+ };
+ };
+
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ positions[] = {{-1.45, 0, 0.25}};
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ positions[] = {{-1.45, -1.68, 0.15}};
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ positions[] = {{-1.45, -2.87, 0.15}};
+ };
+ class crate_l4_unhide: crate_l4_unhide {
+ enabled = 0;
+ };
+ class crate_r1_unhide: crate_r1_unhide {
+ positions[] = {{1.1, 0.97, 0.15}};
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ positions[] = {{1.1, -1.5, 0.15}};
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ enabled = 0;
+ };
+ class crate_r4_unhide: crate_r4_unhide {
+ enabled = 0;
};
};
};
@@ -226,38 +346,56 @@ class CfgVehicles {
class view_0 {
camLocation[] = {0.589844, -0.314941, 0.449678};
camAttach = 45;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_1 {
camLocation[] = {0.809082, -0.442871, 0.276865};
camAttach = 90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_2 {
camLocation[] = {0.819092, -1.24414, 0.27857};
camAttach = 90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_3 {
camLocation[] = {-1.1012, -1.22461, 0.341089};
camAttach = -90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_4 {
camLocation[] = {-1.11597, -0.458984, 0.307256};
camAttach = -90;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
};
class view_5 {
camLocation[] = {-0.869995, -0.304688, 0.461181};
camAttach = -45;
- compartments[]={"Compartment1"};
- roles[]={"cargo"};
+ compartments[] = {"Compartment1"};
+ roles[] = {"cargo"};
+ };
+ };
+
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ positions[] = {{-1.45, 0, 0}};
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ positions[] = {{-1.45, -1.68, 0}};
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ positions[] = {{-1.45, -2.87, 0}};
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ positions[] = {{1.1, 0.97, 0}};
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ positions[] = {{1.1, -1.5, 0}};
};
};
};
@@ -279,11 +417,289 @@ class CfgVehicles {
EGVAR(vehicle_damage,turretFireProb) = 0.5;
EGVAR(vehicle_damage,engineFireProb) = 0.8;
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
+
+ class EGVAR(interaction,anims) {
+ class crate_l1_unhide {
+ positions[] = {{-1.45, 0.5, -0.65}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l2_unhide {
+ positions[] = {{-1.45, -0.2, -0.65}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l3_unhide {
+ positions[] = {{-1.45, -1.2, -0.65}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r1_unhide {
+ positions[] = {{1.45, 0.6, -0.65}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r2_unhide {
+ positions[] = {{1.45, -0.4, -0.65}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r3_unhide {
+ positions[] = {{1.45, -1.2, -0.65}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ };
+ };
+ class rhs_bmd1_base: rhs_bmd_base {};
+ class rhs_bmd1p: rhs_bmd1_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ positions[] = {{-1.45, 0.5, -0.8}};
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ positions[] = {{-1.45, -0.2, -0.8}};
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ positions[] = {{-1.45, -1.2, -0.8}};
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ positions[] = {{1.45, 0.6, -0.8}};
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ positions[] = {{1.45, -0.4, -0.8}};
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ positions[] = {{1.45, -1.2, -0.8}};
+ };
+ };
};
+ class rhs_bmd2_base: rhs_bmd_base {};
+ class rhs_bmd2: rhs_bmd2_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ positions[] = {{-1.45, 0.5, -0.8}};
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ positions[] = {{-1.45, -0.2, -0.8}};
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ positions[] = {{-1.45, -1.2, -0.8}};
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ positions[] = {{1.45, 0.6, -0.8}};
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ positions[] = {{1.45, -0.4, -0.8}};
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ positions[] = {{1.45, -1.2, -0.8}};
+ };
+ };
+ };
+ class rhs_bmd2m: rhs_bmd2 {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ positions[] = {{-1.45, 0.5, -0.7}};
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ positions[] = {{-1.45, -0.2, -0.7}};
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ positions[] = {{-1.45, -1.2, -0.7}};
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ positions[] = {{1.45, 0.6, -0.7}};
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ positions[] = {{1.45, -0.4, -0.7}};
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ positions[] = {{1.45, -1.2, -0.7}};
+ };
+ };
+ };
+
class rhs_bmp1tank_base: Tank_F {
EGVAR(map,vehicleLightColor)[] = {0,1,0,0.1};
EGVAR(refuel,fuelCapacity) = 460;
};
+ class rhs_bmp_base: rhs_bmp1tank_base {
+ EGVAR(vehicle_damage,hullDetonationProb) = 0;
+ EGVAR(vehicle_damage,turretDetonationProb) = 0.2;
+ EGVAR(vehicle_damage,engineDetonationProb) = 0;
+ EGVAR(vehicle_damage,hullFireProb) = 0.8;
+ EGVAR(vehicle_damage,turretFireProb) = 0.5;
+ EGVAR(vehicle_damage,engineFireProb) = 0.8;
+ EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
+
+ class EGVAR(interaction,anims) {
+ class crate_l1_unhide {
+ positions[] = {{-1.55, 1.1, -0.55}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l2_unhide {
+ positions[] = {{-1.55, 0.35, -0.55}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_l3_unhide {
+ positions[] = {{-1.55, -0.6, -0.55}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r1_unhide {
+ positions[] = {{1.55, 1.75, -0.55}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r2_unhide {
+ positions[] = {{1.55, -0.25, -0.55}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ class crate_r3_unhide {
+ positions[] = {{1.55, -1, -0.55}};
+ items[] = {"rhs_3Ya40_1_single"};
+ name = "3Ya40-1 Crate";
+ text = "3Ya40-1 Crate";
+ };
+ };
+ };
+ class rhs_bmp1_vdv: rhs_bmp_base {};
+ class rhs_bmp1d_vdv: rhs_bmp1_vdv {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_r3_unhide: crate_r3_unhide {
+ positions[] = {{1.5, -1.2, -0.55}};
+ };
+ };
+ };
+ class rhs_prp3_vdv: rhs_bmp1_vdv {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ enabled = 0;
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ enabled = 0;
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ enabled = 0;
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ enabled = 0;
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ enabled = 0;
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ enabled = 0;
+ };
+ };
+ };
+
+ class rhs_bmp2e_vdv: rhs_bmp1_vdv {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ positions[] = {{-1.8, 1.05, -0.55}};
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ positions[] = {{-1.8, 0.35, -0.55}};
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ positions[] = {{-1.8, -0.65, -0.55}};
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ positions[] = {{1.4, 1.7, -0.55}};
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ positions[] = {{1.4, -0.25, -0.55}};
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ positions[] = {{1.4, -1.05, -0.55}};
+ };
+ };
+ };
+ class rhs_bmp2_vdv: rhs_bmp2e_vdv {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ positions[] = {{-1.8, 1.2, -0.55}};
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ positions[] = {{-1.8, 0.5, -0.55}};
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ positions[] = {{-1.8, -0.5, -0.55}};
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ positions[] = {{1.4, 1.85, -0.55}};
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ positions[] = {{1.4, -0.1, -0.55}};
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ positions[] = {{1.4, -0.9, -0.55}};
+ };
+ };
+ };
+ class rhs_bmp2e_msv: rhs_bmp2e_vdv {};
+ class rhs_Ob_681_2: rhs_bmp2e_msv {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ positions[] = {{-1.8, 1.2, -0.55}};
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ positions[] = {{-1.8, 0.5, -0.55}};
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ positions[] = {{-1.8, -0.5, -0.55}};
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ positions[] = {{1.4, 1.85, -0.55}};
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ positions[] = {{1.4, -0.1, -0.55}};
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ positions[] = {{1.4, -0.9, -0.55}};
+ };
+ };
+ };
+
+ class rhs_brm1k_base: rhs_bmp2e_vdv {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class crate_l1_unhide: crate_l1_unhide {
+ enabled = 0;
+ };
+ class crate_l2_unhide: crate_l2_unhide {
+ enabled = 0;
+ };
+ class crate_l3_unhide: crate_l3_unhide {
+ enabled = 0;
+ };
+ class crate_r1_unhide: crate_l3_unhide {
+ enabled = 0;
+ };
+ class crate_r2_unhide: crate_r2_unhide {
+ enabled = 0;
+ };
+ class crate_r3_unhide: crate_r3_unhide {
+ enabled = 0;
+ };
+ };
+ };
+
class rhs_bmp3tank_base: Tank_F {
EGVAR(refuel,fuelCapacity) = 460;
EGVAR(vehicle_damage,hullDetonationProb) = 0.2;
@@ -293,37 +709,39 @@ class CfgVehicles {
EGVAR(vehicle_damage,turretFireProb) = 0.2;
EGVAR(vehicle_damage,engineFireProb) = 0.8;
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
+
class ace_viewports {
class view_0 {
camLocation[] = {1.02881, -0.923828, -0.647231};
screenLocation[] = {1.12881, -0.653828, -1.08223};
camAttach = 50;
maxDistance = 0.5;
- roles[]={"cargo"};
+ roles[] = {"cargo"};
};
class view_1 {
camLocation[] = {1.01709, -1.55664, -0.647231};
screenLocation[] = {1.10709, -1.42664, -1.14223};
camAttach = 82;
maxDistance = 0.5;
- roles[]={"cargo"};
+ roles[] = {"cargo"};
};
class view_2 {
camLocation[] = {-0.871094, -1.55762, -0.647231};
screenLocation[] = {-0.981094, -1.42762, -1.13223};
camAttach = 285;
maxDistance = 0.5;
- roles[]={"cargo"};
+ roles[] = {"cargo"};
};
class view_3 {
camLocation[] = {-1.00879, -0.939941, -0.650259};
screenLocation[] = {-0.97879, -0.689941, -1.09526};
camAttach = 310;
maxDistance = 0.5;
- roles[]={"cargo"};
+ roles[] = {"cargo"};
};
};
};
+
class rhs_a3spruttank_base: Tank_F {
EGVAR(refuel,fuelCapacity) = 400;
EGVAR(vehicle_damage,hullDetonationProb) = 0.2;
@@ -334,6 +752,7 @@ class CfgVehicles {
EGVAR(vehicle_damage,engineFireProb) = 0.8;
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
};
+
class rhs_a3t72tank_base: Tank_F {
EGVAR(refuel,fuelCapacity) = 1200;
EGVAR(vehicle_damage,hullDetonationProb) = 0.8;
@@ -344,15 +763,6 @@ class CfgVehicles {
EGVAR(vehicle_damage,engineFireProb) = 0.5;
EGVAR(vehicle_damage,detonationDuringFireProb) = 0.2;
};
- class rhs_bmp_base: rhs_bmp1tank_base {
- EGVAR(vehicle_damage,hullDetonationProb) = 0;
- EGVAR(vehicle_damage,turretDetonationProb) = 0.2;
- EGVAR(vehicle_damage,engineDetonationProb) = 0;
- EGVAR(vehicle_damage,hullFireProb) = 0.8;
- EGVAR(vehicle_damage,turretFireProb) = 0.5;
- EGVAR(vehicle_damage,engineFireProb) = 0.8;
- EGVAR(vehicle_damage,detonationDuringFireProb) = 0.5;
- };
class rhs_t72bd_tv: rhs_a3t72tank_base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint",
diff --git a/addons/compat_rhs_afrf3/XEH_postInit.sqf b/addons/compat_rhs_afrf3/XEH_postInit.sqf
index be180179a55..e740d0d8a66 100644
--- a/addons/compat_rhs_afrf3/XEH_postInit.sqf
+++ b/addons/compat_rhs_afrf3/XEH_postInit.sqf
@@ -1,5 +1,7 @@
#include "script_component.hpp"
+if !(["ace_nametags"] call EFUNC(common,isModLoaded)) exitWith {};
+
private _russianRankIcons = [
QPATHTOEF(nametags,UI\icons_russia\private_gs.paa),
QPATHTOEF(nametags,UI\icons_russia\corporal_gs.paa),
diff --git a/addons/compat_rhs_afrf3/XEH_preInit.sqf b/addons/compat_rhs_afrf3/XEH_preInit.sqf
index b47cf6628db..2ca4338e90c 100644
--- a/addons/compat_rhs_afrf3/XEH_preInit.sqf
+++ b/addons/compat_rhs_afrf3/XEH_preInit.sqf
@@ -6,4 +6,12 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
+// Disable RHS' wheel replacement mechanic
+if (["ace_repair"] call EFUNC(common,isModLoaded)) then {
+ RHS_Retread_Enabled = false;
+ rhs_btr70_EnableRetread = false;
+ rhs_TypeTirePressure = 1;
+ RHS_BTR_Effects_Init = true;
+};
+
ADDON = true;
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgVehicles.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgVehicles.hpp
index 6a3bb0a083e..fb52cc6373c 100644
--- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgVehicles.hpp
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgVehicles.hpp
@@ -5,7 +5,7 @@ class CfgVehicles {
class StaticGrenadeLauncher;
class rhs_SPG9_base: AT_01_base_F {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_SPG9);
magazineLocation = "_target selectionPosition 'breach'";
@@ -18,14 +18,14 @@ class CfgVehicles {
};
class rhs_SPG9M_base: rhs_SPG9_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
disassembleWeapon = QGVAR(spg9m_carry);
};
};
class rhs_Kornet_Base: AT_01_base_F {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_9K133_launcher);
magazineLocation = "_target selectionPosition 'gun'";
@@ -38,7 +38,7 @@ class CfgVehicles {
};
class rhs_Metis_Base: AT_01_base_F {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_9K115_2_launcher);
magazineLocation = "_target selectionPosition 'gun'";
@@ -51,7 +51,7 @@ class CfgVehicles {
};
class rhs_2b14_82mm_Base: StaticMortar {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
magazineLocation = "";
proxyWeapon = QGVAR(rhs_weap_2b14);
@@ -64,7 +64,7 @@ class CfgVehicles {
};
class rhs_nsv_tripod_base: StaticMGWeapon {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_nsvt_effects);
magazineLocation = "_target selectionPosition 'magazine'";
@@ -77,7 +77,7 @@ class CfgVehicles {
};
class RHS_KORD_Base: rhs_nsv_tripod_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_KORD);
disassembleWeapon = QGVAR(kord_carry);
@@ -86,7 +86,7 @@ class CfgVehicles {
};
class RHS_KORD_high_base: RHS_KORD_Base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_KORD);
disassembleWeapon = QGVAR(kord_carry);
@@ -95,7 +95,7 @@ class CfgVehicles {
};
class RHS_AGS30_TriPod_base: StaticGrenadeLauncher {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_AGS30);
magazineLocation = "_target selectionPosition 'magazine'";
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgWeapons.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgWeapons.hpp
index 1e8f4dbdfd1..e444a2aa32f 100644
--- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgWeapons.hpp
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgWeapons.hpp
@@ -14,7 +14,7 @@ class CfgWeapons {
class GVAR(2b14_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 20;
pickupTime = 25;
@@ -40,7 +40,7 @@ class CfgWeapons {
class GVAR(nsv_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -64,7 +64,7 @@ class CfgWeapons {
class GVAR(kord_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -89,7 +89,7 @@ class CfgWeapons {
class GVAR(ags30_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -113,7 +113,7 @@ class CfgWeapons {
class GVAR(spg9_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -136,7 +136,7 @@ class CfgWeapons {
};
class GVAR(spg9m_carry): GVAR(spg9_carry) {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
class assembleTo {
EGVAR(csw,spg9Tripod) = "rhs_SPG9M_MSV";
};
@@ -147,7 +147,7 @@ class CfgWeapons {
class GVAR(metis_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "mount";
deployTime = 4;
pickupTime = 4;
@@ -169,7 +169,7 @@ class CfgWeapons {
class GVAR(kornet_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "mount";
deployTime = 4;
pickupTime = 4;
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/CfgMagazines.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/CfgMagazines.hpp
index 4f8e808bd59..4ad71e5e24c 100644
--- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/CfgMagazines.hpp
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/CfgMagazines.hpp
@@ -2,7 +2,7 @@ class CfgMagazines {
// ACE Explosives
class ATMine_Range_Mag;
class rhs_mine_tm62m_mag: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_tm62m);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_tm62m);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -12,7 +12,7 @@ class CfgMagazines {
};
class rhs_mine_pmn2_mag: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_pmn2);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_pmn2);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -22,7 +22,7 @@ class CfgMagazines {
};
class rhs_mag_mine_ptm1: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_ptm1);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_ptm1);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -32,7 +32,7 @@ class CfgMagazines {
};
class rhs_mag_mine_pfm1: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_pfm1);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_pfm1);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -42,8 +42,7 @@ class CfgMagazines {
};
class rhs_ec75_mag: ATMine_Range_Mag {
- EGVAR(explosives,DelayTime) = 1;
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_ec75);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_ec75);
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
@@ -59,27 +58,27 @@ class CfgMagazines {
};
class rhs_ec75_sand_mag: rhs_ec75_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_ec75_sand);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_ec75_sand);
};
class rhs_ec200_mag: rhs_ec75_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_ec200);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_ec200);
};
class rhs_ec200_sand_mag: rhs_ec200_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_ec200_sand);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_ec200_sand);
};
class rhs_ec400_mag: rhs_ec75_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_ec400);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_ec400);
};
class rhs_ec400_sand_mag: rhs_ec400_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_ec400_sand);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_ec400_sand);
};
class rhs_mine_msk40p_white_mag: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_msk40p_white);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_msk40p_white);
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -89,19 +88,19 @@ class CfgMagazines {
};
class rhs_mine_msk40p_red_mag: rhs_mine_msk40p_white_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_msk40p_red);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_msk40p_red);
};
class rhs_mine_msk40p_green_mag: rhs_mine_msk40p_white_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_msk40p_green);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_msk40p_green);
};
class rhs_mine_msk40p_blue_mag: rhs_mine_msk40p_white_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_msk40p_blue);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_msk40p_blue);
};
class rhs_mine_sm320_white_mag: rhs_mine_msk40p_white_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_sm320_white);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_sm320_white);
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -111,15 +110,15 @@ class CfgMagazines {
};
class rhs_mine_sm320_red_mag: rhs_mine_sm320_white_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_sm320_red);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_sm320_red);
};
class rhs_mine_sm320_green_mag: rhs_mine_sm320_white_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_sm320_green);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_sm320_green);
};
class rhs_mine_ozm72_a_mag: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_ozm72_a);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_ozm72_a);
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -129,12 +128,11 @@ class CfgMagazines {
};
class rhs_mine_ozm72_b_mag: rhs_mine_ozm72_a_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_ozm72_b);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_ozm72_b);
};
class rhs_mine_ozm72_c_mag: rhs_mine_ozm72_a_mag {
- EGVAR(explosives,DelayTime) = 1;
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_ozm72_c);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhs_mine_ozm72_c);
useAction = 0;
class ACE_Triggers {
SupportedTriggers[] = {"Command", "MK16_Transmitter"};
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp
new file mode 100644
index 00000000000..48da0552b85
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp
@@ -0,0 +1,145 @@
+class CfgVehicles {
+ class Wheeled_APC_F;
+ class rhs_btr_base: Wheeled_APC_F {
+ class EGVAR(interaction,anims) {
+ class wheel_1_unhide {
+ positions[] = {{-0.8, -1.7, 0}};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ class wheel_2_unhide {
+ positions[] = {{0.35, -2.9, -0.1}};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ class rhs_btr70_vmf: rhs_btr_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class wheel_1_unhide: wheel_1_unhide {
+ positions[] = {{-1.2, -2.6, 0.2}};
+ };
+ class wheel_2_unhide: wheel_2_unhide {
+ positions[] = {{-0.3, -3.8, 0}};
+ };
+ };
+ };
+
+ class rhs_btr70_msv: rhs_btr70_vmf {};
+ class rhs_btr80_msv: rhs_btr70_msv {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class wheel_1_unhide: wheel_1_unhide {
+ positions[] = {{-1, -2.5, 0.6}};
+ };
+ class wheel_2_unhide: wheel_2_unhide {
+ enabled = 0;
+ };
+ };
+ };
+
+ class Truck_F;
+ class rhs_truck: Truck_F {
+ class EGVAR(interaction,anims) {
+ class spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ class rhs_gaz66_vmf: rhs_truck {};
+ class rhs_gaz66_ammo_base: rhs_gaz66_vmf {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class spare_hide: spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'FireGeometry', 'AveragePoint']"};
+ };
+ };
+ };
+ class rhs_gaz66_repair_base: rhs_gaz66_vmf {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class spare_hide: spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'FireGeometry', 'AveragePoint']"};
+ };
+ };
+ };
+ class rhs_gaz66_ap2_base: rhs_gaz66_vmf {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class spare_hide: spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'FireGeometry', 'AveragePoint']"};
+ };
+ };
+ };
+
+ class RHS_Ural_BaseTurret: Truck_F {
+ class EGVAR(interaction,anims) {
+ class spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class rhs_zil131_base: Truck_F {
+ class EGVAR(interaction,anims) {
+ class spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class rhs_kraz255_base;
+ class rhs_kraz255b1_base: rhs_kraz255_base {
+ class EGVAR(interaction,anims) {
+ class spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class O_Truck_02_covered_F;
+ class rhs_kamaz5350: O_Truck_02_covered_F {
+ class EGVAR(interaction,anims) {
+ class spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class MRAP_02_base_F;
+ class rhs_tigr_base: MRAP_02_base_F {
+ class EGVAR(interaction,anims) {
+ class spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class Offroad_01_base_f;
+ class RHS_UAZ_Base: Offroad_01_base_f {
+ class EGVAR(interaction,anims) {
+ class spare_hide {
+ positions[] = {"_target selectionPosition ['spare', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+};
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/config.cpp
new file mode 100644
index 00000000000..d6d4fab1077
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/config.cpp
@@ -0,0 +1,21 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "rhs_main_loadorder",
+ "ace_repair"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"Dystopian", "johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/script_component.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/script_component.hpp
new file mode 100644
index 00000000000..1af928486c3
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT repair
+#define SUBCOMPONENT_BEAUTIFIED Repair
+#include "..\script_component.hpp"
diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgVehicles.hpp b/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgVehicles.hpp
index 7e58387dabc..1a15fc03f40 100644
--- a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgVehicles.hpp
+++ b/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgVehicles.hpp
@@ -1,7 +1,7 @@
class CfgVehicles {
class StaticMGWeapon;
class rhs_DSHKM_base: StaticMGWeapon {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_DSHKM);
magazineLocation = "_target selectionPosition 'otocvez'";
@@ -13,7 +13,7 @@ class CfgVehicles {
};
};
class rhs_DSHkM_Mini_TriPod_base: rhs_DSHKM_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
disassembleTurret = QEGVAR(csw,kordTripodLow);
};
diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgWeapons.hpp b/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgWeapons.hpp
index 15ff9488cad..279ec98eaa4 100644
--- a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgWeapons.hpp
+++ b/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgWeapons.hpp
@@ -7,7 +7,7 @@ class CfgWeapons {
};
class GVAR(dshkm_carry): Launcher_Base_F {
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/CfgAmmo.hpp b/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/CfgAmmo.hpp
index 0808c7ff1d2..458969b7c0b 100644
--- a/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/CfgAmmo.hpp
+++ b/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/CfgAmmo.hpp
@@ -1,83 +1,83 @@
class CfgAmmo {
class APERSMine_Range_Ammo;
class rhs_mine_a200_bz_ammo: APERSMine_Range_Ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.035};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.035};
};
class rhs_mine_a200_dz35_ammo: rhs_mine_a200_bz_ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.02};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
};
class rhs_mine_glasmine43_hz_ammo: APERSMine_Range_Ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.015};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.015};
};
class rhs_mine_glasmine43_bz_ammo: rhs_mine_glasmine43_hz_ammo {
- ace_minedetector_detectable = 0;
+ EGVAR(minedetector,detectable) = 0;
};
class rhs_mine_bounding_trigger_base;
class rhs_mine_m2a3b_press_ammo: rhs_mine_bounding_trigger_base {
- ace_explosives_defuseObjectPosition[] = {0, 0.046, 0.02};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0.046, 0.02};
};
class rhs_mine_m2a3b_trip_ammo: rhs_mine_m2a3b_press_ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0.046, 0.055};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0.046, 0.055};
};
class rhs_mine_M3_pressure_ammo: APERSMine_Range_Ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.015};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.015};
};
class rhs_mine_M3_tripwire_ammo: rhs_mine_M3_pressure_ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.055};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.055};
};
class ATMine_Range_Ammo;
class rhs_mine_TM43_ammo: ATMine_Range_Ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.072};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.072};
};
class rhs_mine_M7A2_ammo: APERSMine_Range_Ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.067};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.067};
};
class rhs_mine_Mk2_pressure_ammo: APERSMine_Range_Ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.02};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
};
class rhs_mine_Mk2_tripwire_ammo: rhs_mine_Mk2_pressure_ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.055};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.055};
};
class APERSBoundingMine_Range_Ammo;
class rhs_mine_smine35_press_ammo: APERSBoundingMine_Range_Ammo {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.03};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.03};
};
class rhs_mine_smine35_trip_ammo: rhs_mine_bounding_trigger_base {
- ace_explosives_defuseObjectPosition[] = {0, 0, 0.04};
+ EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.04};
};
class rhs_mine_smine44_trip_ammo: rhs_mine_smine35_trip_ammo {
- ace_explosives_defuseObjectPosition[] = {-0.03, 0, 0.015};
+ EGVAR(explosives,defuseObjectPosition)[] = {-0.03, 0, 0.015};
};
class rhs_mine_smine44_press_ammo: APERSBoundingMine_Range_Ammo {
- ace_explosives_defuseObjectPosition[] = {-0.02, 0, 0.02};
+ EGVAR(explosives,defuseObjectPosition)[] = {-0.02, 0, 0.02};
};
class APERSTripMine_Wire_Ammo;
class rhs_mine_stockmine43_2m_ammo: APERSTripMine_Wire_Ammo {
- ace_explosives_defuseObjectPosition[] = {-1, 0, 0.25};
+ EGVAR(explosives,defuseObjectPosition)[] = {-1, 0, 0.25};
};
class rhs_mine_stockmine43_4m_ammo: rhs_mine_stockmine43_2m_ammo {
- ace_explosives_defuseObjectPosition[] = {-2, 0, 0.25};
+ EGVAR(explosives,defuseObjectPosition)[] = {-2, 0, 0.25};
};
class DemoCharge_Remote_Ammo;
class rhs_charge_M2tet_x2_ammo: DemoCharge_Remote_Ammo {
- ace_explosives_defuseObjectPosition[] = {0.095, 0, 0.055};
+ EGVAR(explosives,defuseObjectPosition)[] = {0.095, 0, 0.055};
};
};
diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/CfgMagazines.hpp b/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/CfgMagazines.hpp
index ce882e18258..d25a27bebd8 100644
--- a/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/CfgMagazines.hpp
+++ b/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/CfgMagazines.hpp
@@ -1,7 +1,7 @@
class CfgMagazines {
class APERSMine_Range_Mag;
class rhs_mine_a200_bz_mag: APERSMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_a200_bz";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_a200_bz";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -11,7 +11,7 @@ class CfgMagazines {
};
class rhs_mine_a200_dz35_mag: rhs_mine_a200_bz_mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_a200_dz35";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_a200_dz35";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -21,7 +21,7 @@ class CfgMagazines {
};
class rhs_mine_glasmine43_hz_mag: APERSMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_glasmine43_hz";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_glasmine43_hz";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -31,12 +31,12 @@ class CfgMagazines {
};
class rhs_mine_glasmine43_bz_mag: rhs_mine_glasmine43_hz_mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_glasmine43_bz";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_glasmine43_bz";
};
class APERSBoundingMine_Range_Mag;
class rhs_mine_m2a3b_press_mag: APERSBoundingMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_m2a3b_press";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_m2a3b_press";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -46,7 +46,7 @@ class CfgMagazines {
};
class rhs_mine_m2a3b_trip_mag: rhs_mine_m2a3b_press_mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_m2a3b_trip";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_m2a3b_trip";
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -56,7 +56,7 @@ class CfgMagazines {
};
class rhs_mine_m3_pressure_mag: APERSMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_m3_pressure";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_m3_pressure";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -67,7 +67,7 @@ class CfgMagazines {
class APERSTripMine_Wire_Mag;
class rhs_mine_M3_tripwire_mag: APERSTripMine_Wire_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_M3_tripwire";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_M3_tripwire";
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -78,7 +78,7 @@ class CfgMagazines {
class ATMine_Range_Mag;
class rhs_mine_TM43_mag: ATMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_TM43";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_TM43";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -88,7 +88,7 @@ class CfgMagazines {
};
class rhs_mine_M7A2_mag: APERSMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_M7A2";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_M7A2";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -98,7 +98,7 @@ class CfgMagazines {
};
class rhs_mine_mk2_pressure_mag: APERSMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_mk2_pressure";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_mk2_pressure";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -108,7 +108,7 @@ class CfgMagazines {
};
class rhs_mine_Mk2_tripwire_mag: APERSTripMine_Wire_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_Mk2_tripwire";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_Mk2_tripwire";
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -118,7 +118,7 @@ class CfgMagazines {
};
class rhs_mine_smine35_press_mag: APERSBoundingMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_smine35_press";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_smine35_press";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -128,7 +128,7 @@ class CfgMagazines {
};
class rhs_mine_smine35_trip_mag: rhs_mine_smine35_press_mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_smine35_trip";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_smine35_trip";
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -138,7 +138,7 @@ class CfgMagazines {
};
class rhs_mine_smine44_trip_mag: APERSBoundingMine_Range_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_smine44_trip";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_smine44_trip";
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -148,7 +148,7 @@ class CfgMagazines {
};
class rhs_mine_smine44_press_mag: rhs_mine_smine44_trip_mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_smine44_press";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_smine44_press";
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -158,7 +158,7 @@ class CfgMagazines {
};
class rhs_mine_stockmine43_2m_mag: APERSTripMine_Wire_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_stockmine43_2m";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_stockmine43_2m";
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -168,7 +168,7 @@ class CfgMagazines {
};
class rhs_mine_stockmine43_4m_mag: rhs_mine_stockmine43_2m_mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_mine_stockmine43_4m";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_mine_stockmine43_4m";
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
class Tripwire {
@@ -179,7 +179,7 @@ class CfgMagazines {
class DemoCharge_Remote_Mag;
class rhs_charge_M2tet_x2_mag: DemoCharge_Remote_Mag {
- ace_explosives_SetupObject = "ACE_Explosives_Place_rhs_charge_M2tet_x2";
+ EGVAR(explosives,setupObject) = "ACE_Explosives_Place_rhs_charge_M2tet_x2";
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
class Timer {
diff --git a/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/CfgMagazines.hpp b/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/CfgMagazines.hpp
index c004f584467..e7c00c95d2b 100644
--- a/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/CfgMagazines.hpp
+++ b/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/CfgMagazines.hpp
@@ -3,22 +3,22 @@ class CfgMagazines {
// ACE Explosives
class ATMine_Range_Mag;
class rhssaf_mine_mrud_a_mag: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_mine_mrud_a);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_mine_mrud_a);
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
};
};
class rhssaf_mine_mrud_b_mag: rhssaf_mine_mrud_a_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_mine_mrud_b);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_mine_mrud_b);
};
class rhssaf_mine_mrud_c_mag: rhssaf_mine_mrud_a_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_mine_mrud_c);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_mine_mrud_c);
};
class rhssaf_mine_mrud_d_mag: rhssaf_mine_mrud_a_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_mine_mrud_d);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_mine_mrud_d);
class ACE_Triggers {
SupportedTriggers[] = {"Command", "MK16_Transmitter"};
class Command {
@@ -29,7 +29,7 @@ class CfgMagazines {
};
class rhssaf_mine_pma3_mag: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_mine_pma3);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_mine_pma3);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -39,7 +39,7 @@ class CfgMagazines {
};
class rhssaf_mine_tma4_mag: ATMine_Range_Mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_mine_tma4);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_mine_tma4);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
class PressurePlate {
@@ -51,9 +51,8 @@ class CfgMagazines {
class CA_Magazine;
class rhssaf_tm100_mag: CA_Magazine {
useAction = 0;
- EGVAR(explosives,DelayTime) = 1;
- EGVAR(explosives,Placeable) = 1;
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_tm100);
+ EGVAR(explosives,placeable) = 1;
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_tm100);
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter"};
class Timer {
@@ -67,10 +66,10 @@ class CfgMagazines {
};
class rhssaf_tm200_mag: rhssaf_tm100_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_tm200);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_tm200);
};
class rhssaf_tm500_mag: rhssaf_tm100_mag {
- EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_tm500);
+ EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhssaf_tm500);
};
};
diff --git a/addons/compat_rhs_usf3/CfgVehicles.hpp b/addons/compat_rhs_usf3/CfgVehicles.hpp
index 0593c5a868a..3933e543ecf 100644
--- a/addons/compat_rhs_usf3/CfgVehicles.hpp
+++ b/addons/compat_rhs_usf3/CfgVehicles.hpp
@@ -43,8 +43,7 @@ class CfgVehicles {
EGVAR(refuel,fuelCapacity) = 302;
};
- class Truck_F;
- class Truck_01_base_F: Truck_F {};
+ class Truck_01_base_F;
class rhsusf_fmtv_base: Truck_01_base_F {
EGVAR(refuel,fuelCapacity) = 219;
};
@@ -55,8 +54,7 @@ class CfgVehicles {
EGVAR(refuel,fuelCargo) = 900; // 45 jerrycans
};
- class rhsusf_HEMTT_A4_base: Truck_01_base_F {};
- class rhsusf_M977A4_usarmy_wd: rhsusf_HEMTT_A4_base {};
+ class rhsusf_M977A4_usarmy_wd;
class rhsusf_M977A4_AMMO_usarmy_wd: rhsusf_M977A4_usarmy_wd {
EGVAR(rearm,defaultSupply) = 1200;
};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgVehicles.hpp
index cbca20cce76..bfe157c6099 100644
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgVehicles.hpp
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgVehicles.hpp
@@ -14,7 +14,7 @@ class CfgVehicles {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
magazineLocation = "";
proxyWeapon = QGVAR(rhs_mortar_81mm);
@@ -28,7 +28,7 @@ class CfgVehicles {
class StaticMGWeapon;
class rhs_m2staticmg_base: StaticMGWeapon {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_M2);
magazineLocation = "_target selectionPosition 'magazine'";
@@ -41,7 +41,7 @@ class CfgVehicles {
};
class RHS_M2StaticMG_MiniTripod_base: rhs_m2staticmg_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
disassembleTurret = QEGVAR(csw,m3TripodLow);
};
@@ -49,7 +49,7 @@ class CfgVehicles {
class StaticGrenadeLauncher;
class RHS_MK19_TriPod_base: StaticGrenadeLauncher {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_MK19);
magazineLocation = "_target selectionPosition 'magazine'";
@@ -63,7 +63,7 @@ class CfgVehicles {
class StaticATWeapon;
class RHS_TOW_TriPod_base: StaticATWeapon {
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(rhs_weap_TOW_Launcher_static);
magazineLocation = "_target selectionPosition 'tube'";
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgWeapons.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgWeapons.hpp
index d373e7fe673..b1a8bd88593 100644
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgWeapons.hpp
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgWeapons.hpp
@@ -11,7 +11,7 @@ class CfgWeapons {
class GVAR(m252_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 20;
pickupTime = 25;
@@ -37,13 +37,14 @@ class CfgWeapons {
class GVAR(m2_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
class assembleTo {
EGVAR(csw,m3Tripod) = "RHS_M2StaticMG_WD";
EGVAR(csw,m3TripodLow) = "RHS_M2StaticMG_MiniTripod_WD";
+ EGVAR(compat_spe,m3Tripod) = "RHS_M2StaticMG_MiniTripod_WD";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
@@ -62,7 +63,7 @@ class CfgWeapons {
class GVAR(mk19_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -86,7 +87,7 @@ class CfgWeapons {
class GVAR(tow_carry): Launcher_Base_F {
dlc = "ace";
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp
index 332c2bf1f25..aa2485dcdc2 100644
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp
@@ -1,7 +1,6 @@
class CfgMagazines {
class CA_Magazine;
class rhsusf_m112_mag: CA_Magazine {
- EGVAR(explosives,delayTime) = 1;
EGVAR(explosives,placeable) = 1;
EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_explosive_m112);
useAction = 0;
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_javelin/CfgAmmo.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_javelin/CfgAmmo.hpp
index 65ca880587f..b0df767e3a0 100644
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_javelin/CfgAmmo.hpp
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_javelin/CfgAmmo.hpp
@@ -9,9 +9,10 @@ class CfgAmmo {
class ace_missileguidance {
enabled = 1;
- minDeflection = 0.00005; // Minium flap deflection for guidance
- maxDeflection = 0.025; // Maximum flap deflection for guidance
- incDeflection = 0.00005; // The incrmeent in which deflection adjusts.
+ pitchRate = 120; // degrees per second
+ yawRate = 120;
+ stabilityCoefficient = 0.2;
+ bangBangGuidance = 0;
canVanillaLock = 0;
@@ -22,6 +23,11 @@ class CfgAmmo {
defaultSeekerLockMode = "LOBL";
seekerLockModes[] = { "LOBL" };
+ defaultNavigationType = "Direct";
+ navigationTypes[] = { "Direct", "ZeroEffortMiss" };
+
+ navigationGain = 3;
+
seekerAngle = 180; // Angle in front of the missile which can be searched
seekerAccuracy = 1; // seeker accuracy multiplier
@@ -34,6 +40,19 @@ class CfgAmmo {
defaultAttackProfile = "JAV_TOP";
attackProfiles[] = { "JAV_TOP", "JAV_DIR" };
useModeForAttackProfile = 1;
+
+ class navigationStates {
+ class initial {
+ transitionCondition = QEFUNC(missileguidance,javelin_midCourseTransition);
+ navigationType = "Direct";
+ };
+ class terminal {
+ transitionCondition = "";
+ navigationType = "ZeroEffortMiss";
+ };
+ // transitions from initial -> termimal
+ states[] = {"initial", "terminal"};
+ };
};
};
};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp
new file mode 100644
index 00000000000..10607ab6b5a
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp
@@ -0,0 +1,52 @@
+class CfgVehicles {
+ class rhsusf_stryker_base;
+ class rhsusf_stryker_m1126_base: rhsusf_stryker_base {
+ class EGVAR(interaction,anims) {
+ class Hide_FCans {
+ positions[] = {{-0.7, -3, -0.4}};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class rhsusf_stryker_m1127_base: rhsusf_stryker_m1126_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class Hide_FCans: Hide_FCans {
+ positions[] = {{-0.5, -3, -0.4}};
+ };
+ };
+ };
+
+ class rhsusf_stryker_m1126_m2_base: rhsusf_stryker_m1126_base {};
+ class rhsusf_stryker_m1132_m2_base: rhsusf_stryker_m1126_m2_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class Hide_FCans: Hide_FCans {
+ positions[] = {{-1, -4, -0.4}};
+ };
+ };
+ };
+ class rhsusf_stryker_m1134_base: rhsusf_stryker_m1126_m2_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class Hide_FCans: Hide_FCans {
+ positions[] = {{-0.7, -3, -0.7}};
+ };
+ };
+ };
+
+ class rhsusf_m1a2tank_base;
+ class rhsusf_m1a2sep2_base: rhsusf_m1a2tank_base {
+ class EGVAR(interaction,anims) {
+ class fuelcans_hide {
+ // Rotate interactions with turret rotation
+ positions[] = {
+ "[0.23, -0.6, 0] vectorAdd ([[1.1, -3.6, 0.6], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)",
+ "[0.23, -0.6, 0] vectorAdd ([[-1.1, -3.6, 0.6], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)"
+ };
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
index bf600d5d5ae..391e22d95e8 100644
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
@@ -21,3 +21,4 @@ class CfgPatches {
};
#include "CfgEventHandlers.hpp"
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_repair/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/CfgVehicles.hpp
new file mode 100644
index 00000000000..91bed1dc5a1
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/CfgVehicles.hpp
@@ -0,0 +1,127 @@
+class CfgVehicles {
+ class Truck_01_base_F;
+ class rhsusf_fmtv_base: Truck_01_base_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare {
+ positions[] = {{1, 1.4, 0}};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ class rhsusf_M1078A1P2_fmtv_usarmy: rhsusf_fmtv_base {};
+ class rhsusf_M1078A1P2_B_fmtv_usarmy: rhsusf_M1078A1P2_fmtv_usarmy {};
+ class rhsusf_M1078A1P2_B_M2_fmtv_usarmy: rhsusf_M1078A1P2_B_fmtv_usarmy {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare: hide_spare {
+ positions[] = {{1, 1.4, -0.5}};
+ };
+ };
+ };
+ class rhsusf_M1078A1R_SOV_M2_D_fmtv_socom: rhsusf_M1078A1P2_B_M2_fmtv_usarmy {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare: hide_spare {
+ positions[] = {{1, 1, -0.5}};
+ };
+ };
+ };
+ class rhsusf_M1083A1P2_fmtv_usarmy: rhsusf_M1078A1P2_fmtv_usarmy {};
+ class rhsusf_M1083A1P2_B_fmtv_usarmy: rhsusf_M1083A1P2_fmtv_usarmy {};
+ class rhsusf_M1083A1P2_B_M2_fmtv_usarmy: rhsusf_M1083A1P2_B_fmtv_usarmy {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare: hide_spare {
+ positions[] = {{1, 1.4, -0.5}};
+ };
+ };
+ };
+ class rhsusf_M1084A1P2_fmtv_usarmy: rhsusf_M1083A1P2_fmtv_usarmy {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare: hide_spare {
+ positions[] = {{1, 1.8, 0}};
+ };
+ };
+ };
+ class rhsusf_M1084A1P2_B_M2_fmtv_usarmy: rhsusf_M1083A1P2_B_M2_fmtv_usarmy {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare: hide_spare {
+ positions[] = {{1, 1.8, -0.5}};
+ };
+ };
+ };
+ class rhsusf_M1085A1P2_B_Medical_fmtv_usarmy: rhsusf_M1083A1P2_B_fmtv_usarmy {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_spare: hide_spare {
+ positions[] = {{1, 6.1, 0}};
+ };
+ };
+ };
+
+ class rhsusf_HEMTT_A4_base: Truck_01_base_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare {
+ positions[] = {"_target selectionPosition ['sparewheel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ distance = 2.5;
+ };
+ };
+ };
+
+ class MRAP_01_base_F;
+ class rhsusf_m1151_base: MRAP_01_base_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare {
+ positions[] = {"_target selectionPosition ['sparewheel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ // Don't inherit, as it's easier for the trenches compat
+ class rhsusf_M1165A1_GMV_SAG2_base: rhsusf_m1151_base {
+ class EGVAR(interaction,anims) {
+ class hide_spare {
+ positions[] = {"_target selectionPosition ['sparewheel_gmv', 'Geometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class rhsusf_rg33_base: MRAP_01_base_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare {
+ positions[] = {"_target selectionPosition ['sparewheel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class rhsusf_M1239_base: MRAP_01_base_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare {
+ positions[] = {"_target selectionPosition ['sparewheel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ class rhsusf_MATV_base: MRAP_01_base_F {
+ class EGVAR(interaction,anims) {
+ class hide_spare {
+ positions[] = {"_target selectionPosition ['sparewheel', 'Geometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_repair/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/config.cpp
new file mode 100644
index 00000000000..b204f64166a
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "rhsusf_main_loadorder",
+ "ace_repair"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ addonRootClass = QUOTE(ADDON);
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_repair/script_component.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/script_component.hpp
new file mode 100644
index 00000000000..1af928486c3
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT repair
+#define SUBCOMPONENT_BEAUTIFIED Repair
+#include "..\script_component.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/CfgVehicles.hpp
new file mode 100644
index 00000000000..e914b24d600
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/CfgVehicles.hpp
@@ -0,0 +1,48 @@
+class CfgVehicles {
+ class rhsusf_stryker_base;
+ class rhsusf_stryker_m1126_base: rhsusf_stryker_base {
+ class EGVAR(interaction,anims) {
+ class Hide_PioKit {
+ positions[] = {{-1, -2.2, -0.5}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+ class rhsusf_stryker_m1127_base: rhsusf_stryker_m1126_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class Hide_PioKit: Hide_PioKit {
+ positions[] = {{-0.8, -2.2, -0.5}};
+ };
+ };
+ };
+
+ class rhsusf_stryker_m1126_m2_base: rhsusf_stryker_m1126_base {};
+ class rhsusf_stryker_m1132_m2_base: rhsusf_stryker_m1126_m2_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class Hide_PioKit: Hide_PioKit {
+ positions[] = {{-1.3, -3.3, -0.5}};
+ };
+ };
+ };
+ class rhsusf_stryker_m1134_base: rhsusf_stryker_m1126_m2_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class Hide_PioKit: Hide_PioKit {
+ positions[] = {{-1, -2.2, -0.8}};
+ };
+ };
+ };
+
+ class rhsusf_m1151_base;
+ class rhsusf_M1165A1_GMV_SAG2_base: rhsusf_m1151_base {
+ class EGVAR(interaction,anims) {
+ class tools_hide {
+ positions[] = {{0.365, 1.5, -0.4}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/config.cpp
new file mode 100644
index 00000000000..aea4c9daeb0
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {
+ "rhsusf_main_loadorder",
+ "ace_trenches"
+ };
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+
+ addonRootClass = QUOTE(ADDON);
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/script_component.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/script_component.hpp
new file mode 100644
index 00000000000..10b90eb71e5
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT trenches
+#define SUBCOMPONENT_BEAUTIFIED Trenches
+#include "..\script_component.hpp"
diff --git a/addons/compat_sog/ACE_CSW_Groups.hpp b/addons/compat_sog/ACE_CSW_Groups.hpp
index 2bc81dbb65b..a8914204398 100644
--- a/addons/compat_sog/ACE_CSW_Groups.hpp
+++ b/addons/compat_sog/ACE_CSW_Groups.hpp
@@ -2,7 +2,7 @@ class ACE_CSW_Groups {
// --- Gun Turrets -------------------------------------------------------------
- class ace_csw_100Rnd_127x99_mag {
+ class EGVAR(csw,100Rnd_127x99_mag) {
vn_m2_v_100_mag = 1;
};
diff --git a/addons/compat_sog/CfgAmmo/explosives.hpp b/addons/compat_sog/CfgAmmo/explosives.hpp
index 849f7e69480..6922962fb3e 100644
--- a/addons/compat_sog/CfgAmmo/explosives.hpp
+++ b/addons/compat_sog/CfgAmmo/explosives.hpp
@@ -2,16 +2,10 @@ class DirectionalBombBase;
class vn_mine_m18_ammo: DirectionalBombBase {
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.15};
EGVAR(explosives,size) = 1;
- EGVAR(explosives,explosive) = "vn_mine_m18_ammo_scripted";
};
class vn_mine_m18_x3_ammo: vn_mine_m18_ammo {
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.1};
- EGVAR(explosives,explosive) = "vn_mine_m18_x3_ammo_scripted";
-};
-
-class vn_mine_m18_wp_ammo: vn_mine_m18_ammo {
- EGVAR(explosives,explosive) = "vn_mine_m18_wp_ammo_scripted";
};
class vn_mine_m16_base;
@@ -99,13 +93,7 @@ class vn_mine_punji_05_ammo: vn_mine_punji_04_ammo {
};
class APERSMine_Range_Ammo;
-class vn_mine_bike_ammo: APERSMine_Range_Ammo {
- EGVAR(explosives,explosive) = "vn_mine_bike_ammo_scripted";
-};
-
class vn_mine_cartridge_ammo: APERSMine_Range_Ammo {
- EGVAR(explosives,explosive) = "vn_mine_cartridge_ammo_scripted";
-
// bump range and damage slightly, default values do not work well with ACE Medical
indirectHit = QUOTE(getNumber (configFile >> 'CfgAmmo' >> 'vn_mine_cartridge_ammo' >> 'GVAR(indirectHit)'));
GVAR(indirectHit) = QUOTE([ARR_2(2,1)] select isNull (configFile >> 'CfgPatches' >> 'ace_medical'));
@@ -116,50 +104,8 @@ class vn_mine_cartridge_ammo: APERSMine_Range_Ammo {
class vn_mine_lighter_ammo: APERSMine_Range_Ammo {
ACE_damageType = QGVAR(explosive_incendiary);
-
- EGVAR(explosives,explosive) = "vn_mine_lighter_ammo_scripted";
};
class vn_mine_jerrycan_ammo: APERSMine_Range_Ammo {
ACE_damageType = QGVAR(explosive_incendiary);
-
- EGVAR(explosives,explosive) = "vn_mine_jerrycan_ammo_scripted";
-};
-
-class vn_mine_pot_ammo: APERSMine_Range_Ammo {
- EGVAR(explosives,explosive) = "vn_mine_pot_ammo_scripted";
-};
-
-class vn_mine_mortar_range_ammo: APERSMine_Range_Ammo {
- EGVAR(explosives,explosive) = "vn_mine_mortar_range_ammo_scripted";
-};
-
-class vn_mine_limpet_01_ammo: DemoCharge_Remote_Ammo {
- EGVAR(explosives,explosive) = "vn_mine_limpet_01_ammo_scripted";
-};
-
-class vn_mine_limpet_02_ammo: vn_mine_limpet_01_ammo {
- EGVAR(explosives,explosive) = "vn_mine_limpet_02_ammo_scripted";
-};
-
-class vn_mine_chicom_no8_ammo: APERSMine_Range_Ammo {
- EGVAR(explosives,explosive) = "vn_mine_chicom_no8_ammo_scripted";
-};
-
-class vn_mine_dh10_ammo: DirectionalBombBase {
- EGVAR(explosives,explosive) = "vn_mine_dh10_ammo_scripted";
-};
-
-class PipeBombBase;
-class vn_mine_gboard_range_ammo: PipeBombBase {
- EGVAR(explosives,explosive) = "vn_mine_gboard_range_ammo_scripted";
-};
-
-class SatchelCharge_Remote_Ammo;
-class vn_mine_satchelcharge_02_ammo: SatchelCharge_Remote_Ammo {
- EGVAR(explosives,explosive) = "vn_mine_satchelcharge_02_ammo_scripted";
-};
-
-class vn_mine_bangalore_ammo: SatchelCharge_Remote_Ammo {
- EGVAR(explosives,explosive) = "vn_mine_bangalore_ammo_scripted";
};
diff --git a/addons/compat_sog/CfgMagazines/explosives.hpp b/addons/compat_sog/CfgMagazines/explosives.hpp
index 7e25609fc8a..a8d6ca76bd3 100644
--- a/addons/compat_sog/CfgMagazines/explosives.hpp
+++ b/addons/compat_sog/CfgMagazines/explosives.hpp
@@ -6,8 +6,8 @@ class vn_mine_m18_mag: vn_magazine {
displayNameShort = ""; // Every explosive inherits this and it breaks naming in the placing menu
- EGVAR(explosives,Placeable) = 1;
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m18);
+ EGVAR(explosives,placeable) = 1;
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m18);
class ACE_Triggers {
SupportedTriggers[] = {"Command", "MK16_Transmitter"};
@@ -42,7 +42,7 @@ class vn_mine_m18_fuze10_mag: vn_mine_m18_mag {
// Claymore x3 (Remote)
class vn_mine_m18_x3_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m18_x3);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m18_x3);
class ACE_Triggers {
SupportedTriggers[] = {"Command", "MK16_Transmitter"};
@@ -65,7 +65,7 @@ class vn_mine_m18_x3_range_mag: vn_mine_m18_x3_mag {
// WP Claymore (Remote)
class vn_mine_m18_wp_mag: vn_mine_m18_fuze10_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m18_wp);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m18_wp);
class ACE_Triggers {
SupportedTriggers[] = {"Command", "MK16_Transmitter"};
@@ -101,7 +101,7 @@ class vn_mine_m18_wp_fuze10_mag: vn_mine_m18_wp_mag {
// Toe-Popper
class vn_mine_m14_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m14);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m14);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -113,7 +113,7 @@ class vn_mine_m14_mag: vn_mine_m18_mag {
// Bounding Mine
class vn_mine_m16_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m16);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m16);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -125,7 +125,7 @@ class vn_mine_m16_mag: vn_mine_m18_mag {
// Bounding Mine (Trip Wire 2m)
class vn_mine_tripwire_m16_02_mag: vn_mine_m16_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m16_tripwire_2m);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m16_tripwire_2m);
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
@@ -136,7 +136,7 @@ class vn_mine_tripwire_m16_02_mag: vn_mine_m16_mag {
};
// Bounding Mine (Trip Wire 4m)
class vn_mine_tripwire_m16_04_mag: vn_mine_tripwire_m16_02_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m16_tripwire_4m);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m16_tripwire_4m);
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
@@ -148,22 +148,22 @@ class vn_mine_tripwire_m16_04_mag: vn_mine_tripwire_m16_02_mag {
// F1 (Trip Wire 2m)
class vn_mine_tripwire_f1_02_mag: vn_mine_tripwire_m16_02_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(f1_tripwire_2m);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(f1_tripwire_2m);
};
// F1 (Trip Wire 4m)
class vn_mine_tripwire_f1_04_mag: vn_mine_tripwire_f1_02_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(f1_tripwire_4m);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(f1_tripwire_4m);
};
// Arty Shell (Trip Wire 4m)
class vn_mine_tripwire_arty_mag: vn_mine_tripwire_m16_02_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(arty_tripwire_4m);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(arty_tripwire_4m);
};
// Satchel Charge
class vn_mine_satchel_remote_02_mag: vn_mine_m18_mag {
useAction = 0;
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(satchel_remote_02);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(satchel_remote_02);
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
@@ -180,7 +180,7 @@ class vn_mine_satchel_remote_02_mag: vn_mine_m18_mag {
// TM57 Anti-Tank Mine
class vn_mine_tm57_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(tm57);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(tm57);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -190,7 +190,7 @@ class vn_mine_tm57_mag: vn_mine_m18_mag {
// M15 Anti-Tank Mine
class vn_mine_m15_mag: vn_mine_tm57_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m15);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m15);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -202,7 +202,7 @@ class vn_mine_m15_mag: vn_mine_tm57_mag {
// M112 Breaching charge
class vn_mine_m112_remote_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(m112);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(m112);
class ACE_Triggers {
SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
@@ -221,7 +221,7 @@ class vn_mine_m112_remote_mag: vn_mine_m18_mag {
// Spiked ammo box
class vn_mine_ammobox_range_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(ammobox_range);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(ammobox_range);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -234,7 +234,7 @@ class vn_mine_ammobox_range_mag: vn_mine_m18_mag {
// Punji large
class vn_mine_punji_01_mag: vn_mine_m18_mag {
useAction = 0;
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(punji_01);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(punji_01);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -246,18 +246,18 @@ class vn_mine_punji_01_mag: vn_mine_m18_mag {
// Punji small
class vn_mine_punji_02_mag: vn_mine_punji_01_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(punji_02);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(punji_02);
};
// Punji whip
class vn_mine_punji_03_mag: vn_mine_punji_01_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(punji_03);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(punji_03);
};
// Punji door-way
class vn_mine_punji_04_mag: vn_mine_m18_mag {
useAction = 0;
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(punji_04);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(punji_04);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -270,7 +270,7 @@ class vn_mine_punji_04_mag: vn_mine_m18_mag {
// Punji side whip
class vn_mine_punji_05_mag: vn_mine_punji_04_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(punji_05);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(punji_05);
class ACE_Triggers: ACE_Triggers {
class PressurePlate: PressurePlate {
@@ -281,7 +281,7 @@ class vn_mine_punji_05_mag: vn_mine_punji_04_mag {
// Bike mine (Remote)
class vn_mine_bike_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(bike);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(bike);
class ACE_Triggers {
SupportedTriggers[] = {QGVAR(Command), QGVAR(MK16_Transmitter)};
@@ -304,7 +304,7 @@ class vn_mine_bike_range_mag: vn_mine_bike_mag {
// Cartridge mine
class vn_mine_cartridge_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(cartridge);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(cartridge);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -316,7 +316,7 @@ class vn_mine_cartridge_mag: vn_mine_m18_mag {
// Lighter mine (Proximity)
class vn_mine_lighter_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(lighter);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(lighter);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -328,7 +328,7 @@ class vn_mine_lighter_mag: vn_mine_m18_mag {
// Pot mine (Remote)
class vn_mine_pot_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(pot);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(pot);
class ACE_Triggers {
SupportedTriggers[] = {"Command", "MK16_Transmitter"};
@@ -351,7 +351,7 @@ class vn_mine_pot_range_mag: vn_mine_pot_mag {
// Jerrycan mine (Remote)
class vn_mine_jerrycan_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(jerrycan);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(jerrycan);
class ACE_Triggers {
SupportedTriggers[] = {"Command", "MK16_Transmitter"};
@@ -374,7 +374,7 @@ class vn_mine_jerrycan_range_mag: vn_mine_jerrycan_mag {
// Mortar shell on a stick (Proximity)
class vn_mine_mortar_range_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(mortar_range);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(mortar_range);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -386,17 +386,17 @@ class vn_mine_mortar_range_mag: vn_mine_m18_mag {
// Limpet mine USA (Remote)
class vn_mine_limpet_01_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(limpet_01);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(limpet_01);
};
// Limpet mine RUS (Remote)
class vn_mine_limpet_02_mag: vn_mine_limpet_01_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(limpet_02);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(limpet_02);
};
// Chicom NO8 mine
class vn_mine_chicom_no8_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(chicom_no8);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(chicom_no8);
class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"};
@@ -408,7 +408,7 @@ class vn_mine_chicom_no8_mag: vn_mine_m18_mag {
// DH10 mine (Remote)
class vn_mine_dh10_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(dh10);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(dh10);
};
// DH10 mine (Proximity)
class vn_mine_dh10_range_mag: vn_mine_dh10_mag {
@@ -422,7 +422,7 @@ class vn_mine_dh10_range_mag: vn_mine_dh10_mag {
// Grenade board mine (Tripwire 4m)
class vn_mine_gboard_range_mag: vn_mine_m18_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(gboard);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(gboard);
class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"};
@@ -434,10 +434,10 @@ class vn_mine_gboard_range_mag: vn_mine_m18_mag {
// Satchel charge
class vn_mine_satchelcharge_02_mag: vn_mine_satchel_remote_02_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(satchelcharge_02);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(satchelcharge_02);
};
// Bangalore mine
class vn_mine_bangalore_mag: vn_mine_satchel_remote_02_mag {
- EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(bangalore);
+ EGVAR(explosives,setupObject) = QEXPLOSIVES_PLACE(bangalore);
};
diff --git a/addons/compat_sog/CfgVehicles/tracked.hpp b/addons/compat_sog/CfgVehicles/tracked.hpp
index e2832796a97..7adc0193c63 100644
--- a/addons/compat_sog/CfgVehicles/tracked.hpp
+++ b/addons/compat_sog/CfgVehicles/tracked.hpp
@@ -1,18 +1,55 @@
+// M113A1 https://man.fas.org/dod-101/sys/land/m113.htm
+class Tank_F;
+class APC_Tracked_01_base_F: Tank_F {
+ class ACE_Actions;
+};
+class vn_armor_m113_base: APC_Tracked_01_base_F {
+ EGVAR(refuel,fuelCapacity) = 360;
+ class ACE_Actions: ACE_Actions {
+ class ACE_MainActions;
+ };
+};
+class vn_armor_m577_base: vn_armor_m113_base {
+ class ACE_Actions: ACE_Actions {
+ class ACE_MainActions: ACE_MainActions {
+ position = "[0, 3.5, -1]";
+ };
+ };
+};
+
// M41
class vn_armor_tank_base;
class vn_armor_m41_base: vn_armor_tank_base {
EGVAR(refuel,fuelCapacity) = 530;
};
-// Type 63
-class vn_armor_type63_base: vn_armor_tank_base {
- EGVAR(refuel,fuelCapacity) = 545;
+// M48
+class vn_armor_m48_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_mainturret_backpacks {
+ // Rotate interactions with turret rotation
+ positions[] = {
+ "[[-1.3, -0.7, -0.4], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D",
+ "[[0.1, -2, -0.2], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D"
+ };
+ items[] = {"vn_b_pack_02_02", "vn_b_pack_04_02"};
+ name = "$STR_a3_cfgvehicleclasses_backpacks0";
+ text = "$STR_a3_cfgvehicleclasses_backpacks0";
+ };
+ };
};
-// M113A1 https://man.fas.org/dod-101/sys/land/m113.htm
-class APC_Tracked_01_base_F;
-class vn_armor_m113_base: APC_Tracked_01_base_F {
- EGVAR(refuel,fuelCapacity) = 360;
+// T-54
+class vn_armor_t54_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_mainturret_backpacks {
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, -0.2, 0] vectorAdd ([[-1.1, -0.85, -1.3], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"vn_o_pack_01", "vn_o_pack_02"};
+ name = "$STR_a3_cfgvehicleclasses_backpacks0";
+ text = "$STR_a3_cfgvehicleclasses_backpacks0";
+ };
+ };
};
// PT-76A https://en.wikipedia.org/wiki/PT-76
@@ -24,3 +61,8 @@ class vn_armor_pt76_base: vn_armor_tank_base {
class vn_armor_pt76b_base: vn_armor_pt76_base {
EGVAR(refuel,fuelCapacity) = 400;
};
+
+// Type 63
+class vn_armor_type63_base: vn_armor_tank_base {
+ EGVAR(refuel,fuelCapacity) = 545;
+};
diff --git a/addons/compat_sog/CfgVehicles/turrets.hpp b/addons/compat_sog/CfgVehicles/turrets.hpp
index 6142a018e81..928b80716a4 100644
--- a/addons/compat_sog/CfgVehicles/turrets.hpp
+++ b/addons/compat_sog/CfgVehicles/turrets.hpp
@@ -17,7 +17,7 @@ class vn_static_m2_high_base: StaticMGWeapon {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = "vn_m2_v_01";
magazineLocation = "_target selectionPosition 'mg1_magazine'";
@@ -31,7 +31,7 @@ class vn_static_m2_high_base: StaticMGWeapon {
// M2 Browning - Low
class vn_static_m2_low_base: vn_static_m2_high_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleTurret = QEGVAR(csw,m3TripodLow);
};
};
@@ -45,7 +45,7 @@ class vn_static_m1919a6_base: vn_static_m2_low_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = "vn_m1919_v_01";
magazineLocation = "_target selectionPosition 'mg1_magazine' vectorAdd [-0.3, 0, 0]";
@@ -66,7 +66,7 @@ class vn_static_m1919a4_high_base: vn_static_m1919a6_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = "vn_m1919_v_01";
magazineLocation = "_target selectionPosition 'mg1_magazine'";
@@ -80,7 +80,7 @@ class vn_static_m1919a4_high_base: vn_static_m1919a6_base {
// M1919A4 - Low
class vn_static_m1919a4_low_base: vn_static_m1919a4_high_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleTurret = QEGVAR(csw,m3TripodLow);
};
};
@@ -93,7 +93,7 @@ class vn_static_m60_high_base: vn_static_m2_low_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = "vn_m60_v_01";
magazineLocation = "_target selectionPosition 'mg1_trigger'";
@@ -113,7 +113,7 @@ class vn_static_m60_low_base: vn_static_m60_high_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
magazineLocation = "_target selectionPosition 'mg1_otochlaven_recoil'";
disassembleTurret = QEGVAR(csw,m3TripodLow);
};
@@ -131,7 +131,7 @@ class vn_static_tow_base: vn_static_at3_base {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = "vn_missile_tow_launcher";
magazineLocation = "_target selectionPosition 'magazine'";
@@ -145,7 +145,7 @@ class vn_static_tow_base: vn_static_at3_base {
// DShKM - High
class vn_static_dp28_high_base: vn_static_m2_high_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 0;
};
};
@@ -156,7 +156,7 @@ class vn_static_dshkm_high_01_base: vn_static_dp28_high_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = "vn_dshkm_v_01";
magazineLocation = "_target selectionPosition 'mg1_boxmag'";
@@ -170,7 +170,7 @@ class vn_static_dshkm_high_01_base: vn_static_dp28_high_base {
// DShKM - High, with AA sight
class vn_static_dshkm_high_02_base: vn_static_dshkm_high_01_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleWeapon = QGVAR(dshkm_AA_carry);
};
};
@@ -185,7 +185,7 @@ class vn_static_dshkm_low_01_base: vn_static_dshkm_high_01_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleWeapon = QGVAR(dshkm_shield_carry);
disassembleTurret = QEGVAR(csw,kordTripodLow);
};
@@ -193,7 +193,7 @@ class vn_static_dshkm_low_01_base: vn_static_dshkm_high_01_base {
// DShKM - Low
class vn_static_dshkm_low_02_base: vn_static_dshkm_low_01_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleWeapon = QGVAR(dshkm_carry);
};
};
@@ -206,7 +206,7 @@ class vn_static_rpd_high_base: vn_static_dp28_high_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = "vn_rpd_v_01";
magazineLocation = "_target selectionPosition 'mg1_otochlaven_recoil'";
@@ -226,7 +226,7 @@ class vn_static_pk_high_base: vn_static_rpd_high_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = "vn_pk_v_01";
magazineLocation = "_target selectionPosition 'mg1_otochlaven_recoil'";
@@ -246,7 +246,7 @@ class vn_static_pk_low_base: vn_static_pk_high_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleTurret = QEGVAR(csw,kordTripodLow);
};
};
@@ -259,7 +259,7 @@ class vn_static_mg42_high_base: vn_static_rpd_high_base {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = "vn_mg42_v_01";
magazineLocation = "_target selectionPosition 'mg1_otochlaven_recoil'";
@@ -278,7 +278,7 @@ class vn_static_mg42_low_base: vn_static_mg42_high_base {
};
};
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleTurret = "";
};
};
@@ -294,7 +294,7 @@ class vn_static_sgm_high_base: vn_static_sgm_base {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = "vn_sgm_v_01";
magazineLocation = "_target selectionPosition 'mg1_otochlaven_recoil'";
@@ -308,7 +308,7 @@ class vn_static_sgm_high_base: vn_static_sgm_base {
// SGM - Low
class vn_static_sgm_low_base: vn_static_sgm_high_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleWeapon = QGVAR(sgm_carry);
disassembleTurret = QEGVAR(csw,kordTripodLow);
};
@@ -316,25 +316,25 @@ class vn_static_sgm_low_base: vn_static_sgm_high_base {
// SGM - Shield
class vn_o_pl_static_sgm_low_01: vn_static_sgm_low_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleWeapon = QGVAR(sgm_shield_carry);
disassembleTurret = QEGVAR(csw,kordTripodLow);
};
};
class vn_o_nva_65_static_sgm_low_01: vn_static_sgm_low_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleWeapon = QGVAR(sgm_shield_carry);
disassembleTurret = QEGVAR(csw,kordTripodLow);
};
};
class vn_o_nva_static_sgm_low_01: vn_static_sgm_low_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleWeapon = QGVAR(sgm_shield_carry);
disassembleTurret = QEGVAR(csw,kordTripodLow);
};
};
class vn_o_nva_navy_static_sgm_low_01: vn_static_sgm_low_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
disassembleWeapon = QGVAR(sgm_shield_carry);
disassembleTurret = QEGVAR(csw,kordTripodLow);
};
@@ -351,7 +351,7 @@ class vn_static_mk18_base: StaticCannon {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = "vn_mk18_v_01";
magazineLocation = "_target selectionPosition 'mg1_magazine'";
@@ -378,7 +378,7 @@ class vn_static_mortar_m29_base: Mortar_01_base_F {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
proxyWeapon = QGVAR(vn_mortar_m29);
magazineLocation = "_target selectionPosition 'pohon'";
@@ -392,7 +392,7 @@ class vn_static_mortar_m29_base: Mortar_01_base_F {
// M2 / Type 63 Mortar
class vn_static_mortar_m2_base: vn_static_mortar_m29_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = QGVAR(vn_mortar_m2);
magazineLocation = "_target selectionPosition 'pohon'";
@@ -406,7 +406,7 @@ class vn_static_mortar_m2_base: vn_static_mortar_m29_base {
// Type 53 Mortar
class vn_static_mortar_type53_base: vn_static_mortar_m29_base {
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 1;
proxyWeapon = QGVAR(vn_mortar_type53);
magazineLocation = "_target selectionPosition 'pohon'";
@@ -430,7 +430,7 @@ class vn_static_h12_base: Mortar_01_base_F {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 0;
};
};
@@ -441,7 +441,7 @@ class vn_static_m45_base: vn_static_m2_high_base {
EGVAR(dragging,canCarry) = 0;
EGVAR(dragging,canDrag) = 0;
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 0;
};
};
@@ -450,7 +450,7 @@ class vn_static_zpu4_base: vn_static_m2_high_base {
EGVAR(dragging,canCarry) = 0;
EGVAR(dragging,canDrag) = 0;
- class ACE_CSW: ACE_CSW {
+ class ace_csw: ace_csw {
enabled = 0;
};
};
@@ -466,7 +466,7 @@ class vn_o_static_rsna75: StaticMGWeapon {
};
};
- class ACE_CSW {
+ class ace_csw {
enabled = 0;
};
};
diff --git a/addons/compat_sog/CfgWeapons/csw.hpp b/addons/compat_sog/CfgWeapons/csw.hpp
index 87b1b16c5ec..b5ca942f6e8 100644
--- a/addons/compat_sog/CfgWeapons/csw.hpp
+++ b/addons/compat_sog/CfgWeapons/csw.hpp
@@ -20,7 +20,7 @@ class GVAR(m2_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_m2b_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -48,7 +48,7 @@ class GVAR(m1919a4_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_m1919a4_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -76,7 +76,7 @@ class GVAR(m1919a6_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_m1919a6_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "mount";
deployTime = 2;
pickupTime = 2;
@@ -100,7 +100,7 @@ class GVAR(m60_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_m60_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -128,7 +128,7 @@ class GVAR(tow_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_tow_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -155,7 +155,7 @@ class GVAR(dshkm_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_dshkm_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -183,7 +183,7 @@ class GVAR(dshkm_shield_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_dshkm_shield_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -210,7 +210,7 @@ class GVAR(dshkm_AA_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_dshkm_aa_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -237,7 +237,7 @@ class GVAR(rpd_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_rpd_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -264,7 +264,7 @@ class GVAR(pk_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_pk_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -292,7 +292,7 @@ class GVAR(mortar_m29_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_m29_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 20;
pickupTime = 25;
@@ -319,7 +319,7 @@ class GVAR(mg42_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_mg42_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "mount";
deployTime = 4;
pickupTime = 4;
@@ -347,7 +347,7 @@ class GVAR(sgm_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_sgm_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -374,7 +374,7 @@ class GVAR(sgm_shield_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_sgm_shield_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -401,7 +401,7 @@ class GVAR(mk18_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_mk18_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 4;
pickupTime = 4;
@@ -430,7 +430,7 @@ class GVAR(mortar_m2_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_m2_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 20;
pickupTime = 25;
@@ -457,7 +457,7 @@ class GVAR(mortar_type53_carry): Launcher_Base_F {
modes[] = {};
picture = QPATHTOF(UI\csw_type53_ca.paa);
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 20;
pickupTime = 25;
diff --git a/addons/compat_sog/compat_sog_refuel/CfgVehicles.hpp b/addons/compat_sog/compat_sog_refuel/CfgVehicles.hpp
new file mode 100644
index 00000000000..c3dcfb719e5
--- /dev/null
+++ b/addons/compat_sog/compat_sog_refuel/CfgVehicles.hpp
@@ -0,0 +1,163 @@
+class CfgVehicles {
+ // Vehicle animation interactions
+ // BTR-40
+ class vn_wheeled_car_base;
+ class vn_wheeled_btr40_base: vn_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class refuel_can_hide {
+ positions[] = {{0.7, -2.35, -0.9}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class vn_wheeled_btr40_01_base: vn_wheeled_btr40_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class refuel_can_hide: refuel_can_hide {
+ positions[] = {{0.72, -2.35, -0.45}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_ambulance_base: vn_wheeled_btr40_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class refuel_can_hide: refuel_can_hide {
+ positions[] = {{0.72, -2.35, -0.45}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_mg_01_base: vn_wheeled_btr40_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class refuel_can_hide: refuel_can_hide {
+ positions[] = {{0.72, -2.35, -0.9}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_mg_03_base: vn_wheeled_btr40_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class refuel_can_hide: refuel_can_hide {
+ positions[] = {{0.82, -2.35, -1.25}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_mg_04_base: vn_wheeled_btr40_mg_01_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class refuel_can_hide: refuel_can_hide {
+ positions[] = {{0.72, -2.35, -1}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_mg_05_base: vn_wheeled_btr40_mg_04_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class refuel_can_hide: refuel_can_hide {
+ positions[] = {{0.65, -2.25, -1}};
+ };
+ };
+ };
+
+ // M151
+ class vn_wheeled_m151_base: vn_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class user_refuel_can_hide {
+ positions[] = {{-0.48, -1.5, -1.1}};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+ class vn_wheeled_m151_mg_03_base: vn_wheeled_m151_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_refuel_can_hide: user_refuel_can_hide {
+ positions[] = {{-0.75, -1.5, -1}};
+ };
+ };
+ };
+ class vn_wheeled_m151_mg_05_base: vn_wheeled_m151_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_refuel_can_hide: user_refuel_can_hide {
+ positions[] = {{0.9, -0.1, -1.1}};
+ };
+ };
+ };
+ class vn_wheeled_m151_mg_06_base: vn_wheeled_m151_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_refuel_can_hide: user_refuel_can_hide {
+ positions[] = {{0.3, 0.1, -1.1}};
+ };
+ };
+ };
+ class vn_wheeled_m151_01_base: vn_wheeled_m151_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_refuel_can_hide: user_refuel_can_hide {
+ positions[] = {{-0.4, -1.5, -0.7}};
+ };
+ };
+ };
+
+ // M577
+ class vn_armor_m113_base;
+ class vn_armor_m577_base: vn_armor_m113_base {
+ class EGVAR(interaction,anims) {
+ class hide_fuel_cans {
+ selections[] = {"hide_fuel_cans"};
+ positions[] = {{1.07, 1.05, -1}};
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ // M48
+ class vn_armor_tank_base;
+ class vn_armor_m48_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_mainturret_jerrycan {
+ positions[] = {"_target selectionPosition ['hide_jerrycan', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ // BTR-50PK
+ class vn_armor_btr50pk_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_barrels {
+ selections[] = {"hide_barrels"};
+ positions[] = {"private _pos = _target selectionPosition 'hide_barrels'; _pos set [0, -(_pos select 0)]; _pos"}; // Mirror position to other side of vehicle
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ // PT-76
+ class vn_armor_pt76_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_barrels {
+ selections[] = {"hide_barrels"};
+ positions[] = {"private _pos = _target selectionPosition 'hide_barrels'; _pos set [0, -(_pos select 0)]; _pos"}; // Mirror position to other side of vehicle
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+
+ // Type 63
+ class vn_armor_type63_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_barrels {
+ selections[] = {"hide_barrels"};
+ positions[] = {"private _pos = _target selectionPosition 'hide_barrels'; _pos set [0, -(_pos select 0)]; _pos"}; // Mirror position to other side of vehicle
+ items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+ name = ECSTRING(refuel,TakeFuelCanister);
+ text = ECSTRING(refuel,TakeFuelCanisterAction);
+ };
+ };
+ };
+};
diff --git a/addons/compat_sog/compat_sog_refuel/config.cpp b/addons/compat_sog/compat_sog_refuel/config.cpp
new file mode 100644
index 00000000000..793cf90fc4e
--- /dev/null
+++ b/addons/compat_sog/compat_sog_refuel/config.cpp
@@ -0,0 +1,18 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {"loadorder_f_vietnam", "ace_refuel"};
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_sog/compat_sog_refuel/script_component.hpp b/addons/compat_sog/compat_sog_refuel/script_component.hpp
new file mode 100644
index 00000000000..af997fb8d4d
--- /dev/null
+++ b/addons/compat_sog/compat_sog_refuel/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT refuel
+#define SUBCOMPONENT_BEAUTIFIED refuel
+#include "..\script_component.hpp"
diff --git a/addons/compat_sog/compat_sog_repair/CfgVehicles.hpp b/addons/compat_sog/compat_sog_repair/CfgVehicles.hpp
new file mode 100644
index 00000000000..de93243251e
--- /dev/null
+++ b/addons/compat_sog/compat_sog_repair/CfgVehicles.hpp
@@ -0,0 +1,141 @@
+class CfgVehicles {
+ // Vehicle animation interactions
+ // M39 / M54 / M49
+ class vn_wheeled_truck_base;
+ class vn_wheeled_m54_base: vn_wheeled_truck_base {
+ class EGVAR(interaction,anims) {
+ class user_sparewheel_hide {
+ positions[] = {"_target selectionPosition ['hide_spare_wheel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+ class vn_wheeled_m54_mg_01_base: vn_wheeled_m54_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_sparewheel_hide: user_sparewheel_hide {
+ items[] = {"ACE_Wheel", "ACE_Wheel", "ACE_Wheel", "ACE_Wheel"};
+ };
+ };
+ };
+
+ // M151
+ class vn_wheeled_car_base;
+ class vn_wheeled_m151_base: vn_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class user_sparewheel_hide {
+ positions[] = {"_target selectionPosition ['hide_sparewheel', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ // Dirt Ranger
+ class vn_wheeled_lr2a_base: vn_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class hide_sparewheel {
+ positions[] = {"_target selectionPosition ['hide_sparewheel', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ // BTR-40
+ class vn_wheeled_btr40_base: vn_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class sparewheel_hide {
+ positions[] = {"_target selectionPosition ['hide_sparewheel', 'ViewGeometry', 'AveragePoint']"};
+ items[] = {"ACE_Wheel"};
+ name = ECSTRING(repair,RemoveWheel);
+ text = ECSTRING(repair,RemovingWheel);
+ };
+ };
+ };
+
+ // M48
+ class vn_armor_tank_base;
+ class vn_armor_m48_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_mainturret_tracks {
+ // Rotate interactions with turret rotation
+ positions[] = {
+ "[[1.3, 0.2, -0.5], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D",
+ "[[-1.3, 0.2, -0.5], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D"
+ };
+ items[] = {"ACE_Track", "ACE_Track", "ACE_Track", "ACE_Track", "ACE_Track"};
+ name = ECSTRING(repair,RemoveTrack);
+ text = ECSTRING(repair,RemovingTrack);
+ };
+ };
+ };
+
+ // BTR-50PK
+ class vn_armor_btr50pk_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_tracks {
+ positions[] = {{1.35, 2.5, -0.5}};
+ items[] = {"ACE_Track"};
+ name = ECSTRING(repair,RemoveTrack);
+ text = ECSTRING(repair,RemovingTrack);
+ };
+ };
+ };
+ class vn_armor_btr50pk_01_base: vn_armor_btr50pk_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_tracks: hide_tracks {
+ positions[] = {{1.35, 2.5, -0.8}};
+ };
+ };
+ };
+
+ class vn_armor_btr50pk_02_base: vn_armor_btr50pk_01_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_tracks: hide_tracks {
+ positions[] = {{1.35, 2.9, -0.8}};
+ };
+ };
+ };
+
+ // T-54
+ class vn_armor_t54_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_tracks {
+ positions[] = {{1.4, 2.1, -1.7}};
+ items[] = {"ACE_Track"};
+ name = ECSTRING(repair,RemoveTrack);
+ text = ECSTRING(repair,RemovingTrack);
+ };
+ };
+ };
+
+ // PT-76
+ class vn_armor_pt76_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_tracks {
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, 0.9, 0] vectorAdd ([[-0.6, -0.9, -0.3], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"ACE_Track"};
+ name = ECSTRING(repair,RemoveTrack);
+ text = ECSTRING(repair,RemovingTrack);
+ };
+ };
+ };
+
+ // Type 63
+ class vn_armor_type63_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_tracks {
+ // Rotate interactions with turret rotation
+ positions[] = {"[0, 0.7, 0] vectorAdd ([[0.4, -1.1, -0.4], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)"};
+ items[] = {"ACE_Track"};
+ name = ECSTRING(repair,RemoveTrack);
+ text = ECSTRING(repair,RemovingTrack);
+ };
+ };
+ };
+};
diff --git a/addons/compat_sog/compat_sog_repair/config.cpp b/addons/compat_sog/compat_sog_repair/config.cpp
new file mode 100644
index 00000000000..b2cffd8a364
--- /dev/null
+++ b/addons/compat_sog/compat_sog_repair/config.cpp
@@ -0,0 +1,18 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+ class SUBADDON {
+ name = COMPONENT_NAME;
+ units[] = {};
+ weapons[] = {};
+ requiredVersion = REQUIRED_VERSION;
+ requiredAddons[] = {"loadorder_f_vietnam", "ace_repair"};
+ skipWhenMissingDependencies = 1;
+ author = ECSTRING(common,ACETeam);
+ authors[] = {"johnb43"};
+ url = ECSTRING(main,URL);
+ VERSION_CONFIG;
+ };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_sog/compat_sog_repair/script_component.hpp b/addons/compat_sog/compat_sog_repair/script_component.hpp
new file mode 100644
index 00000000000..1af928486c3
--- /dev/null
+++ b/addons/compat_sog/compat_sog_repair/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT repair
+#define SUBCOMPONENT_BEAUTIFIED Repair
+#include "..\script_component.hpp"
diff --git a/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp b/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp
index bb222eaed16..bc67a39f784 100644
--- a/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp
+++ b/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp
@@ -60,4 +60,199 @@ class CfgVehicles {
class EGVAR(compat_sog,spiderhole_03_nogeo): vn_o_vc_spiderhole_03 {
scope = 1;
};
+
+ // Vehicle animation interactions
+ // BTR-40
+ class vn_wheeled_car_base;
+ class vn_wheeled_btr40_base: vn_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class shovel_hide {
+ positions[] = {{0.95, -1.5, -0.75}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+ class vn_wheeled_btr40_01_base: vn_wheeled_btr40_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class shovel_hide: shovel_hide {
+ positions[] = {{0.95, -1.5, -0.3}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_ambulance_base: vn_wheeled_btr40_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class shovel_hide: shovel_hide {
+ positions[] = {{0.95, -1.5, -0.3}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_mg_01_base: vn_wheeled_btr40_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class shovel_hide: shovel_hide {
+ positions[] = {{0.95, -1.5, -0.8}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_mg_03_base: vn_wheeled_btr40_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class shovel_hide: shovel_hide {
+ positions[] = {{1.05, -1.55, -1.1}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_mg_04_base: vn_wheeled_btr40_mg_01_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class shovel_hide: shovel_hide {
+ positions[] = {{0.95, -1.5, -0.85}};
+ };
+ };
+ };
+ class vn_wheeled_btr40_mg_05_base: vn_wheeled_btr40_mg_04_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class shovel_hide: shovel_hide {
+ positions[] = {{0.9, -1.4, -0.85}};
+ };
+ };
+ };
+
+ // Dirt Ranger
+ class vn_wheeled_lr2a_base: vn_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class hide_shovel {
+ positions[] = {"_target selectionPosition ['hide_shovel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+
+ // M151
+ class vn_wheeled_m151_base: vn_wheeled_car_base {
+ class EGVAR(interaction,anims) {
+ class user_shovel_hide {
+ positions[] = {{0.65, 0.2, -1.4}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+ class vn_wheeled_m151_mg_03_base: vn_wheeled_m151_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_shovel_hide: user_shovel_hide {
+ positions[] = {{0.35, 0.2, -1.27}};
+ };
+ };
+ };
+ class vn_wheeled_m151_mg_05_base: vn_wheeled_m151_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_shovel_hide: user_shovel_hide {
+ enabled = 0;
+ };
+ };
+ };
+ class vn_wheeled_m151_mg_06_base: vn_wheeled_m151_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_shovel_hide: user_shovel_hide {
+ enabled = 0;
+ };
+ };
+ };
+ class vn_wheeled_m151_01_base: vn_wheeled_m151_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class user_shovel_hide: user_shovel_hide {
+ positions[] = {{0.72, 0.2, -0.92}};
+ };
+ };
+ };
+
+ // M113
+ class APC_Tracked_01_base_F;
+ class vn_armor_m113_base: APC_Tracked_01_base_F {
+ class EGVAR(interaction,anims) {
+ class hide_shovel {
+ positions[] = {{0.2, 2.2, -0.5}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+ class vn_armor_m113_01_base: vn_armor_m113_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_shovel: hide_shovel {};
+ };
+ };
+ class vn_armor_m132_base: vn_armor_m113_01_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_shovel: hide_shovel {
+ positions[] = {{0.2, 2.2, -0.35}};
+ };
+ };
+ };
+
+ // Don't inherit, as it's easier for the refuel compat
+ // M577
+ class vn_armor_m577_base: vn_armor_m113_base {
+ class EGVAR(interaction,anims) {
+ class hide_shovel {
+ positions[] = {{0.2, 5.05, -0.57}};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+
+ // M48
+ class vn_armor_tank_base;
+ class vn_armor_m48_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_mainturret_tools {
+ positions[] = {"_target selectionPosition ['hide_tools', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+
+ // BTR-50PK
+ class vn_armor_btr50pk_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_shovel {
+ positions[] = {"_target selectionPosition ['hide_shovel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_EntrenchingTool", "ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+
+ // PT-76
+ class vn_armor_pt76_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_shovel {
+ positions[] = {"_target selectionPosition ['hide_shovel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
+
+ // Type 63
+ class vn_armor_type63_base: vn_armor_tank_base {
+ class EGVAR(interaction,anims) {
+ class hide_shovel {
+ positions[] = {"_target selectionPosition ['hide_shovel', 'FireGeometry', 'AveragePoint']"};
+ items[] = {"ACE_EntrenchingTool"};
+ name = ECSTRING(trenches,EntrenchingToolName);
+ text = ECSTRING(trenches,EntrenchingToolName);
+ };
+ };
+ };
};
diff --git a/addons/compat_spe/CfgMagazines/csw.hpp b/addons/compat_spe/CfgMagazines/csw.hpp
index 404156bd8f8..6b4c385a42a 100644
--- a/addons/compat_spe/CfgMagazines/csw.hpp
+++ b/addons/compat_spe/CfgMagazines/csw.hpp
@@ -2,43 +2,16 @@ class CA_Magazine;
// M1919A4/A6
class SPE_50Rnd_762x63: CA_Magazine {
- ACE_isBelt = 0;
-};
-
-class SPE_100Rnd_762x63: SPE_50Rnd_762x63 {
- ACE_isBelt = 1;
-};
-
-class SPE_100Rnd_762x63_M1: SPE_100Rnd_762x63 {
ACE_isBelt = 1;
};
-class SPE_100Rnd_762x63_M2_AP: SPE_100Rnd_762x63 {
+// M2
+class VehicleMagazine;
+class SPE_100Rnd_127x99_M2: VehicleMagazine {
ACE_isBelt = 1;
};
-//MG34/42
-
+// MG34/42
class SPE_50Rnd_792x57: CA_Magazine {
- ACE_isBelt = 0;
-};
-
-class SPE_50Rnd_792x57_sS: SPE_50Rnd_792x57 {
- ACE_isBelt = 0;
-};
-
-class SPE_50Rnd_792x57_SMK: SPE_50Rnd_792x57_sS {
- ACE_isBelt = 0;
-};
-
-class SPE_100Rnd_792x57: SPE_50Rnd_792x57 {
- ACE_isBelt = 1;
-};
-
-class SPE_100Rnd_792x57_sS: SPE_50Rnd_792x57_sS {
- ACE_isBelt = 1;
-};
-
-class SPE_100Rnd_792x57_SMK: SPE_50Rnd_792x57_SMK {
ACE_isBelt = 1;
};
diff --git a/addons/compat_spe/CfgVehicles/wheeled.hpp b/addons/compat_spe/CfgVehicles/wheeled.hpp
index 6ed68dfbdfb..f645db29e64 100644
--- a/addons/compat_spe/CfgVehicles/wheeled.hpp
+++ b/addons/compat_spe/CfgVehicles/wheeled.hpp
@@ -56,8 +56,12 @@ class SPE_OpelBlitz_Ammo: SPE_OpelBlitz_base {
EGVAR(rearm,defaultSupply) = 1200;
};
-// WHEELED - ALLIED FORCES
+class SPE_OpelBlitz_Fuel: SPE_OpelBlitz_base {
+ EGVAR(refuel,hooks)[] = {{-0.23, -2.58, -0.59}};
+ EGVAR(refuel,fuelCargo) = 2000;
+};
+// WHEELED - ALLIED FORCES
class SPE_US_M3_Halftrack_Ambulance: SPE_Halftrack_base {
EGVAR(medical,medicClass) = 1;
};
@@ -69,3 +73,69 @@ class SPE_US_M3_Halftrack_Repair: SPE_Halftrack_base {
class SPE_US_M3_Halftrack_Ammo: SPE_Halftrack_base {
EGVAR(rearm,defaultSupply) = 1200;
};
+
+class SPE_US_M3_Halftrack_Fuel: SPE_Halftrack_base {
+ EGVAR(refuel,hooks)[] = {{-0.23, -2.58, -0.59}};
+ EGVAR(refuel,fuelCargo) = 2000;
+};
+
+class SPE_Car_base;
+class SPE_G503_MB_base: SPE_Car_base {
+ class EGVAR(interaction,anims) {
+ class hide_musette_source {
+ positions[] = {{0.8, -0.97, -0.6}, {-0.8, -0.92, -0.6}};
+ items[] = {"B_SPE_US_M36", "B_SPE_US_M36"};
+ name = "$STR_CTH_B_SPE_US_M36";
+ text = "$STR_CTH_B_SPE_US_M36";
+ };
+ };
+};
+class SPE_US_G503_MB_M1919_base: SPE_G503_MB_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_musette_source: hide_musette_source {
+ positions[] = {{0.8, -0.5, -0.6}, {-0.8, -0.45, -0.6}};
+ };
+ };
+};
+class SPE_US_G503_MB_M1919_Armoured_base: SPE_G503_MB_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_musette_source: hide_musette_source {
+ positions[] = {{0.8, -0.5, -0.6}, {-0.8, -0.45, -0.6}};
+ };
+ };
+};
+class SPE_US_G503_MB_M1919_PATROL_base: SPE_G503_MB_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_musette_source: hide_musette_source {
+ positions[] = {{0.8, -0.5, -0.6}, {-0.8, -0.45, -0.6}};
+ };
+ };
+};
+class SPE_US_G503_MB_M2_base: SPE_G503_MB_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_musette_source: hide_musette_source {
+ positions[] = {{0.8, -0.5, -0.6}, {-0.8, -0.45, -0.6}};
+ };
+ };
+};
+class SPE_US_G503_MB_M2_Armoured_base: SPE_G503_MB_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_musette_source: hide_musette_source {
+ positions[] = {{0.8, -0.5, -0.6}, {-0.8, -0.45, -0.6}};
+ };
+ };
+};
+class SPE_US_G503_MB_M2_PATROL_base: SPE_G503_MB_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_musette_source: hide_musette_source {
+ positions[] = {{0.8, -0.5, -0.6}, {-0.8, -0.45, -0.6}};
+ };
+ };
+};
+class SPE_G503_MB_Ambulance_base: SPE_G503_MB_base {
+ class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+ class hide_musette_source: hide_musette_source {
+ positions[] = {{0.8, -0.5, -0.6}, {-0.8, -0.45, -0.6}};
+ };
+ };
+};
diff --git a/addons/compat_spe/compat_spe_csw/ACE_CSW_Groups.hpp b/addons/compat_spe/compat_spe_csw/ACE_CSW_Groups.hpp
deleted file mode 100644
index 35758ed5333..00000000000
--- a/addons/compat_spe/compat_spe_csw/ACE_CSW_Groups.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-class ACE_CSW_Groups {
-
- // --- Gun Turrets -------------------------------------------------------------
-
- class SPE_100Rnd_762x63 {
- SPE_100Rnd_762x63 = 1;
- };
-
- class SPE_100Rnd_762x63_M1 {
- SPE_100Rnd_762x63_M1 = 1;
- };
-
- class SPE_100Rnd_762x63_M2_AP {
- SPE_100Rnd_762x63_M2_AP = 1;
- };
-
- class SPE_100Rnd_792x57 {
- SPE_100Rnd_792x57 = 1;
- };
-
- class SPE_100Rnd_792x57_sS {
- SPE_100Rnd_792x57_sS = 1;
- };
-
- class SPE_100Rnd_792x57_SMK {
- SPE_100Rnd_792x57_SMK = 1;
- };
-
- // --- Mortars -------------------------------------------------------------
-
- class SPE_1Rnd_81mmHE_M1_M43A1 {
- SPE_1Rnd_81mmHE_M1_M43A1 = 1;
- };
- class SPE_1Rnd_81mmWP_M1_M57 {
- SPE_1Rnd_81mmWP_M1_M57 = 1;
- };
- class SPE_81mm_M1_M57_SmokeShell {
- SPE_81mm_M1_M57_SmokeShell = 1;
- };
-
- class SPE_1Rnd_81mm_FA_Mle_1932_HE {
- SPE_1Rnd_81mm_FA_Mle_1932_HE = 1;
- };
- class SPE_81mm_FA_Mle_1932_Smoke {
- SPE_81mm_FA_Mle_1932_Smoke = 1;
- };
- class SPE_81mm_FA_Mle_1932_Illu {
- SPE_81mm_FA_Mle_1932_Illu = 1;
- };
-};
diff --git a/addons/compat_spe/compat_spe_csw/CfgMagazineGroups.hpp b/addons/compat_spe/compat_spe_csw/CfgMagazineGroups.hpp
new file mode 100644
index 00000000000..78f6d0629dd
--- /dev/null
+++ b/addons/compat_spe/compat_spe_csw/CfgMagazineGroups.hpp
@@ -0,0 +1,94 @@
+class EGVAR(csw,groups) {
+ // --- Gun Turrets -------------------------------------------------------------
+ class SPE_50Rnd_762x63 {
+ SPE_50Rnd_762x63 = 1;
+ };
+ class SPE_100Rnd_762x63 {
+ SPE_100Rnd_762x63 = 1;
+ };
+
+ class SPE_50Rnd_762x63_M1 {
+ SPE_50Rnd_762x63_M1 = 1;
+ };
+ class SPE_100Rnd_762x63_M1 {
+ SPE_100Rnd_762x63_M1 = 1;
+ };
+
+ class SPE_50Rnd_762x63_M2_AP {
+ SPE_50Rnd_762x63_M2_AP = 1;
+ };
+ class SPE_100Rnd_762x63_M2_AP {
+ SPE_100Rnd_762x63_M2_AP = 1;
+ };
+
+ class SPE_50Rnd_762x63_Tracer {
+ SPE_50Rnd_762x63_Tracer = 1;
+ };
+ class SPE_100Rnd_762x63_Tracer {
+ SPE_100Rnd_762x63_Tracer = 1;
+ };
+
+ class SPE_50Rnd_792x57 {
+ SPE_50Rnd_792x57 = 1;
+ };
+ class SPE_100Rnd_792x57 {
+ SPE_100Rnd_792x57 = 1;
+ SPE_250Rnd_792x57 = 1;
+ };
+
+ class SPE_50Rnd_792x57_sS {
+ SPE_50Rnd_792x57_sS = 1;
+ };
+ class SPE_100Rnd_792x57_sS {
+ SPE_100Rnd_792x57_sS = 1;
+ SPE_250Rnd_792x57_sS = 1;
+ };
+
+ class SPE_50Rnd_792x57_SMK {
+ SPE_50Rnd_792x57_SMK = 1;
+ };
+ class SPE_100Rnd_792x57_SMK {
+ SPE_100Rnd_792x57_SMK = 1;
+ SPE_250Rnd_792x57_SMK = 1;
+ };
+
+ class SPE_50Rnd_792x57_Tracer {
+ SPE_50Rnd_792x57_Tracer = 1;
+ };
+ class SPE_100Rnd_792x57_Tracer {
+ SPE_100Rnd_792x57_Tracer = 1;
+ };
+
+ // Makes it compatible with other mods' .50 BMG
+ class EGVAR(csw,100Rnd_127x99_mag) {
+ SPE_100Rnd_127x99_M2 = 1;
+ };
+ class SPE_100Rnd_127x99_M2: EGVAR(csw,100Rnd_127x99_mag) {};
+
+ // --- Mortars -------------------------------------------------------------
+ class SPE_1Rnd_81mmHE_M1_M43A1 {
+ SPE_8Rnd_81mmHE_M1_M43A1 = 1;
+ SPE_1Rnd_81mmHE_M1_M43A1 = 1;
+ };
+ class SPE_1Rnd_81mmWP_M1_M57 {
+ SPE_8Rnd_81mmWP_M1_M57 = 1;
+ SPE_1Rnd_81mmWP_M1_M57 = 1;
+ };
+ class SPE_81mm_M1_M57_SmokeShell {
+ SPE_8rnd_81mm_M1_M57_SmokeShell = 1;
+ SPE_81mm_M1_M57_SmokeShell = 1;
+ };
+
+ class SPE_1Rnd_81mm_FA_Mle_1932_HE {
+ SPE_8Rnd_81mm_FA_Mle_1932_HE = 1;
+ SPE_1Rnd_81mm_FA_Mle_1932_HE = 1;
+ };
+ class SPE_81mm_FA_Mle_1932_Smoke {
+ SPE_8Rnd_81mm_FA_Mle_1932_Smoke = 1;
+ SPE_81mm_FA_Mle_1932_Smoke = 1;
+ };
+ class SPE_81mm_FA_Mle_1932_Illu {
+ SPE_8Rnd_81mm_FA_Mle_1932_Illu = 1;
+ SPE_81mm_FA_Mle_1932_Illu = 1;
+ };
+};
diff --git a/addons/compat_spe/compat_spe_csw/CfgMagazines.hpp b/addons/compat_spe/compat_spe_csw/CfgMagazines.hpp
new file mode 100644
index 00000000000..9c255c28008
--- /dev/null
+++ b/addons/compat_spe/compat_spe_csw/CfgMagazines.hpp
@@ -0,0 +1,26 @@
+// In SPE 1.1.1, the tracer magazines don't have proper names
+class CfgMagazines {
+ class SPE_50Rnd_762x63;
+ class SPE_50Rnd_762x63_Tracer: SPE_50Rnd_762x63 {
+ displayName = SUBCSTRING(50Rnd_762x63_Tracer);
+ displayNameShort = "$STR_A3_tracer_dns";
+ };
+
+ class SPE_100Rnd_762x63;
+ class SPE_100Rnd_762x63_Tracer: SPE_100Rnd_762x63 {
+ displayName = SUBCSTRING(100Rnd_762x63_Tracer);
+ displayNameShort = "$STR_A3_tracer_dns";
+ };
+
+ class SPE_50Rnd_792x57;
+ class SPE_50Rnd_792x57_Tracer: SPE_50Rnd_792x57 {
+ displayName = SUBCSTRING(50Rnd_792x57_Tracer);
+ displayNameShort = "$STR_A3_tracer_dns";
+ };
+
+ class SPE_100Rnd_792x57;
+ class SPE_100Rnd_792x57_Tracer: SPE_100Rnd_792x57 {
+ displayName = SUBCSTRING(100Rnd_792x57_Tracer);
+ displayNameShort = "$STR_A3_tracer_dns";
+ };
+};
diff --git a/addons/compat_spe/compat_spe_csw/CfgVehicles.hpp b/addons/compat_spe/compat_spe_csw/CfgVehicles.hpp
index e0a38aa341c..30d39301f38 100644
--- a/addons/compat_spe/compat_spe_csw/CfgVehicles.hpp
+++ b/addons/compat_spe/compat_spe_csw/CfgVehicles.hpp
@@ -9,90 +9,267 @@ class CfgVehicles {
class ACE_Actions {
class ACE_MainActions;
};
- class Turrets {
- class MainTurret;
+ };
+
+ // --- Gun Turrets -------------------------------------------------------------
+ class StaticMGWeapon: StaticWeapon {};
+ class SPE_StaticMGWeapon_base: StaticMGWeapon {};
+ class SPE_M2_M3: SPE_StaticMGWeapon_base {
+ class ACE_Actions: ACE_Actions {
+ class ACE_MainActions: ACE_MainActions {
+ position = "";
+ selection = "zamerny";
+ };
+ };
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(M2_proxy);
+ magazineLocation = "";
+ disassembleWeapon = "SPE_M2_50";
+ disassembleTurret = QGVAR(m3Tripod);
+ ammoLoadTime = 10;
+ ammoUnloadTime = 8;
+ desiredAmmo = 100;
+ };
+ };
+ class SPE_M2_M3_Trench: SPE_M2_M3 {
+ class ace_csw: ace_csw {
+ disassembleWeapon = "";
+ disassembleTurret = "";
};
- class UserActions;
};
- // --- Mortars -----------------------------------------------------------------
- class StaticMortar: StaticWeapon {
- class Turrets: Turrets {
- class MainTurret: MainTurret {};
+
+ class SPE_M1919_M2: SPE_StaticMGWeapon_base {
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(M1919A4_proxy);
+ magazineLocation = "_target selectionPosition ['magazine', 'FireGeometry', 'AveragePoint']";
+ disassembleWeapon = "SPE_M1919A4";
+ disassembleTurret = QGVAR(m2Tripod);
+ ammoLoadTime = 8;
+ ammoUnloadTime = 6;
+ desiredAmmo = 100;
};
};
- class SPE_StaticMortar_base: StaticMortar {
- class Turrets: Turrets {
- class MainTurret: MainTurret {};
+ class SPE_M1919_M2_Trench_Deployed: SPE_M1919_M2 {
+ class ace_csw: ace_csw {
+ disassembleWeapon = "";
+ disassembleTurret = "";
};
- class EventHandlers: EventHandlers {
- class SPE_StaticWeaponsHandler {
- init = "";
+ };
+
+
+ class SPE_MG42_Lafette: SPE_StaticMGWeapon_base {
+ class ACE_Actions: ACE_Actions {
+ class ACE_MainActions: ACE_MainActions {
+ class GVAR(alterHeight) {
+ condition = "getText (configOf _target >> 'SPE_AltHeight_Tripod_Name') != '' && {[_target, true] call SPE_WEAPONS_STATIC_fnc_can_alter_height}";
+ displayName = "$STR_SPE_DN_ASSETS_VEHICLES_ADJUST_TRIPOD_HEIGHT";
+ statement = "[_target, getText (configOf _target >> 'SPE_AltHeight_Tripod_Name'), true] call SPE_Weapons_Static_fnc_alter_height";
+ icon = "\A3\Ui_f\data\IGUI\Cfg\Actions\repair_ca.paa";
+ modifierFunction = "(_this select 3) set [1, format [localize 'STR_SPE_DN_ASSETS_VEHICLES_ADJUST_TRIPOD_HEIGHT', getText (configOf _target >> 'displayName')]]";
+ };
};
};
};
+ class SPE_MG42_Lafette_Deployed: SPE_MG42_Lafette {
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(MG42_proxy);
+ magazineLocation = "";
+ disassembleWeapon = "SPE_MG42";
+ disassembleTurret = QGVAR(LafetteTripod);
+ ammoLoadTime = 7;
+ ammoUnloadTime = 5;
+ desiredAmmo = 100;
+ };
+ };
+ class SPE_MG34_Lafette_Deployed: SPE_MG42_Lafette {
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(MG34_proxy);
+ magazineLocation = "";
+ disassembleWeapon = "SPE_MG34";
+ disassembleTurret = QGVAR(LafetteTripod);
+ ammoLoadTime = 7;
+ ammoUnloadTime = 5;
+ desiredAmmo = 100;
+ };
+ };
- class SPE_US_Mortar_base: SPE_StaticMortar_base {};
- class SPE_M1_81: SPE_US_Mortar_base {
- class Turrets: Turrets {
- class MainTurret: MainTurret {
- magazines[] = {};
+ class SPE_MG42_Lafette_low;
+ class SPE_MG42_Lafette_low_Deployed: SPE_MG42_Lafette_low {
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(MG42_proxy);
+ magazineLocation = "";
+ disassembleWeapon = "SPE_MG42";
+ disassembleTurret = QGVAR(LafetteTripodLow);
+ ammoLoadTime = 7;
+ ammoUnloadTime = 5;
+ desiredAmmo = 100;
+ };
+ };
+ class SPE_MG42_Lafette_trench_Deployed: SPE_MG42_Lafette_low_Deployed {
+ class ace_csw: ace_csw {
+ disassembleWeapon = "";
+ disassembleTurret = "";
+ };
+ };
+
+ class SPE_MG34_Lafette_low_Deployed: SPE_MG42_Lafette_low {
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(MG34_proxy);
+ magazineLocation = "";
+ disassembleWeapon = "SPE_MG34";
+ disassembleTurret = QGVAR(LafetteTripodLow);
+ ammoLoadTime = 7;
+ ammoUnloadTime = 5;
+ desiredAmmo = 100;
+ };
+ };
+ class SPE_MG34_Lafette_Trench_Deployed: SPE_MG34_Lafette_low_Deployed {
+ class ace_csw: ace_csw {
+ disassembleWeapon = "";
+ disassembleTurret = "";
+ };
+ };
+
+
+ class SPE_MG_Bipod_base;
+ class SPE_M1919A6_Bipod: SPE_MG_Bipod_base {
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(M1919A6_proxy);
+ magazineLocation = "";
+ disassembleWeapon = "";
+ disassembleTurret = "";
+ ammoLoadTime = 8;
+ ammoUnloadTime = 6;
+ desiredAmmo = 100;
+ };
+ };
+
+
+ class SPE_MG42_Bipod: SPE_MG_Bipod_base {
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(MG42_proxy);
+ magazineLocation = "";
+ disassembleWeapon = "";
+ disassembleTurret = "";
+ ammoLoadTime = 7;
+ ammoUnloadTime = 5;
+ desiredAmmo = 100;
+ };
+ };
+ class SPE_MG34_Bipod: SPE_MG_Bipod_base {
+ class ace_csw {
+ enabled = 1;
+ proxyWeapon = QGVAR(MG34_proxy);
+ magazineLocation = "";
+ disassembleWeapon = "";
+ disassembleTurret = "";
+ ammoLoadTime = 7;
+ ammoUnloadTime = 5;
+ desiredAmmo = 100;
+ };
+ };
+
+
+ class ThingX;
+ class EGVAR(csw,baseTripod): ThingX {
+ class ACE_Actions {
+ class ACE_MainActions;
+ };
+ };
+ class GVAR(m3Tripod): EGVAR(csw,baseTripod) {
+ scope = 2;
+ displayName = "$STR_DN_SPE_M3_Tripod";
+ model = "\WW2\SPE_Assets_m\Vehicles\StaticWeapons_U1_m\SPE_M3_Tripod.p3d";
+ picture = "\WW2\SPE_Assets_t\Weapons\Equipment_U1_t\Weapons\Launchers\Gear_M3_Tripod_X_ca.paa";
+ class ace_csw {
+ disassembleTo = "SPE_M3_Tripod";
+ };
+ };
+
+ class GVAR(m2Tripod): EGVAR(csw,baseTripod) {
+ scope = 2;
+ displayName = "$STR_DN_SPE_M2_Tripod";
+ model = "\WW2\SPE_Assets_m\Vehicles\StaticWeapons_m\SPE_M2_Tripod_Low.p3d";
+ picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_M2_Tripod_X_ca.paa";
+ class ace_csw {
+ disassembleTo = "SPE_M2_Tripod";
+ };
+ };
+
+ class GVAR(LafetteTripodLow): EGVAR(csw,baseTripod) {
+ class ACE_Actions: ACE_Actions {
+ class ACE_MainActions: ACE_MainActions {
+ class GVAR(alterHeight) {
+ condition = "getText (configOf _target >> 'SPE_AltHeight_Tripod_Name') != '' && {[_target, true] call SPE_WEAPONS_STATIC_fnc_can_alter_height}";
+ displayName = "$STR_SPE_DN_ASSETS_VEHICLES_ADJUST_TRIPOD_HEIGHT";
+ statement = "[_target, getText (configOf _target >> 'SPE_AltHeight_Tripod_Name'), true] call SPE_Weapons_Static_fnc_alter_height";
+ icon = "\A3\Ui_f\data\IGUI\Cfg\Actions\repair_ca.paa";
+ modifierFunction = "(_this select 3) set [1, format [localize 'STR_SPE_DN_ASSETS_VEHICLES_ADJUST_TRIPOD_HEIGHT', getText (configOf _target >> 'displayName')]]";
+ };
};
};
+ scope = 2;
+ displayName = "$STR_DN_SPE_Lafette_Tripod";
+ model = "\WW2\SPE_Assets_m\Vehicles\StaticWeapons_m\SPE_Lafette_Tripod_Low.p3d";
+ picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_Lafette_Tripod_X_ca.paa";
+ SPE_AltHeight_Tripod_Name = QGVAR(LafetteTripod);
+ class ace_csw {
+ disassembleTo = "SPE_Lafette_Tripod";
+ };
+ };
+
+ class GVAR(LafetteTripod): GVAR(LafetteTripodLow) {
+ model = "\WW2\SPE_Assets_m\Vehicles\StaticWeapons_m\SPE_Lafette_Tripod_High.p3d";
+ SPE_AltHeight_Tripod_Name = QGVAR(LafetteTripodLow);
+ class ace_csw {
+ disassembleTo = "SPE_Lafette_Tripod";
+ };
+ };
+
+ // --- Mortars -----------------------------------------------------------------
+ class StaticMortar: StaticWeapon {};
+ class SPE_StaticMortar_base: StaticMortar {};
+ class SPE_US_Mortar_base: SPE_StaticMortar_base {};
+ class SPE_M1_81: SPE_US_Mortar_base {
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
position = "";
selection = "zamerny";
};
};
- class UserActions {
- delete Prepare_WP_Selected;
- delete Prepare_WP;
- delete Prepare_Smoke_Selected;
- delete Prepare_Smoke;
- delete Prepare_HE_Selected;
- delete Prepare_HE;
- delete Reload;
- delete Unload;
- };
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
- proxyWeapon = "SPE_M1_81_proxy";
+ proxyWeapon = QGVAR(M1_proxy);
magazineLocation = "_target selectionPosition 'usti hlavne'";
disassembleWeapon = "SPE_M1_81_Barrel";
- disassembleTurret = QGVAR(M1_81_baseplate);
+ disassembleTurret = QGVAR(m1Baseplate);
ammoLoadTime = 3;
ammoUnloadTime = 3;
desiredAmmo = 1;
};
};
+
class SPE_FR_Mortar_base: SPE_StaticMortar_base {};
class SPE_MLE_27_31: SPE_FR_Mortar_base {
- class Turrets: Turrets {
- class MainTurret: MainTurret {
- magazines[] = {};
- };
- };
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
position = "";
selection = "zamerny";
};
};
- class UserActions {
- delete Prepare_Illu_Selected;
- delete Prepare_Illu;
- delete Prepare_Smoke_Selected;
- delete Prepare_Smoke;
- delete Prepare_HE_Selected;
- delete Prepare_HE;
- delete Reload;
- delete Unload;
- };
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
- proxyWeapon = "SPE_MLE_27_31_proxy";
+ proxyWeapon = QGVAR(MLE_27_31_proxy);
magazineLocation = "_target selectionPosition 'usti hlavne'";
disassembleWeapon = "SPE_MLE_27_31_Barrel";
disassembleTurret = QGVAR(MLE_27_31_baseplate);
@@ -103,30 +280,9 @@ class CfgVehicles {
};
class SPE_GrW278_1: SPE_MLE_27_31 {
- class Turrets: Turrets {
- class MainTurret: MainTurret {
- magazines[] = {};
- };
- };
- class ACE_Actions: ACE_Actions {
- class ACE_MainActions: ACE_MainActions {
- position = "";
- selection = "zamerny";
- };
- };
- class UserActions {
- delete Prepare_Illu_Selected;
- delete Prepare_Illu;
- delete Prepare_Smoke_Selected;
- delete Prepare_Smoke;
- delete Prepare_HE_Selected;
- delete Prepare_HE;
- delete Reload;
- delete Unload;
- };
- class ACE_CSW {
+ class ace_csw {
enabled = 1;
- proxyWeapon = "SPE_GrW278_1_proxy";
+ proxyWeapon = QGVAR(GrW278_1_proxy);
magazineLocation = "_target selectionPosition 'usti hlavne'";
disassembleWeapon = "SPE_GrW278_1_Barrel";
disassembleTurret = QGVAR(GrW278_baseplate);
@@ -137,7 +293,15 @@ class CfgVehicles {
};
- class EGVAR(csw,baseTripod);
+ class GVAR(m1Baseplate): EGVAR(csw,baseTripod) {
+ scope = 2;
+ displayName = "$STR_DN_SPE_M1_81_STAND";
+ model = "\WW2\SPE_Assets_m\Weapons\Mortars_m\SPE_M1_Mortar_Stand_Deployed.p3d";
+ picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_M1_81_Stand_X_ca.paa";
+ class ace_csw {
+ disassembleTo = "SPE_M1_81_Stand";
+ };
+ };
class GVAR(MLE_27_31_baseplate): EGVAR(csw,baseTripod) {
scope = 2;
@@ -146,7 +310,7 @@ class CfgVehicles {
picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_MLE_27_31_Stand_X_ca.paa";
hiddenSelections[] = {"camo_0","camo_1"};
hiddenSelectionsTextures[] = {"ww2\spe_assets_t\weapons\mortars_t\m1_mortar\Brandt_81mm_Mortar_French_co.paa","WW2\SPE_Assets_t\Weapons\Mortars_t\M1_Mortar\Brandt_81mm_Sight_French_co.paa"};
- class ACE_CSW {
+ class ace_csw {
disassembleTo = "SPE_MLE_27_31_Stand";
};
};
@@ -158,83 +322,8 @@ class CfgVehicles {
picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_GrW278_1_Stand_X_ca.paa";
hiddenSelections[] = {"camo_0"};
hiddenSelectionsTextures[] = {"ww2\spe_assets_t\weapons\mortars_t\m1_mortar\Brandt_81mm_Mortar_Gelb_co.paa"};
- class ACE_CSW {
+ class ace_csw {
disassembleTo = "SPE_GrW278_1_Stand";
};
};
-
- class GVAR(M1_81_baseplate): EGVAR(csw,baseTripod) {
- scope = 2;
- displayName = "$STR_DN_SPE_M1_81_STAND";
- model = "\WW2\SPE_Assets_m\Weapons\Mortars_m\SPE_M1_Mortar_Stand_Deployed.p3d";
- picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_M1_81_Stand_X_ca.paa";
- class ACE_CSW {
- disassembleTo = "SPE_M1_81_Stand";
- };
- };
-
-
- class ACE_SPE_M1_81_Stand_Deployed: EGVAR(csw,baseTripod) {
- author = "SPE";
- scope = 2;
- displayName = "$STR_DN_SPE_M1_81_STAND";
- model = "\WW2\SPE_Assets_m\Weapons\Mortars_m\SPE_M1_Mortar_Stand_Deployed.p3d";
- picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_M1_81_Stand_X_ca.paa";
- class assembleInfo {
- base = "";
- primary = 0;
- displayName = "";
- assembleTo = "";
- class SPE_M1_81_Barrel {
- deployTime = 0;
- assembleTo = "";
- };
- };
- class ACE_CSW {
- disassembleTo = "SPE_M1_81_Stand";
- };
- };
- class ACE_SPE_GrW278_1_Stand_Deployed: EGVAR(csw,baseTripod) {
- author = "SPE";
- scope = 2;
- displayName = "$STR_DN_SPE_GrW278_1_STAND";
- model = "\WW2\SPE_Assets_m\Weapons\Mortars_m\SPE_M1_Mortar_Stand_Deployed.p3d";
- picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_GrW278_1_Stand_X_ca.paa";
- hiddenSelectionsTextures[] = {"ww2\spe_assets_t\weapons\mortars_t\m1_mortar\Brandt_81mm_Mortar_Gelb_co.paa","WW2\SPE_Assets_t\Weapons\Mortars_t\M1_Mortar\Brandt_81mm_Sight_Gelb_co.paa"};
- class assembleInfo {
- base = "";
- primary = 0;
- displayName = "";
- assembleTo = "";
- class SPE_GrW278_1_Barrel {
- deployTime = 0;
- assembleTo = "";
- };
- };
- class ACE_CSW {
- disassembleTo = "SPE_GrW278_1_Stand";
- };
- };
- class ACE_SPE_MLE_27_31_Stand_Deployed: EGVAR(csw,baseTripod) {
- author = "SPE";
- scope = 2;
- displayName = "$STR_DN_SPE_MLE_27_31_STAND";
- model = "\WW2\SPE_Assets_m\Weapons\Mortars_m\SPE_M1_Mortar_Stand_Deployed.p3d";
- picture = "\WW2\SPE_Assets_t\Weapons\Equipment_t\Weapons\Launchers\Gear_MLE_27_31_Stand_X_ca.paa";
- hiddenSelections[] = {"camo_0","camo_1"};
- hiddenSelectionsTextures[] = {"ww2\spe_assets_t\weapons\mortars_t\m1_mortar\Brandt_81mm_Mortar_French_co.paa","WW2\SPE_Assets_t\Weapons\Mortars_t\M1_Mortar\Brandt_81mm_Sight_French_co.paa"};
- class assembleInfo {
- base = "";
- primary = 0;
- displayName = "";
- assembleTo = "";
- class SPE_MLE_27_31_Barrel {
- deployTime = 0;
- assembleTo = "";
- };
- };
- class ACE_CSW {
- disassembleTo = "SPE_MLE_27_31_Stand";
- };
- };
};
diff --git a/addons/compat_spe/compat_spe_csw/CfgWeapons.hpp b/addons/compat_spe/compat_spe_csw/CfgWeapons.hpp
index db090c77080..b6e71dcb6a9 100644
--- a/addons/compat_spe/compat_spe_csw/CfgWeapons.hpp
+++ b/addons/compat_spe/compat_spe_csw/CfgWeapons.hpp
@@ -1,43 +1,162 @@
class CfgWeapons {
- class Launcher;
- class Launcher_Base_F: Launcher {
- class WeaponSlotsInfo;
+ class Launcher_Base_F;
+ class SPE_Slung_Static_Weapon_Base: Launcher_Base_F {};
+
+ // --- Vanilla Compat -------------------------------------------------------------
+ class EGVAR(csw,staticHMGCarry): Launcher_Base_F {
+ class ace_csw {
+ class assembleTo {
+ GVAR(m3Tripod) = "B_HMG_01_F";
+ };
+ };
+ };
+ class EGVAR(csw,staticM2ShieldCarry): EGVAR(csw,staticHMGCarry) {
+ class ace_csw: ace_csw {
+ class assembleTo {
+ GVAR(m3Tripod) = "B_HMG_02_F";
+ };
+ };
};
- class SPE_Slung_Static_Weapon_Base: Launcher_Base_F {};
+ class EGVAR(csw,staticGMGCarry): Launcher_Base_F {
+ class ace_csw {
+ class assembleTo {
+ GVAR(m3Tripod) = "B_GMG_01_F";
+ };
+ };
+ };
+
+ // --- Gun Turrets -------------------------------------------------------------
+ class SPE_M2_M3_Tripod;
+ class GVAR(M2_proxy): SPE_M2_M3_Tripod {
+ magazineReloadTime = 0.5;
+ };
+ class SPE_M3_Tripod: SPE_Slung_Static_Weapon_Base {
+ class ace_csw {
+ type = "mount";
+ deployTime = 4;
+ pickupTime = 4;
+ deploy = QGVAR(m3Tripod);
+ };
+ };
+ class SPE_M2_50: SPE_Slung_Static_Weapon_Base {
+ class ace_csw {
+ type = "weapon";
+ deployTime = 4;
+ pickupTime = 4;
+ class assembleTo {
+ GVAR(m3Tripod) = "SPE_M2_M3";
+ EGVAR(csw,m3TripodLow) = "SPE_M2_M3";
+ };
+ };
+ };
+
+ class SPE_M1919A4_tripod;
+ class GVAR(M1919A4_proxy): SPE_M1919A4_tripod {
+ magazineReloadTime = 0.5;
+ };
+
+ class SPE_M2_Tripod: SPE_Slung_Static_Weapon_Base {
+ class ace_csw {
+ type = "mount";
+ deployTime = 4;
+ pickupTime = 4;
+ deploy = QGVAR(m2Tripod);
+ };
+ };
+
+ class SPE_LMG;
+ class SPE_M1919A4: SPE_LMG {
+ class ace_csw {
+ type = "weapon";
+ deployTime = 4;
+ pickupTime = 4;
+ class assembleTo {
+ GVAR(m2Tripod) = "SPE_M1919_M2";
+ };
+ };
+ };
+
+ class SPE_M1919A6_StaticBipod;
+ class GVAR(M1919A6_proxy): SPE_M1919A6_StaticBipod {
+ magazineReloadTime = 0.5;
+ };
+
+ class SPE_MG42_Tripod;
+ class GVAR(MG42_proxy): SPE_MG42_Tripod {
+ magazineReloadTime = 0.5;
+ };
+
+ class SPE_MG34_Tripod;
+ class GVAR(MG34_proxy): SPE_MG34_Tripod {
+ magazineReloadTime = 0.5;
+ };
+
+ class SPE_Lafette_Tripod: SPE_Slung_Static_Weapon_Base {
+ class ace_csw {
+ type = "mount";
+ deployTime = 4;
+ pickupTime = 4;
+ deploy = QGVAR(LafetteTripodLow);
+ };
+ };
+ class SPE_MG42: SPE_LMG {
+ class ace_csw {
+ type = "weapon";
+ deployTime = 4;
+ pickupTime = 4;
+ class assembleTo {
+ GVAR(LafetteTripodLow) = "SPE_MG42_Lafette_low_Deployed";
+ GVAR(LafetteTripod) = "SPE_MG42_Lafette_Deployed";
+ };
+ };
+ };
+ class SPE_MG34: SPE_LMG {
+ class ace_csw {
+ type = "weapon";
+ deployTime = 4;
+ pickupTime = 4;
+ class assembleTo {
+ GVAR(LafetteTripodLow) = "SPE_MG34_Lafette_low_Deployed";
+ GVAR(LafetteTripod) = "SPE_MG34_Lafette_Deployed";
+ };
+ };
+ };
+
+ // --- Mortars -----------------------------------------------------------------
class SPE_M1_81;
- class SPE_M1_81_proxy: SPE_M1_81 {
+ class GVAR(M1_proxy): SPE_M1_81 {
magazineReloadTime = 0.5;
};
class SPE_M1_81_Stand: SPE_Slung_Static_Weapon_Base {
- class ACE_CSW {
+ class ace_csw {
type = "mount";
deployTime = 4;
pickupTime = 4;
- deploy = QGVAR(M1_81_baseplate);
+ deploy = QGVAR(m1Baseplate);
};
};
class SPE_M1_81_Barrel: SPE_Slung_Static_Weapon_Base {
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
- deployTime = 4;
- pickupTime = 4;
+ deployTime = 20;
+ pickupTime = 25;
class assembleTo {
- GVAR(M1_81_baseplate) = "SPE_M1_81";
+ GVAR(m1Baseplate) = "SPE_M1_81";
EGVAR(csw,mortarBaseplate) = "SPE_M1_81";
};
};
};
class SPE_MLE_27_31;
- class SPE_MLE_27_31_proxy: SPE_MLE_27_31 {
+ class GVAR(MLE_27_31_proxy): SPE_MLE_27_31 {
magazineReloadTime = 0.5;
};
class SPE_MLE_27_31_Stand: SPE_Slung_Static_Weapon_Base {
- class ACE_CSW {
+ class ace_csw {
type = "mount";
deployTime = 4;
pickupTime = 4;
@@ -45,7 +164,7 @@ class CfgWeapons {
};
};
class SPE_MLE_27_31_Barrel: SPE_Slung_Static_Weapon_Base {
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 20;
pickupTime = 25;
@@ -57,21 +176,20 @@ class CfgWeapons {
};
class SPE_GrW278_1;
- class SPE_GrW278_1_proxy: SPE_GrW278_1 {
+ class GVAR(GrW278_1_proxy): SPE_GrW278_1 {
magazineReloadTime = 0.5;
};
class SPE_GrW278_1_Stand: SPE_MLE_27_31_Stand {
- class ACE_CSW {
+ class ace_csw {
type = "mount";
deployTime = 4;
pickupTime = 4;
deploy = QGVAR(GrW278_baseplate);
};
};
-
class SPE_GrW278_1_Barrel: SPE_MLE_27_31_Barrel {
- class ACE_CSW {
+ class ace_csw {
type = "weapon";
deployTime = 20;
pickupTime = 25;
diff --git a/addons/compat_spe/compat_spe_csw/config.cpp b/addons/compat_spe/compat_spe_csw/config.cpp
index 6ff669629bf..05627a8f6db 100644
--- a/addons/compat_spe/compat_spe_csw/config.cpp
+++ b/addons/compat_spe/compat_spe_csw/config.cpp
@@ -23,7 +23,22 @@ class CfgPatches {
};
};
-#include "ACE_CSW_Groups.hpp"
-// Todo: https://github.com/acemod/ACE3/pull/9292#discussion_r1327738181
-// #include "CfgVehicles.hpp"
-// #include "CfgWeapons.hpp"
+#include "CfgMagazines.hpp"
+#include "CfgMagazineGroups.hpp"
+#include "CfgVehicles.hpp"
+#include "CfgWeapons.hpp"
+
+class CfgFunctions {
+ class SPE_WEAPONS_STATIC {
+ class SPE_Weapons_Static {
+ OVERWRITE_FUNC(alter_height);
+ OVERWRITE_FUNC(can_alter_height);
+ OVERWRITE_FUNC(can_assemble_weapon);
+ OVERWRITE_FUNC(can_disassemble_weapon);
+ OVERWRITE_FUNC(can_prepare_ammo);
+ OVERWRITE_FUNC(can_Reload);
+ OVERWRITE_FUNC(can_resupply_ammo);
+ OVERWRITE_FUNC(can_unload_ammo);
+ };
+ };
+};
diff --git a/addons/compat_spe/compat_spe_csw/functions/fnc_alter_height.sqf b/addons/compat_spe/compat_spe_csw/functions/fnc_alter_height.sqf
new file mode 100644
index 00000000000..0179c881537
--- /dev/null
+++ b/addons/compat_spe/compat_spe_csw/functions/fnc_alter_height.sqf
@@ -0,0 +1,107 @@
+#include "..\script_component.hpp"
+/*
+ * Author: Kerc (SPE), original by www.3commandobrigade.com, edited by johnb43 to be made CSW compatible
+ * Alters the static weapon's height.
+ *
+ * Arguments:
+ * 0: Static Weapon