Blackmarket updates #319
Merged
Blackmarket updates #319
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SilenceIsFatto
added a commit
that referenced
this pull request
Sep 5, 2024
stutpip123
added a commit
that referenced
this pull request
Sep 5, 2024
commit baca9c2 Author: SilenceIsFatto <[email protected]> Date: Thu Sep 5 15:29:11 2024 +0100 Revert "Merge branch 'TestingBranch' into unstable" This reverts commit b753328, reversing changes made to 8def736. commit b753328 Merge: 8def736 00a5876 Author: Silence <[email protected]> Date: Thu Sep 5 15:26:58 2024 +0100 Merge branch 'TestingBranch' into unstable commit 8def736 Author: Silence <[email protected]> Date: Thu Sep 5 15:26:16 2024 +0100 Blackmarket updates (#319) * Update from sheet * Fix FFAA dealer, add FL, SL, SW dealers * Fix duplicate classes
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 <[email protected]> * Update A3A/addons/core/functions/CREATE/fn_createAttackForceMixed.sqf Co-authored-by: Silence <[email protected]> * 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 <[email protected]> * Update A3A/addons/core/functions/CREATE/fn_createVehicleQRFBehaviour.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite_Satellite.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/Missions/fn_LOG_Crashsite_Satellite.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/CREATE/fn_createVehicleQRFBehaviour.sqf Co-authored-by: Silence <[email protected]> * 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 <[email protected]> * Update A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp Co-authored-by: Silence <[email protected]> * 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 <[email protected]> * Update A3A/addons/core/CfgFunctions.hpp Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/Missions/fn_CON_Outpost.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/Missions/fn_missionRequest.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/Base/fn_flagaction.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/scrt/Encounter/fn_encounter_frontlineSkirmish.sqf Co-authored-by: Silence <[email protected]> * 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 <[email protected]> * Update A3A/addons/core/Templates/Templates/CUP/CUP_Reb_LRI.sqf * Update A3A/addons/core/CfgMarkers.hpp --------- Co-authored-by: Silence <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Date: Wed Aug 21 21:31:56 2024 +0300 Merge pull request #289 from SilenceIsFatto/Maxx Builder Box Expansion commit 2b0b806 Author: MaxxLite <[email protected]> Date: Wed Aug 21 21:31:24 2024 +0300 PreBuilt interaction place holders commit 9041e61 Author: MaxxLite <[email protected]> Date: Wed Aug 21 17:16:51 2024 +0300 cDLC Buildable list update commit bd78fd4 Author: MaxxLite <[email protected]> Date: Wed Aug 21 09:12:25 2024 +0300 fixed skill issues commit 7929eed Merge: 2af1b53 8b36ab1 Author: MaxxLite <[email protected]> Date: Tue Aug 20 20:56:25 2024 +0300 General Readability commit 2af1b53 Author: MaxxLite <[email protected]> Date: Tue Aug 20 20:48:38 2024 +0300 Syntax Errors commit 8b36ab1 Author: MaxxLite <[email protected]> Date: Tue Aug 20 20:11:27 2024 +0300 Update A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp Co-authored-by: Silence <[email protected]> commit 7c72445 Author: MaxxLite <[email protected]> Date: Tue Aug 20 20:10:30 2024 +0300 Update A3A/addons/maps/BuildObjectsList.hpp Co-authored-by: Silence <[email protected]> commit 24a0b0f Author: MaxxLite <[email protected]> Date: Tue Aug 20 19:56:42 2024 +0300 Update fn_buildingPlacer.sqf commit 93a4386 Author: MaxxLite <[email protected]> Date: Tue Aug 20 19:55:26 2024 +0300 comment out instead of delete commit f762249 Author: MaxxLite <[email protected]> Date: Tue Aug 20 19:48:17 2024 +0300 updated builderbox * 3AS Update * Update fn_SUP_airstrike.sqf --------- Co-authored-by: Silence <[email protected]> * 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 <[email protected]> * Madrigal City enrichment (#294) * auto return leader role (#298) * Mehland Port (#304) * Mehland Port * Discord rp-sat map --------- Co-authored-by: MaxxLite <[email protected]> Co-authored-by: Silence <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Date: Sun Sep 1 20:09:26 2024 +0300 fixed helmetLossChance not working * Squashed commit of the following: commit 0689d07 Author: MaxxLite <[email protected]> Date: Sat Aug 31 08:41:48 2024 +0300 removed unused content commit 49806cd Author: MaxxLite <[email protected]> Date: Sat Aug 31 08:11:38 2024 +0300 updated build box commit c7dc19f Author: MaxxLite <[email protected]> Date: Sat Aug 31 08:11:18 2024 +0300 updated signs commit 7ddf396 Author: MaxxLite <[email protected]> Date: Sat Aug 31 07:15:46 2024 +0300 updated build boxes to fit scale commit 38fb507 Author: MaxxLite <[email protected]> Date: Sat Aug 31 05:48:35 2024 +0300 buildables update/fix commit 0f75f0d Author: MaxxLite <[email protected]> Date: Sat Aug 31 05:46:19 2024 +0300 Buildable fix/update commit c70bcdc Author: MaxxLite <[email protected]> Date: Sat Aug 31 04:34:41 2024 +0300 Buildabls fix/update * Squashed commit of the following: commit bbef248 Author: SilenceIsFatto <[email protected]> Date: Thu Aug 29 23:07:18 2024 +0100 Tank platoon support commit 6a86c6e Author: SilenceIsFatto <[email protected]> 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 <[email protected]> Date: Fri Aug 9 20:56:02 2024 +0100 Change isNil check May fix #267 * Squashed commit of the following: commit f1a161f Author: SilenceIsFatto <[email protected]> Date: Fri Aug 30 13:52:15 2024 +0100 change lock alive check commit af6adb7 Author: SilenceIsFatto <[email protected]> Date: Fri Aug 23 14:54:02 2024 +0100 Lock airbase vehicles, unlock on flag capture commit 443c7e8 Author: SilenceIsFatto <[email protected]> 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 <[email protected]> Date: Sun Sep 15 22:47:36 2024 +0300 fixed helmetLossChance not working (#310) commit ede762d Author: MaxxLite <[email protected]> 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 <[email protected]> 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 <[email protected]> * Update A3A/addons/core/functions/init/fn_resourcecheck.sqf Co-authored-by: Silence <[email protected]> * Update A3A/addons/core/functions/Base/fn_statistics.sqf Co-authored-by: Silence <[email protected]> * 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 <[email protected]> * Update A3A/addons/scrt/Rally/fn_rally_toggleRallyPoint.sqf Co-authored-by: Silence <[email protected]> * 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 <[email protected]> Co-authored-by: wersal454 <[email protected]> Co-authored-by: stutpip123 <[email protected]> Co-authored-by: vasbyt <[email protected]> Co-authored-by: MaxxLite <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
What have you changed and why?
Information:
Updated the dealer vehicles from the sheet
Please specify which Issue this PR Resolves (If Applicable).
"This PR closes #XXXX!"
Please verify the following.
Is further testing or are further changes required?
How can the changes be tested?
Steps:
Notes: