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

Bugfix/30mm frag #465

Merged
merged 9 commits into from
Dec 11, 2024
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
2 changes: 2 additions & 0 deletions addons/MH60M/config/cfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ class CfgVehicles {
ANIM_INIT(CabinSeats_2_Hide,1);
ANIM_INIT(CabinSeats_3_Hide,1);
ANIM_INIT(Cockpitdoors_Hide,1);
ANIM_INIT(Minigun_Sight_L_hide,1);
ANIM_INIT(Minigun_Sight_R_hide,1);
ANIM_INIT(RADAR_HIDE,0);
ANIM_INIT(FLIR_HIDE,0);
ANIM_INIT(FuelProbe_show,1);
Expand Down
10 changes: 10 additions & 0 deletions addons/UH60/config/cfgAnimationSources.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,16 @@ class AnimationSources {
animPeriod=1;
initPhase=0;
};
class Minigun_Sight_L_hide {
source="user";
animPeriod=1;
initPhase=0;
};
class Minigun_Sight_R_hide {
source="user";
animPeriod=1;
initPhase=0;
};
class cabindoor_L {
source="door";
animPeriod=1;
Expand Down
1 change: 1 addition & 0 deletions addons/UH60/config/cfgMagazines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ class cfgMagazines {
class 2000Rnd_65x39_Belt_Tracer_Red;
class vtx_2000Rnd_65x39_Belt_Tracer_Red: 2000Rnd_65x39_Belt_Tracer_Red {
count = 4400;
tracersEvery = 5;
};
};
16 changes: 16 additions & 0 deletions addons/UH60/config/cfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,18 @@ class CfgVehicles
"", // "right_num_2",
"z\vtx\addons\UH60\Data\FuelProbe\Fuel_probe_co.paa"
};
class AnimationSources: AnimationSources
{
ANIM_INIT(FuelProbe_show,1);
ANIM_INIT(CabinSeats_Hide,1);
ANIM_INIT(HH60Flares_show,1);
ANIM_INIT(HH60GRadar_show,1);
ANIM_INIT(HH60GFlir_show,1);
ANIM_INIT(MAWS_Tubes_Show,1);
ANIM_INIT(ERFS_show,1);
ANIM_INIT(Minigun_Sight_L_hide,1);
ANIM_INIT(Minigun_Sight_R_hide,1);
};
};

