Correct erkir cloud color

This commit is contained in:
Anuken 2022-01-24 13:50:47 -05:00
parent 4a07c95e1c
commit b79ed071b8
6 changed files with 26 additions and 2 deletions

View File

@ -561,6 +561,7 @@ requirement.research = Research {0}
requirement.produce = Produce {0}
requirement.capture = Capture {0}
requirement.onplanet = Control Sector On {0}
requirement.onsector = Land On Sector {0}
launch.text = Launch
research.multiplayer = Only the host can research items.
map.multiplayer = Only the host can view sectors.

View File

@ -1096,7 +1096,7 @@ public class Blocks{
//TODO better name
electrolyzer = new GenericCrafter("electrolyzer"){{
requirements(Category.crafting, with(Items.silicon, 50, Items.graphite, 40, Items.beryllium, 50));
requirements(Category.crafting, with(Items.silicon, 50, Items.graphite, 40, Items.beryllium, 90, Items.tungsten, 40));
size = 3;
craftTime = 10f;

View File

@ -20,6 +20,8 @@ public class ErekirTechTree{
costMultipliers.put(Items.thorium, 9);
costMultipliers.put(Items.graphite, 9);
//TODO gate behind capture
Planets.erekir.techTree = nodeRoot("erekir", coreBastion, true, () -> {
context().researchCostMultipliers = costMultipliers;

View File

@ -48,6 +48,7 @@ public class Planets{
new HexSkyMesh(this, 2, 0.15f, 0.14f, 5, Color.valueOf("eba768").a(0.75f), 2, 0.42f, 1f, 0.43f),
new HexSkyMesh(this, 3, 0.6f, 0.15f, 5, Color.valueOf("eea293").a(0.75f), 2, 0.42f, 1.2f, 0.45f)
);
landCloudColor = Color.valueOf("ed6542");
atmosphereColor = Color.valueOf("f07218");
startSector = 10;
atmosphereRadIn = 0.02f;

View File

@ -365,7 +365,7 @@ public class Control implements ApplicationListener, Loadable{
//reset wave so things are more fair
state.wave = 1;
//set up default wave time
state.wavetime = state.rules.waveSpacing * (sector.preset == null ? 2f : sector.preset.startWaveTimeMultiplier);
state.wavetime = state.rules.initialWaveSpacing <= 0f ? (state.rules.waveSpacing * (sector.preset == null ? 2f : sector.preset.startWaveTimeMultiplier)) : state.rules.initialWaveSpacing;
//reset captured state
sector.info.wasCaptured = false;
//re-enable waves

View File

@ -68,6 +68,26 @@ public class Objectives{
}
}
public static class OnSector implements Objective{
public SectorPreset preset;
public OnSector(SectorPreset zone){
this.preset = zone;
}
protected OnSector(){}
@Override
public boolean complete(){
return preset.sector.hasBase();
}
@Override
public String display(){
return Core.bundle.format("requirement.onsector", preset.localizedName);
}
}
public static class OnPlanet implements Objective{
public Planet planet;