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

Issue 6252: Offboard Artillery cannot unjam critted weapons #6255

Conversation

psikomonkie
Copy link
Collaborator

Fixes #6252

I tested that artillery targeting still works, but I don't have an easy way to get the weapon crit on an offmap artillery, so I'm opening this as a draft.

SuperStucco and others added 30 commits November 28, 2024 15:28
…aling with searching multiple parent factions to avoid messy truncated integers.
…g total model weight which includes +/- dynamic adjustment and role-based adjustment.
…r offsets pre-production models and initial production limits
…doubles instead of in, due to 2^(n/2) generating non-integers on odd values of n
…ication of salvage percentage to conventional math.
…due to complexity of managing multiple factors, including salvage.
…otential conflicting data as well as results that are out of line with provided data.
…oads' into issue-1619-rfe-dirt-and-gravel-roads

# Conflicts:
#	megamek/src/megamek/common/Hex.java
#	megamek/src/megamek/common/MoveStep.java
#	megamek/src/megamek/common/Terrains.java
HammerGS and others added 26 commits December 15, 2024 11:46
allow aerospace to flee  with remaining movement
Issue 6264: Destroyed Infantry no longer have negative weight
…-tools

fix: following suggestions of improvements from SJuliez
…ot-unjam-critted-weapons' into issue-6252-offmap-artillery-cannot-unjam-critted-weapons
}

private JComponent getArgumentComponent(Argument<?> argument) {
if (argument instanceof CoordXArgument intArg) {

Check notice

Code scanning / CodeQL

Chain of 'instanceof' tests Note

This if block performs a chain of 13 type tests - consider alternatives, e.g. polymorphism or the visitor pattern.
1));
}

private JSpinner createSpinner(CoordXArgument coordX) {

Check notice

Code scanning / CodeQL

Useless parameter Note

The parameter 'coordX' is never used.
1));
}

private JSpinner createSpinner(CoordYArgument coordY) {

Check notice

Code scanning / CodeQL

Useless parameter Note

The parameter 'coordY' is never used.
1));
}

private JComboBox<String> createPlayerComboBox(PlayerArgument playerArgument) {

Check notice

Code scanning / CodeQL

Useless parameter Note

The parameter 'playerArgument' is never used.
return comboBox;
}

private JComboBox<String> createUnitComboBox(UnitArgument unitArgument) {

Check notice

Code scanning / CodeQL

Useless parameter Note

The parameter 'unitArgument' is never used.
return comboBox;
}

private JComboBox<String> createTeamsComboBox(TeamArgument teamArgument) {

Check notice

Code scanning / CodeQL

Useless parameter Note

The parameter 'teamArgument' is never used.
@Sleet01
Copy link
Collaborator

Sleet01 commented Dec 18, 2024

@psikomonkie What is even going on with this issue's history? 😄
I see that you closed this issue.
Were you intending to extract the fix changes and start a new PR based on the current state of the master branch?

@psikomonkie
Copy link
Collaborator Author

@psikomonkie What is even going on with this issue's history? 😄 I see that you closed this issue. Were you intending to extract the fix changes and start a new PR based on the current state of the master branch?

@Sleet01 Just git skill issues. This was just supposed to be 83fe08f. I don't know how I pushed 13d1eab, which reverted it. When I tried to get this PR ready today after verifying my fix actually works, it went to heck. I opened a new PR from a new branch: #6286

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Offboard artillery cannot unjam critted weapons
7 participants