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

Auto return leader role #298

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Conversation

wersal454
Copy link

@wersal454 wersal454 commented Aug 25, 2024

What type of PR is this?

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

What have you changed and why?

Information:

While using ACE, if group leader goes unconscious and manages to wake up, he will gain group leader status automatically

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

"This PR closes #244 "

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.)

How can the changes be tested?

Steps:


Notes:

Copy link
Owner

@SilenceIsFatto SilenceIsFatto left a comment

Choose a reason for hiding this comment

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

seems fine

@SilenceIsFatto SilenceIsFatto added misc A miscellaneous change ready-for-merge Use for the AUC bot to allow it to merge everything at once when needed. labels Aug 27, 2024
@AUC-bot AUC-bot merged commit ccc0a46 into SilenceIsFatto:unstable Aug 30, 2024
@SilenceIsFatto SilenceIsFatto mentioned this pull request Aug 30, 2024
8 tasks
SilenceIsFatto added a commit that referenced this pull request Aug 30, 2024
* Port and MilBuildings

* roadblocks

* Update mission.sqm

* WW2 MilBuildings + Staszow redo

* update staszow

* Tobruk update

* Spearhead Milbuildings

* Update description.ext

* Update script_version.hpp

* Update linked page

* CWR trader rework

* Add RU translations for black market

* Yulakia and Phuoc Tuy whiteboard images

* Update fn_initVarCommon.sqf

* Yulakia Fixes

* switch modern HMG to older model

* Phuoc Tuy Improvements

more outposts, seaports, another staticMG milbuilding for said areas

* fix CWR FIA Mosin Ammo

* add milbase to yulakia

* Disable Towns + Add More Zones

* USSR Flag

* Fix CWRIII weapon stock

* Update cfgTraderAddons.hpp

* Remove non-existent weapon entries

* Continuing #204

* yulakia outpost 29 move flag

* Phuoc Tuy Invader Bases

* Dropdown menu for selection

* Gulfcoast Islands Map

Port to AU of Gulfcoast Islands map

* Update mission.sqm

Added more seaAttackSpawn, seaPatrol, seaSpawn & control markers across the map.

Added a SAM markers to Gasparilla Airbase (airport_1) and Rotonda East (airport_6)

Disabled simulation on multiple entities/buildings.

* Map Update

ADDED:
- A military base (milbase_5)
- One additional outpost (outpost_22) (mightve added another dont remember)
- Additional 4-6 resource nodes
- Added buildings to: outpost_19, milbase_2, milbase_3

 MODIFIED:
- Moved locations of two factories (factory_4, factory_5)
- Fixed a couple of marker names
- Cleaned up sea markers (reduced/moved)

* Fix spartan radio backpack

* Add forbiddenItems checks

* Update cfgForbiddenItems.hpp

* Handle nil cost

* Allow forbidden items to be sold correctly

* 3AS Update v0.00.48

* 3AS Update v0.00.48 Arms Dealer

* Remove testing forbiddenItem

* Rename saves from AntistasiPlus to AntistasiUltimate

* Update mission.sqm

Updated building locations in Rassa Airport Military Base to account to default placed helipads

Removed Hide Terrain Object from Rassa Speedway Outpost as well as helipad to make way for default

Deleted Grenadier and Autorifleman lobby roles and in turn slimmed down player slots from 41 to 27.

* Send chat message when downed

* Playtest Patch 1

Patch 1 for playtest issue comment

* Log when vehicle type is unlocked in dealer

* Replace community HQ with Plus type HQ

* Save/load revealed zones

* Remove log message

* Invader return framework

* vanilla LL mortar fix

* Remove template blackMarketStock

* WW2 Objective Trucks

* save/load unlocked vehicle types

* notify when vehicles are unlocked

* Adjustments + fixes

* Update trader unlock conditions

* Update Stringtable.xml

fix ru localization

* OPTRE and SW gunships + attack UAVs added to spawn pool

* no vaping in WW2

* western sahara update 1.1.3

* western sahara update 1.1.3

* Update WS_Riv_ION.sqf

* western sahara update 1.1.3

* western sahara update 1.1.3

* western sahara update 1.1.3

* Update Vanilla_Reb_FIA.sqf

* Update mission.sqm

Replace Corrections Facility resource node for a outpost node, and added a Seaport south of it.

Hid protruding alignment lights at Rassa Airport.
Hid trees obstructing Onion Airbase's eastern landing strip making landing a little easier.

* Enable hacking parameter

* Something to hack