class vtx_HH60 : vtx_H60_base {
Expand Down Expand Up @@ -561,6 +573,8 @@ class CfgVehicles
ANIM_INIT(HH60GFlir_show,1);
ANIM_INIT(MAWS_Tubes_Show,1);
ANIM_INIT(ERFS_show,1);
ANIM_INIT(Minigun_Sight_L_hide,1);
ANIM_INIT(Minigun_Sight_R_hide,1);
};
#include "vehicleTransport.hpp"
}; // vtx_HH60
Expand All @@ -576,6 +590,8 @@ class CfgVehicles
class AnimationSources: AnimationSources {
ANIM_INIT(CabinSeats_Hide,1);
ANIM_INIT(Hoist_hide,1);
ANIM_INIT(Minigun_Sight_L_hide,1);
ANIM_INIT(Minigun_Sight_R_hide,1);
};
class Turrets: Turrets {
class CopilotTurret: CopilotTurret {};
Expand Down
4 changes: 2 additions & 2 deletions addons/UH60/config/turrets/doorguns.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class MainTurret: MainTurret { //Left Doorgun
gunEnd="chamber_1";
gunnerLeftHandAnimName="minigun_base_elev_l";
gunnerLeftLegAnimName="M134Gunner_L_Legs";
gunnerName="Left door gunner";
gunnerName="Left Door Gunner";
gunnerRightHandAnimName= "minigun_base_elev_l";
gunnerRightLegAnimName= "M134Gunner_L_Legs";
memoryPointGunnerOptics="gunnerview_1";
Expand Down Expand Up @@ -60,7 +60,7 @@ class RightDoorGun: MainTurret {
gunEnd="chamber_2"; //gunEnd=chamber of the gun
gunnerLeftHandAnimName="minigun_base_elev_r";
gunnerLeftLegAnimName="M134Gunner_r_Legs";
gunnerName="Right door gunner";
gunnerName="Right Door Gunner";
gunnerRightHandAnimName= "minigun_base_elev_r";
gunnerRightLegAnimName= "M134Gunner_r_Legs";
memoryPointGunnerOptics="gunnerview_2";
Expand Down
4 changes: 2 additions & 2 deletions addons/UH60/config/turrets/doorgunsTurnOut.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class MainTurret: MainTurret { //Left Doorgun
gunEnd="chamber_1";
gunnerAction = "vehicle_turnout_1";
gunnerInAction = "passenger_inside_1";
gunnerName="Left door gunner";
gunnerName="Left Door Gunner";
/* need axis set up
gunnerInAction = "Gunner_HeliTransport3_1";
gunnerLeftHandAnimName = "gunner_1_hand_l";
Expand Down Expand Up @@ -74,7 +74,7 @@ class RightDoorGun: MainTurret {
gunEnd="chamber_2"; //gunEnd=chamber of the gun
gunnerAction = "vehicle_turnout_1";
gunnerInAction = "passenger_inside_1";
gunnerName="Right door gunner";
gunnerName="Right Door Gunner";
gunnerLeftHandAnimName = "";
gunnerRightHandAnimName = "";
gunnerLeftLegAnimName = "";
Expand Down
2 changes: 0 additions & 2 deletions addons/uh60_config/config/CfgAnimationSources.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,11 @@ class AnimationSources: AnimationSources {
mass = -MASS_MINIGUN;
};
class Minigun_Sight_L_hide {
displayName = "Hide Minigun Sight (L)";
source="user";
animPeriod=1;
initPhase=0;
};
class Minigun_Sight_R_hide {
displayName = "Hide Minigun Sight (R)";
source="user";
animPeriod=1;
initPhase=0;
Expand Down
73 changes: 40 additions & 33 deletions addons/uh60_weapons/config/cfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
class CfgAmmo {
class M_Scalpel_AT;
class B_30mm_MP_Tracer_Green;
class ACE_Hellfire_AGM114K: M_Scalpel_AT {class ace_missileguidance;};
class ACE_Hellfire_AGM114N: M_Scalpel_AT {class ace_missileguidance;};
class VTX_Hellfire_AGM114K: ACE_Hellfire_AGM114K {
Expand Down Expand Up @@ -125,38 +124,46 @@ class CfgAmmo {
attackProfiles[] = {"LIN"};
};
};
class B_30mm_HE;
class vtx_30mm_shells_hedp : B_30mm_HE
{
//Ace Cfg
ACE_caliber = 30.00;
ACE_bulletLength = 104;
ACE_bulletMass = 234;
ACE_muzzleVelocityVariationSD = 0.37;
ACE_ammoTempMuzzleVelocityShifts[] = {-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75};
ACE_ballisticCoefficients[] = {0.151};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere = "ICAO";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {805};
ACE_barrelLengths[] = {1676};
ace_vehicle_damage_incendiary = 0.7;

class vtx_30mm_shells_ap : B_30mm_MP_Tracer_Green {
caliber=4.4;
explosive = 0.1;
hit = 170;
indirectHit = 60;
indirectHitRange = 2;
explosionEffects = "ExploAmmoExplosion";
deflecting = 10;
tracerColor[] = {0.7,0.1,0.1,0.04};
tracerColorR[] = {0.7,0.1,0.1,0.04};
};
class vtx_30mm_shells_hedp : vtx_30mm_shells_ap {
explosive = 1;
hit = 20;
indirectHit = 40;
indirectHitRange = 2;
explosionEffects = "ExploAmmoExplosion";
deflecting = -1;
ace_frag_enabled = 1;
ace_frag_skip = 0;

ace_frag_enabled = 0;
ace_frag_metal = 210;
ace_frag_charge = 185;
ace_frag_gurney_c = 2843;
ace_frag_gurney_k = 3/5;
ace_frag_classes[] = {"ACE_frag_large"};
ace_frag_skip = 0;
ace_frag_force = 1;
tracerColor[] = {0.7,0.1,0.1,0.04};
tracerColorR[] = {0.7,0.1,0.1,0.04};
// https://ace3mod.com/wiki/framework/frag-framework.html

};

hit = 60;
indirectHit = 20;
indirectHitRange = 3.5;
typicalSpeed = 800;
maxspeed = 825;
explosive = 0.8;

airFriction = -0.00036;
airlock = 0;
irlock = 0;
weaponType = "cannon";
warheadName = "AP";

//dual purpose warhead
submunitionAmmo ="ammo_Penetrator_30mm";
submunitionDirectionType ="SubmunitionModelDirection";
submunitionInitSpeed =1000;
submunitionParentSpeedCoef =0;
submunitionInitialOffset[] ={0,0,-0.2};
triggerOnImpact =1;
deleteParentWhenTriggered =0;
};
};
17 changes: 1 addition & 16 deletions addons/uh60_weapons/config/cfgMagazines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ class cfgMagazines {
muzzlePos = "muzzlePos";
muzzleEnd = "muzzleEnd";
weight = 164.3;
tracersEvery = 1;
lastRoundsTracer = 1;
count = 300;
hardpoints[] = {"VTX_ST_L"};
model = \z\vtx\addons\uh60_weapons\Data\M230\M230_L.p3d;
Expand All @@ -57,20 +55,7 @@ class cfgMagazines {
hardpoints[] = {"VTX_ST_R"};
model = \z\vtx\addons\uh60_weapons\Data\M230\M230_R.p3d;
};
class VTX_M230_Chaingun_L_AP: VTX_M230_Chaingun_L {
scope = 2;
ammo = "vtx_30mm_shells_ap";
descriptionShort = "Single-barrel chain-driven autocannon firing 30x113 mm AP rounds.";
displayname = "M230 AP [H60]";
displayNameShort = "M230 AP";
pylonWeapon = "vtx_chaingun_ap";
};
class VTX_M230_Chaingun_R_AP: VTX_M230_Chaingun_L_AP {
weight = 164.3;
hardpoints[] = {"VTX_ST_R"};
model = \z\vtx\addons\uh60_weapons\Data\M230\M230_R.p3d;
};


class PylonRack_12Rnd_missiles;
class VTX_PylonRack_M261_M229: PylonRack_12Rnd_missiles {
hardpoints[] = {"VTX_ST_L","VTX_ST_R","VTX_ST_OUTBOARD"};
Expand Down
8 changes: 0 additions & 8 deletions addons/uh60_weapons/config/cfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@ class cfgWeapons {
};
};
};
class vtx_chaingun_ap: vtx_chaingun_hedp {
displayName = "M230 Chaingun";
displayNameShort = "M230 AP";
magazines[] = {"VTX_M230_Chaingun_L_AP", "VTX_M230_Chaingun_R_AP"};
class player: player {
displayName = "M230 AP";
};
};
class RocketPods;
class missiles_DAR: RocketPods {
class Burst;
Expand Down