mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-20 12:58:38 +03:00
Beginning work on respawning
This commit is contained in:
parent
39ee31d748
commit
2dfbbdfd5b
@ -5,6 +5,7 @@ import arc.graphics.*;
|
||||
import arc.graphics.g2d.*;
|
||||
import arc.math.*;
|
||||
import arc.scene.ui.layout.*;
|
||||
import arc.struct.*;
|
||||
import arc.util.*;
|
||||
import arc.util.ArcAnnotate.*;
|
||||
import arc.util.pooling.*;
|
||||
@ -13,10 +14,11 @@ import mindustry.core.*;
|
||||
import mindustry.entities.units.*;
|
||||
import mindustry.game.*;
|
||||
import mindustry.gen.*;
|
||||
import mindustry.net.*;
|
||||
import mindustry.net.Administration.*;
|
||||
import mindustry.net.*;
|
||||
import mindustry.net.Packets.*;
|
||||
import mindustry.ui.*;
|
||||
import mindustry.world.blocks.storage.CoreBlock.*;
|
||||
|
||||
import static mindustry.Vars.*;
|
||||
|
||||
@ -66,15 +68,21 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc{
|
||||
x(unit.x());
|
||||
y(unit.y());
|
||||
unit.team(team);
|
||||
}else if(!team.cores().isEmpty()){
|
||||
//try to respawn
|
||||
Array<CoreEntity> cores = team.cores();
|
||||
|
||||
if(!cores.isEmpty()){
|
||||
//TODO respawning
|
||||
}
|
||||
}
|
||||
|
||||
textFadeTime -= Time.delta() / (60 * 5);
|
||||
}
|
||||
|
||||
public void team(Team team){
|
||||
this.team = team;
|
||||
if(unit != null){
|
||||
unit.team(team);
|
||||
}
|
||||
unit.team(team);
|
||||
}
|
||||
|
||||
public void clearUnit(){
|
||||
|
@ -39,14 +39,15 @@ public class CoreBlock extends StorageBlock{
|
||||
public static void onUnitRespawn(Tile tile, Playerc player){
|
||||
if(player == null || tile.entity == null) return;
|
||||
|
||||
//TODO really fix
|
||||
CoreEntity entity = tile.ent();
|
||||
Fx.spawn.at(entity);
|
||||
entity.progress = 0;
|
||||
entity.spawnPlayer = player;
|
||||
//entity.progress = 0;
|
||||
//entity.spawnPlayer = player;
|
||||
//TODO fix
|
||||
//entity.spawnPlayer.onRespawn(tile);
|
||||
//entity.spawnPlayer.applyImpulse(0, 8f);
|
||||
entity.spawnPlayer = null;
|
||||
//entity.spawnPlayer = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -232,8 +233,8 @@ public class CoreBlock extends StorageBlock{
|
||||
}
|
||||
|
||||
public class CoreEntity extends TileEntity{
|
||||
protected Playerc spawnPlayer;
|
||||
protected float progress;
|
||||
// protected Playerc spawnPlayer;
|
||||
//protected float progress;
|
||||
protected float time;
|
||||
protected float heat;
|
||||
protected int storageCapacity;
|
||||
|
Loading…
Reference in New Issue
Block a user