* Staszow Update Again

* Update RU translations

* Delete A3A/addons/launchMissile.sqf

* blah

* Update blackMarketDialog.hpp

* Update fn_blackMarketDialog.sqf

* bebe

* Fix Floating Buildings

* FIXED

* Display self-revive cooldown in unconscious state

* Add black market weapons isNil checks

* Use the _unit variable for consistency

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* FIX for empty space

* Fix self-revive cooldown doesn't disappear when respawn

* Using A3A_fnc_customHint instead hintSilent

* Removed unnecessary code

* Prevent customHint sound spamming

* Update A3A/addons/core/Params.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* make markersImmune a publicVariable

* update version

* Update Stringtable.xml

* Fix duplicate vehicle from conflict resolution

* Fix the broken marker(marker no more)) + fix for empty category

* East and West militia factions

* Fix type array expected string in resourcecheck

* Update EM guns

* Update Vanilla.hpp

* Update GM.hpp

* Updated militia flags

* Create GM

* Update GM.hpp

* kill mutant mission

* Smasher mission updates, infestation mission

* Attack heli for smasher + zombie infestation fix

* Extra safety checks

* part 1 ?

* Smasher fnc restructuring, zombie conquest mission

* DME, ODST, UNSC, Covenant alternative

* SOG noinsignia variants

* finished SOG config

