Skip to content

Commit

Permalink
Chemical - Fix mortar issues (#458)
Browse files Browse the repository at this point in the history
**When merged this pull request will:**
-  Fix wrong inheritance
- Fix "No matching carry mag" that was blocking unloading 8rnd and 5rnd
ammo from mortar

### IMPORTANT

- [Development Guidelines](https://ace3.acemod.org/wiki/development/)
are read, understood and applied.
- Title of this PR uses our standard template `Component -
Add|Fix|Improve|Change|Make|Remove {changes}`.
  • Loading branch information
MiszczuZPolski authored Apr 25, 2024
1 parent e8a6ae1 commit d251601
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
4 changes: 3 additions & 1 deletion addons/chemical/CfgMagazineGroups.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
class ace_csw_groups {
class KAT_1Rnd_82mm_Mo_Type0 {
KAT_1Rnd_82mm_Mo_Type0 = 1;
KAT_5Rnd_82mm_Mo_Type0_AI = 1;
};
class KAT_1Rnd_82mm_Mo_TypeCS {
KAT_1Rnd_82mm_Mo_TypeCS = 1;
KAT_3Rnd_82mm_Mo_TypeCS_AI = 1;
};
};
};
4 changes: 4 additions & 0 deletions addons/chemical/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ class CfgVehicles {
};
};
class Mortar_01_base_F: StaticMortar {
class ace_csw: ace_csw {
proxyWeapon = "ace_mortar_82mm";
};

class Turrets: Turrets {
class MainTurret: MainTurret {
magazines[] += {"KAT_5Rnd_82mm_Mo_Type0_AI","KAT_5Rnd_82mm_Mo_Type0_AI","KAT_5Rnd_82mm_Mo_Type0_AI","KAT_5Rnd_82mm_Mo_Type0_AI","KAT_3Rnd_82mm_Mo_TypeCS_AI","KAT_3Rnd_82mm_Mo_TypeCS_AI","KAT_3Rnd_82mm_Mo_TypeCS_AI"};
Expand Down
11 changes: 3 additions & 8 deletions addons/chemical/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,13 @@ class CfgWeapons {
class CannonCore;
class mortar_82mm: CannonCore {
magazines[] += {
"KAT_1Rnd_82mm_Mo_Type0",
"KAT_5Rnd_82mm_Mo_Type0_AI",
"KAT_1Rnd_82mm_Mo_TypeCS",
"KAT_3Rnd_82mm_Mo_TypeCS_AI"
};
};
class ACE_mortar_82mm;
class ACE_mortar_82mm: ACE_mortar_82mm {
magazines[] += {
"KAT_1Rnd_82mm_Mo_Type0",
"KAT_1Rnd_82mm_Mo_TypeCS"
};

class ACE_mortar_82mm: mortar_82mm {
magazines[] = {"ACE_1Rnd_82mm_Mo_HE","ACE_1Rnd_82mm_Mo_Smoke","ACE_1Rnd_82mm_Mo_Illum","ACE_1Rnd_82mm_Mo_HE_Guided","ACE_1Rnd_82mm_Mo_HE_LaserGuided", "KAT_1Rnd_82mm_Mo_Type0", "KAT_1Rnd_82mm_Mo_TypeCS"};
};

class GrenadeLauncher;
Expand Down

0 comments on commit d251601

Please sign in to comment.