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

Jump to bottom

Add Global Mobilization Compatibility #7835

Merged
merged 5 commits into from
Oct 14, 2021
Merged

Add Global Mobilization Compatibility #7835

merged 5 commits into from
Oct 14, 2021

Conversation

nomisum
Copy link
Contributor

@nomisum nomisum commented Aug 2, 2020 •
edited
Loading

When merged this pull request will enable compatibility with Global Mobilization Vehicles

  • Fastroping Bo105 Swooper
  • Fastroping CH53
  • Fastroping Mi-2
  • Refuel, JerryCan
  • Static Medical Containers
  • Repair
  • Explosives
  • Dragging Crates , Jerrycan
  • Hearing Helmet Protection
  • mg overheating
  • vehicle ammo
  • launcher overpressure

Why Fuchs and K125 wheel repair is not working i have no idea. Was hoping for a 1.3 selectionName fix but that didnt help.

// things i wont do in this PR as no expertise in:

  • ammo/missile values
  • grenade adjustments
  • cfgGlasses
  • magazineGroups
  • cfgWeapons Barrel Length/Scope Stuff/Static Weapon Assembly

@Whigital
Copy link
Contributor

Whigital commented Aug 2, 2020

optionals, not addons

@nomisum
Copy link
Contributor Author

nomisum commented Aug 2, 2020

optionals, not addons

will change in last commit due to easier development (i asked the exact question in the ace slack how to approach developing for optionals)

@PabstMirror PabstMirror added this to the Ongoing milestone Aug 3, 2020
@Cyruz143
Copy link
Contributor

Cyruz143 commented Nov 14, 2020 •
edited
Loading

Note for me: Add dragging to GM crates

@nomisum
Copy link
Contributor Author

nomisum commented Nov 27, 2020

missing hitpointselectionstrings (fuchs + K125) are reported to GM devs and likely fixed in 1.3

@nomisum
Copy link
Contributor Author

nomisum commented Nov 27, 2020 •
edited
Loading

//explosives editor
gm_minestatic_ap_dm31
gm_minestatic_at_dm21
gm_minestatic_at_tm46
gm_minestatic_at_mn111

// explosives inventory item
gm_explosive_plnp_charge
gm_explosive_petn_charge
gm_mine_at_tm46
gm_mine_at_dm21
gm_mine_ap_dm31

// ammo
gm_mine_ap_base

gm_mine_at_base >> gm_mine_at_dm21
gm_mine_at_base >> gm_mine_at_tm46
gm_mine_at_base >> gm_mine_at_mn111
gm_mine_bounce_base >> gm_mine_ap_dm31

// medic items
gm_repairkit_01
gm_gc_army_medkit
gm_ge_army_gauzeCompress
gm_ge_army_gauzeBandage
gm_gc_army_gauzeBandage // ossis only have one bandage type lol
gm_ge_army_burnBandage

// draggable/carryable
gm_jerrycan
gm_barrel
gm_barrel_rusty

// repair shelter
gm_gc_army_shelterlakII_repair
gm_ge_army_shelteraceII_repair

