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

Fixed unit icons / New scatter AA turret

Browse Source
This commit is contained in:
Anuken
2019-03-14 16:37:07 -04:00
parent 71751ee18d
commit 43bcf0cf3b
11 changed files with 1241 additions and 1155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -72,7 +72,7 @@ public class Blocks implements ContentList{
coreShard, coreFoundation, coreNucleus, vault, container, unloader, launchPad,
//turrets
duo, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown,
duo, scatter, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown,
//units
spiritFactory, phantomFactory, wraithFactory, ghoulFactory, revenantFactory, daggerFactory, crawlerFactory, titanFactory,
@@ -1066,6 +1066,26 @@ public class Blocks implements ContentList{
rotatespeed = 10f;
}};
scatter = new BurstTurret("scatter"){{
requirements(Category.turret, ItemStack.with(Items.copper, 170, Items.lead, 90), true);
ammo(
Items.scrap, Bullets.flakScrap,
Items.lead, Bullets.flakLead
);
reload = 45f;
range = 160f;
size = 2;
burstSpacing = 5f;
shots = 2;
recoil = 2f;
rotatespeed = 10f;
inaccuracy = 18f;
shootCone = 35f;
health = 220;
}};
hail = new ArtilleryTurret("hail"){{
requirements(Category.turret, ItemStack.with(Items.copper, 60, Items.graphite, 35));
ammo(
@@ -1138,6 +1158,7 @@ public class Blocks implements ContentList{
shootCone = 40f;
rotatespeed = 8f;
powerUsed = 1f / 2f;
targetAir = false;
consumes.powerBuffered(80f);
range = 80f;
shootEffect = Fx.lightningShoot;
@@ -1221,7 +1242,7 @@ public class Blocks implements ContentList{
);
xRand = 4f;
reload = 8f;
range = 145f;
range = 160f;
size = 3;
recoil = 3f;
rotatespeed = 10f;

21
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -30,7 +30,7 @@ public class Bullets implements ContentList{
artilleryDense, arilleryPlastic, artilleryPlasticFrag, artilleryHoming, artlleryIncendiary, artilleryExplosive, artilleryUnit,
//flak
flakPlastic, flakExplosive, flakSurge,
flakScrap, flakLead, flakPlastic, flakExplosive, flakSurge,
//missiles
missileExplosive, missileIncendiary, missileSurge, missileJavelin, missileSwarm, missileRevenant,
@@ -140,6 +140,25 @@ public class Bullets implements ContentList{
frontColor = Pal.bulletYellow;
}};
flakLead = new FlakBulletType(3.9f, 3){{
shootEffect = Fx.shootSmall;
bulletWidth = 6f;
bulletHeight = 8f;
hitEffect = Fx.flakExplosion;
splashDamage = 25f;
splashDamageRadius = 15f;
}};
flakScrap = new FlakBulletType(3.5f, 3){{
shootEffect = Fx.shootSmall;
reloadMultiplier = 0.5f;
bulletWidth = 6f;
bulletHeight = 8f;
hitEffect = Fx.flakExplosion;
splashDamage = 16f;
splashDamageRadius = 24f;
}};
flakPlastic = new FlakBulletType(4f, 6){{
splashDamageRadius = 50f;
fragBullet = artilleryPlasticFrag;