More bugfixes
This commit is contained in:
@@ -151,6 +151,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
|
||||
|
||||
/** Return relative rotation to a coordinate. Returns -1 if the coordinate is not near this tile. */
|
||||
public byte relativeTo(int cx, int cy){
|
||||
int x = tile.x, y = tile.y;
|
||||
if(x == cx && y == cy - 1) return 1;
|
||||
if(x == cx && y == cy + 1) return 3;
|
||||
if(x == cx - 1 && y == cy) return 0;
|
||||
@@ -159,6 +160,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
|
||||
}
|
||||
|
||||
public byte absoluteRelativeTo(int cx, int cy){
|
||||
int x = tile.x, y = tile.y;
|
||||
if(x == cx && y <= cy - 1) return 1;
|
||||
if(x == cx && y >= cy + 1) return 3;
|
||||
if(x <= cx - 1 && y == cy) return 0;
|
||||
@@ -486,7 +488,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
|
||||
|
||||
/** Try offloading an item to a nearby container in its facing direction. Returns true if success. */
|
||||
public boolean moveForward(Item item){
|
||||
Tilec other = tile().front();
|
||||
Tilec other = front();
|
||||
if(other != null && other.team() == team() && other.acceptItem(this, item)){
|
||||
other.handleItem(this, item);
|
||||
return true;
|
||||
|
||||
@@ -118,15 +118,11 @@ public class Conveyor extends Block implements Autotiler{
|
||||
|
||||
int blendbits;
|
||||
int blendsclx, blendscly;
|
||||
boolean everupdated = false;
|
||||
|
||||
float clogHeat = 0f;
|
||||
|
||||
@Override
|
||||
public void draw(){
|
||||
if(!everupdated){
|
||||
Log.info("--DID NOT UPDATE {0}", tile);
|
||||
}
|
||||
byte rotation = tile.rotation();
|
||||
int frame = clogHeat <= 0.5f ? (int)(((Time.time() * speed * 8f * timeScale())) % 4) : 0;
|
||||
Draw.rect(regions[Mathf.clamp(blendbits, 0, regions.length - 1)][Mathf.clamp(frame, 0, regions[0].length - 1)], x, y,
|
||||
@@ -146,7 +142,6 @@ public class Conveyor extends Block implements Autotiler{
|
||||
blendbits = bits[0];
|
||||
blendsclx = bits[1];
|
||||
blendscly = bits[2];
|
||||
everupdated = true;
|
||||
|
||||
if(tile.front() != null && tile.front() != null){
|
||||
next = tile.front();
|
||||
|
||||
@@ -2,13 +2,13 @@ package mindustry.world.blocks.legacy;
|
||||
|
||||
import arc.util.io.*;
|
||||
import mindustry.gen.*;
|
||||
import mindustry.world.*;
|
||||
|
||||
public class LegacyMechPad extends Block{
|
||||
public class LegacyMechPad extends LegacyBlock{
|
||||
|
||||
public LegacyMechPad(String name){
|
||||
super(name);
|
||||
update = true;
|
||||
hasPower = true;
|
||||
}
|
||||
|
||||
public class LegacyMechPadEntity extends TileEntity{
|
||||
|
||||
Reference in New Issue
Block a user