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

A tiny pr now with combined factions #307

Merged
merged 92 commits into from
Sep 25, 2024

Conversation

wersal454
Copy link

@wersal454 wersal454 commented Aug 30, 2024

What type of PR is this?

  1. Bug
  2. Change
  3. Enhancement
  4. Miscellaneous

What have you changed and why?

Information:
continuation of #279

Added SOG and SPE content for vanilla factions
Moved dlc content to specialized directories containing all content that used in different templates
Moved variants and animations for vehicles in their own directories, so depending on what faction you are making if you using vehicles from dlcs and/or vanilla, you can simply include those files and it would apply desired camo and randomized customization
Changed logic for picking helmets for friendly AI, now AI will equip random helmets if their "armor" points are below 5
Added Mod content directory(mostly same as DLC content) with CUP AAF example
Added CUP AAF content to Vanilla AAF

contains fixes for that PR + Added combined vanilla factions

CSAT&AAF -

Canton Protocol Strategic Alliance Treaty and Altis Armed Forces (CSAT and AAF). After NATO forces took over Altis archipelagos, AAF stroke deal with CSAT to return control of their islands, but at the cost of becoming their puppets and dragging their nation in the bigger conflict.

NATO&AAF -

North Atlantic Treaty Organization and Altis Armed Forces (NATO and AAF). After brutal civil war, Altis government and militiraly were left in ruin. After negotiations with NATO, AAF will receive requested support, but at the cost of their autonomy.

NATO&LDF (both Arid and Temperate) -

North Atlantic Treaty Organization and Livonian Defense Force (NATO and LDF). After successful combined training in Livonia, tension between CSAT and NATO increased. LDF decided to let NATO build more of their bases to increase their chances if their eastern neighbor will make it's move.

Ported official-antistasi-community#3335

Please specify which Issue this PR Resolves (If Applicable).

"This PR closes #XXXX!"

Please verify the following.

  1. Have you loaded the mission in LAN host?
  2. Have you loaded the mission on a dedicated server?

Is further testing or are further changes required?

  1. No
  2. Yes (Please provide further detail below.)

Notes:

Big thanks to @UAC-MaxxLite for making flags and markers and thanks to @Ravenholme for providing support considering lore stuff

@wersal454 wersal454 mentioned this pull request Aug 30, 2024
8 tasks
@wersal454
Copy link
Author

NATO&UNA

North Atlantic Treaty Organization and United Nations Agency (NATO and UNA). After a series of attacks on UN peacekeepers within the Sefrou-Ramal region, some of which were seemingly perpetrated by elements of the SFIA, it was agreed that a NATO task force would provide support to ensure the safety of aid workers and UN staff in the region.

CSAT&SFIA

Canton Protocol Strategic Alliance Treaty and Sefrawi Freedom and Independence Army (CSAT and SFIA).After recent attacks by Tura forces on SFIA military bases and increasing presence of NATO forces to oversee UN peacekeeping operations, a decision was made by the Arganan government to station CSAT forces in Sefrou-Ramal to bolster regional security.

@wersal454
Copy link
Author

Ported over official-antistasi-community#3335 to fix CUP & IFA planes turn rates

@SilenceIsFatto
Copy link
Owner

Add any community links to your original posts by editing them, will prevent it being forgotten when pulls are merged

wersal454 and others added 4 commits September 10, 2024 17:47
commit a272834
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sun Sep 15 22:47:36 2024 +0300

    fixed helmetLossChance not working (official-antistasi-community#310)

commit ede762d
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sun Sep 15 22:47:34 2024 +0300

    Building box (official-antistasi-community#309)

    * Buildabls fix/update

    * Buildable fix/update

    * buildables update/fix

    * updated build boxes to fit scale

    * updated signs

    * updated build box

    * removed unused content

commit 91bf0a3
Author: Silence <78276788+SilenceIsFatto@users.noreply.github.com>
Date:   Sun Sep 15 20:47:32 2024 +0100

    Community 3.7.0 updates (official-antistasi-community#291)

    * Community 3.7.0 updates

    official-antistasi-community#3327
    official-antistasi-community#3359
    official-antistasi-community#3362
    official-antistasi-community#3367
    official-antistasi-community#3370

    * Tank platoon support

    * Fix attackForceLand
@stutpip123
Copy link
Collaborator

this is so massive idk if we can do anything without just merging and pray it doesnt break too much.
its been in the testingbranch and not caused issues as far as can tell

@stutpip123 stutpip123 merged commit 22ea256 into SilenceIsFatto:unstable Sep 25, 2024
@SilenceIsFatto SilenceIsFatto mentioned this pull request Oct 7, 2024
8 tasks
@SilenceIsFatto
Copy link
Owner

I've reverted the equipmentClassToCategories change as it was causing helmets to be unlocked by default, if you can find a way to do the AI pick change without that bug then open another PR

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.

3 participants