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

things

Browse Source
This commit is contained in:
Anuken
2020-10-03 15:35:26 -04:00
parent 58a62ad19c
commit 06f9aa5f84
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -757,14 +757,14 @@ public class Blocks implements ContentList{
plastaniumWall = new Wall("plastanium-wall"){{ plastaniumWall = new Wall("plastanium-wall"){{
requirements(Category.defense, with(Items.plastanium, 5, Items.metaglass, 2)); requirements(Category.defense, with(Items.plastanium, 5, Items.metaglass, 2));
health = 190 * wallHealthMultiplier; health = 130 * wallHealthMultiplier;
insulated = true; insulated = true;
absorbLasers = true; absorbLasers = true;
}}; }};
plastaniumWallLarge = new Wall("plastanium-wall-large"){{ plastaniumWallLarge = new Wall("plastanium-wall-large"){{
requirements(Category.defense, ItemStack.mult(plastaniumWall.requirements, 4)); requirements(Category.defense, ItemStack.mult(plastaniumWall.requirements, 4));
health = 190 * wallHealthMultiplier * 4; health = 130 * wallHealthMultiplier * 4;
size = 2; size = 2;
insulated = true; insulated = true;
absorbLasers = true; absorbLasers = true;

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

@@ -519,7 +519,7 @@ public class UnitTypes implements ContentList{
crawler = new UnitType("crawler"){{ crawler = new UnitType("crawler"){{
defaultController = SuicideAI::new; defaultController = SuicideAI::new;
speed = 0.85f; speed = 0.9f;
hitSize = 8f; hitSize = 8f;
health = 180; health = 180;
mechSideSway = 0.25f; mechSideSway = 0.25f;
@@ -536,7 +536,7 @@ public class UnitTypes implements ContentList{
speed = 1f; speed = 1f;
splashDamageRadius = 55f; splashDamageRadius = 55f;
instantDisappear = true; instantDisappear = true;
splashDamage = 55f; splashDamage = 60f;
killShooter = true; killShooter = true;
hittable = false; hittable = false;
collidesAir = true; collidesAir = true;

2
core/src/mindustry/mod/ContentParser.java
View File

@@ -542,7 +542,7 @@ public class ContentParser{
} }
void checkNullFields(Object object){ void checkNullFields(Object object){
if(object instanceof Number || object instanceof String || toBeParsed.contains(object)) return; if(object == null || object instanceof Number || object instanceof String || toBeParsed.contains(object) || object.getClass().getName().startsWith("arc.")) return;
parser.getFields(object.getClass()).values().toSeq().each(field -> { parser.getFields(object.getClass()).values().toSeq().each(field -> {
try{ try{

1
core/src/mindustry/world/blocks/distribution/OverflowGate.java
View File

@@ -23,6 +23,7 @@ public class OverflowGate extends Block{
instantTransfer = true; instantTransfer = true;
unloadable = false; unloadable = false;
canOverdrive = false; canOverdrive = false;
itemCapacity = 1;
} }
@Override @Override

2
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -75,6 +75,8 @@ public class CoreBlock extends StorageBlock{
public void setStats(){ public void setStats(){
super.setStats(); super.setStats();
stats.add(BlockStat.buildTime, 0, StatUnit.seconds);
bars.add("capacity", (CoreBuild e) -> bars.add("capacity", (CoreBuild e) ->
new Bar( new Bar(
() -> Core.bundle.format("bar.capacity", UI.formatAmount(e.storageCapacity)), () -> Core.bundle.format("bar.capacity", UI.formatAmount(e.storageCapacity)),

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=7d3ae40af604e0c0dfa1e01bb563675732b111a4 archash=6fca97cecdf28a696b2c19097f70960485a62743