mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-21 05:17:50 +03:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c674b5c256
@ -1028,6 +1028,7 @@ public class Blocks implements ContentList{
|
||||
reloadTime = 200f;
|
||||
range = 440f;
|
||||
consumes.power(1.75f);
|
||||
bullet = new MassDriverBolt();
|
||||
}};
|
||||
|
||||
//special transport blocks
|
||||
|
@ -36,7 +36,7 @@ public class Bullets implements ContentList{
|
||||
waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot,
|
||||
|
||||
//environment, misc.
|
||||
damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt;
|
||||
damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame;
|
||||
|
||||
@Override
|
||||
public void load(){
|
||||
@ -510,7 +510,5 @@ public class Bullets implements ContentList{
|
||||
statusDuration = 60f * 4f;
|
||||
damage = 0.2f;
|
||||
}};
|
||||
|
||||
driverBolt = new MassDriverBolt();
|
||||
}
|
||||
}
|
||||
|
@ -12,6 +12,7 @@ import arc.util.pooling.*;
|
||||
import mindustry.annotations.Annotations.*;
|
||||
import mindustry.content.*;
|
||||
import mindustry.entities.*;
|
||||
import mindustry.entities.bullet.*;
|
||||
import mindustry.gen.*;
|
||||
import mindustry.graphics.*;
|
||||
import mindustry.logic.*;
|
||||
@ -28,6 +29,7 @@ public class MassDriver extends Block{
|
||||
public int minDistribute = 10;
|
||||
public float knockback = 4f;
|
||||
public float reloadTime = 100f;
|
||||
public MassDriverBolt bullet;
|
||||
public float bulletSpeed = 5.5f;
|
||||
public float bulletLifetime = 200f;
|
||||
public Effect shootEffect = Fx.shootBig2;
|
||||
@ -287,7 +289,7 @@ public class MassDriver extends Block{
|
||||
|
||||
float angle = tile.angleTo(target);
|
||||
|
||||
Bullets.driverBolt.create(this, team,
|
||||
bullet.create(this, team,
|
||||
x + Angles.trnsx(angle, translation), y + Angles.trnsy(angle, translation),
|
||||
angle, -1f, bulletSpeed, bulletLifetime, data);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user