Somevehicles missing, cause there is no way of making their variants(or I didn't found one)

* Extra checks for unlocked vehicles

* Update fn_resourcecheck.sqf

* Ability to donate less than 250

* Attack on return

* OPFOR insurrectionist faction

* A little update to SOG and SPE

* Add default sell price for rival vehicles

* spe cargo and nodes

* Create CSLA

* working version

* Fix misplaced commas

* Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Remnants.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Riv_Remnants.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update CSLA_Riv_Separatists.sqf

* Update conditions (+ vehicles) (#264)

* Update infestation and conquest zombie mission (#265)

* Update infestation and conquest mission

* GC update

* Update fn_spawnZombieWaves.sqf

* Missing comma fix

* Replace USA vehicles in CUP BAF templates (#268)

* Replace USA vehicles

* whoops, got them backwards lol

* Fix wrong return from getOrDefault in fn_createAIAirplane.sqf (#269)

* Fix wrong return from getOrDefault

* More default return fixes

* M26 Pershing to USA WW2 Templates

not included in arid due to M26 only being used in Europe near end of war and camo not fitting

* WW2 Tanks + Armoured Cars UK

Daimler, T17E1 and Valentine to appropriate UK WW2 templates

* WW2 Tanks + Armoured Cars WEH

added vehicles to IFA and FoW Wehrmacht templates, CSA38 templates already have similar model of the vehicles so no point duplicating

* WW2 Tanks + Armoured Cars SOV

added vehicles to IFA Soviet templates. NFtS has no need, already has these vehicles

* Allies Templates

combined UK + USA templates, UK Militia and SF, USA Military and Elite

* Re-add King Tiger

now with the IS-2 and Pershing possible, the King Tiger should be less OP (RIP UK faction, no heavy for you)

* SPE v1.1.0, SPE_IFA Templates

Add new vehicles and weapons to SPE_IFA templates

* Spearhead Standalone Templates

* fix mistakes

* C-47 Mega Pack

still need a transport plane so this will have to do.
regardless a huge improvement not to need all of IFA3 and CUP Terrains Core

* Truck and Jeep Nodes

* Node Seats

* Update Arms Store

* Update SPE Vehicle Dealer

* Mortain Map Port

* Add M24 Chaffee optional to SPE Templates

https://steamcommunity.com/sharedfiles/filedetails/?id=3301951691
Added to SPE USA and SPE_IFA USA

* Update mission.sqm

* Update GM_Reb with new uniforms

Replace 2035 uniforms, backpacks, facewear with GM classes

* SPE German and French Voices

* SPEX Boat Support

* Discord Rich Presence Fixes

fixed issues with discord rich presence and added missing information

* Update fn_misc_getWorldName.sqf

* fixxed an oppsie

* Fix missing ] in SPE/IFA templates

* Update script_version.hpp

* fix IFA Pol starting grenade

* Update CSA_Reb_CZE.sqf

* misc changes

* Small fixes

* added perm - helmetLossSound

* Readability fix

* updated builderbox

* comment out instead of delete

* Update fn_buildingPlacer.sqf

* Update A3A/addons/maps/BuildObjectsList.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Syntax Errors

* fixed skill issues

* cDLC Buildable list update

* PreBuilt interaction place holders

* Mortain whiteboard

* Cup LRI Rebel Faction (#276)

* Lri fix

* blacklist update

* Update A3A/addons/ultimate/config/cfgForbiddenItemsClient.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/Templates/Templates/CUP/CUP_Reb_LRI.sqf

* Update A3A/addons/core/CfgMarkers.hpp

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Fix for spectrum device hacking working only for JIP & and cruise missile only in unfair (#278)

* fix for spectrum device hacking JIP

* spawn cruise missile only at war level 6 and higher

* cruise missile in unfair supports

* Update A3A/addons/core/functions/Supports/fn_SUP_cruiseMissileAvailable.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Increase of probability of cruisemissile support

(at least I think it does that)

* comment fix

* change "TARGET" to "AREA" for CM support

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Vehicles spawn logic (#281)

* airbase spawn logic

* Uncomment retaliatory minefields

* vehicles basic to outpost spawn pool

* more vehicle types for patrol

* enable vn dynamic music NEEDS TESTING

* fix

* Pulau map port (#284)

* Pulau Map Port

* Fix HBarrier Bunkers/Towers

* CW Additional Planes (LargeCAS and LargeAA) (#288)

* Initial figuring out of adding new category

trying to add vehiclesPlaneLargeAA and vehiclesPlaneLargeCAS, with intention to be used in all places normal equivalents used, except spawning in hangars

* more variables

* planeLoadouts

* ASF, CAS + CASDive

* PlaneLoadouts

* Update EnemyDefaults.sqf

* CIS and Empire LargeAA and LargeCAS

* Increase Vulture chance

more entries of Vulture fighter should increase odds of use, as other planes are republic placeholders as only viable for hangars

* Squashed commit of the following:

commit 37b1f7c
Merge: bd353e4 2b0b806
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Wed Aug 21 21:31:56 2024 +0300

    Merge pull request #289 from SilenceIsFatto/Maxx

    Builder Box Expansion

commit 2b0b806
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Wed Aug 21 21:31:24 2024 +0300

    PreBuilt interaction place holders

commit 9041e61
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Wed Aug 21 17:16:51 2024 +0300

    cDLC Buildable list update

commit bd78fd4
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Wed Aug 21 09:12:25 2024 +0300

    fixed skill issues

commit 7929eed
Merge: 2af1b53 8b36ab1
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 20:56:25 2024 +0300

    General Readability

commit 2af1b53
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 20:48:38 2024 +0300

    Syntax Errors

commit 8b36ab1
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 20:11:27 2024 +0300

    Update A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp

    Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

commit 7c72445
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 20:10:30 2024 +0300

    Update A3A/addons/maps/BuildObjectsList.hpp

    Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

commit 24a0b0f
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 19:56:42 2024 +0300

    Update fn_buildingPlacer.sqf

commit 93a4386
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 19:55:26 2024 +0300

    comment out instead of delete

commit f762249
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 19:48:17 2024 +0300

    updated builderbox

* 3AS Update

* Update fn_SUP_airstrike.sqf

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Flying Legends  (#292)

* Flying Legends Vehicle Dealer

* Flying Legends WEH Template Updates

* Update CSA_AI_WEH_Arid.sqf

* Flying Legends SOV

* Flying Legends UK

* Flying Legends USA

* USA Cont

* Flying Legends Allies

* Secret Weapons Arms Dealer

Secret Weapons expansion for Flying Legends, arms dealer list

* Secret Weapons Template Optionals

* Allies & SPE_IFA FlyingLegends & Secret Weapons Optionals

* Naval Legends Arms Dealer

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Madrigal City enrichment (#294)

* auto return leader role (#298)

* Mehland Port (#304)

* Mehland Port

* Discord rp-sat map

---------

Co-authored-by: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Svartmarka Map Port (#277)

* Svartmarka Map Port

Chernarus but WW2
https://steamcommunity.com/sharedfiles/filedetails/?id=1630816076

* Svartmarka Winter

* Update whiteboard.jpg

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update script_version.hpp

---------

Co-authored-by: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Co-authored-by: traditional <katzepvp@gmail.com>
Co-authored-by: traditional <38315957+lanoitidart@users.noreply.github.com>
Co-authored-by: Antistasi Ultimate Community Bot <admin@antistasiultimate.com>
Co-authored-by: wersal454 <wroma@bk.ru>
Co-authored-by: staysane0 <jiviandrew@gmail.com>
Co-authored-by: dayrain <blackwaterbread@gmail.com>
Co-authored-by: vasbyt <mattjackson128@gmail.com>
Co-authored-by: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
SilenceIsFatto added a commit that referenced this pull request Oct 7, 2024
* Update conditions (+ vehicles) (#264)

* Update infestation and conquest zombie mission (#265)

* Update infestation and conquest mission

* GC update

* Update fn_spawnZombieWaves.sqf

* Update A3A/addons/core/functions/Missions/fn_missionRequest.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/CREATE/fn_createAttackForceMixed.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update fn_createAttackForceOrbital.sqf

* Missing comma fix

* Replace USA vehicles in CUP BAF templates (#268)

* Replace USA vehicles

* whoops, got them backwards lol

* Fix wrong return from getOrDefault in fn_createAIAirplane.sqf (#269)

* Fix wrong return from getOrDefault

* More default return fixes

* M26 Pershing to USA WW2 Templates

not included in arid due to M26 only being used in Europe near end of war and camo not fitting

* WW2 Tanks + Armoured Cars UK

Daimler, T17E1 and Valentine to appropriate UK WW2 templates

* WW2 Tanks + Armoured Cars WEH

added vehicles to IFA and FoW Wehrmacht templates, CSA38 templates already have similar model of the vehicles so no point duplicating

* WW2 Tanks + Armoured Cars SOV

added vehicles to IFA Soviet templates. NFtS has no need, already has these vehicles

* Allies Templates

combined UK + USA templates, UK Militia and SF, USA Military and Elite

* Re-add King Tiger

now with the IS-2 and Pershing possible, the King Tiger should be less OP (RIP UK faction, no heavy for you)

* Working stuff

* SPE v1.1.0, SPE_IFA Templates

Add new vehicles and weapons to SPE_IFA templates

* Spearhead Standalone Templates

* fix mistakes

* C-47 Mega Pack

still need a transport plane so this will have to do.
regardless a huge improvement not to need all of IFA3 and CUP Terrains Core

* NATO arid

* Truck and Jeep Nodes

* Node Seats

* Update Arms Store

* Update SPE Vehicle Dealer

* Mortain Map Port

* Add M24 Chaffee optional to SPE Templates

https://steamcommunity.com/sharedfiles/filedetails/?id=3301951691
Added to SPE USA and SPE_IFA USA

* Update mission.sqm

* Update GM_Reb with new uniforms

Replace 2035 uniforms, backpacks, facewear with GM classes

* SPE German and French Voices

* SPEX Boat Support

* Discord Rich Presence Fixes

fixed issues with discord rich presence and added missing information

* Update fn_misc_getWorldName.sqf

* fixxed an oppsie

* Change isNil check

May fix #267

* Fix missing ] in SPE/IFA templates

* Update script_version.hpp

* dlc content rework

* SPE planes no insignia support

* Update fn_initServer.sqf

* fix IFA Pol starting grenade

* Update CSA_Reb_CZE.sqf

* remove comments

* remove comments

* misc changes

* SPE 1.1 content

* fixies

* fixes

* owner check fix

* Small fixes

* Update A3A/addons/core/functions/CREATE/fn_createAttackForceOrbital.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/CREATE/fn_createVehicleQRFBehaviour.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite_Satellite.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite_Satellite.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/CREATE/fn_createVehicleQRFBehaviour.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* added perm - helmetLossSound

* AC47 gunship from 3CB

* working version

* Readability fix

* even better working version

* update

* updated builderbox

* comment out instead of delete

* Update fn_buildingPlacer.sqf

* Update A3A/addons/maps/BuildObjectsList.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Syntax Errors

* fixed skill issues

* cDLC Buildable list update

* PreBuilt interaction place holders

* Madrigal City enrichment

* LET THERE BE LIGHT

* Victory Condition Markers

* fixes

* Correct File Sizes

* Victory Conditions

* string tables

* removed pop check for logistical

* mistake clean up

* Update A3A/addons/core/CfgFunctions.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/CfgFunctions.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/Missions/fn_CON_Outpost.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/Missions/fn_missionRequest.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/Base/fn_flagaction.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/scrt/Encounter/fn_encounter_frontlineSkirmish.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* gunship cost increase

* increase spread for default gunship function

* the return of "totalVictory"

* Disable arms dealer parameter

* extra redundancy

* Mortain whiteboard

* CUP LDF start

* Air response changes

Ported from community
official-antistasi-community#3250

* Cup LRI Rebel Faction (#276)

* Lri fix

* blacklist update

* Update A3A/addons/ultimate/config/cfgForbiddenItemsClient.hpp

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/Templates/Templates/CUP/CUP_Reb_LRI.sqf

* Update A3A/addons/core/CfgMarkers.hpp

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Fix for spectrum device hacking working only for JIP & and cruise missile only in unfair (#278)

* fix for spectrum device hacking JIP

* spawn cruise missile only at war level 6 and higher

* cruise missile in unfair supports

* Update A3A/addons/core/functions/Supports/fn_SUP_cruiseMissileAvailable.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Increase of probability of cruisemissile support

(at least I think it does that)

* comment fix

* change "TARGET" to "AREA" for CM support

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Vehicles spawn logic (#281)

* airbase spawn logic

* Uncomment retaliatory minefields

* vehicles basic to outpost spawn pool

* more vehicle types for patrol

* enable vn dynamic music NEEDS TESTING

* fix

* Pulau map port (#284)

* Pulau Map Port

* Fix HBarrier Bunkers/Towers

* CW Additional Planes (LargeCAS and LargeAA) (#288)

* Initial figuring out of adding new category

trying to add vehiclesPlaneLargeAA and vehiclesPlaneLargeCAS, with intention to be used in all places normal equivalents used, except spawning in hangars

* more variables

* planeLoadouts

* ASF, CAS + CASDive

* PlaneLoadouts

* Update EnemyDefaults.sqf

* CIS and Empire LargeAA and LargeCAS

* Increase Vulture chance

more entries of Vulture fighter should increase odds of use, as other planes are republic placeholders as only viable for hangars

* Squashed commit of the following:

commit 37b1f7c
Merge: bd353e4 2b0b806
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Wed Aug 21 21:31:56 2024 +0300

    Merge pull request #289 from SilenceIsFatto/Maxx

    Builder Box Expansion

commit 2b0b806
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Wed Aug 21 21:31:24 2024 +0300

    PreBuilt interaction place holders

commit 9041e61
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Wed Aug 21 17:16:51 2024 +0300

    cDLC Buildable list update

commit bd78fd4
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Wed Aug 21 09:12:25 2024 +0300

    fixed skill issues

commit 7929eed
Merge: 2af1b53 8b36ab1
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 20:56:25 2024 +0300

    General Readability

commit 2af1b53
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 20:48:38 2024 +0300

    Syntax Errors

commit 8b36ab1
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 20:11:27 2024 +0300

    Update A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp

    Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

commit 7c72445
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 20:10:30 2024 +0300

    Update A3A/addons/maps/BuildObjectsList.hpp

    Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

commit 24a0b0f
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 19:56:42 2024 +0300

    Update fn_buildingPlacer.sqf

commit 93a4386
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 19:55:26 2024 +0300

    comment out instead of delete

commit f762249
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Tue Aug 20 19:48:17 2024 +0300

    updated builderbox

* 3AS Update

* Update fn_SUP_airstrike.sqf

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Flying Legends  (#292)

* Flying Legends Vehicle Dealer

* Flying Legends WEH Template Updates

* Update CSA_AI_WEH_Arid.sqf

* Flying Legends SOV

* Flying Legends UK

* Flying Legends USA

* USA Cont

* Flying Legends Allies

* Secret Weapons Arms Dealer

Secret Weapons expansion for Flying Legends, arms dealer list

* Secret Weapons Template Optionals

* Allies & SPE_IFA FlyingLegends & Secret Weapons Optionals

* Naval Legends Arms Dealer

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Madrigal City enrichment (#294)

* auto return leader role (#298)

* Mehland Port (#304)

* Mehland Port

* Discord rp-sat map

---------

Co-authored-by: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Svartmarka Map Port (#277)

* Svartmarka Map Port

Chernarus but WW2
https://steamcommunity.com/sharedfiles/filedetails/?id=1630816076

* Svartmarka Winter

* Update whiteboard.jpg

---------

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update script_version.hpp

* Buildabls fix/update

* combined factions

* fix LRI missing flag

* WS combined factions

* Prize vehicle if mission is "difficult"

* remove comments

* fixies

* port of official-antistasi-community#3335

* fix

* Fix downed notification being local

* added more donation options

* func behavior

* description edit

* Squashed commit of the following:

commit 6efe29d
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sun Sep 1 20:09:26 2024 +0300

    fixed helmetLossChance not working

* Squashed commit of the following:

commit 0689d07
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sat Aug 31 08:41:48 2024 +0300

    removed unused content

commit 49806cd
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sat Aug 31 08:11:38 2024 +0300

    updated build box

commit c7dc19f
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sat Aug 31 08:11:18 2024 +0300

    updated signs

commit 7ddf396
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sat Aug 31 07:15:46 2024 +0300

    updated build boxes to fit scale

commit 38fb507
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sat Aug 31 05:48:35 2024 +0300

    buildables update/fix

commit 0f75f0d
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sat Aug 31 05:46:19 2024 +0300

    Buildable fix/update

commit c70bcdc
Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Date:   Sat Aug 31 04:34:41 2024 +0300

    Buildabls fix/update

* Squashed commit of the following:

commit bbef248
Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com>
Date:   Thu Aug 29 23:07:18 2024 +0100

    Tank platoon support

commit 6a86c6e
Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com>
Date:   Tue Aug 20 13:38:02 2024 +0100

    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

* Squashed commit of the following:

commit 80a49be
Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com>
Date:   Fri Aug 9 20:56:02 2024 +0100

    Change isNil check

    May fix #267

* Squashed commit of the following:

commit f1a161f
Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com>
Date:   Fri Aug 30 13:52:15 2024 +0100

    change lock alive check

commit af6adb7
Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com>
Date:   Fri Aug 23 14:54:02 2024 +0100

    Lock airbase vehicles, unlock on flag capture

commit 443c7e8
Author: SilenceIsFatto <78276788+SilenceIsFatto@users.noreply.github.com>
Date:   Fri Aug 23 14:33:59 2024 +0100

    locking framework

* Blackmarket updates (#319)

* Update from sheet

* Fix FFAA dealer, add FL, SL, SW dealers

* Fix duplicate classes

* Revert "Merge branch 'TestingBranch' into unstable"

This reverts commit b753328, reversing
changes made to 8def736.

* duplicate dot fix

* Params & string tables

* vicroty/loss functions

* comander menu burron

* hr loss on death option

* Parmas/string tables/func's

* loss condition/loss markers

* lose HR on respawn param

* victory condition hints

* removed victory/loss checks from file

* string table. player respawn

* hud + hr limits

* HR warnings

* limit HR param

* misc fixes

* removed uneeded fnc param

* Fix no gunship default, add LightAttack

* Remove random vehicles, fix pricing

* Community 3.7.0 updates (#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

* Building box (#309)

* Buildabls fix/update

* Buildable fix/update

* buildables update/fix

* updated build boxes to fit scale

* updated signs

* updated build box

* removed unused content

* fixed helmetLossChance not working (#310)

* HR limit, lose HR on death, Weapon sway

* performance, CBA setting

* string tables (again.....)

* Update Madrigal

+2 outpost (-1 outpost thats now a milbase), +1 milbase, +1 resource, +1 factory

moved reinforcement flags to ocean to make room for new zones

adjusted east island seaport so flag spawns on land

* Update

* option to disable rally points

* Squashed commit of the following:

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

    fixed helmetLossChance not working (#310)

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

    Building box (#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 (#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

* option to disable ai recruitment.

* more time multiplier options

* disable punishments

* Green Sea improvements

* removed uneeded if

* Update mission.sqm

* Update A3A/addons/core/functions/Base/fn_resourcesFIA.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/init/fn_resourcecheck.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/core/functions/Base/fn_statistics.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update Stringtable.xml include default

* Update Stringtable.xml Russian

* player donation hint fix

* LDF Equipments

* Activate LDF

* Update A3A/addons/scrt/Rally/fn_rally_placeRallyPoint.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* Update A3A/addons/scrt/Rally/fn_rally_toggleRallyPoint.sqf

Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

* quick fixes for performance

* Update CUP_Reb_Vehicle_Attributes.sqf

add rebCost of 20k for Su25 Jet, as default price is way too low for such a strong jet

* Update script_version.hpp

* Czech Voices for CSA38 Rebels

* NFtS Rebel Voices

* Rename JMs to differentiate from WMs

* Fix NFtS Norway Flag

* Add finland marker

* Fix duplicates

* Fix yet another duplicate

---------

Co-authored-by: Antistasi Ultimate Community Bot <admin@antistasiultimate.com>
Co-authored-by: wersal454 <wroma@bk.ru>
Co-authored-by: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Co-authored-by: vasbyt <mattjackson128@gmail.com>
Co-authored-by: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
misc A miscellaneous change ready-for-merge Use for the AUC bot to allow it to merge everything at once when needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants