Requirement balancing

This commit is contained in:
Anuken
2021-12-24 12:52:32 -05:00
parent f755fd76b4
commit 67986ee72c
6 changed files with 38 additions and 28 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 791 B

After

Width:  |  Height:  |  Size: 762 B

View File

@@ -1125,7 +1125,7 @@ public class Blocks{
size = 3; size = 3;
itemCapacity = 20; itemCapacity = 20;
hasPower = hasItems = true; hasPower = hasItems = true;
drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawCrucible(), new DrawBlock(), new DrawHeatInput()); drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawCrucibleFlame(), new DrawBlock(), new DrawHeatInput());
drawer.iconOverride = new String[]{"-bottom", ""}; drawer.iconOverride = new String[]{"-bottom", ""};
ambientSound = Sounds.smelter; ambientSound = Sounds.smelter;
ambientSoundVolume = 0.07f; ambientSoundVolume = 0.07f;
@@ -1677,17 +1677,17 @@ public class Blocks{
//erekir transport blocks //erekir transport blocks
duct = new Duct("duct"){{ duct = new Duct("duct"){{
requirements(Category.distribution, with(Items.graphite, 2)); requirements(Category.distribution, with(Items.graphite, 1));
speed = 4f; speed = 4f;
}}; }};
ductRouter = new DuctRouter("duct-router"){{ ductRouter = new DuctRouter("duct-router"){{
requirements(Category.distribution, with(Items.graphite, 10)); requirements(Category.distribution, with(Items.graphite, 8));
speed = 4f; speed = 4f;
}}; }};
overflowDuct = new OverflowDuct("overflow-duct"){{ overflowDuct = new OverflowDuct("overflow-duct"){{
requirements(Category.distribution, with(Items.graphite, 10)); requirements(Category.distribution, with(Items.graphite, 8));
speed = 4f; speed = 4f;
}}; }};

View File

@@ -2494,6 +2494,37 @@ public class UnitTypes{
} }
}}; }};
//endregion
//region erekir - mech
//TODO
//endregion
//region erekir - flying
//TODO
//endregion
//region erekir - neoplasm
if(false)
scuttler = new NeoplasmUnitType("scuttler"){{
health = 20000;
armor = 17;
hitSize = 48f;
omniMovement = false;
rotateSpeed = 1.7f;
drownTimeMultiplier = 4f;
drawCell = false;
segments = 4;
drawBody = false;
crawlDamage = 2f;
segmentScl = 4f;
segmentPhase = 5f;
speed = 1f;
}};
//endregion //endregion
//region erekir - core //region erekir - core
@@ -2748,27 +2779,6 @@ public class UnitTypes{
//}}; //}};
//endregion
//region neoplasm
if(false)
scuttler = new NeoplasmUnitType("scuttler"){{
health = 20000;
armor = 17;
hitSize = 48f;
omniMovement = false;
rotateSpeed = 1.7f;
drownTimeMultiplier = 4f;
drawCell = false;
segments = 4;
drawBody = false;
crawlDamage = 2f;
segmentScl = 4f;
segmentPhase = 5f;
speed = 1f;
}};
//endregion //endregion
} }
} }

View File

@@ -249,7 +249,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
Schematics.placeLaunchLoadout(spawnX, spawnY); Schematics.placeLaunchLoadout(spawnX, spawnY);
//TODO this is only for testing //TODO this is only for testing
state.rules.defaultTeam.items().add(Seq.with(ItemStack.with(Items.beryllium, 300, Items.graphite, 300))); state.rules.defaultTeam.items().add(Seq.with(ItemStack.with(Items.beryllium, 1000, Items.graphite, 1000)));
//TODO proper waves //TODO proper waves
state.rules.waves = true; state.rules.waves = true;

View File

@@ -101,7 +101,7 @@ public class ModsDialog extends BaseDialog{
void modError(Throwable error){ void modError(Throwable error){
ui.loadfrag.hide(); ui.loadfrag.hide();
if(Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){ if(error instanceof NoSuchMethodError || Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){
ui.showErrorMessage("@feature.unsupported"); ui.showErrorMessage("@feature.unsupported");
}else if(error instanceof HttpStatusException st){ }else if(error instanceof HttpStatusException st){
ui.showErrorMessage(Core.bundle.format("connectfail", Strings.capitalize(st.status.toString().toLowerCase()))); ui.showErrorMessage(Core.bundle.format("connectfail", Strings.capitalize(st.status.toString().toLowerCase())));

View File

@@ -7,7 +7,7 @@ import arc.math.Interp.*;
import arc.util.*; import arc.util.*;
import mindustry.gen.*; import mindustry.gen.*;
public class DrawCrucible extends DrawPartial{ public class DrawCrucibleFlame extends DrawPartial{
public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585"); public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585");
public float flameRad = 1f, circleSpace = 2f, flameRadiusScl = 10f, flameRadiusMag = 0.6f, circleStroke = 1.5f; public float flameRad = 1f, circleSpace = 2f, flameRadiusScl = 10f, flameRadiusMag = 0.6f, circleStroke = 1.5f;