Enlarged laser/blast drills / Removed ground zero copper cost
|
Before Width: | Height: | Size: 119 B After Width: | Height: | Size: 253 B |
|
Before Width: | Height: | Size: 168 B After Width: | Height: | Size: 206 B |
|
Before Width: | Height: | Size: 155 B After Width: | Height: | Size: 172 B |
|
Before Width: | Height: | Size: 294 B After Width: | Height: | Size: 3.3 KiB |
BIN
core/assets-raw/sprites/blocks/drills/laser-drill-rim.png
Normal file
|
After Width: | Height: | Size: 119 B |
|
Before Width: | Height: | Size: 136 B After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 143 B After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 170 B After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 253 B |
|
Before Width: | Height: | Size: 206 B |
|
Before Width: | Height: | Size: 172 B |
|
Before Width: | Height: | Size: 362 B |
|
Before Width: | Height: | Size: 196 B After Width: | Height: | Size: 200 B |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 509 B After Width: | Height: | Size: 509 B |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
@@ -62,7 +62,7 @@ public class Blocks implements ContentList{
|
|||||||
impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower,
|
impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower,
|
||||||
|
|
||||||
//production
|
//production
|
||||||
mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, plasmaDrill, waterExtractor, oilExtractor, cultivator,
|
mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, waterExtractor, oilExtractor, cultivator,
|
||||||
|
|
||||||
//storage
|
//storage
|
||||||
coreShard, coreFoundation, coreNucleus, vault, container, unloader, launchPad,
|
coreShard, coreFoundation, coreNucleus, vault, container, unloader, launchPad,
|
||||||
@@ -916,7 +916,7 @@ public class Blocks implements ContentList{
|
|||||||
laserDrill = new Drill("laser-drill"){{
|
laserDrill = new Drill("laser-drill"){{
|
||||||
requirements(Category.production, ItemStack.with(Items.copper, 70, Items.graphite, 90, Items.silicon, 60, Items.titanium, 50));
|
requirements(Category.production, ItemStack.with(Items.copper, 70, Items.graphite, 90, Items.silicon, 60, Items.titanium, 50));
|
||||||
drillTime = 280;
|
drillTime = 280;
|
||||||
size = 2;
|
size = 3;
|
||||||
hasPower = true;
|
hasPower = true;
|
||||||
tier = 4;
|
tier = 4;
|
||||||
updateEffect = Fx.pulverizeMedium;
|
updateEffect = Fx.pulverizeMedium;
|
||||||
@@ -928,7 +928,7 @@ public class Blocks implements ContentList{
|
|||||||
blastDrill = new Drill("blast-drill"){{
|
blastDrill = new Drill("blast-drill"){{
|
||||||
requirements(Category.production, ItemStack.with(Items.copper, 130, Items.silicon, 120, Items.titanium, 100, Items.thorium, 60));
|
requirements(Category.production, ItemStack.with(Items.copper, 130, Items.silicon, 120, Items.titanium, 100, Items.thorium, 60));
|
||||||
drillTime = 200;
|
drillTime = 200;
|
||||||
size = 3;
|
size = 4;
|
||||||
drawRim = true;
|
drawRim = true;
|
||||||
hasPower = true;
|
hasPower = true;
|
||||||
tier = 5;
|
tier = 5;
|
||||||
@@ -941,23 +941,6 @@ public class Blocks implements ContentList{
|
|||||||
consumes.power(3f);
|
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"){{
|
waterExtractor = new SolidPump("water-extractor"){{
|
||||||
requirements(Category.production, ItemStack.with(Items.copper, 50, Items.graphite, 50, Items.lead, 40));
|
requirements(Category.production, ItemStack.with(Items.copper, 50, Items.graphite, 50, Items.lead, 40));
|
||||||
result = Liquids.water;
|
result = Liquids.water;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ public class Zones implements ContentList{
|
|||||||
public void load(){
|
public void load(){
|
||||||
|
|
||||||
groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1)){{
|
groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1)){{
|
||||||
deployCost = ItemStack.with(Items.copper, 60);
|
deployCost = ItemStack.with();
|
||||||
startingItems = ItemStack.with(Items.copper, 50);
|
startingItems = ItemStack.with(Items.copper, 50);
|
||||||
alwaysUnlocked = true;
|
alwaysUnlocked = true;
|
||||||
conditionWave = 10;
|
conditionWave = 10;
|
||||||
|
|||||||
@@ -24,10 +24,6 @@ import static io.anuke.mindustry.Vars.*;
|
|||||||
import static io.anuke.mindustry.input.PlaceMode.*;
|
import static io.anuke.mindustry.input.PlaceMode.*;
|
||||||
|
|
||||||
public class DesktopInput extends InputHandler{
|
public class DesktopInput extends InputHandler{
|
||||||
private final String section;
|
|
||||||
//controller info
|
|
||||||
private float controlx, controly;
|
|
||||||
private boolean controlling;
|
|
||||||
/**Current cursor type.*/
|
/**Current cursor type.*/
|
||||||
private Cursor cursorType = SystemCursor.arrow;
|
private Cursor cursorType = SystemCursor.arrow;
|
||||||
|
|
||||||
@@ -40,7 +36,6 @@ public class DesktopInput extends InputHandler{
|
|||||||
|
|
||||||
public DesktopInput(Player player){
|
public DesktopInput(Player player){
|
||||||
super(player);
|
super(player);
|
||||||
this.section = "player_" + (player.playerIndex + 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**Draws a placement icon for a specific block.*/
|
/**Draws a placement icon for a specific block.*/
|
||||||
@@ -302,12 +297,12 @@ public class DesktopInput extends InputHandler{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getMouseX(){
|
public float getMouseX(){
|
||||||
return !controlling ? Core.input.mouseX() : controlx;
|
return Core.input.mouseX();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getMouseY(){
|
public float getMouseY(){
|
||||||
return !controlling ? Core.input.mouseY() : controly;
|
return Core.input.mouseY();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||