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

map setting refund (#1709)

Browse Source
This commit is contained in:
ma44
2020-03-15 13:02:47 -05:00
committed by GitHub
parent 6079980a50
commit ec34e27102
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -777,6 +777,7 @@ rules.respawntime = Respawn Time:[lightgray] (sec)
rules.wavespacing = Wave Spacing:[lightgray] (sec) rules.wavespacing = Wave Spacing:[lightgray] (sec)
rules.buildcostmultiplier = Build Cost Multiplier rules.buildcostmultiplier = Build Cost Multiplier
rules.buildspeedmultiplier = Build Speed Multiplier rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Waves Wait for Enemies rules.waitForWaveToEnd = Waves Wait for Enemies
rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles) rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
rules.respawns = Max respawns per wave rules.respawns = Max respawns per wave

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

@@ -44,6 +44,8 @@ public class Rules{
public float buildCostMultiplier = 1f; public float buildCostMultiplier = 1f;
/** Multiplier for building speed. */ /** Multiplier for building speed. */
public float buildSpeedMultiplier = 1f; public float buildSpeedMultiplier = 1f;
/** Multiplier for percentage of materials refunded when deconstructing */
public float deconstructRefundMultiplier = 0.5f;
/** No-build zone around enemy core radius. */ /** No-build zone around enemy core radius. */
public float enemyCoreBuildRadius = 400f; public float enemyCoreBuildRadius = 400f;
/** Radius around enemy wave drop zones.*/ /** 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); check("$rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
number("$rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources); number("$rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources);
number("$rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier); 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); number("$rules.blockhealthmultiplier", f -> rules.blockHealthMultiplier = f, () -> rules.blockHealthMultiplier);
main.addButton("$configure", main.addButton("$configure",

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

@@ -252,7 +252,7 @@ public class BuildBlock extends Block{
} }
public void deconstruct(Unit builder, @Nullable TileEntity core, float amount){ public void deconstruct(Unit builder, @Nullable TileEntity core, float amount){
float deconstructMultiplier = 0.5f; float deconstructMultiplier = state.rules.deconstructRefundMultiplier;
if(cblock != null){ if(cblock != null){
ItemStack[] requirements = cblock.requirements; ItemStack[] requirements = cblock.requirements;