This commit is contained in:
Anuken
2019-02-08 08:44:20 -05:00
parent 56bcabedf7
commit 66c27fab13
7 changed files with 32 additions and 14 deletions

View File

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 273 B

View File

Before

Width:  |  Height:  |  Size: 112 B

After

Width:  |  Height:  |  Size: 112 B

View File

@ -368,7 +368,7 @@ junction
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
mass-driver mass-driver-base
rotate: false rotate: false
xy: 1359, 1494 xy: 1359, 1494
size: 96, 96 size: 96, 96
@ -2615,7 +2615,7 @@ phantom-factory-top-open
orig: 64, 64 orig: 64, 64
offset: 0, 0 offset: 0, 0
index: -1 index: -1
repair-point repair-point-base
rotate: false rotate: false
xy: 1949, 544 xy: 1949, 544
size: 32, 32 size: 32, 32

View File

@ -432,7 +432,7 @@ public class Blocks implements ContentList{
requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.lead, 70, Items.graphite, 90)); requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.lead, 70, Items.graphite, 90));
health = 200; health = 200;
outputLiquid = Liquids.slag; outputLiquid = Liquids.slag;
outputLiquidAmount = 1.5f; outputLiquidAmount = 2f;
craftTime = 10f; craftTime = 10f;
hasLiquids = hasPower = true; hasLiquids = hasPower = true;
@ -630,21 +630,21 @@ public class Blocks implements ContentList{
}}; }};
mendProjector = new MendProjector("mend-projector"){{ mendProjector = new MendProjector("mend-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.titanium, 50, Items.silicon, 180)); requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 50, Items.silicon, 180));
consumes.power(2f); consumes.power(2f);
size = 2; size = 2;
consumes.item(Items.phasefabric).optional(true); consumes.item(Items.phasefabric).optional(true);
}}; }};
overdriveProjector = new OverdriveProjector("overdrive-projector"){{ overdriveProjector = new OverdriveProjector("overdrive-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.titanium, 150, Items.silicon, 250)); requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.silicon, 250));
consumes.power(3.50f); consumes.power(3.50f);
size = 2; size = 2;
consumes.item(Items.phasefabric).optional(true).boost(true); consumes.item(Items.phasefabric).optional(true).boost(true);
}}; }};
forceProjector = new ForceProjector("force-projector"){{ forceProjector = new ForceProjector("force-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.titanium, 150, Items.silicon, 250)); requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 150, Items.silicon, 250));
size = 3; size = 3;
consumes.item(Items.phasefabric).optional(true).boost(true); consumes.item(Items.phasefabric).optional(true).boost(true);
}}; }};

View File

@ -20,4 +20,12 @@ public class ItemStack{
} }
return stacks; return stacks;
} }
@Override
public String toString(){
return "ItemStack{" +
"item=" + item +
", amount=" + amount +
'}';
}
} }

View File

@ -48,7 +48,7 @@ public class MassDriver extends Block{
protected Effect recieveEffect = Fx.mineBig; protected Effect recieveEffect = Fx.mineBig;
protected float shake = 3f; protected float shake = 3f;
protected float powerPercentageUsed = 0.95f; protected float powerPercentageUsed = 0.95f;
protected TextureRegion turretRegion; protected TextureRegion baseRegion;
public MassDriver(String name){ public MassDriver(String name){
super(name); super(name);
@ -111,14 +111,14 @@ public class MassDriver extends Block{
@Override @Override
public TextureRegion[] generateIcons(){ public TextureRegion[] generateIcons(){
return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-turret")}; return new TextureRegion[]{Core.atlas.find(name + "-base"), Core.atlas.find(name + "-turret")};
} }
@Override @Override
public void load(){ public void load(){
super.load(); super.load();
turretRegion = Core.atlas.find(name); baseRegion = Core.atlas.find(name + "-base");
} }
@Override @Override
@ -178,11 +178,16 @@ public class MassDriver extends Block{
entity.waiting.clear(); entity.waiting.clear();
} }
@Override
public void draw(Tile tile){
Draw.rect(baseRegion, tile.drawx(), tile.drawy());
}
@Override @Override
public void drawLayer(Tile tile){ public void drawLayer(Tile tile){
MassDriverEntity entity = tile.entity(); MassDriverEntity entity = tile.entity();
Draw.rect(turretRegion, Draw.rect(region,
tile.drawx() + Angles.trnsx(entity.rotation + 180f, entity.reload * knockback), tile.drawx() + Angles.trnsx(entity.rotation + 180f, entity.reload * knockback),
tile.drawy() + Angles.trnsy(entity.rotation + 180f, entity.reload * knockback), entity.rotation - 90); tile.drawy() + Angles.trnsy(entity.rotation + 180f, entity.reload * knockback), entity.rotation - 90);
} }

View File

@ -33,7 +33,7 @@ public class RepairPoint extends Block{
protected float powerPerEvent = 0.06f; protected float powerPerEvent = 0.06f;
protected ConsumePower consumePower; protected ConsumePower consumePower;
protected TextureRegion topRegion; protected TextureRegion baseRegion;
public RepairPoint(String name){ public RepairPoint(String name){
super(name); super(name);
@ -51,7 +51,7 @@ public class RepairPoint extends Block{
public void load(){ public void load(){
super.load(); super.load();
topRegion = Core.atlas.find(name); baseRegion = Core.atlas.find(name + "-base");
} }
@Override @Override
@ -67,11 +67,16 @@ public class RepairPoint extends Block{
Draw.color(); Draw.color();
} }
@Override
public void draw(Tile tile){
Draw.rect(baseRegion, tile.drawx(), tile.drawy());
}
@Override @Override
public void drawLayer(Tile tile){ public void drawLayer(Tile tile){
RepairPointEntity entity = tile.entity(); RepairPointEntity entity = tile.entity();
Draw.rect(topRegion, tile.drawx(), tile.drawy(), entity.rotation - 90); Draw.rect(region, tile.drawx(), tile.drawy(), entity.rotation - 90);
} }
@Override @Override
@ -93,7 +98,7 @@ public class RepairPoint extends Block{
@Override @Override
public TextureRegion[] generateIcons(){ public TextureRegion[] generateIcons(){
return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-turret")}; return new TextureRegion[]{Core.atlas.find(name + "-base"), Core.atlas.find(name + "-turret")};
} }
@Override @Override