Skip to content

Commit

Permalink
v11.0.0 hotfixes (#266) (#270)
Browse files Browse the repository at this point in the history
* fixes for fixes + working searchlight

* CWR Initial work

* AI "Get In" Command's Fixed when unconscious

* Removing old code

* port community updates (prs in description)

Community PRs:
official-antistasi-community#3226
official-antistasi-community#3215
official-antistasi-community#3197
official-antistasi-community#3196
official-antistasi-community#3195
official-antistasi-community#3188
official-antistasi-community#3152
official-antistasi-community#3136
official-antistasi-community#3114
official-antistasi-community#3110

* Link weapons and vehicles to addons

* Update csvparser

* Add vehicles from modsets

* Update vehicles_tmt.hpp

* add proper conditions + unsung

* Add unsung to trader

* Add max zone + bad classname protection

* CWR US Army

* CWRIII US Army WD + DES, Logi, Plane Loadouts

* USSR Start

* Update black market UI and text

+ Vehicle conditions are now done via macro and the python scripts have been cleaned up

* Add old trader method detection

* Update README.md

* Update Stringtable.xml

* cleaning/refining files and structure

* Update xlsx2csv, add .ps1 scripts

* Update xlsx2csv.py

* Update documentation

* Update link

* fix IFA and stock locality

* swap A3U_blackMarketStock to use publicVariable

* last attempt to fix the black market

* Update parser to properly handle existing comments

* Update vehicle price functions

* Update fn_support_lootHeli.sqf

* Fix zone preview exploit via map screen

* Fix error - initZones.sqf

* Only give info if zone is normally revealed

* Fix potential money exploit

* USSR

* Update CWR_AI_USSR_Temperate.sqf

* Add missing dealers, fix SOGPF planes in OPTRE

* Reb and Riv

* fixes

* more fixes

* USSR plane loadouts

* CWRIII BAF

* Arms Dealer Weapon Stock

* Reb Tweaks

* Update config.hpp

* Update cwr.hpp

* USMC

* USMC Planes + Fixes

* Update CWR_AI_USMC_Temperate.sqf

* TDF Arid

* tdf flag

* TRF Rival

* Update CWR_AI_BAF_Temperate.sqf

* Update CWR_Riv_TReb.sqf

* Update templates.hpp

* Initial Port

* Cont

* Port

should be ready to playtest now

* Initial Setup

map port stuff + milBuildings for unsung MG and AA

* 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

* 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 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

---------

Co-authored-by: wersal454 <wroma@bk.ru>
Co-authored-by: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Co-authored-by: sniperclub01 <30736048+sniperclub01@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: staysane0 <jiviandrew@gmail.com>
Co-authored-by: dayrain <blackwaterbread@gmail.com>
  • Loading branch information
9 people authored Aug 1, 2024
1 parent 6434527 commit fc3133c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions A3A/addons/core/Templates/Templates/CUP/CUP_AI_BAF_Arid.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
["uavsAttack", ["CUP_B_USMC_DYN_MQ9"]] call _fnc_saveToTemplate;
["uavsPortable", ["B_UAV_01_F"]] call _fnc_saveToTemplate;

["vehiclesMilitiaLightArmed", ["CUP_B_nM1025_M2_USA_DES"]] call _fnc_saveToTemplate;
["vehiclesMilitiaLightArmed", ["CUP_B_LR_Transport_GB_D"]] call _fnc_saveToTemplate;
["vehiclesMilitiaTrucks", ["CUP_B_MTVR_USA"]] call _fnc_saveToTemplate;
["vehiclesMilitiaCars", ["CUP_B_nM1025_Unarmed_USA_DES"]] call _fnc_saveToTemplate;
["vehiclesMilitiaAPCs", ["CUP_B_Mastiff_HMG_GB_D", "rhsusf_m113_usarmy_M240"]] call _fnc_saveToTemplate;
["vehiclesMilitiaCars", ["CUP_B_LR_MG_GB_D"]] call _fnc_saveToTemplate;
["vehiclesMilitiaAPCs", ["CUP_B_Mastiff_HMG_GB_D", "CUP_B_FV432_Bulldog_GB_D_RWS"]] call _fnc_saveToTemplate;

["vehiclesPolice", ["B_GEN_Offroad_01_gen_F"]] call _fnc_saveToTemplate;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
["uavsAttack", ["CUP_B_USMC_DYN_MQ9"]] call _fnc_saveToTemplate;
["uavsPortable", ["B_UAV_01_F"]] call _fnc_saveToTemplate;

["vehiclesMilitiaLightArmed", ["CUP_B_nM1025_M2_USA_WDL"]] call _fnc_saveToTemplate;
["vehiclesMilitiaLightArmed", ["CUP_B_LR_MG_GB_W"]] call _fnc_saveToTemplate;
["vehiclesMilitiaTrucks", ["CUP_B_MTVR_USA"]] call _fnc_saveToTemplate;
["vehiclesMilitiaCars", ["CUP_B_nM1025_Unarmed_DF_USA_WDL"]] call _fnc_saveToTemplate;
["vehiclesMilitiaAPCs", ["CUP_B_FV432_Bulldog_GB_W_RWS", "CUP_B_FV432_Bulldog_GB_W_RWS"]] call _fnc_saveToTemplate;
["vehiclesMilitiaCars", ["CUP_B_LR_Transport_GB_W"]] call _fnc_saveToTemplate;
["vehiclesMilitiaAPCs", ["CUP_B_Mastiff_GMG_GB_W", "CUP_B_FV432_Bulldog_GB_W_RWS"]] call _fnc_saveToTemplate;
["vehiclesPolice", ["B_GEN_Offroad_01_gen_F"]] call _fnc_saveToTemplate;

["staticMGs", ["CUP_B_L111A1_BAF_DDPM"]] call _fnc_saveToTemplate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ if (_hasCSLA) then {
["B_T_APC_Wheeled_01_atgm_lxWS", ["showCamonetHull",0.3,"showCamonetTurret",0.3,"showSLATHull",0.3,"showSLATTurret",0.3]],
["B_T_APC_Wheeled_01_mortar_lxWS",["showBags",0.3,"showCamonetHull",0.3,"showCamonetTurret",0.3,"showSLATHull",0.3,"showSLATTurret",0.3]],
["B_T_APC_Wheeled_01_cannon_F", ["showCamonetHull",0.3,"showCamonetTurret",0.3,"showSLATHull",0.3,"showSLATTurret",0.3]],
["B_T_APC_Tracked_01_AA_F", ["showCamonetHull",0.3,"showCamonetTurret",0.3,"showSLATHull",0.3]]
["B_T_APC_Tracked_01_AA_F", ["showCamonetHull",0.3,"showCamonetTurret",0.3,"showSLATHull",0.3]],
["gm_dk_army_m113a1dk_command_noinsignia", ["antennaMast_01_unhide",0.3,"antennamast_01_elev_trigger",0.3,"generator_01_unhide",0.3,"storageBox_01_unhide",0.3,"IceCleats_01_unhide",0.3,"IceCleats_02_unhide",0.3,"SupportPoles_01_unhide",0.3,"CamoNet_02_unhide",0.3,"CamoNet_01_unhide",0.3,"CamoNet_03_unhide",0.3,"Tarp_01_unhide",0.3,"camonet_hull_unhide",0.3,"camofoilage_hull_unhide",0.3]],
["gm_dk_army_m113a2dk_noinsignia", ["camonet_hull_unhide",0.3,"camofoilage_hull_unhide",0.3,"camonet_MainTurret_trav_unhide",0.3,"camofoilage_MainTurret_trav_unhide",0.3,"CamoNet_01_unhide",0.3,"CamoNet_03_unhide",0.3,"Tarp_01_unhide",0.3]],
["gm_dk_army_Leopard1a3_noinsignia", ["CamoNet_01_unhide",0.3,"CamoNet_02_unhide",0.3,"CamoNet_03_unhide",0.3,"sideskirt_unhide",0.3,"camonet_hull_unhide",0.3,"camofoilage_hull_unhide",0.3,"camonet_MainTurret_trav_unhide",0.3,"camofoilage_MainTurret_trav_unhide",0.3,"camonet_MainTurret_elev_unhide",0.3]],
Expand Down
6 changes: 3 additions & 3 deletions A3A/addons/core/functions/CREATE/fn_createAIAirplane.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ if (!_busy) then {
private _veh = objNull;
private _spawnParameter = [_markerX, "Plane"] call A3A_fnc_findSpawnPosition;
if(_spawnParameter isEqualType []) then {
private _vehPool = (_faction get "vehiclesPlanesCAS") + (_faction get "vehiclesPlanesAA") + (_faction getOrDefault ["vehiclesPlanesGunship", "vehiclesPlanesCAS"]) + (_faction getOrDefault ["uavsAttack", "vehiclesPlanesCAS"]);
private _vehPool = (_faction get "vehiclesPlanesCAS") + (_faction get "vehiclesPlanesAA") + (_faction getOrDefault ["vehiclesPlanesGunship", []]) + (_faction getOrDefault ["uavsAttack", []]);
if(count _vehPool > 0) then
{
_spawnsUsed pushBack _spawnParameter#2;
Expand All @@ -319,8 +319,8 @@ if (!_busy) then {
+ (_faction get "vehiclesPlanesCAS")
+ (_faction get "vehiclesPlanesAA")
+ (_faction get "vehiclesPlanesTransport");
+ (_faction getOrDefault ["vehiclesPlanesGunship", "vehiclesPlanesCAS"]);
+ (_faction getOrDefault ["uavsAttack", "vehiclesPlanesCAS"]);
+ (_faction getOrDefault ["vehiclesPlanesGunship", []]);
+ (_faction getOrDefault ["uavsAttack", []]);
_typeVehX = selectRandom _airVehTypes;
if (!isNil "_typeVehX") then {
_veh = createVehicle [_typeVehX, _pos, [],50, "NONE"];
Expand Down

0 comments on commit fc3133c

Please sign in to comment.