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

Fixed #2763

Browse Source
This commit is contained in:
Anuken
2020-09-29 11:53:45 -04:00
parent 521ca1aea4
commit c3274622b2
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -1582,7 +1582,7 @@ public class Blocks implements ContentList{
health = 250 * size * size; health = 250 * size * size;
range = 140f; range = 140f;
hasPower = true; hasPower = true;
consumes.power(8f); consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null);
size = 2; size = 2;
shootLength = 5f; shootLength = 5f;
bulletDamage = 25f; bulletDamage = 25f;

3
core/src/mindustry/content/TechTree.java
View File

@@ -109,6 +109,9 @@ public class TechTree implements ContentList{
node(Items.coal, with(Items.lead, 3000), () -> { node(Items.coal, with(Items.lead, 3000), () -> {
node(Items.graphite, with(Items.coal, 1000), () -> { node(Items.graphite, with(Items.coal, 1000), () -> {
node(illuminator, () -> {
});
node(graphitePress, () -> { node(graphitePress, () -> {
node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> { node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> {
node(pneumaticDrill, () -> { node(pneumaticDrill, () -> {

4
core/src/mindustry/content/UnitTypes.java
View File

@@ -446,7 +446,7 @@ public class UnitTypes implements ContentList{
mineTier = 1; mineTier = 1;
hitSize = 29f; hitSize = 29f;
itemCapacity = 80; itemCapacity = 80;
health = 19000f; health = 18000f;
buildSpeed = 1.7f; buildSpeed = 1.7f;
armor = 9f; armor = 9f;
landShake = 1.5f; landShake = 1.5f;
@@ -488,7 +488,7 @@ public class UnitTypes implements ContentList{
firstShotDelay = Fx.greenLaserCharge.lifetime; firstShotDelay = Fx.greenLaserCharge.lifetime;
bullet = new LaserBulletType(){{ bullet = new LaserBulletType(){{
length = 500f; length = 460f;
damage = 550f; damage = 550f;
width = 75f; width = 75f;

2
core/src/mindustry/editor/MapGenerateDialog.java
View File

@@ -417,7 +417,7 @@ public class MapGenerateDialog extends BaseDialog{
public void set(Block floor, Block wall, Block ore, Team team){ public void set(Block floor, Block wall, Block ore, Team team){
this.floor = floor.id; this.floor = floor.id;
this.block = wall.id; this.block = wall.id;
this.ore = ore.id; this.ore = floor.asFloor().isLiquid ? 0 : ore.id;
this.team = (byte)team.id; this.team = (byte)team.id;
} }