Skip to content

Commit 6130de3

Browse files
Sasha20kproSasha20kpro
authored
Merge branch 'Global-Conflicts-ArmA:master' into master
2 parents b018809 + 7b38fcb commit 6130de3

72 files changed

Lines changed: 5067 additions & 310 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Missions/Jub/LightArmoredRecon.conf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
SCR_MissionHeader {
2+
World "{0A04EF216B35C42B}worlds/Jub/LightArmoredRecon/LightArmoredRecon.ent"
3+
m_sName "COOP (16-28) Light Armored Recon"
4+
m_sAuthor "jubxxxjub"
5+
m_sDescription "USMC LAR support an attack on RU forces"
6+
m_sGameMode "COOP"
7+
m_iPlayerCount 28
8+
}

‎Missions/Jub/LightArmoredRecon.conf.meta‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
MetaFileClass {
2+
Name "{3E070AE23CF7241F}Missions/Jub/LightArmoredRecon.conf"
3+
Configurations {
4+
CONFResourceClass PC {
5+
}
6+
CONFResourceClass XBOX_ONE : PC {
7+
}
8+
CONFResourceClass XBOX_SERIES : PC {
9+
}
10+
CONFResourceClass PS4 : PC {
11+
}
12+
CONFResourceClass PS5 : PC {
13+
}
14+
CONFResourceClass HEADLESS : PC {
15+
}
16+
CONFResourceClass Xbox : PC {
17+
}
18+
}
19+
}

‎Missions/TheLocalPub/Joutus.conf‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
SCR_MissionHeader {
2+
World "{4686580AAF58BDDF}worlds/TheLocalPub/Joutus/Joutus.ent"
3+
m_sName "COTVT (20-33) Joutus"
4+
m_sAuthor "TheLocalPub"
5+
m_sDescription "Canadian forces have been pursuing an FIA cell for several days. Isolated, cut off, and fixed in location, the FIA cell makes it's final stand. Can they repel the Canadian assault?"
6+
m_sDetails "Canadian forces have been pursuing an FIA cell for several days. Isolated, cut off, and fixed in location, the FIA cell makes it's final stand. Can they repel the Canadian assault?"
7+
m_iPlayerCount 33
8+
m_GC_Metadata GC_MissionMetadata "{6A3CCAAA83FC4FF6}" {
9+
m_FriendlyForce GC_ForceDefinition "{6A3CCAAA8081D872}" {
10+
m_sFactionKey "GC_CAF"
11+
m_eType MOTORIZED
12+
}
13+
m_OpposingForce GC_ForceDefinition "{6A3CCAAA84E515B6}" {
14+
m_sFactionKey "FIA"
15+
m_eType LIGHT
16+
}
17+
m_eEra ERA_2020s
18+
m_eSpecialAssets {
19+
DRONES
20+
}
21+
}
22+
}

‎Missions/TheLocalPub/Joutus.conf.meta‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
MetaFileClass {
2+
Name "{715CFD69B983CE6D}Missions/TheLocalPub/Joutus.conf"
3+
Configurations {
4+
CONFResourceClass PC {
5+
}
6+
CONFResourceClass XBOX_ONE : PC {
7+
}
8+
CONFResourceClass XBOX_SERIES : PC {
9+
}
10+
CONFResourceClass PS4 : PC {
11+
}
12+
CONFResourceClass PS5 : PC {
13+
}
14+
CONFResourceClass HEADLESS : PC {
15+
}
16+
CONFResourceClass Xbox : PC {
17+
}
18+
}
19+
}

‎Missions/TheLocalPub/OilRigRangos.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
SCR_MissionHeader {
22
World "{00840EF88C54F288}worlds/TheLocalPub/OilRigRangos/OilRigRangos.ent"
3-
m_sName "TVT (20-48) OilRigRangos"
3+
m_sName "TVT (20-46) OilRigRangos"
44
m_sAuthor "TheLocalPub"
55
m_sDescription "42 Cmdo must stop a radical group called ECO, from blowing up the TEM POWER oil rig."
66
m_sDetails "Radical environmentalist from the Earth Contamination Outfit have launched a surprise attack on a TEM POWER oil rig off the coast of Scotland."\
77
"They've captured hostages and plan to blow the rig sky high with the goal of causing an environmental distaster."\
88
""\
99
"Can 42Cmdo rapidly deploy and neutralize the threat in time?"
1010
m_iPlayerCount 47
11-
}
11+
}

