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

Balanced a few electric turrets, fixed crash

Browse Source
This commit is contained in:
Anuken
2018-06-24 21:26:22 -04:00
parent 6ec28be541
commit d8e8765cec
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/content/Recipes.java
View File

@@ -26,7 +26,8 @@ public class Recipes implements ContentList{
new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.tungsten, 25), new ItemStack(Items.carbide, 25)); new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.tungsten, 25), new ItemStack(Items.carbide, 25));
new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.tungsten, 25), new ItemStack(Items.lead, 25), new ItemStack(Items.silicon, 25)); new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.tungsten, 25), new ItemStack(Items.lead, 25), new ItemStack(Items.silicon, 25));
new Recipe(weapon, TurretBlocks.arc, new ItemStack(Items.tungsten, 25), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 30)); //TODO arc turret broken
//new Recipe(weapon, TurretBlocks.arc, new ItemStack(Items.tungsten, 25), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 30));
//DISTRIBUTION //DISTRIBUTION
new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.lead, 1)); new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.lead, 1));

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

@@ -35,7 +35,7 @@ public class TurretBullets extends BulletList implements ContentList {
@Override @Override
public void load() { public void load() {
fireball = new BulletType(1f, 1) { fireball = new BulletType(1f, 4) {
{ {
pierce = true; pierce = true;
hitTiles = false; hitTiles = false;
@@ -90,7 +90,7 @@ public class TurretBullets extends BulletList implements ContentList {
} }
}; };
lancerLaser = new BulletType(0.001f, 1) { lancerLaser = new BulletType(0.001f, 110) {
Color[] colors = {Palette.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Palette.lancerLaser, Color.WHITE}; Color[] colors = {Palette.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Palette.lancerLaser, Color.WHITE};
float[] tscales = {1f, 0.7f, 0.5f, 0.2f}; float[] tscales = {1f, 0.7f, 0.5f, 0.2f};
float[] lenscales = {1f, 1.1f, 1.13f, 1.14f}; float[] lenscales = {1f, 1.1f, 1.13f, 1.14f};
@@ -160,7 +160,7 @@ public class TurretBullets extends BulletList implements ContentList {
statusIntensity = 0.5f; statusIntensity = 0.5f;
} }
}; };
lightning = new BulletType(0.001f, 5) { lightning = new BulletType(0.001f, 10) {
{ {
lifetime = 1; lifetime = 1;
despawneffect = Fx.none; despawneffect = Fx.none;

8
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -65,9 +65,7 @@ public class Control extends Module{
Core.atlas.setErrorRegion("error"); Core.atlas.setErrorRegion("error");
ContentLoader.initialize(Content::load); ContentLoader.initialize(Content::load);
//TODO load database db.load();
//not loaded currently for testing
//db.load();
gdxInput = Gdx.input; gdxInput = Gdx.input;
@@ -356,8 +354,8 @@ public class Control extends Module{
if(!state.mode.infiniteResources && !state.mode.disableWaveTimer && Timers.get("timerCheckUnlock", 120)){ if(!state.mode.infiniteResources && !state.mode.disableWaveTimer && Timers.get("timerCheckUnlock", 120)){
checkUnlockableBlocks(); checkUnlockableBlocks();
//save if the db changed //save if the db changed, but don't save unlocks
if(db.isDirty()){ if(db.isDirty() && !debug){
db.save(); db.save();
} }
} }

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

@@ -28,6 +28,7 @@ import io.anuke.ucore.util.SeedRandom;
import static io.anuke.mindustry.Vars.bulletGroup; import static io.anuke.mindustry.Vars.bulletGroup;
//TODO utterly broken
public class Lightning extends TimedEntity implements Poolable, DrawTrait{ public class Lightning extends TimedEntity implements Poolable, DrawTrait{
private static Array<SolidTrait> entities = new Array<>(); private static Array<SolidTrait> entities = new Array<>();
private static Rectangle rect = new Rectangle(); private static Rectangle rect = new Rectangle();

2
core/src/io/anuke/mindustry/world/blocks/BreakBlock.java
View File

@@ -45,7 +45,7 @@ public class BreakBlock extends Block {
@Override @Override
public boolean isSolidFor(Tile tile) { public boolean isSolidFor(Tile tile) {
BreakEntity entity = tile.entity(); BreakEntity entity = tile.entity();
return entity.previous.solid; return entity.previous == null || entity.previous.solid;
} }
@Override @Override