Bugfixes / Mender block / Extra stats / Balancing

This commit is contained in:
Anuken
2019-03-26 11:05:47 -04:00
parent 0b1e2bf19b
commit 10c999a4a2
29 changed files with 1957 additions and 1822 deletions
@@ -53,7 +53,7 @@ public class Blocks implements ContentList{
//defense
scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, forceProjector, shockMine,
phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, forceProjector, shockMine,
//transport
conveyor, titaniumConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, router, overflowGate, massDriver,
@@ -529,7 +529,7 @@ public class Blocks implements ContentList{
cultivator = new Cultivator("cultivator"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 20, Items.lead, 50, Items.silicon, 20));
output = Items.sporePod;
craftTime = 200;
craftTime = 160;
size = 2;
hasLiquids = true;
hasPower = true;
@@ -544,7 +544,7 @@ public class Blocks implements ContentList{
liquidCapacity = 60f;
craftTime = 20f;
outputLiquid = Liquids.oil;
outputLiquidAmount = 2.5f;
outputLiquidAmount = 4f;
size = 2;
health = 320;
hasLiquids = true;
@@ -695,10 +695,23 @@ public class Blocks implements ContentList{
size = 2;
}};
mender = new MendProjector("mender"){{
requirements(Category.effect, ItemStack.with(Items.lead, 60, Items.copper, 50));
consumes.power(0.7f);
size = 1;
reload = 200f;
range = 40f;
healPercent = 5f;
consumes.item(Items.phasefabric).optional(true);
}};
mendProjector = new MendProjector("mend-projector"){{
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 50, Items.silicon, 180));
consumes.power(2f);
requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 40, Items.silicon, 80));
consumes.power(1.8f);
size = 2;
reload = 250f;
range = 70f;
healPercent = 13f;
consumes.item(Items.phasefabric).optional(true);
}};
@@ -1118,7 +1131,7 @@ public class Blocks implements ContentList{
Items.scrap, Bullets.flakScrap,
Items.lead, Bullets.flakLead
);
reload = 33f;
reload = 25f;
range = 180f;
size = 2;
burstSpacing = 5f;
@@ -1126,7 +1139,7 @@ public class Blocks implements ContentList{
targetGround = false;
recoil = 2f;
rotatespeed = 10f;
rotatespeed = 15f;
inaccuracy = 17f;
shootCone = 35f;
@@ -141,25 +141,25 @@ public class Bullets implements ContentList{
}};
flakLead = new FlakBulletType(4.2f, 3){{
lifetime = 50f;
lifetime = 60f;
ammoMultiplier = 3f;
shootEffect = Fx.shootSmall;
bulletWidth = 6f;
bulletHeight = 8f;
hitEffect = Fx.flakExplosion;
splashDamage = 30f;
splashDamage = 35f;
splashDamageRadius = 15f;
}};
flakScrap = new FlakBulletType(4f, 3){{
lifetime = 50f;
lifetime = 60f;
ammoMultiplier = 3f;
shootEffect = Fx.shootSmall;
reloadMultiplier = 0.5f;
bulletWidth = 6f;
bulletHeight = 8f;
hitEffect = Fx.flakExplosion;
splashDamage = 24f;
splashDamage = 26f;
splashDamageRadius = 24f;
}};
@@ -201,7 +201,9 @@ public class TechTree implements ContentList{
});
});
});
});
node(mender, () -> {
node(mendProjector, () -> {
node(forceProjector, () -> {
node(overdriveProjector, () -> {
@@ -263,7 +265,7 @@ public class TechTree implements ContentList{
private TechNode node(Block block, Runnable children){
ItemStack[] requirements = new ItemStack[block.buildRequirements.length];
for(int i = 0; i < requirements.length; i++){
requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 6);
requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 5);
}
return new TechNode(block, requirements, children);