Remove redundant prompts #1599

simon33-2 · 2017-03-31T02:18:06Z

Don't prompt for retreat when only one retreat territory is valid

Don't ask for submerge or retreat when only defenseless transports remain

EDIT: Also don't allow retreat when only an AA Gun or defenseless transport remains as per #1270.

Breaks serialisation when a battle is in progress so just move to 1.9.1. #1583 also causes issues with serialization in certain situations. Trouble is that the old jar mechanism doesn't quite work for 1.9, although 1.9 can spawn 1.809. I've got a fix for this one but I'm open to a better fix. Reopen because I messed with the successor PR too.

…date duplicated code

Don't ask for submerge or retreat when only defenseless transports remain

simon33-2 · 2017-03-31T02:23:43Z

Hold on, I'll see if I can figure where those tests fail.

panther2 · 2017-03-31T06:24:16Z

Does this address and solve #1270 ?

simon33-2 · 2017-03-31T06:42:57Z

Partly. Doesn't do anything about the remaining AA Gun but does prevent the retreat prompt when a sea battle leaves a non fighting TT. Not 100% sure about the submarine vs air problem. I'll have to test it.

RoiEXLab · 2017-03-31T12:52:37Z

One Test is still failing...

simon33-2 · 2017-03-31T12:58:36Z

Fixed now.

RoiEXLab

Looks good to me.
I'd like you to chnage a couple things

RoiEXLab · 2017-03-31T15:31:56Z

game_engine.properties

@@ -1,4 +1,4 @@
-engine_version = 1.9.0.0
+engine_version = 1.9.0.2


Not sure if this is going to break anything...

RoiEXLab · 2017-03-31T15:33:33Z

src/main/java/games/strategy/triplea/delegate/MustFightBattle.java

