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

Power balance tweak

Browse Source
This commit is contained in:
Anuken
2020-03-27 18:23:02 -04:00
parent b284d6892a
commit 767719d410
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
package mindustry.world.blocks.power; package mindustry.world.blocks.power;
import arc.*; import arc.*;
import arc.struct.*;
import arc.math.*; import arc.math.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.consumers.*; import mindustry.world.consumers.*;
@@ -199,6 +199,8 @@ public class PowerGraph{
lastPowerNeeded = powerNeeded; lastPowerNeeded = powerNeeded;
lastPowerProduced = powerProduced; lastPowerProduced = powerProduced;
powerBalance.addValue((lastPowerProduced - lastPowerNeeded) / Time.delta());
if(!(consumers.size == 0 && producers.size == 0 && batteries.size == 0)){ if(!(consumers.size == 0 && producers.size == 0 && batteries.size == 0)){
if(!Mathf.equal(powerNeeded, powerProduced)){ if(!Mathf.equal(powerNeeded, powerProduced)){
@@ -214,8 +216,6 @@ public class PowerGraph{
distributePower(powerNeeded, powerProduced); distributePower(powerNeeded, powerProduced);
} }
powerBalance.addValue((lastPowerProduced - lastPowerNeeded) / Time.delta());
//overproducing: 10 / 20 = 0.5 //overproducing: 10 / 20 = 0.5
//underproducing: 20 / 10 = 2 -> clamp -> 1.0 //underproducing: 20 / 10 = 2 -> clamp -> 1.0
//nothing being produced: 20 / 0 -> 1.0 //nothing being produced: 20 / 0 -> 1.0

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=04b670f22169ae9e268458950a5d324b5ed03e23 archash=9659841bc145ba3db1dff036cfa1ca8f4ebdfabd