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

Removed tierScaleBack, fixed waves spawning with very few enemies

Browse Source
This commit is contained in:
Anuken
2018-01-20 22:06:37 -05:00
parent 12efe4a509
commit bf83ccd636
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -432,6 +432,9 @@ public class Renderer extends RendererModule{
Draw.thickness(3f); Draw.thickness(3f);
Draw.color(Color.SLATE); Draw.color(Color.SLATE);
Draw.line(x - len + 1, y, x + len + 1.5f, y);
Draw.thickness(1f);
Draw.color(Color.BLACK);
Draw.line(x - len + 1, y, x + len + 0.5f, y); Draw.line(x - len + 1, y, x + len + 0.5f, y);
Draw.color(color); Draw.color(color);
if(w >= 1) if(w >= 1)

6
core/src/io/anuke/mindustry/game/EnemySpawn.java
View File

@@ -15,8 +15,8 @@ public class EnemySpawn{
protected int spacing = 1; protected int spacing = 1;
/**How many waves need to pass after the start of this spawn for the tier to increase by one*/ /**How many waves need to pass after the start of this spawn for the tier to increase by one*/
protected int tierscale = 14; protected int tierscale = 14;
/**How many less enemies there are, every time the tier increases*/ /**How many more enemies there are, every time the tier increases*/
protected int tierscaleback = 1; protected int tierscaleback = 0;
/**The tier this spawn starts at.*/ /**The tier this spawn starts at.*/
protected int tier = 1; protected int tier = 1;
/**Maximum amount of enemies that spawn*/ /**Maximum amount of enemies that spawn*/
@@ -36,7 +36,7 @@ public class EnemySpawn{
} }
float scaling = this.scaling * Vars.control.getDifficulty().enemyScaling; float scaling = this.scaling * Vars.control.getDifficulty().enemyScaling;
return Math.min(amount-1 + Math.max((int)((wave / spacing) / scaling), 1) - (tier(wave, lane)-1) * tierscaleback, max); return Math.min(amount-1 + Math.max((int)((wave / spacing) / scaling), 1) + (tier(wave, lane)-1) * tierscaleback, max);
} }
public int tier(int wave, int lane){ public int tier(int wave, int lane){

2
core/src/io/anuke/mindustry/game/WaveCreator.java
View File

@@ -26,7 +26,7 @@ public class WaveCreator{
amount = 2; amount = 2;
spacing = 5; spacing = 5;
scaling = 2; scaling = 2;
tierscaleback = 0; tierscaleback = 1;
}}, }},
new EnemySpawn(EnemyTypes.tank){{ new EnemySpawn(EnemyTypes.tank){{

4
core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
View File

@@ -143,7 +143,9 @@ public class MapEditorDialog extends Dialog{
Core.scene.setScrollFocus(view); Core.scene.setScrollFocus(view);
view.clearStack(); view.clearStack();
Mindustry.platforms.updateRPC(); Timers.runTask(3f, () -> {
Mindustry.platforms.updateRPC();
});
}); });
hidden(() -> Mindustry.platforms.updateRPC()); hidden(() -> Mindustry.platforms.updateRPC());