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

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

@@ -728,7 +728,7 @@ public class Blocks implements ContentList{
hasItems = hasPower = true;
drawer = new DrawRotator();
ambientSound = Sounds.grinding;
ambientSoundVolume = 0.02f;
ambientSoundVolume = 0.025f;
consumes.item(Items.scrap, 1);
consumes.power(0.50f);
@@ -1229,7 +1229,7 @@ public class Blocks implements ContentList{
thoriumReactor = new NuclearReactor("thorium-reactor"){{
requirements(Category.power, with(Items.lead, 300, Items.silicon, 200, Items.graphite, 150, Items.thorium, 150, Items.metaglass, 50));
ambientSound = Sounds.hum;
ambientSoundVolume = 0.2f;
ambientSoundVolume = 0.24f;
size = 3;
health = 700;
itemDuration = 360f;

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

@@ -1309,6 +1309,9 @@ public class UnitTypes implements ContentList{
reload = 55f;
minShootVelocity = 0.01f;
soundPitchMin = 1f;
shootSound = Sounds.plasmadrop;
bullet = new BasicBulletType(){{
sprite = "large-bomb";
width = height = 120/4f;
@@ -1320,9 +1323,10 @@ public class UnitTypes implements ContentList{
frontColor = Color.white;
mixColorTo = Color.white;
hitSound = Sounds.plasmaboom;
shootCone = 180f;
ejectEffect = Fx.none;
shootSound = Sounds.none;
despawnShake = 4f;
collidesAir = false;