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

Changes to break/place system

Browse Source
This commit is contained in:
Anuken
2017-12-16 10:47:06 -05:00
parent 97d1542ff4
commit 93f58bb458
15 changed files with 230 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ public class Player extends DestructibleEntity{
public transient Recipe recipe;
public transient int rotation;
public transient PlaceMode placeMode = android ? PlaceMode.cursor : PlaceMode.hold;
public transient PlaceMode breakMode = PlaceMode.holdDelete;
public transient PlaceMode breakMode = android ? PlaceMode.none : PlaceMode.holdDelete;
public Player(){
hitbox.setSize(5);

13
core/src/io/anuke/mindustry/entities/effect/Shield.java
View File

@@ -1,6 +1,5 @@
package io.anuke.mindustry.entities.effect;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Interpolation;
import io.anuke.mindustry.Vars;
@@ -8,7 +7,6 @@ import io.anuke.mindustry.entities.enemies.Enemy;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.types.defense.ShieldBlock;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.BulletEntity;
import io.anuke.ucore.entities.Entities;
@@ -75,13 +73,7 @@ public class Shield extends Entity{
}
float rad = drawRadius();
Graphics.surface(Vars.renderer.shieldSurface, false);
Draw.color(Color.ROYAL);
Draw.thick(2f);
Draw.rect("circle2", x, y, rad, rad);
Draw.reset();
Graphics.surface();
}
float drawRadius(){
@@ -92,6 +84,11 @@ public class Shield extends Entity{
active = false;
}
@Override
public Shield add(){
return add(Vars.control.shieldGroup);
}
@Override
public void added(){
active = true;