Massive amount of bugfixes, too many to list in commit log

This commit is contained in:
Anuken
2018-07-05 12:05:53 -04:00
parent 4a32706c5a
commit b9ef88951e
33 changed files with 278 additions and 156 deletions

View File

@@ -21,11 +21,13 @@ public class Items implements ContentList{
tungsten = new Item("tungsten", Color.valueOf("a0b0c8")) {{
type = ItemType.material;
hardness = 1;
cost = 0.75f;
}};
lead = new Item("lead", Color.valueOf("8e85a2")) {{
type = ItemType.material;
hardness = 1;
cost = 0.6f;
}};
coal = new Item("coal", Color.valueOf("272727")) {{
@@ -41,6 +43,7 @@ public class Items implements ContentList{
titanium = new Item("titanium", Color.valueOf("8da1e3")) {{
type = ItemType.material;
hardness = 3;
cost = 1.1f;
}};
thorium = new Item("thorium", Color.valueOf("f9a3c7")) {{
@@ -48,20 +51,24 @@ public class Items implements ContentList{
explosiveness = 0.1f;
hardness = 4;
radioactivity = 0.5f;
cost = 1.2f;
}};
silicon = new Item("silicon", Color.valueOf("53565c")) {{
type = ItemType.material;
cost = 0.9f;
}};
plastanium = new Item("plastanium", Color.valueOf("e9ead3")) {{
type = ItemType.material;
flammability = 0.1f;
explosiveness = 0.1f;
cost = 1.5f;
}};
phasematter = new Item("phase-matter", Color.valueOf("f4ba6e")) {{
type = ItemType.material;
cost = 1.5f;
}};
surgealloy = new Item("surge-alloy", Color.valueOf("b4d5c7")) {{

View File

@@ -101,6 +101,8 @@ public class Recipes implements ContentList{
new Recipe(power, PowerBlocks.solarPanel, new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 30));
new Recipe(power, PowerBlocks.largeSolarPanel, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 290), new ItemStack(Items.phasematter, 30));
//generators - other
new Recipe(power, PowerBlocks.nuclearReactor, new ItemStack(Items.lead, 600), new ItemStack(Items.silicon, 400), new ItemStack(Items.carbide, 300), new ItemStack(Items.thorium, 300));
//new Recipe(distribution, StorageBlocks.core, new ItemStack(Items.carbide, 50));
new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.carbide, 40), new ItemStack(Items.silicon, 50));

View File

@@ -22,6 +22,7 @@ public class PowerBlocks extends BlockList implements ContentList {
maxLiquidGenerate = 0.5f;
powerPerLiquid = 0.08f;
powerCapacity = 40f;
powerPerLiquid = 0.25f;
generateEffect = BlockFx.redgeneratespark;
size = 2;
}};
@@ -30,6 +31,7 @@ public class PowerBlocks extends BlockList implements ContentList {
powerOutput = 0.28f;
powerCapacity = 40f;
itemDuration = 30f;
powerPerLiquid = 0.7f;
auxLiquidUse = 0.05f;
size = 2;
}};
@@ -51,7 +53,8 @@ public class PowerBlocks extends BlockList implements ContentList {
nuclearReactor = new NuclearReactor("nuclear-reactor") {{
size = 3;
health = 600;
health = 700;
powerMultiplier = 0.8f;
}};
fusionReactor = new FusionReactor("fusion-reactor") {{

View File

@@ -83,13 +83,13 @@ public class TurretBlocks extends BlockList implements ContentList {
}};
lancer = new LaserTurret("lancer") {{
range = 70f;
chargeTime = 70f;
range = 90f;
chargeTime = 60f;
chargeMaxDelay = 30f;
chargeEffects = 7;
shootType = AmmoTypes.lancerLaser;
recoil = 2f;
reload = 130f;
reload = 100f;
cooldown = 0.03f;
powerUsed = 20f;
powerCapacity = 60f;
@@ -131,7 +131,7 @@ public class TurretBlocks extends BlockList implements ContentList {
salvo = new BurstTurret("salvo") {{
size = 2;
range = 110f;
range = 120f;
ammoTypes = new AmmoType[]{AmmoTypes.bulletTungsten, AmmoTypes.bulletCarbide, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon};
reload = 40f;
restitution = 0.03f;

View File

@@ -96,7 +96,7 @@ public class TurretBullets extends BulletList implements ContentList {
Color[] colors = {Palette.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Palette.lancerLaser, Color.WHITE};
float[] tscales = {1f, 0.7f, 0.5f, 0.2f};
float[] lenscales = {1f, 1.1f, 1.13f, 1.14f};
float length = 70f;
float length = 90f;
{
hiteffect = BulletFx.hitLancer;