Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added and updated Viking loadouts and Compositions as well as updated display name and order of comps #1217

Merged
merged 34 commits into from
Jul 22, 2024
Merged

Added and updated Viking loadouts and Compositions as well as updated display name and order of comps #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
05033be
Updating/Adding Viking squad and weapons loadout
Zarenx Jul 20, 2024
8548943
Update CfgLoadouts_Bravo_Weapon.hpp
Zarenx Jul 20, 2024
49539e6
Update CfgLoadouts_Bravo_Weapon.hpp
Zarenx Jul 20, 2024
138c312
Update CfgLoadouts_Bravo_Viking.hpp
Zarenx Jul 20, 2024
edcae89
Update CfgLoadouts_Bravo_Weapon.hpp
Zarenx Jul 20, 2024
9938641
Update CfgLoadouts.hpp
Zarenx Jul 20, 2024
3aef699
Update and rename CfgLoadouts_Bravo_Weapon.hpp to CfgLoadouts_Bravo_V…
Zarenx Jul 20, 2024
e47ce80
Update CfgLoadouts_Bravo_Viking_Weapons.hpp
Zarenx Jul 20, 2024
b2f21d1
Update CfgLoadouts_Charlie_Weapon.hpp
Zarenx Jul 20, 2024
093e209
Merge branch 'Viking-Platoon-Kits' of https://github.com/Zarenx/cScri…
Zarenx Jul 20, 2024
b9434ab
Update CfgLoadouts_Bravo_Viking.hpp
Zarenx Jul 20, 2024
8204314
Update CfgLoadouts_Charlie_Squad.hpp
Zarenx Jul 20, 2024
eb6e7ce
Merge branch 'Viking-Platoon-Kits' of https://github.com/Zarenx/cScri…
Zarenx Jul 20, 2024
0566dd0
Update composition.sqe
Zarenx Jul 20, 2024
dd78a44
Update CfgLoadouts_Bravo_Viking.hpp
Zarenx Jul 20, 2024
b8fc781
asd
Zarenx Jul 20, 2024
e9d01ab
Update CfgLoadouts.hpp
Zarenx Jul 20, 2024
54a0f5e
asd
Zarenx Jul 20, 2024
b9c9734
Update fn_setupLoadoutCategories.sqf
Zarenx Jul 20, 2024
47052aa
Update fn_setupLoadoutCategories.sqf
Zarenx Jul 20, 2024
fa8d71c
Updated Loadouts
Zarenx Jul 20, 2024
24903a5
Merge branch 'Viking-Platoon-Kits' of https://github.com/Zarenx/cScri…
Zarenx Jul 20, 2024
85a3f36
Update fn_setupLoadoutCategories.sqf
Zarenx Jul 20, 2024
9e9f54d
Update CfgLoadouts_Bravo_Viking.hpp
Zarenx Jul 20, 2024
421ea5d
Update CfgLoadouts_Bravo_Viking.hpp
Zarenx Jul 20, 2024
5b26c98
Update CfgLoadouts_Bravo_Viking.hpp
Zarenx Jul 20, 2024
bca3fb4
Update CfgLoadouts_Bravo_Crew.hpp
Zarenx Jul 20, 2024
7f17c61
Merge branch 'Viking-Platoon-Kits' of https://github.com/Zarenx/cScri…
Zarenx Jul 20, 2024
54db297
Updated display order and remove SABRE
Zarenx Jul 20, 2024
01bf61d
Removed Sabre Composition
Zarenx Jul 20, 2024
b7fa4fa
Updated Spelling on Charlie Combat Lifesaver
Zarenx Jul 20, 2024
5ca3fcf
Updated Weapons squad leaders description
Zarenx Jul 20, 2024
afb36c6
Update fn_setupLoadoutCategories.sqf
AndreasBrostrom Jul 22, 2024
2266eef
Update fn_setupLoadoutCategories.sqf
AndreasBrostrom Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 76 additions & 76 deletions Compositions/1.Cav_Viking_Platoon/composition.sqe
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Compositions/2.Cav_Bandit_Platoon/composition.sqe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ class items
{
rank="SERGEANT";
init="call{this setgroupID[""BANDIT-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""BANDIT-4""];}";
description="Squad Leader@BANDIT-4";
description="Weapons Squad Leader@BANDIT-4";
isPlayable=1;
};
id=397;
Expand Down
2 changes: 1 addition & 1 deletion Compositions/3.Cav_Misfit_Platoon/composition.sqe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,7 +1216,7 @@ class items
{
rank="SERGEANT";
init="this setGroupid [""MISFIT-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""MISFIT-4""];";
description="Squad Leader@MISFIT-4";
description="Weapons Squad Leader@MISFIT-4";
isPlayable=1;
};
id=467;
Expand Down
0 Compositions/5.ATLAS_Platoon/composition.sqe → ...tions/4.Cav_ATLAS_Platoon/composition.sqe
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Compositions/5.ATLAS_Platoon/header.sqe → Compositions/4.Cav_ATLAS_Platoon/header.sqe
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version=54;
name="5.ATLAS_Platoon_DEVBUILD";
name="4.ATLAS_Platoon_DEVBUILD";
author="=7Cav=CPL.Zaren.T";
category="Cav_EdSubcat_Deploy_Platoon";
requiredAddons[]=
Expand Down
Loading