Fixed #5498
This commit is contained in:
@@ -148,6 +148,8 @@ public class Vars implements Loadable{
|
||||
public static int maxTextureSize = 2048;
|
||||
/** Whether to show the core landing animation. */
|
||||
public static boolean showLandAnimation = true;
|
||||
/** Whether to check for memory use before taking screenshots. */
|
||||
public static boolean checkScreenshotMemory = true;
|
||||
/** Whether to prompt the user to confirm exiting. */
|
||||
public static boolean confirmExit = true;
|
||||
/** if true, UI is not drawn */
|
||||
|
||||
@@ -51,7 +51,7 @@ public class Blocks implements ContentList{
|
||||
melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
|
||||
|
||||
//sandbox
|
||||
powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadVoid, payloadSource, illuminator,
|
||||
powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator,
|
||||
|
||||
//defense
|
||||
copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
|
||||
@@ -2068,12 +2068,12 @@ public class Blocks implements ContentList{
|
||||
alwaysUnlocked = true;
|
||||
}};
|
||||
|
||||
payloadVoid = new PayloadVoid("payload-void"){{
|
||||
payloadSource = new PayloadSource("payload-source"){{
|
||||
requirements(Category.units, BuildVisibility.sandboxOnly, with());
|
||||
size = 5;
|
||||
}};
|
||||
|
||||
payloadSource = new PayloadSource("payload-source"){{
|
||||
payloadVoid = new PayloadVoid("payload-void"){{
|
||||
requirements(Category.units, BuildVisibility.sandboxOnly, with());
|
||||
size = 5;
|
||||
}};
|
||||
|
||||
@@ -2113,7 +2113,7 @@ public class UnitTypes implements ContentList{
|
||||
|
||||
bullet = new ContinuousLaserBulletType(){{
|
||||
maxRange = 90f;
|
||||
damage = 26f;
|
||||
damage = 27f;
|
||||
length = 95f;
|
||||
hitEffect = Fx.hitMeltHeal;
|
||||
drawSize = 200f;
|
||||
@@ -2144,7 +2144,7 @@ public class UnitTypes implements ContentList{
|
||||
x = 70f/4f;
|
||||
y = -26f/4f;
|
||||
|
||||
reload = 70f;
|
||||
reload = 65f;
|
||||
shake = 3f;
|
||||
rotateSpeed = 2f;
|
||||
shadow = 30f;
|
||||
@@ -2161,7 +2161,7 @@ public class UnitTypes implements ContentList{
|
||||
timeIncrease = 3f;
|
||||
timeDuration = 60f * 20f;
|
||||
powerDamageScl = 3f;
|
||||
damage = 50;
|
||||
damage = 60;
|
||||
hitColor = lightColor = Pal.heal;
|
||||
lightRadius = 70f;
|
||||
clipSize = 250f;
|
||||
@@ -2177,7 +2177,7 @@ public class UnitTypes implements ContentList{
|
||||
trailWidth = 6f;
|
||||
trailColor = Pal.heal;
|
||||
trailInterval = 3f;
|
||||
splashDamage = 60f;
|
||||
splashDamage = 70f;
|
||||
splashDamageRadius = rad;
|
||||
hitShake = 4f;
|
||||
trailRotation = true;
|
||||
|
||||
@@ -11,6 +11,7 @@ import arc.scene.ui.layout.*;
|
||||
import arc.struct.*;
|
||||
import arc.util.*;
|
||||
import arc.util.async.*;
|
||||
import mindustry.*;
|
||||
import mindustry.content.*;
|
||||
import mindustry.game.EventType.*;
|
||||
import mindustry.gen.*;
|
||||
@@ -355,7 +356,7 @@ public class Renderer implements ApplicationListener{
|
||||
int w = world.width() * tilesize, h = world.height() * tilesize;
|
||||
int memory = w * h * 4 / 1024 / 1024;
|
||||
|
||||
if(memory >= (mobile ? 65 : 120)){
|
||||
if(Vars.checkScreenshotMemory && memory >= (mobile ? 65 : 120)){
|
||||
ui.showInfo("@screenshot.invalid");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -11,6 +11,10 @@ public class ModClassLoader extends ClassLoader{
|
||||
}
|
||||
};
|
||||
|
||||
public ModClassLoader(ClassLoader parent){
|
||||
super(parent);
|
||||
}
|
||||
|
||||
public void addChild(ClassLoader child){
|
||||
children.add(child);
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class Mods implements Loadable{
|
||||
|
||||
private int totalSprites;
|
||||
private MultiPacker packer;
|
||||
private ModClassLoader mainLoader = new ModClassLoader();
|
||||
private ModClassLoader mainLoader = new ModClassLoader(getClass().getClassLoader());
|
||||
|
||||
Seq<LoadedMod> mods = new Seq<>();
|
||||
private ObjectMap<Class<?>, ModMeta> metas = new ObjectMap<>();
|
||||
|
||||
Reference in New Issue
Block a user