Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some logistics remnants

Browse Source
This commit is contained in:
IngoKauffmann 2015-08-15 19:00:28 +02:00
parent 0c4924259d
commit 26c54b352a
3 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
addons/rearm/CfgAmmo.hpp
View File

@ -2,195 +2,195 @@ class CfgAmmo {
class BombCore;
class BombBase : BombCore {
ace_logistics_caliber = 250; // Default caliber for bombs
GVAR(caliber) = 250; // Default caliber for bombs
};
class LaserBombCore : BombCore {
ace_logistics_caliber = 250; // Default caliber for bombs
GVAR(caliber) = 250; // Default caliber for bombs
};
class MissileCore;
class MissileBase : MissileCore {
ace_logistics_caliber = 250; // Default caliber for missiles
GVAR(caliber) = 250; // Default caliber for missiles
};
class Rocket_04_HE_F : MissileBase {
ace_logistics_caliber = 70;
GVAR(caliber) = 70;
};
class M_PG_AT : MissileBase {
ace_logistics_caliber = 100;
GVAR(caliber) = 100;
};
class ACE_Hydra70_DAGR : M_PG_AT {
ace_logistics_caliber = 70;
GVAR(caliber) = 70;
};
class RocketCore;
class RocketBase : RocketCore {
ace_logistics_caliber = 70; // Default caliber for rockets
GVAR(caliber) = 70; // Default caliber for rockets
};
class R_80mm_HE : RocketBase {
ace_logistics_caliber = 80;
GVAR(caliber) = 80;
};
class R_60mm_HE : R_80mm_HE {
ace_logistics_caliber = 60;
GVAR(caliber) = 60;
};
class BulletBase;
class B_19mm_HE : BulletBase {
ace_logistics_caliber = 19;
GVAR(caliber) = 19;
};
class B_20mm : BulletBase {
ace_logistics_caliber = 20;
GVAR(caliber) = 20;
};
class B_25mm : BulletBase {
ace_logistics_caliber = 25;
GVAR(caliber) = 25;
};
class B_30mm_AP : BulletBase {
ace_logistics_caliber = 30;
GVAR(caliber) = 30;
};
class B_30mm_HE : B_19mm_HE {
ace_logistics_caliber = 30;
GVAR(caliber) = 30;
};
class Gatling_30mm_HE_Plane_CAS_01_F : BulletBase {
ace_logistics_caliber = 30;
GVAR(caliber) = 30;
};
class B_35mm_AA : BulletBase {
ace_logistics_caliber = 35;
GVAR(caliber) = 35;
};
class B_30mm_APFSDS;
class B_40mm_APFSDS : B_30mm_APFSDS {
ace_logistics_caliber = 40;
GVAR(caliber) = 40;
};
class B_40mm_GPR : B_30mm_HE {
ace_logistics_caliber = 40;
GVAR(caliber) = 40;
};
class GrenadeBase;
class G_40mm_HE : GrenadeBase {
ace_logistics_caliber = 40;
GVAR(caliber) = 40;
};
class RDS_B_127x107_Ball : BulletBase {
ace_logistics_caliber = 12.7;
GVAR(caliber) = 12.7;
};
class ShellBase;
class Sh_120mm_APFSDS : Shellbase {
ace_logistics_caliber = 120;
GVAR(caliber) = 120;
};
class Sh_105mm_APFSDS : Sh_120mm_APFSDS {
ace_logistics_caliber = 105;
GVAR(caliber) = 105;
};
class Sh_125mm_APFSDS : Sh_120mm_APFSDS {
ace_logistics_caliber = 125;
GVAR(caliber) = 125;
};
class Sh_120mm_HE : ShellBase {
ace_logistics_caliber = 120;
GVAR(caliber) = 120;
};
class Sh_125mm_HE : Sh_120mm_HE {
ace_logistics_caliber = 125;
GVAR(caliber) = 125;
};
class Sh_125mm_HEAT : Sh_125mm_HE {
ace_logistics_caliber = 125;
GVAR(caliber) = 125;
};
class Sh_105mm_HEAT_MP : Sh_125mm_HEAT {
ace_logistics_caliber = 105;
GVAR(caliber) = 105;
};
class Sh_155mm_AMOS : ShellBase {
ace_logistics_caliber = 155;
GVAR(caliber) = 155;
};
class Sh_82mm_AMOS : Sh_155mm_AMOS {
ace_logistics_caliber = 82;
GVAR(caliber) = 82;
};
class RDS_Sh_122_HE : Sh_155mm_AMOS {
ace_logistics_caliber = 122;
GVAR(caliber) = 122;
};
class RDS_Sh_105_HE : Sh_155mm_AMOS {
ace_logistics_caliber = 105;
GVAR(caliber) = 105;
};
class Sh_82mm_AMOS_LG;
class Sh_155mm_AMOS_LG : Sh_82mm_AMOS_LG {
ace_logistics_caliber = 155;
GVAR(caliber) = 155;
};
class RDS_Sh_122_LASER : Sh_155mm_AMOS_LG {
ace_logistics_caliber = 122;
GVAR(caliber) = 122;
};
class RDS_Sh_105_LASER : Sh_155mm_AMOS_LG {
ace_logistics_caliber = 105;
GVAR(caliber) = 105;
};
class ShotDeployBase;
class Smoke_82mm_AMOS_White : ShotDeployBase {
ace_logistics_caliber = 82;
GVAR(caliber) = 82;
};
class FlareCore;
class Flare_82mm_AMOS_White : FlareCore {
ace_logistics_caliber = 82;
GVAR(caliber) = 82;
};
class SmokeLauncherAmmo : BulletBase {
ace_logistics_caliber = 250;
GVAR(caliber) = 250;
};
class CMflareAmmo : BulletBase {
ace_logistics_caliber = 40;
GVAR(caliber) = 40;
};
class SubmunitionBase;
class Sh_82mm_AMOS_guided : SubmunitionBase {
ace_logistics_caliber = 82;
GVAR(caliber) = 82;
};
class Sh_155mm_AMOS_guided : Sh_82mm_AMOS_guided {
ace_logistics_caliber = 155;
GVAR(caliber) = 155;
};
class R_230mm_HE : SubmunitionBase {
ace_logistics_caliber = 230;
GVAR(caliber) = 230;
};
class rhs_ammo_127x108mm_x5 : SubmunitionBase {
ace_logistics_caliber = 12.7;
GVAR(caliber) = 12.7;
};
class Mine_155mm_AMOS_range : SubmunitionBase {
ace_logistics_caliber = 155;
GVAR(caliber) = 155;
};
class Cluster_155mm_AMOS : SubmunitionBase {
ace_logistics_caliber = 155;
GVAR(caliber) = 155;
};
class Smoke_120mm_AMOS_White : SubmunitionBase {
ace_logistics_caliber = 155;
GVAR(caliber) = 155;
};
class AT_Mine_155mm_AMOS_range : SubmunitionBase {
ace_logistics_caliber = 155;
GVAR(caliber) = 155;
};
class rhs_ammo_rpgShell_base : ShellBase {
ace_logistics_caliber = 70;
GVAR(caliber) = 70;
};
class Bomb_04_F : LaserBombCore {
ace_logistics_caliber = 250; // Default caliber for bombs
GVAR(caliber) = 250; // Default caliber for bombs
};
class Bo_GBU12_LGB : LaserBombCore {
ace_logistics_caliber = 250; // Default caliber for bombs
GVAR(caliber) = 250; // Default caliber for bombs
};
class js_a_fa18_wing_tank : LaserBombCore {
ace_logistics_caliber = 250; // Default caliber for bombs
GVAR(caliber) = 250; // Default caliber for bombs
};
class js_a_fa18x_MK82 : BombCore {};
class js_a_fa18x_GBU39_SDB : js_a_fa18x_MK82 {
ace_logistics_caliber = 250; // Default caliber for bombs
GVAR(caliber) = 250; // Default caliber for bombs
};
class js_a_fa18_GBU12_LGB : LaserBombCore {};
class js_a_fa18_GBU38_JDAM : js_a_fa18_GBU12_LGB {
ace_logistics_caliber = 250; // Default caliber for bombs
GVAR(caliber) = 250; // Default caliber for bombs
};
};

