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

Impact map balance / Block balance / Editor block sorting

Browse Source
This commit is contained in:
Anuken
2019-03-03 19:54:20 -05:00
parent 9e960d461b
commit 21f3a053ed
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/impact0079.mmap
View File

Binary file not shown.

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

@@ -450,7 +450,7 @@ public class Blocks implements ContentList{
Items.titanium, 2 Items.titanium, 2
); );
hasPower = true; hasPower = true;
filterTime = 30f; filterTime = 35f;
spinnerLength = 1.5f; spinnerLength = 1.5f;
spinnerRadius = 3.5f; spinnerRadius = 3.5f;
spinnerThickness = 1.5f; spinnerThickness = 1.5f;
@@ -458,7 +458,7 @@ public class Blocks implements ContentList{
size = 2; size = 2;
consumes.power(1f); consumes.power(1f);
consumes.liquid(Liquids.slag, 0.09f); consumes.liquid(Liquids.slag, 0.07f);
}}; }};
cultivator = new Cultivator("cultivator"){{ cultivator = new Cultivator("cultivator"){{

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

@@ -361,11 +361,11 @@ public class Zones implements ContentList{
).drops(ItemStack.with(Items.copper, 2000, Items.lead, 1500, Items.silicon, 1000, Items.graphite, 2000, Items.pyratite, 2000, Items.titanium, 2000, Items.metaglass, 1000, Items.coal, 2000))){{ ).drops(ItemStack.with(Items.copper, 2000, Items.lead, 1500, Items.silicon, 1000, Items.graphite, 2000, Items.pyratite, 2000, Items.titanium, 2000, Items.metaglass, 1000, Items.coal, 2000))){{
loadout = Loadouts.basicFoundation; loadout = Loadouts.basicFoundation;
baseLaunchCost = ItemStack.with(Items.copper, 500, Items.lead, 500, Items.silicon, 100); baseLaunchCost = ItemStack.with(Items.copper, 500, Items.lead, 500, Items.silicon, 100);
startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 500, Items.silicon, 200); startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 500, Items.silicon, 200, Items.titanium, 400, Items.graphite, 200);
itemRequirements = ItemStack.with(Items.silicon, 8000, Items.titanium, 6000, Items.graphite, 4000); itemRequirements = ItemStack.with(Items.silicon, 8000, Items.titanium, 6000, Items.graphite, 4000);
conditionWave = 20; conditionWave = 20;
zoneRequirements = new Zone[]{stainedMountains}; zoneRequirements = new Zone[]{stainedMountains};
blockRequirements = new Block[]{Blocks.launchPad, Blocks.unloader}; blockRequirements = new Block[]{Blocks.launchPad, Blocks.unloader, Blocks.melter, Blocks.separator};
resources = new Item[]{Items.scrap}; resources = new Item[]{Items.scrap};
rules = () -> new Rules(){{ rules = () -> new Rules(){{
waves = true; waves = true;

13
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@@ -29,6 +29,7 @@ import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Block.Icon; import io.anuke.mindustry.world.Block.Icon;
import io.anuke.mindustry.world.blocks.OreBlock; import io.anuke.mindustry.world.blocks.OreBlock;
import io.anuke.mindustry.world.blocks.storage.CoreBlock;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.InputStream; import java.io.InputStream;
@@ -503,9 +504,15 @@ public class MapEditorDialog extends Dialog implements Disposable{
blocksOut.clear(); blocksOut.clear();
blocksOut.addAll(Vars.content.blocks()); blocksOut.addAll(Vars.content.blocks());
blocksOut.sort((b1, b2) -> b1.synthetic() && !b2.synthetic() ? 1 : b2.synthetic() && !b1.synthetic() ? -1 : blocksOut.sort((b1, b2) -> {
b1 instanceof OreBlock && !(b2 instanceof OreBlock) ? 1 : !(b1 instanceof OreBlock) && b2 instanceof OreBlock ? -1 : int core = -Boolean.compare(b1 instanceof CoreBlock, b2 instanceof CoreBlock);
Integer.compare(b1.id, b2.id)); if(core != 0) return core;
int synth = Boolean.compare(b1.synthetic(), b2.synthetic());
if(synth != 0) return synth;
int ore = Boolean.compare(b1 instanceof OreBlock, b2 instanceof OreBlock);
if(ore != 0) return ore;
return Integer.compare(b1.id, b2.id);
});
for(Block block : blocksOut){ for(Block block : blocksOut){
TextureRegion region = block.icon(Icon.medium); TextureRegion region = block.icon(Icon.medium);

2
core/src/io/anuke/mindustry/type/Loadout.java
View File

@@ -56,7 +56,7 @@ public class Loadout extends Content{
char c = layout[y].charAt(x); char c = layout[y].charAt(x);
if(entries.containsKey(c)){ if(entries.containsKey(c)){
BlockEntry entry = entries.get(c); BlockEntry entry = entries.get(c);
blocks.put(Pos.get(x - coreX, layout.length - 1 - (y - coreY)), entry); blocks.put(Pos.get(x - coreX, -(y - coreY)), entry);
} }
} }
} }