Rename compression to plastanium

Breaking change.
This commit is contained in:
Patrick 'Quezler' Mounier 2020-01-01 13:43:14 +01:00
parent 8cd03c8a06
commit c3186b63ce
No known key found for this signature in database
GPG Key ID: 0D6CA7326C76D8EA
17 changed files with 933 additions and 935 deletions

View File

@ -931,10 +931,10 @@ block.hail.name = Hail
block.lancer.name = Lancer
block.conveyor.name = Conveyor
block.titanium-conveyor.name = Titanium Conveyor
block.plastanium-conveyor.name = Plastanium Conveyor
block.plastanium-conveyor.description = Employs craters to move items around,\ninput items at the start,\nextract at the end.
block.armored-conveyor.name = Armored Conveyor
block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyor belts.
block.compressed-conveyor.name = Compressed Conveyor
block.compressed-conveyor.description = Employs craters to move items around,\ninput items at the start,\nextract at the end.
block.junction.name = Junction
block.router.name = Router
block.distributor.name = Distributor

Binary file not shown.

Before

Width:  |  Height:  |  Size: 751 B

After

Width:  |  Height:  |  Size: 751 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 961 KiB

After

Width:  |  Height:  |  Size: 960 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 KiB

After

Width:  |  Height:  |  Size: 333 KiB

View File

@ -57,7 +57,7 @@ public class Blocks implements ContentList{
scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
//transport
conveyor, titaniumConveyor, armoredConveyor, compressedConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router, overflowGate, massDriver,
conveyor, titaniumConveyor, plastaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router, overflowGate, massDriver,
//liquids
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
@ -891,18 +891,18 @@ public class Blocks implements ContentList{
speed = 0.08f;
}};
plastaniumConveyor = new PlastaniumConveyor("plastanium-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.surgealloy, 1, Items.phasefabric, 1));
health = 150;
speed = 0f;
}};
armoredConveyor = new ArmoredConveyor("armored-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.thorium, 1, Items.metaglass, 1));
health = 180;
speed = 0.08f;
}};
compressedConveyor = new CompressedConveyor("compressed-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.surgealloy, 1, Items.phasefabric, 1));
health = 150;
speed = 0f;
}};
junction = new Junction("junction"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 2), true);
speed = 26;

View File

@ -49,11 +49,11 @@ public class TechTree implements ContentList{
});
});
node(armoredConveyor, () -> {
node(plastaniumConveyor, () -> {
});
node(compressedConveyor, () -> {
node(armoredConveyor, () -> {
});
});

View File

@ -14,7 +14,7 @@ import arc.scene.ui.layout.*;
import mindustry.entities.units.*;
import mindustry.game.EventType.*;
import mindustry.entities.Effects.*;
import mindustry.world.blocks.distribution.CompressedConveyor.*;
import mindustry.world.blocks.distribution.PlastaniumConveyor.*;
import static mindustry.Vars.*;

View File

@ -6,21 +6,19 @@ import arc.struct.*;
import mindustry.type.*;
import mindustry.world.*;
import arc.graphics.g2d.*;
import mindustry.content.*;
import mindustry.entities.type.*;
import mindustry.game.EventType.*;
import mindustry.entities.type.base.*;
public class CompressedConveyor extends ArmoredConveyor{
public class PlastaniumConveyor extends ArmoredConveyor{
protected TextureRegion start;
public TextureRegion end;
protected static int cooldown = 4; // ticks it needs to wait with spawning when a ground unit has walked on it
public CompressedConveyor(String name){
public PlastaniumConveyor(String name){
super(name);
compressable = true;
entityType = CompressedConveyorEntity::new;
entityType = PlastaniumConveyorEntity::new;
}
@Override
@ -48,25 +46,25 @@ public class CompressedConveyor extends ArmoredConveyor{
@Override
public void unitOn(Tile tile, Unit unit){ // resets the spawner cooldown, as well as adopting stray roomba's
CompressedConveyorEntity entity = tile.ent();
PlastaniumConveyorEntity entity = tile.ent();
if(unit instanceof CraterUnit) entity.crater = (CraterUnit)unit;
entity.reload = cooldown;
}
@Override
public void update(Tile tile){ // tick away the cooldown
CompressedConveyorEntity entity = tile.ent();
PlastaniumConveyorEntity entity = tile.ent();
if(entity.reload > 0) entity.reload--;
}
class CompressedConveyorEntity extends ConveyorEntity{
class PlastaniumConveyorEntity extends ConveyorEntity{
public int reload = 0;
public CraterUnit crater = null;
}
@Override
public boolean acceptItem(Item item, Tile tile, Tile source){ // summon craters into existence to be loaded
CompressedConveyorEntity entity = tile.ent();
PlastaniumConveyorEntity entity = tile.ent();
if(!Track.start.check.get(tile)) return false;
if(entity.crater == null || entity.crater.dead || !entity.crater.loading() || entity.crater.on() != tile){
@ -80,7 +78,7 @@ public class CompressedConveyor extends ArmoredConveyor{
@Override
public void handleItem(Item item, Tile tile, Tile source){
((CompressedConveyorEntity)tile.ent()).crater.handleItem(item);
((PlastaniumConveyorEntity)tile.ent()).crater.handleItem(item);
}
@Override