Merge remote-tracking branch 'origin/master'

2022-06-13 21:42:16 -04:00
parent 2134762ed1 22c5002931
commit f5b38ccbba
43 changed files with 48 additions and 6 deletions
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1401,6 +1401,7 @@ public class LExecutor{
                    }
                }
                case ambientLight -> state.rules.ambientLight.fromDouble(exec.num(value));
+                case solarMultiplier -> state.rules.solarMultiplier = exec.numf(value);
                case unitBuildSpeed, unitDamage, blockHealth, blockDamage, buildSpeed, rtsMinSquad, rtsMinWeight -> {
                    Team team = exec.team(p1);
                    if(team != null){