Spearhead 1944 Compatibility #9292

BrettMayson · 2023-07-26T19:47:18Z

When merged this pull request will:

Add compatibility with SPE
SPE MGs use primaries, since CSW does not support this, the default behaviour is used (scroll menu actions)
Requires HEMTT 1.7.2

.hemtt/project.toml

optionals/compat_spe/CfgVehicles/turrets.hpp

… into compat_spe

- Ballistics Framework Finished (Infantry Weapons) - Wirecutter & Trench Framework Finished (Vests/Backpacks) - Explosives Framework Finished (Added backward support for IFA3 Detonator/Firecord) - Crew Served Weapons Framework Finished (Fixed Assemble/Disassemble)

optionals/compat_spe/CfgVehicles/wheeled.hpp

optionals/compat_spe/CfgWeapons/weapons.hpp

optionals/compat_spe/CfgMagazines/explosives.hpp

optionals/compat_spe/CfgMagazines.hpp

optionals/compat_spe/CfgVehicles/backpacks.hpp

optionals/compat_spe/CfgVehicles/tracked.hpp

optionals/compat_spe/CfgVehicles/wheeled.hpp

optionals/compat_spe/CfgWeapons/csw.hpp

optionals/compat_spe/CfgWeapons/helmets.hpp

optionals/compat_spe/CfgWeapons/launchers.hpp

optionals/compat_spe/config.cpp

optionals/compat_spe/script_version.hpp

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: ZluskeN <pontux@gmail.com>

PabstMirror · 2023-09-05T17:27:05Z

build may fail because updated .github/workflows/pboproject.yml won't take effect until after merge

addons/compat_spe/CfgWeapons/weapons.hpp

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

addons/compat_spe/CfgWeapons/helmets.hpp

… pr/9292

jonpas

This adds CSW and Hearing includes to base compats instead of sub-components.

jonpas · 2023-09-12T19:11:53Z

addons/compat_gm/script_component.hpp

+#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
+#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"


This causes a requirement on CSW and Hearing.

moved to config.cpp

How does that fix it? 🤔

CSW include should be in a sub-component. But I guess GM doesn't have one? Although I guess those are only needed for building?

How does that fix it? 🤔

Requirement is only there on building.

… pr/9292

jonpas · 2023-09-12T19:49:34Z

  Log P:\temp\compat_spe.packing.log tail:
    9262: rapWarning: **********missing file(s)***************
    9263: 
    9264: \z\ace\addons\compat_spe\compat_spe_explosives\config.cpp Rapify:rapWarning: **********missing file(s)***************

PabstMirror · 2023-09-12T19:51:27Z