4
addons/rearm/functions/fnc_pickUpAmmo.sqf
View File

@ -29,11 +29,11 @@ _cal = 8;
if (_tmpCal > 0) then {
_cal = _tmpCal;
} else {
_tmpCal = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ace_logistics_caliber");
_tmpCal = getNumber (configFile >> "CfgAmmo" >> _ammo >> QGVAR(caliber));
if (_tmpCal > 0) then {
_cal = _tmpCal;
} else {
diag_log format ["ACE_Logistics: Undefined Ammo [%1 : %2]", _ammo, inheritsFrom (configFile >> "CfgAmmo" >> _ammo)];
diag_log format ["ACE_Rearm: Undefined Ammo [%1 : %2]", _ammo, inheritsFrom (configFile >> "CfgAmmo" >> _ammo)];
if (_ammo isKindOf "BulletBase") then {
_cal = 8;
} else {

2
addons/rearm/functions/fnc_rearm.sqf
View File

@ -39,7 +39,7 @@ _cal = 8;
if (_tmpCal > 0) then {
_cal = _tmpCal;
} else {
_tmpCal = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ace_logistics_caliber");
_tmpCal = getNumber (configFile >> "CfgAmmo" >> _ammo >> QGVAR(caliber));
if (_tmpCal > 0) then {
_cal = _tmpCal;
} else {