// crates
gm_AmmoBox_10Rnd_smokeshell_org_dm32
gm_AmmoBox_10Rnd_smokeshell_yel_dm26
gm_AmmoBox_10Rnd_smokeshell_wht_dm25
gm_AmmoBox_10Rnd_smokeshell_red_dm23
gm_AmmoBox_10Rnd_smokeshell_grn_dm21
gm_AmmoBox_10Rnd_smokeshell_yel_gc
gm_AmmoBox_10Rnd_smokeshell_wht_gc
gm_AmmoBox_10Rnd_smokeshell_red_gc
gm_AmmoBox_10Rnd_smokeshell_org_gc
gm_AmmoBox_10Rnd_smokeshell_grn_gc
gm_AmmoBox_10Rnd_smokeshell_blu_gc
gm_AmmoBox_10Rnd_smokeshell_blk_gc
gm_AmmoBox_4Rnd_mine_at_tm46_put
gm_AmmoBox_4Rnd_mine_at_DM21_put
gm_AmmoBox_6Rnd_mine_ap_dm31_put
gm_AmmoBox_wood_05_empty
gm_AmmoBox_wood_04_empty
gm_AmmoBox_wood_04_empty
gm_AmmoBox_wood_03_empty
gm_AmmoBox_wood_02_empty
gm_AmmoBox_wood_01_empty
gm_AmmoBox_2500Rnd_9x19mm_b_DM11_mp2
gm_AmmoBox_2Rnd_84x245mm_illum_DM16_carlgustaf
gm_AmmoBox_2Rnd_84x245mm_heat_t_DM32_carlgustaf
gm_AmmoBox_2Rnd_84x245mm_heat_t_DM22_carlgustaf
gm_AmmoBox_2Rnd_84x245mm_heat_t_DM12a1_carlgustaf
gm_AmmoBox_800Rnd_762x54mmR_b_t_7t2_pk
gm_AmmoBox_280Rnd_762x53mm_b_7N1_svd
gm_AmmoBox_880Rnd_762x54mmR_api_7bz3_pk
gm_AmmoBox_1000Rnd_762x51mm_b_DM41_g3
gm_AmmoBox_480Rnd_762x51mm_b_t_DM21A1_mg3
gm_AmmoBox_1000Rnd_762x51mm_b_t_DM21A1_g3
gm_AmmoBox_1000Rnd_762x51mm_ap_DM151_g3
gm_AmmoBox_1000Rnd_762x51mm_b_DM111_g3
gm_AmmoBox_880Rnd_762x39mm_b_T_m43_ak47
gm_AmmoBox_880Rnd_762x39mm_b_M43_ak47
gm_AmmoBox_4Rnd_67mm_heat_dm22a1_g3
gm_AmmoBox_2160Rnd_545x39mm_b_t_7t3_ak74
gm_AmmoBox_2160Rnd_545x39mm_b_7N6_ak74
gm_AmmoBox_4Rnd_44x537mm_heat_DM32_pzf44_2
gm_AmmoBox_3Rnd_40mm_heat_pg7v_rpg7
gm_AmmoBox_20rnd_265mm_smoke_single_vlt_DM24
gm_AmmoBox_20rnd_265mm_smoke_single_org_DM22
gm_AmmoBox_20rnd_265mm_smoke_single_yel_DM19
gm_AmmoBox_20rnd_265mm_flare_para_yel_DM16
gm_AmmoBox_20rnd_265mm_smoke_single_yel_gc
gm_AmmoBox_20rnd_265mm_smoke_single_blu_gc
gm_AmmoBox_20rnd_265mm_smoke_single_blk_gc
gm_AmmoBox_20rnd_265mm_flare_multi_nbc_DM47
gm_AmmoBox_20rnd_265mm_flare_multi_wht_DM25
gm_AmmoBox_20rnd_265mm_flare_multi_red_DM23
gm_AmmoBox_20rnd_265mm_flare_multi_grn_DM21
gm_AmmoBox_20rnd_265mm_flare_multi_yel_DM20
gm_AmmoBox_20rnd_265mm_flare_single_wht_DM15
gm_AmmoBox_20rnd_265mm_flare_single_red_DM13
gm_AmmoBox_20rnd_265mm_flare_single_grn_DM11
gm_AmmoBox_20rnd_265mm_flare_single_yel_DM10
gm_AmmoBox_20rnd_265mm_flare_single_wht_gc
gm_AmmoBox_20rnd_265mm_flare_multi_red_gc
gm_AmmoBox_20rnd_265mm_flare_single_red_gc
gm_AmmoBox_20rnd_265mm_flare_single_grn_gc

// hearing helmets
// headset + ear
gm_ge_headgear_crewhat_80_blk
gm_ge_headgear_headset_crew_oli
gm_ge_headgear_beret_crew_red_antiair
gm_ge_headgear_beret_crew_blk_antitank
gm_ge_headgear_beret_crew_blk_armor
gm_ge_headgear_beret_crew_blk_armorrecon
gm_ge_headgear_beret_crew_red_artillery
gm_ge_headgear_beret_crew_red_engineer
gm_ge_headgear_beret_crew_red_maintenance
gm_ge_headgear_beret_crew_grn_mechinf
gm_ge_headgear_beret_crew_red_militarypolice
gm_ge_headgear_beret_crew_red_nbc
gm_ge_headgear_beret_crew_red_opcom
gm_ge_headgear_beret_crew_bdx_paratrooper
gm_ge_headgear_beret_crew_blk_recon
gm_ge_headgear_beret_crew_red_signals
gm_ge_headgear_beret_crew_red_supply
gm_ge_headgear_sph4_oli

// only ear
gm_gc_army_headgear_crewhat_80_blk
gm_pl_army_headgear_wz63_oli
gm_pl_army_headgear_wz63_net_oli
gm_gc_headgear_zsh3_wht
gm_gc_headgear_zsh3_blu
gm_gc_headgear_zsh3_orn

@nomisum nomisum marked this pull request as ready for review November 28, 2020 11:24
@nomisum
Copy link
Contributor Author

nomisum commented Nov 28, 2020

can be reviewed. will be moved to optionals when green light is given.

