Simplify percent system by adding entern percent and whitelist config toggles
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Ursprung
4f65023491
Commit
0a45b161a2
@ -114,8 +114,6 @@ WinConditions: # defaults to none if missing
|
|||||||
# - CAPTAIN_DEAD
|
# - CAPTAIN_DEAD
|
||||||
|
|
||||||
# - PERCENT_SYSTEM
|
# - PERCENT_SYSTEM
|
||||||
# - WHITELIST_PERCENT
|
|
||||||
# - RELATIVE_PERCENT
|
|
||||||
# - POINTS
|
# - POINTS
|
||||||
# - POINTS_AIRSHIP
|
# - POINTS_AIRSHIP
|
||||||
|
|
||||||
@ -133,6 +131,10 @@ WinConditionParams:
|
|||||||
TimeoutTime: 1200 # defaults to 1200 if missing
|
TimeoutTime: 1200 # defaults to 1200 if missing
|
||||||
# The percentage when any of the percent win conditions limits or triggers a win
|
# The percentage when any of the percent win conditions limits or triggers a win
|
||||||
PercentWin: 7.0 # defaults to 7.0 if missing
|
PercentWin: 7.0 # defaults to 7.0 if missing
|
||||||
|
# Does the percentage still change after the start of the enter phase
|
||||||
|
PercentEntern: true # defaults to true if missing
|
||||||
|
# Is Blocks a whitelist (true) or blacklist (false)
|
||||||
|
BlocksWhitelist: false # defaults to false if missing
|
||||||
# Special Blocks (Valid spigot material values) used by the percent win conditions
|
# Special Blocks (Valid spigot material values) used by the percent win conditions
|
||||||
Blocks: [] # defaults to none if missing
|
Blocks: [] # defaults to none if missing
|
||||||
|
|
||||||
|
@ -107,6 +107,8 @@ public class Config {
|
|||||||
//win condition parameters
|
//win condition parameters
|
||||||
public static final int TimeoutTime;
|
public static final int TimeoutTime;
|
||||||
public static final double PercentWin;
|
public static final double PercentWin;
|
||||||
|
public static final boolean PercentEntern;
|
||||||
|
public static final boolean PercentBlocksWhitelist;
|
||||||
public static final Set<Material> PercentBlocks;
|
public static final Set<Material> PercentBlocks;
|
||||||
|
|
||||||
//default kits
|
//default kits
|
||||||
@ -197,6 +199,8 @@ public class Config {
|
|||||||
|
|
||||||
TimeoutTime = config.getInt("WinConditionParams.TimeoutTime", 1200);
|
TimeoutTime = config.getInt("WinConditionParams.TimeoutTime", 1200);
|
||||||
PercentWin = config.getDouble("WinConditionParams.PercentWin", 7.0);
|
PercentWin = config.getDouble("WinConditionParams.PercentWin", 7.0);
|
||||||
|
PercentEntern = config.getBoolean("WinConditionParams.PercentEntern", true);
|
||||||
|
PercentBlocksWhitelist = config.getBoolean("WinConditionParams.BlocksWhitelist", false);
|
||||||
PercentBlocks = Collections.unmodifiableSet(config.getStringList("WinConditionParams.Blocks").stream().map(Material::valueOf).collect(Collectors.toSet()));
|
PercentBlocks = Collections.unmodifiableSet(config.getStringList("WinConditionParams.Blocks").stream().map(Material::valueOf).collect(Collectors.toSet()));
|
||||||
|
|
||||||
EnterStages = Collections.unmodifiableList(config.getIntegerList("EnterStages"));
|
EnterStages = Collections.unmodifiableList(config.getIntegerList("EnterStages"));
|
||||||
|
@ -118,9 +118,7 @@ public class FightSystem extends JavaPlugin {
|
|||||||
new WinconditionCaptainDead();
|
new WinconditionCaptainDead();
|
||||||
new WinconditionBlocks(Winconditions.WATER_TECH_KO, "WaterTechKO", "BAR_WATER", FlatteningWrapper.impl::isWater);
|
new WinconditionBlocks(Winconditions.WATER_TECH_KO, "WaterTechKO", "BAR_WATER", FlatteningWrapper.impl::isWater);
|
||||||
new WinconditionBlocks(Winconditions.PUMPKIN_TECH_KO, "PumpkinTechKO", "BAR_CANNONS", block -> block.getType() == WinconditionBlocks.PUMPKIN_LANTERN);
|
new WinconditionBlocks(Winconditions.PUMPKIN_TECH_KO, "PumpkinTechKO", "BAR_CANNONS", block -> block.getType() == WinconditionBlocks.PUMPKIN_LANTERN);
|
||||||
new WinconditionPercentSystem();
|
new WinconditionPercent(Winconditions.PERCENT_SYSTEM, "Percent");
|
||||||
new WinconditionBlacklistPercent();
|
|
||||||
new WinconditionWhitelistPercent();
|
|
||||||
new WinconditionPoints();
|
new WinconditionPoints();
|
||||||
new WinconditionPointsAirShip();
|
new WinconditionPointsAirShip();
|
||||||
new WinconditionTimeout();
|
new WinconditionTimeout();
|
||||||
|
@ -34,7 +34,7 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
public abstract class Wincondition {
|
public abstract class Wincondition {
|
||||||
|
|
||||||
protected static PercentWincondition percentWincondition = null;
|
protected static WinconditionPercent percentWincondition = null;
|
||||||
protected static StateDependentCountdown timeOverCountdown = null;
|
protected static StateDependentCountdown timeOverCountdown = null;
|
||||||
protected static final List<PrintableWincondition> printableWinconditions = new ArrayList<>();
|
protected static final List<PrintableWincondition> printableWinconditions = new ArrayList<>();
|
||||||
|
|
||||||
@ -65,7 +65,7 @@ public abstract class Wincondition {
|
|||||||
return printableWinconditions;
|
return printableWinconditions;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PercentWincondition getPercentWincondition() {
|
public static WinconditionPercent getPercentWincondition() {
|
||||||
return percentWincondition;
|
return percentWincondition;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is a part of the SteamWar software.
|
|
||||||
|
|
||||||
Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.fightsystem.winconditions;
|
|
||||||
|
|
||||||
public class WinconditionBlacklistPercent extends PercentWincondition {
|
|
||||||
|
|
||||||
public WinconditionBlacklistPercent(){
|
|
||||||
super("RelativePercent", Winconditions.RELATIVE_PERCENT);
|
|
||||||
}
|
|
||||||
}
|
|
@ -26,7 +26,6 @@ import de.steamwar.fightsystem.states.FightState;
|
|||||||
import de.steamwar.fightsystem.states.OneShotStateDependent;
|
import de.steamwar.fightsystem.states.OneShotStateDependent;
|
||||||
import de.steamwar.fightsystem.states.StateDependentListener;
|
import de.steamwar.fightsystem.states.StateDependentListener;
|
||||||
import de.steamwar.fightsystem.utils.Message;
|
import de.steamwar.fightsystem.utils.Message;
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
@ -34,27 +33,12 @@ import org.bukkit.event.entity.EntityExplodeEvent;
|
|||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
import java.util.function.BooleanSupplier;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Predicate;
|
|
||||||
import java.util.function.ToIntFunction;
|
|
||||||
|
|
||||||
public class PercentWincondition extends Wincondition implements PrintableWincondition {
|
public class WinconditionPercent extends Wincondition implements PrintableWincondition {
|
||||||
|
|
||||||
private final Map<FightTeam, TeamPercent> teamMap = new HashMap<>();
|
private final Map<FightTeam, TeamPercent> teamMap = new HashMap<>();
|
||||||
|
|
||||||
protected BooleanSupplier explosionFilter = () -> !Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft();
|
|
||||||
protected Predicate<Material> testBlock = type -> !Config.PercentBlocks.contains(type);
|
|
||||||
protected ToIntFunction<FightTeam> totalBlockCalc = team -> {
|
|
||||||
AtomicInteger blocks = new AtomicInteger();
|
|
||||||
team.getSchemRegion().forEach((x, y, z) -> {
|
|
||||||
if (testBlock.test(Config.world.getBlockAt(x, y, z).getType())) {
|
|
||||||
blocks.getAndIncrement();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return blocks.get();
|
|
||||||
};
|
|
||||||
protected Consumer<FightTeam> checkWin = team -> {
|
protected Consumer<FightTeam> checkWin = team -> {
|
||||||
if (getPercent(team) >= Config.PercentWin) {
|
if (getPercent(team) >= Config.PercentWin) {
|
||||||
win(Fight.getOpposite(team), "WIN_PERCENT", team.getColoredName());
|
win(Fight.getOpposite(team), "WIN_PERCENT", team.getColoredName());
|
||||||
@ -62,7 +46,7 @@ public class PercentWincondition extends Wincondition implements PrintableWincon
|
|||||||
};
|
};
|
||||||
protected Consumer<FightTeam> postEnable = team -> {};
|
protected Consumer<FightTeam> postEnable = team -> {};
|
||||||
|
|
||||||
public PercentWincondition(String windescription, Winconditions wincondition) {
|
public WinconditionPercent(Winconditions wincondition, String windescription) {
|
||||||
super(windescription);
|
super(windescription);
|
||||||
|
|
||||||
if (Config.ActiveWinconditions.contains(wincondition)) {
|
if (Config.ActiveWinconditions.contains(wincondition)) {
|
||||||
@ -105,12 +89,16 @@ public class PercentWincondition extends Wincondition implements PrintableWincon
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onEntityExplode(EntityExplodeEvent event) {
|
public void onEntityExplode(EntityExplodeEvent event) {
|
||||||
if (event.getEntityType() == EntityType.FIREBALL || explosionFilter.getAsBoolean() || !team.getExtendRegion().inRegion(event.getEntity().getLocation())) {
|
if (
|
||||||
|
event.getEntityType() == EntityType.FIREBALL ||
|
||||||
|
!team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
|
||||||
|
(!Config.PercentEntern && !Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
|
||||||
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
event.blockList().forEach(block -> {
|
event.blockList().forEach(block -> {
|
||||||
if (testBlock.test(block.getType())) {
|
if (Config.PercentBlocks.contains(block.getType()) == Config.PercentBlocksWhitelist) {
|
||||||
currentBlocks--;
|
currentBlocks--;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -119,7 +107,11 @@ public class PercentWincondition extends Wincondition implements PrintableWincon
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void enable() {
|
private void enable() {
|
||||||
totalBlocks = totalBlockCalc.applyAsInt(team);
|
totalBlocks = 0;
|
||||||
|
team.getSchemRegion().forEach((x, y, z) -> {
|
||||||
|
if (Config.PercentBlocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.PercentBlocksWhitelist)
|
||||||
|
totalBlocks++;
|
||||||
|
});
|
||||||
currentBlocks = totalBlocks;
|
currentBlocks = totalBlocks;
|
||||||
postEnable.accept(team);
|
postEnable.accept(team);
|
||||||
}
|
}
|
@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is a part of the SteamWar software.
|
|
||||||
|
|
||||||
Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.fightsystem.winconditions;
|
|
||||||
|
|
||||||
public class WinconditionPercentSystem extends PercentWincondition {
|
|
||||||
|
|
||||||
public WinconditionPercentSystem() {
|
|
||||||
super("Percent", Winconditions.PERCENT_SYSTEM);
|
|
||||||
|
|
||||||
totalBlockCalc = team -> team.getSchemRegion().volume();
|
|
||||||
explosionFilter = () -> false;
|
|
||||||
}
|
|
||||||
}
|
|
@ -36,12 +36,12 @@ import org.bukkit.event.player.PlayerQuitEvent;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class WinconditionPoints extends PercentWincondition implements Listener {
|
public class WinconditionPoints extends WinconditionPercent implements Listener {
|
||||||
|
|
||||||
private final Map<FightTeam, TeamPoints> teamMap = new HashMap<>();
|
private final Map<FightTeam, TeamPoints> teamMap = new HashMap<>();
|
||||||
|
|
||||||
public WinconditionPoints(){
|
public WinconditionPoints(){
|
||||||
super("Points", Winconditions.POINTS);
|
super(Winconditions.POINTS, "Points");
|
||||||
|
|
||||||
checkWin = team -> {};
|
checkWin = team -> {};
|
||||||
postEnable = this::pointInit;
|
postEnable = this::pointInit;
|
||||||
|
@ -35,7 +35,7 @@ import java.util.HashMap;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
public class WinconditionPointsAirShip extends PercentWincondition implements Listener {
|
public class WinconditionPointsAirShip extends WinconditionPercent implements Listener {
|
||||||
|
|
||||||
private double[] as = new double[] {
|
private double[] as = new double[] {
|
||||||
0.5,
|
0.5,
|
||||||
@ -56,7 +56,7 @@ public class WinconditionPointsAirShip extends PercentWincondition implements Li
|
|||||||
private final Map<FightTeam, TeamPoints> teamMap = new HashMap<>();
|
private final Map<FightTeam, TeamPoints> teamMap = new HashMap<>();
|
||||||
|
|
||||||
public WinconditionPointsAirShip(){
|
public WinconditionPointsAirShip(){
|
||||||
super("Points", Winconditions.POINTS_AIRSHIP);
|
super(Winconditions.POINTS_AIRSHIP, "Points");
|
||||||
|
|
||||||
checkWin = team -> {
|
checkWin = team -> {
|
||||||
if (teamMap.get(team).getPoints() > TeamPoints.WIN_POINTS) {
|
if (teamMap.get(team).getPoints() > TeamPoints.WIN_POINTS) {
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is a part of the SteamWar software.
|
|
||||||
|
|
||||||
Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.fightsystem.winconditions;
|
|
||||||
|
|
||||||
import de.steamwar.fightsystem.Config;
|
|
||||||
|
|
||||||
public class WinconditionWhitelistPercent extends PercentWincondition {
|
|
||||||
|
|
||||||
public WinconditionWhitelistPercent() {
|
|
||||||
super("WhitelistPercent", Winconditions.WHITELIST_PERCENT);
|
|
||||||
|
|
||||||
testBlock = Config.PercentBlocks::contains;
|
|
||||||
}
|
|
||||||
}
|
|
@ -28,8 +28,6 @@ public enum Winconditions {
|
|||||||
CAPTAIN_DEAD,
|
CAPTAIN_DEAD,
|
||||||
|
|
||||||
PERCENT_SYSTEM,
|
PERCENT_SYSTEM,
|
||||||
WHITELIST_PERCENT,
|
|
||||||
RELATIVE_PERCENT,
|
|
||||||
POINTS,
|
POINTS,
|
||||||
POINTS_AIRSHIP,
|
POINTS_AIRSHIP,
|
||||||
|
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren