weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into faction_refactor

Browse Source 
# Conflicts:
#	game/factions/bluefor_coldwar.py
#	game/factions/bluefor_coldwar_a4.py
#	game/factions/bluefor_coldwar_mods.py
#	game/factions/bluefor_modern.py
This commit is contained in:
Khopa
2020-10-24 16:57:28 +02:00
parent 669a8c9e64 04d3ba4c47
commit f962fd55bc
36 changed files with 571 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
game/factions/russia_1955.py
View File

@@ -1,4 +1,12 @@
from dcs.planes import An_26B, An_30M, IL_76MD, IL_78M, MiG_15bis, Yak_40
from dcs.planes import (
An_26B,
An_30M,
IL_76MD,
IL_78M,
MiG_15bis,
Tu_95MS,
Yak_40,
)
from dcs.ships import (
Bulk_cargo_ship_Yakushev,
CV_1143_5_Admiral_Kuznetsov,
@@ -19,6 +27,8 @@ Russia_1955 = {
An_30M,
Yak_40,
Tu_95MS,
AirDefence.AAA_ZU_23_Closed,
AirDefence.AAA_ZU_23_on_Ural_375,
Armor.ARV_BRDM_2,

3
game/factions/russia_1965.py
View File

@@ -8,6 +8,7 @@ from dcs.planes import (
MiG_15bis,
MiG_19P,
MiG_21Bis,
Tu_95MS,
Yak_40,
)
from dcs.ships import (
@@ -32,6 +33,8 @@ Russia_1965 = {
An_30M,
Yak_40,
Tu_95MS,
A_50,
Mi_8MT,

5
game/factions/russia_1975.py
View File

@@ -15,6 +15,8 @@ from dcs.planes import (
Su_17M4,
Su_24M,
Su_25,
Tu_22M3,
Tu_95MS,
Yak_40,
)
from dcs.ships import (
@@ -41,6 +43,9 @@ Russia_1975 = {
Su_24M,
Su_25,
Tu_22M3,
Tu_95MS,
IL_76MD,
IL_78M,
An_26B,

7
game/factions/russia_1990.py
View File

@@ -17,6 +17,9 @@ from dcs.planes import (
Su_24M,
Su_25,
Su_27,
Tu_160,
Tu_22M3,
Tu_95MS,
Yak_40,
)
from dcs.ships import (
@@ -51,6 +54,10 @@ Russia_1990 = {
Su_25,
Ka_50,
Tu_160,
Tu_22M3,
Tu_95MS,
IL_76MD,
IL_78M,
An_26B,

7
game/factions/russia_2010.py
View File

@@ -20,6 +20,9 @@ from dcs.planes import (
Su_30,
Su_33,
Su_34,
Tu_160,
Tu_22M3,
Tu_95MS,
Yak_40,
)
from dcs.ships import (
@@ -55,6 +58,10 @@ Russia_2010 = {
Su_24M,
L_39ZA,
Tu_160,
Tu_22M3,
Tu_95MS,
IL_76MD,
IL_78M,
An_26B,

7
game/factions/russia_2020.py
View File

@@ -20,6 +20,9 @@ from dcs.planes import (
Su_30,
Su_33,
Su_34,
Tu_160,
Tu_22M3,
Tu_95MS,
Yak_40,
)
from dcs.ships import (
@@ -58,6 +61,10 @@ Russia_2020 = {
Su_24M,
L_39ZA,
Tu_160,
Tu_22M3,
Tu_95MS,
IL_76MD,
IL_78M,
An_26B,

7
game/factions/us_aggressors.py
View File

@@ -6,10 +6,13 @@ from dcs.helicopters import (
UH_1H,
)
from dcs.planes import (
B_1B,
B_52H,
C_130,
E_3A,
FA_18C_hornet,
F_15C,
F_15E,
F_16C_50,
F_5E_3,
KC130,
@@ -38,11 +41,15 @@ US_Aggressors = {
"units": [
F_15C,
F_15E,
F_5E_3,
FA_18C_hornet,
F_16C_50,
Su_27,
B_1B,
B_52H,
KC_135,
KC130,
C_130,

3
game/factions/usa_1955.py
View File

@@ -1,4 +1,5 @@
from dcs.planes import (
B_52H,
C_130,
E_3A,
F_86F_Sabre,
@@ -25,6 +26,8 @@ USA_1955 = {
F_86F_Sabre,
P_51D,
B_52H,
KC_135,
KC130,
C_130,

3
game/factions/usa_1960.py
View File

@@ -2,6 +2,7 @@ from dcs.helicopters import (
UH_1H,
)
from dcs.planes import (
B_52H,
C_130,
E_3A,
F_86F_Sabre,
@@ -28,6 +29,8 @@ USA_1960 = {
F_86F_Sabre,
P_51D,
B_52H,
KC_135,
KC130,
C_130,

7
game/factions/usa_1990.py
View File

@@ -5,9 +5,12 @@ from dcs.helicopters import (
from dcs.planes import (
AV8BNA,
A_10A,
B_1B,
B_52H,
C_130,
E_3A,
FA_18C_hornet,
F_117A,
F_14B,
F_15C,
F_15E,
@@ -43,6 +46,10 @@ USA_1990 = {
A_10A,
AV8BNA,
B_1B,
B_52H,
F_117A,
KC_135,
KC130,
C_130,

7
game/factions/usa_2005.py
View File

@@ -6,9 +6,12 @@ from dcs.planes import (
AV8BNA,
A_10C,
A_10C_2,
B_1B,
B_52H,
C_130,
E_3A,
FA_18C_hornet,
F_117A,
F_14B,
F_15C,
F_15E,
@@ -46,6 +49,10 @@ USA_2005 = {
AV8BNA,
MQ_9_Reaper,
B_1B,
B_52H,
F_117A,
KC_135,
KC130,
C_130,