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

Added respawn animation on game start

Browse Source
This commit is contained in:
Anuken 2018-05-31 11:48:07 -04:00
parent e534a6b7fc
commit 24e7d755eb
8 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 567 B

After

Width:  |  Height:  |  Size: 580 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 111 KiB

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

@ -135,11 +135,9 @@ public class Control extends Module{
Events.on(PlayEvent.class, () -> {
for(Player player : players){
player.set(world.getSpawnX(), world.getSpawnY());
player.dead = true;
}
Core.camera.position.set(world.getSpawnX(), world.getSpawnY(), 0);
state.set(State.playing);
});

5
core/src/io/anuke/mindustry/core/NetServer.java
View File

@ -6,9 +6,9 @@ import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.Mechs;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.bullet.BulletType;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.SyncEntity;
import io.anuke.mindustry.entities.bullet.BulletType;
import io.anuke.mindustry.gen.CallServer;
import io.anuke.mindustry.io.Version;
import io.anuke.mindustry.net.*;
@ -22,7 +22,6 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Build;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.BaseBulletType;
import io.anuke.ucore.entities.Entities;
import io.anuke.ucore.entities.EntityGroup;
import io.anuke.ucore.modules.Module;
@ -106,7 +105,7 @@ public class NetServer extends Module{
player.name = packet.name;
player.uuid = uuid;
player.mech = packet.mobile ? Mechs.standardShip : Mechs.standard;
player.set(world.getSpawnX(), world.getSpawnY());
player.dead = true;
player.setNet(player.x, player.y);
player.setNet(player.x, player.y);
player.color.set(packet.color);

9
core/src/io/anuke/mindustry/core/World.java
View File

@ -55,15 +55,6 @@ public class World extends Module{
public Pathfinder pathfinder(){
return pathfinder;
}
//TODO proper spawnpoints!
public float getSpawnX(){
return width() * tilesize/2f;
}
public float getSpawnY(){
return height() * tilesize/2f;
}
public boolean solid(int x, int y){
Tile tile = tile(x, y);

8
core/src/io/anuke/mindustry/entities/Player.java
View File

@ -133,16 +133,10 @@ public class Player extends Unit implements BlockBuilder {
@Override
public void onRemoteDeath(){
dead = true;
respawning = true;
respawning = false;
Effects.effect(ExplosionFx.explosion, this);
Effects.shake(4f, 5f, this);
Effects.sound("die", this);
Timers.run(respawnduration + 5f, () -> {
heal();
set(world.getSpawnX(), world.getSpawnY());
interpolator.target.set(x, y);
});
}
@Override

2
core/src/io/anuke/mindustry/net/NetworkIO.java
View File

@ -166,7 +166,7 @@ public class NetworkIO {
}
}
player.set(world.getSpawnX(), world.getSpawnY());
player.dead = true;
world.endMapLoad();

8
core/src/io/anuke/mindustry/world/blocks/types/storage/CoreBlock.java
View File

@ -20,6 +20,7 @@ import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.EnumSet;
import io.anuke.ucore.util.Mathf;
import static io.anuke.mindustry.Vars.debug;
import static io.anuke.mindustry.Vars.state;
public class CoreBlock extends StorageBlock {
@ -77,8 +78,6 @@ public class CoreBlock extends StorageBlock {
size * Vars.tilesize /2f);
Draw.reset();
//Draw.rect(name + (!entity.solid ? "-top-open" : "-top"), tile.drawx(), tile.drawy());
}
}
@ -138,6 +137,11 @@ public class CoreBlock extends StorageBlock {
entity.time += Timers.delta();
entity.progress += 1f / Vars.respawnduration;
//instant build for fast testing.
if(debug){
entity.progress = 1f;
}
if(entity.progress >= 1f){
Effects.effect(Fx.spawn, entity);
entity.progress = 0;