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

Re-added preloading of ground enemy path / Core unit casing FX

Browse Source
This commit is contained in:
Anuken 2020-11-19 12:31:27 -05:00
parent 7612a22480
commit 97c3d36bae
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,8 @@ public class Pathfinder implements Runnable{
tiles[tile.x][tile.y] = packTile(tile); tiles[tile.x][tile.y] = packTile(tile);
} }
preloadPath(getField(state.rules.waveTeam, costGround, fieldCore));
start(); start();
}); });

3
core/src/mindustry/content/UnitTypes.java
View File

@ -1731,6 +1731,7 @@ public class UnitTypes implements ContentList{
x = 2.75f; x = 2.75f;
y = 1f; y = 1f;
top = false; top = false;
ejectEffect = Fx.casing1;
bullet = new BasicBulletType(2.5f, 10){{ bullet = new BasicBulletType(2.5f, 10){{
width = 7f; width = 7f;
@ -1772,6 +1773,7 @@ public class UnitTypes implements ContentList{
shots = 2; shots = 2;
shotDelay = 4f; shotDelay = 4f;
spacing = 0f; spacing = 0f;
ejectEffect = Fx.casing1;
bullet = new BasicBulletType(3f, 10){{ bullet = new BasicBulletType(3f, 10){{
width = 7f; width = 7f;
@ -1811,6 +1813,7 @@ public class UnitTypes implements ContentList{
spacing = 2f; spacing = 2f;
inaccuracy = 3f; inaccuracy = 3f;
shotDelay = 3f; shotDelay = 3f;
ejectEffect = Fx.casing1;
bullet = new BasicBulletType(3.5f, 10){{ bullet = new BasicBulletType(3.5f, 10){{
width = 6.5f; width = 6.5f;

8
core/src/mindustry/entities/EntityGroup.java
View File

@ -4,6 +4,7 @@ import arc.*;
import arc.func.*; import arc.func.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*;
import mindustry.gen.*; import mindustry.gen.*;
import java.util.*; import java.util.*;
@ -93,6 +94,7 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
return map != null; return map != null;
} }
@Nullable
public T getByID(int id){ public T getByID(int id){
if(map == null) throw new RuntimeException("Mapping is not enabled for group " + id + "!"); if(map == null) throw new RuntimeException("Mapping is not enabled for group " + id + "!");
return map.get(id); return map.get(id);
@ -188,10 +190,16 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
clearing = false; clearing = false;
} }
@Nullable
public T find(Boolf<T> pred){ public T find(Boolf<T> pred){
return array.find(pred); return array.find(pred);
} }
@Nullable
public T first(){
return array.first();
}
@Override @Override
public Iterator<T> iterator(){ public Iterator<T> iterator(){
return array.iterator(); return array.iterator();

2
core/src/mindustry/type/UnitType.java
View File

@ -374,7 +374,7 @@ public class UnitType extends UnlockableContent{
if(stacks != null){ if(stacks != null){
ItemStack[] out = new ItemStack[stacks.length]; ItemStack[] out = new ItemStack[stacks.length];
for(int i = 0; i < out.length; i++){ for(int i = 0; i < out.length; i++){
out[i] = new ItemStack(stacks[i].item, UI.roundAmount((int)(Math.pow(stacks[i].amount, 1.11) * 50))); out[i] = new ItemStack(stacks[i].item, UI.roundAmount((int)(Math.pow(stacks[i].amount, 1.1) * 50)));
} }
return out; return out;

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

@ -617,7 +617,7 @@ public class Block extends UnlockableContent{
public ItemStack[] researchRequirements(){ public ItemStack[] researchRequirements(){
ItemStack[] out = new ItemStack[requirements.length]; ItemStack[] out = new ItemStack[requirements.length];
for(int i = 0; i < out.length; i++){ for(int i = 0; i < out.length; i++){
int quantity = 60 + Mathf.round(Mathf.pow(requirements[i].amount, 1.13f) * 20 * researchCostMultiplier, 10); int quantity = 60 + Mathf.round(Mathf.pow(requirements[i].amount, 1.1f) * 20 * researchCostMultiplier, 10);
out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity)); out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity));
} }