Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

Hellfire - Update to use 1.82 submunition #6299

Merged
merged 2 commits into from
May 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions addons/frag/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ class CfgAmmo {
GVAR(gurney_c) = 2700;
GVAR(gurney_k) = 1/2;
};
class ACE_Hellfire_AGM114K: M_PG_AT {
// Source: http://www.designation-systems.net/dusrm/m-114.html
GVAR(enabled) = 1;

GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 8000;
GVAR(charge) = 2400;
GVAR(gurney_c) = 2700;
GVAR(gurney_k) = 1/2;
};
class RocketBase;
class R_80mm_HE: RocketBase {
GVAR(skip) = 1;
Expand Down Expand Up @@ -174,6 +164,16 @@ class CfgAmmo {
GVAR(gurney_c) = 2700;
GVAR(gurney_k) = 1/2;
};
class ACE_Hellfire_AGM114K: M_Scalpel_AT {
// Source: http://www.designation-systems.net/dusrm/m-114.html
GVAR(enabled) = 1;

GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)};
GVAR(metal) = 8000;
GVAR(charge) = 2400;
GVAR(gurney_c) = 2700;
GVAR(gurney_k) = 1/2;
};
class M_Air_AA: MissileBase {
GVAR(skip) = 1;
};
Expand Down
10 changes: 4 additions & 6 deletions addons/hellfire/CfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class CfgAmmo {
class M_PG_AT;
class M_Scalpel_AT;

class ACE_Hellfire_AGM114K: M_PG_AT {
class ACE_Hellfire_AGM114K: M_Scalpel_AT {
displayName = "AGM-114K";
displayNameShort = "AGM-114K";
description = "AGM-114K";
Expand All @@ -10,9 +10,6 @@ class CfgAmmo {
model = "\A3\Weapons_F\Ammo\Missile_AT_03_fly_F";
proxyShape = "\A3\Weapons_F\Ammo\Missile_AT_03_F";

hit = 1400;
indirectHit = 71;
indirectHitRange = 4.5;
effectsMissile = "missile2";

irLock = 0;
Expand Down Expand Up @@ -47,7 +44,7 @@ class CfgAmmo {
seekerAccuracy = 1; // seeker accuracy multiplier

seekerMinRange = 1;
seekerMaxRange = 5000; // Range from the missile which the seeker can visually search
seekerMaxRange = 8000; // Range from the missile which the seeker can visually search

// Attack profile type selection
defaultAttackProfile = "hellfire";
Expand All @@ -62,6 +59,7 @@ class CfgAmmo {
hit = 200;
indirectHit = 200;
indirectHitRange = 12;
submunitionAmmo = "";
explosionEffects = "BombExplosion";
class ace_missileguidance: ace_missileguidance {
enabled = 1; // Missile Guidance must be explicitly enabled
Expand Down