mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 06:51:30 -08:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
Anuken 2021-02-07 13:01:30 -05:00
parent e5f2073de2
commit ee61d0dcfa
5 changed files with 5 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
core/assets/maps/stainedMountains.msav
View file

Binary file not shown.

BIN
core/assets/maps/tarFields.msav
View file

Binary file not shown.

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

@ -23,7 +23,6 @@ public class Pathfinder implements Runnable{
private static final int updateFPS = 60;
private static final int updateInterval = 1000 / updateFPS;
private static final int impassable = -1;
private static final int fieldTimeout = 1000 * 60 * 2;
public static final int
fieldCore = 0,
@ -192,31 +191,6 @@ public class Pathfinder implements Runnable{
//total update time no longer than maxUpdate
for(Flowfield data : threadList){
updateFrontier(data, maxUpdate / threadList.size);
//TODO implement timeouts... or don't
/*
//remove flowfields that have 'timed out' so they can be garbage collected and no longer waste space
if(data.refreshRate > 0 && Time.timeSinceMillis(data.lastUpdateTime) > fieldTimeout){
//make sure it doesn't get removed twice
data.lastUpdateTime = Time.millis();
Team team = data.team;
Core.app.post(() -> {
//remove its used state
if(fieldMap[team.id] != null){
fieldMap[team.id].remove(data.target);
fieldMapUsed[team.id].remove(data.target);
}
//remove from main thread list
mainList.remove(data);
});
queue.post(() -> {
//remove from this thread list with a delay
threadList.remove(data);
});
}*/
}
}

8
core/src/mindustry/content/UnitTypes.java
View file

@ -150,7 +150,7 @@ public class UnitTypes implements ContentList{
hitSize = 20f;
rotateSpeed = 2.1f;
health = 9000;
armor = 11f;
armor = 10f;
canDrown = false;
mechFrontSway = 1f;
@ -419,7 +419,7 @@ public class UnitTypes implements ContentList{
lowAltitude = true;
health = 7200f;
armor = 7f;
armor = 8f;
canBoost = true;
landShake = 4f;
immunities = ObjectSet.with(StatusEffects.burning);
@ -443,8 +443,8 @@ public class UnitTypes implements ContentList{
cooldownTime = 200f;
bullet = new ContinuousLaserBulletType(){{
damage = 24f;
length = 164f;
damage = 26f;
length = 170f;
hitEffect = Fx.hitMeltHeal;
drawSize = 420f;
lifetime = 160f;

5
core/src/mindustry/core/Renderer.java
View file

@ -38,10 +38,7 @@ public class Renderer implements ApplicationListener{
private @Nullable CoreBuild landCore;
private Color clearColor = new Color(0f, 0f, 0f, 1f);
private float targetscale = Scl.scl(4);
private float camerascale = targetscale;
private float landscale = 0f, landTime, weatherAlpha;
private float minZoomScl = Scl.scl(0.01f);
private float targetscale = Scl.scl(4), camerascale = targetscale, landscale, landTime, weatherAlpha, minZoomScl = Scl.scl(0.01f);
private float shakeIntensity, shaketime;
public Renderer(){