mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shields not working / Fixed player text not fading

Browse Source
This commit is contained in:
Anuken 2019-05-04 22:33:08 -04:00
parent a3f5583326
commit 13969bdd29
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/content/Blocks.java
View File

@ -862,6 +862,7 @@ public class Blocks implements ContentList{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.silicon, 250)); requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.silicon, 250));
size = 3; size = 3;
consumes.item(Items.phasefabric).boost(); consumes.item(Items.phasefabric).boost();
consumes.power(3f);
}}; }};
shockMine = new ShockMine("shock-mine"){{ shockMine = new ShockMine("shock-mine"){{
@ -1539,7 +1540,7 @@ public class Blocks implements ContentList{
reload = 50f; reload = 50f;
firingMoveFract = 0.5f; firingMoveFract = 0.5f;
shootDuration = 220f; shootDuration = 220f;
powerUse = 8f; powerUse = 10f;
health = 200 * size * size; health = 200 * size * size;
consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false); consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false);

1
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@ -492,6 +492,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
@Override @Override
public void update(){ public void update(){
hitTime -= Time.delta(); hitTime -= Time.delta();
textFadeTime -= Time.delta() / (60 * 5);
if(Float.isNaN(x) || Float.isNaN(y)){ if(Float.isNaN(x) || Float.isNaN(y)){
velocity.set(0f, 0f); velocity.set(0f, 0f);

1
core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
View File

@ -127,7 +127,6 @@ public class ForceProjector extends Block{
} }
}else{ }else{
entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.1f); entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.1f);
entity.power.satisfaction -= Math.min(entity.power.satisfaction, relativePowerDraw * Time.delta());
} }
if(entity.buildup > 0){ if(entity.buildup > 0){