Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handled compiler errors by either resolving them or commenting & adding a TODO

Browse Source
This commit is contained in:
Timmeey86
2018-11-20 22:33:36 +01:00
parent c1bb05c0a4
commit f561768c67
30 changed files with 174 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@@ -38,7 +38,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
fluxNeeded = 2;
consumes.items(new ItemStack[]{new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)});
consumes.power(0.1f);
basePowerUse = 0.1f;
}};
siliconsmelter = new PowerSmelter("silicon-smelter"){{
@@ -46,13 +46,12 @@ public class CraftingBlocks extends BlockList implements ContentList{
craftEffect = BlockFx.smeltsmoke;
result = Items.silicon;
craftTime = 40f;
powerCapacity = 20f;
size = 2;
hasLiquids = false;
flameColor = Color.valueOf("ffef99");
consumes.items(new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.sand, 2)});
consumes.power(0.05f);
basePowerUse = 0.05f;
}};
plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{
@@ -61,7 +60,6 @@ public class CraftingBlocks extends BlockList implements ContentList{
craftTime = 60f;
output = Items.plastanium;
itemCapacity = 30;
powerCapacity = 40f;
size = 2;
health = 320;
hasPower = hasLiquids = true;
@@ -69,7 +67,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
updateEffect = BlockFx.plasticburn;
consumes.liquid(Liquids.oil, 0.25f);
consumes.power(0.3f);
basePowerUse = 0.3f;
consumes.item(Items.titanium, 2);
}};
@@ -77,24 +75,22 @@ public class CraftingBlocks extends BlockList implements ContentList{
craftEffect = BlockFx.smeltsmoke;
result = Items.phasefabric;
craftTime = 120f;
powerCapacity = 50f;
size = 2;
consumes.items(new ItemStack[]{new ItemStack(Items.thorium, 4), new ItemStack(Items.sand, 10)});
consumes.power(0.5f);
basePowerUse = 0.5f;
}};
alloySmelter = new PowerSmelter("alloy-smelter"){{
craftEffect = BlockFx.smeltsmoke;
result = Items.surgealloy;
craftTime = 75f;
powerCapacity = 60f;
size = 2;
useFlux = true;
fluxNeeded = 3;
consumes.power(0.4f);
basePowerUse = 0.4f;
consumes.items(new ItemStack[]{new ItemStack(Items.titanium, 2), new ItemStack(Items.lead, 4), new ItemStack(Items.silicon, 3), new ItemStack(Items.copper, 3)});
}};
@@ -105,7 +101,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
size = 2;
hasPower = true;
consumes.power(0.1f);
basePowerUse = 0.1f;
consumes.item(Items.titanium);
consumes.liquid(Liquids.water, 0.3f);
}};
@@ -120,7 +116,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
consumes.liquid(Liquids.oil, 0.05f);
consumes.item(Items.pyratite, 1);
consumes.power(0.04f);
basePowerUse = 0.04f;
}};
pyratiteMixer = new PowerSmelter("pyratite-mixer"){{
@@ -132,7 +128,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
size = 2;
consumes.power(0.02f);
basePowerUse = 0.02f;
consumes.items(new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.lead, 2), new ItemStack(Items.sand, 2)});
}};
@@ -144,7 +140,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
craftTime = 10f;
hasLiquids = hasPower = true;
consumes.power(0.1f);
basePowerUse = 0.1f;
consumes.item(Items.stone, 2);
}};
@@ -189,7 +185,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
size = 2;
consumes.item(Items.stone, 2);
consumes.power(0.2f);
basePowerUse = 0.2f;
consumes.liquid(Liquids.water, 0.5f);
}};
@@ -204,7 +200,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
hasLiquids = true;
consumes.item(Items.biomatter, 1);
consumes.power(0.06f);
basePowerUse = 0.06f;
}};
pulverizer = new Pulverizer("pulverizer"){{
@@ -217,7 +213,7 @@ public class CraftingBlocks extends BlockList implements ContentList{
hasItems = hasPower = true;
consumes.item(Items.stone, 1);
consumes.power(0.05f);
basePowerUse = 0.05f;
}};
solidifier = new GenericCrafter("solidifer"){{

13
core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
View File

@@ -40,7 +40,8 @@ public class DebugBlocks extends BlockList implements ContentList{
public void load(){
powerVoid = new PowerBlock("powervoid"){
{
powerCapacity = Float.MAX_VALUE;
// TODO Adapt to new power system if necessary
basePowerUse = Float.MAX_VALUE;
shadow = "shadow-round-1";
}
@@ -53,23 +54,23 @@ public class DebugBlocks extends BlockList implements ContentList{
@Override
public void init(){
super.init();
stats.remove(BlockStat.powerCapacity);
// TODO Adapt to new power system if necessary
//stats.remove(BlockStat.powerCapacity);
}
};
powerInfinite = new PowerNode("powerinfinite"){
{
powerCapacity = 10000f;
maxNodes = 100;
outputsPower = true;
consumesPower = false;
shadow = "shadow-round-1";
}
// TODO Adapt to new power system if necessary
@Override
public void update(Tile tile){
super.update(tile);
tile.entity.power.amount = powerCapacity;
public float getPowerProduction(Tile tile){
return 10000f;
}
};

6
core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
View File

@@ -71,19 +71,19 @@ public class DefenseBlocks extends BlockList implements ContentList{
}};
mendProjector = new MendProjector("mend-projector"){{
consumes.power(0.2f);
basePowerUse = 0.2f;
size = 2;
consumes.item(Items.phasefabric).optional(true);
}};
overdriveProjector = new OverdriveProjector("overdrive-projector"){{
consumes.power(0.35f);
basePowerUse = 0.35f;
size = 2;
consumes.item(Items.phasefabric).optional(true);
}};
forceProjector = new ForceProjector("force-projector"){{
consumes.power(0.2f);
basePowerUse = 0.2f;
size = 3;
consumes.item(Items.phasefabric).optional(true);
}};

2
core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java
View File

@@ -35,7 +35,7 @@ public class DistributionBlocks extends BlockList implements ContentList{
phaseConveyor = new ItemBridge("phase-conveyor"){{
range = 11;
hasPower = true;
consumes.power(0.05f);
basePowerUse = 0.05f;
}};
sorter = new Sorter("sorter");

12
core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
View File

@@ -20,9 +20,10 @@ public class LiquidBlocks extends BlockList implements ContentList{
rotaryPump = new Pump("rotary-pump"){{
shadow = "shadow-rounded-2";
pumpAmount = 0.2f;
consumes.power(0.015f);
basePowerUse = 0.015f;
liquidCapacity = 30f;
powerCapacity = 20f;
// TODO Verify: No longer buffered
basePowerUse = 20f / 60f;
hasPower = true;
size = 2;
tier = 1;
@@ -31,10 +32,11 @@ public class LiquidBlocks extends BlockList implements ContentList{
thermalPump = new Pump("thermal-pump"){{
shadow = "shadow-rounded-2";
pumpAmount = 0.275f;
consumes.power(0.03f);
basePowerUse = 0.03f;
liquidCapacity = 40f;
hasPower = true;
powerCapacity = 20f;
// TODO Verify: No longer buffered
basePowerUse = 20f / 60f;
size = 2;
tier = 2;
}};
@@ -69,7 +71,7 @@ public class LiquidBlocks extends BlockList implements ContentList{
phaseConduit = new LiquidBridge("phase-conduit"){{
range = 11;
hasPower = true;
consumes.power(0.05f);
basePowerUse = 0.05f;
}};
}
}

23
core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
View File

@@ -13,41 +13,40 @@ public class PowerBlocks extends BlockList implements ContentList{
@Override
public void load(){
combustionGenerator = new BurnerGenerator("combustion-generator"){{
powerOutput = 0.09f;
powerCapacity = 40f;
powerProduction = 0.09f;
itemDuration = 40f;
}};
thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{
maxLiquidGenerate = 4f;
powerCapacity = 40f;
// TODO: Adapt to new power system
powerProduction = -1;
powerPerLiquid = 0.1f;
generateEffect = BlockFx.redgeneratespark;
size = 2;
}};
turbineGenerator = new TurbineGenerator("turbine-generator"){{
powerOutput = 0.28f;
powerCapacity = 40f;
// TODO: Adapt to new power system
powerProduction = 0.28f;
powerPerLiquid = 0.1f;
itemDuration = 30f;
powerPerLiquid = 0.7f;
consumes.liquid(Liquids.water, 0.05f);
size = 2;
}};
rtgGenerator = new DecayGenerator("rtg-generator"){{
powerCapacity = 40f;
size = 2;
powerOutput = 0.3f;
powerProduction = 0.3f;
itemDuration = 220f;
}};
solarPanel = new PowerGenerator("solar-panel"){{
powerGeneration = 0.0045f;
powerProduction = 0.0045f;
}};
largeSolarPanel = new PowerGenerator("solar-panel-large"){{
powerGeneration = 0.055f;
powerProduction = 0.055f;
size = 3;
}};
@@ -63,12 +62,12 @@ public class PowerBlocks extends BlockList implements ContentList{
}};
battery = new Battery("battery"){{
powerCapacity = 320f;
basePowerUse = 320f;
}};
batteryLarge = new Battery("battery-large"){{
size = 3;
powerCapacity = 2000f;
basePowerUse = 2000f;
}};
powerNode = new PowerNode("power-node"){{

12
core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java
View File

@@ -38,7 +38,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
updateEffect = BlockFx.pulverizeMedium;
drillEffect = BlockFx.mineBig;
consumes.power(0.11f);
basePowerUse = 0.11f;
}};
blastDrill = new Drill("blast-drill"){{
@@ -53,7 +53,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
rotateSpeed = 6f;
warmupSpeed = 0.01f;
consumes.power(0.3f);
basePowerUse = 0.3f;
}};
plasmaDrill = new Drill("plasma-drill"){{
@@ -70,7 +70,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
drillEffect = BlockFx.mineHuge;
warmupSpeed = 0.005f;
consumes.power(0.7f);
basePowerUse = 0.7f;
}};
waterExtractor = new SolidPump("water-extractor"){{
@@ -80,7 +80,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
liquidCapacity = 30f;
rotateSpeed = 1.4f;
consumes.power(0.09f);
basePowerUse = 0.09f;
}};
oilExtractor = new Fracker("oil-extractor"){{
@@ -93,7 +93,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
liquidCapacity = 30f;
consumes.item(Items.sand);
consumes.power(0.3f);
basePowerUse = 0.3f;
consumes.liquid(Liquids.water, 0.15f);
}};
@@ -104,7 +104,7 @@ public class ProductionBlocks extends BlockList implements ContentList{
hasLiquids = true;
hasPower = true;
consumes.power(0.08f);
basePowerUse = 0.08f;
consumes.liquid(Liquids.water, 0.2f);
}};

12
core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
View File

@@ -102,8 +102,8 @@ public class TurretBlocks extends BlockList implements ContentList{
recoil = 2f;
reload = 100f;
cooldown = 0.03f;
powerUsed = 20f;
powerCapacity = 60f;
powerUsed = 1 / 3f;
basePowerUse = 60f; // capacity
shootShake = 2f;
shootEffect = ShootFx.lancerLaserShoot;
smokeEffect = ShootFx.lancerLaserShootSmoke;
@@ -121,8 +121,8 @@ public class TurretBlocks extends BlockList implements ContentList{
shootShake = 1f;
shootCone = 40f;
rotatespeed = 8f;
powerUsed = 7f;
powerCapacity = 30f;
powerUsed = 7 / 30f;
basePowerUse = 30f; // capacity
range = 150f;
shootEffect = ShootFx.lightningShoot;
heatColor = Color.RED;
@@ -255,8 +255,8 @@ public class TurretBlocks extends BlockList implements ContentList{
recoil = 4f;
size = 4;
shootShake = 2f;
powerUsed = 60f;
powerCapacity = 120f;
powerUsed = 0.5f;
basePowerUse = 120f; // capacity
range = 160f;
reload = 200f;
firingMoveFract = 0.1f;

16
core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java
View File

@@ -20,7 +20,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.spirit;
produceTime = 5700;
size = 2;
consumes.power(0.08f);
basePowerUse = 0.08f;
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)});
}};
@@ -28,7 +28,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.phantom;
produceTime = 7300;
size = 2;
consumes.power(0.2f);
basePowerUse = 0.2f;
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)});
}};
@@ -36,7 +36,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.wraith;
produceTime = 1800;
size = 2;
consumes.power(0.1f);
basePowerUse = 0.1f;
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)});
}};
@@ -44,7 +44,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.ghoul;
produceTime = 3600;
size = 3;
consumes.power(0.2f);
basePowerUse = 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)});
}};
@@ -53,7 +53,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.revenant;
produceTime = 8000;
size = 4;
consumes.power(0.3f);
basePowerUse = 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)});
}};
@@ -62,7 +62,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.dagger;
produceTime = 1700;
size = 2;
consumes.power(0.05f);
basePowerUse = 0.05f;
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10)});
}};
@@ -70,7 +70,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.titan;
produceTime = 3400;
size = 3;
consumes.power(0.15f);
basePowerUse = 0.15f;
shadow = "shadow-round-3";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)});
}};
@@ -79,7 +79,7 @@ public class UnitBlocks extends BlockList implements ContentList{
type = UnitTypes.fortress;
produceTime = 5000;
size = 3;
consumes.power(0.2f);
basePowerUse = 0.2f;
shadow = "shadow-round-3";
consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 40), new ItemStack(Items.thorium, 50)});
}};

