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

Cleanup of merged PR

Browse Source
This commit is contained in:
Anuken
2020-10-30 19:03:05 -04:00
parent e02458122b
commit 4ec8e24bd8
6 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/entities/Lightning.java
View File

@@ -37,18 +37,12 @@ public class Lightning{
random.setSeed(seed);
hit.clear();
BulletType bulletType;
if(hitter != null && hitter.type.lightningHitter != null){
bulletType = hitter.type.lightningHitter;
}else{
bulletType = hitter != null && !hitter.type.collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
}
BulletType hitCreate = hitter.type.lightningType;
Seq<Vec2> lines = new Seq<>();
bhit = false;
for(int i = 0; i < length / 2; i++){
bulletType.create(null, team, x, y, 0f, damage, 1f, 1f, hitter);
hitCreate.create(null, team, x, y, 0f, damage, 1f, 1f, hitter);
lines.add(new Vec2(x + Mathf.range(3f), y + Mathf.range(3f)));
if(lines.size > 1){