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

Fix case where seats may not be unlocked when dead crew are deleted #3205

Merged
merged 1 commit into from
Apr 28, 2024
Merged

Fix case where seats may not be unlocked when dead crew are deleted #3205

merged 1 commit into from
Apr 28, 2024

Conversation

jaj22
Copy link

@jaj22 jaj22 commented Apr 7, 2024

What type of PR is this.

  1. Bug
  2. Change
  3. Enhancement

What have you changed and why?

Fixed the remaining case where vehicle seats might be permanently blocked with ACE after the crew is cleaned up.

Example test case: Set the cleantime global var to 10 seconds. Put some AIs in a vehicle. Kill them.

Please specify which Issue this PR Resolves.

closes #3145

Please verify the following and ensure all checks are completed.

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

@jaj22 jaj22 added the Bug Something isn't working label Apr 7, 2024
@jaj22 jaj22 added this to the 3.6 milestone Apr 7, 2024
Tiny-DM
Tiny-DM approved these changes Apr 17, 2024
View reviewed changes
Copy link

@Tiny-DM Tiny-DM left a comment

Choose a reason for hiding this comment

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

Not necessary anymore because the core bug was fixed by ACE, but code is good and cant hurt to merge

@Bob-Murphy Bob-Murphy merged commit db2ce67 into official-antistasi-community:unstable Apr 28, 2024
@Bob-Murphy Bob-Murphy added the Added to changelog Added to changelog label Jun 8, 2024
wersal454 added a commit to wersal454/A3-Antistasi that referenced this pull request Sep 1, 2024
@wersal454
port official-antistasi-community#3205
e864593
@SilenceIsFatto SilenceIsFatto mentioned this pull request Dec 5, 2024
Merged
8 tasks
SilenceIsFatto added a commit to SilenceIsFatto/A3-Antistasi-Ultimate that referenced this pull request Dec 5, 2024
@SilenceIsFatto @wersal454
@AtteKarppinen @Azodion @UAC-MaxxLite @stutpip123 @PlayerBotPro @Brenner650 @AUC-bot
V11.4.0 (#407)
c71c116 
* port official-antistasi-community#3369

adopted to ultimate functions
needs testing

* port official-antistasi-community#3364

needs testing

* port official-antistasi-community#3349

adopted to ultimate functions

Needs heavy testing and probably some work to integrate rivals

* port official-antistasi-community#3273

* port official-antistasi-community#3231

* port official-antistasi-community#3205

* port official-antistasi-community#3207

* unit traits changes

* Fast travel enabled only between major locations

* CUP Norwegian Armed Forces

* Fixes/Flushing

For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back.

* JCA Arms Dealer

* Project Infinite Arms Dealer

* Naming Consistency

* F-16C Price Update to Match Sheet

* Vehicle Prices Match to Sheet

* Naming Consistency

* CUP HAFM

Gives a RVMAT Error whenever the GD420 Spawns. But it's not a crashing error.

* CUP FFP

* Correcting Mistake

* fixes

* Fixing Mistake

* Fixes and Additions

* Add names function for templates

* requiredAddons Fix

* basic structure

* leftover fix

* M16 Addition

* Start

* Fixes

* ChernarusRedux Initial Port

* CUP NATO + BAF Fix

CUP NATO
BAF SF + BW Elite + US Army Military + Czech Militia

* Vehicle Market - Use diminishing returns approach on HQ vehicle price

* Vehicle Market - Use diminishing returns approach on black market vehicle price

* more zones and stuff

* Update mission.sqm

* Update common.inc

* Update fn_moveOutCrew.sqf

* Update A3A/addons/core/functions/REINF/fn_postmortem.sqf

Co-authored-by: Silence <[email protected]>

* Update fn_compatibilityLoadFaction.sqf

* Update fn_loadRivals.sqf

* Update fn_initVarServer.sqf

* changed some music and radio files

* updated money item yield and make money spawn in random houses

* volume and maxDistance

* 3AS DC17M replace Legion

* Update mission.sqm

* Update mission.sqm

* Add names (cup, rhs, vanilla), add functionality

* Update mission.sqm

* more audio files and changes

* done

* Create fn_RivalsCreateUnit.sqf

* Update fn_itemset_medicalSupplies.sqf

* SFP ZU-23 to CUP ZU-23

* bunch of fixes

no driver issue fix
tags error fix
wind param fix
vehicle don't fit in tent hangar "fix"
duplicate string for ldf fix

* fixes for fixes

* add another outpost, clear more roads

* Air vehicle access on milbases (#282)

* air vehicle access on milbases (whaaaaaaaaa)

whaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Update CUP_AI_BAF_Temperate.sqf

* Update CUP_AI_BAF_Arid.sqf

* roll back

* roll back

---------

Co-authored-by: Silence <[email protected]>

* Fast travel enabled only between major locations (#332)

* CUP Norwegian Armed Forces (#335)

* CUP Norwegian Armed Forces

* Fixes/Flushing

For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back.

* F-16C Price Update to Match Sheet

* Vehicle Prices Match to Sheet

---------

Co-authored-by: stutpip123 <[email protected]>

* economic victory needed amount fix / bug fixes (#339)

* economic victory per map

* hud warning weapon sway

* updated to use correct values

* Main menu update (#342)

* base changes

* bug fixes

* added images

* documentation

* removed unused fnc

* future proofing

* Set naming/case consistency, quality consistency

---------

Co-authored-by: SilenceIsFatto <[email protected]>
Co-authored-by: stutpip123 <[email protected]>

* Revert "Merge pull request #341 from Azodion/CUP_FFP"

This reverts commit 9971e7b, reversing
changes made to dcbc50f.

* Reapply "Merge pull request #341 from Azodion/CUP_FFP"

This reverts commit aabf384.

* Update templates.hpp

* Update cfgPlaneLoadouts.hpp

* support new anomalies mod

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* Update Aegis_AI_CSAT_Temperate.sqf

* Update Aegis_AI_NATO_Arid.sqf

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* Update WS_AI_NATO&UNA.sqf

* Create fn_liberatedeserter.sqf

* Update fn_destroyCity.sqf

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

Actually need to test this one, if good, uncomment

* revert the revert

@SilenceIsFatto

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* community ports official-antistasi-community#3388 and official-antistasi-community#3418

* community port official-antistasi-community#3397

* cleanup

* Update fn_SUP_cruiseMissileAvailable.sqf

* Fix helmet default unlocks (again)

* 3AS Update

add Gozanti Cruiser to WM Empire templates and arms dealer

* Add missing variable

* Missing semicolons fixed

* Missing semicolons fixed

* Missing semicolons fixed

* Missing semicolons fixed

* Missing semicolons fixed

* Update fn_airspaceControl.sqf

* Petros Ambient sounds

* Revert "Merge branch 'ambient-sound-change' into unstable"

This reverts commit 9bb7c70, reversing
changes made to 1e94ef9.

* delete _laser to avoid spam

* delete pods 

untested

* delete pods

untested

* Fix anomaly height/spawning

* cleanup

* cleanup

* remove laggy bit

* cleanup

* Unmerge ambient sounds (#2)

* Update script_version.hpp

* compile gunships variable

I dunno, probably required

* Fix grass/view distance being set in main menu

* Re-add addon entries and strings, update dealers

* Update script_version.hpp

v11.3.1

* DELETE THE F LASER

* Fix Respawning on Redux

* disable invinsiblity

untested

* Update A3A/addons/gui/CfgFunctions.hpp

Co-authored-by: Silence <[email protected]>

* Update Stringtable.xml

* Expeditionary Forces arms dealer

* Re-add removed entries

* EAW Updates

add new planes to template and dealer

* EF support

* EF part 1

* Add fallbacks for identity, convert to hashmap

* part 2

next stop, weapons and gear

* Add EF helicopters, change `py` to `python`

* part 3

next stop, logistics

* part 4

finished

Next stop, QRFNaval?

* part 4.1

Oups, almost forgot

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf

Co-authored-by: Silence <[email protected]>

* fixes

* Add initACE to CfgFunctions.hpp

* fix

* fix

* fix

* Remove CUP names, replace with vanilla

* price adjustment for the support

* Fix syntax errors, incorrect var declarations

* 11.4

---------

Co-authored-by: wersal454 <[email protected]>
Co-authored-by: Pvt.Unknown <[email protected]>
Co-authored-by: Hophri <[email protected]>
Co-authored-by: MaxxLite <[email protected]>
Co-authored-by: stutpip123 <[email protected]>
Co-authored-by: Bot <[email protected]>
Co-authored-by: AtteKarppinen <[email protected]>
Co-authored-by: Brenner650 <[email protected]>
Co-authored-by: Antistasi Ultimate Community Bot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tiny-DM Tiny-DM Tiny-DM approved these changes

Assignees
No one assigned
Labels
Added to changelog Added to changelog Bug Something isn't working Ready for merge
Projects
None yet
Milestone
3.6
Development

Successfully merging this pull request may close these issues.

[Bug]: Players using ACE may be blocked from empty vehicle seats
3 participants
@jaj22 @Tiny-DM @Bob-Murphy