balance changes

Author: Pointifix

build.gradle

@@ -2,7 +2,7 @@ apply plugin: "java"
 
 version '1.0'
 
-sourceCompatibility = 1.9
+sourceCompatibility = JavaVersion.VERSION_16
 
 sourceSets.main.java.srcDirs = ["src"]
 
@@ -11,18 +11,28 @@ compileTestJava.options.encoding = "UTF-8"
 
 repositories {
     mavenCentral()
+    maven { url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
     maven { url 'https://www.jitpack.io' }
 }
 
 ext {
     //the build number that this plugin is made for
-    mindustryVersion = 'v140.2'
+    mindustryVersion = 'v145'
+    jabelVersion = "93fde537c7"
+}
+
+//java 8 backwards compatibility flag
+allprojects {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs.addAll(['--release', '8'])
+    }
 }
 
 dependencies {
     implementation 'org.jetbrains:annotations:20.1.0'
     compileOnly "com.github.Anuken.Arc:arc-core:$mindustryVersion"
     compileOnly "com.github.Anuken.Mindustry:core:$mindustryVersion"
+    annotationProcessor "com.github.Anuken:jabel:$jabelVersion"
     implementation 'org.mariadb.jdbc:mariadb-java-client:2.1.2'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'net.dv8tion:JDA:5.0.0-alpha.17'

gradle.properties

@@ -0,0 +1,13 @@
+org.gradle.jvmargs=--illegal-access=permit \
+--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED

src/sectorized/constant/Rules.java

@@ -47,7 +47,7 @@ public class Rules {
                 Blocks.canvas);
 
         ((ItemTurret) (Blocks.foreshadow)).ammoTypes.forEach(ammoType -> {
-            ammoType.value.damage *= 0.75;
+            ammoType.value.damage *= 1.5;
         });
         ((ItemTurret) (Blocks.spectre)).ammoTypes.forEach(ammoType -> {
             ammoType.value.damage *= 2.0;
@@ -69,7 +69,7 @@ public class Rules {
 
     public static void setSpawnGroups(mindustry.game.Rules rules) {
         if (State.planet.equals(Planets.serpulo.name)) {
-            rules.waveSpacing = 60 * 60 * 2.5f;
+            rules.waveSpacing = 60 * 60 * 3.0f;
 
             rules.spawns = Seq.with(
                     // T1
@@ -215,38 +215,31 @@ public static void setSpawnGroups(mindustry.game.Rules rules) {
                         begin = 40;
                         end = never;
                         unitAmount = 2;
-                        unitScaling = 2f;
+                        unitScaling = 5f;
                     }},
                     new SpawnGroup(corvus) {{
                         begin = 45;
                         end = never;
                         unitAmount = 2;
-                        unitScaling = 2f;
+                        unitScaling = 5f;
                     }},
                     new SpawnGroup(toxopid) {{
                         begin = 50;
                         end = never;
                         unitAmount = 2;
-                        unitScaling = 2f;
+                        unitScaling = 5f;
                     }},
                     new SpawnGroup(eclipse) {{
                         begin = 55;
                         end = never;
                         unitAmount = 2;
-                        unitScaling = 2f;
-                    }},
-                    new SpawnGroup(oct) {{
-                        begin = 60;
-                        end = never;
-                        unitAmount = 2;
-                        unitScaling = 2f;
+                        unitScaling = 5f;
                     }},
                     new SpawnGroup(omura) {{
                         begin = 55;
                         end = never;
-                        spacing = 2;
                         unitAmount = 2;
-                        unitScaling = 2f;
+                        unitScaling = 5f;
                     }}
             );
         } else if (State.planet.equals(Planets.erekir.name)) {
@@ -334,13 +327,13 @@ public static void setSpawnGroups(mindustry.game.Rules rules) {
                         begin = 56;
                         end = never;
                         unitAmount = 1;
-                        unitScaling = 3f;
+                        unitScaling = 5f;
                     }},
                     new SpawnGroup(disrupt) {{
                         begin = 58;
                         end = never;
                         unitAmount = 1;
-                        unitScaling = 3f;
+                        unitScaling = 5f;
                     }}
             );
         }

src/sectorized/faction/FactionManager.java

@@ -4,7 +4,6 @@
 import arc.struct.Seq;
 import arc.util.CommandHandler;
 import arc.util.Timer;
-import mindustry.Vars;
 import mindustry.ai.types.LogicAI;
 import mindustry.content.UnitTypes;
 import mindustry.entities.Units;
@@ -353,29 +352,6 @@ else if (faction.maxCores >= 5) {
 
             MessageUtils.sendMessage("(Re)spawning is now " + MessageUtils.cInfo + "unlocked" + MessageUtils.cDefault + " again!", MessageUtils.MessageLevel.INFO);
         });
-
-        Events.on(EventType.WaveEvent.class, event -> {
-            if (Vars.state.wave == 45) {
-                MessageUtils.sendMessage("Everyone with more than 5 cores will loose 1% of their score per wave after wave 50! Stop camping, start fighting!", MessageUtils.MessageLevel.WARNING);
-            }
-
-            if (Vars.state.wave == 50) {
-                MessageUtils.sendMessage("Everyone with more than 5 cores will now loose 1% of their score per wave! Stop camping, start fighting!", MessageUtils.MessageLevel.WARNING);
-            }
-
-            if (Vars.state.wave > 50) {
-                for (Player player : Groups.player) {
-                    Member member = memberLogic.getMember(player);
-
-                    if (member.faction != null && member.faction.team.cores().size >= 5) {
-                        int loss = (int) (member.score * 0.01f);
-                        member.score *= 0.99f;
-
-                        MessageUtils.sendMessage(member.player, "You lost" + loss + " points! Stop camping, start fighting!", MessageUtils.MessageLevel.WARNING);
-                    }
-                }
-            }
-        });
     }
 
     @Override
