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

Attribute tweaks

Browse Source
This commit is contained in:
Anuken
2020-03-07 13:56:57 -05:00
parent 1e0067d64b
commit 7b144cbec6
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/content/Blocks.java
View File

@@ -220,16 +220,18 @@ public class Blocks implements ContentList{
}}; }};
ignarock = new Floor("ignarock"){{ ignarock = new Floor("ignarock"){{
attributes.set(Attribute.water, -0.1f);
}}; }};
hotrock = new Floor("hotrock"){{ hotrock = new Floor("hotrock"){{
attributes.set(Attribute.heat, 0.5f); attributes.set(Attribute.heat, 0.5f);
attributes.set(Attribute.water, -0.2f);
blendGroup = ignarock; blendGroup = ignarock;
}}; }};
magmarock = new Floor("magmarock"){{ magmarock = new Floor("magmarock"){{
attributes.set(Attribute.heat, 0.75f); attributes.set(Attribute.heat, 0.75f);
attributes.set(Attribute.water, -0.5f);
updateEffect = Fx.magmasmoke; updateEffect = Fx.magmasmoke;
blendGroup = ignarock; blendGroup = ignarock;
}}; }};
@@ -254,6 +256,7 @@ public class Blocks implements ContentList{
salt = new Floor("salt"){{ salt = new Floor("salt"){{
variants = 0; variants = 0;
attributes.set(Attribute.water, -0.2f);
}}; }};
snow = new Floor("snow"){{ snow = new Floor("snow"){{

3
core/src/mindustry/world/blocks/production/SolidPump.java
View File

@@ -39,7 +39,7 @@ public class SolidPump extends Pump{
@Override @Override
public void drawPlace(int x, int y, int rotation, boolean valid){ public void drawPlace(int x, int y, int rotation, boolean valid){
if(attribute != null){ if(attribute != null){
drawPlaceText(Core.bundle.formatFloat("bar.efficiency", (sumAttribute(attribute, x, y) + 1f) * 100 * percentSolid(x, y), 1), x, y, valid); drawPlaceText(Core.bundle.formatFloat("bar.efficiency", Math.max(sumAttribute(attribute, x, y) + 1f, 0f) * 100 * percentSolid(x, y), 1), x, y, valid);
} }
} }
@@ -120,6 +120,7 @@ public class SolidPump extends Pump{
} }
fraction += boost; fraction += boost;
fraction = Math.max(fraction, 0);
if(cons.valid() && typeLiquid() < liquidCapacity - 0.001f){ if(cons.valid() && typeLiquid() < liquidCapacity - 0.001f){
float maxPump = Math.min(liquidCapacity - typeLiquid(), pumpAmount * delta() * fraction * efficiency()); float maxPump = Math.min(liquidCapacity - typeLiquid(), pumpAmount * delta() * fraction * efficiency());

3
core/src/mindustry/world/meta/BlockStats.java
View File

@@ -1,6 +1,5 @@
package mindustry.world.meta; package mindustry.world.meta;
import arc.math.*;
import arc.struct.*; import arc.struct.*;
import arc.struct.ObjectMap.*; import arc.struct.ObjectMap.*;
import mindustry.*; import mindustry.*;
@@ -40,7 +39,7 @@ public class BlockStats{
public void add(BlockStat stat, Attribute attr){ public void add(BlockStat stat, Attribute attr){
for(Block block : Vars.content.blocks()){ for(Block block : Vars.content.blocks()){
if(!block.isFloor() || Mathf.zero(block.asFloor().attributes.get(attr))) continue; if(!block.isFloor() || block.asFloor().attributes.get(attr) <= 0) continue;
add(stat, new FloorValue(block.asFloor())); add(stat, new FloorValue(block.asFloor()));
} }
} }