mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 18:04:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor bugfixes & requirement tweaks

Browse Source
This commit is contained in:
Anuken 2022-07-10 07:37:01 -04:00
parent 311118ae58
commit 55e78c9dce
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Blocks.java
View File

@ -4435,7 +4435,7 @@ public class Blocks{
}};
smite = new ItemTurret("smite"){{
requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.carbide, 250, Items.phaseFabric, 100));
requirements(Category.turret, with(Items.oxide, 200, Items.surgeAlloy, 400, Items.silicon, 800, Items.carbide, 500, Items.phaseFabric, 300));
ammo(
//this is really lazy
@ -4701,7 +4701,7 @@ public class Blocks{
}};
malign = new PowerTurret("malign"){{
requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.graphite, 250, Items.phaseFabric, 300));
requirements(Category.turret, with(Items.carbide, 400, Items.beryllium, 2000, Items.silicon, 800, Items.graphite, 800, Items.phaseFabric, 300));
var haloProgress = PartProgress.warmup;
Color haloColor = Color.valueOf("d370d3"), heatCol = Color.purple;
@ -4756,7 +4756,7 @@ public class Blocks{
sideAngle = 175f;
sideWidth = 1f;
sideLength = 40f;
lifetime = 16f;
lifetime = 22f;
drawSize = 400f;
length = 180f;
pierceCap = 2;

3
core/src/mindustry/ui/ReqImage.java
View File

@ -5,6 +5,7 @@ import arc.graphics.g2d.*;
import arc.scene.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import mindustry.graphics.*;
public class ReqImage extends Stack{
@ -30,7 +31,7 @@ public class ReqImage extends Stack{
}
public ReqImage(TextureRegion region, Boolp valid){
this(new Image(region), valid);
this(new Image(region).setScaling(Scaling.fit), valid);
}
public boolean valid(){