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

Fixed #3884 / Fixed #3881 / Fixed #3880

Browse Source
This commit is contained in:
Anuken
2020-12-09 10:49:26 -05:00
parent 1460a15942
commit c93bc0e457
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/mindustry/graphics/MinimapRenderer.java
View File

@@ -91,18 +91,23 @@ public class MinimapRenderer implements Disposable{
rect.set((dx - sz) * tilesize, (dy - sz) * tilesize, sz * 2 * tilesize, sz * 2 * tilesize);
for(Unit unit : units){
float rx = !withLabels ? (unit.x() - rect.x) / rect.width * w : unit.x() / (world.width() * tilesize) * w;
float ry = !withLabels ? (unit.y() - rect.y) / rect.width * h : unit.y() / (world.height() * tilesize) * h;
float rx = !withLabels ? (unit.x - rect.x) / rect.width * w : unit.x / (world.width() * tilesize) * w;
float ry = !withLabels ? (unit.y - rect.y) / rect.width * h : unit.y / (world.height() * tilesize) * h;
Draw.mixcol(unit.team().color, 1f);
float scale = Scl.scl(1f) / 2f * scaling * 32f;
Draw.rect(unit.type.icon(Cicon.full), x + rx, y + ry, scale, scale, unit.rotation() - 90);
Draw.reset();
}
//only disable player names in multiplayer
if(withLabels && unit.isPlayer() && net.active()){
Player pl = unit.getPlayer();
drawLabel(x + rx, y + ry, pl.name, unit.team().color);
if(withLabels && net.active()){
for(Player player : Groups.player){
if(!player.dead()){
float rx = player.x / (world.width() * tilesize) * w;
float ry = player.y / (world.height() * tilesize) * h;
drawLabel(x + rx, y + ry, player.name, player.team().color);
}
}
}

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -209,7 +209,7 @@ public class Turret extends ReloadTurret{
}
public void targetPosition(Posc pos){
if(!hasAmmo()) return;
if(!hasAmmo() || target == null) return;
BulletType bullet = peekAmmo();
float speed = bullet.speed;
//slow bullets never intersect

6
core/src/mindustry/world/blocks/production/LiquidConverter.java
View File

@@ -18,7 +18,7 @@ public class LiquidConverter extends GenericCrafter{
@Override
public void init(){
ConsumeLiquidBase cl = consumes.get(ConsumeType.liquid);
cl.update(true);
cl.update(false);
outputLiquid.amount = cl.amount;
super.init();
}
@@ -40,11 +40,13 @@ public class LiquidConverter extends GenericCrafter{
@Override
public void updateTile(){
ConsumeLiquidBase cl = consumes.get(ConsumeType.liquid);
ConsumeLiquid cl = consumes.get(ConsumeType.liquid);
if(cons.valid()){
float use = Math.min(cl.amount * edelta(), liquidCapacity - liquids.get(outputLiquid.liquid));
liquids.remove(cl.liquid, Math.min(use, liquids.get(cl.liquid)));
progress += use / cl.amount;
liquids.add(outputLiquid.liquid, use);
if(progress >= craftTime){

2
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -10,6 +10,7 @@ import mindustry.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.entities.units.*;
import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
@@ -174,6 +175,7 @@ public class Reconstructor extends UnitBlock{
Effect.shake(2f, 3f, this);
Fx.producesmoke.at(this);
consume();
Events.fire(new UnitCreateEvent(payload.unit));
}
}
}