18
core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java
View File

@@ -9,55 +9,57 @@ public class UpgradeBlocks extends BlockList{
@Override
public void load(){
// Note: MechPads are buffered; all basePowerUse values represent total capacity
alphaPad = new MechPad("alpha-mech-pad"){{
mech = Mechs.alpha;
size = 2;
powerCapacity = 50f;
basePowerUse = 50f;
}};
deltaPad = new MechPad("delta-mech-pad"){{
mech = Mechs.delta;
size = 2;
powerCapacity = 70f;
basePowerUse = 70f;
}};
tauPad = new MechPad("tau-mech-pad"){{
mech = Mechs.tau;
size = 2;
powerCapacity = 100f;
basePowerUse = 100f;
}};
omegaPad = new MechPad("omega-mech-pad"){{
mech = Mechs.omega;
size = 3;
powerCapacity = 120f;
basePowerUse = 120f;
}};
dartPad = new MechPad("dart-ship-pad"){{
mech = Mechs.dart;
size = 2;
powerCapacity = 50f;
basePowerUse = 50f;
shadow = "shadow-rounded-2";
}};
javelinPad = new MechPad("javelin-ship-pad"){{
mech = Mechs.javelin;
size = 2;
powerCapacity = 80f;
basePowerUse = 80f;
shadow = "shadow-rounded-2";
}};
tridentPad = new MechPad("trident-ship-pad"){{
mech = Mechs.trident;
size = 2;
powerCapacity = 100f;
basePowerUse = 100f;
shadow = "shadow-rounded-2";
}};
glaivePad = new MechPad("glaive-ship-pad"){{
mech = Mechs.glaive;
size = 3;
powerCapacity = 120f;
basePowerUse = 120f;
shadow = "shadow-round-3";
}};
}

6
core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
View File

@@ -25,7 +25,6 @@ import io.anuke.mindustry.world.blocks.defense.turrets.PowerTurret;
import io.anuke.mindustry.world.blocks.defense.turrets.Turret;
import io.anuke.mindustry.world.blocks.power.NuclearReactor;
import io.anuke.mindustry.world.blocks.power.PowerGenerator;
import io.anuke.mindustry.world.blocks.power.SolarGenerator;
import io.anuke.mindustry.world.blocks.storage.CoreBlock;
import io.anuke.mindustry.world.blocks.storage.StorageBlock;
import io.anuke.mindustry.world.blocks.units.UnitFactory;
@@ -115,7 +114,8 @@ public class FortressGenerator{
seeder.get(PowerBlocks.solarPanel, tile -> tile.block() == PowerBlocks.largeSolarPanel && gen.random.chance(0.3)),
//coal gens
seeder.get(PowerBlocks.combustionGenerator, tile -> tile.block() instanceof SolarGenerator && gen.random.chance(0.2)),
// TODO Verify - This used to be solar panel
seeder.get(PowerBlocks.combustionGenerator, tile -> tile.block() instanceof PowerGenerator && gen.random.chance(0.2)),
//water extractors
seeder.get(ProductionBlocks.waterExtractor, tile -> tile.block() instanceof NuclearReactor && gen.random.chance(0.5)),
@@ -181,7 +181,7 @@ public class FortressGenerator{
Block block = tile.block();
if(block instanceof PowerTurret){
tile.entity.power.amount = block.powerCapacity;
tile.entity.power.satisfaction = 1.0f;
}else if(block instanceof ItemTurret){
ItemTurret turret = (ItemTurret)block;
AmmoType[] type = turret.getAmmoTypes();

3
core/src/io/anuke/mindustry/world/BaseBlock.java
View File

@@ -29,6 +29,9 @@ public abstract class BaseBlock extends MappableContent{
public boolean outputsPower;
public boolean bufferedPowerConsumer = false;
/** In case of unbuffered consumers, this stores the amount of power which is required per tick in order to work at maximum efficiency.
* In case of buffered consumers, this stores the maximum power capacity.
*/
public float basePowerUse = 0;
public int itemCapacity;

10
core/src/io/anuke/mindustry/world/Block.java
View File

@@ -331,8 +331,8 @@ public class Block extends BaseBlock {
consumes.forEach(cons -> cons.display(stats));
if(hasPower){
if(bufferedPowerConsumer) stats.add(BlockStat.powerUse, basePowerUse, StatUnit.powerUnits);
else stats.add(BlockStat.powerCapacity, basePowerUse, StatUnit.powerUnits);
if(bufferedPowerConsumer) stats.add(BlockStat.powerCapacity, basePowerUse, StatUnit.powerUnits);
else stats.add(BlockStat.powerUse, basePowerUse * 60, StatUnit.powerUnits);
}
if(hasLiquids) stats.add(BlockStat.liquidCapacity, liquidCapacity, StatUnit.liquidUnits);
if(hasItems) stats.add(BlockStat.itemCapacity, itemCapacity, StatUnit.items);
@@ -340,7 +340,7 @@ public class Block extends BaseBlock {
//TODO make this easier to config.
public void setBars(){
if(hasPower) bars.add(new BlockBar(BarType.power, true, tile -> tile.entity.power.amount / powerCapacity));
if(bufferedPowerConsumer) bars.add(new BlockBar(BarType.power, true, tile -> tile.entity.power.satisfaction));
if(hasLiquids)
bars.add(new BlockBar(BarType.liquid, true, tile -> tile.entity.liquids.total() / liquidCapacity));
if(hasItems)
@@ -406,8 +406,8 @@ public class Block extends BaseBlock {
explosiveness += tile.entity.liquids.sum((liquid, amount) -> liquid.flammability * amount / 2f);
}
if(hasPower){
power += tile.entity.power.amount;
if(bufferedPowerConsumer){
power += tile.entity.power.satisfaction * tile.block().basePowerUse;
}
tempColor.mul(1f / units);

18
core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -51,7 +51,7 @@ public class ForceProjector extends Block {
hasPower = true;
canOverdrive = false;
hasLiquids = true;
powerCapacity = 60f;
basePowerUse = 60f;
hasItems = true;
itemCapacity = 10;
consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.1f)).optional(true).update(false);
@@ -106,8 +106,9 @@ public class ForceProjector extends Block {
}
}else{
entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.1f);
float powerUse = Math.min(powerDamage * entity.delta() * (1f + entity.buildup / breakage), powerCapacity);
entity.power.amount -= powerUse;
// TODO Adapt power calculations to new power system
// float powerUse = Math.min(powerDamage * entity.delta() * (1f + entity.buildup / breakage), powerCapacity);
// entity.power.amount -= powerUse;
}
if(entity.buildup > 0){
@@ -144,11 +145,12 @@ public class ForceProjector extends Block {
Effects.effect(BulletFx.absorb, trait);
float hit = trait.getShieldDamage()*powerDamage;
entity.hit = 1f;
entity.power.amount -= Math.min(hit, entity.power.amount);
if(entity.power.amount <= 0.0001f){
entity.buildup += trait.getShieldDamage() * entity.warmup*2f;
}
// TODO Adapt power calculations to new power system
// entity.power.amount -= Math.min(hit, entity.power.amount);
//
// if(entity.power.amount <= 0.0001f){
// entity.buildup += trait.getShieldDamage() * entity.warmup*2f;
// }
entity.buildup += trait.getShieldDamage() * entity.warmup;
}
});

10
core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java
View File

@@ -6,12 +6,15 @@ import io.anuke.mindustry.world.meta.BlockStat;
import io.anuke.mindustry.world.meta.StatUnit;
public abstract class PowerTurret extends CooledTurret{
/** The percentage of power which will be used per shot. */
protected float powerUsed = 0.5f;
protected AmmoType shootType;
public PowerTurret(String name){
super(name);
hasPower = true;
// TODO Verify for new power system
bufferedPowerConsumer = true;
}
@Override
@@ -23,13 +26,16 @@ public abstract class PowerTurret extends CooledTurret{
@Override
public boolean hasAmmo(Tile tile){
return tile.entity.power.amount >= powerUsed;
// TODO Verify for new power system
// Allow shooting as long as the turret is at least at 50% power
return tile.entity.power.satisfaction >= powerUsed;
}
@Override
public AmmoType useAmmo(Tile tile){
if(tile.isEnemyCheat()) return shootType;
tile.entity.power.amount -= powerUsed;
// Make sure that power can not go negative in case of threading issues or similar
tile.entity.power.satisfaction -= Math.min(powerUsed, tile.entity.power.satisfaction);
return shootType;
}

9
core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -36,6 +36,7 @@ import java.io.IOException;
import static io.anuke.mindustry.Vars.*;
// TODO Adapt whole class to new power system
public class MassDriver extends Block{
protected float range;
protected float rotateSpeed = 0.04f;
@@ -78,7 +79,8 @@ public class MassDriver extends Block{
MassDriverEntity other = target.entity();
entity.reload = 1f;
entity.power.amount = 0f;
entity.power.satisfaction = 0f;
DriverBulletData data = Pooling.obtain(DriverBulletData.class, DriverBulletData::new);
data.from = entity;
@@ -126,7 +128,7 @@ public class MassDriver extends Block{
public void setStats(){
super.setStats();
stats.add(BlockStat.powerShot, powerCapacity, StatUnit.powerUnits);
stats.add(BlockStat.powerShot, basePowerUse, StatUnit.powerUnits);
}
@Override
@@ -166,7 +168,8 @@ public class MassDriver extends Block{
entity.rotation = Mathf.slerpDelta(entity.rotation, tile.angleTo(waiter), rotateSpeed);
}else if(tile.entity.items.total() >= minDistribute &&
linkValid(tile) && //only fire when at least at half-capacity and power
tile.entity.power.amount >= powerCapacity * 0.8f &&
// TODO adapt
//tile.entity.power.amount >= powerCapacity * 0.8f &&
link.block().itemCapacity - link.entity.items.total() >= minDistribute && entity.reload <= 0.0001f){
MassDriverEntity other = link.entity();

10
core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java
View File

@@ -24,7 +24,8 @@ public class FusionReactor extends PowerGenerator{
super(name);
hasPower = true;
hasLiquids = true;
powerCapacity = 100f;
// TODO Adapt to new power system
//powerCapacity = 100f;
liquidCapacity = 30f;
hasItems = true;
}
@@ -33,6 +34,8 @@ public class FusionReactor extends PowerGenerator{
public void setStats(){
super.setStats();
// TODO Verify for new power system
stats.remove(BlockStat.basePowerGeneration);
stats.add(BlockStat.basePowerGeneration, maxPowerProduced * 60f, StatUnit.powerSecond);
}
@@ -46,8 +49,9 @@ public class FusionReactor extends PowerGenerator{
entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, 0.01f);
}
float powerAdded = Math.min(powerCapacity - entity.power.amount, maxPowerProduced * Mathf.pow(entity.warmup, 4f) * Timers.delta());
entity.power.amount += powerAdded;
// TODO Adapt to new power system
//float powerAdded = Math.min(powerCapacity - entity.power.amount, maxPowerProduced * Mathf.pow(entity.warmup, 4f) * Timers.delta());
//entity.power.amount += powerAdded;
entity.totalProgress += entity.warmup * Timers.delta();
tile.entity.power.graph.update();

15
core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
View File

@@ -51,29 +51,34 @@ public abstract class ItemLiquidGenerator extends ItemGenerator{
if(liquid != null && entity.liquids.get(liquid) >= 0.001f && entity.cons.valid()){
float powerPerLiquid = getLiquidEfficiency(liquid) * this.powerPerLiquid;
float used = Math.min(entity.liquids.get(liquid), maxLiquidGenerate * entity.delta());
used = Math.min(used, (powerCapacity - entity.power.amount) / powerPerLiquid);
// TODO: Adapt to new power system
//used = Math.min(used, (powerCapacity - entity.power.amount) / powerPerLiquid);
entity.liquids.remove(liquid, used);
entity.power.amount += used * powerPerLiquid;
// TODO: Adapt to new power system
//entity.power.amount += used * powerPerLiquid;
if(used > 0.001f && Mathf.chance(0.05 * entity.delta())){
Effects.effect(generateEffect, tile.drawx() + Mathf.range(3f), tile.drawy() + Mathf.range(3f));
}
}else if(entity.cons.valid()){
float maxPower = Math.min(powerCapacity - entity.power.amount, powerOutput * entity.delta()) * entity.efficiency;
// TODO: Adapt to new power system
//float maxPower = Math.min(powerCapacity - entity.power.amount, powerOutput * entity.delta()) * entity.efficiency;
if(entity.generateTime <= 0f && entity.items.total() > 0){
Effects.effect(generateEffect, tile.worldx() + Mathf.range(3f), tile.worldy() + Mathf.range(3f));
Item item = entity.items.take();
entity.efficiency = getItemEfficiency(item);
// TODO: Adapt to new power system
//entity.efficiency = getItemEfficiency(item);
entity.explosiveness = item.explosiveness;
entity.generateTime = 1f;
}
if(entity.generateTime > 0f){
entity.generateTime -= 1f / itemDuration * entity.delta();
entity.power.amount += maxPower;
// TODO: Adapt to new power system
//entity.power.amount += maxPower;
entity.generateTime = Mathf.clamp(entity.generateTime);
if(Mathf.chance(entity.delta() * 0.06 * Mathf.clamp(entity.explosiveness - 0.25f))){

6
core/src/io/anuke/mindustry/world/blocks/power/LiquidGenerator.java
View File

@@ -53,10 +53,12 @@ public abstract class LiquidGenerator extends PowerGenerator{
if(entity.liquids.get(entity.liquids.current()) >= 0.001f){
float powerPerLiquid = getEfficiency(entity.liquids.current()) * this.powerPerLiquid;
float used = Math.min(entity.liquids.currentAmount(), maxLiquidGenerate * entity.delta());
used = Math.min(used, (powerCapacity - entity.power.amount) / powerPerLiquid);
// TODO Adapt to new power system
//used = Math.min(used, (powerCapacity - entity.power.amount) / powerPerLiquid);
entity.liquids.remove(entity.liquids.current(), used);
entity.power.amount += used * powerPerLiquid;
// TODO Adapt to new power system
//entity.power.amount += used * powerPerLiquid;
if(used > 0.001f && Mathf.chance(0.05 * entity.delta())){
Effects.effect(generateEffect, tile.drawx() + Mathf.range(3f), tile.drawy() + Mathf.range(3f));

2
core/src/io/anuke/mindustry/world/blocks/power/LiquidHeatGenerator.java
View File

@@ -14,6 +14,8 @@ public class LiquidHeatGenerator extends LiquidGenerator{
public void setStats(){
super.setStats();
// TODO Verify for new power system
stats.remove(BlockStat.basePowerGeneration);
stats.add(BlockStat.basePowerGeneration, maxLiquidGenerate * powerPerLiquid * 60f, StatUnit.powerSecond);
}

11
core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
View File

@@ -49,7 +49,8 @@ public class NuclearReactor extends PowerGenerator{
super(name);
itemCapacity = 30;
liquidCapacity = 50;
powerCapacity = 80f;
// TODO Adapt to new power system
//powerCapacity = 80f;
hasItems = true;
hasLiquids = true;
@@ -75,6 +76,9 @@ public class NuclearReactor extends PowerGenerator{
public void setStats(){
super.setStats();
stats.add(BlockStat.inputLiquid, new LiquidFilterValue(liquid -> liquid.temperature <= 0.5f));
// TODO Verify for new power system
stats.remove(BlockStat.basePowerGeneration);
stats.add(BlockStat.basePowerGeneration, powerMultiplier * 60f * 0.5f, StatUnit.powerSecond);
}
@@ -87,8 +91,9 @@ public class NuclearReactor extends PowerGenerator{
if(fuel > 0){
entity.heat += fullness * heating * Math.min(entity.delta(), 4f);
entity.power.amount += powerMultiplier * fullness * entity.delta();
entity.power.amount = Mathf.clamp(entity.power.amount, 0f, powerCapacity);
// TODO Adapt to new power system
//entity.power.amount += powerMultiplier * fullness * entity.delta();
//entity.power.amount = Mathf.clamp(entity.power.amount, 0f, powerCapacity);
if(entity.timer.get(timerFuel, fuelUseTime)){
entity.items.remove(consumes.item(), 1);
}

4
core/src/io/anuke/mindustry/world/blocks/power/PowerGenerator.java
View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.world.blocks.power;
import io.anuke.mindustry.world.meta.StatUnit;
import io.anuke.ucore.util.EnumSet;
import io.anuke.mindustry.entities.TileEntity;
@@ -8,6 +9,7 @@ import io.anuke.mindustry.world.meta.BlockFlag;
import io.anuke.mindustry.world.meta.BlockStat;
public class PowerGenerator extends PowerDistributor{
/** The amount of power produced per tick. */
public float powerProduction;
public BlockStat generationType = BlockStat.basePowerGeneration;
@@ -20,7 +22,7 @@ public class PowerGenerator extends PowerDistributor{
@Override
public void setStats(){
super.setStats();
stats.add(generationType, baseGeneration * 60f, StatUnit.powerSecond);
stats.add(generationType, powerProduction, StatUnit.powerSecond);
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
View File

@@ -87,6 +87,8 @@ public class PowerGraph{
}
public void distributePower(float needed, float produced){
if(needed == 0f){ return; }
float satisfaction = Math.min(1, produced / needed);
for(Tile consumer : consumers){
if(consumer.block().bufferedPowerConsumer){

1
core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
View File

@@ -39,7 +39,6 @@ public class PowerNode extends PowerBlock{
super(name);
expanded = true;
layer = Layer.power;
powerCapacity = 5f;
configurable = true;
consumesPower = false;
outputsPower = false;

2
core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java
View File

@@ -26,7 +26,7 @@ public class Incinerator extends Block{
update = true;
solid = true;
consumes.power(0.05f);
basePowerUse = 0.05f;
}
@Override

17
core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
View File

@@ -17,7 +17,6 @@ import io.anuke.mindustry.graphics.Shaders;
import io.anuke.mindustry.type.Mech;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.consumers.ConsumePowerExact;
import io.anuke.mindustry.world.meta.BlockStat;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Graphics;
@@ -37,6 +36,7 @@ import static io.anuke.mindustry.Vars.tilesize;
public class MechPad extends Block{
protected Mech mech;
protected float buildTime = 60 * 5;
protected float requiredSatisfaction = 1f;
protected TextureRegion openRegion;
@@ -45,18 +45,19 @@ public class MechPad extends Block{
update = true;
solidifes = true;
hasPower = true;
bufferedPowerConsumer = true;
}
@Override
public void init(){
consumes.add(new ConsumePowerExact(powerCapacity * 0.8f));
super.init();
}
@Override
public void setStats(){
super.setStats();
stats.remove(BlockStat.powerUse);
// TODO Verify for new power system
//stats.remove(BlockStat.powerUse);
}
@Override
@@ -66,10 +67,14 @@ public class MechPad extends Block{
@Remote(targets = Loc.both, called = Loc.server)
public static void onMechFactoryTap(Player player, Tile tile){
if(player == null || !checkValidTap(tile, player)) return;
if(player == null || !checkValidTap(tile, player) || !(tile.block() instanceof MechPad)) return;
MechFactoryEntity entity = tile.entity();
entity.power.amount = 0f;
MechPad pad = (MechPad)tile.block();
if(entity.power.satisfaction < pad.requiredSatisfaction) return;
entity.power.satisfaction -= Math.min(entity.power.satisfaction, pad.requiredSatisfaction);
player.beginRespawning(entity);
}
@@ -102,7 +107,7 @@ public class MechPad extends Block{
protected static boolean checkValidTap(Tile tile, Player player){
MechFactoryEntity entity = tile.entity();
return Math.abs(player.x - tile.drawx()) <= tile.block().size * tilesize / 2f &&
return Math.abs(player.x - tile.drawx()) <= tile.block().size * tilesize / 2f &&
Math.abs(player.y - tile.drawy()) <= tile.block().size * tilesize / 2f && entity.cons.valid() && entity.player == null;
}

19
core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -33,7 +33,8 @@ import static io.anuke.mindustry.Vars.*;
public class Reconstructor extends Block{
protected float departTime = 30f;
protected float arriveTime = 40f;
protected float powerPerTeleport = 5f;
/** Stores the percentage of buffered power to be used upon teleporting. */
protected float powerPerTeleport = 0.5f;
protected Effect arriveEffect = Fx.spawn;
protected TextureRegion openRegion;
@@ -43,13 +44,15 @@ public class Reconstructor extends Block{
solidifes = true;
hasPower = true;
configurable = true;
basePowerUse = 30f; // capacity
bufferedPowerConsumer = true;
}
protected static boolean checkValidTap(Tile tile, ReconstructorEntity entity, Player player){
return validLink(tile, entity.link) &&
Math.abs(player.x - tile.drawx()) <= tile.block().size * tilesize / 2f &&
Math.abs(player.y - tile.drawy()) <= tile.block().size * tilesize / 2f &&
entity.current == null && entity.power.amount >= ((Reconstructor) tile.block()).powerPerTeleport;
entity.current == null && entity.power.satisfaction >= ((Reconstructor) tile.block()).powerPerTeleport;
}
protected static boolean validLink(Tile tile, int position){
@@ -74,13 +77,13 @@ public class Reconstructor extends Block{
public static void reconstructPlayer(Player player, Tile tile){
ReconstructorEntity entity = tile.entity();
if(!checkValidTap(tile, entity, player) || entity.power.amount < ((Reconstructor) tile.block()).powerPerTeleport)
if(!checkValidTap(tile, entity, player) || entity.power.satisfaction < ((Reconstructor) tile.block()).powerPerTeleport)
return;
entity.departing = true;
entity.current = player;
entity.solid = false;
entity.power.amount -= ((Reconstructor) tile.block()).powerPerTeleport;
entity.power.satisfaction -= Math.min(entity.power.satisfaction, ((Reconstructor) tile.block()).powerPerTeleport);
entity.updateTime = 1f;
entity.set(tile.drawx(), tile.drawy());
player.rotation = 90f;
@@ -246,13 +249,13 @@ public class Reconstructor extends Block{
entity.updateTime -= Timers.delta() / departTime;
if(entity.updateTime <= 0f){
//no power? death.
if(other.power.amount < powerPerTeleport){
if(other.power.satisfaction < powerPerTeleport){
entity.current.setDead(true);
//entity.current.setRespawning(false);
entity.current = null;
return;
}
other.power.amount -= powerPerTeleport;
other.power.satisfaction -= Math.min(other.power.satisfaction, powerPerTeleport);
other.current = entity.current;
other.departing = false;
other.current.set(other.x, other.y);
@@ -276,8 +279,8 @@ public class Reconstructor extends Block{
if(validLink(tile, entity.link)){
Tile other = world.tile(entity.link);
if(other.entity.power.amount >= powerPerTeleport && Units.anyEntities(tile, 4f, unit -> unit.getTeam() == entity.getTeam() && unit instanceof Player) &&
entity.power.amount >= powerPerTeleport){
if(other.entity.power.satisfaction >= powerPerTeleport && Units.anyEntities(tile, 4f, unit -> unit.getTeam() == entity.getTeam() && unit instanceof Player) &&
entity.power.satisfaction >= powerPerTeleport){
entity.solid = false;
stayOpen = true;
}

6
core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
View File

@@ -37,8 +37,9 @@ public class RepairPoint extends Block{
layer = Layer.turret;
layer2 = Layer.laser;
hasPower = true;
powerCapacity = 20f;
consumes.power(0.06f);
// TODO Adapt to new power system - Make it use power while repairing
basePowerUse = 20f; // capacity
bufferedPowerConsumer = true;
}
@Override
@@ -89,6 +90,7 @@ public class RepairPoint extends Block{
}else if(entity.target != null){
entity.target.health += repairSpeed * Timers.delta() * entity.strength;
entity.target.clampHealth();
// TODO: Make it use power here and reset power once target goes null
entity.rotation = Mathf.slerpDelta(entity.rotation, entity.angleTo(entity.target), 0.5f);
}

6
core/src/io/anuke/mindustry/world/consumers/Consumers.java
View File

@@ -30,12 +30,6 @@ public class Consumers{
}
}
public ConsumePower power(float amount){
ConsumePower p = new ConsumePower(amount);
add(p);
return p;
}
public ConsumeLiquid liquid(Liquid liquid, float amount){
ConsumeLiquid c = new ConsumeLiquid(liquid, amount);
add(c);

5
core/src/io/anuke/mindustry/world/modules/PowerModule.java
View File

@@ -8,7 +8,12 @@ import java.io.DataOutput;
import java.io.IOException;
public class PowerModule extends BlockModule{
/** In case of unbuffered consumers, this is the percentage (1.0f = 100%) of the demanded power which can be supplied.
* Blocks will work at a reduced efficiency if this is not equal to 1.0f.
* In case of buffered consumers, this is the percentage of power stored in relation to the maximum capacity.
*/
public float satisfaction;
/** Specifies power which is required additionally, e.g. while a force projector is being shot at. */
public float extraUse = 0f;
public PowerGraph graph = new PowerGraph();
public IntArray links = new IntArray();