FA18EFG mod support Patch 4 #3340

Chilli935 · 2024-02-12T23:31:55Z

Corrected banner file types.
Corrected australia_2005.yaml and usn_2005.yaml
Added australia_2009.yaml and usn_2009.yaml

Changes made to checkbox, icon and banner added for Growler. correct yaml files coming soon

yaml files for F/A-18E and F/A-18F corrected. yaml file for EA-18G added.

yaml files of he F/A-18E and F/A-18F were completely empty for some reason. Correct files re-added

Support updated to CJS F/A18EFG version 2.2.5. Adding: AIM-120D *fix push*

should be correctly formatted now

Reformated, should work now

…dded Australia and usn 2009 factions.

codecov · 2024-02-12T23:34:10Z

Codecov Report

Attention: Patch coverage is 99.39614% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 47.63%. Comparing base (63702f8) to head (2695f09).

Files	Patch %	Lines
game/factions/faction.py	0.00%	4 Missing ⚠️
game/theater/start_generator.py	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #3340      +/-   ##
===========================================
+ Coverage    46.00%   47.63%   +1.63%     
===========================================
  Files          474      476       +2     
  Lines        26230    27055     +825     
  Branches      4592     4595       +3     
===========================================
+ Hits         12066    12889     +823     
- Misses       14141    14143       +2     
  Partials        23       23

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

zhexu14

@Chilli935 , a few things I've noticed playing around with this PR. I was mostly looking at it from the perspective of someone who doesn't have the mod installed. It would be good if you could have a play with this build to check it works as expected for someone who does have the mod. If something doesn't work and you're stuck, let me know.

BTW, not sure how familiar you are with Github, but in case you didn't know, you can download the build of Liberation with this PR included from the Checks tab of this PR. You'll need to select the "build" action (left hand menu) and download the Artefact (top right).

Lastly, does this PR supersede this one #3338? If so, I'll go ahead and close that one.

resources/units/aircraft/EA-18G.yaml

qt_ui/windows/newgame/QNewGameWizard.py

resources/factions/usn_2009.yaml

resources/factions/australia_2009.yaml

resources/ui/units/aircrafts/banners/FA-18E.jpg

Chilli935 · 2024-03-04T12:16:10Z

@Chilli935 , a few things I've noticed playing around with this PR. I was mostly looking at it from the perspective of someone who doesn't have the mod installed. It would be good if you could have a play with this build to check it works as expected for someone who does have the mod. If something doesn't work and you're stuck, let me know.

I have tested it with the mod installed as someone who owns the module and others that don't and it worked good for us. The AIM-120D mod that was added does replace the Bravo variant which happened for all of us.

Lastly, does this PR supersede this one #3338? If so, I'll go ahead and close that one.

This PR does supersede #3338.

zhexu14 · 2024-03-04T22:11:27Z

Thanks for the changes @Chilli935 . Unfortunately it looks like the force push (or something else) has deleted some of your commits and some of the YAML changes didn't stick. Can you have a look please? If it's easier, can just close this PR and create a new one.

Chilli935 · 2024-03-05T07:56:59Z

Thanks for the changes @Chilli935 . Unfortunately it looks like the force push (or something else) has deleted some of your commits and some of the YAML changes didn't stick. Can you have a look please? If it's easier, can just close this PR and create a new one.

Yeah I was working on some changes in github desktop any way so I'll do that

…into patch-4

Added hit points to E & F variant Deleted wrongly named yaml files

This reverts commit a353a84.

…into patch-4

zhexu14 · 2024-03-19T10:35:23Z

@Chilli935 FYI I've just tested this branch and everything looks good (at least for someone running without the mod) except possibly a cosmetic change in the New Game Wizard label (it still shows as fa18efg, rather than something like "Super Hornet"). I'm happy to merge this once you're ready.

Changed new game wizard lable

Correctly changed label(*) in new game wizard

Chilli935 · 2024-03-19T13:49:25Z

I think that's all, just checked to make sure and the label looks good, and did some more testing as someone with the mod which worked well so this PR is ready to merge

zhexu14 · 2024-03-20T20:31:57Z

I think that's all, just checked to make sure and the label looks good, and did some more testing as someone with the mod which worked well so this PR is ready to merge

Nice one! Which version of the mod did you use?

Chilli935 · 2024-03-20T20:37:57Z

I think that's all, just checked to make sure and the label looks good, and did some more testing as someone with the mod which worked well so this PR is ready to merge

Nice one! Which version of the mod did you use?

2.2.5, which is the latest version. I was planning to add it in the new game wizard tomorrow morning

Added mod version to newgamewizard

Chilli935 · 2024-03-21T10:04:31Z

@zhexu14 it now contains the mod version in the newgamewizard, so you can go ahead and merge

Chilli935 and others added 9 commits January 26, 2024 12:57

modded aircraft support for FA-18E and FA-18F

432d5b8

Changes made to checkbox, icon and banner added for Growler. correct yaml files coming soon