@@ -1821,13 +1824,13 @@ private void checkForUnitsThatCanRollLeft(final IDelegateBridge bridge, final bo
   */
  private void submergeSubsVsOnlyAir(final IDelegateBridge bridge) {
    // if All attackers are AIR submerge any defending subs ..m_defendingUnits.removeAll(m_killed);
-    if (Match.allMatch(m_attackingUnits, Matches.UnitIsAir) && Match.someMatch(m_defendingUnits, Matches.UnitIsSub)) {
+    if ( Match.allMatch(m_attackingUnits, Matches.UnitIsAir) && Match.someMatch(m_defendingUnits, Matches.UnitIsSub)) {


I'd like you to remove this space

I'm probably stating something that everyone already knows, but if you're using Eclipse, there are TripleA formatter and cleanup configurations available here (they can be used from IntelliJ, too, with a little more work). I've gotten into the habit of running Source > Clean Up... on the files I've changed before committing so that I don't have to worry that I fat-fingered a couple of spaces (among other things like removing unused imports, making variables final, etc.). 😃

RoiEXLab · 2017-03-31T15:33:41Z

src/main/java/games/strategy/triplea/delegate/MustFightBattle.java

      // Get all defending subs (including allies) in the territory.
      final List<Unit> defendingSubs = Match.getMatches(m_defendingUnits, Matches.UnitIsSub);
      // submerge defending subs
      submergeUnits(defendingSubs, true, bridge);
      // checking defending air on attacking subs
-    } else if (Match.allMatch(m_defendingUnits, Matches.UnitIsAir)
+    } else if ( Match.allMatch(m_defendingUnits, Matches.UnitIsAir)


I'd like you to remove this space too

simon33-2 · 2017-03-31T21:11:25Z

This now also fixes AA Guns. I think it fixes the subs too although I'm not 100% sure I understand that issue. So should allow #1270 to be closed off.

Regarding the version, I have decreed that it is about time we moved on the version. 1.901 has already been used. If we don't update the latest_version quite yet, it doesn't break anything that I am aware of. We need to advertise that people should upgrade, then after we've given them some time, we can update the latest_version which will break the older versions of 1.9, albeit with a workaround of disabling the network connection while the version is being checked.

I have eclipse but I've forgotten how to configure it.

Positively hate parenthesis surrounding the condition in "if" statements! I don't know why people like it - I've seen it done in languages which don't require it. I also hate parenthesis used for grouping and functions. I want braces for functions and not blocks. Anyway, I guess that's enough esoteric argument for today.

…propriately offered

simon33-2 · 2017-03-31T21:18:20Z

There was still an issue with subs vs air but that should be fixed now.

… a combat is in progress

simon33-2 · 2017-04-01T21:09:42Z

Note that this PR breaks serialisation in cases where a game is saved during a battle. That's why I've updated the version to 1.9.1.

We shouldn't update latest_version quite yet because it causes older builds to hang.

simon33-2 · 2017-04-03T03:52:21Z

Can I get some thoughts on moving to 1.9.1 @DanVanAtta @ron-murhammer ?

I note that the fix for the latest version check has not been migrated to triplea-game.org yet. I suggest that we change the filename checked. Why not include the latest version in the triplea_maps.yaml and check that every startup - is the 91kb that the file is an issue? Can we check the git commit hash perhaps?

simon33-2 · 2017-04-03T12:43:51Z

I'm going to have a look tomorrow how much of this can be achieved without breaking the compatibility.

simon33-2 · 2017-04-05T21:17:56Z

Old jar mechanisms appears to be broken in 1.9

Seems that the 1.9 triplea.jar is unaware of what version it is but the 1.809 jar seems like it might be. In any event if I build 1.9.1 of Triple-A and put 1.9.0 of triple-A in the old jar directory, 1.9.0 has an identity crisis and thinks its 1.9.1 because it looks at the game_engine.properties. What sort of system is this? The jar should be self aware. Ideally, the build would examine the source and put that version number into the game_engine.properties.

ron-murhammer · 2017-04-05T21:39:48Z

@simon33-2 Can you update the initial post of this with exactly what features are being changed and how to test them. Seems like a number of different things are being changed here along with updating to 1.9.1. Also referencing back to any issues that this is addressing helps as well.

RoiEXLab · 2017-04-05T22:05:28Z

src/main/java/games/strategy/triplea/delegate/DependentBattle.java

  protected final Collection<Territory> m_amphibiousAttackFrom = new ArrayList<>();

  DependentBattle(final Territory battleSite, final PlayerID attacker, final BattleTracker battleTracker,
      final boolean isBombingRun, final BattleType battleType, final GameData data) {
    super(battleSite, attacker, battleTracker, isBombingRun, battleType, data);
+    m_attackingFromMap = new HashMap<>();
+    m_attackingFrom = new HashSet<>();


Same thing like in #1610...

Good point. If we move on the version, that change shouldn't be needed.

RoiEXLab

You should run the eclipse formatting tool (Ctrl+Shift+F)

simon33-2 · 2017-04-05T23:30:43Z

Isn't there some configuration needed to get the formatting tool to work? I've forgotten how to do that.

ssoloff · 2017-04-06T03:15:38Z

@simon33-2

Isn't there some configuration needed to get the formatting tool to work?

Configure clean up

From Eclipse main menu: Window > Preferences
Expand node: Java > Code Style > Clean Up
Click Import...
Navigate to the following folder in your TripleA Git repo: /eclipse/format
Select file triplea_java_eclipse_cleanup.xml
Ensure TripleaCleanup is selected as the Active profile
Click OK or Apply

Configure formatter

From Eclipse main menu: Window > Preferences
Expand node: Java > Code Style > Formatter
Click Import...
Navigate to the following folder in your TripleA Git repo: /eclipse/format
Select file triplea_java_eclipse_format_style.xml
Ensure TripleaStyle is selected as the Active profile
Click OK or Apply

Configure import order

From Eclipse main menu: Window > Preferences
Expand node: Java > Code Style > Organize Imports
Click Import...
Navigate to the following folder in your TripleA Git repo: /eclipse/format
Select file triplea.importorder
Click OK or Apply

Usage

As @RoiEXLab said, you can use the default key binding, Ctrl+Shift+F, to run the formatter on any source file. However, I would recommend you consider running the whole Clean Up suite, which includes the formatter, among other useful things (e.g. organize imports, remove trailing whitespace, etc.). Run the Clean Up command using Source > Clean Up... from either the main menu or the context menu. There is no default key binding for this command, but you can add one from the General > Keys node in preferences.

simon33-2 · 2017-04-06T04:32:07Z

Close this for rebased PR #1615.

Simon added 3 commits March 24, 2017 22:02

Add abstract class for MustFightBattle & NonFightingBattle to consoli…

65574dc

…date duplicated code

Review feedback

e26b518

Don't prompt for retreat when only one retreat territory is valid

29389d5

Don't ask for submerge or retreat when only defenseless transports remain

Fix tests

32a6142

Fix bug found by test

c6a3106

Kill undefended AA Guns too

87fc650

RoiEXLab requested changes Mar 31, 2017

View reviewed changes

Code formatting

e6a18a4

Fix order for subs submerging vs air only so that retreat is not inap…

50e199b

…propriately offered

simon33-2 mentioned this pull request Apr 1, 2017

Allow invisible units #1604

Closed

Simon added 5 commits April 1, 2017 18:06

Move on 3rd version number because this fix breaks serialisation when…

2ae7a18

… a combat is in progress

Fix NPE

9ecca77

Fix NPE

9940148

Merge branch 'cleanup' of github.com:simon33-2/triplea into cleanup

6c7a53f

Merge branch 'cleanup' into RemovePrompts

73c2cb5

simon33-2 mentioned this pull request Apr 4, 2017

Fix NPEs #1610

Closed

Update for moving on latest version

38c4f26

RoiEXLab approved these changes Apr 5, 2017

View reviewed changes

RoiEXLab reviewed Apr 5, 2017

View reviewed changes

RoiEXLab requested changes Apr 5, 2017

View reviewed changes

simon33-2 closed this Apr 6, 2017

simon33-2 mentioned this pull request Apr 6, 2017

Remove redundant prompts and inappropriate retreat options. Bump version and fix old version processing #1615

Closed

simon33-2 deleted the RemovePrompts branch April 8, 2017 06:18

This was referenced Apr 8, 2017

Remove redundant prompts and inappropriate retreat options. Bump version and fix old version processing #1621

Closed

Remove redundant prompts and inappropriate retreat options. Bump version. #1632

Closed

simon33-2 mentioned this pull request Apr 15, 2017

Remove redundant prompts - attacking defenseless units or retreating to a single territory #1646

Merged

simon33-2 mentioned this pull request Apr 28, 2017

Sub combat rules wrong #1645

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove redundant prompts #1599

Remove redundant prompts #1599

simon33-2 commented Mar 31, 2017 •

edited

Loading

simon33-2 commented Mar 31, 2017

panther2 commented Mar 31, 2017

simon33-2 commented Mar 31, 2017

RoiEXLab commented Mar 31, 2017

simon33-2 commented Mar 31, 2017

RoiEXLab left a comment

RoiEXLab Mar 31, 2017

RoiEXLab Mar 31, 2017

ssoloff Mar 31, 2017

RoiEXLab Mar 31, 2017

simon33-2 commented Mar 31, 2017

simon33-2 commented Mar 31, 2017

simon33-2 commented Apr 1, 2017

simon33-2 commented Apr 3, 2017

simon33-2 commented Apr 3, 2017

simon33-2 commented Apr 5, 2017 •

edited

Loading

ron-murhammer commented Apr 5, 2017

RoiEXLab Apr 5, 2017

simon33-2 Apr 5, 2017

RoiEXLab left a comment

simon33-2 commented Apr 5, 2017

ssoloff commented Apr 6, 2017

simon33-2 commented Apr 6, 2017

		@@ -1,4 +1,4 @@
		engine_version = 1.9.0.0
		engine_version = 1.9.0.2

Remove redundant prompts #1599

Remove redundant prompts #1599

Conversation

simon33-2 commented Mar 31, 2017 • edited Loading

simon33-2 commented Mar 31, 2017

panther2 commented Mar 31, 2017

simon33-2 commented Mar 31, 2017

RoiEXLab commented Mar 31, 2017

simon33-2 commented Mar 31, 2017

RoiEXLab left a comment

Choose a reason for hiding this comment

RoiEXLab Mar 31, 2017

Choose a reason for hiding this comment

RoiEXLab Mar 31, 2017

Choose a reason for hiding this comment

ssoloff Mar 31, 2017

Choose a reason for hiding this comment

RoiEXLab Mar 31, 2017

Choose a reason for hiding this comment

simon33-2 commented Mar 31, 2017

simon33-2 commented Mar 31, 2017

simon33-2 commented Apr 1, 2017

simon33-2 commented Apr 3, 2017

simon33-2 commented Apr 3, 2017

simon33-2 commented Apr 5, 2017 • edited Loading

ron-murhammer commented Apr 5, 2017

RoiEXLab Apr 5, 2017

Choose a reason for hiding this comment

simon33-2 Apr 5, 2017

Choose a reason for hiding this comment

RoiEXLab left a comment

Choose a reason for hiding this comment

simon33-2 commented Apr 5, 2017

ssoloff commented Apr 6, 2017

Configure clean up

Configure formatter

Configure import order

Usage

simon33-2 commented Apr 6, 2017

simon33-2 commented Mar 31, 2017 •

edited

Loading

simon33-2 commented Apr 5, 2017 •

edited

Loading