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

Added backwards compatibility for legacy saves

Browse Source
This commit is contained in:
Anuken
2020-02-17 11:13:46 -05:00
parent 18d4efa315
commit e215772f30
34 changed files with 1009 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/blocks/defense/MendProjector.java
+5 -7
View File
@@ -1,20 +1,18 @@
package mindustry.world.blocks.defense;
import arc.Core;
import arc.struct.IntSet;
import arc.graphics.Color;
import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.Mathf;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.Fx;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import java.io.*;
import static mindustry.Vars.*;
public class MendProjector extends Block{
core/src/mindustry/world/blocks/defense/OverdriveProjector.java
+6 -8
View File
@@ -1,19 +1,17 @@
package mindustry.world.blocks.defense;
import arc.Core;
import arc.struct.IntSet;
import arc.graphics.Color;
import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.Mathf;
import arc.util.Time;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import java.io.*;
import static mindustry.Vars.*;
public class OverdriveProjector extends Block{
@@ -90,7 +88,7 @@ public class OverdriveProjector extends Block{
float realBoost = (speedBoost + entity.phaseHeat * speedBoostPhase) * entity.efficiency();
entity.charge = 0f;
indexer.eachBlock(entity, realRange, other -> other.entity.timeScale() <= realBoost, other -> other.entity.applyBoost(realBoost, reload + 1f));
indexer.eachBlock(entity, realRange, other -> other.entity.timeScale() < realBoost, other -> other.entity.applyBoost(realBoost, reload + 1f));
}
}
core/src/mindustry/world/blocks/defense/turrets/Turret.java
+14 -18
View File
@@ -1,29 +1,23 @@
package mindustry.world.blocks.defense.turrets;
import arc.Core;
import arc.*;
import arc.audio.*;
import arc.struct.Array;
import arc.struct.EnumSet;
import arc.func.Cons2;
import arc.graphics.Blending;
import arc.graphics.Color;
import arc.func.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.Angles;
import arc.math.Mathf;
import arc.math.geom.Vec2;
import arc.util.Time;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.Fx;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.entities.bullet.BulletType;
import mindustry.entities.bullet.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.Block;
import mindustry.world.Tile;
import mindustry.world.*;
import mindustry.world.meta.*;
import java.io.*;
import static mindustry.Vars.tilesize;
public abstract class Turret extends Block{
@@ -330,8 +324,10 @@ public abstract class Turret extends Block{
@Override
public void read(Reads read, byte revision){
super.read(read, revision);
reload = read.f();
rotation = read.f();
if(revision == 1){
reload = read.f();
rotation = read.f();
}
}
@Override