Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 530c74f
Merge: b04fa73 6a9361c
Author: ante <[email protected]>
Date:   Wed Mar 13 20:50:27 2024 +0100

    Merge branch 'unstable' into IFA-AIO

commit 6a9361c
Merge: 31609ef 2a2ffd8
Author: Bob-Murphy <[email protected]>
Date:   Sun Mar 3 14:41:31 2024 +0100

    Merge pull request #3163 from official-antistasi-community/tolgee-update-1709472690

    Updated Stringtable files

commit 2a2ffd8
Author: Bob-Murphy <[email protected]>
Date:   Sun Mar 3 13:31:30 2024 +0000

    Automated Tolgee Update

commit 31609ef
Merge: 46e9780 08f0ca0
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 18:40:06 2024 +0100

    Merge pull request #3156 from official-antistasi-community/3.5.1

    3.5.1 version and changelog

commit 46e9780
Merge: 927361f 6e9c0f1
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 18:36:11 2024 +0100

    Merge pull request #3157 from official-antistasi-community/tolgee-update-1708277554

    Updated Stringtable files

commit 6e9c0f1
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 17:32:34 2024 +0000

    Automated Tolgee Update

commit 08f0ca0
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 11:46:27 2024 +0100

    version and changelog

commit 927361f
Merge: 6517087 e709901
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 11:35:06 2024 +0100

    Merge pull request #3155 from official-antistasi-community/3119

    3119 - kujari map fixes

commit 6517087
Merge: bdfd7ed 08ea558
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:56:36 2024 +0100

    Merge pull request #3151 from jaj22/remove-artySupport-forcedspawn

    Disable forced marker spawn in artySupport

commit bdfd7ed
Merge: 5aeba0a f46ad2b
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:55:39 2024 +0100

    Merge pull request #3150 from jaj22/fix-LDF-rogue-var

    Fix rogue var breaking vanilla LDF template

commit 5aeba0a
Merge: 61e1c61 5adeb8d
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:55:02 2024 +0100

    Merge pull request #3147 from Tiny-DM/3.5.1-fixes

    3.5.1 Undercover and Defend fixes

commit e709901
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 18 01:52:10 2024 +0100

    3119 fixes

commit 08ea558
Author: John Jordan <[email protected]>
Date:   Fri Feb 16 21:18:19 2024 +0000

    Disable forced marker spawn in artySupport (rebel HC arty)

commit f46ad2b
Author: John Jordan <[email protected]>
Date:   Fri Feb 16 21:13:28 2024 +0000

    Fix rogue var breaking vanilla LDF template

commit 5adeb8d
Author: Tiny-DM <[email protected]>
Date:   Tue Feb 13 13:22:00 2024 -0500

    Initial Commit (UNTESTED)

commit 61e1c61
Merge: dae0828 f4f8049
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 21:09:38 2024 +0100

    Merge pull request #3144 from jaj22/fix-missing-actionRevive-localize

    Fix missing localize in actionRevive

commit dae0828
Merge: ef4cec3 b9f0ba7
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 21:09:26 2024 +0100

    Merge pull request #3143 from jaj22/fix-double-destroyCity

    Orbital strike already destroys the city naturally, don't do it twice

commit f4f8049
Author: John Jordan <[email protected]>
Date:   Sun Feb 11 19:52:10 2024 +0000

    Fix missing localize in actionRevive

commit b9f0ba7
Author: John Jordan <[email protected]>
Date:   Sun Feb 11 19:46:07 2024 +0000

    Orbital strike already destroys the city naturally, don't do it twice

