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

Fixed #2300

Browse Source
This commit is contained in:
Anuken
2020-08-02 10:35:50 -04:00
parent a7c0f9e73c
commit f97d1eedee
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/content/Bullets.java
View File

@@ -239,7 +239,7 @@ public class Bullets implements ContentList{
explodeRange = 20f; explodeRange = 20f;
}}; }};
missileExplosive = new MissileBulletType(2.7f, 10, "missile"){{ missileExplosive = new MissileBulletType(2.7f, 10){{
width = 8f; width = 8f;
height = 8f; height = 8f;
shrinkY = 0f; shrinkY = 0f;
@@ -247,7 +247,7 @@ public class Bullets implements ContentList{
splashDamageRadius = 30f; splashDamageRadius = 30f;
splashDamage = 30f; splashDamage = 30f;
ammoMultiplier = 4f; ammoMultiplier = 4f;
lifetime = 150f; lifetime = 100f;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
@@ -255,7 +255,7 @@ public class Bullets implements ContentList{
statusDuration = 60f; statusDuration = 60f;
}}; }};
missileIncendiary = new MissileBulletType(2.9f, 12, "missile"){{ missileIncendiary = new MissileBulletType(2.9f, 12){{
frontColor = Pal.lightishOrange; frontColor = Pal.lightishOrange;
backColor = Pal.lightOrange; backColor = Pal.lightOrange;
width = 7f; width = 7f;
@@ -265,26 +265,26 @@ public class Bullets implements ContentList{
homingPower = 0.08f; homingPower = 0.08f;
splashDamageRadius = 20f; splashDamageRadius = 20f;
splashDamage = 20f; splashDamage = 20f;
lifetime = 160f; lifetime = 100f;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
status = StatusEffects.burning; status = StatusEffects.burning;
}}; }};
missileSurge = new MissileBulletType(4.4f, 20, "bullet"){{ missileSurge = new MissileBulletType(4.4f, 20){{
width = 8f; width = 8f;
height = 8f; height = 8f;
shrinkY = 0f; shrinkY = 0f;
drag = -0.01f; drag = -0.01f;
splashDamageRadius = 28f; splashDamageRadius = 28f;
splashDamage = 40f; splashDamage = 40f;
lifetime = 150f; lifetime = 100f;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
lightning = 2; lightning = 2;
lightningLength = 14; lightningLength = 14;
}}; }};
standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{ standardCopper = new BasicBulletType(2.5f, 9){{
width = 7f; width = 7f;
height = 9f; height = 9f;
lifetime = 60f; lifetime = 60f;
@@ -293,7 +293,7 @@ public class Bullets implements ContentList{
ammoMultiplier = 2; ammoMultiplier = 2;
}}; }};
standardDense = new BasicBulletType(3.5f, 18, "bullet"){{ standardDense = new BasicBulletType(3.5f, 18){{
width = 9f; width = 9f;
height = 12f; height = 12f;
reloadMultiplier = 0.6f; reloadMultiplier = 0.6f;

2
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -363,7 +363,7 @@ public class SettingsMenuDialog extends SettingsDialog{
} }
}); });
graphics.checkPref("linear", true, b -> { graphics.checkPref("linear", !mobile, b -> {
for(Texture tex : Core.atlas.getTextures()){ for(Texture tex : Core.atlas.getTextures()){
TextureFilter filter = b ? TextureFilter.linear : TextureFilter.nearest; TextureFilter filter = b ? TextureFilter.linear : TextureFilter.nearest;
tex.setFilter(filter, filter); tex.setFilter(filter, filter);

3
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -161,6 +161,9 @@ public class StackConveyor extends Block implements Autotiler{
for(Building near : proximity){ for(Building near : proximity){
if(near instanceof StackConveyorEntity){ if(near instanceof StackConveyorEntity){
near.onProximityUpdate(); near.onProximityUpdate();
for(Building other : near.proximity){
if(!(other instanceof StackConveyorEntity)) other.onProximityUpdate();
}
} }
} }
} }