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

Added shell ejection effects / Added burst turret

Browse Source
This commit is contained in:
Anuken
2018-04-02 22:52:24 -04:00
parent 54d0cae450
commit c03aa6300e
7 changed files with 111 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java
View File

@@ -6,6 +6,7 @@ import io.anuke.mindustry.resource.AmmoType;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.types.defense.LaserTurret;
import io.anuke.mindustry.world.blocks.types.defense.Turret;
import io.anuke.mindustry.world.blocks.types.defense.turrets.BurstTurret;
import io.anuke.mindustry.world.blocks.types.defense.turrets.DoubleTurret;
import io.anuke.mindustry.world.blocks.types.defense.turrets.LiquidTurret;
import io.anuke.mindustry.world.blocks.types.defense.turrets.PowerTurret;
@@ -15,13 +16,24 @@ public class WeaponBlocks{
doubleturret = new DoubleTurret("doubleturret"){{
ammoTypes = new AmmoType[]{AmmoTypes.basicIron};
reload = 40f;
reload = 25f;
restitution = 0.03f;
shootEffect = BulletFx.shootSmall;
smokeEffect = BulletFx.shootSmallSmoke;
}},
gatlingturret = new Turret("gatlingturret"){
},
gatlingturret = new BurstTurret("gatlingturret") {{
ammoTypes = new AmmoType[]{AmmoTypes.basicIron};
ammoPerShot = 1;
shots = 3;
reload = 60f;
restitution = 0.03f;
recoil = 1.5f;
burstSpacing = 6f;
shootEffect = BulletFx.shootSmall;
smokeEffect = BulletFx.shootSmallSmoke;
ammoUseEffect = BulletFx.shellEjectSmall;
}},
flameturret = new Turret("flameturret"){

4
core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
View File

@@ -8,10 +8,10 @@ import io.anuke.ucore.graphics.Draw;
public class TurretBullets {
public static final BulletType
basicIron = new BulletType(2f, 0) {
basicIron = new BulletType(3f, 0) {
@Override
public void draw(Bullet b) {
Draw.color(Color.valueOf("f6e096"));
Draw.color(Color.valueOf("f3d47f"));
Draw.rect("bullet", b.x, b.y, b.angle() - 90);
Draw.color();
}