mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Updated desolate rift / Spawning fixes

Browse Source
This commit is contained in:
Anuken 2019-04-26 23:23:45 -04:00
parent d827cda395
commit 768d67a8ae
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -168,15 +168,15 @@ public class Zones implements ContentList{
loadout = Loadouts.basicNucleus;
baseLaunchCost = ItemStack.with();
startingItems = ItemStack.list(Items.copper, 1500);
conditionWave = 10;
launchPeriod = 20;
conditionWave = 3;
launchPeriod = 1;
zoneRequirements = ZoneRequirement.with(tarFields, 20);
blockRequirements = new Block[]{Blocks.thermalGenerator};
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand};
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand, Items.thorium};
rules = () -> new Rules(){{
waves = true;
waveTimer = true;
waveSpacing = 60 * 60 * 1.3f;
waveSpacing = 60 * 60 * 2.5f;
}};
}};

4
core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
View File

@ -79,7 +79,9 @@ public class MapGenerateDialog extends FloatingDialog{
cont.clear();
cont.table("flat", t -> {
t.margin(8f);
t.stack(new BorderImage(texture), new Stack(){{
t.stack(new BorderImage(texture){{
setScaling(Scaling.fit);
}}, new Stack(){{
add(new Image("loadDim"));
add(new Image("icon-refresh"){{
setScaling(Scaling.none);

4
core/src/io/anuke/mindustry/game/SpawnGroup.java
View File

@ -48,9 +48,7 @@ public class SpawnGroup implements Serializable{
if(wave < begin || wave > end || (wave - begin) % spacing != 0){
return 0;
}
float scaling = this.unitScaling;
return Math.min(unitAmount - 1 + Math.max((int)(((wave - begin + 1) / spacing) / scaling), 1), max);
return Math.min(unitAmount + (int)(((wave - begin) / spacing) / unitScaling), max);
}
/**

4
core/src/io/anuke/mindustry/maps/Maps.java
View File

@ -25,10 +25,6 @@ public class Maps implements Disposable{
/** Serializer for meta. */
private Json json = new Json();
public Maps(){
}
/** Returns a list of all maps, including custom ones. */
public Array<Map> all(){
return maps;

2
core/src/io/anuke/mindustry/world/Block.java
View File

@ -436,7 +436,7 @@ public class Block extends BlockStorage{
float capacity = consumes.getPower().powerCapacity;
bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.satisfaction * capacity) ? "<ERROR>" : (int)(entity.power.satisfaction * capacity)) :
Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> entity.power.satisfaction));
Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> entity.power.satisfaction));
}
if(hasItems && configurable){