mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2020-07-18 22:50:05 -04:00
parent 870f06218b
commit c772e1fcc6
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ai/types/FormationAI.java
View File

@ -35,8 +35,10 @@ public class FormationAI extends AIController implements FormationMember{
if(leader.isShooting){
unit.aimLook(leader.aimX(), leader.aimY());
}else{
if(!unit.moving()){
unit.lookAt(unit.vel.angle());
if(!leader.moving() || !unit.type().rotateShooting){
if(unit.moving()){
unit.lookAt(unit.vel.angle());
}
}else{
unit.lookAt(leader.rotation);
}

2
core/src/mindustry/entities/comp/WeaponsComp.java
View File

@ -26,7 +26,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
@ReadOnly transient float range, aimX, aimY;
@ReadOnly transient boolean isRotate;
boolean isShooting;
int ammo;
float ammo;
void setWeaponRotation(float rotation){
for(WeaponMount mount : mounts){

4
core/src/mindustry/io/TypeIO.java
View File

@ -266,10 +266,10 @@ public class TypeIO{
//no real unit controller state is written, only the type
if(control instanceof Player){
write.b(0);
write.i(((Player)control).id());
write.i(((Player)control).id);
}else if(control instanceof FormationAI){
write.b(1);
write.i(((FormationAI)control).leader.id());
write.i(((FormationAI)control).leader.id);
}else{
write.b(2);
}

2
core/src/mindustry/mod/Mods.java
View File

@ -400,7 +400,7 @@ public class Mods implements Loadable{
d.button("$details", Icon.downOpen, Styles.transt, () -> {
new Dialog(""){{
setFillParent(true);
cont.pane(e -> e.add(c.minfo.error)).grow();
cont.pane(e -> e.add(c.minfo.error).wrap().grow()).grow();
cont.row();
cont.button("$ok", Icon.left, this::hide).size(240f, 60f);
}}.show();

5
core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@ -41,6 +41,11 @@ public class LiquidTurret extends Turret{
return entity.liquids.total() > 0.001f;
}
@Override
public void update(Building entity){
}
@Override
public void display(BlockStats stats){