Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
Anuken
2021-06-03 18:24:54 -04:00
parent 3f27cebfb6
commit 4932d11d7b
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/types/LogicAI.java
View File

@@ -15,7 +15,7 @@ import static mindustry.Vars.*;
public class LogicAI extends AIController{ public class LogicAI extends AIController{
/** Minimum delay between item transfers. */ /** Minimum delay between item transfers. */
public static final float transferDelay = 60f * 2f; public static final float transferDelay = 60f * 1.5f;
/** Time after which the unit resets its controlled and reverts to a normal unit. */ /** Time after which the unit resets its controlled and reverts to a normal unit. */
public static final float logicControlTimeout = 10f * 60f; public static final float logicControlTimeout = 10f * 60f;

8
core/src/mindustry/input/InputHandler.java
View File

@@ -448,10 +448,6 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
return !selectRequests.isEmpty(); return !selectRequests.isEmpty();
} }
public OverlayFragment getFrag(){
return frag;
}
public void update(){ public void update(){
player.typing = ui.chatfrag.shown(); player.typing = ui.chatfrag.shown();
@@ -466,8 +462,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
wasShooting = player.shooting; wasShooting = player.shooting;
//only reset the controlled type and control a unit after the timer runs out //only reset the controlled type and control a unit after the timer runs out
//essentially, this means the client waits for 1 second after controlling something before trying to control something else automatically //essentially, this means the client waits for ~1 second after controlling something before trying to control something else automatically
if(!player.dead() && (recentRespawnTimer -= Time.delta / 60f) <= 0f && player.justSwitchFrom != player.unit()){ if(!player.dead() && (recentRespawnTimer -= Time.delta / 70f) <= 0f && player.justSwitchFrom != player.unit()){
controlledType = player.unit().type; controlledType = player.unit().type;
} }

2
core/src/mindustry/world/blocks/power/PowerGraph.java
View File

@@ -49,7 +49,7 @@ public class PowerGraph{
} }
public float getPowerBalance(){ public float getPowerBalance(){
return powerBalance.mean(); return powerBalance.rawMean();
} }
public float getLastPowerNeeded(){ public float getLastPowerNeeded(){

2
gradle.properties
View File

@@ -9,4 +9,4 @@ kapt.use.worker.api=true
kapt.include.compile.classpath=false kapt.include.compile.classpath=false
# I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues # I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
archash=ef9b29a8978e8f5e2fcba770bfebd210f4bc8117 archash=ebc24e24e7b60c10a85dff648bd9f592838d40ec