-
Notifications
You must be signed in to change notification settings - Fork 748
Compat Aegis - Add Realistic Weights #11177
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SirPotoo
wants to merge
17
commits into
acemod:master
Choose a base branch
from
SirPotoo:SirPotoo-patch-aegis_realisticweights
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
2f36ac8
Compat Aegis - Realistic Weights
SirPotoo 2dfcf98
Update AUTHORS.txt
SirPotoo 4055668
Reorder PoToo alphabetically
SirPotoo 35df12b
Refactor CfgPatches structure in config.cpp
SirPotoo 9b5468d
Add author to CfgPatches
SirPotoo 62df5e3
Remove unused classes
SirPotoo 2b396aa
Give the subaddon an actual name in config
SirPotoo 56a811c
Add missing braces
SirPotoo 2a46e59
remove tabs
PabstMirror a0541ac
Update AK74M weight
SirPotoo c1795e2
Update AK74M GL weight
SirPotoo 0fb5bf4
Update AK74 GL weight
SirPotoo f9cd257
Update AK74 weight
SirPotoo 5ca3ccd
Update AKS74 weight
SirPotoo 3ca9936
Update AK103 weight
SirPotoo 141e277
Update AK103 GL weight
SirPotoo 8343496
use COMPONENT_NAME macro
PabstMirror File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -209,3 +209,4 @@ Zakant <[email protected]> | |
| zGuba | ||
| Zman6258 | ||
| Zorn <[email protected]> | ||
| PoToo | ||
361 changes: 361 additions & 0 deletions
361
addons/compat_aegis/compat_aegis_realisticweights/CfgWeapons.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,361 @@ | ||
| class CfgWeapons { | ||
| class Rifle; | ||
| class Rifle_Base_F: Rifle { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class Rifle_Long_Base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class Rifle_Short_Base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class Launcher; | ||
| class Launcher_Base_F: Launcher { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class launch_RPG7_F: Launcher_Base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class Pistol; | ||
| class Pistol_Base_F: Pistol { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class UGL_F; | ||
| class arifle_AKM_base_F; | ||
| class arifle_AKM_F: arifle_AKM_base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class arifle_RPK_base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class Aegis_arifle_RPK74_base_F: arifle_RPK_base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class GM6_base_F: Rifle_Long_Base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class Aegis_srifle_GM6B_base_F: GM6_base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
| class arifle_SPAR_02_base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo; | ||
| }; | ||
|
|
||
| // - Assault rifles ----------------------------------------------------------- | ||
|
|
||
| // - AK-74M --------------------------------------------------------------- | ||
| class Aegis_arifle_AKM74_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 75; | ||
SirPotoo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_AKM74_GL_F: Aegis_arifle_AKM74_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 108; | ||
SirPotoo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }; | ||
| }; | ||
|
|
||
| // - AK-74 ---------------------------------------------------------------- | ||
| class Aegis_arifle_AK74_F: Aegis_arifle_AKM74_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 68; | ||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_AK74_GL_F: Aegis_arifle_AKM74_GL_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 100.7; | ||
SirPotoo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_AK74_gold_F: Aegis_arifle_AK74_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 68; | ||
| }; | ||
| }; | ||
|
|
||
| // - AKS-74 --------------------------------------------------------------- | ||
| class Aegis_arifle_AKS74_F: Aegis_arifle_AK74_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 65; | ||
SirPotoo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_AKS74_gold_F: Aegis_arifle_AKS74_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 65; | ||
SirPotoo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }; | ||
| }; | ||
|
|
||
| // - AK-103 --------------------------------------------------------------- | ||
| class Aegis_arifle_AK103_F: Aegis_arifle_AKM74_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 79; | ||
SirPotoo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_AK103_GL_F: Aegis_arifle_AK103_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 112; | ||
SirPotoo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }; | ||
| }; | ||
|
|
||
| // - M4A1 ----------------------------------------------------------------- | ||
| class Aegis_arifle_M4A1_base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 64.3; | ||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_M4A1_GL_base_F: Aegis_arifle_M4A1_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 97.3; | ||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_M4A1_Grip_base_F: Aegis_arifle_M4A1_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 67.3; | ||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_M4A1_short_base_F: Aegis_arifle_M4A1_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 60; | ||
| }; | ||
| }; | ||
|
|
||
| // - M16 ------------------------------------------------------------------ | ||
| class Aegis_arifle_M16A4_base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 75; | ||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_M16A4_FG_base_F: Aegis_arifle_M16A4_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 78; | ||
| }; | ||
| }; | ||
|
|
||
| class Aegis_arifle_M16A4_GL_base_F: Aegis_arifle_M16A4_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 105; | ||
| }; | ||
| }; | ||
|
|
||
| // - L85A3 ---------------------------------------------------------------- | ||
| class arifle_SA80_base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 85.2; | ||
| }; | ||
| }; | ||
|
|
||
| class arifle_SA80_GL_base_F: arifle_SA80_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 118.3; | ||
| }; | ||
| }; | ||
|
|
||
| class arifle_SA80_C_base_F: arifle_SA80_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 72.6; | ||
| }; | ||
| }; | ||
|
|
||
| // - SCAR-H --------------------------------------------------------------- | ||
| class arifle_SCAR_base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 79; | ||
| }; | ||
| }; | ||
|
|
||
| class arifle_SCAR_grip_base_F: arifle_SCAR_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 82; | ||
| }; | ||
| }; | ||
|
|
||
| class arifle_SCAR_GL_base_F: arifle_SCAR_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 112; | ||
| }; | ||
| }; | ||
|
|
||
| class arifle_SCAR_short_base_F: arifle_SCAR_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 77; | ||
| }; | ||
| }; | ||
|
|
||
| // - SCAR-L --------------------------------------------------------------- | ||
| class arifle_SCAR_L_base_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 73; | ||
| }; | ||
| }; | ||
|
|
||
| class arifle_SCAR_L_grip_base_F: arifle_SCAR_L_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 76; | ||
| }; | ||
| }; | ||
|
|
||
| class arifle_SCAR_L_GL_base_F: arifle_SCAR_L_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 106; | ||
| }; | ||
| }; | ||
|
|
||
| class arifle_SCAR_L_short_base_F: arifle_SCAR_L_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 67; | ||
| }; | ||
| }; | ||
|
|
||
| // - HK-416A5 14.5" ------------------------------------------------------- | ||
| class Aegis_arifle_SPAR_02_Inf_base_F: arifle_SPAR_02_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 73.4; | ||
| }; | ||
| }; | ||
|
|
||
| // - LMGs --------------------------------------------------------------------- | ||
|
|
||
| // - RPK-74M -------------------------------------------------------------- | ||
| class Aegis_arifle_RPK74M_F: Aegis_arifle_RPK74_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 104.9; | ||
| }; | ||
| }; | ||
|
|
||
| // - RPK ------------------------------------------------------------------ | ||
| class arifle_RPK_F: arifle_RPK_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 106; | ||
| }; | ||
| }; | ||
|
|
||
| // - FN MAG --------------------------------------------------------------- | ||
| class Aegis_MMG_FNMAG_Base: Rifle_Long_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 256; | ||
| }; | ||
| }; | ||
|
|
||
| class Aegis_MMG_FNMAG_old_F: Aegis_MMG_FNMAG_Base { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 260; | ||
| }; | ||
| }; | ||
|
|
||
| class Aegis_MMG_FNMAG_240_F: Aegis_MMG_FNMAG_Base { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 218; | ||
| }; | ||
| }; | ||
|
|
||
|
|
||
| // - Sniper rifles ------------------------------------------------------------ | ||
|
|
||
| // - GM6 .50 BMG ---------------------------------------------------------- | ||
| class Aegis_srifle_GM6B_F: Aegis_srifle_GM6B_base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 253; | ||
| }; | ||
| }; | ||
|
|
||
| // - SVD ------------------------------------------------------------------ | ||
| class Aegis_srifle_SVD_base_F: Rifle_Long_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 81; | ||
| }; | ||
| }; | ||
|
|
||
| // - SMGs --------------------------------------------------------------------- | ||
|
|
||
| // - MP7 ------------------------------------------------------------------ | ||
| class SMG_04_base_F: Rifle_Short_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 42; | ||
| }; | ||
| }; | ||
|
|
||
| // - Shotguns ----------------------------------------------------------------- | ||
|
|
||
| // - KSG-12 --------------------------------------------------------------- | ||
| class sgun_KSG_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 69; | ||
| }; | ||
| }; | ||
|
|
||
| // - Benelli M4 ----------------------------------------------------------- | ||
| class sgun_M4_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 84; | ||
| }; | ||
| }; | ||
|
|
||
| // Mp-153 ----------------------------------------------------------------- | ||
| class sgun_Mp153_black_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 70; | ||
| //Roughly? | ||
| }; | ||
| }; | ||
|
|
||
| class sgun_Mp153_classic_F: sgun_Mp153_black_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 76; | ||
| }; | ||
| }; | ||
|
|
||
| // - Launchers ---------------------------------------------------------------- | ||
|
|
||
| // M32 -------------------------------------------------------------------- | ||
| class GL_M32_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 132; | ||
| }; | ||
| }; | ||
|
|
||
| // XM25 ------------------------------------------------------------------- | ||
| class GL_XM25_F: Rifle_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 140; | ||
| }; | ||
| }; | ||
|
|
||
| // RPG-7M ----------------------------------------------------------------- | ||
| class Aegis_launch_RPG7M_F: launch_RPG7_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 100; | ||
| //it's a fictional polymer RPG, 6 lbs still felt too light | ||
| }; | ||
| }; | ||
|
|
||
| // - Pistols ------------------------------------------------------------------ | ||
|
|
||
| // - P320 ----------------------------------------------------------------- | ||
| class Aegis_hgun_P320_base_F: Pistol_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 20; | ||
| }; | ||
| }; | ||
|
|
||
| // - Ruger 57 ------------------------------------------------------------- | ||
| class Aegis_hgun_Pistol_R57_F: Pistol_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 14.4; | ||
| }; | ||
| }; | ||
|
|
||
| // - Desert Eagle XIX .44 ------------------------------------------------- | ||
| class hgun_Mk26_F: Pistol_Base_F { | ||
| class WeaponSlotsInfo: WeaponSlotsInfo { | ||
| mass = 44; | ||
| }; | ||
| }; | ||
| }; | ||
27 changes: 27 additions & 0 deletions
27
addons/compat_aegis/compat_aegis_realisticweights/config.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| class CfgPatches | ||
| { | ||
| class compat_aegis_realisticweights | ||
PabstMirror marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| { | ||
| name="ACE3 - Realistic Weights Aegis Patch"; | ||
| units[]={}; | ||
| weapons[]={}; | ||
| requiredVersion=2.2; | ||
| requiredAddons[]= | ||
| { | ||
| "ace_realisticweights", | ||
| "A3_Aegis_Weapons_F_Aegis" | ||
| }; | ||
| skipWhenMissingDependencies = 1; | ||
| author="$STR_ace_common_ACETeam"; | ||
| authors[]= | ||
| { | ||
| "PoToo" | ||
| }; | ||
| url="$STR_ace_main_URL"; | ||
| version=3.2; | ||
| versionStr="3.20.0.104"; | ||
| versionAr[]={3,20,0,104}; | ||
| }; | ||
| }; | ||
|
|
||
| #include "CfgWeapons.hpp" | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.