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

GM Frag Compat and Convertable Frags #599

Merged
merged 7 commits into from
Nov 17, 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
51 changes: 51 additions & 0 deletions addons/miscFixes/patchGM/CfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
class CfgAmmo {
/// Hand Grenades
class gm_HandGrenade_base;
class gm_HandGrenade_prac_base: gm_HandGrenade_base {
ACEGVAR(frag,skip) = 1;
};
class gm_HandGrenade_conc_base: gm_HandGrenade_base {
ACEGVAR(frag,skip) = 1;
ACEGVAR(frag,charge) = 0.06;
ACEGVAR(frag,metal) = 0.085;
ACEGVAR(frag,gurney_k) = 0.6;
ACEGVAR(frag,gurney_c) = 2930;
ACEGVAR(frag,classes)[] = {QACEGVAR(frag,tiny)};
ACEGVAR(frag,fragCount) = 300;
};
class gm_HandGrenade_frag_base: gm_HandGrenade_base {
ACEGVAR(frag,skip) = 0;
};
class gm_HandGrenade_frag_dm51: gm_HandGrenade_base {
ACEGVAR(frag,charge) = 0.06;
ACEGVAR(frag,metal) = 0.276;
ACEGVAR(frag,gurney_k) = 0.6;
ACEGVAR(frag,gurney_c) = 2930;
ACEGVAR(frag,classes)[] = {QACEGVAR(frag,tiny_HD), QACEGVAR(frag,tiny_HD), QACEGVAR(frag,small_HD)};
ACEGVAR(frag,fragCount) = 6500;
};
class gm_HandGrenade_frag_dm41: gm_HandGrenade_frag_base {
ACEGVAR(frag,charge) = 0.165;
ACEGVAR(frag,metal) = 0.21812;
ACEGVAR(frag,gurney_k) = 0.6;
ACEGVAR(frag,gurney_c) = 2700;
ACEGVAR(frag,classes)[] = {QACEGVAR(frag,tiny_HD), QACEGVAR(frag,tiny_HD), QACEGVAR(frag,small_HD)};
ACEGVAR(frag,fragCount) = 1200;
};
class gm_HandGrenade_frag_m26: gm_HandGrenade_frag_base {
ACEGVAR(frag,charge) = 0.165;
ACEGVAR(frag,metal) = 0.21812;
ACEGVAR(frag,gurney_k) = 0.6;
ACEGVAR(frag,gurney_c) = 2700;
ACEGVAR(frag,classes)[] = {QACEGVAR(frag,tiny_HD), QACEGVAR(frag,tiny_HD), QACEGVAR(frag,small_HD)};
ACEGVAR(frag,fragCount) = 1200;
};
class gm_HandGrenade_frag_rgd5: gm_HandGrenade_frag_base {
ACEGVAR(frag,charge) = 0.11;
ACEGVAR(frag,metal) = 0.2;
ACEGVAR(frag,gurney_k) = 0.6;
ACEGVAR(frag,gurney_c) = 2440;
ACEGVAR(frag,classes)[] = {QACEGVAR(frag,tiny_HD), QACEGVAR(frag,small_HD), QACEGVAR(frag,small_HD)};
ACEGVAR(frag,fragCount) = 350;
};
};
6 changes: 6 additions & 0 deletions addons/miscFixes/patchGM/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#define QQUOTE(var1) QUOTE(QUOTE(var1))
class Extended_PostInit_EventHandlers {
class ADDON {
init = QUOTE(call compileScript [QQUOTE(\z\potato\addons\miscFixes\patchGM\xeh_postInit.sqf)]);
};
};
14 changes: 14 additions & 0 deletions addons/miscFixes/patchGM/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
class CfgWeapons {
class gm_mp2a1_blk;
class gm_mp2a1_gld: gm_mp2a1_blk {
displayName = "MP2A1 9x19mm (Gold)";
magazines[] = {
"gm_32Rnd_9x19mm_b_DM51_mp2_blk",
"gm_32Rnd_9x19mm_b_DM11_mp2_blk",
"gm_32Rnd_9x19mm_ap_DM91_mp2_blk"
};
hiddenSelectionsTextures[] = {
"\gm\gm_weapons\gm_machinepistols\gm_mp2\data\gld\gm_mp2a1_ext_01_gld_co.paa"
};
};
};
59 changes: 59 additions & 0 deletions addons/miscFixes/patchGM/XEH_postInit.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#include "..\script_component.hpp"

