Minor fixes, crawler coal research removed
This commit is contained in:
@@ -2,6 +2,7 @@ package mindustry.content;
|
||||
|
||||
import arc.struct.*;
|
||||
import mindustry.game.Objectives.*;
|
||||
import mindustry.type.*;
|
||||
|
||||
import static mindustry.content.Blocks.*;
|
||||
import static mindustry.content.SectorPresets.craters;
|
||||
@@ -359,7 +360,8 @@ public class SerpuloTechTree{
|
||||
});
|
||||
});
|
||||
|
||||
node(crawler, () -> {
|
||||
//override research requirements to have graphite, not coal
|
||||
node(crawler, ItemStack.with(Items.silicon, 400, Items.graphite, 400), () -> {
|
||||
node(atrax, () -> {
|
||||
node(spiroct, () -> {
|
||||
node(arkyid, () -> {
|
||||
|
||||
@@ -1912,7 +1912,7 @@ public class UnitTypes{
|
||||
trailWidth = 3f;
|
||||
trailLength = 8;
|
||||
|
||||
splashDamage = 33f;
|
||||
splashDamage = 36f;
|
||||
splashDamageRadius = 32f;
|
||||
}};
|
||||
}});
|
||||
|
||||
@@ -12,6 +12,7 @@ import rhino.module.provider.*;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.util.*;
|
||||
import java.util.regex.*;
|
||||
|
||||
public class Scripts implements Disposable{
|
||||
@@ -46,7 +47,18 @@ public class Scripts implements Disposable{
|
||||
Object o = context.evaluateString(scope, text, "console.js", 1);
|
||||
if(o instanceof NativeJavaObject n) o = n.unwrap();
|
||||
if(o == null) o = "null";
|
||||
|
||||
else if(o instanceof Undefined) o = "undefined";
|
||||
|
||||
else if(o instanceof Object[] arr) o = Arrays.toString(arr);
|
||||
else if(o instanceof int[] arr) o = Arrays.toString(arr);
|
||||
else if(o instanceof float[] arr) o = Arrays.toString(arr);
|
||||
else if(o instanceof byte[] arr) o = Arrays.toString(arr);
|
||||
else if(o instanceof double[] arr) o = Arrays.toString(arr);
|
||||
else if(o instanceof long[] arr) o = Arrays.toString(arr);
|
||||
else if(o instanceof char[] arr) o = Arrays.toString(arr);
|
||||
else if(o instanceof boolean[] arr) o = Arrays.toString(arr);
|
||||
|
||||
var out = o.toString();
|
||||
return out == null ? "null" : out;
|
||||
}catch(Throwable t){
|
||||
|
||||
@@ -80,9 +80,6 @@ public class ItemStack implements Comparable<ItemStack>{
|
||||
|
||||
@Override
|
||||
public String toString(){
|
||||
return "ItemStack{" +
|
||||
"item=" + item +
|
||||
", amount=" + amount +
|
||||
'}';
|
||||
return item + ": " + amount;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user