From bd4696429deefc1563ef8a229e981576219c079f Mon Sep 17 00:00:00 2001 From: yoyosource Date: Tue, 7 Jun 2022 14:58:21 +0200 Subject: [PATCH 1/6] Update Config --- FightSystem_Core/src/de/steamwar/fightsystem/Config.java | 2 ++ .../src/de/steamwar/fightsystem/listener/PistonListener.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java index 0bc6775..9404bbe 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java @@ -75,6 +75,7 @@ public class Config { public static final boolean GroundWalkable; public static final boolean DisableSnowMelt; public static final boolean ArenaLeaveable; + public static final boolean AllowMissiles; //schematic parameter public static final boolean RanksEnabled; @@ -172,6 +173,7 @@ public class Config { GroundWalkable = config.getBoolean("Arena.GroundWalkable", true); DisableSnowMelt = config.getBoolean("Arena.DisableSnowMelt", false); ArenaLeaveable = config.getBoolean("Arena.Leaveable", false); + AllowMissiles = config.getBoolean("Arena.AllowMissiles", false); int schemsizeX = config.getInt("Schematic.Size.x"); int schemsizeY = config.getInt("Schematic.Size.y"); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java index 43848ba..9c60d19 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java @@ -36,8 +36,8 @@ public class PistonListener implements Listener { public PistonListener() { //Wenn Entern aktiv ist, sollen Raketen etc. entern können if(!ArenaMode.Check.contains(Config.mode)) { - new StateDependentListener(Config.EnterStages.isEmpty(), FightState.All, this); - new StateDependentListener(!Config.EnterStages.isEmpty(), FightState.Setup, this); + new StateDependentListener(Config.EnterStages.isEmpty() || Config.AllowMissiles, FightState.All, this); + new StateDependentListener(!(Config.EnterStages.isEmpty() || Config.AllowMissiles), FightState.Setup, this); } } From 2263cdd4b451c1bbec376fa58957c6ab406baac7 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Tue, 7 Jun 2022 15:02:44 +0200 Subject: [PATCH 2/6] Update Config --- FightSystem_Core/src/de/steamwar/fightsystem/Config.java | 2 +- .../src/de/steamwar/fightsystem/listener/PistonListener.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java index 9404bbe..b985885 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java @@ -173,7 +173,6 @@ public class Config { GroundWalkable = config.getBoolean("Arena.GroundWalkable", true); DisableSnowMelt = config.getBoolean("Arena.DisableSnowMelt", false); ArenaLeaveable = config.getBoolean("Arena.Leaveable", false); - AllowMissiles = config.getBoolean("Arena.AllowMissiles", false); int schemsizeX = config.getInt("Schematic.Size.x"); int schemsizeY = config.getInt("Schematic.Size.y"); @@ -196,6 +195,7 @@ public class Config { PercentBlocks = Collections.unmodifiableSet(config.getStringList("WinConditionParams.Blocks").stream().map(Material::valueOf).collect(Collectors.toSet())); EnterStages = Collections.unmodifiableList(config.getIntegerList("EnterStages")); + AllowMissiles = config.getBoolean("Arena.AllowMissiles", EnterStages.isEmpty()); KitFile = config.getString("Kits.File", "kits.yml"); MemberDefault = config.getString("Kits.MemberDefault", "default"); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java index 9c60d19..7aba189 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java @@ -36,8 +36,8 @@ public class PistonListener implements Listener { public PistonListener() { //Wenn Entern aktiv ist, sollen Raketen etc. entern können if(!ArenaMode.Check.contains(Config.mode)) { - new StateDependentListener(Config.EnterStages.isEmpty() || Config.AllowMissiles, FightState.All, this); - new StateDependentListener(!(Config.EnterStages.isEmpty() || Config.AllowMissiles), FightState.Setup, this); + new StateDependentListener(!Config.AllowMissiles, FightState.All, this); + new StateDependentListener(Config.AllowMissiles, FightState.Setup, this); } } From 23e3e741c72e2857a1db50e7ebbba95181d0c5c7 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Tue, 7 Jun 2022 15:09:42 +0200 Subject: [PATCH 3/6] Update Config --- FightSystem_Core/src/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/FightSystem_Core/src/config.yml b/FightSystem_Core/src/config.yml index f87f00c..c39ff0b 100644 --- a/FightSystem_Core/src/config.yml +++ b/FightSystem_Core/src/config.yml @@ -45,6 +45,9 @@ Arena: DisableSnowMelt: false # defaults to false if missing # Allow leaving the arena area as spectator Leaveable: false # defaults to false if missing + # Allow missiles to fly to the enemy and not stop at the schem border. + # This overrides the 'EnterStages' setting if present otherwise if any 'EnterStages' are present this defaults to 'true'. + AllowMissiles: false # defaults to false if missing Schematic: # The size of the schematics @@ -104,6 +107,7 @@ WinConditions: # defaults to none if missing # - WHITELIST_PERCENT # - RELATIVE_PERCENT # - POINTS + # - POINTS_AIRSHIP # - WATER_TECH_KO # - TIME_TECH_KO From e49215d9216ef57656651c89bb35a93ff0f83f9e Mon Sep 17 00:00:00 2001 From: yoyosource Date: Tue, 7 Jun 2022 15:13:03 +0200 Subject: [PATCH 4/6] Update Config --- FightSystem_Core/src/config.yml | 3 +-- FightSystem_Core/src/de/steamwar/fightsystem/Config.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/FightSystem_Core/src/config.yml b/FightSystem_Core/src/config.yml index c39ff0b..76d3b49 100644 --- a/FightSystem_Core/src/config.yml +++ b/FightSystem_Core/src/config.yml @@ -46,8 +46,7 @@ Arena: # Allow leaving the arena area as spectator Leaveable: false # defaults to false if missing # Allow missiles to fly to the enemy and not stop at the schem border. - # This overrides the 'EnterStages' setting if present otherwise if any 'EnterStages' are present this defaults to 'true'. - AllowMissiles: false # defaults to false if missing + AllowMissiles: false # defaults to true if a 'EnterStages' is present otherwise 'false' Schematic: # The size of the schematics diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java index b985885..86026c6 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java @@ -195,7 +195,7 @@ public class Config { PercentBlocks = Collections.unmodifiableSet(config.getStringList("WinConditionParams.Blocks").stream().map(Material::valueOf).collect(Collectors.toSet())); EnterStages = Collections.unmodifiableList(config.getIntegerList("EnterStages")); - AllowMissiles = config.getBoolean("Arena.AllowMissiles", EnterStages.isEmpty()); + AllowMissiles = config.getBoolean("Arena.AllowMissiles", !EnterStages.isEmpty()); KitFile = config.getString("Kits.File", "kits.yml"); MemberDefault = config.getString("Kits.MemberDefault", "default"); From 14d7b0d6a718d57d3597fabc48525fe1d5dcacb1 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Tue, 7 Jun 2022 15:15:51 +0200 Subject: [PATCH 5/6] Update Config --- FightSystem_Core/src/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_Core/src/config.yml b/FightSystem_Core/src/config.yml index 76d3b49..40a21f1 100644 --- a/FightSystem_Core/src/config.yml +++ b/FightSystem_Core/src/config.yml @@ -46,7 +46,7 @@ Arena: # Allow leaving the arena area as spectator Leaveable: false # defaults to false if missing # Allow missiles to fly to the enemy and not stop at the schem border. - AllowMissiles: false # defaults to true if a 'EnterStages' is present otherwise 'false' + AllowMissiles: false # defaults to true if a EnterStages are present otherwise 'false' Schematic: # The size of the schematics From d154f8579fc8e59a3d4f8ba6578da3eb5526624e Mon Sep 17 00:00:00 2001 From: yoyosource Date: Tue, 7 Jun 2022 15:19:22 +0200 Subject: [PATCH 6/6] Update Config --- FightSystem_Core/src/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FightSystem_Core/src/config.yml b/FightSystem_Core/src/config.yml index 40a21f1..711d1d2 100644 --- a/FightSystem_Core/src/config.yml +++ b/FightSystem_Core/src/config.yml @@ -46,7 +46,7 @@ Arena: # Allow leaving the arena area as spectator Leaveable: false # defaults to false if missing # Allow missiles to fly to the enemy and not stop at the schem border. - AllowMissiles: false # defaults to true if a EnterStages are present otherwise 'false' + AllowMissiles: false # defaults to true if EnterStages are present otherwise 'false' Schematic: # The size of the schematics