-
Notifications
You must be signed in to change notification settings - Fork 183
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
Switch F-15E S4+ loadouts from LGBs to JDAMs (AI still won't use LGBs) #3259
Merged
DanAlbert
merged 1 commit into
dcs-liberation:develop
from
Starfire13:F-15ES4_loadout_update
Dec 1, 2023
Merged
Switch F-15E S4+ loadouts from LGBs to JDAMs (AI still won't use LGBs) #3259
DanAlbert
merged 1 commit into
dcs-liberation:develop
from
Starfire13:F-15ES4_loadout_update
Dec 1, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #3259 +/- ##
========================================
Coverage 46.10% 46.10%
========================================
Files 474 474
Lines 26025 26025
Branches 4527 4527
========================================
Hits 12000 12000
Misses 14004 14004
Partials 21 21 ☔ View full report in Codecov by Sentry. |
Dragonius
pushed a commit
to Dragonius/dcs_liberation
that referenced
this pull request
Dec 12, 2023
dcs-liberation#3259) It appears the AI is still incapable of using LGBs (and laser JDAMs), even though Razbam had said the issues was fixed. I have switched loadouts to JDAMs because the AI will use those. (cherry picked from commit 5271b3d)
Dragonius
added a commit
to Dragonius/dcs_liberation
that referenced
this pull request
Dec 12, 2023
commit e133930 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat Dec 9 00:46:37 2023 +0000 Bump pyinstaller from 5.13.0 to 5.13.1 Bumps [pyinstaller](https://github.com/pyinstaller/pyinstaller) from 5.13.0 to 5.13.1. - [Release notes](https://github.com/pyinstaller/pyinstaller/releases) - [Changelog](https://github.com/pyinstaller/pyinstaller/blob/develop/doc/CHANGES.rst) - [Commits](pyinstaller/pyinstaller@v5.13.0...v5.13.1) --- updated-dependencies: - dependency-name: pyinstaller dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> commit b014f2e Author: Starfire13 <[email protected]> Date: Thu Dec 7 11:46:16 2023 +1100 Improve F-15E S4+ loadouts (dcs-liberation#3286) I've come to realise that two external tanks is overkill for pretty much all A2G mission types. The AI no longer have a problem with fuel, and player flights will essentially never run out of fuel with the 2 CFTs and a single external tank. I have done 700+ mile trips at mil power the whole way with fuel to spare. I have therefore switched all A2G mission loadouts to a single tank. A2A loadouts still carry 2 tanks, as players may require the extra fuel if they make very extensive use of afterburner in air combat. It turns out the GBU31v3 JDAMs are bugged in more than one way. We've known that they vanish if carried in pairs on the CFT pylons, but now it turns out their penetration doesn't actually work. This means they are no better in any way than the GBU31v1s, which are not bugged on CFT pylons. I have therefore removed the penetrator JDAMs from all loadouts, replacing them with regular JDAMs. commit f3d3c5f Author: Nosajthedevil <[email protected]> Date: Wed Dec 6 18:45:38 2023 -0600 Aim-9 Updates (dcs-liberation#3287) Adds the Aim-9P3 between the Aim-9P5 and the Aim-9P. Also adds fallback support for sidewinder versions for the VSN 104 mod, the JAS39 mod, and the AJS-37. commit 5ee3afe Author: Dan Albert <[email protected]> Date: Sat Dec 2 13:17:13 2023 -0800 Disconnect log signals on exit. If we don't do this, the uvicorn server may log its shutdown after the Qt application has closed, and the signal this attempts to emit may not be valid. Disconnect the log signals when the application exits to prevent that. There's actually another solution that I thought would be better, but I couldn't get it to work: https://www.pyinstaller.org/en/stable/feature-notes.html#automatic-hiding-and-minimization-of-console-window-under-windows describes a way to have pyinstaller hide or minimize the console rather than disabling it entirely. I was never really fond of getting rid of the console window in the first place, but it did bother some users. If we could get the hide or minimize option working, that'd probably avoid bothering users, but also make the logs much easier to find, get us out of the trouble of maintaining our own log viewer, and fix the problem mentioned in the comment I add here (the log window only works if there's only one in memory log handler). Another option would be ditching our log window and instead just having that menu item open the log file or directory in whatever program the OS defaults to (probably notepad). It would still have the quirk of maybe needing to open more than one location, since logging is use configurable. Fixes dcs-liberation#3278. commit 88591fd Author: Dan Albert <[email protected]> Date: Sat Dec 2 12:08:42 2023 -0800 Downgrade Qt. Fixes dcs-liberation#3276. commit f5573cf Author: Dan Albert <[email protected]> Date: Sat Dec 2 12:07:26 2023 -0800 Revert "Update to Python 3.12." Might fix dcs-liberation#3276. If not, we need to revert the Qt upgrade too, and if we downgrade Qt we can't use Python 3.12 anyway. This reverts commit 65eb106. commit f7141a9 Author: Dan Albert <[email protected]> Date: Sat Dec 2 12:14:50 2023 -0800 Fix a few more Pydantic conversions. One of the newer versions got a lot more strict. It now only expects dicts that match the model, or objects of the model. Previously it also accepted objects which had the same properties as the model. Convert a few more LatLngs to LeafletPoints. Fixes dcs-liberation#3279. commit a599b50 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Dec 1 04:25:07 2023 +0000 Bump @adobe/css-tools from 4.3.1 to 4.3.2 in /client Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> commit 6c4b8c8 Author: Dan Albert <[email protected]> Date: Thu Nov 30 21:20:56 2023 -0800 Update mypy. Needed so mypy can recognize the new Python 3.12 generic syntax. commit 2447cc1 Author: Dan Albert <[email protected]> Date: Thu Nov 30 21:02:27 2023 -0800 Update black. Required for the new syntax in Python 3.12. commit 28954d0 Author: Dan Albert <[email protected]> Date: Thu Nov 30 20:52:33 2023 -0800 Downgrade pyinstaller. I forgot to test the pyinstaller binary when I upgraded all the other dependencies, and there's a breaking change in 6.0.0: https://pyinstaller.org/en/latest/CHANGES.html#incompatible-changes > All of onedir build's contents except for the executable are now moved > into a sub-directory (called _internal by default). sys._MEIPASS is > adjusted to point to this _internal directory. The breaking > implications for this are: > > * Assumptions that os.path.dirname(sys.executable) == sys._MEIPASS > will break. Code locating application resources using > os.path.dirname(sys.executable) should be adjusted to use __file__ > or sys._MEIPASS and any code locating the original executable using > sys._MEIPASS should use sys.executable directly. > * Any custom post processing steps (either in the .spec file or > externally) which modify the bundle will likely need adjusting to > accommodate the new directory. This is actually great because it declutters the top level directory to just `dcs_liberation.exe` and a directory named `_internal` that has all the guts, but the CWD is no longer the directory that has `resources/` in it, so we can't find any of our resources. There are a few options for fixing that (cd into that directory probably being the easiest, or we could stop relying on CWD relative paths), but for now just downgrade to unbreak the build. commit 65eb106 Author: Dan Albert <[email protected]> Date: Thu Nov 30 20:23:06 2023 -0800 Update to Python 3.12. commit 7bc35ef Author: Dan Albert <[email protected]> Date: Thu Nov 30 20:17:36 2023 -0800 Update most Python dependencies. A lot of the dependency versions we have pinned don't have wheels for Python 3.12. Update almost all of them so we can upgrade Python. The few that weren't upgraded here are black and mypy, since those will be a bit invasive, and Pillow, which has an API change I don't want to deal with right now (I've got a commit on another machine that has already done the migration, so I'll do it later). commit 46766ec Author: Starfire13 <[email protected]> Date: Fri Dec 1 14:12:45 2023 +1100 Remove AI F-15E from Starfire's campaigns. Now that the F-15E Suite 4+ has JDAMs and the bug preventing AI from using LGBs has been fixed, I have removed the AI-only F-15Es from my campaigns. Also minor tweaks to a couple of squadron types/sizes based on play-testing results. commit 3469d08 Author: Dan Albert <[email protected]> Date: Thu Nov 30 19:04:08 2023 -0800 Remove recommendation to dedicated server. DCS multithreading made this unnecessary. commit 28d959b Author: Dan Albert <[email protected]> Date: Thu Nov 30 18:47:52 2023 -0800 Fix disappearing aircraft when deleting packages. There are a few different code paths for deleting packages depending on the state of the package, and two of them were deleting items from a list they were iterating over without first making a copy, causing each iteration of the loop to skip over a flight, making it still used since the flight was never deleted, but unreachable since the package that owned it was deleted. This only happened when the package was canceled in its draft state (the user clicked the X without ever saving the package), or if the user canceled a package mid fast forward (the controls for which aren't even visible to users) while only a portion of the package was active. In both cases, only even numbered flights were lost. There's a better fix lurking in here somewhere but the interaction with the Qt model complicates it. Fortunately that mess would be cleaned up automatically by moving this dialog into React, which we'll do some day. Fixes dcs-liberation#3257. Fixes dcs-liberation#3258. commit b99eb49 Author: Dan Albert <[email protected]> Date: Thu Nov 30 18:23:37 2023 -0800 Renumber flight members for meatbags. Puny humans count wrong, but we ought to match DCS. Fixes dcs-liberation#3244. commit c6f8122 Author: Starfire13 <[email protected]> Date: Fri Dec 1 13:02:21 2023 +1100 Update Exercise Vegas Nerve. Updated Exercise Vegas Nerve with off map spawns for B-52 and B-1. commit cc5b5fa Author: Starfire13 <[email protected]> Date: Fri Dec 1 12:57:50 2023 +1100 Add new Mariana Islands campaign - Operation Velvet Thunder. Vietnam War era campaign for the Mariana Islands map, utilising the two new Vietnam War factions. commit 5271b3d Author: Starfire13 <[email protected]> Date: Fri Dec 1 12:56:34 2023 +1100 Switch F-15E S4+ loadouts from LGBs to JDAMs (AI still won't use LGBs) (dcs-liberation#3259) It appears the AI is still incapable of using LGBs (and laser JDAMs), even though Razbam had said the issues was fixed. I have switched loadouts to JDAMs because the AI will use those. commit 8f4192e Author: Starfire13 <[email protected]> Date: Fri Dec 1 12:51:55 2023 +1100 Fix Operation Grabthar's Hammer map object strike target. This fixes a map object strike target (yes, just one. Fortunately!) that was broken by the latest DCS open beta update that removed the buildings the strike target was using. commit 183d6df Author: Starfire13 <[email protected]> Date: Sun Nov 19 13:51:42 2023 +1100 Add guided bombs to F-15E Suite 4+ loadouts. GBUs have been added to the F-15E Suite 4+ loadouts Also switched CAP loadouts to 2 external tanks instead of 3 to improve aircraft performance, as 2 tanks is plenty for players and the AI has infinite fuel now. commit a825651 Author: Dan Albert <[email protected]> Date: Sat Nov 18 14:48:54 2023 -0800 Update pydcs. Terrain updates for Normandy and South Atlantic. commit f3c0281 Author: Dan Albert <[email protected]> Date: Sat Nov 18 14:00:14 2023 -0800 Update pydcs. Includes F-15E JDAM support. commit c4e2e45 Author: Starfire13 <[email protected]> Date: Sun Nov 19 09:20:14 2023 +1100 Add Vietnam War factions for USA and NVA. This adds factions for Vietnam War for both the US and North Vietnamese Army. commit 6613642 Author: Starfire13 <[email protected]> Date: Sun Nov 19 09:12:40 2023 +1100 Add LARC-V and Speedboat. This adds LARC-V to Liberation (required by USA 1970) Also adds Speedboat to Liberation (required by NVA 1970) Both units are available via pydcs but have not been added to Liberation thus far as no factions used them (until now).
Dragonius
pushed a commit
to Dragonius/dcs_liberation
that referenced
this pull request
Dec 12, 2023
dcs-liberation#3259) It appears the AI is still incapable of using LGBs (and laser JDAMs), even though Razbam had said the issues was fixed. I have switched loadouts to JDAMs because the AI will use those. (cherry picked from commit 5271b3d)
Dragonius
pushed a commit
to Dragonius/dcs_liberation
that referenced
this pull request
May 18, 2024
dcs-liberation#3259) It appears the AI is still incapable of using LGBs (and laser JDAMs), even though Razbam had said the issues was fixed. I have switched loadouts to JDAMs because the AI will use those. (cherry picked from commit 5271b3d)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It appears the AI is still incapable of using LGBs (and laser JDAMs), even though Razbam had said the issues was fixed. I have switched loadouts to JDAMs because the AI will use those.