mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-10 00:41:17 -07:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2026-02-06 22:46:23 -05:00
commit 80d2ddfab9
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/src/mindustry/content/Blocks.java
View file

@ -3740,21 +3740,22 @@ public class Blocks{
salvo = new ItemTurret("salvo"){{
requirements(Category.turret, with(Items.copper, 100, Items.graphite, 80, Items.titanium, 50));
ammo(
Items.copper, new BasicBulletType(2.5f, 11){{
Items.copper, new BasicBulletType(2.5f, 15){{
width = 7f;
height = 9f;
lifetime = 60f;
ammoMultiplier = 2;
ammoMultiplier = 4;
hitEffect = despawnEffect = Fx.hitBulletColor;
hitColor = backColor = trailColor = Pal.copperAmmoBack;
frontColor = Pal.copperAmmoFront;
}},
Items.graphite, new BasicBulletType(3.5f, 20){{
Items.graphite, new BasicBulletType(3.5f, 31){{
width = 9f;
height = 12f;
ammoMultiplier = 4;
lifetime = 60f;
reloadMultiplier = 0.8f;
rangeChange = 4f * 8f;
@ -3762,7 +3763,7 @@ public class Blocks{
hitColor = backColor = trailColor = Pal.graphiteAmmoBack;
frontColor = Pal.graphiteAmmoFront;
}},
Items.pyratite, new BasicBulletType(3.2f, 18){{
Items.pyratite, new BasicBulletType(3.2f, 25){{
width = 10f;
height = 12f;
frontColor = hitColor = Pal.lightishOrange;
@ -3772,13 +3773,13 @@ public class Blocks{
ammoMultiplier = 5;
splashDamage = 12f;
splashDamage = 15f;
splashDamageRadius = 22f;
makeFire = true;
lifetime = 60f;
}},
Items.silicon, new BasicBulletType(3f, 15, "bullet"){{
Items.silicon, new BasicBulletType(3f, 23, "bullet"){{
width = 8f;
height = 10f;
homingPower = 0.2f;
@ -3792,13 +3793,14 @@ public class Blocks{
hitColor = backColor = trailColor = Pal.siliconAmmoBack;
frontColor = Pal.siliconAmmoFront;
}},
Items.thorium, new BasicBulletType(4f, 29, "bullet"){{
Items.thorium, new BasicBulletType(4f, 28, "bullet"){{
width = 8f;
height = 13f;
shootEffect = Fx.shootBig;
smokeEffect = Fx.shootBigSmoke;
ammoMultiplier = 4;
lifetime = 60f;
armorMultiplier = 0.8f;
hitEffect = despawnEffect = Fx.hitBulletColor;
backColor = hitColor = trailColor = Pal.thoriumAmmoBack;
@ -3822,7 +3824,7 @@ public class Blocks{
size = 2;
range = 190f;
reload = 31f;
reload = 29f;
consumeAmmoOnce = false;
ammoEjectBack = 3f;
recoil = 0f;

2
core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
View file

@ -382,7 +382,7 @@ public class PayloadMassDriver extends PayloadBlock{
Drawf.shadow(region, tx - (size / 2f), ty - (size / 2f), r);
Tmp.v1.trns(turretRotation, 0, -(curSize/2f - grabWidth));
Tmp.v2.trns(rotation, -Math.max(curSize/2f - grabHeight - length, 0f), 0f);
Tmp.v2.trns(turretRotation, -Math.max(curSize/2f - grabHeight - length, 0f), 0f);
float rx = tx + Tmp.v1.x + Tmp.v2.x, ry = ty + Tmp.v1.y + Tmp.v2.y;
float lx = tx - Tmp.v1.x + Tmp.v2.x, ly = ty - Tmp.v1.y + Tmp.v2.y;

2
core/src/mindustry/world/blocks/power/ThermalGenerator.java
View file

@ -61,7 +61,7 @@ public class ThermalGenerator extends PowerGenerator{
super.drawPlace(x, y, rotation, valid);
if(displayEfficiency){
drawPlaceText(Core.bundle.formatFloat("bar.efficiency", sumAttribute(attribute, x, y) * 100, 1), x, y, valid);
drawPlaceText(Core.bundle.formatFloat("bar.efficiency", sumAttribute(attribute, x, y) * 100 * displayEfficiencyScale, 1), x, y, valid);
}
}