‎Missions/TheLocalPub/TakingTrenches.conf‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
SCR_MissionHeader {
2+
World "{20CACBE0D7D21595}worlds/TheLocalPub/TakingTrenches/TakingTrenches.ent"
3+
m_sName "COTVT (15-28) Taking Trenches"
4+
m_sAuthor "TheLocalPub"
5+
m_sDescription "Special forces from the Chernarus Defence Force conduct a deliberate assault to secure a Russian headquarters operating along the Zherebets river."
6+
m_sDetails "Special forces from the Chernarus Defence Force conduct a deliberate assault to secure a Russian headquarters operating along the Zherebets river."
7+
m_iPlayerCount 28
8+
m_GC_Metadata GC_MissionMetadata "{6A367EBCF57BF0B0}" {
9+
m_FriendlyForce GC_ForceDefinition "{6A367EBCEA57DAE1}" {
10+
m_sFactionKey "GC_CDF"
11+
m_eType LIGHT
12+
}
13+
m_OpposingForce GC_ForceDefinition "{6A367EBCE399A609}" {
14+
m_sFactionKey "RHS_AFRF"
15+
m_eType LIGHT
16+
}
17+
m_eEra ERA_2020s
18+
m_eSpecialAssets {
19+
DRONES
20+
}
21+
}
22+
}

‎Missions/TheLocalPub/TakingTrenches.conf.meta‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
MetaFileClass {
2+
Name "{26FB09A7602F249E}Missions/TheLocalPub/TakingTrenches.conf"
3+
Configurations {
4+
CONFResourceClass PC {
5+
}
6+
CONFResourceClass XBOX_ONE : PC {
7+
}
8+
CONFResourceClass XBOX_SERIES : PC {
9+
}
10+
CONFResourceClass PS4 : PC {
11+
}
12+
CONFResourceClass PS5 : PC {
13+
}
14+
CONFResourceClass HEADLESS : PC {
15+
}
16+
CONFResourceClass Xbox : PC {
17+
}
18+
}
19+
}

‎worlds/Delfer/Grouse_Hunt/Grouse_Hunt_Layers/Objects.layer‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ GenericEntity {
77
}
88
}
99
coords 4592.794 145.364 6749.499
10+
angles 10.354 0 0
1011
}

‎worlds/Delfer/Grouse_Hunt/Grouse_Hunt_Layers/Players.layer‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,7 @@ SCR_AIGroup : "{43FF832A024AD2EA}Prefabs/Groups/BLUFOR/US/Army/1981/101st Airbor
4444
coords 4590.388 151.114 6754.694
4545
angles -4.921 145.485 2.296
4646
m_aUnitPrefabSlots {
47-
""
48-
""
4947
"{8426E83786EC8E1E}Prefabs/Characters/Factions/BLUFOR/US_Army/1981/Pilots/P/Character_US_1981_Pilot_P.et"
50-
""
51-
""
52-
""
53-
""
54-
""
55-
""
56-
""
5748
}
5849
m_sCustomNameSet "Pilot"
5950
}

‎worlds/Jub/CobrasBite/Cobras_bite_Layers/players.layer‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ SCR_AIGroup Sq2 : "{C62B0A55626A9D90}Prefabs/Groups/BLUFOR/US/Marines/2025/Marin
169169
"{5018C15D7AB1AE99}Prefabs/Characters/Factions/BLUFOR/RHS_USAF/2025/Marines/Desert/Character_2025_USMC_LAT_D.et"
170170
"{9F318E347C7D1DDE}Prefabs/Characters/Factions/BLUFOR/RHS_USAF/2025/Marines/Desert/Character_2025_USMC_TL_DMR_D.et"
171171
"{344A4421876CAD27}Prefabs/Characters/Factions/BLUFOR/RHS_USAF/2025/Marines/Desert/Character_2025_USMC_GL_D.et"
172-
"{5449D2F88894225B}Prefabs/Characters/Factions/BLUFOR/RHS_USAF/2025/Marines/Desert/Character_2025_USMC_MAAW_D.et"
173-
"{D978A1BE753ED0C8}Prefabs/Characters/Factions/BLUFOR/RHS_USAF/2025/Marines/Desert/Character_2025_USMC_MAAW_ASST_D.et"
172+
"{6CA5BE07728357DE}Prefabs/Characters/Factions/BLUFOR/RHS_USAF/2025/Marines/Desert/Character_2025_USMC_M3MAAW_D.et"
173+
"{4EA7CF8765E83F76}Prefabs/Characters/Factions/BLUFOR/RHS_USAF/2025/Marines/Desert/Character_2025_USMC_M3MAAW_ASST_D.et"
174174
}
175175
}
176176
Vehicle JLTV_OGPK1 : "{DEB5350D1B0FAE4D}Prefabs/Vehicles/Wheeled/JLTV/OGPK/M2HB/JLTV_OGPK_Pas13G.et" {

0 commit comments

Comments
 (0)