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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/assets/bundles/bundle_fil.properties
This commit is contained in:
Anuken
2022-02-14 23:34:54 -05:00
parent ea630e3b99 0ee8c07904
commit 95a0f4e735
8 changed files with 335 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ public class TractorBeamTurret extends BaseTurret{
public Sound shootSound = Sounds.tractorbeam;
public float shootSoundVolume = 0.9f;
public @Load("block-@size") TextureRegion baseRegion;
public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
public @Load("@-laser") TextureRegion laser;
public @Load(value = "@-laser-start", fallback = "@-laser-end") TextureRegion laserStart;
public @Load("@-laser-end") TextureRegion laserEnd;

3
core/src/mindustry/world/blocks/logic/LogicDisplay.java
View File

@@ -31,6 +31,7 @@ public class LogicDisplay extends Block{
public int maxSides = 25;
public int displaySize = 64;
public float scaleFactor = 1f;
public LogicDisplay(String name){
super(name);
@@ -104,7 +105,7 @@ public class LogicDisplay extends Block{
Draw.blend(Blending.disabled);
Draw.draw(Draw.z(), () -> {
if(buffer != null){
Draw.rect(Draw.wrap(buffer.getTexture()), x, y, buffer.getWidth() * Draw.scl, -buffer.getHeight() * Draw.scl);
Draw.rect(Draw.wrap(buffer.getTexture()), x, y, buffer.getWidth() * scaleFactor * Draw.scl, -buffer.getHeight() * scaleFactor * Draw.scl);
}
});
Draw.blend();