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

Fixed #3200 / Fixed #3196 / Fixed #3198

Browse Source
This commit is contained in:
Anuken
2020-10-31 09:01:06 -04:00
parent 4ec8e24bd8
commit 42b8ece85a
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1545,9 +1545,9 @@ public class Blocks implements ContentList{
hasPower = true; hasPower = true;
size = 2; size = 2;
force = 7f; force = 8f;
scaledForce = 7f; scaledForce = 7f;
range = 220f; range = 230f;
damage = 0.3f; damage = 0.3f;
health = 160 * size * size; health = 160 * size * size;
rotateSpeed = 10; rotateSpeed = 10;

13
core/src/mindustry/core/UI.java
View File

@@ -328,20 +328,21 @@ public class UI implements ApplicationListener, Loadable{
/** Shows a label in the world. This label is behind everything. Does not fade. */ /** Shows a label in the world. This label is behind everything. Does not fade. */
public void showLabel(String info, float duration, float worldx, float worldy){ public void showLabel(String info, float duration, float worldx, float worldy){
Table table = new Table(); var table = new Table(Styles.black3).margin(4);
table.setFillParent(true);
table.touchable = Touchable.disabled; table.touchable = Touchable.disabled;
table.update(() -> { table.update(() -> {
if(state.isMenu()) table.remove(); if(state.isMenu()) table.remove();
Vec2 v = Core.camera.project(worldx, worldy);
table.setPosition(v.x, v.y, Align.center);
}); });
table.actions(Actions.delay(duration), Actions.remove()); table.actions(Actions.delay(duration), Actions.remove());
table.align(Align.center).table(Styles.black3, t -> t.margin(4).add(info).style(Styles.outlineLabel)).update(t -> { table.add(info).style(Styles.outlineLabel);
Vec2 v = Core.camera.project(worldx, worldy); table.pack();
t.setPosition(v.x, v.y, Align.center);
});
table.act(0f); table.act(0f);
//make sure it's at the back //make sure it's at the back
Core.scene.root.addChildAt(0, table); Core.scene.root.addChildAt(0, table);
table.getChildren().first().act(0f);
} }
public void showInfo(String info){ public void showInfo(String info){

2
core/src/mindustry/game/Waves.java
View File

@@ -342,7 +342,7 @@ public class Waves{
int bossWave = (int)(rand.random(50, 70) * Mathf.lerp(1f, 0.6f, difficulty)); int bossWave = (int)(rand.random(50, 70) * Mathf.lerp(1f, 0.6f, difficulty));
int bossSpacing = (int)(rand.random(25, 40) * Mathf.lerp(1f, 0.6f, difficulty)); int bossSpacing = (int)(rand.random(25, 40) * Mathf.lerp(1f, 0.6f, difficulty));
int bossTier = difficulty < 0.5 ? 4 : 5; int bossTier = difficulty < 0.5 ? 3 : 4;
//main boss progression //main boss progression
out.add(new SpawnGroup(Structs.random(species)[bossTier]){{ out.add(new SpawnGroup(Structs.random(species)[bossTier]){{

1
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -233,6 +233,7 @@ public abstract class Turret extends ReloadTurret{
unit.health(health); unit.health(health);
unit.rotation(rotation); unit.rotation(rotation);
unit.team(team); unit.team(team);
unit.set(x, y);
if(logicControlTime > 0){ if(logicControlTime > 0){
logicControlTime -= Time.delta; logicControlTime -= Time.delta;

1
core/src/mindustry/world/blocks/distribution/Router.java
View File

@@ -99,6 +99,7 @@ public class Router extends Block{
unit.health(health); unit.health(health);
unit.ammo(unit.type().ammoCapacity * (items.total() > 0 ? 1f : 0f)); unit.ammo(unit.type().ammoCapacity * (items.total() > 0 ? 1f : 0f));
unit.team(team); unit.team(team);
unit.set(x, y);
int angle = Mathf.mod((int)((angleTo(unit.aimX(), unit.aimY()) + 45) / 90), 4); int angle = Mathf.mod((int)((angleTo(unit.aimX(), unit.aimY()) + 45) / 90), 4);

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=392916100da348316b514af0af19fc48a04255b9 archash=57726650a54aa55dae98cf4d5f17cd6cd3218a3d