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

Merge branch 'master' into unit-stats

Browse Source
This commit is contained in:
genNAowl
2020-11-11 16:50:37 -08:00
committed by GitHub
parent 14ee997a76 b1b84fe380
commit 21a8a39344
14 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -67,7 +67,7 @@ public class Drill extends Block{
liquidCapacity = 5f;
hasItems = true;
ambientSound = Sounds.drill;
ambientSoundVolume = 0.015f;
ambientSoundVolume = 0.018f;
}
@Override
@@ -209,6 +209,11 @@ public class Drill extends Block{
return efficiency() > 0.01f && items.total() < itemCapacity;
}
@Override
public float ambientVolume(){
return efficiency() * (size * size) / 4f;
}
@Override
public void drawSelect(){
if(dominantItem != null){

3
core/src/mindustry/world/blocks/production/Fracker.java
View File

@@ -2,6 +2,7 @@ package mindustry.world.blocks.production;
import arc.graphics.g2d.*;
import mindustry.annotations.Annotations.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.meta.*;
@@ -15,6 +16,8 @@ public class Fracker extends SolidPump{
public Fracker(String name){
super(name);
hasItems = true;
ambientSound = Sounds.drill;
ambientSoundVolume = 0.03f;
}
@Override

8
core/src/mindustry/world/meta/values/AmmoListValue.java
View File

@@ -46,11 +46,13 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1)));
}
//ammo multiplyers do not make sense for units
if(!(t instanceof UnitType) && !Mathf.equal(type.ammoMultiplier, 1f))
if(!(t instanceof UnitType) && !Mathf.equal(type.ammoMultiplier, 1f) && !(type instanceof LiquidBulletType)){
sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier));
if(!Mathf.equal(type.reloadMultiplier, 1f))
}
if(!Mathf.equal(type.reloadMultiplier, 1f)){
sep(bt, Core.bundle.format("bullet.reload", Strings.fixed(type.reloadMultiplier, 1)));
}
if(type.knockback > 0){
sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1)));