if !(hasInterface) exitWith {};
// Modified from ace_grenades_fnc_addChangeFuseItemContextMenuOptions by Cyruz
{
_x params ["_concusion", "_frag"];
[
_concusion, "CONTAINER", "Attach frag jacket", [],
"\a3\ui_f\data\igui\cfg\simpletasks\types\destroy_ca.paa",
[{true}, {
params ["", "", "_item", "", "_grenadeType"];
_item == _grenadeType#0
}], {
params ["_unit", "", "", "_slot", "_grenadeType"];

private _container = switch (_slot) do {
case "UNIFORM_CONTAINER": {"uniform"};
case "VEST_CONTAINER": {"vest"};
case "BACKPACK_CONTAINER": {"backpack"};
default {""};
};

if (_container != "") then {
[_unit, _grenadeType#1, _container] call ACEFUNC(common,addToInventory);
};

false
}, true, [_concusion, _frag]
] call CBA_fnc_addItemContextMenuOption;

[
_frag, "CONTAINER", "Remove frag jacket", [],
"\a3\ui_f\data\igui\cfg\simpletasks\types\destroy_ca.paa",
[{true}, {
params ["", "", "_item", "", "_grenadeType"];
_item == _grenadeType#1
}],
{
params ["_unit", "", "", "_slot", "_grenadeType"];

private _container = switch (_slot) do {
case "UNIFORM_CONTAINER": {"uniform"};
case "VEST_CONTAINER": {"vest"};
case "BACKPACK_CONTAINER": {"backpack"};
default {""};
};

if (_container != "") then {
[_unit, _grenadeType#0, _container] call ACEFUNC(common,addToInventory);
};

false
}, true, [_concusion, _frag]
] call CBA_fnc_addItemContextMenuOption;
} forEach [
["gm_handgrenade_conc_dm51a1", "gm_handgrenade_frag_dm51a1"],
["gm_handgrenade_conc_dm51", "gm_handgrenade_frag_dm51"],
["gm_handgrenade_pracconc_dm58", "gm_handgrenade_pracfrag_dm58"]
];
24 changes: 22 additions & 2 deletions addons/miscFixes/patchGM/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,29 @@

class CfgPatches {
class ADDON {
weapons[] = {};
weapons[] = {
"gm_mp2a1_gld"
};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"potato_miscFixes",
"gm_structures_euro_80",
"gm_structures_euro_80_winter"
"gm_structures_euro_80_winter",
"gm_core_weapons",
"gm_weapons_ammo",
"gm_weapons_put",
"gm_weapons_throw",
"gm_weapons_launchers_fim43",
"gm_weapons_launchers_luna",
"gm_weapons_launchers_m72",
"gm_weapons_launchers_mlrs_110mm",
"gm_weapons_launchers_mlrs_122mm",
"gm_weapons_launchers_pzf3",
"gm_weapons_launchers_pzf44_2",
"gm_weapons_launchers_rpg7",
"gm_weapons_launchers_rpg18",
"gm_weapons_launchers_strela",
"gm_weapons_machinepistols_gm_mp2"
};
units[] = {
"land_gm_euro_bridge_02_20_mainroad",
Expand Down Expand Up @@ -37,4 +54,7 @@ class CfgPatches {
VERSION_CONFIG;
};
};
#include "CfgAmmo.hpp"
#include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"