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
2021-06-03 15:59:39 -04:00
parent 1c4184db4b 0247301272
commit c674b5c256
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1028,6 +1028,7 @@ public class Blocks implements ContentList{
reloadTime = 200f; reloadTime = 200f;
range = 440f; range = 440f;
consumes.power(1.75f); consumes.power(1.75f);
bullet = new MassDriverBolt();
}}; }};
//special transport blocks //special transport blocks

4
core/src/mindustry/content/Bullets.java
View File

@@ -36,7 +36,7 @@ public class Bullets implements ContentList{
waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot, waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot,
//environment, misc. //environment, misc.
damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt; damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame;
@Override @Override
public void load(){ public void load(){
@@ -510,7 +510,5 @@ public class Bullets implements ContentList{
statusDuration = 60f * 4f; statusDuration = 60f * 4f;
damage = 0.2f; damage = 0.2f;
}}; }};
driverBolt = new MassDriverBolt();
} }
} }

4
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -12,6 +12,7 @@ import arc.util.pooling.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.entities.*; import mindustry.entities.*;
import mindustry.entities.bullet.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.logic.*; import mindustry.logic.*;
@@ -28,6 +29,7 @@ public class MassDriver extends Block{
public int minDistribute = 10; public int minDistribute = 10;
public float knockback = 4f; public float knockback = 4f;
public float reloadTime = 100f; public float reloadTime = 100f;
public MassDriverBolt bullet;
public float bulletSpeed = 5.5f; public float bulletSpeed = 5.5f;
public float bulletLifetime = 200f; public float bulletLifetime = 200f;
public Effect shootEffect = Fx.shootBig2; public Effect shootEffect = Fx.shootBig2;
@@ -287,7 +289,7 @@ public class MassDriver extends Block{
float angle = tile.angleTo(target); float angle = tile.angleTo(target);
Bullets.driverBolt.create(this, team, bullet.create(this, team,
x + Angles.trnsx(angle, translation), y + Angles.trnsy(angle, translation), x + Angles.trnsx(angle, translation), y + Angles.trnsy(angle, translation),
angle, -1f, bulletSpeed, bulletLifetime, data); angle, -1f, bulletSpeed, bulletLifetime, data);