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

More reorganization, implemented multiblock drills, API changes

Browse Source
This commit is contained in:
Anuken
2018-03-04 22:00:32 -05:00
parent 099d88ba7b
commit 292dbf101b
70 changed files with 606 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -158,13 +158,13 @@ public class DesktopInput extends InputHandler{
public int tilex(){
return (recipe != null && recipe.result.isMultiblock() &&
recipe.result.width % 2 == 0) ?
recipe.result.size % 2 == 0) ?
Mathf.scl(Graphics.mouseWorld().x, tilesize) : Mathf.scl2(Graphics.mouseWorld().x, tilesize);
}
public int tiley(){
return (recipe != null && recipe.result.isMultiblock() &&
recipe.result.height % 2 == 0) ?
recipe.result.size % 2 == 0) ?
Mathf.scl(Graphics.mouseWorld().y, tilesize) : Mathf.scl2(Graphics.mouseWorld().y, tilesize);
}

2
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@@ -71,7 +71,7 @@ public abstract class InputHandler extends InputAdapter{
}
public boolean round2(){
return !(recipe != null && recipe.result.isMultiblock() && recipe.result.height % 2 == 0);
return !(recipe != null && recipe.result.isMultiblock() && recipe.result.size % 2 == 0);
}
public boolean validPlace(int x, int y, Block type){

16
core/src/io/anuke/mindustry/input/PlaceMode.java
View File

@@ -36,8 +36,8 @@ public enum PlaceMode{
Draw.color(valid ? Colors.get("place") : Colors.get("placeInvalid"));
Lines.stroke(2f);
Lines.crect(x + offset.x, y + offset.y, tilesize * control.input().recipe.result.width + si,
tilesize * control.input().recipe.result.height + si);
Lines.crect(x + offset.x, y + offset.y, tilesize * control.input().recipe.result.size + si,
tilesize * control.input().recipe.result.size + si);
control.input().recipe.result.drawPlace(tilex, tiley, control.input().rotation, valid);
Lines.stroke(2f);
@@ -150,7 +150,7 @@ public enum PlaceMode{
tile = tile.getLinked();
if(tile != null && control.input().validBreak(tile.x, tile.y)){
Lines.crect(tile.drawx(), tile.drawy(),
tile.block().width * t, tile.block().height * t);
tile.block().size* t, tile.block().size * t);
}
}
}
@@ -251,13 +251,13 @@ public enum PlaceMode{
x2 = this.endx * t, y2 = this.endy * t;
if(x2 >= x){
x -= block.width * t/2;
x2 += block.width * t/2;
x -= block.size * t/2;
x2 += block.size * t/2;
}
if(y2 >= y){
y -= block.height * t/2;
y2 += block.height * t/2;
y -= block.size * t/2;
y2 += block.size * t/2;
}
x += offset.x;
@@ -284,7 +284,7 @@ public enum PlaceMode{
if(!control.input().validPlace(px, py, control.input().recipe.result)
|| !state.inventory.hasItems(control.input().recipe.requirements, amount)){
Lines.crect(px * t + offset.x, py * t + offset.y, t*block.width, t*block.height);
Lines.crect(px * t + offset.x, py * t + offset.y, t*block.size, t*block.size);
}
amount ++;
}