Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit ea24fd7
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Wed Mar 13 21:17:23 2024 +0100

    FlaK 38 instead of FlaK 30

    38 has a higher rate of fire - a reward for stealing them compared to the slower firing 30 that the FFI can buy

commit e1d1982
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Wed Mar 13 20:54:00 2024 +0100

    Update fn_setPlaneLoadout.sqf

commit 9cf8683
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Wed Mar 13 20:52:46 2024 +0100

    Update fn_categoryOverrides.sqf

commit b58873f
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sun Mar 10 17:37:51 2024 +0100

    Updated seats blocked by logi

commit bf4ec09
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sun Mar 10 17:03:48 2024 +0100

    tanker kit adjustment

commit f22cbe4
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sun Mar 10 16:18:23 2024 +0100

    Update IFA_AI_UK.sqf

commit 5b24034
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sun Mar 10 15:54:56 2024 +0100

    Radios (To match SPE)

commit 7fe9399
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Sun Mar 10 15:41:57 2024 +0100

    IFA logistics

commit 52a180f
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 21:27:23 2024 +0100

    "attributeLowAir", true

commit 2031a6b
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 21:20:52 2024 +0100

    Update IFA_REB_FFI.sqf

commit 4ea35bd
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 21:12:09 2024 +0100

    flags & boats

commit 1709722
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 21:06:50 2024 +0100

    rebel car adjustments

commit 4182363
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 20:59:50 2024 +0100

    Update Templates.hpp

commit a227049
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 20:58:28 2024 +0100

    Create IFA_Vehicle_Attributes.sqf

commit 6430d32
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 20:58:24 2024 +0100

    IFA US, UK, & Combined

commit 3c4f471
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 20:57:46 2024 +0100

    Create IFA_AI_SOV.sqf

commit 61cd6e3
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 20:57:35 2024 +0100

    Create IFA_AI_WEH.sqf

commit 107a8db
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 20:57:22 2024 +0100

    IFA Civilians

commit 0aae58d
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 20:56:58 2024 +0100

    IFA Rebels

commit efa5448
Author: ante <49555217+ante185@users.noreply.github.com>
Date:   Fri Mar 8 20:54:37 2024 +0100

    IFA Markers & Flags

commit 6a9361c
Merge: 31609ef 2a2ffd8
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Sun Mar 3 13:31:30 2024 +0000

    Automated Tolgee Update

commit 31609ef
Merge: 46e9780 08f0ca0
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Sun Feb 18 17:32:34 2024 +0000

    Automated Tolgee Update

commit 08f0ca0
Author: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Date:   Sun Feb 18 11:46:27 2024 +0100

    version and changelog

commit 927361f
Merge: 6517087 e709901
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Sun Feb 18 01:52:10 2024 +0100

    3119 fixes

commit 08ea558
Author: John Jordan <jaj22x@gmail.com>
Date:   Fri Feb 16 21:18:19 2024 +0000

    Disable forced marker spawn in artySupport (rebel HC arty)

commit f46ad2b
Author: John Jordan <jaj22x@gmail.com>
Date:   Fri Feb 16 21:13:28 2024 +0000

    Fix rogue var breaking vanilla LDF template

commit 5adeb8d
Author: Tiny-DM <ianfeickert2@gmail.com>
Date:   Tue Feb 13 13:22:00 2024 -0500

    Initial Commit (UNTESTED)

commit 61e1c61
Merge: dae0828 f4f8049
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <jaj22x@gmail.com>
Date:   Sun Feb 11 19:52:10 2024 +0000

    Fix missing localize in actionRevive

commit b9f0ba7
Author: John Jordan <jaj22x@gmail.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>

commit 3864669
Merge: ea2c3cc a77fe5a
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Sun Feb 11 12:13:47 2024 +0000

    Automated Tolgee Update

