mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-21 13:17:39 +07:00
Code Issues 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

BIN
core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

0
core/assets-raw/sprites/blocks/mechs/dart-mech-pad.png → core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

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

@ -873,7 +873,8 @@ block.pneumatic-drill.name = Pneumatic Drill
block.laser-drill.name = Laser Drill block.laser-drill.name = Laser Drill
block.water-extractor.name = Water Extractor block.water-extractor.name = Water Extractor
block.cultivator.name = Cultivator block.cultivator.name = Cultivator
block.dart-mech-pad.name = Alpha Mech Pad block.dart-ship-pad.name = Dart Ship Pad
block.alpha-mech-pad.name = Alpha Mech Pad
block.delta-mech-pad.name = Delta Mech Pad block.delta-mech-pad.name = Delta Mech Pad
block.javelin-ship-pad.name = Javelin Ship Pad block.javelin-ship-pad.name = Javelin Ship Pad
block.trident-ship-pad.name = Trident Ship Pad block.trident-ship-pad.name = Trident Ship Pad

BIN
core/assets/sprites/block_colors.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 732 B

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

@ -79,7 +79,7 @@ public class Blocks implements ContentList{
fortressFactory, repairPoint, fortressFactory, repairPoint,
//upgrades //upgrades
dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad; dartPad, alphaPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad;
@Override @Override
public void load(){ public void load(){
@ -1742,7 +1742,14 @@ public class Blocks implements ContentList{
//endregion //endregion
//region upgrades //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)); requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75));
mech = Mechs.alpha; mech = Mechs.alpha;
size = 2; size = 2;

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

@ -43,10 +43,9 @@ public class Mechs implements ContentList{
homingPower = 20f; homingPower = 20f;
damage = 3f; damage = 3f;
speed = 3f; speed = 3f;
bulletWidth = 4f; bulletWidth = 6f;
bulletHeight = 4f; bulletHeight = 6f;
lifetime = 60f; 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 DataOutputStream dataBytes = new DataOutputStream(byteOutput);
protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream(); protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall); 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{ protected void region(String name, DataInput stream, CounterInputStream counter, IORunner<DataInput> cons) throws IOException{
counter.resetCount(); counter.resetCount();