modded aircraft support for FA-18E and FA-18F

12e1135

yaml files for F/A-18E and F/A-18F corrected. yaml file for EA-18G added.

Super Hornet Mod Fix

20272df

yaml files of he F/A-18E and F/A-18F were completely empty for some reason. Correct files re-added

FA18EFG mod update fixing

98b7ed1

Support updated to CJS F/A18EFG version 2.2.5. Adding: AIM-120D *fix push*

Merge branch 'develop' into develop

c7791fe

Update start_generator.py

f95b386

should be correctly formatted now

Update QNewGameWizard.py

a039dc5

Reformated, should work now

Correct banner file types. Correct Australia and usn 2005 factions. A…

43ae989

…dded Australia and usn 2009 factions.

Update faction.py

0026c6f

Chilli935 marked this pull request as ready for review February 12, 2024 23:40

Chilli935 changed the title ~~Patch 4~~ FA18EFG mod support Patch 4 Feb 13, 2024

zhexu14 requested changes Mar 3, 2024

View reviewed changes

Chilli935 force-pushed the patch-4 branch from c65be27 to 181a2d4 Compare March 4, 2024 12:12

zhexu14 mentioned this pull request Mar 5, 2024

FA18EFG mod support #3338

Closed

Chilli935 force-pushed the patch-4 branch from 1696b87 to d42735f Compare March 11, 2024 08:57

Update QNewGameWizard.py

c0f284b

Chilli935 force-pushed the patch-4 branch from d42735f to c0f284b Compare March 11, 2024 10:16

Chilli935 and others added 9 commits March 11, 2024 12:31

Merge branch 'dcs-liberation:develop' into patch-4

76f545c

Update QNewGameWizard.py

2fc575e

Merge branch 'patch-4' of https://github.com/Chilli935/dcs_liberation …

46eb2a5

…into patch-4

Update QNewGameWizard.py

88de01f

Update yaml files

1026cf0

Added hit points to E & F variant Deleted wrongly named yaml files

Update QNewGameWizard.py

37bf957

Update EA-18G_growler.yaml

a5f9d07

Deleted and cloned entire fork

a353a84

Revert "Deleted and cloned entire fork"

560a6dd

This reverts commit a353a84.

Chilli935 and others added 12 commits March 13, 2024 15:43

Delete and clone take 2

d928b86

Create dcs_liberation

4435c15

Github clone

c5592d7

Update QNewGameWizard.py

c6fd6b6

Re-added previously made changes

d7f5a60

Re-added correct banners and icons

c472f09

Removed super hornet from aus_2005, changed dating in aus_2009

d1f9474

Merge branch 'develop' into patch-4

4c54e98

Merge branch 'dcs-liberation:develop' into patch-4

d38bb2f

Update start_generator.py

0538b9e

Merge branch 'patch-4' of https://github.com/Chilli935/dcs_liberation …

b7b437b

…into patch-4

Update faction.py

4a177e9

Chilli935 added 3 commits March 19, 2024 13:58

Update QNewGameWizard.py

35779a6

Update QNewGameWizard.py

0e8cb6c

Changed new game wizard lable

Update QNewGameWizard.py

78387b1

Correctly changed label(*) in new game wizard

Update QNewGameWizard.py

2695f09

Added mod version to newgamewizard

zhexu14 merged commit 88ebb8b into dcs-liberation:develop Mar 21, 2024
8 checks passed

Chilli935 deleted the patch-4 branch March 21, 2024 11:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FA18EFG mod support Patch 4 #3340

FA18EFG mod support Patch 4 #3340

Chilli935 commented Feb 12, 2024

codecov bot commented Feb 12, 2024 •

edited

Loading

zhexu14 left a comment •

edited

Loading

Chilli935 commented Mar 4, 2024

zhexu14 commented Mar 4, 2024

Chilli935 commented Mar 5, 2024

zhexu14 commented Mar 19, 2024

Chilli935 commented Mar 19, 2024 •

edited

Loading

zhexu14 commented Mar 20, 2024

Chilli935 commented Mar 20, 2024

Chilli935 commented Mar 21, 2024

FA18EFG mod support Patch 4 #3340

FA18EFG mod support Patch 4 #3340

Conversation

Chilli935 commented Feb 12, 2024

codecov bot commented Feb 12, 2024 • edited Loading

Codecov Report

zhexu14 left a comment • edited Loading

Choose a reason for hiding this comment

Chilli935 commented Mar 4, 2024

zhexu14 commented Mar 4, 2024

Chilli935 commented Mar 5, 2024

zhexu14 commented Mar 19, 2024

Chilli935 commented Mar 19, 2024 • edited Loading

zhexu14 commented Mar 20, 2024

Chilli935 commented Mar 20, 2024

Chilli935 commented Mar 21, 2024

codecov bot commented Feb 12, 2024 •

edited

Loading

zhexu14 left a comment •

edited

Loading

Chilli935 commented Mar 19, 2024 •

edited

Loading