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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-03-02 23:06:14 -05:00
parent 4a4a9f267b
commit 89b439c3c8
12 changed files with 1168 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -731,7 +731,7 @@ public class Blocks implements ContentList{
rotaryPump = new Pump("rotary-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 140, Items.lead, 100, Items.silicon, 40, Items.titanium, 70));
pumpAmount = 0.2f;
pumpAmount = 0.8f;
consumes.power(1.50f);
liquidCapacity = 30f;
hasPower = true;
@@ -740,7 +740,7 @@ public class Blocks implements ContentList{
thermalPump = new Pump("thermal-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 160, Items.lead, 130, Items.silicon, 60, Items.titanium, 80, Items.thorium, 70));
pumpAmount = 0.22f;
pumpAmount = 1.95f;
consumes.power(0.30f);
liquidCapacity = 40f;
hasPower = true;

1
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -359,6 +359,7 @@ public class Bullets implements ContentList{
float healPercent = 3f;
{
shootEffect = Fx.shootHeal;
hitEffect = Fx.hitLaser;
despawnEffect = Fx.hitLaser;
collidesTeam = true;

4
core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
View File

@@ -35,6 +35,10 @@ public class RubbleDecal extends Decal{
@Override
public void drawDecal(){
if(!Core.atlas.isFound(region)){
remove();
return;
}
Draw.rect(region, x, y, Mathf.randomSeed(id, 0, 4) * 90);
}
}

2
core/src/io/anuke/mindustry/graphics/BlockRenderer.java
View File

@@ -25,7 +25,7 @@ import static io.anuke.mindustry.Vars.*;
public class BlockRenderer{
private final static int initialRequests = 32 * 32;
private final static int expandr = 6;
private final static int expandr = 9;
private final static boolean disableShadows = false;
private final static Color shadowColor = new Color(0, 0, 0, 0.19f);

2
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -467,6 +467,6 @@ public class HudFragment extends Fragment{
}
}).growY().fillX().right().width(40f)
.visible(() -> state.rules.waves && ((Net.server() || players[0].isAdmin) || !Net.active()) && state.enemies() == 0
&& state.wavetime < state.rules.waveSpacing - 60);
&& (state.wavetime < state.rules.waveSpacing - 60 || !state.rules.waveTimer));
}
}

6
core/src/io/anuke/mindustry/world/blocks/production/Pump.java
View File

@@ -19,7 +19,7 @@ public class Pump extends LiquidBlock{
protected final int timerContentCheck = timers++;
/**Pump amount per tile this block is on.*/
/**Pump amount, total.*/
protected float pumpAmount = 1f;
public Pump(String name){
@@ -40,7 +40,7 @@ public class Pump extends LiquidBlock{
@Override
public void setStats(){
super.setStats();
stats.add(BlockStat.liquidOutputSpeed, 60f * pumpAmount * size * size, StatUnit.liquidSecond);
stats.add(BlockStat.liquidOutputSpeed, 60f * pumpAmount, StatUnit.liquidSecond);
}
@Override
@@ -93,7 +93,7 @@ public class Pump extends LiquidBlock{
}
if(tile.entity.cons.valid() && liquidDrop != null){
float maxPump = Math.min(liquidCapacity - tile.entity.liquids.total(), tiles * pumpAmount * tile.entity.delta());
float maxPump = Math.min(liquidCapacity - tile.entity.liquids.total(), tiles * pumpAmount * tile.entity.delta() / size / size);
if(hasPower){
maxPump *= tile.entity.power.satisfaction; // Produce slower if not at full power
}