Skip to content

Intercom - Improve Infantry Phone Limitations and add Custom Positions to Vanilla Vehicles #1306

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

Merged
merged 7 commits into from
Jul 3, 2024

Conversation

mrschick
Copy link
Contributor

@mrschick mrschick commented Dec 2, 2023

When merged this pull request will:

  • Hide Infantry Phone interaction on destroyed vehicles;
  • Return Infantry Phone when going unconscious;
  • Add Infantry Phone to Wheeled_APC_F class inheritors Vanilla Wheeled APCs;
  • Add Custom Infantry Phone position on Vanilla vehicles:
    • Wheeled_APC_F inheritors:
      • NATO AMV-7 Marshall (Badger IFV);
      • NATO Rhino MGS Tank Destroyer (Rooikat 120);
      • CSAT MSE-3 Marid (Otokar ARMA);
      • AAF AFV-4 Gorgon (Pandur II);
    • Tanks inheritors:
      • CSAT T-100X Futura;
      • CSAT T-140 Angara (T-14 Armata);
      • AAF AWC 301/304 Nyx (Wiesel 2);

Would previously only be hidden on vehicles with custom InfPhone positions.
Detects Vanilla Injured status too.
Custom position on:
- NATO AMV-7 Marshall;
- NATO Rhino MGS Tank Destroyer;
- CSAT MSE-3 Marid;
- AAF AFV-4 Gorgon;
@Drofseh
Copy link
Contributor

Drofseh commented Dec 2, 2023

Adding the infantry phone to Wheeled_APC_F should not be done.
This will create a ton of work to remove infantry phones from vehicles that should not have them.
For example, these are the CUP vehicles that inherit from Wheeled_APC_F and most if not all of them should not have an infantry phone.

class CUP_BRDM2_Base: Wheeled_APC_F
class CUP_BTR40_MG_Base: Wheeled_APC_F
class CUP_BTR60_Base: Wheeled_APC_F
class CUP_BTR80_Common_Base: Wheeled_APC_F
class CUP_BTR90_Base: Wheeled_APC_F
class CUP_Boxer_Base: Wheeled_APC_F
class CUP_GAZ_Vodnik_Base: Wheeled_APC_F
class CUP_LAV25_Base: Wheeled_APC_F
class CUP_Mastiff_Base: Wheeled_APC_F
class CUP_Ridgback_Base: Wheeled_APC_F
class CUP_StrykerBase: Wheeled_APC_F
class CUP_Wolfhound_Base: Wheeled_APC_F

@mrschick
Copy link
Contributor Author

mrschick commented Dec 2, 2023

I suspected there was a reason they didn't have InfPhones 🤔
Do most of those vehicles really not have infantryphones but do have crew /pax intercoms?

Either way, should be easy enough to work around by adding the full infantry phone config to each Vanilla APC class.

@mrschick
Copy link
Contributor Author

mrschick commented Dec 3, 2023

Should be good like this, on Wheeled_APC_F I defined Infantry Phone as disabled + other normal attributes to avoid having to duplicate them on every child class. That way it only has to be enabled and be set to custom position on each APC.
Tested it and without acre_hasInfantryPhone = 1; in a child class the vehicle has no Infantry Phone at all, as expected.

@Drofseh
Copy link
Contributor

Drofseh commented Dec 3, 2023

Do most of those vehicles really not have infantryphones but do have crew /pax intercoms?

99% of vehicles don't have infantry phones, even for tanks

@jonpas jonpas added this to the 2.13.0 milestone Jul 2, 2024
@jonpas jonpas requested a review from Mike-MF July 2, 2024 18:46
Copy link
Collaborator

@Mike-MF Mike-MF left a comment

Choose a reason for hiding this comment

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

Tested, didn't see any issues.

@jonpas jonpas merged commit 63a34eb into IDI-Systems:master Jul 3, 2024
@mrschick mrschick deleted the fix/intercom-improves branch July 3, 2024 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants