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.

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

FA18EFG mod support Patch 4 #3340

Merged
merged 35 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
432d5b8
modded aircraft support for FA-18E and FA-18F
Chilli935 Jan 25, 2024
12e1135
modded aircraft support for FA-18E and FA-18F
Chilli935 Jan 25, 2024
20272df
Super Hornet Mod Fix
Chilli935 Jan 26, 2024
98b7ed1
FA18EFG mod update fixing
Chilli935 Feb 5, 2024
c7791fe
Merge branch 'develop' into develop
Chilli935 Feb 9, 2024
f95b386
Update start_generator.py
Chilli935 Feb 10, 2024
a039dc5
Update QNewGameWizard.py
Chilli935 Feb 10, 2024
43ae989
Correct banner file types. Correct Australia and usn 2005 factions. A…
Chilli935 Feb 12, 2024
0026c6f
Update faction.py
Chilli935 Feb 12, 2024
c0f284b
Update QNewGameWizard.py
Chilli935 Feb 12, 2024
76f545c
Merge branch 'dcs-liberation:develop' into patch-4
Chilli935 Mar 11, 2024
2fc575e
Update QNewGameWizard.py
Chilli935 Mar 11, 2024
46eb2a5
Merge branch 'patch-4' of https://github.com/Chilli935/dcs_liberation…
Chilli935 Mar 11, 2024
88de01f
Update QNewGameWizard.py
Chilli935 Mar 12, 2024
1026cf0
Update yaml files
Chilli935 Mar 12, 2024
37bf957
Update QNewGameWizard.py
Chilli935 Mar 12, 2024
a5f9d07
Update EA-18G_growler.yaml
Chilli935 Mar 12, 2024
a353a84
Deleted and cloned entire fork
Chilli935 Mar 13, 2024
560a6dd
Revert "Deleted and cloned entire fork"
Chilli935 Mar 13, 2024
d928b86
Delete and clone take 2
Chilli935 Mar 13, 2024
4435c15
Create dcs_liberation
Chilli935 Mar 13, 2024
c5592d7
Github clone
Chilli935 Mar 13, 2024
c6fd6b6
Update QNewGameWizard.py
Chilli935 Mar 13, 2024
d7f5a60
Re-added previously made changes
Chilli935 Mar 13, 2024
c472f09
Re-added correct banners and icons
Chilli935 Mar 14, 2024
d1f9474
Removed super hornet from aus_2005, changed dating in aus_2009
Chilli935 Mar 14, 2024
4c54e98
Merge branch 'develop' into patch-4
Chilli935 Mar 15, 2024
d38bb2f
Merge branch 'dcs-liberation:develop' into patch-4
Chilli935 Mar 18, 2024
0538b9e
Update start_generator.py
Chilli935 Mar 18, 2024
b7b437b
Merge branch 'patch-4' of https://github.com/Chilli935/dcs_liberation…
Chilli935 Mar 18, 2024
4a177e9
Update faction.py
Chilli935 Mar 18, 2024
35779a6
Update QNewGameWizard.py
Chilli935 Mar 19, 2024
0e8cb6c
Update QNewGameWizard.py
Chilli935 Mar 19, 2024
78387b1
Update QNewGameWizard.py
Chilli935 Mar 19, 2024
2695f09
Update QNewGameWizard.py
Chilli935 Mar 21, 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
7 changes: 5 additions & 2 deletions game/factions/faction.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,11 @@
self.remove_aircraft("Su-57")
if not mod_settings.ov10a_bronco:
self.remove_aircraft("Bronco-OV-10A")
if not mod_settings.superhornet:
self.remove_aircraft("Super-Hornet")
if not mod_settings.fa18efg:
self.remove_aircraft("FA_18E")
self.remove_aircraft("FA_18F")
self.remove_aircraft("EA_18G")

Check warning on line 306 in game/factions/faction.py

View check run for this annotation

Codecov / codecov/patch

game/factions/faction.py#L304-L306

Added lines #L304 - L306 were not covered by tests

# frenchpack
if not mod_settings.frenchpack:
self.remove_vehicle("AMX10RCR")
Expand Down
2 changes: 1 addition & 1 deletion game/theater/start_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
frenchpack: bool = False
high_digit_sams: bool = False
ov10a_bronco: bool = False
superhornet: bool = False
fa18efg: bool = False

Check warning on line 69 in game/theater/start_generator.py

View check run for this annotation

Codecov / codecov/patch

game/theater/start_generator.py#L69

Added line #L69 was not covered by tests

def save_player_settings(self) -> None:
"""Saves the player's global settings to the user directory."""
Expand Down
1 change: 1 addition & 0 deletions pydcs_extensions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from .ov10a import *
from .su57 import *
from .uh60l import *
from .fa18efg import *


def load_mods() -> None:
Expand Down
1 change: 1 addition & 0 deletions pydcs_extensions/fa18efg/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .fa18efg import *
Loading
Loading