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

Further research cost reduction

Browse Source
This commit is contained in:
Anuken
2022-02-19 16:48:22 -05:00
parent 8ce4f4683c
commit 864fddffa3
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -925,7 +925,7 @@ public class Blocks{
envDisabled = Env.none; envDisabled = Env.none;
itemCapacity = 30; itemCapacity = 30;
drawer = new DrawArcSmelter(); drawer = new DrawArcSmelter();
researchCostMultiplier = 0.3f; researchCostMultiplier = 1f / 10f;
consumeItems(with(Items.graphite, 1, Items.sand, 4)); consumeItems(with(Items.graphite, 1, Items.sand, 4));
consumePower(6f); consumePower(6f);
@@ -1875,7 +1875,7 @@ public class Blocks{
buildVisibility = BuildVisibility.berylliumOnly; buildVisibility = BuildVisibility.berylliumOnly;
health = 90; health = 90;
speed = 4f; speed = 4f;
researchCostMultiplier = 1f / 12f; researchCostMultiplier = 1f / 6f;
}}; }};
ductRouter = new DuctRouter("duct-router"){{ ductRouter = new DuctRouter("duct-router"){{
@@ -2154,7 +2154,7 @@ public class Blocks{
health = 90; health = 90;
consumePowerBuffered(1000f); consumePowerBuffered(1000f);
range = 10; range = 10;
researchCostMultiplier = 0.8f; researchCostMultiplier = 0.2f;
}}; }};
//TODO requirements //TODO requirements
@@ -2291,7 +2291,7 @@ public class Blocks{
hasLiquids = true; hasLiquids = true;
outputLiquid = new LiquidStack(Liquids.water, 5f / 60f / 9f); outputLiquid = new LiquidStack(Liquids.water, 5f / 60f / 9f);
liquidCapacity = 20f; liquidCapacity = 20f;
researchCostMultiplier = 0.18f / 13f; researchCostMultiplier = 1f / 18f;
}}; }};
//TODO rename //TODO rename
@@ -2488,6 +2488,7 @@ public class Blocks{
size = 2; size = 2;
attribute = Attribute.sand; attribute = Attribute.sand;
output = Items.sand; output = Items.sand;
researchCostMultiplier = 1f / 8f;
}}; }};
plasmaBore = new BeamDrill("plasma-bore"){{ plasmaBore = new BeamDrill("plasma-bore"){{
@@ -2497,7 +2498,7 @@ public class Blocks{
tier = 3; tier = 3;
size = 2; size = 2;
range = 4; range = 4;
researchCostMultiplier = 0.18f / 12f; researchCostMultiplier = 1f / 30f;
consumeLiquid(Liquids.hydrogen, 0.25f / 60f).boost(); consumeLiquid(Liquids.hydrogen, 0.25f / 60f).boost();
}}; }};

2
core/src/mindustry/world/Block.java
View File

@@ -989,7 +989,7 @@ public class Block extends UnlockableContent implements Senseable{
if(researchCostMultiplier <= 0f) return ItemStack.empty; if(researchCostMultiplier <= 0f) return ItemStack.empty;
ItemStack[] out = new ItemStack[requirements.length]; ItemStack[] out = new ItemStack[requirements.length];
for(int i = 0; i < out.length; i++){ for(int i = 0; i < out.length; i++){
int quantity = 60 + Mathf.round(Mathf.pow(requirements[i].amount, 1.11f) * 20 * researchCostMultiplier * researchCostMultipliers.get(requirements[i].item, 1f), 10); int quantity = Mathf.round(60 * researchCostMultiplier + Mathf.pow(requirements[i].amount, 1.11f) * 20 * researchCostMultiplier * researchCostMultipliers.get(requirements[i].item, 1f), 10);
out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity)); out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity));
} }