Enlarged laser/blast drills / Removed ground zero copper cost

This commit is contained in:
Anuken
2019-02-10 17:32:22 -05:00
parent 34b7961814
commit 718f56172e
21 changed files with 1384 additions and 1455 deletions

View File

@@ -62,7 +62,7 @@ public class Blocks implements ContentList{
impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower,
//production
mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, plasmaDrill, waterExtractor, oilExtractor, cultivator,
mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, waterExtractor, oilExtractor, cultivator,
//storage
coreShard, coreFoundation, coreNucleus, vault, container, unloader, launchPad,
@@ -916,7 +916,7 @@ public class Blocks implements ContentList{
laserDrill = new Drill("laser-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 70, Items.graphite, 90, Items.silicon, 60, Items.titanium, 50));
drillTime = 280;
size = 2;
size = 3;
hasPower = true;
tier = 4;
updateEffect = Fx.pulverizeMedium;
@@ -928,7 +928,7 @@ public class Blocks implements ContentList{
blastDrill = new Drill("blast-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 130, Items.silicon, 120, Items.titanium, 100, Items.thorium, 60));
drillTime = 200;
size = 3;
size = 4;
drawRim = true;
hasPower = true;
tier = 5;
@@ -941,23 +941,6 @@ public class Blocks implements ContentList{
consumes.power(3f);
}};
plasmaDrill = new Drill("plasma-drill"){{
heatColor = Color.valueOf("ff461b");
drillTime = 150;
size = 4;
hasLiquids = true;
hasPower = true;
tier = 5;
rotateSpeed = 9f;
drawRim = true;
updateEffect = Fx.pulverizeRedder;
updateEffectChance = 0.04f;
drillEffect = Fx.mineHuge;
warmupSpeed = 0.005f;
consumes.power(7f);
}};
waterExtractor = new SolidPump("water-extractor"){{
requirements(Category.production, ItemStack.with(Items.copper, 50, Items.graphite, 50, Items.lead, 40));
result = Liquids.water;

View File

@@ -19,7 +19,7 @@ public class Zones implements ContentList{
public void load(){
groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1)){{
deployCost = ItemStack.with(Items.copper, 60);
deployCost = ItemStack.with();
startingItems = ItemStack.with(Items.copper, 50);
alwaysUnlocked = true;
conditionWave = 10;

View File

@@ -24,10 +24,6 @@ import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.input.PlaceMode.*;
public class DesktopInput extends InputHandler{
private final String section;
//controller info
private float controlx, controly;
private boolean controlling;
/**Current cursor type.*/
private Cursor cursorType = SystemCursor.arrow;
@@ -40,7 +36,6 @@ public class DesktopInput extends InputHandler{
public DesktopInput(Player player){
super(player);
this.section = "player_" + (player.playerIndex + 1);
}
/**Draws a placement icon for a specific block.*/
@@ -302,12 +297,12 @@ public class DesktopInput extends InputHandler{
@Override
public float getMouseX(){
return !controlling ? Core.input.mouseX() : controlx;
return Core.input.mouseX();
}
@Override
public float getMouseY(){
return !controlling ? Core.input.mouseY() : controly;
return Core.input.mouseY();
}
@Override