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

Added correctly named mech pads for alpha/dart

Browse Source
This commit is contained in:
Anuken
2019-10-15 18:32:47 -04:00
parent 923b3eba96
commit a3871cca90
7 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -79,7 +79,7 @@ public class Blocks implements ContentList{
fortressFactory, repairPoint,
//upgrades
dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad;
dartPad, alphaPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad;
@Override
public void load(){
@@ -1742,7 +1742,14 @@ public class Blocks implements ContentList{
//endregion
//region upgrades
dartPad = new MechPad("dart-mech-pad"){{
dartPad = new MechPad("dart-ship-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75));
mech = Mechs.dart;
size = 2;
consumes.power(0.5f);
}};
alphaPad = new MechPad("alpha-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75));
mech = Mechs.alpha;
size = 2;

5
core/src/io/anuke/mindustry/content/Mechs.java
View File

@@ -43,10 +43,9 @@ public class Mechs implements ContentList{
homingPower = 20f;
damage = 3f;
speed = 3f;
bulletWidth = 4f;
bulletHeight = 4f;
bulletWidth = 6f;
bulletHeight = 6f;
lifetime = 60f;
}};
}};
}

4
core/src/io/anuke/mindustry/io/SaveFileReader.java
View File

@@ -14,7 +14,9 @@ public abstract class SaveFileReader{
protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput);
protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall);
protected final ObjectMap<String, String> fallback = ObjectMap.of();
protected final ObjectMap<String, String> fallback = ObjectMap.of(
"dart-mech-pad", "dart-ship-pad"
);
protected void region(String name, DataInput stream, CounterInputStream counter, IORunner<DataInput> cons) throws IOException{
counter.resetCount();