@@ -430,7 +406,7 @@ public void registerClientCommands(CommandHandler handler) {
             if (member.rank == 0) {
                 MessageUtils.sendMessage(player, "You are not ranked yet. Play a game to get ranked!", MessageUtils.MessageLevel.INFO);
             } else {
-                MessageUtils.sendMessage(player, "Rank: " + MessageUtils.cHighlight1 + (member.rank < 0 ? "unranked" : member.rank) + MessageUtils.cDefault + ", Score: " + MessageUtils.cHighlight2 + member.score + MessageUtils.cDefault + ", Wins: " + MessageUtils.cHighlight3 + member.wins, MessageUtils.MessageLevel.INFO);
+                MessageUtils.sendMessage(player, "Rank: " + MessageUtils.cHighlight1 + (member.rank < 0 ? "unranked" : member.rank) + MessageUtils.cDefault + ", Score: " + MessageUtils.cHighlight2 + member.score + MessageUtils.cDefault + ", Wins: " + MessageUtils.cHighlight3 + member.wins + MessageUtils.cDefault + ", Losses: " + MessageUtils.cDanger + member.losses, MessageUtils.MessageLevel.INFO);
             }
         });
 

src/sectorized/faction/logic/FactionLogic.java

@@ -155,7 +155,7 @@ public void removeFaction(Faction defender, Faction attacker, boolean fallback)
 
         if (Vars.state.wave < 5) return;
 
-        if (factions.size == 1 && State.gameState != State.GameState.GAMEOVER) {
+        if (factions.size == 1 && !(defender.maxCores <= 3 && timeSinceSpawned < 60 * 60 * 5) && State.gameState != State.GameState.GAMEOVER) {
             Member winner = factions.first().members.first();
             State.winner = winner;
             winner.wins++;

src/sectorized/faction/persistence/RankingPersistence.java

@@ -123,7 +123,9 @@ public void updateHallfOfFame() {
                         .append(" - Score: ")
                         .append(entry.score)
                         .append(" - Wins: ")
-                        .append(entry.wins);
+                        .append(entry.wins)
+                        .append(" - Losses: ")
+                        .append(entry.losses);
 
                 i++;
                 if (i == 10) break;
@@ -190,7 +192,7 @@ private void getLeaderboard() {
                     ResultSet rs = statement.executeQuery();
 
                     while (rs.next()) {
-                        LeaderBoardEntry leaderBoardEntry = new LeaderBoardEntry(rs.getString("name"), rs.getInt("rank"), rs.getInt("score"), rs.getInt("wins"));
+                        LeaderBoardEntry leaderBoardEntry = new LeaderBoardEntry(rs.getString("name"), rs.getInt("rank"), rs.getInt("score"), rs.getInt("wins"), rs.getInt("losses"));
 
                         leaderboard.add(leaderBoardEntry);
                     }
@@ -214,6 +216,8 @@ private void getLeaderboard() {
                         .append(entry.score)
                         .append(MessageUtils.cDefault + ", Wins: " + MessageUtils.cHighlight3)
                         .append(entry.wins)
+                        .append(MessageUtils.cDefault + ", Losses: " + MessageUtils.cDanger)
+                        .append(entry.losses)
                         .append(MessageUtils.cDefault)
                         .append("\n");
 
@@ -332,12 +336,14 @@ private static class LeaderBoardEntry {
         public final int rank;
         public final int score;
         public final int wins;
+        public final int losses;
 
-        public LeaderBoardEntry(String name, int rank, int score, int wins) {
+        public LeaderBoardEntry(String name, int rank, int score, int wins, int losses) {
             this.name = name;
             this.rank = rank;
             this.score = score;
             this.wins = wins;
+            this.losses = losses;
         }
     }
 }

src/sectorized/update/UpdateManager.java

@@ -172,10 +172,10 @@ public void init() {
 
             state.rules.loadout = Loadout.getLoadout(state.wave);
 
-            state.rules.blockDamageMultiplier = (float) (1 + (2 / (Math.pow(state.wave * 0.05, 4) + 1)));
-            state.rules.unitDamageMultiplier = (float) (3 - (2.5 / (Math.pow(state.wave * 0.05, 4) + 1)));
+            state.rules.blockDamageMultiplier = (float) (1 + (1 / (Math.pow(state.wave * 0.05, 4) + 1)));
+            state.rules.unitDamageMultiplier = (float) (3 - (2 / (Math.pow(state.wave * 0.02, 4) + 1)));
 
-            Units.setUnitHealthMultiplier((float) (6 - (5 / (Math.pow(state.wave * 0.05, 4) + 1))));
+            Units.setUnitHealthMultiplier((float) (6 - (5 / (Math.pow(state.wave * 0.02, 4) + 1))));
 
             if (state.teams.active.size < 2 && state.wave >= 5) {
                 DiscordBot.sendMessage("**Game Over!** Crux won the game in " + Vars.state.wave + " waves.");