Many bugfixes

This commit is contained in:
Anuken
2022-03-02 21:03:45 -05:00
parent 315c273de3
commit 7865950ec8
18 changed files with 102 additions and 53 deletions

View File

@@ -1701,7 +1701,7 @@ public class Blocks{
fogRadius = 27;
researchCost = with(Items.silicon, 50, Items.graphite, 50);
consumePower(0.2f);
consumePower(0.1f);
}};
buildTower = new BuildTurret("build-tower"){{
@@ -2541,7 +2541,7 @@ public class Blocks{
tier = 3;
size = 2;
range = 4;
fogRadius = 2;
fogRadius = 3;
researchCost = with(Items.beryllium, 10);
consumeLiquid(Liquids.hydrogen, 0.25f / 60f).boost();
@@ -2556,6 +2556,7 @@ public class Blocks{
tier = 5;
size = 3;
range = 6;
fogRadius = 4;
laserWidth = 0.7f;
itemCapacity = 20;
@@ -2577,6 +2578,8 @@ public class Blocks{
blockedItem = Items.thorium;
researchCostMultiplier = 0.5f;
fogRadius = 4;
consumePower(160f / 60f);
consumeLiquid(Liquids.water, 0.2f);
}};
@@ -2601,6 +2604,7 @@ public class Blocks{
arrowSpacing = 5f;
arrows = 2;
glowColor.a = 0.6f;
fogRadius = 5;
//TODO different requirements
consumePower(6f);
@@ -2661,6 +2665,7 @@ public class Blocks{
thrusterLength = 34/4f;
armor = 5f;
alwaysUnlocked = true;
incinerateNonBuildable = true;
//TODO should this be higher?
buildCostMultiplier = 0.75f;
@@ -2678,6 +2683,7 @@ public class Blocks{
size = 5;
thrusterLength = 40/4f;
armor = 10f;
incinerateNonBuildable = true;
unitCapModifier = 30;
researchCostMultipliers.put(Items.silicon, 0.4f);
@@ -2694,6 +2700,7 @@ public class Blocks{
size = 6;
thrusterLength = 48/4f;
armor = 15f;
incinerateNonBuildable = true;
unitCapModifier = 30;
researchCostMultipliers.put(Items.silicon, 0.3f);

View File

@@ -310,29 +310,29 @@ public class ErekirTechTree{
});
nodeProduce(Items.beryllium, () -> {
nodeProduce(Items.sand, () -> {
nodeProduce(Items.silicon, () -> {
nodeProduce(Items.oxide, () -> {
nodeProduce(Items.fissileMatter, () -> {
});
});
});
});
nodeProduce(Liquids.water, () -> {
nodeProduce(Liquids.ozone, () -> {
nodeProduce(Liquids.hydrogen, () -> {
nodeProduce(Liquids.nitrogen, () -> {
nodeProduce(Liquids.cyanogen, () -> {
});
});
});
});
});
nodeProduce(Items.graphite, () -> {
nodeProduce(Items.sand, () -> {
nodeProduce(Items.silicon, () -> {
nodeProduce(Items.oxide, () -> {
nodeProduce(Items.fissileMatter, () -> {
});
});
});
});
nodeProduce(Liquids.water, () -> {
nodeProduce(Liquids.ozone, () -> {
nodeProduce(Liquids.hydrogen, () -> {
nodeProduce(Liquids.nitrogen, () -> {
nodeProduce(Liquids.cyanogen, () -> {
});
});
});
});
});
nodeProduce(Items.tungsten, () -> {
nodeProduce(Liquids.slag, () -> {

View File

@@ -37,12 +37,14 @@ public class Items{
sand = new Item("sand", Color.valueOf("f7cba4")){{
lowPriority = true;
alwaysUnlocked = true;
buildable = false;
}};
coal = new Item("coal", Color.valueOf("272727")){{
explosiveness = 0.2f;
flammability = 1f;
hardness = 2;
buildable = false;
}};
titanium = new Item("titanium", Color.valueOf("8da1e3")){{
@@ -87,16 +89,19 @@ public class Items{
sporePod = new Item("spore-pod", Color.valueOf("7457ce")){{
flammability = 1.15f;
buildable = false;
}};
blastCompound = new Item("blast-compound", Color.valueOf("ff795e")){{
flammability = 0.4f;
explosiveness = 1.2f;
buildable = false;
}};
pyratite = new Item("pyratite", Color.valueOf("ffaa5f")){{
flammability = 1.4f;
explosiveness = 0.4f;
buildable = false;
}};
beryllium = new Item("beryllium", Color.valueOf("3a8f64")){{

View File

@@ -68,7 +68,7 @@ public class Planets{
r.attributes.set(Attribute.heat, 0.8f);
r.showSpawns = true;
r.fog = true;
//r.staticFog = false;
r.staticFog = true; //TODO false
};
unlockedOnLand.add(Blocks.coreBastion);

View File

@@ -2502,7 +2502,7 @@ public class UnitTypes{
//TODO make this look nicer
bullet = new RailBulletType(){{
length = 140f;
length = 160f;
damage = 45f;
hitColor = Color.valueOf("feb380");
hitEffect = endEffect = Fx.hitBulletColor;