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

Compat GM - Fix inheritance and add GM stringtable entries to display names #10256

Merged
merged 4 commits into from
Aug 26, 2024
Merged

Compat GM - Fix inheritance and add GM stringtable entries to display names #10256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9740f2
Fixed inheritance on PETN and PLNP
lambdatiger Aug 25, 2024
2b03c44
Added GM's localization strings
lambdatiger Aug 25, 2024
678ca56
adds required addons
lambdatiger Aug 25, 2024
ed7145e
one of my testing scripts added forward slashes that aren't/aren't re…
lambdatiger Aug 25, 2024
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
7 changes: 4 additions & 3 deletions addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
class CfgAmmo {
class PipeBombBase;
class gm_explosive_petn_charge: PipeBombBase {
class gm_explosive_petn_base;
class gm_explosive_charge_petn: gm_explosive_petn_base {
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
};
class gm_explosive_plnp_charge: PipeBombBase {
class gm_explosive_plnp_base;
class gm_explosive_charge_plnp: gm_explosive_plnp_base {
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
};

Expand Down
12 changes: 6 additions & 6 deletions addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class CfgVehicles {

// CHARGE
class EGVAR(explosives,Place_gm_explosive_petn): EGVAR(explosives,Place) {
displayName = "PETN Charge";
displayName = "$STR_DN_GM_EXPLOSIVE_PETN_CHARGE";
model = "gm\gm_weapons\gm_put\gm_explosive_charge_petn";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
Expand All @@ -18,7 +18,7 @@ class CfgVehicles {
};
};
class EGVAR(explosives,Place_gm_explosive_plnp): EGVAR(explosives,Place) {
displayName = "PLNP Charge";
displayName = "$STR_DN_GM_EXPLOSIVE_PLNP_CHARGE";
model = "gm\gm_weapons\gm_put\gm_explosive_charge_plnp";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
Expand All @@ -28,7 +28,7 @@ class CfgVehicles {
};
// AT MINE
class EGVAR(explosives,Place_gm_mine_tm46): EGVAR(explosives,Place) {
displayName = "AT Mine TM46";
displayName = "$STR_DN_GM_MINE_AT_TM46";
model = "gm\gm_weapons\gm_put\gm_mine_at_tm46";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
Expand All @@ -37,7 +37,7 @@ class CfgVehicles {
};
};
class EGVAR(explosives,Place_gm_explosive_dm21): EGVAR(explosives,Place) {
displayName = "AT Mine DM21";
displayName = "$STR_DN_GM_MINE_AT_DM21";
model = "gm\gm_weapons\gm_put\gm_mine_at_dm21";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
Expand All @@ -46,7 +46,7 @@ class CfgVehicles {
};
};
class EGVAR(explosives,Place_gm_explosive_m111): EGVAR(explosives,Place) {
displayName = "MN 111";
displayName = "$STR_DN_GM_MINE_AT_MN111";
model = "gm\gm_weapons\gm_launchers\gm_platan\gm_mine_at_mn111_disarmed";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
Expand All @@ -56,7 +56,7 @@ class CfgVehicles {
};
// AP
class EGVAR(explosives,Place_gm_explosive_dm31): EGVAR(explosives,Place) {
displayName = "AP Mine DM31";
displayName = "$STR_DN_GM_MINE_AP_DM31";
model = "gm\gm_weapons\gm_put\gm_mine_ap_dm31";
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
Expand Down
1 change: 1 addition & 0 deletions addons/compat_gm/compat_gm_explosives/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class CfgPatches {
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"gm_core",
"gm_weapons_put",
"ace_explosives"
};
skipWhenMissingDependencies = 1;
Expand Down