commit ef4cec3
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 19:27:13 2024 +0100

    preliminary 3.5.0 changelog (#3135)

    * preliminary 3.5.0 changelog

    * adjustments based on tinys input

    * 3134 addition

    * 3137

    * 3131

    * 2802

    * typo fix

    * 3139

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 3864669
Merge: ea2c3cc a77fe5a
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 13:14:49 2024 +0100

    Merge pull request #3140 from official-antistasi-community/tolgee-update-1707653626

    Updated Stringtable files

commit a77fe5a
Author: Bob-Murphy <[email protected]>
Date:   Sun Feb 11 12:13:47 2024 +0000

    Automated Tolgee Update

commit ea2c3cc
Author: jaj22 <[email protected]>
Date:   Sun Feb 11 12:12:48 2024 +0000

    Make SLAT IFVs CBA-compatible (#3128)

    * Make SLAT IFVs CBA-compatible

    * Remove extra init EH if vehicle already has initVehicle in EH

    * Make WS IFVs CBA-compatible

commit 5d5c821
Author: Tiny-DM <[email protected]>
Date:   Sat Feb 10 17:32:12 2024 -0500

    Vehicle discounts with no seaports (#3137)

    * Update fn_vehiclePrice.sqf

    added additional conditions for vehicle pricing

    * add additional war level tiers to calc

commit a0c1714
Author: jaj22 <[email protected]>
Date:   Sat Feb 10 20:41:27 2024 +0000

    Cull large builder boxes because they don't work yet (#3139)

    The very large builder boxes don't fit in either width or weight for a lot of vehicles that they'll load into. Can be fixed later, but not in 3.5. Also the gameplay need for them is questionable: We probably don't want people building or repairing that much.

    Buffed the "large" box to 1500 as a placeholder.

commit 1df0da1
Author: targetingsnake <[email protected]>
Date:   Sat Feb 10 21:39:57 2024 +0100

    readded debug functions second time (#3131)

    * readed debug functions seccond time

    ---------

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

commit 6540b7c
Merge: 8cbc8e7 b580a2d
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 12:39:53 2024 +0100

    Merge pull request #3138 from official-antistasi-community/tolgee-update-1707565006

    Updated Stringtable files

commit b580a2d
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 11:36:46 2024 +0000

    Automated Tolgee Update

commit 8cbc8e7
Merge: 1e03950 53e2985
Author: Bob-Murphy <[email protected]>
Date:   Sat Feb 10 11:20:46 2024 +0100

    Merge pull request #3134 from jaj22/add-construction-button-hint

    Add hint to help older players find the new construction system

commit 53e2985
Author: John Jordan <[email protected]>
Date:   Fri Feb 9 20:18:08 2024 +0000

    Add hint to help older players find the new construction system

commit 1e03950
Merge: 16fa821 b0b9e09
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 21:52:21 2024 +0100

    Merge pull request #3133 from official-antistasi-community/tolgee-update-1707425397

    Updated Stringtable files

commit b0b9e09
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 20:49:57 2024 +0000

    Automated Tolgee Update

commit 16fa821
Merge: d3ba88a 0bc0367
Author: Bob-Murphy <[email protected]>
Date:   Thu Feb 8 21:47:20 2024 +0100

    Merge pull request #3126 from jaj22/fix-airspaceControl-exploit

    Fix cases where airspaceControl wouldn't execute

commit d3ba88a
Author: Tiny-DM <[email protected]>
Date:   Thu Feb 8 15:46:37 2024 -0500

    Misc fixes batch 2 (#3110)

    * initial commit (UNTESTED)

    * second major commit (TESTED)

    * hotfix by John

    * Additional fixes, removed 2585

    * Stringtable update (why github)

    funny merge conflict

    * Update Stringtable.xml

    misc new line in stringtable, removed

    * fixed patrol arm routine

    * Minor updates (localization + john's comment)

commit f24ab7c
Author: targetingsnake <[email protected]>
Date:   Thu Feb 8 11:01:02 2024 +0100

    Fix Crashes on GM Desert Templates (#3120)

    * added function for Checking vehicles in templates

    * imporved vehicle script

    * fix for servers crashing on desert template

    * removed testcode

    ---------

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

commit d6ab4ea
Merge: a174dbe 4afd496
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 08:47:59 2024 +0100

    Merge pull request #3129 from official-antistasi-community/tolgee-update-1707205400

    Updated Stringtable files

commit 4afd496
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 07:43:19 2024 +0000

    Automated Tolgee Update

commit a174dbe
Merge: 63e90d6 06ad9f6
Author: Bob-Murphy <[email protected]>
Date:   Tue Feb 6 08:42:08 2024 +0100

    Merge pull request #3123 from jaj22/fix-petros-placement-hintC

    Fix petros placement stringtable conversion bug

commit 0bc0367
Author: John Jordan <[email protected]>
Date:   Mon Feb 5 22:38:09 2024 +0000

    Fix cases where airspaceControl wouldn't execute despite a player flying an air vehicle

commit 06ad9f6
Author: John Jordan <[email protected]>
Date:   Sat Feb 3 04:55:23 2024 +0000

    Fix bogus array wrapper on hintC that prevented the petros placement UI from appearing

commit 63e90d6
Merge: 84121b4 c908f2e
Author: Bob-Murphy <[email protected]>
Date:   Wed Jan 31 10:01:26 2024 +0100

    Merge pull request #3118 from official-antistasi-community/tolgee-update-1706691491

    Updated Stringtable files

commit c908f2e
Author: Bob-Murphy <[email protected]>
Date:   Wed Jan 31 08:58:11 2024 +0000

    Automated Tolgee Update

commit 84121b4
Merge: 9fd39fb 15e4e41
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 23:29:14 2024 +0100

    Merge pull request #3114 from jaj22/fix-RC-spawning

    Fix remote-controlling players despawning rebel garrisons & civs

commit 9fd39fb
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:21:00 2024 +0100

    proper map pics and blurb fix (#3117)

    * proper map pics

    * blurb

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit a5aa69d
Merge: 02bb42c 367d91a
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:18:37 2024 +0100

    Merge pull request #3116 from jaj22/fix-cargoTrucks-fallback

    Fix fallback code for militia lacking cargo trucks

commit 02bb42c
Merge: bebc9de a1b41ee
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 30 15:18:28 2024 +0100

    Merge pull request #3115 from jaj22/log-rebel-airstrikes

    Add more logging for rebel and enemy airstrikes

commit bebc9de
Author: ante185 <[email protected]>
Date:   Tue Jan 30 15:18:16 2024 +0100

    Pistols for rebel AI - case (#3083)

    * Update fn_categoryOverrides.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_randomRifle.sqf

    * Update fn_randomRifle.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_generateRebelGear.sqf

    * Update fn_categoryOverrides.sqf

    * Update fn_randomRifle.sqf

    * Update A3A/addons/core/functions/Ammunition/fn_randomRifle.sqf

    Co-authored-by: Jouni Järvinen <[email protected]>

    * Adds LIB_FLARE_PISTOL to Overrides

    ---------

    Co-authored-by: Jouni Järvinen <[email protected]>

commit 367d91a
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 04:01:20 2024 +0000

    Fix fallback code for militia lacking cargo trucks

commit a1b41ee
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 03:48:49 2024 +0000

    Add more logging for rebel and enemy airstrikes

commit 15e4e41
Author: John Jordan <[email protected]>
Date:   Tue Jan 30 03:23:00 2024 +0000

    Fix case where remote-controlling players didn't spawn rebel or civ markers

commit c1c0f57
Merge: 2d0eccb 6c3d494
Author: Bob-Murphy <[email protected]>
Date:   Mon Jan 29 22:09:06 2024 +0100

    Merge pull request #3112 from official-antistasi-community/tolgee-update-1706560000

    Updated Stringtable files

commit 6c3d494
Author: Bob-Murphy <[email protected]>
Date:   Mon Jan 29 20:26:40 2024 +0000

    Automated Tolgee Update

commit 2d0eccb
Author: ante185 <[email protected]>
Date:   Sun Jan 28 19:20:32 2024 +0100

    Western Sahara Faction update (#3091)

    * Reskinned T100

    * ION 30mm APC, MRL truck, Texture lists

    * Update WS_AI_CSAT_NAfrica.sqf

    Officer loadout, tracked vics moved to IFV

    * ION loadout tuning

    shifted guns around for consistency, added IFV, replaced slammers with black T100

    * Update WS_AI_SFIA.sqf

    Weapon lineup tuned. IFVs moved to IFV category, expanded case for APEX dlc, added case for Contact DLC

    * Update WS_AI_SFIA.sqf

    * update

    * Update ws_ion.hpp

    * moved

    * Adjusted light armed and militia cars

    * Update WS_AI_SFIA.sqf

    * removed not-yet existing APCs

    * Update WS_AI_CSAT_NAfrica.sqf

    * moved IFV's to APC pending #3049

    * NATO Officer

    * Update WS_AI_ION.sqf

    * Update WS_AI_NATO_Desert.sqf

    * Update WS_AI_ADF.sqf

    * Update armor.hpp

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit c55e2c6
Author: ante185 <[email protected]>
Date:   Sun Jan 28 18:57:49 2024 +0100

    Cleaned up vanilla/ifv.hpp & armour.hpp (#3109)

    * Revert "CfgVehicles fix"

    This reverts commit 5b4761e.

    * moved a3a_APC_Wheeled_03_cannon_blufor_F

commit 5b4761e
Author: Bob-Murphy <[email protected]>
Date:   Sat Jan 27 10:04:15 2024 +0100

    CfgVehicles fix

commit 1d36293
Merge: 1bdc1c1 8730d26
Author: Bob-Murphy <[email protected]>
Date:   Thu Jan 25 15:08:01 2024 +0100

    Merge pull request #3108 from ante185/config_fixes_cleanup0

    Removed debug scope from a3a rhs t-72

commit 8730d26
Author: ante <[email protected]>
Date:   Thu Jan 25 15:00:12 2024 +0100

    Removed debug scope from a3a rhs t-72

commit 1bdc1c1
Author: ante185 <[email protected]>
Date:   Wed Jan 24 19:49:25 2024 +0100

    3CB LSM rebel template. (#3081)

    * 8mm CZ-550

    * Update 3CB_AI_LDF.sqf

    * Create 3CB_Reb_LSM.sqf

    * Update Templates.hpp

    * Update 3CB_Reb_Vehicle_Attributes.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update 3CB_Reb_Vehicle_Attributes.sqf

    * Update 3CB_Reb_LSM.sqf

    * Update CfgWeapons.hpp

    * Update Templates.hpp

    * Update Templates.hpp

    * name shortening

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 32866c8
Author: ante185 <[email protected]>
Date:   Wed Jan 24 19:48:00 2024 +0100

    RHS CHDKZ - Officer loadout & 3CB uniform support (#3037)

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Update RHS_AI_ChDKZ.sqf

    * Climate dependent 3cb uniform selection.

    * Update RHS_AI_ChDKZ.sqf

commit ad9d854
Author: Play3rgg <[email protected]>
Date:   Wed Jan 24 20:47:33 2024 +0200

    CUP AFRF Desert Template (#3022)

    Commit for CUP AFRF Desert Template, that uses the russian Pink Desert camouflage.

commit 254d518
Author: ante185 <[email protected]>
Date:   Wed Jan 24 17:29:53 2024 +0100

    Vanilla Slat Caged APCs (#3049)

    * Update armor.hpp

    * NATO

    * CSAT

    * AAF LDF

    * corrected T140 variant used by non-arid CSAT

    * created 11 more classes

    * FIX

    * CSAT LDF AAF

    * Create ws_ifv.hpp

    * Update ws_ifv.hpp

    * WS armour

    * NATO APCs

    * csat sfia ion

    * ion atgm

    * CSAT fin

    * Update ws_ifv.hpp

    * Update Vanilla_AI_LDF.sqf

    * Update CfgVehicles.hpp

commit 09e8625
Author: targetingsnake <[email protected]>
Date:   Wed Jan 24 17:26:57 2024 +0100

    Gm templates desert prep (#2802)

    * started BW-Templates arctic

    * started nva winter template (currently copy of existing one)

    * added swaped stuff in nva template; corrected artillery part in bw arctiv template

    * finished winter

    * fixed errors

    * updated GM-Vehicle-Attributes

    * added BW desert Camo

    * commented BW Desert template out

    * changed east german helmets

    * updated the old perpared desert template with the current temeperate one

    * added changes in templates

    * started with desert vehicles in desert templates

    * Swaped BW weapons and vehicles in Desert Template to desert or Olive versions

    * swapped uniforms to desert ones, didn't find some for militia

    * prepared desert NVA template

    * added NVA desert vehicles, fixed issue with sg550 and sg551 magazines in BW template (Error only in Logiles, afaik no report)

    * fixed issues with wrong magazines for a certain weapon in the nva templates

    * added CUP rebel uniforms to template aswell

    * corrected config error

    * fixed issues with mounting weapons and loading crates on ammotruck of GM, also fixed #2761

    * Name shortening and missing space

    * fixed issue

    ---------

    Co-authored-by: targetingsnake <[email protected]>
    Co-authored-by: Bob-Murphy <[email protected]>

commit 530fefc
Author: Bob-Murphy <[email protected]>
Date:   Tue Jan 23 23:29:55 2024 +0100

    Weferlingen & Colombia fixes (#3107)

    * colombia - moved initial hq

    * Weferlingen - remove trees from roads

    * weferlingen - added buildable objects and fixed winter climate

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 2f90e16
Author: Tiny-DM <[email protected]>
Date:   Tue Jan 23 17:29:19 2024 -0500

    Miscellaneous fixes - Batch 1 (Tiny) (#3102)

    * initial commit (fn_captureX)

    * core/functions/ai localization

    * addons/core/base (jesus christ)

    * convoy, create, dialogs

    * up through the end of OrgPlayers

    * punishment and reinf

    * core done. on to the stringtable

    im not looking forward to this

    * ....done?

    everything is done. no testing and reworks yet

    * refinements, on to testing

    when I get off my lazy ass (never)

    * save so I can continue on my laptop tomorrow

    * saving again

    * im losing my sanity

    * final commit before PR

    * I deny making these bugs

    * I lied about being done btw

    * no im serious this time

    * Complete - Awaiting Review

    * Changes by rautamiekka

    I had to change _level into a string to make it convert properly but otherwise this is rauta's

    * Actually completed this time

    Finished a few stray lines that had the //TODO: Localize tag on them. Further lines can be tagged as needed. Ready for review.

    * Updated files -- KNOWN BUG

    * github please work

    * merge resolved

    * Change by John + 1

    reverted a change accidentally made here that should have been in another branch

    * Minor syntax fix

    Always test your changes kids

    * fixed random response selection

    known issue

    * Changes from Bob + more

    Fixed a minor bug preventing resourcesFIA from showing properly. Learned my lesson not to touch Barbolani code without understanding exactly how it works.

    * Minor fix

    somehow I still fucked something up. added stringtables for "you damaged a friendly as cas/admin/driver/arty". Fixed the autosave start message.

    * initial commit

    ok this time we make sure everything works on the FIRST commit not the 29TH

    * experimental update

    NOT TESTED - DROPBOX BEING STUPID

    * minor fixes for prev bugs

    * small fix that slipped through

    * another tiny fix

    * third batch (UNSTABLE)

    these changes are NOT tested.

    * Revert "Merge branch 'more-unstable-internal' into misc-fixes-batch1"

    This reverts commit b792d20, reversing
    changes made to 3d8ecf0.

    * fixes for prev commit (RDY)

    * fixes from John

    * more misc fixes (RDY)

    * 1.22.24 fixes (UNTESTED)

    * minor fixes from John (RDY)

    * Changes by Bob and Rauta (UNTESTED))

commit 4114cfe
Author: Ellis Nielsen <[email protected]>
Date:   Tue Jan 23 16:28:19 2024 -0600

    Added: More builder boxes (#3098)

    * larger builder boxes

    * removed two largest options

    * stringtable adaptation

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit f771de7
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 22:40:12 2024 +0100

    stringtable fix

commit 6fd16f8
Author: ante185 <[email protected]>
Date:   Sun Jan 21 17:14:47 2024 +0100

    Vanilla LFF rebel faction (#3082)

    * Created the LLF faction

    * Identities

    * launch_RPG32_green_F

    * enoch offroads

    * Update Templates.hpp

    * renamed files

    * Update Templates.hpp

    * Update Vanilla_Reb_LFF.sqf

commit 15b4179
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 17:12:25 2024 +0100

    [Map Port] Weferlingen (#3075)

    * weferlingen initial upload

    * whiteboard

    * sqm

    * sqm updates

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 0e7b45c
Author: Bob-Murphy <[email protected]>
Date:   Sun Jan 21 11:55:35 2024 +0100

    [Map Port] Colombia (#3073)

    * UMB_Colombia

    * adding buildObjects

    * whiteboard

    * climate change

    * sqm update

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit 032e2a5
Author: Tiny-DM <[email protected]>
Date:   Sat Jan 20 21:14:39 2024 -0500

    Stringtabling the rest of core (#3089)

    * initial commit (fn_captureX)

    * core/functions/ai localization

    * addons/core/base (jesus christ)

    * convoy, create, dialogs

    * up through the end of OrgPlayers

    * punishment and reinf

    * core done. on to the stringtable

    im not looking forward to this

    * ....done?

    everything is done. no testing and reworks yet

    * refinements, on to testing

    when I get off my lazy ass (never)

    * save so I can continue on my laptop tomorrow

    * saving again

    * im losing my sanity

    * final commit before PR

    * I deny making these bugs

    * I lied about being done btw

    * no im serious this time

    * Complete - Awaiting Review

    * Changes by rautamiekka

    I had to change _level into a string to make it convert properly but otherwise this is rauta's

    * Actually completed this time

    Finished a few stray lines that had the //TODO: Localize tag on them. Further lines can be tagged as needed. Ready for review.

    * Updated files -- KNOWN BUG

    * github please work

    * merge resolved

    * Change by John + 1

    reverted a change accidentally made here that should have been in another branch

    * Minor syntax fix

    Always test your changes kids

    * fixed random response selection

    known issue

    * Changes from Bob + more

    Fixed a minor bug preventing resourcesFIA from showing properly. Learned my lesson not to touch Barbolani code without understanding exactly how it works.

    * Minor fix

    somehow I still fucked something up. added stringtables for "you damaged a friendly as cas/admin/driver/arty". Fixed the autosave start message.

    * small fix that slipped through

    * another tiny fix

    * punctuation & removed non-english changes

    ---------

    Co-authored-by: Bob-Murphy <[email protected]>

commit b04fa73
Author: ante <[email protected]>
Date:   Fri Jan 12 10:52:53 2024 +0100

    template update

commit 542c479
Author: ante <[email protected]>
Date:   Fri Jan 12 10:52:44 2024 +0100

    Update PIC.jpg

commit c6707fb
Author: ante <[email protected]>
Date:   Fri Jan 12 10:52:39 2024 +0100

    Create whiteboard.jpg

commit 0d8166a
Author: ante <[email protected]>
Date:   Fri Jan 12 10:52:36 2024 +0100

    Update fn_createAIcontrols.sqf

commit ea8a26f
Author: ante <[email protected]>
Date:   Fri Jan 5 01:59:34 2024 +0100

    Staszow, initial push

commit 8c4917c
Author: ante <[email protected]>
Date:   Fri Jan 5 01:58:56 2024 +0100

    Sark update, static spawns

commit 4c6a553
Author: ante <[email protected]>
Date:   Fri Jan 5 01:57:30 2024 +0100

    Update IFA_Reb_Vehicle_Attributes.sqf

commit 98c4a58
Author: ante <[email protected]>
Date:   Fri Jan 5 01:57:23 2024 +0100

    Update fn_milBuildings.sqf

commit 895a255
Author: ante <[email protected]>
Date:   Fri Jan 5 01:57:02 2024 +0100

    Update IFA_AI_ALLIES.sqf

commit 0f014e6
Author: ante <[email protected]>
Date:   Tue Jan 2 04:10:35 2024 +0100

    IFA Statics buildings update

commit b92cff7
Author: ante <[email protected]>
Date:   Mon Jan 1 22:26:33 2024 +0100

    Sark updates

commit 4e2ac89
Author: ante <[email protected]>
Date:   Mon Jan 1 22:26:17 2024 +0100

    winter/desert rebel vehicles

commit 560a3e8
Author: ante <[email protected]>
Date:   Mon Jan 1 22:25:57 2024 +0100

    Update mission.sqm

commit 6609521
Author: ante <[email protected]>
Date:   Sat Dec 30 08:03:54 2023 +0100

    Torbruk

commit bd08765
Author: ante <[email protected]>
Date:   Sat Dec 30 08:03:37 2023 +0100

    rebel civilian vehicles

commit cfb56c2
Author: ante <[email protected]>
Date:   Sat Dec 30 08:03:20 2023 +0100

    Comments

commit fae98e5
Author: ante <[email protected]>
Date:   Fri Dec 29 00:11:01 2023 +0100

    Update mission.sqm

commit 4f8d6d1
Author: ante <[email protected]>
Date:   Fri Dec 29 00:02:48 2023 +0100

    Sark testbed update

commit e132fe8
Author: ante <[email protected]>
Date:   Fri Dec 29 00:02:04 2023 +0100

    used launcher categories

commit a341089
Author: ante <[email protected]>
Date:   Fri Dec 29 00:01:54 2023 +0100

    template fixes

commit 5e0d0e4
Author: ante <[email protected]>
Date:   Thu Dec 28 21:52:32 2023 +0100

    Bayonets and weapon tweaks

commit a5f211f
Author: ante <[email protected]>
Date:   Thu Dec 28 21:52:19 2023 +0100

    Home Army

commit 3876116
Author: ante <[email protected]>
Date:   Thu Dec 28 17:31:41 2023 +0100

    Updated flags, added low air attribute

commit 649c593
Author: ante <[email protected]>
Date:   Wed Dec 27 01:03:40 2023 +0100

    REB Vehicle Attributes lines

commit b831536
Author: ante <[email protected]>
Date:   Wed Dec 27 01:03:29 2023 +0100

    "Police" voicelines

commit 8356846
Author: ante <[email protected]>
Date:   Tue Dec 26 23:48:54 2023 +0100

    Arsenal fixed

commit 9d9f9be
Author: ante <[email protected]>
Date:   Tue Dec 26 23:45:01 2023 +0100

    Rebel vehicle and vehicle cost update

commit 2dab3eb
Merge: 55e70b4 e77cf0d
Author: ante <[email protected]>
Date:   Tue Dec 26 22:39:46 2023 +0100

    Merge branch 'unstable' into IFA-AIO
  • Loading branch information
@ante185
ante185 committed Mar 28, 2024
1 parent 7ce3a25 commit 6a12134
Show file tree
Hide file tree
Showing 199 changed files with 129,624 additions and 1,326 deletions.
16 changes: 16 additions & 0 deletions A3A/addons/config_fixes/3CB/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//3CB - CfgWeapons.hpp

class CfgWeapons
{
class UK3CB_CZ550;
class a3a_UK3CB_CZ550_8mm : UK3CB_CZ550
{
BaseWeapon = "a3a_UK3CB_CZ550_8mm";
descriptionshort = "Hunting Rifle <br/>Caliber: 8×57mm IS";
displayname = "CZ-550 Lux";
magazines[] = {"rhsgref_5Rnd_792x57_kar98k"};
magazineWell[] = {"CBA_792x57_K98"};
recoil = "recoil_dmr_01";
};
};

1 change: 1 addition & 0 deletions A3A/addons/config_fixes/3CB/config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ class CfgPatches
};

#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
16 changes: 0 additions & 16 deletions A3A/addons/config_fixes/RHS/chdkz_rhs.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ class rhsgref_ins_t72bc;

class a3a_rhs_chdkz_72a : rhsgref_ins_t72ba
{

#if __A3_DEBUG__
scope = 2;
#else
scope = 1;
#endif
class EventHandlers
{
fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
Expand All @@ -22,11 +16,6 @@ class a3a_rhs_chdkz_72a : rhsgref_ins_t72ba
};
class a3a_rhs_chdkz_72b : rhsgref_ins_t72bb
{
#if __A3_DEBUG__
scope = 2;
#else
scope = 1;
#endif
class EventHandlers
{
fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');";
Expand All @@ -36,11 +25,6 @@ class a3a_rhs_chdkz_72b : rhsgref_ins_t72bb
};
class a3a_rhs_chdkz_72c : rhsgref_ins_t72bc
{
#if __A3_DEBUG__
scope = 2;
#else
scope = 1;
#endif
hiddenSelectionsTextures[] =
{
"rhsafrf\addons\rhs_t72_camo\data\rhs_t72b_01a_chdkz_co.paa",
Expand Down
1 change: 1 addition & 0 deletions A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class CfgVehicles
{
#include "air.hpp"
#include "armor.hpp"
#include "ifv.hpp"
#include "sea.hpp"
#include "soft.hpp"
};
29 changes: 21 additions & 8 deletions A3A/addons/config_fixes/Vanilla/armor.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
//Vanilla - armor.hpp

class I_APC_Wheeled_03_cannon_F;
class I_MRAP_03_F;
class I_MRAP_03_gmg_F;
class I_MRAP_03_hmg_F;
class O_MBT_04_cannon_F;
class O_MBT_04_command_F;
class O_MBT_02_base_F
; //external Root Class
class O_MBT_02_cannon_F : O_MBT_02_base_F
{
class TextureSources; //external Child Class
};

//Grey
class a3a_MRAP_03_grey_F : I_MRAP_03_F
Expand All @@ -21,13 +26,6 @@ class a3a_MRAP_03_hmg_grey_F : I_MRAP_03_hmg_F
hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"};
};

//Olive
class a3a_APC_Wheeled_03_cannon_blufor_F : I_APC_Wheeled_03_cannon_F
{
textureList[] = {};
hiddenSelectionsTextures[] = {"a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext2_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\RCWS30_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_alpha_CO.paa","a3\armor_f\data\camonet_aaf_fia_desert_co.paa","a3\armor_f\data\cage_sand_co.paa"};
};

//Black
class a3a_MBT_04_cannon_black_F : O_MBT_04_cannon_F
{
Expand All @@ -39,3 +37,18 @@ class a3a_MBT_04_command_black_F : O_MBT_04_command_F
textureList[] = {};
hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"};
};

class a3a_MBT_02_cannon_black_F : O_MBT_02_cannon_F
{
class TextureSources : TextureSources
{
class Grey
{
author = "Bohemia Interactive";
displayName = "Grey";
textures[] = {"a3\Armor_F_Decade\MBT_02\Data\MBT_02_body_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_turret_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_expo_CO.paa","A3\Armor_F\Data\camonet_CSAT_HEX_Green_CO.paa"};
};
};
textureList[] = {"Grey", 1};
hiddenSelectionsTextures[] = {"a3\Armor_F_Decade\MBT_02\Data\MBT_02_body_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_turret_expo_CO.paa","a3\Armor_F_Decade\MBT_02\Data\MBT_02_expo_CO.paa","A3\Armor_F\Data\camonet_CSAT_HEX_Green_CO.paa"};
};
105 changes: 105 additions & 0 deletions A3A/addons/config_fixes/Vanilla/ifv.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
//Vanilla - ifv.hpp

//Marshall
class B_APC_Wheeled_01_base_F;
class B_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_base_F { class EventHandlers; };
class a3a_B_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_cannon_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_T_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_cannon_F {};
class a3a_B_T_APC_Wheeled_01_cannon_F : B_T_APC_Wheeled_01_cannon_F
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

//Rhino
class AFV_Wheeled_01_base_F;
class B_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F { class EventHandlers; };
class a3a_AFV_Wheeled_01_cannon_F : B_AFV_Wheeled_01_cannon_F
{
animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1};
// Already has initVehicle EH
};
class B_T_AFV_Wheeled_01_cannon_F : AFV_Wheeled_01_base_F { class EventHandlers; };
class a3a_T_AFV_Wheeled_01_cannon_F : B_T_AFV_Wheeled_01_cannon_F
{
animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1};
// Already has initVehicle EH
};

//Gorgon
class I_APC_Wheeled_03_base_F;
class I_APC_Wheeled_03_cannon_F : I_APC_Wheeled_03_base_F { class EventHandlers; }
class a3a_APC_Wheeled_03_cannon_F : I_APC_Wheeled_03_cannon_F
{
animationList[] = {"showCamonetHull",0,"showBags",0.3,"showBags2",0.3,"showTools",0.3,"showSLATHull",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class a3a_APC_Wheeled_03_cannon_blufor_F : a3a_APC_Wheeled_03_cannon_F
{
textureList[] = {};
hiddenSelectionsTextures[] = {"a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext2_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\RCWS30_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_alpha_CO.paa","a3\armor_f\data\camonet_aaf_fia_desert_co.paa","a3\armor_f\data\cage_sand_co.paa"};
};

//Mora
class I_APC_tracked_03_base_F;
class I_APC_tracked_03_cannon_F : I_APC_tracked_03_base_F { class EventHandlers; };
class a3a_APC_tracked_03_cannon_F : I_APC_tracked_03_cannon_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class I_E_APC_tracked_03_base_F;
class I_E_APC_tracked_03_cannon_F : I_E_APC_tracked_03_base_F { class EventHandlers; };
class a3a_E_APC_tracked_03_cannon_F : I_E_APC_tracked_03_cannon_F
{
animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
//Marid
class APC_Wheeled_02_base_v2_F;
class O_APC_Wheeled_02_rcws_v2_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
class a3a_APC_Wheeled_02_rcws_v2_F : O_APC_Wheeled_02_rcws_v2_F
{
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
// Already has initVehicle EH
};
class O_T_APC_Wheeled_02_rcws_v2_ghex_F : APC_Wheeled_02_base_v2_F { class EventHandlers; };
class a3a_T_APC_Wheeled_02_rcws_v2_F : O_T_APC_Wheeled_02_rcws_v2_ghex_F
{
animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1};
// Already has initVehicle EH
};

//Kamysh
class O_APC_Tracked_02_base_F;
class O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_base_F { class EventHandlers; };
class a3a_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
// Already has initVehicle EH
};
class O_T_APC_Tracked_02_cannon_ghex_F : O_APC_Tracked_02_cannon_F {};
class a3a_T_APC_Tracked_02_cannon_F : O_T_APC_Tracked_02_cannon_ghex_F
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
// Already has initVehicle EH
};
1 change: 1 addition & 0 deletions A3A/addons/config_fixes/WS/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class CfgVehicles
class O_Tura_Truck_02_aa_lxWS;
class O_Tura_ZU23_lxWS;

#include "ws_ifv.hpp"
#include "ws_ion.hpp"

//Tan
Expand Down
94 changes: 94 additions & 0 deletions A3A/addons/config_fixes/WS/ws_ifv.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
//WS - ws_ifv.hpp

//Marshall
//Ion

class APC_Wheeled_01_base_F;
class APC_Wheeled_01_command_base_lxWS : APC_Wheeled_01_base_F { class EventHandlers; }; // also used for NATO
class B_ION_APC_Wheeled_01_command_lxWS: APC_Wheeled_01_command_base_lxWS {};
class a3a_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_APC_Wheeled_01_cannon_lxWS;
class B_ION_APC_Wheeled_01_cannon_lxWS: B_APC_Wheeled_01_cannon_lxWS { class EventHandlers; };
class a3a_ION_APC_Wheeled_01_cannon_lxWS : B_ION_APC_Wheeled_01_cannon_lxWS
{
scope = 2;
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_D_APC_Wheeled_01_atgm_lxWS;
class a3a_ION_APC_Wheeled_01_atgm : B_D_APC_Wheeled_01_atgm_lxWS {
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
textureList[] = {"ION_BLACK", 1};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\APC_Wheeled_01\APC_Wheeled_ion_base_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\apc_wheeled_ion_adds_co.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\apc_wheeled_ion_tows_co.paa","a3\armor_f\Data\camonet_AAF_stripe_desert_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\cage_black_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\APC_Wheeled_ion_lxws_CO.paa"};
};

//NATO
class a3a_APC_Wheeled_01_command_lxWS : APC_Wheeled_01_command_base_lxWS
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};
class B_T_APC_Wheeled_01_command_lxWS : APC_Wheeled_01_command_base_lxWS {};
class a3a_T_APC_Wheeled_01_command_lxWS : B_T_APC_Wheeled_01_command_lxWS
{
animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1};
class EventHandlers : EventHandlers
{
init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};";
};
};

//Iskatel/Kamysh
//Arid
class O_APC_Tracked_02_30mm_lxWS;
class a3a_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_30mm_lxWS
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
// Has initVehicle EH already
};
//Tropical
class O_T_APC_Tracked_02_30mm_lxWS;
class a3a_T_APC_Tracked_02_30mm_lxWS : O_T_APC_Tracked_02_30mm_lxWS
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
// Has initVehicle EH already
};
//SFIA
class O_SFIA_APC_Tracked_02_30mm_lxWS;
class a3a_SFIA_APC_Tracked_02_30mm_lxWS : O_SFIA_APC_Tracked_02_30mm_lxWS
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
// Has initVehicle EH already
};
class O_SFIA_APC_Tracked_02_cannon_lxWS;
class a3a_SFIA_APC_Tracked_02_cannon_lxWS : O_SFIA_APC_Tracked_02_cannon_lxWS
{
animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1};
// Has initVehicle EH already
};
//ION
class a3a_ION_APC_Tracked_02_30mm : O_APC_Tracked_02_30mm_lxWS
{
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
animationList[] = {"showTracks",1,"showCamonetHull",0,"showBags",0.2,"showSLATHull",1};
textureList[] = {"Grey", 1};
hiddenSelectionsTextures[] = {"lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_01_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_02_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_03_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_30mm_black_co.paa","A3\Armor_F\Data\camonet_CSAT_Stripe_Desert_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\cage_black_CO.paa"};
// Has initVehicle EH already
};
10 changes: 5 additions & 5 deletions A3A/addons/config_fixes/WS/ws_ion.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class a3a_ION_Truck_02_MRL_F : I_Truck_02_MRL_F
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","a3\soft_f_gamma\truck_02\data\truck_02_mrl_co.paa"};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\data\truck_02\zamak_mrl_brown_co.paa"};
};
class a3a_ION_Truck_02_Ammo_F : O_Truck_02_Ammo_F
{
Expand Down Expand Up @@ -69,22 +69,22 @@ class a3a_ION_Offroad_armor : B_Tura_Offroad_armor_lxWS
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
textureList[] = {};
textureList[] = {"Black", 1};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
};
class a3a_ION_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS
{
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
textureList[] = {};
textureList[] = {"Black", 1};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
};
class a3a_ION_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS
{
side = 1;
crew = "B_ION_Soldier_lxWS";
faction = "BLU_ION_lxWS";
textureList[] = {};
textureList[] = {"Black", 1};
hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_black_co.paa"};
};
};
5 changes: 4 additions & 1 deletion A3A/addons/core/CfgFunctions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class CfgFunctions
class cargoSeats {};
class cleanserVeh {};
class countFreeSpawnPositions {};
class createAIAirplane {};
class createAIAirbase {};
class createAICities {};
class createAIcontrols {};
class createAIOutposts {};
Expand Down Expand Up @@ -293,6 +293,8 @@ class CfgFunctions
class installSchrodingersBuildingFix {};
class prepFunctions {};
class spawnDebuggingLoop {};
class spawnSelectedTemplateAI {};
class debugSpawnVics {};
};

class Dialogs {
Expand Down Expand Up @@ -381,6 +383,7 @@ class CfgFunctions
class prepareMarkerArrays {};
class resourcecheck {};
class tags {};
class checkCampaignEnd {};
};

class Intel {
Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/core/Includes/script_version.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define MAJOR 3
#define MINOR 5
#define PATCHLVL 0
#define PATCHLVL 1
#define BUILD 0
Loading

0 comments on commit 6a12134

Please sign in to comment.