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.

Sign up for GitHub

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

Ai add land transports #3439

Merged
merged 7 commits into from
May 29, 2018
Merged

Ai add land transports #3439

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a82faf
Add new matches and utils for land transports
ron-murhammer May 26, 2018
3be3791
Update combat move to attack with land transports
ron-murhammer May 26, 2018
e736b1b
Update noncombat move to move land transports
ron-murhammer May 26, 2018
5ff8b24
Update move utils to handle moving land transports
ron-murhammer May 26, 2018
d60adee
Update purchase to increase chance of buying land transports
ron-murhammer May 26, 2018
32f10cd
Remove system.out
ron-murhammer May 26, 2018
0703e1e
Add javadoc
ron-murhammer May 26, 2018
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
87 changes: 47 additions & 40 deletions game-core/src/main/java/games/strategy/triplea/ai/pro/ProCombatMoveAi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,10 +746,10 @@ private void determineUnitsToAttackWith(final List<ProTerritory> prioritizedTerr
// Re-sort attack options
sortedUnitAttackOptions = ProSortMoveOptionsUtils.sortUnitNeededOptionsThenAttack(player, sortedUnitAttackOptions,
attackMap, ProData.unitTerritoryMap, calc);
final List<Unit> addedUnits = new ArrayList<>();

// Set air units in any territory with no AA (don't move planes to empty territories)
for (final Iterator<Unit> it = sortedUnitAttackOptions.keySet().iterator(); it.hasNext();) {
final Unit unit = it.next();
for (final Unit unit : sortedUnitAttackOptions.keySet()) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to move away from iterator since there is potential to have to remove multiple units now.

final boolean isAirUnit = UnitAttachment.get(unit.getType()).getIsAir();
if (!isAirUnit) {
continue; // skip non-air units
Expand Down Expand Up @@ -783,19 +783,22 @@ private void determineUnitsToAttackWith(final List<ProTerritory> prioritizedTerr
}
}
if (minWinTerritory != null) {
attackMap.get(minWinTerritory).addUnit(unit);
attackMap.get(minWinTerritory).setBattleResult(null);
it.remove();
attackMap.get(minWinTerritory).addUnit(unit);
addedUnits.add(unit);
}
}
sortedUnitAttackOptions.keySet().removeAll(addedUnits);

// Re-sort attack options
sortedUnitAttackOptions = ProSortMoveOptionsUtils.sortUnitNeededOptionsThenAttack(player, sortedUnitAttackOptions,
attackMap, ProData.unitTerritoryMap, calc);

// Find territory that we can try to hold that needs unit
for (final Iterator<Unit> it = sortedUnitAttackOptions.keySet().iterator(); it.hasNext();) {
final Unit unit = it.next();
for (final Unit unit : sortedUnitAttackOptions.keySet()) {
if (addedUnits.contains(unit)) {
continue;
}
Territory minWinTerritory = null;
for (final Territory t : sortedUnitAttackOptions.get(unit)) {
final ProTerritory patd = attackMap.get(t);
Expand All @@ -818,19 +821,20 @@ private void determineUnitsToAttackWith(final List<ProTerritory> prioritizedTerr
}
}
if (minWinTerritory != null) {
attackMap.get(minWinTerritory).addUnit(unit);
attackMap.get(minWinTerritory).setBattleResult(null);
it.remove();
final List<Unit> unitsToAdd = ProTransportUtils.getUnitsToAdd(unit, alreadyMovedUnits, attackMap);
attackMap.get(minWinTerritory).addUnits(unitsToAdd);
addedUnits.addAll(unitsToAdd);
}
}
sortedUnitAttackOptions.keySet().removeAll(addedUnits);

// Re-sort attack options
sortedUnitAttackOptions = ProSortMoveOptionsUtils.sortUnitNeededOptionsThenAttack(player, sortedUnitAttackOptions,
attackMap, ProData.unitTerritoryMap, calc);

// Add sea units to any territory that significantly increases TUV gain
for (final Iterator<Unit> it = sortedUnitAttackOptions.keySet().iterator(); it.hasNext();) {
final Unit unit = it.next();
for (final Unit unit : sortedUnitAttackOptions.keySet()) {
final boolean isSeaUnit = UnitAttachment.get(unit.getType()).getIsSea();
if (!isSeaUnit) {
continue; // skip non-sea units
Expand All @@ -848,13 +852,14 @@ private void determineUnitsToAttackWith(final List<ProTerritory> prioritizedTerr
patd.getMaxEnemyDefenders(player, data), patd.getBombardTerritoryMap().keySet());
final double unitValue = ProData.unitValueMap.getInt(unit.getType());
if ((result2.getTuvSwing() - unitValue / 3) > result.getTuvSwing()) {
attackMap.get(t).addUnit(unit);
attackMap.get(t).setBattleResult(null);
it.remove();
attackMap.get(t).addUnit(unit);
addedUnits.add(unit);
break;
}
}
}
sortedUnitAttackOptions.keySet().removeAll(addedUnits);

// Determine if all attacks are worth it
final List<Unit> usedUnits = new ArrayList<>();
Expand Down Expand Up @@ -1004,10 +1009,10 @@ private Map<Unit, Set<Territory>> tryToAttackTerritories(final List<ProTerritory

// Sort units by number of attack options and cost
Map<Unit, Set<Territory>> sortedUnitAttackOptions = ProSortMoveOptionsUtils.sortUnitMoveOptions(unitAttackOptions);
final List<Unit> addedUnits = new ArrayList<>();

// Try to set at least one destroyer in each sea territory with subs
for (final Iterator<Unit> it = sortedUnitAttackOptions.keySet().iterator(); it.hasNext();) {
final Unit unit = it.next();
for (final Unit unit : sortedUnitAttackOptions.keySet()) {
final boolean isDestroyerUnit = UnitAttachment.get(unit.getType()).getIsDestroyer();
if (!isDestroyerUnit) {
continue; // skip non-destroyer units
Expand All @@ -1019,17 +1024,17 @@ private Map<Unit, Set<Territory>> tryToAttackTerritories(final List<ProTerritory
if (defendingUnits.stream().anyMatch(Matches.unitIsSub())
&& attackMap.get(t).getUnits().stream().noneMatch(Matches.unitIsDestroyer())) {
attackMap.get(t).addUnit(unit);
it.remove();
addedUnits.add(unit);
break;
}
}
}
sortedUnitAttackOptions.keySet().removeAll(addedUnits);

// Set enough land and sea units in territories to have at least a chance of winning
for (final Iterator<Unit> it = sortedUnitAttackOptions.keySet().iterator(); it.hasNext();) {
final Unit unit = it.next();
for (final Unit unit : sortedUnitAttackOptions.keySet()) {
final boolean isAirUnit = UnitAttachment.get(unit.getType()).getIsAir();
if (isAirUnit) {
if (isAirUnit || addedUnits.contains(unit)) {
continue; // skip air units
}
final TreeMap<Double, Territory> estimatesMap = new TreeMap<>();
Expand All @@ -1047,20 +1052,21 @@ private Map<Unit, Set<Territory>> tryToAttackTerritories(final List<ProTerritory
}
if (!estimatesMap.isEmpty() && estimatesMap.firstKey() < 40) {
final Territory minWinTerritory = estimatesMap.entrySet().iterator().next().getValue();
attackMap.get(minWinTerritory).addUnit(unit);
it.remove();
final List<Unit> unitsToAdd = ProTransportUtils.getUnitsToAdd(unit, alreadyMovedUnits, attackMap);
attackMap.get(minWinTerritory).addUnits(unitsToAdd);
addedUnits.addAll(unitsToAdd);
}
}
sortedUnitAttackOptions.keySet().removeAll(addedUnits);

// Re-sort attack options
sortedUnitAttackOptions = ProSortMoveOptionsUtils.sortUnitNeededOptionsThenAttack(player, sortedUnitAttackOptions,
attackMap, ProData.unitTerritoryMap, calc);

// Set non-air units in territories that can be held
for (final Iterator<Unit> it = sortedUnitAttackOptions.keySet().iterator(); it.hasNext();) {
final Unit unit = it.next();
for (final Unit unit : sortedUnitAttackOptions.keySet()) {
final boolean isAirUnit = UnitAttachment.get(unit.getType()).getIsAir();
if (isAirUnit) {
if (isAirUnit || addedUnits.contains(unit)) {
continue; // skip air units
}
Territory minWinTerritory = null;
Expand All @@ -1081,19 +1087,20 @@ private Map<Unit, Set<Territory>> tryToAttackTerritories(final List<ProTerritory
}
}
if (minWinTerritory != null) {
attackMap.get(minWinTerritory).addUnit(unit);
attackMap.get(minWinTerritory).setBattleResult(null);
it.remove();
final List<Unit> unitsToAdd = ProTransportUtils.getUnitsToAdd(unit, alreadyMovedUnits, attackMap);
attackMap.get(minWinTerritory).addUnits(unitsToAdd);
addedUnits.addAll(unitsToAdd);
}
}
sortedUnitAttackOptions.keySet().removeAll(addedUnits);

// Re-sort attack options
sortedUnitAttackOptions = ProSortMoveOptionsUtils.sortUnitNeededOptionsThenAttack(player, sortedUnitAttackOptions,
attackMap, ProData.unitTerritoryMap, calc);

// Set air units in territories that can't be held (don't move planes to empty territories)
for (final Iterator<Unit> it = sortedUnitAttackOptions.keySet().iterator(); it.hasNext();) {
final Unit unit = it.next();
for (final Unit unit : sortedUnitAttackOptions.keySet()) {
final boolean isAirUnit = UnitAttachment.get(unit.getType()).getIsAir();
if (!isAirUnit) {
continue; // skip non-air units
Expand Down Expand Up @@ -1141,19 +1148,22 @@ private Map<Unit, Set<Territory>> tryToAttackTerritories(final List<ProTerritory
}
}
if (minWinTerritory != null) {
attackMap.get(minWinTerritory).addUnit(unit);
attackMap.get(minWinTerritory).setBattleResult(null);
it.remove();
attackMap.get(minWinTerritory).addUnit(unit);
addedUnits.add(unit);
}
}
sortedUnitAttackOptions.keySet().removeAll(addedUnits);

// Re-sort attack options
sortedUnitAttackOptions = ProSortMoveOptionsUtils.sortUnitNeededOptionsThenAttack(player, sortedUnitAttackOptions,
attackMap, ProData.unitTerritoryMap, calc);

// Set remaining units in any territory that needs it (don't move planes to empty territories)
for (final Iterator<Unit> it = sortedUnitAttackOptions.keySet().iterator(); it.hasNext();) {
final Unit unit = it.next();
for (final Unit unit : sortedUnitAttackOptions.keySet()) {
if (addedUnits.contains(unit)) {
continue;
}
final boolean isAirUnit = UnitAttachment.get(unit.getType()).getIsAir();
Territory minWinTerritory = null;
double minWinPercentage = ProData.winPercentage;
Expand Down Expand Up @@ -1197,11 +1207,13 @@ private Map<Unit, Set<Territory>> tryToAttackTerritories(final List<ProTerritory
}
}
if (minWinTerritory != null) {
attackMap.get(minWinTerritory).addUnit(unit);
attackMap.get(minWinTerritory).setBattleResult(null);
it.remove();
final List<Unit> unitsToAdd = ProTransportUtils.getUnitsToAdd(unit, alreadyMovedUnits, attackMap);
attackMap.get(minWinTerritory).addUnits(unitsToAdd);
addedUnits.addAll(unitsToAdd);
}
}
sortedUnitAttackOptions.keySet().removeAll(addedUnits);

// Re-sort attack options
sortedUnitAttackOptions =
Expand Down Expand Up @@ -1292,14 +1304,9 @@ private Map<Unit, Set<Territory>> tryToAttackTerritories(final List<ProTerritory
if (result.getWinPercentage() < minWinPercentage
|| (!result.isHasLandUnitRemaining() && minWinTerritory == null)) {

// Get all units that have already attacked
final List<Unit> alreadyAttackedWithUnits = new ArrayList<>(alreadyMovedUnits);
alreadyAttackedWithUnits.addAll(attackMap.values().stream()
.map(ProTerritory::getUnits)
.flatMap(Collection::stream)
.collect(Collectors.toList()));

// Find units that haven't attacked and can be transported
final List<Unit> alreadyAttackedWithUnits =
ProTransportUtils.getMovedUnits(alreadyMovedUnits, attackMap);
for (final ProTransport proTransportData : transportMapList) {
if (proTransportData.getTransport().equals(transport)) {

Expand Down
Loading