@Sparker95 Sparker95 mentioned this pull request Feb 14, 2021
Closed
@nomisum
Copy link
Contributor Author

nomisum commented Mar 10, 2021 •
edited
Loading

resolved conflicts.

ps: should i move to optionals now for merge-readiness or any more changes required?

jonpas
jonpas previously requested changes Apr 20, 2021
View reviewed changes
Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you split FastRoping and Refuel changes to separate PRs?

addons/compat_gm/CfgVehicles.hpp Outdated Show resolved Hide resolved
addons/compat_gm/config.cpp Outdated Show resolved Hide resolved
addons/compat_gm/functions/fnc_onCutRopes.sqf Outdated Show resolved Hide resolved
addons/compat_gm/functions/fnc_onDeployRopes.sqf Outdated Show resolved Hide resolved
addons/compat_gm/initSettings.sqf Outdated Show resolved Hide resolved
addons/compat_gm/functions/fnc_onCutRopes.sqf Outdated Show resolved Hide resolved
addons/compat_gm/CfgVehicles.hpp Outdated Show resolved Hide resolved
addons/compat_gm/CfgAmmo.hpp Outdated Show resolved Hide resolved
addons/compat_gm/CfgEventHandlers.hpp Outdated Show resolved Hide resolved
addons/compat_gm/CfgMagazines.hpp Outdated Show resolved Hide resolved
@nomisum
Copy link
Contributor Author

nomisum commented Apr 20, 2021

Could you split FastRoping and Refuel changes to separate PRs?

will do asap. thanks for the review! meanwhile as 1.3 was released there are new changes pending i need to implement anyway.

@jonpas
Copy link
Member

jonpas commented Apr 20, 2021

Awesome, will be easier to review separately and get them merged faster.

@nomisum nomisum mentioned this pull request Jun 28, 2021
Open
Fusselwurm pushed a commit to Fusselwurm/ACE3 that referenced this pull request Oct 13, 2021
@nomisum @jonpas @Fusselwurm
GM Compat
4ca9f63 
add GM Compat addon - it's acemod#7835 without fastroping & refuel changes

Co-authored-by: jonpas <jonpas33@gmail.com>
nomisum and others added 2 commits October 13, 2021 11:10
@nomisum @jonpas @Fusselwurm
GM Compat
419065e 
add GM Compat addon - it's acemod#7835 without fastroping & refuel changes
* plus compat_gm moved into optionals
* plus a few whitespace fixes

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>
@Fusselwurm
add ACE CSW dep (see script_component.hpp)
5c275ee
@Fusselwurm
Copy link
Contributor

removed refuel & fastroping changes.
rebased, squashed, bunch of whitespace fixes, moved to optionals, added ACE csw dependency to config

@veteran29
Copy link
Member

Could you add CfgSettings entry so players will be notified they should load the compat:
https://github.com/acemod/ACE3/blob/master/addons/main/CfgSettings.hpp#L18

@Fusselwurm
Copy link
Contributor

Could you add CfgSettings entry so players will be notified they should load the compat: https://github.com/acemod/ACE3/blob/master/addons/main/CfgSettings.hpp#L18

fancy! done.

@PabstMirror PabstMirror modified the milestones: Ongoing, 3.14.0 Oct 13, 2021
@jonpas jonpas changed the title GM Compat Add Global Mobilization Compatibility Oct 13, 2021
@PabstMirror PabstMirror merged commit 7009404 into acemod:master Oct 14, 2021
@Fusselwurm Fusselwurm deleted the gm-compat branch October 14, 2021 21:19
@sancron sancron mentioned this pull request Oct 21, 2021
Closed
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
@nomisum @jonpas
@Fusselwurm @PabstMirror @AndreasBrostrom
Add Global Mobilization Compatibility (acemod#7835)
8f4b3d7 
* GM Compat

add GM Compat addon - it's acemod#7835 without fastroping & refuel changes
* plus compat_gm moved into optionals
* plus a few whitespace fixes

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>

* add ACE CSW dep (see script_component.hpp)

* warn about missiong compat_gm if GM is loaded

* move medic tents to EGVAR(medical,facilities) array thing

* add pDumbs

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mharis001 mharis001 mharis001 approved these changes

@PabstMirror PabstMirror PabstMirror approved these changes

@veteran29 veteran29 veteran29 approved these changes

@jonpas jonpas Awaiting requested review from jonpas

Assignees
No one assigned
Labels
area/compatibility
Projects
None yet
Milestone
3.14.0
Development

Successfully merging this pull request may close these issues.
8 participants
@nomisum @Whigital @Cyruz143 @jonpas @Fusselwurm @veteran29 @PabstMirror @mharis001