commit ea2c3cc
Author: jaj22 <jaj22x@gmail.com>
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 <148804148+Tiny-DM@users.noreply.github.com>
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 <jaj22x@gmail.com>
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 <94396851+targetingsnake@users.noreply.github.com>
Date:   Sat Feb 10 21:39:57 2024 +0100

    readded debug functions second time (#3131)

    * readed debug functions seccond time

    ---------

    Co-authored-by: targetingsnake <targetingsnake@users.noreply.github.com>

commit 6540b7c
Merge: 8cbc8e7 b580a2d
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Sat Feb 10 11:36:46 2024 +0000

    Automated Tolgee Update

commit 8cbc8e7
Merge: 1e03950 53e2985
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <jaj22x@gmail.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Thu Feb 8 20:49:57 2024 +0000

    Automated Tolgee Update

commit 16fa821
Merge: d3ba88a 0bc0367
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <148804148+Tiny-DM@users.noreply.github.com>
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 <94396851+targetingsnake@users.noreply.github.com>
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 <targetingsnake@users.noreply.github.com>

commit d6ab4ea
Merge: a174dbe 4afd496
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Tue Feb 6 07:43:19 2024 +0000

    Automated Tolgee Update

commit a174dbe
Merge: 63e90d6 06ad9f6
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <jaj22x@gmail.com>
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 <jaj22x@gmail.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Wed Jan 31 08:58:11 2024 +0000

    Automated Tolgee Update

commit 84121b4
Merge: 9fd39fb 15e4e41
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>

commit a5aa69d
Merge: 02bb42c 367d91a
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <49555217+ante185@users.noreply.github.com>
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 <rautamiekka@users.noreply.github.com>

    * Adds LIB_FLARE_PISTOL to Overrides

    ---------

    Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

commit 367d91a
Author: John Jordan <jaj22x@gmail.com>
Date:   Tue Jan 30 04:01:20 2024 +0000

    Fix fallback code for militia lacking cargo trucks

commit a1b41ee
Author: John Jordan <jaj22x@gmail.com>
Date:   Tue Jan 30 03:48:49 2024 +0000

    Add more logging for rebel and enemy airstrikes

commit 15e4e41
Author: John Jordan <jaj22x@gmail.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Mon Jan 29 20:26:40 2024 +0000

    Automated Tolgee Update

commit 2d0eccb
Author: ante185 <49555217+ante185@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>

commit c55e2c6
Author: ante185 <49555217+ante185@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
Date:   Sat Jan 27 10:04:15 2024 +0100

    CfgVehicles fix

commit 1d36293
Merge: 1bdc1c1 8730d26
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <49555217+ante185@users.noreply.github.com>
Date:   Thu Jan 25 15:00:12 2024 +0100

    Removed debug scope from a3a rhs t-72

commit 1bdc1c1
Author: ante185 <49555217+ante185@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>

commit 32866c8
Author: ante185 <49555217+ante185@users.noreply.github.com>
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 <39414270+Play3rgg@users.noreply.github.com>
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 <49555217+ante185@users.noreply.github.com>
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 <94396851+targetingsnake@users.noreply.github.com>
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 <targetingsnake@users.noreply.github.com>
    Co-authored-by: Bob-Murphy <Bob-Murphy@users.noreply.github.com>

commit 530fefc
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>

commit 2f90e16
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
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 <thecakebecamethelie@yahoo.com>
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 <Bob-Murphy@users.noreply.github.com>

commit f771de7
Author: Bob-Murphy <Bob-Murphy@users.noreply.github.com>
Date:   Sun Jan 21 22:40:12 2024 +0100

    stringtable fix

commit 6fd16f8
Author: ante185 <49555217+ante185@users.noreply.github.com>
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 <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>

commit 0e7b45c
Author: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>

commit 032e2a5
Author: Tiny-DM <148804148+Tiny-DM@users.noreply.github.com>
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 <Bob-Murphy@users.noreply.github.com>
  • Loading branch information
@ante185
ante185 committed Mar 28, 2024
1 parent 6a12134 commit 4c95536
Show file tree
Hide file tree
Showing 27 changed files with 118 additions and 73 deletions.
22 changes: 14 additions & 8 deletions A3A/addons/core/CfgMarkers.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,31 @@ class CfgMarkers
class a3a_flag_FFI : flag_NATO
{
name = "FFI";
icon = QPATHTOFOLDER(Templates\Templates\IFA\marker_ffi.paa);
texture = QPATHTOFOLDER(Templates\Templates\IFA\marker_ffi.paa);
icon = QPATHTOFOLDER(Pictures\Markers\ifa_ffi.paa);
texture = QPATHTOFOLDER(Pictures\Markers\ifa_ffi.paa);
};
class a3a_flag_AK : flag_NATO
{
name = "AK";
icon = QPATHTOFOLDER(Pictures\Markers\ifa_ak.paa);
texture = QPATHTOFOLDER(Pictures\Markers\ifa_ak.paa);
};
class a3a_flag_ALLIES : flag_NATO
{
name = "ALLIES";
icon = QPATHTOFOLDER(Templates\Templates\IFA\marker_allies.paa);
texture = QPATHTOFOLDER(Templates\Templates\IFA\marker_allies.paa);
icon = QPATHTOFOLDER(Pictures\Markers\ifa_allies.paa);
texture = QPATHTOFOLDER(Pictures\Markers\ifa_allies.paa);
};
class a3a_flag_WEH : flag_NATO
{
name = "WEH";
icon = QPATHTOFOLDER(Templates\Templates\IFA\marker_weh.paa);
texture = QPATHTOFOLDER(Templates\Templates\IFA\marker_weh.paa);
icon = QPATHTOFOLDER(Pictures\Markers\ifa_weh.paa);
texture = QPATHTOFOLDER(Pictures\Markers\ifa_weh.paa);
};
class a3a_flag_SOV : flag_NATO
{
name = "SOV";
icon = QPATHTOFOLDER(Templates\Templates\IFA\marker_sov.paa);
texture = QPATHTOFOLDER(Templates\Templates\IFA\marker_sov.paa);
icon = QPATHTOFOLDER(Pictures\Markers\ifa_sov.paa);
texture = QPATHTOFOLDER(Pictures\Markers\ifa_sov.paa);
};
};
Binary file added A3A/addons/core/Pictures/Flags/ifa_ak.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Flags/ifa_allies.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Flags/ifa_ffi.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Flags/ifa_fr.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Flags/ifa_pl.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Flags/ifa_sov.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Flags/ifa_weh.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Markers/ifa_ak.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Markers/ifa_allies.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Markers/ifa_ffi.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Markers/ifa_sov.paa
View file
Binary file not shown.
Binary file added A3A/addons/core/Pictures/Markers/ifa_weh.paa
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions A3A/addons/core/Templates/Templates.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,22 +995,22 @@ class Templates
class IFA_WEH : IFA_Base
{
side = "Inv";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_weh.paa);
flagTexture = "\x\A3A\addons\core\Pictures\Flags\ifa_weh.paa";
name = "IFA WEHRMACHT";
priority = 65;
file = "IFA_AI_WEH";
};
class IFA_SOV : IFA_Base
{
side = "Inv";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_sov.paa);
flagTexture = "\x\A3A\addons\core\Pictures\Flags\ifa_sov.paa";
name = "IFA SOVIET ARMY";
file = "IFA_AI_SOV";
};
class IFA_ALLIES : IFA_Base
{
side = "Occ";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_allies.paa);
flagTexture = "\x\A3A\addons\core\Pictures\Flags\ifa_allies.paa";
name = "IFA ALLIES";
priority = 65;
file = "IFA_AI_ALLIES";
Expand All @@ -1032,7 +1032,7 @@ class Templates
class IFA_FFI : IFA_Base
{
side = "Reb";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_ffi.paa);
flagTexture = "\x\A3A\addons\core\Pictures\Flags\ifa_ffi.paa";
name = "IFA French Resistance";
priority = 65;
file = "IFA_REB_FFI";
Expand All @@ -1042,7 +1042,7 @@ class Templates
class IFA_AK : IFA_Base
{
side = "Reb";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_ak.paa);
flagTexture = "\x\A3A\addons\core\Pictures\Flags\ifa_ak.paa";
name = "IFA Polish Resistance";
file = "IFA_REB_AK";
maps[] = {"Staszow"};
Expand All @@ -1051,7 +1051,7 @@ class Templates
class IFA_CIV_FR : IFA_Base
{
side = "Civ";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_fr.paa);
flagTexture = "\x\A3A\addons\core\Pictures\Flags\ifa_fr.paa";
name = "IFA French";
priority = 65;
file = "IFA_CIV_FR";
Expand All @@ -1060,7 +1060,7 @@ class Templates
class IFA_CIV_PL : IFA_Base
{
side = "Civ";
flagTexture = QPATHTOFOLDER(Templates\Templates\IFA\flag_pl.paa);
flagTexture = "\x\A3A\addons\core\Pictures\Flags\ifa_pl.paa";
name = "IFA Polish";
file = "IFA_CIV_PL";
maps[] = {"Staszow"};
Expand Down
12 changes: 6 additions & 6 deletions A3A/addons/core/Templates/Templates/IFA/IFA_AI_ALLIES.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
["spawnMarkerName", "Allies Support Corridor"] call _fnc_saveToTemplate;

["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Templates\Templates\IFA\flag_allies.paa"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Pictures\Flags\ifa_allies.paa"] call _fnc_saveToTemplate;
["flagMarkerType", "a3a_flag_ALLIES"] call _fnc_saveToTemplate;

//////////////////////////
// Vehicles //
//////////////////////////

["attributeLowAir", true] call _fnc_saveToTemplate;

["ammobox", "LIB_WeaponsBox_Big_SU"] call _fnc_saveToTemplate;
["surrenderCrate", "LIB_BasicAmmunitionBox_US"] call _fnc_saveToTemplate;
["equipmentBox", "WW2_Cle_Container"] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -54,7 +56,7 @@ for "_i" from 1 to _tankRatio do { _tanks append _mediumTanks; };


["vehiclesTransportBoats", ["LIB_LCA"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCM3_Armed"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCI"]] call _fnc_saveToTemplate;
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["LIB_P47","LIB_P47","LIB_RAF_P39"]] call _fnc_saveToTemplate; // Will be used with CAS script, must be defined in setPlaneLoadout. Needs fixed gun and either rockets or missiles
Expand Down Expand Up @@ -148,7 +150,7 @@ _loadoutData set ["signalsmokeGrenades", ["LIB_US_M18_Green","LIB_US_M18_Red","L
_loadoutData set ["maps", ["ItemMap"]];
_loadoutData set ["watches", ["ItemWatch"]];
_loadoutData set ["compasses", ["ItemCompass"]];
_loadoutData set ["radios", []];
_loadoutData set ["radios", ["ItemRadio"]];
_loadoutData set ["gpses", []];
_loadoutData set ["NVGs", []];
_loadoutData set ["binoculars", ["LIB_Binocular_US"]];
Expand Down Expand Up @@ -206,7 +208,6 @@ _sfLoadoutData set ["backpacks", ["B_LIB_US_M36_Bandoleer"]];
_sfLoadoutData set ["helmets", ["H_LIB_US_Rangers_Helmet_ns"]];
_sfLoadoutData set ["slHelmets", ["H_LIB_US_Rangers_Helmet_NCO"]];
_sfLoadoutData set ["atBackpacks", ["B_LIB_US_Backpack_RocketBag_Empty"]];
_sfLoadoutData set ["radios", ["ItemRadio"]];
//["Weapon", "Muzzle", "Rail", "Sight", [], [], "Bipod"];

_sfLoadoutData set ["lightATLaunchers", [
Expand Down Expand Up @@ -247,8 +248,7 @@ _militaryLoadoutData set ["slWeapons", ["LIB_M3_GreaseGun", "LIB_M1A1_Thompson",
_militaryLoadoutData set ["rifles", [["LIB_M1_Garand", "LIB_ACC_M1_Bayo", "", "", [], [], ""],"LIB_M1_Garand" ]];
_militaryLoadoutData set ["carbines", ["LIB_M1_Carbine"]];
_militaryLoadoutData set ["grenadeLaunchers", [
["LIB_M1_Garand", "LIB_ACC_GL_M7", "", "", [], ["LIB_1Rnd_G_Mk2"], ""],
["LIB_M1_Garand", "LIB_ACC_GL_M7", "", "", [], ["LIB_1Rnd_G_M9A1"], ""]
["LIB_M1_Garand", "LIB_ACC_GL_M7", "", "", [], ["LIB_1Rnd_G_Mk2"], ""]
]];
_militaryLoadoutData set ["SMGs", ["LIB_M3_GreaseGun", "LIB_M3_GreaseGun", "LIB_M1A1_Thompson"]];
_militaryLoadoutData set ["machineGuns", [
Expand Down
13 changes: 7 additions & 6 deletions A3A/addons/core/Templates/Templates/IFA/IFA_AI_SOV.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
["spawnMarkerName", "Soviet Support Corridor"] call _fnc_saveToTemplate;

["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Templates\Templates\IFA\flag_sov.paa"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Pictures\Flags\ifa_sov.paa"] call _fnc_saveToTemplate;
["flagMarkerType", "a3a_flag_SOV"] call _fnc_saveToTemplate;

//////////////////////////
// Vehicles //
//////////////////////////

["attributeLowAir", true] call _fnc_saveToTemplate;

["ammobox", "LIB_WeaponsBox_Big_SU"] call _fnc_saveToTemplate;
["surrenderCrate", "LIB_Lone_Big_Box"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
["equipmentBox", "WW2_Cle_Container"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
Expand All @@ -27,8 +29,8 @@
["vehiclesRepairTrucks", ["LIB_Zis6_Parm"]] call _fnc_saveToTemplate;
["vehiclesFuelTrucks", ["LIB_Zis5v_Fuel"]] call _fnc_saveToTemplate;
["vehiclesMedical", ["LIB_Zis5v_Med"]] call _fnc_saveToTemplate;
["vehiclesLightAPCs", ["LIB_SOV_M3_Halftrack", "LIB_Scout_M3_FFV"]] call _fnc_saveToTemplate; // armed, lightly armoured, with 6-8 passengers
["vehiclesAPCs", ["LIB_SOV_M3_Halftrack", "LIB_SdKfz251_captured_FFV"]] call _fnc_saveToTemplate; // armed with enclosed turret, armoured, with 6-8 passengers
["vehiclesLightAPCs", ["LIB_SOV_M3_Halftrack", "LIB_SOV_M3_Halftrack", "LIB_SdKfz251_captured_FFV"]] call _fnc_saveToTemplate; // armed, lightly armoured, with 6-8 passengers
["vehiclesAPCs", []] call _fnc_saveToTemplate; // armed with enclosed turret, armoured, with 6-8 passengers
["vehiclesIFVs", []] call _fnc_saveToTemplate; // capable of surviving multiple rockets, cannon armed, with 6-8 passengers
["vehiclesLightTanks", []] call _fnc_saveToTemplate;
["vehiclesTanks", [
Expand All @@ -39,7 +41,7 @@


["vehiclesTransportBoats", ["LIB_LCA"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCM3_Armed"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCI"]] call _fnc_saveToTemplate;
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["LIB_Pe2"]] call _fnc_saveToTemplate; // Will be used with CAS script, must be defined in setPlaneLoadout. Needs fixed gun and either rockets or missiles
Expand Down Expand Up @@ -132,7 +134,7 @@ _loadoutData set ["signalsmokeGrenades", ["LIB_RDG"]];
_loadoutData set ["maps", ["ItemMap"]];
_loadoutData set ["watches", ["ItemWatch"]];
_loadoutData set ["compasses", ["ItemCompass"]];
_loadoutData set ["radios", []];
_loadoutData set ["radios", ["ItemRadio"]];
_loadoutData set ["gpses", []];
_loadoutData set ["NVGs", []];
_loadoutData set ["binoculars", ["LIB_Binocular_SU"]];
Expand Down Expand Up @@ -192,7 +194,6 @@ _sfLoadoutData set ["backpacks", ["B_LIB_SOV_RA_Rucksack2_Gas_Kit_Shinel"]];
_sfLoadoutData set ["atBackpacks", ["B_LIB_US_Backpack_RocketBag_Empty"]];
_sfLoadoutData set ["helmets", ["H_LIB_SOV_RA_Helmet"]];
_sfLoadoutData set ["slHelmets", ["H_LIB_SOV_RA_Helmet"]];
_sfLoadoutData set ["radios", ["ItemRadio"]];
//["Weapon", "Muzzle", "Rail", "Sight", [], [], "Bipod"];

_sfLoadoutData set ["slWeapons", [
Expand Down
21 changes: 12 additions & 9 deletions A3A/addons/core/Templates/Templates/IFA/IFA_AI_UK.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// Vehicles //
//////////////////////////

["attributeLowAir", true] call _fnc_saveToTemplate;

["ammobox", "LIB_WeaponsBox_Big_SU"] call _fnc_saveToTemplate;
["surrenderCrate", "LIB_BasicAmmunitionBox_US"] call _fnc_saveToTemplate;
["equipmentBox", "WW2_Cle_Container"] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -54,7 +56,7 @@ for "_i" from 1 to _tankRatio do { _tanks append _mediumTanks; };


["vehiclesTransportBoats", ["LIB_LCA"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCM3_Armed"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_UK_LCI"]] call _fnc_saveToTemplate;
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["LIB_RAF_P39"]] call _fnc_saveToTemplate; // Will be used with CAS script, must be defined in setPlaneLoadout. Needs fixed gun and either rockets or missiles
Expand Down Expand Up @@ -147,7 +149,7 @@ _loadoutData set ["signalsmokeGrenades", ["LIB_US_M18_Green","LIB_US_M18_Red","L
_loadoutData set ["maps", ["ItemMap"]];
_loadoutData set ["watches", ["ItemWatch"]];
_loadoutData set ["compasses", ["ItemCompass"]];
_loadoutData set ["radios", []];
_loadoutData set ["radios", ["ItemRadio"]];
_loadoutData set ["gpses", []];
_loadoutData set ["NVGs", []];
_loadoutData set ["binoculars", ["LIB_Binocular_UK"]];
Expand Down Expand Up @@ -198,9 +200,9 @@ _sfLoadoutData set ["backpacks", ["B_LIB_UK_HSack"]];
_sfLoadoutData set ["helmets", ["H_LIB_UK_Helmet_Mk2"]];
//["Weapon", "Muzzle", "Rail", "Sight", [], [], "Bipod"];

_sfLoadoutData set ["slWeapons", ["LIB_M1928_Thompson", "LIB_Sten_Mk5"]];
_sfLoadoutData set ["carbines", ["LIB_M1A1_Carbine"]];
_sfLoadoutData set ["SMGs", ["LIB_M1928_Thompson", "LIB_Sten_Mk5"]];
_sfLoadoutData set ["slWeapons", ["LIB_M1928_Thompson", "LIB_Sten_Mk5"], ["LIB_50Rnd_45ACP", "LIB_30Rnd_45ACP"], [], ""]];
_sfLoadoutData set ["carbines", ["LIB_M1A1_Carbine", "LIB_M1A1_Carbine", ["LIB_DELISLE", "", "", "", ["LIB_7Rnd_45ACP"], [], ""]]];
_sfLoadoutData set ["SMGs", ["LIB_M1928_Thompson", "LIB_Sten_Mk5", ["LIB_M1928_Thompson", "", "", "", ["LIB_50Rnd_45ACP", "LIB_30Rnd_45ACP"], [], ""]]];
/////////////////////////////////
// Military Loadout Data //
/////////////////////////////////
Expand Down Expand Up @@ -245,7 +247,7 @@ _crewLoadoutData set ["uniforms", ["U_LIB_UK_P37_Sergeant", "U_LIB_UK_P37"]];
_crewLoadoutData set ["vests", ["V_LIB_UK_P37_Crew"]];
_crewLoadoutData set ["helmets", ["H_LIB_UK_Beret_Tankist", "H_LIB_UK_Beret_Headset"]];

_crewLoadoutData set ["sidearms", ["LIB_Webley_mk6"]];
_crewLoadoutData set ["sidearms", ["LIB_Colt_M1911", "LIB_Webley_mk6", "LIB_Webley_mk6"]];

private _pilotLoadoutData = _militaryLoadoutData call _fnc_copyLoadoutData;
_pilotLoadoutData set ["uniforms", ["U_LIB_US_Pilot", "U_LIB_US_Pilot_2"]];
Expand Down Expand Up @@ -587,11 +589,12 @@ private _crewTemplate = {
if(random 10 > 5) then
{
[selectRandom ["SMGs", "carbines"]] call _fnc_setPrimary;
["primary", 2] call _fnc_addMagazines;
["primary", 3] call _fnc_addMagazines;
} else {
["sidearms"] call _fnc_setHandgun;
["handgun", 4] call _fnc_addMagazines;
};

["sidearms"] call _fnc_setHandgun;
["handgun", 4] call _fnc_addMagazines;

["items_medical_basic"] call _fnc_addItemSet;
["items_crew_extras"] call _fnc_addItemSet;
Expand Down
11 changes: 8 additions & 3 deletions A3A/addons/core/Templates/Templates/IFA/IFA_AI_US.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// Vehicles //
//////////////////////////

["attributeLowAir", true] call _fnc_saveToTemplate;

["ammobox", "LIB_WeaponsBox_Big_SU"] call _fnc_saveToTemplate;
["surrenderCrate", "LIB_BasicAmmunitionBox_US"] call _fnc_saveToTemplate;
["equipmentBox", "WW2_Cle_Container"] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -52,7 +54,7 @@ for "_i" from 1 to _tankRatio do { _tanks append _mediumTanks; };


["vehiclesTransportBoats", ["LIB_LCA"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCM3_Armed"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCI"]] call _fnc_saveToTemplate;
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["LIB_P47","LIB_P47","LIB_US_P39"]] call _fnc_saveToTemplate; // Will be used with CAS script, must be defined in setPlaneLoadout. Needs fixed gun and either rockets or missiles
Expand Down Expand Up @@ -144,7 +146,7 @@ _loadoutData set ["signalsmokeGrenades", ["LIB_US_M18_Green","LIB_US_M18_Red","L
_loadoutData set ["maps", ["ItemMap"]];
_loadoutData set ["watches", ["ItemWatch"]];
_loadoutData set ["compasses", ["ItemCompass"]];
_loadoutData set ["radios", []];
_loadoutData set ["radios", ["ItemRadio"]];
_loadoutData set ["gpses", []];
_loadoutData set ["NVGs", []];
_loadoutData set ["binoculars", ["LIB_Binocular_US"]];
Expand Down Expand Up @@ -610,7 +612,10 @@ private _crewTemplate = {
if(random 10 > 5) then
{
[selectRandom ["SMGs", "carbines"]] call _fnc_setPrimary;
["primary", 2] call _fnc_addMagazines;
["primary", 3] call _fnc_addMagazines;
} else {
["sidearms"] call _fnc_setHandgun;
["handgun", 4] call _fnc_addMagazines;
};

["sidearms"] call _fnc_setHandgun;
Expand Down
11 changes: 6 additions & 5 deletions A3A/addons/core/Templates/Templates/IFA/IFA_AI_WEH.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
["spawnMarkerName", "Wehrmacht Support Corridor"] call _fnc_saveToTemplate;

["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Templates\Templates\IFA\flag_weh.paa"] call _fnc_saveToTemplate;
["flagTexture", "\x\A3A\addons\core\Pictures\Flags\ifa_weh.paa"] call _fnc_saveToTemplate;
["flagMarkerType", "a3a_flag_WEH"] call _fnc_saveToTemplate;

//////////////////////////
// Vehicles //
//////////////////////////

["attributeLowAir", true] call _fnc_saveToTemplate;

["ammobox", "LIB_WeaponsBox_Big_SU"] call _fnc_saveToTemplate;
["surrenderCrate", "LIB_BasicWeaponsBox_GER"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
["equipmentBox", "WW2_Cle_Container"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
Expand Down Expand Up @@ -61,7 +63,7 @@ for "_i" from 1 to _tankRatio do { _tanks append _mediumTanks; };


["vehiclesTransportBoats", ["LIB_LCA"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCM3_Armed"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["LIB_LCI"]] call _fnc_saveToTemplate;
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["LIB_Ju87","LIB_FW190F8_2"]] call _fnc_saveToTemplate; // Will be used with CAS script, must be defined in setPlaneLoadout. Needs fixed gun and either rockets or missiles
Expand Down Expand Up @@ -94,7 +96,7 @@ for "_i" from 1 to _tankRatio do { _tanks append _mediumTanks; };

["staticMGs", ["LIB_MG42_Lafette_low_Deployed","LIB_MG34_Lafette_low_Deployed"]] call _fnc_saveToTemplate;
["staticAT", ["LIB_Pak40_g","LIB_Pak40_g","LIB_leFH18_AT"]] call _fnc_saveToTemplate;
["staticAA", ["LIB_FlaK_36_AA","LIB_FlaK_30","LIB_FlaK_30","LIB_FlaK_38","LIB_FlaK_38","LIB_Flakvierling_38","LIB_Flakvierling_38"]] call _fnc_saveToTemplate;
["staticAA", ["LIB_FlaK_36_AA","LIB_FlaK_38","LIB_FlaK_38","LIB_FlaK_38","LIB_FlaK_38","LIB_Flakvierling_38","LIB_Flakvierling_38"]] call _fnc_saveToTemplate;
["staticMortars", ["LIB_GrWr34","LIB_GrWr34_g"]] call _fnc_saveToTemplate;

["mortarMagazineHE", "LIB_8Rnd_81mmHE_GRWR34"] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -153,7 +155,7 @@ _loadoutData set ["signalsmokeGrenades", ["LIB_NB39"]];
_loadoutData set ["maps", ["ItemMap"]];
_loadoutData set ["watches", ["LIB_GER_ItemWatch"]];
_loadoutData set ["compasses", ["LIB_GER_ItemCompass_deg"]];
_loadoutData set ["radios", []];
_loadoutData set ["radios", ["ItemRadio"]];
_loadoutData set ["gpses", []];
_loadoutData set ["NVGs", []];
_loadoutData set ["binoculars", ["LIB_Binocular_GER"]];
Expand Down Expand Up @@ -211,7 +213,6 @@ _sfLoadoutData set ["vests", ["V_LIB_GER_VestG43", "V_LIB_GER_VestSTG"]];
_sfLoadoutData set ["slVests", ["V_LIB_GER_VestUnterofficer"]];
_sfLoadoutData set ["backpacks", ["B_LIB_GER_Backpack"]];
_sfLoadoutData set ["helmets", ["H_LIB_ST_Helmet2"]];
_sfLoadoutData set ["radios", ["ItemRadio"]];
//["Weapon", "Muzzle", "Rail", "Sight", [], [], "Bipod"];

_sfLoadoutData set ["lightATLaunchers", []];
Expand Down
6 changes: 3 additions & 3 deletions A3A/addons/core/Templates/Templates/IFA/IFA_CIV_Common.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
["vehiclesCivCar", [
"LIB_GazM1", 1.5,
"LIB_GazM1_dirty", 2.5,
"LIB_CIV_FFI_CitC4", 0.25,
"LIB_CIV_FFI_CitC4_2", 0.25,
"LIB_CIV_FFI_CitC4_3", 0.25
"LIB_CIV_FFI_CitC4", 0.125,
"LIB_CIV_FFI_CitC4_2", 0.125,
"LIB_CIV_FFI_CitC4_3", 0.125
]] call _fnc_saveToTemplate; //this line determines civilian cars -- Example: ["vehiclesCivCar", ["C_Offroad_01_F"]] -- Array, can contain multiple assets

["vehiclesCivIndustrial", [
Expand Down
Loading

0 comments on commit 4c95536

Please sign in to comment.