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

Minor fixes, crawler coal research removed

Browse Source
This commit is contained in:
Anuken
2024-09-01 12:31:56 -04:00
parent 863611a3e3
commit a6da8cb02f
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/SerpuloTechTree.java
View File

@@ -2,6 +2,7 @@ package mindustry.content;
import arc.struct.*; import arc.struct.*;
import mindustry.game.Objectives.*; import mindustry.game.Objectives.*;
import mindustry.type.*;
import static mindustry.content.Blocks.*; import static mindustry.content.Blocks.*;
import static mindustry.content.SectorPresets.craters; 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(atrax, () -> {
node(spiroct, () -> { node(spiroct, () -> {
node(arkyid, () -> { node(arkyid, () -> {

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

@@ -1912,7 +1912,7 @@ public class UnitTypes{
trailWidth = 3f; trailWidth = 3f;
trailLength = 8; trailLength = 8;
splashDamage = 33f; splashDamage = 36f;
splashDamageRadius = 32f; splashDamageRadius = 32f;
}}; }};
}}); }});

12
core/src/mindustry/mod/Scripts.java
View File

@@ -12,6 +12,7 @@ import rhino.module.provider.*;
import java.io.*; import java.io.*;
import java.net.*; import java.net.*;
import java.util.*;
import java.util.regex.*; import java.util.regex.*;
public class Scripts implements Disposable{ public class Scripts implements Disposable{
@@ -46,7 +47,18 @@ public class Scripts implements Disposable{
Object o = context.evaluateString(scope, text, "console.js", 1); Object o = context.evaluateString(scope, text, "console.js", 1);
if(o instanceof NativeJavaObject n) o = n.unwrap(); if(o instanceof NativeJavaObject n) o = n.unwrap();
if(o == null) o = "null"; if(o == null) o = "null";
else if(o instanceof Undefined) o = "undefined"; 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(); var out = o.toString();
return out == null ? "null" : out; return out == null ? "null" : out;
}catch(Throwable t){ }catch(Throwable t){

5
core/src/mindustry/type/ItemStack.java
View File

@@ -80,9 +80,6 @@ public class ItemStack implements Comparable<ItemStack>{
@Override @Override
public String toString(){ public String toString(){
return "ItemStack{" + return item + ": " + amount;
"item=" + item +
", amount=" + amount +
'}';
} }
} }