mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Changed teleporter name, fixed some bugs

Browse Source
This commit is contained in:
Anuken 2018-06-16 21:55:38 -04:00
parent 9fbeeda1c6
commit e1cdf80b17
10 changed files with 672 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/distribution/teleporter-top.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 168 B

0
core/assets-raw/sprites/blocks/power/teleporter-top.png → core/assets-raw/sprites/blocks/distribution/warpgate-top.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 346 B

0
core/assets-raw/sprites/blocks/power/teleporter.png → core/assets-raw/sprites/blocks/distribution/warpgate.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 492 B

1124
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 118 KiB

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

@ -100,7 +100,7 @@ public class Recipes implements ContentList{
new Recipe(power, PowerBlocks.shieldgenerator, new ItemStack(Items.titanium, 30), new ItemStack(Items.surgealloy, 30));
new Recipe(distribution, PowerBlocks.teleporter, new ItemStack(Items.steel, 30), new ItemStack(Items.surgealloy, 40));
new Recipe(distribution, PowerBlocks.warpgate, new ItemStack(Items.steel, 1));
new Recipe(power, PowerBlocks.repairturret, new ItemStack(Items.iron, 30));
new Recipe(power, PowerBlocks.megarepairturret, new ItemStack(Items.iron, 20), new ItemStack(Items.steel, 30));

5
core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
View File

@ -100,11 +100,6 @@ public class DebugBlocks extends BlockList implements ContentList{
ButtonGroup<ImageButton> group = new ButtonGroup<>();
Table cont = new Table();
cont.margin(4);
cont.marginBottom(5);
cont.add().colspan(4).height(50f * (int) (items.size / 4f + 1f));
cont.row();
for (int i = 0; i < items.size; i++) {
if (i == 0) continue;

7
core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
View File

@ -5,11 +5,12 @@ import io.anuke.mindustry.type.ContentList;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.defense.RepairTurret;
import io.anuke.mindustry.world.blocks.defense.ShieldBlock;
import io.anuke.mindustry.world.blocks.distribution.Teleporter;
import io.anuke.mindustry.world.blocks.distribution.WarpGate;
import io.anuke.mindustry.world.blocks.power.*;
public class PowerBlocks extends BlockList implements ContentList {
public static Block combustiongenerator, thermalgenerator, liquidcombustiongenerator, rtgenerator, solarpanel, largesolarpanel, nuclearReactor, fusionReactor, repairturret, megarepairturret, shieldgenerator, battery, batteryLarge, powernode, powernodelarge, teleporter;
public static Block combustiongenerator, thermalgenerator, liquidcombustiongenerator, rtgenerator, solarpanel, largesolarpanel,
nuclearReactor, fusionReactor, repairturret, megarepairturret, shieldgenerator, battery, batteryLarge, powernode, powernodelarge, warpgate;
@Override
public void load() {
@ -98,7 +99,7 @@ public class PowerBlocks extends BlockList implements ContentList {
shadow = "shadow-round-2";
}};
teleporter = new Teleporter("teleporter");
warpgate = new WarpGate("warpgate");
}
}

121
core/src/io/anuke/mindustry/world/blocks/distribution/Teleporter.java → core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java
View File

@ -7,6 +7,8 @@ import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.fx.BlockFx;
import io.anuke.mindustry.content.fx.ExplosionFx;
import io.anuke.mindustry.entities.Damage;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.gen.CallBlocks;
@ -17,6 +19,7 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.PowerBlock;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Effects.Effect;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Fill;
@ -26,12 +29,15 @@ import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Translator;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
public class Teleporter extends PowerBlock{
import static io.anuke.mindustry.Vars.tilesize;
public class WarpGate extends PowerBlock{
public static final Color[] colorArray = {Color.ROYAL, Color.ORANGE, Color.SCARLET, Color.LIME,
Color.PURPLE, Color.GOLD, Color.PINK, Color.LIGHT_GRAY};
public static final int colors = colorArray.length;
@ -46,8 +52,10 @@ public class Teleporter extends PowerBlock{
private Array<Tile> returns = new Array<>();
protected float warmupTime = 60f;
protected float teleportMax = 400f;
protected float liquidUse = 0.3f;
//time between teleports
protected float teleportMax = 1000f;
protected float teleportLiquidUse = 0.3f;
protected float liquidUse = 0.1f;
protected float powerUse = 0.3f;
protected Liquid inputLiquid = Liquids.cryofluid;
protected Effect activateEffect = BlockFx.teleportActivate;
@ -60,7 +68,7 @@ public class Teleporter extends PowerBlock{
}
}
public Teleporter(String name) {
public WarpGate(String name) {
super(name);
update = true;
solid = true;
@ -91,8 +99,15 @@ public class Teleporter extends PowerBlock{
float time = entity.time;
float rad = entity.activeScl;
if(entity.liquidLackScl > 0.01f){
Graphics.setAdditiveBlending();
Draw.color(1f, 0.3f, 0.3f, 0.4f * entity.liquidLackScl);
Fill.square(tile.drawx(), tile.drawy(), size * tilesize);
Graphics.setNormalBlending();
}
Draw.color(getColor(tile, 0));
Draw.rect("teleporter-top", tile.drawx(), tile.drawy());
Draw.rect(name+"-top", tile.drawx(), tile.drawy());
Draw.reset();
if(rad <= 0.0001f) return;
@ -142,9 +157,12 @@ public class Teleporter extends PowerBlock{
entity.activeScl = Mathf.lerpDelta(entity.activeScl, 0f, 0.01f);
if(entity.power.amount >= powerCapacity){
Color resultColor = new Color();
resultColor.set(getColor(tile, 0));
entity.active = true;
entity.power.amount = 0f;
Effects.effect(activateEffect, getColor(tile, 0), tile.drawx(), tile.drawy());
Effects.effect(activateEffect, resultColor, tile.drawx(), tile.drawy());
}
}else {
entity.activeScl = Mathf.lerpDelta(entity.activeScl, 1f, 0.015f);
@ -153,20 +171,35 @@ public class Teleporter extends PowerBlock{
if (entity.power.amount >= powerUsed) {
entity.power.amount -= powerUsed;
entity.powerLackScl = Mathf.lerpDelta(entity.powerLackScl, 0f, 0.01f);
entity.powerLackScl = Mathf.lerpDelta(entity.powerLackScl, 0f, 0.1f);
}else{
entity.powerLackScl = Mathf.lerpDelta(entity.powerLackScl, 1f, 0.01f);
entity.power.amount = 0f;
entity.powerLackScl = Mathf.lerpDelta(entity.powerLackScl, 1f, 0.1f);
}
if(entity.powerLackScl >= 0.999f){
catastrophicFailure(tile);
}
float liquidUsed = Math.min(liquidCapacity, liquidUse * Timers.delta());
if (entity.liquids.amount >= liquidUsed) {
entity.liquids.amount -= liquidUsed;
entity.liquidLackScl = Mathf.lerpDelta(entity.liquidLackScl, 0f, 0.1f);
}else{
entity.liquids.amount = 0f;
entity.liquidLackScl = Mathf.lerpDelta(entity.liquidLackScl, 1f, 0.1f);
}
if(entity.liquidLackScl >= 0.999f){
catastrophicFailure(tile);
}
//TODO draw warning info!
if (entity.teleporting) {
entity.speedScl = Mathf.lerpDelta(entity.speedScl, 2f, 0.01f);
float liquidUsed = Math.min(liquidCapacity, liquidUse * Timers.delta());
liquidUsed = Math.min(liquidCapacity, teleportLiquidUse * Timers.delta());
if (entity.liquids.amount >= liquidUsed) {
entity.liquids.amount -= liquidUsed;
@ -179,15 +212,18 @@ public class Teleporter extends PowerBlock{
entity.time += Timers.delta() * entity.speedScl;
if (entity.items.totalItems() == itemCapacity && entity.power.amount >= powerCapacity &&
if (!entity.teleporting && entity.items.totalItems() >= itemCapacity && entity.power.amount >= powerCapacity - 0.01f &&
entity.timer.get(timerTeleport, teleportMax)) {
Array<Tile> testLinks = findLinks(tile);
if (testLinks.size == 0) return;
Color resultColor = new Color();
resultColor.set(getColor(tile, 0));
entity.teleporting = true;
Effects.effect(teleportEffect, getColor(tile, 0), tile.drawx(), tile.drawy());
Effects.effect(teleportEffect, resultColor, tile.drawx(), tile.drawy());
Timers.run(warmupTime, () -> {
Array<Tile> links = findLinks(tile);
@ -195,12 +231,12 @@ public class Teleporter extends PowerBlock{
int canAccept = itemCapacity - other.entity.items.totalItems();
int total = entity.items.totalItems();
if (total == 0) break;
Effects.effect(teleportOutEffect, getColor(tile, 0), other.drawx(), other.drawy());
Effects.effect(teleportOutEffect, resultColor, other.drawx(), other.drawy());
for (int i = 0; i < canAccept && i < total; i++) {
other.entity.items.addItem(entity.items.takeItem(), 1);
}
}
Effects.effect(teleportOutEffect, getColor(tile, 0), tile.drawx(), tile.drawy());
Effects.effect(teleportOutEffect, resultColor, tile.drawx(), tile.drawy());
entity.power.amount = 0f;
entity.teleporting = false;
});
@ -216,11 +252,6 @@ public class Teleporter extends PowerBlock{
ButtonGroup<ImageButton> group = new ButtonGroup<>();
Table cont = new Table();
cont.margin(4);
cont.marginBottom(5);
cont.add().colspan(4).height(145f);
cont.row();
for(int i = 0; i < colors; i ++){
final int f = i;
@ -255,7 +286,46 @@ public class Teleporter extends PowerBlock{
return super.acceptLiquid(tile, source, liquid, amount) && liquid == inputLiquid;
}
@Override
public void onDestroyed(Tile tile) {
super.onDestroyed(tile);
TeleporterEntity entity = tile.entity();
if(entity.activeScl < 0.5f) return;
float explosionRadius = 50f;
float explosionDamage = 20f;
Translator tr = new Translator();
Effects.shake(6f, 16f, tile.worldx(), tile.worldy());
Effects.effect(ExplosionFx.nuclearShockwave, tile.worldx(), tile.worldy());
for(int i = 0; i < 6; i ++){
Timers.run(Mathf.random(40), () -> {
Effects.effect(BlockFx.nuclearcloud, tile.worldx(), tile.worldy());
});
}
Damage.damage(tile.worldx(), tile.worldy(), explosionRadius * tilesize, explosionDamage * 4);
for(int i = 0; i < 20; i ++){
Timers.run(Mathf.random(50), ()->{
tr.rnd(Mathf.random(40f));
Effects.effect(ExplosionFx.explosion, tr.x + tile.worldx(), tr.y + tile.worldy());
});
}
for(int i = 0; i < 70; i ++){
Timers.run(Mathf.random(80), ()->{
tr.rnd(Mathf.random(120f));
Effects.effect(BlockFx.nuclearsmoke, tr.x + tile.worldx(), tr.y + tile.worldy());
});
}
}
private void catastrophicFailure(Tile tile){
tile.entity.damage(tile.entity.health + 1);
//TODO fail gloriously
}
@ -277,7 +347,7 @@ public class Teleporter extends PowerBlock{
for(Tile other : teleporters[entity.color]){
if(other != tile){
if(other.block() instanceof Teleporter){
if(other.block() instanceof WarpGate){
TeleporterEntity oe = other.entity();
if(!oe.active) continue;
if(oe.color != entity.color){
@ -291,8 +361,9 @@ public class Teleporter extends PowerBlock{
}
}
for(Tile remove : removal)
for(Tile remove : removal) {
teleporters[entity.color].remove(remove);
}
return returns;
}
@ -309,17 +380,25 @@ public class Teleporter extends PowerBlock{
public boolean active;
public float activeScl = 0f;
public float speedScl = 1f;
public float powerLackScl;
public float powerLackScl, liquidLackScl;
public float time;
@Override
public void write(DataOutputStream stream) throws IOException{
stream.writeByte(color);
stream.writeBoolean(active);
stream.writeFloat(activeScl);
stream.writeFloat(speedScl);
stream.writeFloat(powerLackScl);
}
@Override
public void read(DataInputStream stream) throws IOException{
color = stream.readByte();
active = stream.readBoolean();
activeScl = stream.readFloat();
speedScl = stream.readFloat();
powerLackScl = stream.readFloat();
}
}

17
core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java
View File

@ -29,8 +29,8 @@ import java.io.IOException;
import static io.anuke.mindustry.Vars.*;
public class Reconstructor extends Block{
protected float departTime = 20f;
protected float arriveTime = 30f;
protected float departTime = 30f;
protected float arriveTime = 40f;
protected float powerPerTeleport = 5f;
protected Effect arriveEffect = Fx.spawn;
@ -158,7 +158,13 @@ public class Reconstructor extends Block{
entity.updateTime -= Timers.delta()/departTime;
if(entity.updateTime <= 0f){
//TODO veryify power per teleport!
//no power? death.
if(other.power.amount < powerPerTeleport){
entity.current.setDead(true);
entity.current.setRespawning(false);
entity.current = null;
return;
}
other.power.amount -= powerPerTeleport;
other.current = entity.current;
other.departing = false;
@ -239,13 +245,14 @@ public class Reconstructor extends Block{
public static void reconstructPlayer(Player player, Tile tile){
ReconstructorEntity entity = tile.entity();
if(!checkValidTap(tile, entity, player)) return;
if(!checkValidTap(tile, entity, player) || entity.power.amount < ((Reconstructor)tile.block()).powerPerTeleport) return;
entity.departing = true;
entity.current = player;
entity.solid = false;
entity.set(tile.drawx(), tile.drawy());
entity.power.amount -= ((Reconstructor)tile.block()).powerPerTeleport;
entity.updateTime = 1f;
entity.set(tile.drawx(), tile.drawy());
player.setDead(true);
player.setRespawning(true);
player.setRespawning();