mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-04-27 07:50:54 -07:00
Code Issues Projects Releases Wiki Activity

Various small tweaks

Browse source
This commit is contained in:
Anuken 2020-10-17 18:37:54 -04:00
parent e9131b4631
commit 7349af4753
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/ai/Pathfinder.java
View file

@ -112,7 +112,7 @@ public class Pathfinder implements Runnable{
}
return PathTile.get(
tile.build == null ? 0 : Math.min((int)(tile.build.health / 40), 80),
tile.build == null || !tile.solid() ? 0 : Math.min((int)(tile.build.health / 40), 80),
tile.getTeamID(),
tile.solid(),
tile.floor().isLiquid,

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

@ -919,8 +919,8 @@ public class Blocks implements ContentList{
shockMine = new ShockMine("shock-mine"){{
requirements(Category.effect, with(Items.lead, 25, Items.silicon, 12));
hasShadow = false;
health = 40;
damage = 23;
health = 50;
damage = 25;
tileDamage = 7f;
length = 10;
tendrils = 4;

2
core/src/mindustry/entities/comp/FireComp.java
View file

@ -16,7 +16,7 @@ import static mindustry.Vars.*;
@EntityDef(value = {Firec.class}, pooled = true)
@Component(base = true)
abstract class FireComp implements Timedc, Posc, Firec, Syncc{
private static final float spreadChance = 0.05f, fireballChance = 0.07f;
private static final float spreadChance = 0.04f, fireballChance = 0.06f;
@Import float time, lifetime, x, y;

8
core/src/mindustry/game/DefaultWaves.java
View file

@ -18,6 +18,7 @@ public class DefaultWaves{
new SpawnGroup(dagger){{
end = 10;
unitScaling = 2f;
max = 30;
}},
new SpawnGroup(crawler){{
@ -45,6 +46,7 @@ public class DefaultWaves{
begin = 13;
spacing = 3;
unitScaling = 0.5f;
max = 25;
}},
new SpawnGroup(mace){{
@ -61,7 +63,7 @@ public class DefaultWaves{
unitAmount = 4;
spacing = 2;
shieldScaling = 10f;
max = 20;
max = 14;
}},
new SpawnGroup(mace){{
@ -94,6 +96,7 @@ public class DefaultWaves{
unitScaling = 1;
spacing = 2;
shieldScaling = 20f;
max = 20;
}},
new SpawnGroup(quasar){{
@ -111,6 +114,7 @@ public class DefaultWaves{
unitAmount = 1;
unitScaling = 3;
effect = StatusEffects.shielded;
max = 25;
}},
new SpawnGroup(fortress){{
@ -138,6 +142,7 @@ public class DefaultWaves{
effect = StatusEffects.overdrive;
items = new ItemStack(Items.pyratite, 100);
end = 130;
max = 30;
}},
new SpawnGroup(horizon){{
@ -156,6 +161,7 @@ public class DefaultWaves{
shields = 100f;
shieldScaling = 10f;
effect = StatusEffects.overdrive;
max = 20;
}},
new SpawnGroup(zenith){{