Fixed multiblocks not drawing
This commit is contained in:
@@ -424,7 +424,6 @@ public class Bullets implements ContentList{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(Bullet b){
|
public void draw(Bullet b){
|
||||||
//TODO add color to the bullet depending on the color of the flame it came from
|
|
||||||
Draw.color(Pal.lightFlame, Pal.darkFlame, Color.GRAY, b.fin());
|
Draw.color(Pal.lightFlame, Pal.darkFlame, Color.GRAY, b.fin());
|
||||||
Fill.circle(b.x, b.y, 3f * b.fout());
|
Fill.circle(b.x, b.y, 3f * b.fout());
|
||||||
Draw.reset();
|
Draw.reset();
|
||||||
|
|||||||
@@ -75,8 +75,6 @@ public class StatusEffects implements ContentList{
|
|||||||
armorMultiplier = 3f;
|
armorMultiplier = 3f;
|
||||||
damageMultiplier = 3f;
|
damageMultiplier = 3f;
|
||||||
speedMultiplier = 1.1f;
|
speedMultiplier = 1.1f;
|
||||||
//TODO custom effect
|
|
||||||
//effect = Fx.overdriven;
|
|
||||||
}};
|
}};
|
||||||
|
|
||||||
shocked = new StatusEffect();
|
shocked = new StatusEffect();
|
||||||
|
|||||||
@@ -154,20 +154,6 @@ public class Zones implements ContentList{
|
|||||||
}};
|
}};
|
||||||
}};
|
}};
|
||||||
|
|
||||||
/*
|
|
||||||
crags = new Zone("crags", new MapGenerator("groundZero", 1)){{ //TODO implement
|
|
||||||
baseLaunchCost = ItemStack.with(Items.copper, 300);
|
|
||||||
startingItems = ItemStack.with(Items.copper, 200);
|
|
||||||
conditionWave = 15;
|
|
||||||
zoneRequirements = new Zone[]{frozenForest};
|
|
||||||
blockRequirements = new Block[]{Blocks.copperWall};
|
|
||||||
rules = () -> new Rules(){{
|
|
||||||
waves = true;]
|
|
||||||
waveTimer = true;
|
|
||||||
waveSpacing = 60 * 80;
|
|
||||||
}};
|
|
||||||
}};*/
|
|
||||||
|
|
||||||
stainedMountains = new Zone("stainedMountains", new MapGenerator("stainedMountains", 2)
|
stainedMountains = new Zone("stainedMountains", new MapGenerator("stainedMountains", 2)
|
||||||
.dist(0f, false)
|
.dist(0f, false)
|
||||||
.decor(new Decoration(Blocks.shale, Blocks.shaleBoulder, 0.02))){{
|
.decor(new Decoration(Blocks.shale, Blocks.shaleBoulder, 0.02))){{
|
||||||
|
|||||||
@@ -168,6 +168,8 @@ public class MapEditor{
|
|||||||
if(block.isMultiblock() || block instanceof BlockPart){
|
if(block.isMultiblock() || block instanceof BlockPart){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
renderer.updatePoint(worldx, worldy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,7 +85,6 @@ public class MapRenderer implements Disposable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void updatePoint(int x, int y){
|
public void updatePoint(int x, int y){
|
||||||
//TODO spread out over multiple frames?
|
|
||||||
updates.add(x + y * width);
|
updates.add(x + y * width);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -859,7 +859,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
|
|||||||
@Override
|
@Override
|
||||||
public void write(DataOutput buffer) throws IOException{
|
public void write(DataOutput buffer) throws IOException{
|
||||||
super.writeSave(buffer, !isLocal);
|
super.writeSave(buffer, !isLocal);
|
||||||
TypeIO.writeStringData(buffer, name); //TODO writing strings is very inefficient
|
TypeIO.writeStringData(buffer, name);
|
||||||
buffer.writeByte(Pack.byteValue(isAdmin) | (Pack.byteValue(dead) << 1) | (Pack.byteValue(isBoosting) << 2) | (Pack.byteValue(isTyping) << 3));
|
buffer.writeByte(Pack.byteValue(isAdmin) | (Pack.byteValue(dead) << 1) | (Pack.byteValue(isBoosting) << 2) | (Pack.byteValue(isTyping) << 3));
|
||||||
buffer.writeInt(Color.rgba8888(color));
|
buffer.writeInt(Color.rgba8888(color));
|
||||||
buffer.writeByte(mech.id);
|
buffer.writeByte(mech.id);
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import io.anuke.arc.graphics.g2d.*;
|
|||||||
import io.anuke.arc.math.Mathf;
|
import io.anuke.arc.math.Mathf;
|
||||||
import io.anuke.arc.util.Tmp;
|
import io.anuke.arc.util.Tmp;
|
||||||
|
|
||||||
//TODO remove
|
|
||||||
public class Shapes{
|
public class Shapes{
|
||||||
|
|
||||||
public static void laser(String line, String edge, float x, float y, float x2, float y2, float scale){
|
public static void laser(String line, String edge, float x, float y, float x2, float y2, float scale){
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ public abstract class SaveVersion extends SaveFileReader{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void writeMap(DataOutput stream) throws IOException{
|
public void writeMap(DataOutput stream) throws IOException{
|
||||||
//TODO something here messes up everything
|
|
||||||
//write world size
|
//write world size
|
||||||
stream.writeShort(world.width());
|
stream.writeShort(world.width());
|
||||||
stream.writeShort(world.height());
|
stream.writeShort(world.height());
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ public class CrashSender{
|
|||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
|
|
||||||
//don't create crash logs for me (anuke) or custom builds, as it's expected
|
//don't create crash logs for me (anuke) or custom builds, as it's expected
|
||||||
//TODO maybe custom builds such as bleeding edge in certain cases
|
|
||||||
if(System.getProperty("user.name").equals("anuke") || Version.build == -1) return;
|
if(System.getProperty("user.name").equals("anuke") || Version.build == -1) return;
|
||||||
|
|
||||||
//attempt to load version regardless
|
//attempt to load version regardless
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package io.anuke.mindustry.type;
|
|||||||
|
|
||||||
import io.anuke.mindustry.game.Content;
|
import io.anuke.mindustry.game.Content;
|
||||||
|
|
||||||
//TODO implement-- should it even be content?
|
//currently unimplemented, see trello for implementation plans
|
||||||
public class WeatherEvent extends Content{
|
public class WeatherEvent extends Content{
|
||||||
public final String name;
|
public final String name;
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class PlacementFragment extends Fragment{
|
|||||||
Table blockTable, toggler, topTable;
|
Table blockTable, toggler, topTable;
|
||||||
boolean lastGround;
|
boolean lastGround;
|
||||||
|
|
||||||
//TODO make this configurable
|
//not configurable, no plans to make it configurable
|
||||||
final KeyCode[] inputGrid = {
|
final KeyCode[] inputGrid = {
|
||||||
KeyCode.NUM_1, KeyCode.NUM_2, KeyCode.NUM_3, KeyCode.NUM_4,
|
KeyCode.NUM_1, KeyCode.NUM_2, KeyCode.NUM_3, KeyCode.NUM_4,
|
||||||
KeyCode.Q, KeyCode.W, KeyCode.E, KeyCode.R,
|
KeyCode.Q, KeyCode.W, KeyCode.E, KeyCode.R,
|
||||||
|
|||||||
@@ -452,19 +452,6 @@ public class Tile implements Position, TargetTrait{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString(){
|
public String toString(){
|
||||||
return floor.name + ":" + block.name + ":" + content.block(overlay) + "[" + x + "," + y + "] " + "entity=" + (entity == null ? "null" : (entity.getClass())) +
|
return floor.name + ":" + block.name + ":" + content.block(overlay) + "[" + x + "," + y + "] " + "entity=" + (entity == null ? "null" : (entity.getClass()));
|
||||||
(isLinked() ? " link=[" + linkX(rotation) + ", " + linkY(rotation) + "]" : "");
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO remove these!
|
|
||||||
|
|
||||||
/**Returns the relative X from a link byte.*/
|
|
||||||
public static int linkX(byte value){
|
|
||||||
return -((byte)((value >> 4) & (byte)0x0F) - 8);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**Returns the relative Y from a link byte.*/
|
|
||||||
public static int linkY(byte value){
|
|
||||||
return -((byte)(value & 0x0F) - 8);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user