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

Better 'unknown' map names / Recipe fixes

Browse Source
This commit is contained in:
Anuken
2019-02-14 12:11:20 -05:00
parent 66766b43c7
commit 59e909ae3a
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/power/impact-reactor-top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 4.4 KiB

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

@@ -820,7 +820,6 @@ public class Blocks implements ContentList{
batteryLarge = new Battery("battery-large"){{ batteryLarge = new Battery("battery-large"){{
requirements(Category.power, ItemStack.with(Items.titanium, 40, Items.lead, 80, Items.silicon, 30)); requirements(Category.power, ItemStack.with(Items.titanium, 40, Items.lead, 80, Items.silicon, 30));
requirements(Category.power, ItemStack.with(Items.copper, 8, Items.lead, 30, Items.silicon, 4));
size = 3; size = 3;
consumes.powerBuffered(20000f, 1f); consumes.powerBuffered(20000f, 1f);
}}; }};

2
core/src/io/anuke/mindustry/content/Zones.java
View File

@@ -398,7 +398,7 @@ public class Zones implements ContentList{
}}; }};
desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift") desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift")
.core(Blocks.coreNucleus).dist(2f)){{ .core(Blocks.coreNucleus).dist(2f)){{
deployCost = ItemStack.with(Items.copper, 2000); deployCost = ItemStack.with(Items.copper, 2000);
startingItems = ItemStack.with(Items.copper, 1500); startingItems = ItemStack.with(Items.copper, 1500);
itemRequirements = ItemStack.with(Items.copper, 8000, Items.metaglass, 2000, Items.graphite, 3000); itemRequirements = ItemStack.with(Items.copper, 8000, Items.metaglass, 2000, Items.graphite, 3000);

3
core/src/io/anuke/mindustry/io/versions/Save16.java
View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.io.versions; package io.anuke.mindustry.io.versions;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time; import io.anuke.arc.util.Time;
import io.anuke.mindustry.game.Version; import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.gen.Serialization; import io.anuke.mindustry.gen.Serialization;
@@ -34,7 +35,7 @@ public class Save16 extends SaveFileVersion{
} }
String mapname = stream.readUTF(); String mapname = stream.readUTF();
Map map = world.maps.getByName(mapname); Map map = world.maps.getByName(mapname);
if(map == null) map = new Map("unknown", 1, 1); if(map == null) map = new Map(Strings.capitalize(mapname), 1, 1);
world.setMap(map); world.setMap(map);
int wave = stream.readInt(); int wave = stream.readInt();