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

Jump to bottom

Score Minimum Value #1046

Merged
merged 13 commits into from
Nov 4, 2022
Merged

Score Minimum Value #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
715292a
Add mercy limit min value
Samuel-Roach Aug 26, 2022
4b4896f
Apply mvn formatting to MercyRule min changes
Samuel-Roach Aug 26, 2022
2b172b5
Move expected location of 'min' to an attribute of 'mercy' node
Samuel-Roach Sep 3, 2022
cd289d9
Fix world border filter NPE (#1052)
Pablete1234 Sep 2, 2022
bd59686
Fix objective filter not reacting dynamically (#1050)
Pablete1234 Sep 2, 2022
aa85a9d
Add options for item kits being given to players (#1049)
Pablete1234 Sep 2, 2022
842aaa8
Fix mode commands with filtered modes (#1048)
Pablete1234 Sep 2, 2022
75bf28c
Reintroduce include statements (#1028)
applenick Sep 2, 2022
e49db4f
Remove testing comment
Samuel-Roach Sep 3, 2022
0e4a8a3
Merge branch 'dev' into mercy-limit-min
Samuel-Roach Sep 4, 2022
8204b7a
Use getUniqueChild for mercy rule
Samuel-Roach Oct 15, 2022
44d3cba
Merge branch 'dev' into mercy-limit-min
Samuel-Roach Oct 19, 2022
5a488f8
Merge branch 'dev' into mercy-limit-min
Samuel-Roach Nov 4, 2022
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
11 changes: 8 additions & 3 deletions core/src/main/java/tc/oc/pgm/score/MercyRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ public class MercyRule {
private final ScoreMatchModule scoreMatchModule;
private final int scoreLimit;
private final int mercyLimit;
private final int mercyLimitMin;

private Map.Entry<Competitor, Double> leader;
private Map.Entry<Competitor, Double> trailer;

public MercyRule(ScoreMatchModule scoreMatchModule, int scoreLimit, int mercyLimit) {
public MercyRule(
ScoreMatchModule scoreMatchModule, int scoreLimit, int mercyLimit, int mercyLimitMin) {
this.scoreMatchModule = scoreMatchModule;
this.scoreLimit = scoreLimit;
this.mercyLimit = mercyLimit;
this.mercyLimitMin = mercyLimitMin;

calculateLeaders();
}
Expand Down Expand Up @@ -49,11 +52,13 @@ private boolean isTrailer(Competitor competitor) {
public int getScoreLimit() {
int scoreBaseline = (int) getTrailerScore();

int mercyBaseline = Math.max(scoreBaseline + mercyLimit, mercyLimitMin);

if (scoreLimit < 0) {
return scoreBaseline + mercyLimit;
return mercyBaseline;
}

return Math.min(scoreBaseline + mercyLimit, scoreLimit);
return Math.min(mercyBaseline, scoreLimit);
}

public void handleEvent(CompetitorScoreChangeEvent event) {
Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/tc/oc/pgm/score/ScoreConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ public class ScoreConfig {
public int deathScore;
public int killScore;
public int mercyLimit;
public int mercyLimitMin;
}
3 changes: 2 additions & 1 deletion core/src/main/java/tc/oc/pgm/score/ScoreMatchModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ public ScoreMatchModule(Match match, ScoreConfig config, Set<ScoreBox> scoreBoxe
this.match.getCompetitors().forEach(competitor -> this.scores.put(competitor, 0.0));

if (this.config.mercyLimit > 0) {
this.mercyRule = new MercyRule(this, config.scoreLimit, config.mercyLimit);
this.mercyRule =
new MercyRule(this, config.scoreLimit, config.mercyLimit, config.mercyLimitMin);
}
}

Expand Down
4 changes: 4 additions & 0 deletions core/src/main/java/tc/oc/pgm/score/ScoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ public ScoreModule parse(MapFactory factory, Logger logger, Document doc)
config.scoreLimit = XMLUtils.parseNumber(scoreEl.getChild("limit"), Integer.class, -1);
config.mercyLimit = XMLUtils.parseNumber(scoreEl.getChild("mercy"), Integer.class, -1);

Element mercyElement = XMLUtils.getUniqueChild(scoreEl, "mercy");
config.mercyLimitMin =
XMLUtils.parseNumber(Node.fromAttr(mercyElement, "min"), Integer.class, -1);

// For backwards compatibility, default kill/death points to 1 if proto is old and <king/>
// tag
// is not present
Expand Down