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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse Source 
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
This commit is contained in:
Anuken
2020-03-17 20:03:12 -04:00
parent 12d4aab48a 71f20f928a
commit 436c76fd2f
8 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/core/ContentLoader.java
View File

@@ -1,5 +1,6 @@
package mindustry.core;
import arc.files.*;
import arc.struct.*;
import arc.func.*;
import arc.graphics.*;
@@ -180,6 +181,9 @@ public class ContentLoader{
}
if(currentMod != null){
content.minfo.mod = currentMod;
if(content.minfo.sourceFile == null){
content.minfo.sourceFile = new Fi(content.name);
}
}
contentNameMap[content.getContentType().ordinal()].put(content.name, content);
}

2
core/src/mindustry/game/Rules.java
View File

@@ -45,6 +45,8 @@ public class Rules{
public float buildCostMultiplier = 1f;
/** Multiplier for building speed. */
public float buildSpeedMultiplier = 1f;
/** Multiplier for percentage of materials refunded when deconstructing */
public float deconstructRefundMultiplier = 0.5f;
/** No-build zone around enemy core radius. */
public float enemyCoreBuildRadius = 400f;
/** Radius around enemy wave drop zones.*/

1
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -142,6 +142,7 @@ public class CustomRulesDialog extends FloatingDialog{
check("$rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
number("$rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources);
number("$rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier);
number("$rules.deconstructrefundmultiplier", false, f -> rules.deconstructRefundMultiplier = f, () -> rules.deconstructRefundMultiplier, () -> !rules.infiniteResources);
number("$rules.blockhealthmultiplier", f -> rules.blockHealthMultiplier = f, () -> rules.blockHealthMultiplier);
main.addButton("$configure",

4
core/src/mindustry/world/blocks/BuildBlock.java
View File

@@ -127,7 +127,7 @@ public class BuildBlock extends Block{
private float[] accumulator;
private float[] totalAccumulator;
@Override
public String getDisplayName(){
return Core.bundle.format("block.constructing", cblock == null ? previous.localizedName : cblock.localizedName);
@@ -230,7 +230,7 @@ public class BuildBlock extends Block{
}
public void deconstruct(Unitc builder, @Nullable Tilec core, float amount){
float deconstructMultiplier = 0.5f;
float deconstructMultiplier = state.rules.deconstructRefundMultiplier;
if(cblock != null){
ItemStack[] requirements = cblock.requirements;