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

Arc balancing / Bundle update / Changed turret colors

Browse Source
This commit is contained in:
Anuken
2019-02-05 22:36:20 -05:00
parent 6ea90ea828
commit 1bdea1b8d8
29 changed files with 826 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1125,13 +1125,12 @@ public class Blocks implements ContentList{
arc = new PowerTurret("arc"){{
requirements(Category.turret, ItemStack.with(Items.copper, 70, Items.lead, 60));
shootType = Bullets.arc;
reload = 85f;
shootShake = 1f;
reload = 20f;
shootCone = 40f;
rotatespeed = 8f;
powerUsed = 1f / 3f;
consumes.powerBuffered(300f);
range = 150f;
powerUsed = 1f / 2f;
consumes.powerBuffered(50f);
range = 80f;
shootEffect = Fx.lightningShoot;
heatColor = Color.RED;
recoil = 1f;

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

@@ -618,7 +618,7 @@ public class Bullets implements ContentList{
}
};
arc = new BulletType(0.001f, 26){{
arc = new BulletType(0.001f, 20){{
lifetime = 1;
despawnEffect = Fx.none;
hitEffect = Fx.hitLancer;
@@ -629,7 +629,7 @@ public class Bullets implements ContentList{
@Override
public void init(Bullet b){
Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 36);
Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 14);
}
};

6
core/src/io/anuke/mindustry/core/Logic.java
View File

@@ -32,12 +32,6 @@ import static io.anuke.mindustry.Vars.*;
public class Logic implements ApplicationListener{
public Logic(){
Events.on(TileChangeEvent.class, event -> {
if(event.tile.getTeam() == defaultTeam && event.tile.block().isVisible()){
handleContent(event.tile.block());
}
});
Events.on(WaveEvent.class, event -> {
if(world.isZone()){
data.updateWaveScore(world.getZone(), state.wave);

4
core/src/io/anuke/mindustry/entities/effect/Lightning.java
View File

@@ -131,7 +131,7 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time
@Override
public void draw(){
Lines.stroke(2f * fout());
Lines.stroke(3f * fout());
Draw.color(color, Color.WHITE, fin());
Lines.beginLine();
@@ -144,7 +144,7 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time
int i = 0;
for(Position p : lines){
Fill.square(p.getX(), p.getY(), (4f - (float)i++/lines.size*2f) * fout(), 45);
Fill.square(p.getX(), p.getY(), (5f - (float)i++/lines.size*2f) * fout(), 45);
}
Draw.reset();
}