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

Fixed #7719

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/game/EventType.java
View File

@ -28,6 +28,7 @@ public class EventType{
newGame,
tutorialComplete,
flameAmmo,
resupplyTurret,
turretCool,
enablePixelation,
exclusionDeath,

4
core/src/mindustry/graphics/g3d/PlanetParams.java
View File

@ -37,8 +37,4 @@ public class PlanetParams{
public transient int viewW = -1, viewH = -1;
/** If true, atmosphere will be drawn regardless of player options. */
public transient boolean alwaysDrawAtmosphere = false;
//TODO:
//- blur
//- darken
}

4
core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
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;

7
core/src/mindustry/world/blocks/logic/CanvasBlock.java
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();