will build ok on merge (changes to pboproject.yml don't take effect inside the pr)

veteran29 · 2023-09-15T20:11:03Z

addons/compat_spe/compat_spe_csw/CfgVehicles.hpp

+    class SPE_M1_81: SPE_US_Mortar_base {
+        class Turrets: Turrets {
+            class MainTurret: MainTurret {
+                magazines[] = {};


Why we're zeroing magazines array here? Won't this make the mortar unusable/empty, CSW compat does not need this IIRC?

Yeah, CSW shouldn't need this

csw was designed to be a runtime setting
so we shouldn't be doing this or fully removing actions (but we might have to modify them to be compat with csw)

class UserActions { delete Prepare_Illu_Selected;

maybe we just comment out

#include "CfgVehicles.hpp" #include "CfgWeapons.hpp"

for now and finish this sub-component up later

.hemtt/project.toml

disabled for now

BrettMayson and others added 10 commits July 9, 2023 08:59

compat(spe): initial

bf5587d

--changed csw/turrets

311df13

disable spe disassemble

879d347

csw: all mortars done

132114c

more cleanup

f59cf2f

add missing hearing protection

a5dc50b

final cleanup

288f822

goofed and removed too much

d9b5ce0

ok all done

3525937

formatting

f45bb2d

BrettMayson commented Jul 26, 2023

View reviewed changes

.hemtt/project.toml Outdated Show resolved Hide resolved

veteran29 self-requested a review July 26, 2023 20:26

remove adt

cdf4148

PabstMirror reviewed Jul 27, 2023

View reviewed changes

optionals/compat_spe/CfgVehicles/turrets.hpp Outdated Show resolved Hide resolved

Coldfront15 and others added 3 commits July 27, 2023 09:29

Merge branch 'compat_spe' of https://github.com/BrettMayson/ace-private…

38cf3f6

… into compat_spe

-+ updated frameworks

b2aa8ca

- Ballistics Framework Finished (Infantry Weapons) - Wirecutter & Trench Framework Finished (Vests/Backpacks) - Explosives Framework Finished (Added backward support for IFA3 Detonator/Firecord) - Crew Served Weapons Framework Finished (Fixed Assemble/Disassemble)

formatting

bce1936

jonpas added the area/compatibility label Aug 11, 2023

jonpas added this to the 3.16.0 milestone Aug 11, 2023

jonpas and others added 2 commits August 11, 2023 20:21

Require HEMTT v1.7.2

5ec151e

cleanup tabs / formating

9bf7535

PabstMirror reviewed Aug 17, 2023

View reviewed changes

optionals/compat_spe/CfgVehicles/wheeled.hpp Outdated Show resolved Hide resolved

PabstMirror reviewed Aug 17, 2023

View reviewed changes

optionals/compat_spe/CfgVehicles/wheeled.hpp Outdated Show resolved Hide resolved

ZluskeN suggested changes Aug 18, 2023

View reviewed changes

optionals/compat_spe/CfgWeapons/weapons.hpp Outdated Show resolved Hide resolved

optionals/compat_spe/CfgWeapons/weapons.hpp Outdated Show resolved Hide resolved

optionals/compat_spe/CfgWeapons/weapons.hpp Outdated Show resolved Hide resolved

veteran29 requested changes Aug 24, 2023

View reviewed changes

veteran29 reviewed Aug 24, 2023

View reviewed changes

optionals/compat_spe/CfgVehicles/wheeled.hpp Outdated Show resolved Hide resolved

veteran29 reviewed Aug 24, 2023

View reviewed changes

optionals/compat_spe/CfgVehicles/wheeled.hpp Outdated Show resolved Hide resolved

veteran29 requested changes Aug 24, 2023

View reviewed changes

optionals/compat_spe/config.cpp Outdated Show resolved Hide resolved

optionals/compat_spe/config.cpp Outdated Show resolved Hide resolved

optionals/compat_spe/script_version.hpp Outdated Show resolved Hide resolved

Apply suggestions from code review

0cfbf1e

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: ZluskeN <pontux@gmail.com>

jonpas changed the title ~~Compat: Spearhead 1944~~ Spearhead 1944 Compatibility Sep 5, 2023

rautamiekka suggested changes Sep 5, 2023

View reviewed changes

Apply suggestions from code review

ce7d40b

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

jonpas reviewed Sep 7, 2023

View reviewed changes

addons/compat_spe/CfgWeapons/helmets.hpp Outdated Show resolved Hide resolved

PabstMirror and others added 9 commits September 11, 2023 22:02

cleanup sten duplicate configs

3be80db

Merge branch 'compat_spe' of https://github.com/BrettMayson/ACE3 into…

08aa02b

… pr/9292

Merge branch 'master' into pr/9292

deb919d

move hearing to macro

4aa0cb1

fix macro repaclement

b03f00a

Use SUBADDON

a1c84ba

Move addonRootClass to bottom of CfgPatches

5dcd22a

Merge branch 'master' into compat_spe

819d5b3

Relative includes

2cbff44

jonpas reviewed Sep 12, 2023

View reviewed changes

PabstMirror added 2 commits September 12, 2023 14:40

move config macro includes to config.cpp

f9fa4d0

Merge branch 'compat_spe' of https://github.com/BrettMayson/ACE3 into…

b235b0f

… pr/9292

veteran29 previously requested changes Sep 15, 2023

View reviewed changes

veteran29 self-requested a review September 23, 2023 17:33

PabstMirror added 2 commits September 25, 2023 13:24

Merge branch 'master' into pr/9292

8b610b1

comment off csw changes for now

1d31246

PabstMirror reviewed Sep 25, 2023

View reviewed changes

.hemtt/project.toml Outdated Show resolved Hide resolved

Update .hemtt/project.toml

98cad41

PabstMirror approved these changes Sep 25, 2023

View reviewed changes

jonpas approved these changes Sep 25, 2023

View reviewed changes

PabstMirror merged commit d2f5c2d into acemod:master Sep 25, 2023

johnb432 mentioned this pull request Jul 25, 2024

ACE Spearhead 1944 Compatibility: Mortars not using Assembly & Ammunition Handling framework #9940

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spearhead 1944 Compatibility #9292

Spearhead 1944 Compatibility #9292

BrettMayson commented Jul 26, 2023 •

edited

Loading

PabstMirror commented Sep 5, 2023

jonpas left a comment

jonpas Sep 12, 2023

PabstMirror Sep 12, 2023

jonpas Sep 12, 2023

LinkIsGrim Sep 19, 2023

jonpas commented Sep 12, 2023

PabstMirror commented Sep 12, 2023

veteran29 Sep 15, 2023

LinkIsGrim Sep 19, 2023

PabstMirror Sep 23, 2023

		#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
		#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"

Spearhead 1944 Compatibility #9292

Spearhead 1944 Compatibility #9292

Conversation

BrettMayson commented Jul 26, 2023 • edited Loading

PabstMirror commented Sep 5, 2023

jonpas left a comment

Choose a reason for hiding this comment

jonpas Sep 12, 2023

Choose a reason for hiding this comment

PabstMirror Sep 12, 2023

Choose a reason for hiding this comment

jonpas Sep 12, 2023

Choose a reason for hiding this comment

LinkIsGrim Sep 19, 2023

Choose a reason for hiding this comment

jonpas commented Sep 12, 2023

PabstMirror commented Sep 12, 2023

veteran29 Sep 15, 2023

Choose a reason for hiding this comment

LinkIsGrim Sep 19, 2023

Choose a reason for hiding this comment

PabstMirror Sep 23, 2023

Choose a reason for hiding this comment

BrettMayson commented Jul 26, 2023 •

edited

Loading