mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-09 23:37:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed oil extractor desync / Buffed thermal genenerator / Typo fix

Browse Source
This commit is contained in:
Anuken
2018-08-08 16:00:33 -04:00
parent 22d0992d38
commit 57019b6e20
7 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -281,7 +281,7 @@ text.blocks.maxitemssecond=Max Items
text.blocks.powerrange=Power Range
text.blocks.poweruse=Power Use
text.blocks.inputitemcapacity=Input Item Capacity
text.blocks.outputitemcapacity=Input Item Capacity
text.blocks.outputitemcapacity=Output Item Capacity
text.blocks.itemcapacity=Item Capacity
text.blocks.maxpowergeneration=Max Power Generation
text.blocks.powertransferspeed=Power Transfer

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

@ -22,7 +22,7 @@ public class PowerBlocks extends BlockList implements ContentList{
thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{
maxLiquidGenerate = 0.5f;
powerCapacity = 40f;
powerPerLiquid = 0.55f;
powerPerLiquid = 1.5f;
generateEffect = BlockFx.redgeneratespark;
size = 2;
}};

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

@ -33,8 +33,6 @@ public class FortressGenerator{
private static void init(){
if(structures != null) return;
String vaults = "BQMADWNhcmJpZGUtZHJpbGwCAA10dW5nc3Rlbi13YWxsAQATdHVuZ3N0ZW4td2FsbC1sYXJnZQAAA2FpcgQABXZhdWx0CQUAAgABAAEAAQABAAIAAAABAAAAAAACAAAAAQAAAAABAQABAgEBAQAAAAIAAgMBAAEAAAICAAAAAAAAAgACAgAABAIAAAIAAgIAAAAAAAACAAICAgMCAwIDAgM=";
structures = new Structure[]{
//tiny duo outpost
new Structure(0.03f, Items.tungsten, "BAMADnR1bmdzdGVuLWRyaWxsAgADZHVvAQANdHVuZ3N0ZW4td2FsbAAAA2FpcgMFAQABAwEDAQMBAAEAAgMDAwIDAQABAAEBAQEBAQEA"),
@ -51,9 +49,6 @@ public class FortressGenerator{
//resupply point
new Structure(0.03f, Items.lead, "BgEADXR1bmdzdGVuLXdhbGwCAAtzb2xhci1wYW5lbAUAA2R1bwMADnJlc3VwcGx5LXBvaW50AAADYWlyBAANY2FyYmlkZS1kcmlsbAUFAQABAAEAAAAAAAEAAgMBAQEBAQABAAMDBAEFAQEAAQACAwEBAQEBAAEBAQEBAQAAAAA="),
//lead storage
new Structure(0.02f, Items.lead, vaults),
//mini dagger outpost
new Structure(0.02f, Items.lead, "CwIADXR1bmdzdGVuLXdhbGwGAAhjb252ZXlvcgUAA2R1bwgACmRhZ2dlci1wYWQBABN0dW5nc3Rlbi13YWxsLWxhcmdlBwAIc3BsaXR0ZXIDAA5yZXN1cHBseS1wb2ludAoADHJlcGFpci1wb2ludAkADnR1bmdzdGVuLWRyaWxsAAADYWlyBAALc29sYXItcGFuZWwHCQAAAAABAAABAgECAQIBAAAAAAEAAAMAAwADAwEEAAIBAgICAgAAAAAFAwYDBwMCAQIBBQECAgAAAAAIAAAACQMGAQYBBwMCAgAAAAAAAAAAAQMAAAIDBQECAgEAAAAKAQQBAAAAAAIBAgECAgAAAAACAQIBAgEAAAAAAAAAAA=="),
@ -63,9 +58,6 @@ public class FortressGenerator{
//advanced laser outpost
new Structure(0.03f, null, "BQIABmxhbmNlcgEAEmNhcmJpZGUtd2FsbC1sYXJnZQQAEXNvbGFyLXBhbmVsLWxhcmdlAAADYWlyAwALc29sYXItcGFuZWwLCwAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAAABAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMAAwAAAAAAAwABAAAAAAABAAAAAgAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAQAAAACAAAAAQAAAAAAAQAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAIAAAADAAMAAQAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"),
//titanium storage
new Structure(0.02f, Items.titanium, vaults),
//2x interceptor outpost
new Structure(0.02f, Items.lead, "CgMAEXNvbGFyLXBhbmVsLWxhcmdlBgADZHVvAgAPaW50ZXJjZXB0b3ItcGFkBAASY2FyYmlkZS13YWxsLWxhcmdlBwAOcmVzdXBwbHktcG9pbnQAAANhaXIFAAtzb2xhci1wYW5lbAEADGNhcmJpZGUtd2FsbAkAC2Rpc3RyaWJ1dG9yCAALbGFzZXItZHJpbGwKCAEAAQMBAwEDAQMBAwECAAABAAIDAAAAAAAAAAABAgAAAQAAAAAAAAADAQAAAQIBAgQDAAAFAAAAAAAAAAYCAQMAAAAABwAIAAAACQAAAAECBAMAAAEAAAAAAAABAAABAgAAAAAFAAAAAAAAAAYCAQIBAAIDAAAAAAMBAAABAgECAQAAAAAAAAAAAAAAAQIAAAEAAQEBAQEBAQEBAQEBAAA="),
@ -80,9 +72,6 @@ public class FortressGenerator{
//fabricator outpost
new Structure(0.02f, Items.tungsten, "BgUADWNhcmJpZGUtZHJpbGwBABJ0aG9yaXVtLXdhbGwtbGFyZ2UCAAx0aG9yaXVtLXdhbGwEAANkdW8AAANhaXIDAA5mYWJyaWNhdG9yLXBhZAkJAAAAAAEDAAACAwEDAAAAAAAAAAACAwADAAMCAwADAAMCAgAAAQMAAAMCAAACAAMCAAABAwAAAAAAAAAAAAAEAgAAAAAAAgAAAgMCAAIBBAIFAAQCAgMCAgIDAQMAAAMCAAAEAgMCAAABAwAAAAAAAAAAAAACAQAAAAAAAgAAAAACAAEDAAECAQEDAAECAQAAAAAAAAAAAAACAwACAAAAAAAA"),
//coal storage
new Structure(0.02f, Items.coal, vaults),
};
bases = new Structure[]{

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

@ -1,6 +1,8 @@
package io.anuke.mindustry.world.blocks.power;
import io.anuke.mindustry.type.Liquid;
import io.anuke.mindustry.world.meta.BlockStat;
import io.anuke.mindustry.world.meta.StatUnit;
public class LiquidHeatGenerator extends LiquidGenerator{
@ -8,6 +10,13 @@ public class LiquidHeatGenerator extends LiquidGenerator{
super(name);
}
@Override
public void setStats(){
super.setStats();
stats.add(BlockStat.maxPowerGeneration, maxLiquidGenerate * powerPerLiquid * 60f * 0.4f, StatUnit.powerSecond);
}
@Override
protected float getEfficiency(Liquid liquid){
return liquid.temperature - 0.5f;

4
core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
View File

@ -9,7 +9,7 @@ import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw;
public class Fracker extends SolidPump{
protected float itemUseTime = 100f;
protected final float itemUseTime = 100f;
protected TextureRegion liquidRegion;
protected TextureRegion rotatorRegion;
@ -63,7 +63,7 @@ public class Fracker extends SolidPump{
FrackerEntity entity = tile.entity();
Item item = consumes.item();
while(entity.accumulator > itemUseTime && entity.items.has(item, 1)){
while(entity.accumulator >= itemUseTime && entity.items.has(item, 1)){
entity.items.remove(item, 1);
entity.accumulator -= itemUseTime;
}

1
core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java
View File

@ -44,7 +44,6 @@ public class UnitPad extends Block{
protected UnitType type;
protected float produceTime = 1000f;
protected float openDuration = 50f;
protected float launchVelocity = 0f;
public UnitPad(String name){

6
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@ -290,6 +290,12 @@ public class ServerControl extends Module{
}
});
handler.register("debugmode", "<on/off>", "Disables or enables debug ode", arg -> {
boolean value = arg[0].equalsIgnoreCase("on");
debug = value;
info("Debug mode is now {0}.", value ? "on" : "off");
});
handler.register("antigrief", "[on/off] [max-break] [cooldown-in-ms]", "Enable or disable anti-grief.", arg -> {
if(arg.length == 0){
info("Anti-grief is currently &lc{0}.", netServer.admins.isAntiGrief() ? "on" : "off");