mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-02-03 04:44:24 +07:00
Bugfixes
This commit is contained in:
parent
56bcabedf7
commit
66c27fab13
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 273 B |
Before Width: | Height: | Size: 112 B After Width: | Height: | Size: 112 B |
@ -368,7 +368,7 @@ junction
|
||||
orig: 32, 32
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
mass-driver
|
||||
mass-driver-base
|
||||
rotate: false
|
||||
xy: 1359, 1494
|
||||
size: 96, 96
|
||||
@ -2615,7 +2615,7 @@ phantom-factory-top-open
|
||||
orig: 64, 64
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
repair-point
|
||||
repair-point-base
|
||||
rotate: false
|
||||
xy: 1949, 544
|
||||
size: 32, 32
|
||||
|
@ -432,7 +432,7 @@ public class Blocks implements ContentList{
|
||||
requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.lead, 70, Items.graphite, 90));
|
||||
health = 200;
|
||||
outputLiquid = Liquids.slag;
|
||||
outputLiquidAmount = 1.5f;
|
||||
outputLiquidAmount = 2f;
|
||||
craftTime = 10f;
|
||||
hasLiquids = hasPower = true;
|
||||
|
||||
@ -630,21 +630,21 @@ public class Blocks implements ContentList{
|
||||
}};
|
||||
|
||||
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);
|
||||
size = 2;
|
||||
consumes.item(Items.phasefabric).optional(true);
|
||||
}};
|
||||
|
||||
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);
|
||||
size = 2;
|
||||
consumes.item(Items.phasefabric).optional(true).boost(true);
|
||||
}};
|
||||
|
||||
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;
|
||||
consumes.item(Items.phasefabric).optional(true).boost(true);
|
||||
}};
|
||||
|
@ -20,4 +20,12 @@ public class ItemStack{
|
||||
}
|
||||
return stacks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(){
|
||||
return "ItemStack{" +
|
||||
"item=" + item +
|
||||
", amount=" + amount +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
@ -48,7 +48,7 @@ public class MassDriver extends Block{
|
||||
protected Effect recieveEffect = Fx.mineBig;
|
||||
protected float shake = 3f;
|
||||
protected float powerPercentageUsed = 0.95f;
|
||||
protected TextureRegion turretRegion;
|
||||
protected TextureRegion baseRegion;
|
||||
|
||||
public MassDriver(String name){
|
||||
super(name);
|
||||
@ -111,14 +111,14 @@ public class MassDriver extends Block{
|
||||
|
||||
@Override
|
||||
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
|
||||
public void load(){
|
||||
super.load();
|
||||
|
||||
turretRegion = Core.atlas.find(name);
|
||||
baseRegion = Core.atlas.find(name + "-base");
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -178,11 +178,16 @@ public class MassDriver extends Block{
|
||||
entity.waiting.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(Tile tile){
|
||||
Draw.rect(baseRegion, tile.drawx(), tile.drawy());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawLayer(Tile tile){
|
||||
MassDriverEntity entity = tile.entity();
|
||||
|
||||
Draw.rect(turretRegion,
|
||||
Draw.rect(region,
|
||||
tile.drawx() + Angles.trnsx(entity.rotation + 180f, entity.reload * knockback),
|
||||
tile.drawy() + Angles.trnsy(entity.rotation + 180f, entity.reload * knockback), entity.rotation - 90);
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ public class RepairPoint extends Block{
|
||||
protected float powerPerEvent = 0.06f;
|
||||
protected ConsumePower consumePower;
|
||||
|
||||
protected TextureRegion topRegion;
|
||||
protected TextureRegion baseRegion;
|
||||
|
||||
public RepairPoint(String name){
|
||||
super(name);
|
||||
@ -51,7 +51,7 @@ public class RepairPoint extends Block{
|
||||
public void load(){
|
||||
super.load();
|
||||
|
||||
topRegion = Core.atlas.find(name);
|
||||
baseRegion = Core.atlas.find(name + "-base");
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -67,11 +67,16 @@ public class RepairPoint extends Block{
|
||||
Draw.color();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(Tile tile){
|
||||
Draw.rect(baseRegion, tile.drawx(), tile.drawy());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawLayer(Tile tile){
|
||||
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
|
||||
@ -93,7 +98,7 @@ public class RepairPoint extends Block{
|
||||
|
||||
@Override
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user