Removed shadow sprites

This commit is contained in:
Anuken
2018-11-17 11:33:56 -05:00
parent 745592f507
commit c6f1f19866
29 changed files with 1136 additions and 1305 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 332 KiB

View File

@@ -157,9 +157,7 @@ public class Blocks extends BlockList implements ContentList{
minimapColor = Color.valueOf("549d5b");
}};
shrub = new Rock("shrub"){{
shadow = "shrubshadow";
}};
shrub = new Rock("shrub");
rock = new Rock("rock"){{
variants = 2;

View File

@@ -41,7 +41,6 @@ public class DebugBlocks extends BlockList implements ContentList{
powerVoid = new PowerBlock("powervoid"){
{
powerCapacity = Float.MAX_VALUE;
shadow = "shadow-round-1";
}
@Override
@@ -63,7 +62,6 @@ public class DebugBlocks extends BlockList implements ContentList{
maxNodes = 100;
outputsPower = true;
consumesPower = false;
shadow = "shadow-round-1";
}
@Override

View File

@@ -12,13 +12,11 @@ public class LiquidBlocks extends BlockList implements ContentList{
public void load(){
mechanicalPump = new Pump("mechanical-pump"){{
shadow = "shadow-round-1";
pumpAmount = 0.1f;
tier = 0;
}};
rotaryPump = new Pump("rotary-pump"){{
shadow = "shadow-rounded-2";
pumpAmount = 0.2f;
consumes.power(0.015f);
liquidCapacity = 30f;
@@ -29,7 +27,6 @@ public class LiquidBlocks extends BlockList implements ContentList{
}};
thermalPump = new Pump("thermal-pump"){{
shadow = "shadow-rounded-2";
pumpAmount = 0.275f;
consumes.power(0.03f);
liquidCapacity = 40f;

View File

@@ -72,7 +72,6 @@ public class PowerBlocks extends BlockList implements ContentList{
}};
powerNode = new PowerNode("power-node"){{
shadow = "shadow-round-1";
maxNodes = 4;
laserRange = 6;
}};
@@ -81,7 +80,6 @@ public class PowerBlocks extends BlockList implements ContentList{
size = 2;
maxNodes = 6;
laserRange = 9.5f;
shadow = "shadow-round-2";
}};
}

View File

@@ -45,7 +45,6 @@ public class UnitBlocks extends BlockList implements ContentList{
produceTime = 3600;
size = 3;
consumes.power(0.2f);
shadow = "shadow-round-3";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)});
}};
@@ -54,7 +53,6 @@ public class UnitBlocks extends BlockList implements ContentList{
produceTime = 8000;
size = 4;
consumes.power(0.3f);
shadow = "shadow-round-4";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 80), new ItemStack(Items.plastanium, 50)});
}};
@@ -71,7 +69,6 @@ public class UnitBlocks extends BlockList implements ContentList{
produceTime = 3400;
size = 3;
consumes.power(0.15f);
shadow = "shadow-round-3";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)});
}};
@@ -80,12 +77,10 @@ public class UnitBlocks extends BlockList implements ContentList{
produceTime = 5000;
size = 3;
consumes.power(0.2f);
shadow = "shadow-round-3";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 40), new ItemStack(Items.thorium, 50)});
}};
repairPoint = new RepairPoint("repair-point"){{
shadow = "shadow-round-1";
repairSpeed = 0.1f;
}};

View File

@@ -37,28 +37,24 @@ public class UpgradeBlocks extends BlockList{
mech = Mechs.dart;
size = 2;
powerCapacity = 50f;
shadow = "shadow-rounded-2";
}};
javelinPad = new MechPad("javelin-ship-pad"){{
mech = Mechs.javelin;
size = 2;
powerCapacity = 80f;
shadow = "shadow-rounded-2";
}};
tridentPad = new MechPad("trident-ship-pad"){{
mech = Mechs.trident;
size = 2;
powerCapacity = 100f;
shadow = "shadow-rounded-2";
}};
glaivePad = new MechPad("glaive-ship-pad"){{
mech = Mechs.glaive;
size = 3;
powerCapacity = 120f;
shadow = "shadow-round-3";
}};
}
}

