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

#2647

Browse Source
This commit is contained in:
Anuken
2020-09-22 12:24:40 -04:00
parent 08ff36c43e
commit 5895e2f23c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,12 +90,14 @@ public class Vars implements Loadable{
public static final float minArmorDamage = 0.05f; public static final float minArmorDamage = 0.05f;
/** launch animation duration */ /** launch animation duration */
public static final float launchDuration = 140f; public static final float launchDuration = 140f;
/** size of tiles in units */
public static final int tilesize = 8;
/** size of one tile payload (^2) */
public static final float tilePayload = tilesize * tilesize;
/** tile used in certain situations, instead of null */ /** tile used in certain situations, instead of null */
public static Tile emptyTile; public static Tile emptyTile;
/** for map generator dialog */ /** for map generator dialog */
public static boolean updateEditorOnChange = false; public static boolean updateEditorOnChange = false;
/** size of tiles in units */
public static final int tilesize = 8;
/** all choosable player colors in join/host dialog */ /** all choosable player colors in join/host dialog */
public static final Color[] playerColors = { public static final Color[] playerColors = {
Color.valueOf("82759a"), Color.valueOf("82759a"),

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

@@ -11,6 +11,8 @@ import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.type.*; import mindustry.type.*;
import static mindustry.Vars.*;
public class UnitTypes implements ContentList{ public class UnitTypes implements ContentList{
//region definitions //region definitions
@@ -1194,7 +1196,7 @@ public class UnitTypes implements ContentList{
rotateShooting = false; rotateShooting = false;
hitsize = 15f; hitsize = 15f;
engineSize = 3f; engineSize = 3f;
payloadCapacity = 4 * (8 * 8); payloadCapacity = (2 * 2) * tilePayload;
buildSpeed = 2.5f; buildSpeed = 2.5f;
weapons.add( weapons.add(
@@ -1227,7 +1229,7 @@ public class UnitTypes implements ContentList{
engineSize = 6f; engineSize = 6f;
rotateShooting = false; rotateShooting = false;
hitsize = 32f; hitsize = 32f;
payloadCapacity = (3 * 3) * (8 * 8); payloadCapacity = (3 * 3) * tilePayload;
buildSpeed = 2.5f; buildSpeed = 2.5f;
range = 140f; range = 140f;
targetAir = false; targetAir = false;
@@ -1287,7 +1289,7 @@ public class UnitTypes implements ContentList{
engineSize = 7.8f; engineSize = 7.8f;
rotateShooting = false; rotateShooting = false;
hitsize = 60f; hitsize = 60f;
payloadCapacity = (5.2f * 5.2f) * (8 * 8); payloadCapacity = (5.3f * 5.3f) * tilePayload;
buildSpeed = 4f; buildSpeed = 4f;
drawShields = false; drawShields = false;