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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2026-02-05 22:29:10 -05:00
parent 9f21a98923 ab64677ea9
commit a7a3aaf06a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2537,6 +2537,7 @@ public class Blocks{
consume(new ConsumeItemFlammable()); consume(new ConsumeItemFlammable());
consume(new ConsumeItemExplode()); consume(new ConsumeItemExplode());
itemDurationMultipliers.put(Items.pyratite, 3f);
drawer = new DrawMulti(new DrawDefault(), new DrawWarmupRegion()); drawer = new DrawMulti(new DrawDefault(), new DrawWarmupRegion());
}}; }};
@@ -2566,6 +2567,7 @@ public class Blocks{
consume(new ConsumeItemFlammable()); consume(new ConsumeItemFlammable());
consume(new ConsumeItemExplode()); consume(new ConsumeItemExplode());
itemDurationMultipliers.put(Items.pyratite, 3f);
drawer = new DrawMulti( drawer = new DrawMulti(
new DrawDefault(), new DrawDefault(),
@@ -3440,8 +3442,8 @@ public class Blocks{
keepVelocity = false; keepVelocity = false;
hittable = false; hittable = false;
}}, }},
Items.pyratite, new BulletType(4f, 60f){{ Items.pyratite, new BulletType(4f, 30f){{
ammoMultiplier = 6f; ammoMultiplier = 10f;
hitSize = 7f; hitSize = 7f;
lifetime = 18f; lifetime = 18f;
pierce = true; pierce = true;

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

@@ -691,6 +691,7 @@ public class UnitTypes{
splashDamageRadius = 44f; splashDamageRadius = 44f;
instantDisappear = true; instantDisappear = true;
splashDamage = 80f; splashDamage = 80f;
buildingDamageMultiplier = 0.68f;
killShooter = true; killShooter = true;
hittable = false; hittable = false;
collidesAir = true; collidesAir = true;