From 1b7187b046a02a20feeeaf09244b92adf50b45f9 Mon Sep 17 00:00:00 2001 From: Shade Date: Sun, 10 Nov 2024 12:51:08 +0800 Subject: [PATCH] World Processor: SetRuleI unitCrashDamage Implemented --- core/src/mindustry/logic/LExecutor.java | 3 ++- core/src/mindustry/logic/LStatements.java | 2 +- core/src/mindustry/logic/LogicRule.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index 94aafa451c..d10569b3b3 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -1515,7 +1515,7 @@ public class LExecutor{ state.rules.bannedUnits.remove(u); } } - case unitHealth, unitBuildSpeed, unitMineSpeed, unitCost, unitDamage, blockHealth, blockDamage, buildSpeed, rtsMinSquad, rtsMinWeight -> { + case unitHealth, unitBuildSpeed, unitCrashDamage, unitMineSpeed, unitCost, unitDamage, blockHealth, blockDamage, buildSpeed, rtsMinSquad, rtsMinWeight -> { Team team = p1.team(); if(team != null){ float num = value.numf(); @@ -1523,6 +1523,7 @@ public class LExecutor{ case buildSpeed -> team.rules().buildSpeedMultiplier = Mathf.clamp(num, 0.001f, 50f); case unitHealth -> team.rules().unitHealthMultiplier = Math.max(num, 0.001f); case unitBuildSpeed -> team.rules().unitBuildSpeedMultiplier = Mathf.clamp(num, 0f, 50f); + case unitCrashDamage -> team.rules().unitCrashDamageMultiplier = Math.max(num, 0f); case unitMineSpeed -> team.rules().unitMineSpeedMultiplier = Math.max(num, 0f); case unitCost -> team.rules().unitCostMultiplier = Math.max(num, 0f); case unitDamage -> team.rules().unitDamageMultiplier = Math.max(num, 0f); diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index bdb6c94114..ccbb7671cd 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -1552,7 +1552,7 @@ public class LStatements{ fields(table, "w", p3, s -> p3 = s); fields(table, "h", p4, s -> p4 = s); } - case buildSpeed, unitHealth, unitBuildSpeed, unitMineSpeed, unitCost, unitDamage, blockHealth, blockDamage, rtsMinSquad, rtsMinWeight -> { + case buildSpeed, unitHealth, unitBuildSpeed, unitCrashDamage, unitMineSpeed, unitCost, unitDamage, blockHealth, blockDamage, rtsMinSquad, rtsMinWeight -> { if(p1.equals("0")){ p1 = "@sharded"; } diff --git a/core/src/mindustry/logic/LogicRule.java b/core/src/mindustry/logic/LogicRule.java index 211064e271..36b29dae1d 100644 --- a/core/src/mindustry/logic/LogicRule.java +++ b/core/src/mindustry/logic/LogicRule.java @@ -23,6 +23,7 @@ public enum LogicRule{ buildSpeed, unitHealth, unitBuildSpeed, + unitCrashDamage, unitMineSpeed, unitCost, unitDamage,