From bc3a340a1f134713940d7ac190e41d2a0fe04498 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 22 Nov 2024 20:29:52 -0600 Subject: [PATCH] Frag - de-quote number --- addons/compat_rhs_afrf3/CfgAmmo.hpp | 4 +- addons/compat_rhs_usf3/CfgAmmo.hpp | 4 +- addons/compat_spe/CfgAmmo/bombs.hpp | 10 +- addons/compat_spe/CfgAmmo/explosives.hpp | 46 +++++----- addons/compat_spe/CfgAmmo/grenades.hpp | 22 ++--- addons/frag/CfgAmmoFragParameters.hpp | 112 +++++++++++------------ addons/hot/CfgAmmo.hpp | 2 +- 7 files changed, 100 insertions(+), 100 deletions(-) diff --git a/addons/compat_rhs_afrf3/CfgAmmo.hpp b/addons/compat_rhs_afrf3/CfgAmmo.hpp index 11aee03d795..8599ffd25de 100644 --- a/addons/compat_rhs_afrf3/CfgAmmo.hpp +++ b/addons/compat_rhs_afrf3/CfgAmmo.hpp @@ -158,7 +158,7 @@ class CfgAmmo { EGVAR(frag,metal) = 200; EGVAR(frag,charge) = 110; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_small_HD"}; EGVAR(frag,skip) = 0; EGVAR(frag,force) = 1; @@ -186,7 +186,7 @@ class CfgAmmo { EGVAR(frag,metal) = 400; EGVAR(frag,charge) = 210; EGVAR(frag,gurney_c) = 2800; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium_HD"}; EGVAR(frag,skip) = 0; EGVAR(frag,force) = 1; diff --git a/addons/compat_rhs_usf3/CfgAmmo.hpp b/addons/compat_rhs_usf3/CfgAmmo.hpp index 6b885d7e04c..569d67ad5cc 100644 --- a/addons/compat_rhs_usf3/CfgAmmo.hpp +++ b/addons/compat_rhs_usf3/CfgAmmo.hpp @@ -364,7 +364,7 @@ class CfgAmmo { EGVAR(frag,metal) = 213; EGVAR(frag,charge) = 185; EGVAR(frag,gurney_c) = 2700; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium_HD"}; EGVAR(frag,skip) = 0; EGVAR(frag,force) = 1; @@ -374,7 +374,7 @@ class CfgAmmo { EGVAR(frag,metal) = 330; EGVAR(frag,charge) = 280; EGVAR(frag,gurney_c) = 2800; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium_HD"}; EGVAR(frag,skip) = 0; EGVAR(frag,force) = 1; diff --git a/addons/compat_spe/CfgAmmo/bombs.hpp b/addons/compat_spe/CfgAmmo/bombs.hpp index 489930289c1..23d547d5f03 100644 --- a/addons/compat_spe/CfgAmmo/bombs.hpp +++ b/addons/compat_spe/CfgAmmo/bombs.hpp @@ -5,7 +5,7 @@ class SPE_NC250_Bomb: SPE_Bomb_base { EGVAR(frag,metal) = 166000; EGVAR(frag,charge) = 130000; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"}; }; class SPE_NC50_Bomb: SPE_Bomb_base { @@ -14,7 +14,7 @@ class SPE_NC50_Bomb: SPE_Bomb_base { EGVAR(frag,metal) = 25000; EGVAR(frag,charge) = 24400; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"}; }; class SPE_SC500_Bomb: SPE_Bomb_base { @@ -23,7 +23,7 @@ class SPE_SC500_Bomb: SPE_Bomb_base { EGVAR(frag,metal) = 200000; EGVAR(frag,charge) = 275000; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"}; }; class SPE_US_500lb_Bomb: SPE_Bomb_base { @@ -32,7 +32,7 @@ class SPE_US_500lb_Bomb: SPE_Bomb_base { EGVAR(frag,metal) = 100000; EGVAR(frag,charge) = 124000; EGVAR(frag,gurney_c) = 2700; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"}; }; class SPE_US_1000lb_Bomb: SPE_Bomb_base { @@ -41,6 +41,6 @@ class SPE_US_1000lb_Bomb: SPE_Bomb_base { EGVAR(frag,metal) = 200000; EGVAR(frag,charge) = 158000; EGVAR(frag,gurney_c) = 2700; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"}; }; diff --git a/addons/compat_spe/CfgAmmo/explosives.hpp b/addons/compat_spe/CfgAmmo/explosives.hpp index 14b49104468..1f7df20213d 100644 --- a/addons/compat_spe/CfgAmmo/explosives.hpp +++ b/addons/compat_spe/CfgAmmo/explosives.hpp @@ -14,7 +14,7 @@ class SPE_PzFaust_30m: SPE_Rocket_base { EGVAR(frag,metal) = 150; EGVAR(frag,charge) = 400; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_small"}; }; class SPE_60mm_M6: SPE_Rocket_base { @@ -23,7 +23,7 @@ class SPE_60mm_M6: SPE_Rocket_base { EGVAR(frag,metal) = 250; EGVAR(frag,charge) = 400; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_small"}; }; class SPE_Sh_M43A1_81_HE: SubmunitionBase { @@ -32,7 +32,7 @@ class SPE_Sh_M43A1_81_HE: SubmunitionBase { EGVAR(frag,metal) = 1200; EGVAR(frag,charge) = 600; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; }; class SPE_M48_HE: SPE_ShellHE_base { @@ -41,7 +41,7 @@ class SPE_M48_HE: SPE_ShellHE_base { EGVAR(frag,metal) = 1250; EGVAR(frag,charge) = 670; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; }; class SPE_M101_M1_HE: SPE_ShellHE_base { @@ -50,7 +50,7 @@ class SPE_M101_M1_HE: SPE_ShellHE_base { EGVAR(frag,metal) = 2500; EGVAR(frag,charge) = 1980; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"}; }; class SPE_S_105L28_Gr38: SPE_ShellHE_base { @@ -59,7 +59,7 @@ class SPE_S_105L28_Gr38: SPE_ShellHE_base { EGVAR(frag,metal) = 2500; EGVAR(frag,charge) = 1500; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"}; }; class SPE_S_105L28_Gr39HlC: SPE_ShellHEAT_base { @@ -68,7 +68,7 @@ class SPE_S_105L28_Gr39HlC: SPE_ShellHEAT_base { EGVAR(frag,metal) = 2500; EGVAR(frag,charge) = 1500; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"}; }; class SPE_R_280mm_WkSpr: SubmunitionBase { @@ -77,7 +77,7 @@ class SPE_R_280mm_WkSpr: SubmunitionBase { EGVAR(frag,metal) = 37000; EGVAR(frag,charge) = 50000; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"}; }; class SPE_US_Bangalore_ammo: SPE_MAIN_pipebomb { @@ -86,7 +86,7 @@ class SPE_US_Bangalore_ammo: SPE_MAIN_pipebomb { EGVAR(frag,metal) = 1700; EGVAR(frag,charge) = 4100; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -96,7 +96,7 @@ class SPE_Ladung_Big_ammo: SPE_MAIN_pipebomb { EGVAR(frag,metal) = 500; EGVAR(frag,charge) = 1500; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -106,7 +106,7 @@ class SPE_Ladung_Small_ammo: SPE_MAIN_pipebomb { EGVAR(frag,metal) = 250; EGVAR(frag,charge) = 750; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -116,7 +116,7 @@ class SPE_US_M1A1_ATMINE_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 2100; EGVAR(frag,charge) = 2700; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -126,7 +126,7 @@ class SPE_US_TNT_half_pound_ammo: SPE_MAIN_pipebomb { EGVAR(frag,metal) = 100; EGVAR(frag,charge) = 226; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -136,7 +136,7 @@ class SPE_US_TNT_4pound_ammo: SPE_MAIN_pipebomb { EGVAR(frag,metal) = 372; EGVAR(frag,charge) = 1814; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -146,7 +146,7 @@ class SPE_US_M3_PRessure_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 2267; EGVAR(frag,charge) = 454; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -156,7 +156,7 @@ class SPE_US_M3_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 2267; EGVAR(frag,charge) = 454; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -166,7 +166,7 @@ class SPE_shumine42_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 300; EGVAR(frag,charge) = 200; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -176,7 +176,7 @@ class SPE_Shg24x7_Improvised_Mine_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 525; EGVAR(frag,charge) = 1330; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_small_HD"}; }; class SPE_SMI35_Pressure_ammo: SPE_MAIN_mine { @@ -185,7 +185,7 @@ class SPE_SMI35_Pressure_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 2720; EGVAR(frag,charge) = 182; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -195,7 +195,7 @@ class SPE_SMI35_1_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 2720; EGVAR(frag,charge) = 182; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -205,7 +205,7 @@ class SPE_SMI35_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 2720; EGVAR(frag,charge) = 182; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -215,7 +215,7 @@ class SPE_STMI_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 1520; EGVAR(frag,charge) = 152; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; @@ -225,7 +225,7 @@ class SPE_TMI42_ammo: SPE_MAIN_mine { EGVAR(frag,metal) = 2520; EGVAR(frag,charge) = 5400; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"}; EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; diff --git a/addons/compat_spe/CfgAmmo/grenades.hpp b/addons/compat_spe/CfgAmmo/grenades.hpp index 12043d50116..197989cea98 100644 --- a/addons/compat_spe/CfgAmmo/grenades.hpp +++ b/addons/compat_spe/CfgAmmo/grenades.hpp @@ -12,7 +12,7 @@ class SPE_Shg24: SPE_GrenadeHand_base { EGVAR(frag,metal) = 75; EGVAR(frag,charge) = 170; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"}; }; class SPE_Shg24_Frag: SPE_GrenadeHand_base { @@ -21,7 +21,7 @@ class SPE_Shg24_Frag: SPE_GrenadeHand_base { EGVAR(frag,metal) = 250; EGVAR(frag,charge) = 190; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_small_HD"}; }; class SPE_Shg24x7: SPE_GrenadeHand_base { @@ -30,7 +30,7 @@ class SPE_Shg24x7: SPE_GrenadeHand_base { EGVAR(frag,metal) = 525; EGVAR(frag,charge) = 1330; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_small_HD"}; }; class SPE_M39: SPE_GrenadeHand_base { @@ -39,7 +39,7 @@ class SPE_M39: SPE_GrenadeHand_base { EGVAR(frag,metal) = 200; EGVAR(frag,charge) = 112; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"}; }; class SPE_US_Mk_2: SPE_GrenadeHand_base { @@ -48,7 +48,7 @@ class SPE_US_Mk_2: SPE_GrenadeHand_base { EGVAR(frag,metal) = 400; EGVAR(frag,charge) = 56; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_small_HD"}; }; class SPE_US_Mk_2_Yellow: SPE_US_Mk_2 {}; @@ -58,7 +58,7 @@ class SPE_US_Mk_3: SPE_GrenadeHand_base { EGVAR(frag,metal) = 90; EGVAR(frag,charge) = 200; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"}; }; class SPE_G_M9A1: SPE_Grenade_base { @@ -67,7 +67,7 @@ class SPE_G_M9A1: SPE_Grenade_base { EGVAR(frag,metal) = 200; EGVAR(frag,charge) = 113; EGVAR(frag,gurney_c) = 2750; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"}; }; class SPE_G_MK2: SPE_Grenade_base { @@ -76,7 +76,7 @@ class SPE_G_MK2: SPE_Grenade_base { EGVAR(frag,metal) = 400; EGVAR(frag,charge) = 56; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_small_HD"}; }; class SPE_G_PZGR_30: SPE_Grenade_base { @@ -85,7 +85,7 @@ class SPE_G_PZGR_30: SPE_Grenade_base { EGVAR(frag,metal) = 120; EGVAR(frag,charge) = 50; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"}; }; class SPE_G_PZGR_40: SPE_Grenade_base { @@ -94,7 +94,7 @@ class SPE_G_PZGR_40: SPE_Grenade_base { EGVAR(frag,metal) = 180; EGVAR(frag,charge) = 75; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_tiny_HD"}; }; class SPE_G_SPRGR_30_Detonation: SPE_Grenade_base { @@ -103,7 +103,7 @@ class SPE_G_SPRGR_30_Detonation: SPE_Grenade_base { EGVAR(frag,metal) = 150; EGVAR(frag,charge) = 200; EGVAR(frag,gurney_c) = 2440; - EGVAR(frag,gurney_k) = "1/2"; + EGVAR(frag,gurney_k) = 1/2; EGVAR(frag,classes)[] = {"ACE_frag_small_HD"}; }; diff --git a/addons/frag/CfgAmmoFragParameters.hpp b/addons/frag/CfgAmmoFragParameters.hpp index 588032673d2..269f7df3548 100644 --- a/addons/frag/CfgAmmoFragParameters.hpp +++ b/addons/frag/CfgAmmoFragParameters.hpp @@ -10,7 +10,7 @@ class B_20mm: BulletBase { GVAR(charge) = 6; GVAR(metal) = 114; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(tiny_HD)}; }; @@ -23,7 +23,7 @@ class ammo_Gun20mmAABase: BulletBase { // 20x139mm GVAR(charge) = 6; GVAR(metal) = 114; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(tiny_HD)}; }; @@ -31,7 +31,7 @@ class ammo_Gun30mmAABase: BulletBase { // 30x210mm HEI GVAR(skip) = 0; GVAR(charge) = 40; GVAR(metal) = 410; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(gurney_c) = 2901; GVAR(classes)[] = {QGVAR(tiny_HD), QGVAR(tiny_HD), QGVAR(small_HD)}; @@ -44,7 +44,7 @@ class B_30mm_HE: B_19mm_HE { GVAR(charge) = 25; GVAR(metal) = 320; GVAR(gurney_c) = 2552; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(tiny_HD), QGVAR(tiny_HD), QGVAR(small_HD)}; }; class B_30mm_MP: B_30mm_HE { @@ -53,7 +53,7 @@ class B_30mm_MP: B_30mm_HE { GVAR(metal) = 388; GVAR(charge) = 56; GVAR(gurney_c) = 2600; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(tiny_HD), QGVAR(tiny_HD), QGVAR(small_HD)}; }; @@ -63,7 +63,7 @@ class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase { GVAR(metal) = 388; GVAR(charge) = 56; GVAR(gurney_c) = 2600; // guessed - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class ammo_Gun35mmAABase: BulletBase { @@ -73,7 +73,7 @@ class ammo_Gun35mmAABase: BulletBase { GVAR(skip) = 0; GVAR(charge) = 98; GVAR(metal) = 400; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(gurney_c) = 2700; GVAR(classes)[] = {QGVAR(tiny_HD), QGVAR(tiny_HD), QGVAR(small_HD)}; }; @@ -85,7 +85,7 @@ class B_35mm_AA: BulletBase { GVAR(skip) = 0; GVAR(charge) = 98; GVAR(metal) = 400; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(gurney_c) = 2700; GVAR(classes)[] = {QGVAR(tiny_HD), QGVAR(tiny_HD), QGVAR(small_HD)}; }; @@ -98,7 +98,7 @@ class B_40mm_GPR: B_30mm_HE { GVAR(metal) = 750; GVAR(charge) = 120; GVAR(gurney_c) = 2700; // guessed - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class UnderwaterMine_Range_Ammo: MineBase { GVAR(skip) = 1; @@ -110,7 +110,7 @@ class Bo_GBU12_LGB: ammo_Bomb_LaserGuidedBase { GVAR(charge) = 87000; GVAR(metal) = 140000; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large_HD), QGVAR(huge_HD), QGVAR(huge_HD), QGVAR(huge_HD)}; }; class Bomb_03_F: ammo_Bomb_LaserGuidedBase { @@ -118,7 +118,7 @@ class Bomb_03_F: ammo_Bomb_LaserGuidedBase { GVAR(charge) = 100000; GVAR(metal) = 150000; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large_HD), QGVAR(huge_HD), QGVAR(huge_HD), QGVAR(huge_HD)}; }; class Bomb_04_F: ammo_Bomb_LaserGuidedBase { @@ -126,7 +126,7 @@ class Bomb_04_F: ammo_Bomb_LaserGuidedBase { GVAR(charge) = 87000; GVAR(metal) = 140000; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large_HD), QGVAR(huge_HD), QGVAR(huge_HD), QGVAR(huge_HD)}; }; class BombCluster_01_Ammo_F: Bomb_04_F { @@ -137,7 +137,7 @@ class ammo_Bomb_SmallDiameterBase: ammo_Bomb_LaserGuidedBase { GVAR(charge) = 160; // kg GVAR(metal) = 113; // kg GVAR(gurney_c) = 2830; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD), QGVAR(large), QGVAR(large_HD), QGVAR(huge_HD), QGVAR(huge_HD)}; }; @@ -147,7 +147,7 @@ class Bo_Mk82: BombCore { GVAR(metal) = 140000; GVAR(charge) = 87000; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class Mo_cluster_AP: ShellBase { @@ -160,7 +160,7 @@ class Mo_cluster_Bomb_01_F: Mo_cluster_AP { // Mk 118 Rockeye GVAR(metal) = 400; GVAR(charge) = 180; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class Mo_cluster_Bomb_02_F: Mo_cluster_Bomb_01_F { // ShOAB-0.5 GVAR(classes)[] = {QGVAR(small_HD)}; @@ -188,7 +188,7 @@ class GrenadeHand: Grenade { GVAR(metal) = 210; // metal in grams GVAR(charge) = 185; // explosive in grams GVAR(gurney_c) = 2843; // Gurney velocity constant for explosive type. See: http://en.wikipedia.org/wiki/Gurney_equations - GVAR(gurney_k) = "3/5"; // Gurney shape factor, in this case a sphere. See: http://en.wikipedia.org/wiki/Gurney_equations + GVAR(gurney_k) = 3/5; // Gurney shape factor, in this case a sphere. See: http://en.wikipedia.org/wiki/Gurney_equations }; class mini_Grenade: GrenadeHand { GVAR(classes)[] = {QGVAR(tiny_HD)}; @@ -209,14 +209,14 @@ class G_40mm_HE: GrenadeBase { GVAR(metal) = 200; GVAR(charge) = 32; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "3/5"; // interior fragmenter/charge is a sphere + GVAR(gurney_k) = 3/5; // interior fragmenter/charge is a sphere }; class G_20mm_HE: G_40mm_HE { GVAR(classes)[] = {QGVAR(tiny_HD)}; GVAR(metal) = 50; GVAR(charge) = 8; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "3/5"; // interior fragmenter/charge is a sphere + GVAR(gurney_k) = 3/5; // interior fragmenter/charge is a sphere }; class G_40mm_HEDP: G_40mm_HE { // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433 @@ -224,7 +224,7 @@ class G_40mm_HEDP: G_40mm_HE { GVAR(metal) = 200; GVAR(charge) = 45; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class ACE_G_40mm_HEDP: G_40mm_HEDP {}; @@ -247,7 +247,7 @@ class APERSMine_Range_Ammo: MineBase { // VS-50 GVAR(metal) = 100; GVAR(charge) = 50; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/3"; + GVAR(gurney_k) = 1/3; }; class APERSBoundingMine_Range_Ammo: BoundingMineBase { @@ -257,7 +257,7 @@ class APERSBoundingMine_Range_Ammo: BoundingMineBase { GVAR(metal) = 80; GVAR(charge) = 170; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; }; class TrainingMine_Ammo: APERSMine_Range_Ammo { @@ -275,7 +275,7 @@ class APERSTripMine_Wire_Ammo: DirectionalBombBase { GVAR(metal) = 210; GVAR(charge) = 185; GVAR(gurney_c) = 2843; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; }; class IEDUrbanBig_Remote_Ammo: PipeBombBase { @@ -284,7 +284,7 @@ class IEDUrbanBig_Remote_Ammo: PipeBombBase { GVAR(metal) = 36000; GVAR(charge) = 9979; GVAR(gurney_c) = 2440; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; }; class IEDLandBig_Remote_Ammo: PipeBombBase { GVAR(skip) = 0; @@ -292,14 +292,14 @@ class IEDLandBig_Remote_Ammo: PipeBombBase { GVAR(metal) = 36000; GVAR(charge) = 9979; GVAR(gurney_c) = 2440; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; }; class IEDUrbanSmall_Remote_Ammo: PipeBombBase { GVAR(skip) = 0; GVAR(metal) = 23000; GVAR(charge) = 3148; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; GVAR(classes)[] = {QGVAR(small), QGVAR(medium_HD), QGVAR(medium_HD)}; }; class IEDLandSmall_Remote_Ammo: PipeBombBase { @@ -307,7 +307,7 @@ class IEDLandSmall_Remote_Ammo: PipeBombBase { GVAR(metal) = 23000; GVAR(charge) = 3148; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; GVAR(classes)[] = {QGVAR(small), QGVAR(medium_HD), QGVAR(medium_HD)}; }; @@ -320,7 +320,7 @@ class UXO1_Ammo_Base_F: APERSMine_Range_Ammo { // Mk 118 Rockeye GVAR(charge) = 180; GVAR(metal) = 400; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(small_HD)}; }; @@ -343,7 +343,7 @@ class ClaymoreDirectionalMine_Remote_Ammo: DirectionalBombBase { GVAR(metal) = 700; GVAR(charge) = 680; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; }; class SatchelCharge_Remote_Ammo: PipeBombBase { @@ -374,7 +374,7 @@ class R_PG7_F: RocketBase { GVAR(metal) = 100; GVAR(charge) = 560; GVAR(gurney_c) = 2730; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class R_PG32V_F: RocketBase { @@ -385,7 +385,7 @@ class R_TBG32V_F: R_PG32V_F { // Thermobaric GVAR(metal) = 400; GVAR(charge) = 210; GVAR(gurney_c) = 2800; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; GVAR(classes)[] = {QGVAR(medium_HD)}; }; @@ -394,14 +394,14 @@ class M_SPG9_HEAT: RocketBase { GVAR(metal) = 4150; GVAR(charge) = 340; GVAR(gurney_c) = 2970; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(small_HD), QGVAR(medium_HD)}; }; class M_SPG9_HE: M_SPG9_HEAT { GVAR(metal) = 4695; GVAR(charge) = 655; GVAR(gurney_c) = 2800; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(small_HD), QGVAR(tiny), QGVAR(medium_HD), QGVAR(medium_HD)}; }; @@ -411,7 +411,7 @@ class R_MRAAWS_HEAT_F: RocketBase { // Table A-20. HEAT 751 GVAR(metal) = 2265; GVAR(charge) = 635; GVAR(gurney_c) = 2970; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(small_HD)}; }; @@ -423,7 +423,7 @@ class R_MRAAWS_HE_F: R_MRAAWS_HEAT_F { // Table A-6. HE 441D RS GVAR(metal) = 2300; GVAR(charge) = 590; GVAR(gurney_c) = 2800; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; GVAR(classes)[] = {QGVAR(small_HD)}; }; @@ -432,7 +432,7 @@ class R_80mm_HE: RocketBase { // S-8D GVAR(charge) = 2150; GVAR(metal) = 1650; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(small_HD), QGVAR(tiny_HD), QGVAR(tiny)}; }; class R_60mm_HE: R_80mm_HE { // no idea but looks like a FFAR so made it weaker @@ -445,7 +445,7 @@ class m_70mm_saami: MissileBase { GVAR(charge) = 2150; GVAR(metal) = 1650; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(small_HD), QGVAR(tiny_HD), QGVAR(tiny)}; }; @@ -455,7 +455,7 @@ class Rocket_04_HE_F: MissileBase { // Shrieker (Hydra 70) GVAR(metal) = 3850; GVAR(charge) = 1040; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class Rocket_03_HE_F: Rocket_04_HE_F { // S-8DM makes the most sense GVAR(metal) = 1800; @@ -475,7 +475,7 @@ class R_230mm_fly: ShellBase { GVAR(charge) = 100; // kg GVAR(metal) = 150; // kg GVAR(gurney_c) = 2320; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; GVAR(classes)[] = {QGVAR(large_HD), QGVAR(large), QGVAR(large), QGVAR(large), QGVAR(huge_HD), QGVAR(huge_HD), QGVAR(huge)}; }; @@ -485,7 +485,7 @@ class M_PG_AT: MissileBase { // DAGR M247 warhead GVAR(charge) = 910; GVAR(metal) = 3085; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class M_AT: M_PG_AT { // DAR (Hydra 70) M151 warhead GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)}; @@ -502,7 +502,7 @@ class Missile_AGM_02_F: MissileBase { GVAR(metal) = 56250; GVAR(charge) = 39000; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class Missile_AGM_01_F: Missile_AGM_02_F { // Kh-25MTP !!! fix me }; @@ -514,7 +514,7 @@ class M_Titan_AA: MissileBase { GVAR(metal) = 1980; GVAR(charge) = 1020; GVAR(gurney_c) = 2501; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(tiny), QGVAR(tiny_HD), QGVAR(small_HD)}; }; class M_Titan_AT: MissileBase { @@ -525,7 +525,7 @@ class M_Titan_AP: M_Titan_AT { GVAR(metal) = 400; GVAR(charge) = 210; GVAR(gurney_c) = 2800; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; GVAR(classes)[] = {QGVAR(medium_HD)}; }; @@ -535,7 +535,7 @@ class M_Scalpel_AT: MissileBase { // 9K121 Vikhr GVAR(metal) = 10000; GVAR(charge) = 3000; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class ACE_Hellfire_AGM114K: M_Scalpel_AT { // Source: http://www.designation-systems.net/dusrm/m-114.html @@ -545,7 +545,7 @@ class ACE_Hellfire_AGM114K: M_Scalpel_AT { GVAR(metal) = 8000; GVAR(charge) = 2400; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class ammo_Missile_CruiseBase: MissileBase {}; @@ -555,12 +555,12 @@ class ammo_missile_cruise_01: ammo_Missile_CruiseBase { GVAR(metal) = 700000; GVAR(charge) = 110000; GVAR(gurney_c) = 2600; - GVAR(gurney_k) = "3/5"; + GVAR(gurney_k) = 3/5; }; class ammo_Missile_Cruise_01_Cluster: ammo_missile_cruise_01 {}; class ammo_Missile_AntiRadiationBase: MissileBase { - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(gurney_c) = 2400; }; class ammo_Missile_HARM: ammo_Missile_AntiRadiationBase { @@ -581,7 +581,7 @@ class M_Zephyr: M_Titan_AA { // model is an AMRAAM- WDU-41/B warhead GVAR(metal) = 12800; GVAR(charge) = 4000; GVAR(gurney_c) = 2900; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(tiny), QGVAR(medium_HD), QGVAR(small), QGVAR(small_HD)}; }; @@ -590,7 +590,7 @@ class M_Air_AA: MissileBase { // Looks not real, maybe r-73 inspired? GVAR(charge) = 2450; GVAR(metal) = 4950; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(tiny), QGVAR(medium_HD), QGVAR(small_HD), QGVAR(small_HD)}; }; @@ -599,7 +599,7 @@ class Missile_AA_04_F: MissileBase { GVAR(charge) = 4400; GVAR(metal) = 5000; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class Missile_AA_03_F: Missile_AA_04_F { GVAR(charge) = 2450; @@ -608,7 +608,7 @@ class Missile_AA_03_F: Missile_AA_04_F { }; class ammo_Missile_ShortRangeAABase: MissileBase { - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class ammo_Missile_rim116: ammo_Missile_ShortRangeAABase { GVAR(skip) = 0; @@ -634,7 +634,7 @@ class ammo_Missile_AA_R73: ammo_Missile_ShortRangeAABase { class ammo_Missile_MediumRangeAABase: MissileBase { GVAR(gurney_c) = 2900; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; }; class ammo_Missile_rim162: ammo_Missile_MediumRangeAABase { GVAR(skip) = 0; @@ -673,7 +673,7 @@ class M_Vorona_HE: M_Vorona_HEAT { GVAR(metal) = 13800; GVAR(charge) = 4950; GVAR(gurney_c) = 2800; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(tiny)}; }; @@ -702,7 +702,7 @@ class Sh_155mm_AMOS: ShellBase { GVAR(charge) = 9979; GVAR(metal) = 36000; GVAR(gurney_c) = 2440; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large), QGVAR(huge), QGVAR(huge_HD), QGVAR(huge)}; }; @@ -717,7 +717,7 @@ class Sh_120mm_HE: ShellBase { GVAR(charge) = 3148; GVAR(metal) = 23000; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(medium), QGVAR(medium_HD)}; }; class Sh_120mm_HEAT_MP: ShellBase { @@ -725,7 +725,7 @@ class Sh_120mm_HEAT_MP: ShellBase { GVAR(charge) = 2500; GVAR(metal) = 5000; GVAR(gurney_c) = 2500; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(small), QGVAR(medium), QGVAR(medium_HD), QGVAR(medium_HD)}; }; @@ -762,7 +762,7 @@ class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS { GVAR(metal) = 1950; GVAR(charge) = 15800; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = "1/2"; + GVAR(gurney_k) = 1/2; GVAR(classes)[] = {QGVAR(large), QGVAR(large_HD), QGVAR(large_HD), QGVAR(large_HD), QGVAR(huge_HD), QGVAR(huge_HD), QGVAR(huge_HD)}; }; class ammo_Penetrator_Base: ShellBase { diff --git a/addons/hot/CfgAmmo.hpp b/addons/hot/CfgAmmo.hpp index 6f91d241fb9..764cebc7c53 100644 --- a/addons/hot/CfgAmmo.hpp +++ b/addons/hot/CfgAmmo.hpp @@ -86,7 +86,7 @@ class CfgAmmo { EGVAR(frag,metal) = 7100; // 1000 steel balls EGVAR(frag,charge) = 4100; EGVAR(frag,gurney_c) = 2700; - EGVAR(frag,gurney_k) = "3/5"; + EGVAR(frag,gurney_k) = 3/5; EGVAR(frag,classes)[] = {"ACE_frag_small"}; displayName = CSTRING(hot2mp);