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.

Sign up for GitHub

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

Frag - de-quote number #10521

Merged
merged 1 commit into from
Nov 23, 2024
+100 −100
Merged

Frag - de-quote number #10521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions addons/compat_rhs_afrf3/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions addons/compat_rhs_usf3/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions addons/compat_spe/CfgAmmo/bombs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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"};
};
46 changes: 23 additions & 23 deletions addons/compat_spe/CfgAmmo/explosives.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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 {
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
Expand All @@ -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};
};
22 changes: 11 additions & 11 deletions addons/compat_spe/CfgAmmo/grenades.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {};
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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"};
};

Expand Down
Loading