This commit is contained in:
Anuken
2022-10-15 09:41:43 -04:00
parent bf6f933686
commit 83ed26a271
4 changed files with 11 additions and 5 deletions

View File

@@ -138,6 +138,10 @@ public class ItemTurret extends Turret{
Events.fire(Trigger.flameAmmo);
}
if(totalAmmo == 0){
Events.fire(Trigger.resupplyTurret);
}
BulletType type = ammoTypes.get(item);
if(type == null) return;
totalAmmo += type.ammoMultiplier;

View File

@@ -1,5 +1,6 @@
package mindustry.world.blocks.logic;
import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.input.*;
@@ -142,6 +143,10 @@ public class CanvasBlock extends Block{
int[] curColor = {palette[0]};
boolean[] modified = {false};
dialog.resized(() -> {
dialog.hide();
});
dialog.cont.table(Tex.pane, body -> {
body.stack(new Element(){
int lastX, lastY;
@@ -191,7 +196,7 @@ public class CanvasBlock extends Block{
}
}, new GridImage(canvasSize, canvasSize){{
touchable = Touchable.disabled;
}}).size(500f);
}}).size(mobile && !Core.graphics.isPortrait() ? 290f : 480f);
});
dialog.cont.row();