View File

@@ -117,9 +117,7 @@ public class BlockRenderer{
Team team = tile.getTeam();
if(!expanded && block != Blocks.air && world.isAccessible(x, y)){
tile.block().draw(tile);
//Draw.rect(tile.block().getEditorIcon(), tile.drawx(), tile.drawy());
//tile.block().drawShadow(tile);
tile.block().drawShadow(tile);
}
if(block != Blocks.air){

View File

@@ -87,8 +87,6 @@ public class Block extends BaseBlock {
public EnumSet<BlockFlag> flags;
/** Whether to automatically set the entity to 'sleeping' when created. */
public boolean autoSleep;
/** Name of shadow region to load. Null to indicate normal shadow. */
public String shadow = null;
/** Whether the block can be tapped and selected to configure. */
public boolean configurable;
/** Whether this block consumes touchDown events when tapped. */
@@ -111,7 +109,6 @@ public class Block extends BaseBlock {
protected TextureRegion[] compactIcon;
protected TextureRegion editorIcon;
public TextureRegion shadowRegion;
public TextureRegion region;
public Block(String name){
@@ -260,7 +257,6 @@ public class Block extends BaseBlock {
@Override
public void load(){
shadowRegion = Draw.region(shadow == null ? "shadow-" + size : shadow);
region = Draw.region(name);
}
@@ -516,7 +512,7 @@ public class Block extends BaseBlock {
}
public void drawShadow(Tile tile){
Draw.rect(shadowRegion, tile.drawx(), tile.drawy());
draw(tile);
}
/** Offset for placing and drawing multiblocks. */

View File

@@ -153,16 +153,7 @@ public class BuildBlock extends Block{
@Override
public void drawShadow(Tile tile){
BuildEntity entity = tile.entity();
Recipe recipe = entity.recipe;
Block previous = entity.previous;
if(recipe != null){
Draw.rect(recipe.result.shadowRegion, tile.drawx(), tile.drawy());
}else if(previous != null && !(previous instanceof BuildBlock)){
previous.drawShadow(tile);
}
//don't
}
@Override

View File

@@ -25,15 +25,6 @@ public class Rock extends Block{
}
}
@Override
public void drawShadow(Tile tile){
if(shadowRegions != null){
Draw.rect(shadowRegions[(Mathf.randomSeed(tile.id(), 0, variants - 1))], tile.worldx(), tile.worldy());
}else if(shadowRegion != null){
Draw.rect(shadowRegion, tile.drawx(), tile.drawy());
}
}
@Override
public void load(){
super.load();

View File

@@ -24,7 +24,6 @@ public class ShockMine extends Block{
update = false;
destructible = true;
solid = false;
shadow = "shadow-shock-mine";
targetable = false;
layer = Layer.overlay;
}

View File

@@ -37,17 +37,6 @@ public class Conduit extends LiquidBlock{
}
}
@Override
public void drawShadow(Tile tile){
ConduitEntity entity = tile.entity();
if(entity.blendshadowrot == -1){
super.drawShadow(tile);
}else{
Draw.rect("shadow-corner", tile.drawx(), tile.drawy(), (tile.getRotation() + 3 + entity.blendshadowrot) * 90);
}
}
@Override
public void onProximityUpdate(Tile tile){
super.onProximityUpdate(tile);

View File

@@ -74,23 +74,6 @@ public class Conveyor extends Block{
}
}
@Override
public void drawShadow(Tile tile){
//fixes build block crash
if(!(tile.entity instanceof ConveyorEntity)){
super.drawShadow(tile);
return;
}
ConveyorEntity entity = tile.entity();
if(entity.blendshadowrot == -1){
super.drawShadow(tile);
}else{
Draw.rect("shadow-corner", tile.drawx(), tile.drawy(), (tile.getRotation() + 3 + entity.blendshadowrot) * 90);
}
}
@Override
public void draw(Tile tile){
ConveyorEntity entity = tile.entity();