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

Small tweaks

Browse Source
This commit is contained in:
Anuken
2020-10-05 17:44:06 -04:00
parent e8e9c14ec9
commit 5cc6ac0216
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/Vars.java
View File

@@ -83,7 +83,7 @@ public class Vars implements Loadable{
/** range for moving items */ /** range for moving items */
public static final float itemTransferRange = 220f; public static final float itemTransferRange = 220f;
/** range for moving items for logic units */ /** range for moving items for logic units */
public static final float logicItemTransferRange = 40f; public static final float logicItemTransferRange = 45f;
/** duration of time between turns in ticks */ /** duration of time between turns in ticks */
public static final float turnDuration = 20 * Time.toMinutes; public static final float turnDuration = 20 * Time.toMinutes;
/** turns needed to destroy a sector completely */ /** turns needed to destroy a sector completely */

2
core/src/mindustry/ai/types/LogicAI.java
View File

@@ -61,7 +61,7 @@ public class LogicAI extends AIController{
moveTo(Tmp.v1.set(moveX, moveY), 1f, 30f); moveTo(Tmp.v1.set(moveX, moveY), 1f, 30f);
} }
case approach -> { case approach -> {
moveTo(Tmp.v1.set(moveX, moveY), moveRad, 10f); moveTo(Tmp.v1.set(moveX, moveY), moveRad, 1f);
} }
case pathfind -> { case pathfind -> {
Building core = unit.closestEnemyCore(); Building core = unit.closestEnemyCore();

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

@@ -394,7 +394,7 @@ public class UnitTypes implements ContentList{
engineSize = 6f; engineSize = 6f;
lowAltitude = true; lowAltitude = true;
health = 6500f; health = 7000f;
armor = 7f; armor = 7f;
canBoost = true; canBoost = true;
landShake = 4f; landShake = 4f;

8
core/src/mindustry/core/Renderer.java
View File

@@ -63,7 +63,9 @@ public class Renderer implements ApplicationListener{
Color.white.set(1f, 1f, 1f, 1f); Color.white.set(1f, 1f, 1f, 1f);
Gl.clear(Gl.stencilBufferBit); Gl.clear(Gl.stencilBufferBit);
camerascale = Mathf.lerpDelta(camerascale, targetscale, 0.1f); float dest = Mathf.round(targetscale, 0.5f);
camerascale = Mathf.lerpDelta(camerascale, dest, 0.1f);
if(Mathf.within(camerascale, dest, 0.001f)) camerascale = dest;
laserOpacity = Core.settings.getInt("lasersopacity") / 100f; laserOpacity = Core.settings.getInt("lasersopacity") / 100f;
if(landTime > 0){ if(landTime > 0){
@@ -303,6 +305,10 @@ public class Renderer implements ApplicationListener{
targetscale = Mathf.clamp(targetscale, minScale(), Math.round(s * 6)); targetscale = Mathf.clamp(targetscale, minScale(), Math.round(s * 6));
} }
public float getDisplayScale(){
return camerascale;
}
public float minScale(){ public float minScale(){
return Scl.scl(1.5f); return Scl.scl(1.5f);
} }