External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: removed useless getNumberOfTargets from Target (replaced with getMinNumberOfTargets)

Browse source
This commit is contained in:
Oleg Agafonov 2025-05-06 23:05:39 +04:00
parent 264eb58644
commit 00dc6f4742
20 changed files with 55 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
View file

@ -164,7 +164,7 @@ public class ComputerPlayer extends PlayerImpl {
boolean required = target.isRequired(sourceId, game);
Set<UUID> possibleTargets = target.possibleTargets(abilityControllerId, source, game);
if (possibleTargets.isEmpty() || target.getTargets().size() >= target.getNumberOfTargets()) {
if (possibleTargets.isEmpty() || target.getTargets().size() >= target.getMinNumberOfTargets()) {
required = false;
}
@ -251,7 +251,7 @@ public class ComputerPlayer extends PlayerImpl {
for (Permanent permanent : targets) {
if (target.canTarget(abilityControllerId, permanent.getId(), source, game) && !target.getTargets().contains(permanent.getId())) {
// stop to add targets if not needed and outcome is no advantage for AI player
if (target.getNumberOfTargets() == target.getTargets().size()) {
if (target.getMinNumberOfTargets() == target.getTargets().size()) {
if (outcome.isGood() && hasOpponent(permanent.getControllerId(), game)) {
return true;
}
@ -348,7 +348,7 @@ public class ComputerPlayer extends PlayerImpl {
target.add(randomOpponentId, game);
return true;
}
if (!target.isRequired(sourceId, game) || target.getNumberOfTargets() == 0) {
if (!target.isRequired(sourceId, game) || target.getMinNumberOfTargets() == 0) {
return false;
}
if (target.canTarget(abilityControllerId, randomOpponentId, source, game)) {
@ -548,7 +548,7 @@ public class ComputerPlayer extends PlayerImpl {
boolean required = target.isRequired(sourceId, game);
Set<UUID> possibleTargets = target.possibleTargets(abilityControllerId, source, game);
if (possibleTargets.isEmpty() || target.getTargets().size() >= target.getNumberOfTargets()) {
if (possibleTargets.isEmpty() || target.getTargets().size() >= target.getMinNumberOfTargets()) {
required = false;
}
@ -672,7 +672,7 @@ public class ComputerPlayer extends PlayerImpl {
for (Permanent permanent : targets) {
if (target.canTarget(abilityControllerId, permanent.getId(), source, game)) {
target.addTarget(permanent.getId(), source, game);
if (target.getNumberOfTargets() <= target.getTargets().size() && (!outcome.isGood() || target.getMaxNumberOfTargets() <= target.getTargets().size())) {
if (target.getMinNumberOfTargets() <= target.getTargets().size() && (!outcome.isGood() || target.getMaxNumberOfTargets() <= target.getTargets().size())) {
return true;
}
}
@ -2051,9 +2051,9 @@ public class ComputerPlayer extends PlayerImpl {
cardChoices.remove(card);
} else {
// We don't have any valid target to choose so stop choosing
return target.getTargets().size() >= target.getNumberOfTargets();
return target.getTargets().size() >= target.getMinNumberOfTargets();
}
if (outcome == Outcome.Neutral && target.getTargets().size() > target.getNumberOfTargets() + (target.getMaxNumberOfTargets() - target.getNumberOfTargets()) / 2) {
if (outcome == Outcome.Neutral && target.getTargets().size() > target.getMinNumberOfTargets() + (target.getMaxNumberOfTargets() - target.getMinNumberOfTargets()) / 2) {
return true;
}
}
@ -2082,9 +2082,9 @@ public class ComputerPlayer extends PlayerImpl {
cardChoices.remove(card); // selectCard don't remove cards (only on second+ tries)
} else {
// We don't have any valid target to choose so stop choosing
return target.getTargets().size() >= target.getNumberOfTargets();
return target.getTargets().size() >= target.getMinNumberOfTargets();
}
if (outcome == Outcome.Neutral && target.getTargets().size() > target.getNumberOfTargets() + (target.getMaxNumberOfTargets() - target.getNumberOfTargets()) / 2) {
if (outcome == Outcome.Neutral && target.getTargets().size() > target.getMinNumberOfTargets() + (target.getMaxNumberOfTargets() - target.getMinNumberOfTargets()) / 2) {
return true;
}
}

22
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -699,11 +699,11 @@ public class HumanPlayer extends PlayerImpl {
while (canRespond()) {
Set<UUID> possibleTargetIds = target.possibleTargets(abilityControllerId, source, game);
if (possibleTargetIds == null || possibleTargetIds.isEmpty()) {
return target.getTargets().size() >= target.getNumberOfTargets();
return target.getTargets().size() >= target.getMinNumberOfTargets();
}
boolean required = target.isRequired(source != null ? source.getSourceId() : null, game);
if (target.getTargets().size() >= target.getNumberOfTargets()) {
if (target.getTargets().size() >= target.getMinNumberOfTargets()) {
required = false;
}
@ -770,7 +770,7 @@ public class HumanPlayer extends PlayerImpl {
// send other command like cancel or done (??sends other commands like concede??)
// auto-complete on all selected
if (target.getTargets().size() >= target.getNumberOfTargets()) {
if (target.getTargets().size() >= target.getMinNumberOfTargets()) {
return true;
}
@ -802,7 +802,7 @@ public class HumanPlayer extends PlayerImpl {
Set<UUID> possibleTargetIds = target.possibleTargets(abilityControllerId, source, game);
boolean required = target.isRequired(source != null ? source.getSourceId() : null, game);
if (possibleTargetIds.isEmpty()
|| target.getTargets().size() >= target.getNumberOfTargets()) {
|| target.getTargets().size() >= target.getMinNumberOfTargets()) {
required = false;
}
@ -840,7 +840,7 @@ public class HumanPlayer extends PlayerImpl {
}
}
} else {
if (target.getTargets().size() >= target.getNumberOfTargets()) {
if (target.getTargets().size() >= target.getMinNumberOfTargets()) {
return true;
}
if (!required) {
@ -856,7 +856,7 @@ public class HumanPlayer extends PlayerImpl {
if (options == null) {
options = new HashMap<>();
}
if (target.getTargets().size() >= target.getNumberOfTargets()
if (target.getTargets().size() >= target.getMinNumberOfTargets()
&& !options.containsKey("UI.right.btn.text")) {
options.put("UI.right.btn.text", "Done");
}
@ -887,7 +887,7 @@ public class HumanPlayer extends PlayerImpl {
boolean required = target.isRequired(source != null ? source.getSourceId() : null, game);
int count = cards.count(target.getFilter(), abilityControllerId, source, game);
if (count == 0
|| target.getTargets().size() >= target.getNumberOfTargets()) {
|| target.getTargets().size() >= target.getMinNumberOfTargets()) {
required = false;
}
@ -933,7 +933,7 @@ public class HumanPlayer extends PlayerImpl {
}
}
} else {
if (target.getTargets().size() >= target.getNumberOfTargets()) {
if (target.getTargets().size() >= target.getMinNumberOfTargets()) {
return true;
}
if (!required) {
@ -968,7 +968,7 @@ public class HumanPlayer extends PlayerImpl {
boolean required = target.isRequiredExplicitlySet() ? target.isRequired() : target.isRequired(source);
int count = cards.count(target.getFilter(), abilityControllerId, source, game);
if (count == 0
|| target.getTargets().size() >= target.getNumberOfTargets()) {
|| target.getTargets().size() >= target.getMinNumberOfTargets()) {
required = false;
}
@ -1013,7 +1013,7 @@ public class HumanPlayer extends PlayerImpl {
}
}
} else {
if (target.getTargets().size() >= target.getNumberOfTargets()) {
if (target.getTargets().size() >= target.getMinNumberOfTargets()) {
return true;
}
if (!required) {
@ -1061,7 +1061,7 @@ public class HumanPlayer extends PlayerImpl {
Set<UUID> possibleTargetIds = target.possibleTargets(abilityControllerId, source, game);
boolean required = target.isRequired(source.getSourceId(), game);
if (possibleTargetIds.isEmpty()
|| target.getSize() >= target.getNumberOfTargets()) {
|| target.getSize() >= target.getMinNumberOfTargets()) {
required = false;
}