Bugfixes, balancing

This commit is contained in:
Anuken
2022-02-12 23:24:40 -05:00
parent 907dc7a1e3
commit cb86156b49
5 changed files with 16 additions and 15 deletions
+9 -9
View File
@@ -1193,7 +1193,7 @@ public class Blocks{
liquidCapacity = 40f; liquidCapacity = 40f;
consumes.power(2f); consumes.power(2f);
heatRequirement = 5f; heatRequirement = 6f;
//TODO continuous output //TODO continuous output
outputLiquid = new LiquidStack(Liquids.nitrogen, 4f / 60f); outputLiquid = new LiquidStack(Liquids.nitrogen, 4f / 60f);
@@ -1222,7 +1222,7 @@ public class Blocks{
}}; }};
electricHeater = new HeatProducer("electric-heater"){{ electricHeater = new HeatProducer("electric-heater"){{
requirements(Category.crafting, with(Items.tungsten, 30, Items.graphite, 30)); requirements(Category.crafting, with(Items.tungsten, 30, Items.oxide, 30));
researchCostMultiplier = 4f; researchCostMultiplier = 4f;
@@ -1231,7 +1231,7 @@ public class Blocks{
drawer.iconOverride = new String[]{""}; drawer.iconOverride = new String[]{""};
size = 2; size = 2;
heatOutput = 3f; heatOutput = 3f;
consumes.power(0.5f / 60f); consumes.power(50f / 60f);
}}; }};
phaseHeater = new HeatProducer("phase-heater"){{ phaseHeater = new HeatProducer("phase-heater"){{
@@ -2237,7 +2237,7 @@ public class Blocks{
chemicalCombustionChamber = new ConsumeGenerator("chemical-combustion-chamber"){{ chemicalCombustionChamber = new ConsumeGenerator("chemical-combustion-chamber"){{
requirements(Category.power, with(Items.graphite, 40, Items.tungsten, 40, Items.oxide, 40f, Items.silicon, 30)); requirements(Category.power, with(Items.graphite, 40, Items.tungsten, 40, Items.oxide, 40f, Items.silicon, 30));
powerProduction = 9f; powerProduction = 9f;
consumes.liquids(LiquidStack.with(Liquids.ozone, 1f / 60f, Liquids.arkycite, 20f / 60f)); consumes.liquids(LiquidStack.with(Liquids.ozone, 2f / 60f, Liquids.arkycite, 20f / 60f));
size = 3; size = 3;
drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{ drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{
sinMag = 3f; sinMag = 3f;
@@ -3381,11 +3381,11 @@ public class Blocks{
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
acceptCoolant = false; acceptCoolant = false;
scaledHealth = 340; scaledHealth = 420;
range = 270f; range = 270f;
size = 4; size = 4;
limitRange(0f); limitRange(-5f);
}}; }};
//endregion //endregion
@@ -3546,7 +3546,7 @@ public class Blocks{
consumes.power(3f); consumes.power(3f);
areaSize = 13; areaSize = 13;
consumes.liquid(Liquids.nitrogen, 12f / 60f); consumes.liquid(Liquids.nitrogen, 24f / 60f);
}}; }};
//TODO requirements //TODO requirements
@@ -3557,7 +3557,7 @@ public class Blocks{
consumes.power(3f); consumes.power(3f);
areaSize = 13; areaSize = 13;
consumes.liquid(Liquids.nitrogen, 12f / 60f); consumes.liquid(Liquids.nitrogen, 24f / 60f);
}}; }};
//TODO requirements //TODO requirements
@@ -3568,7 +3568,7 @@ public class Blocks{
consumes.power(3f); consumes.power(3f);
areaSize = 13; areaSize = 13;
consumes.liquid(Liquids.nitrogen, 12f / 60f); consumes.liquid(Liquids.nitrogen, 24f / 60f);
}}; }};
//TODO requirements //TODO requirements
+4 -3
View File
@@ -2934,8 +2934,8 @@ public class UnitTypes{
unitSpawned = new MissileUnitType("quell-missile"){{ unitSpawned = new MissileUnitType("quell-missile"){{
speed = 3.8f; speed = 3.8f;
maxRange = 80f; maxRange = 15f;
lifetime = 60f * 1.4f; lifetime = 60f * 1.2f;
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
health = 45; health = 45;
@@ -2944,7 +2944,7 @@ public class UnitTypes{
mirror = false; mirror = false;
reload = 1f; reload = 1f;
shootOnDeath = true; shootOnDeath = true;
bullet = new ExplosionBulletType(130f, 22f){{ bullet = new ExplosionBulletType(100f, 22f){{
shootEffect = Fx.massiveExplosion; shootEffect = Fx.massiveExplosion;
}}; }};
}}); }});
@@ -3362,6 +3362,7 @@ public class UnitTypes{
engineSize = 2f; engineSize = 2f;
engineOffset = 6.5f; engineOffset = 6.5f;
payloadCapacity = 0f; payloadCapacity = 0f;
targetable = false;
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
isCounted = false; isCounted = false;
+1 -1
View File
@@ -36,7 +36,7 @@ public class Rules{
/** Whether this is the editor gamemode. */ /** Whether this is the editor gamemode. */
public boolean editor = false; public boolean editor = false;
/** Whether a gameover can happen at all. Set this to false to implement custom gameover conditions. */ /** Whether a gameover can happen at all. Set this to false to implement custom gameover conditions. */
public boolean canGameOver = false; public boolean canGameOver = true;
/** Whether cores change teams when they are destroyed. */ /** Whether cores change teams when they are destroyed. */
public boolean coreCapture = false; public boolean coreCapture = false;
/** Whether reactors can explode and damage other blocks. */ /** Whether reactors can explode and damage other blocks. */
@@ -30,7 +30,7 @@ public class MissileUnitType extends UnitType{
speed = 4f; speed = 4f;
lifetime = 60f * 1.7f; lifetime = 60f * 1.7f;
rotateSpeed = 2.5f; rotateSpeed = 2.5f;
range = 30f; range = 15f;
targetPriority = -1f; targetPriority = -1f;
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
//TODO weapon configs, etc? //TODO weapon configs, etc?
@@ -497,7 +497,7 @@ public class UnitAssembler extends PayloadBlock{
var output = unit(); var output = unit();
float hsize = output.hitSize * 1.4f; float hsize = output.hitSize * 1.4f;
return ((!output.flying && collisions.overlapsTile(Tmp.r1.setCentered(v.x, v.y, output.hitSize), EntityCollisions::solid)) || return ((!output.flying && collisions.overlapsTile(Tmp.r1.setCentered(v.x, v.y, output.hitSize), EntityCollisions::solid)) ||
Units.anyEntities(v.x - hsize/2f, v.y - hsize/2f, hsize, hsize, u -> (!same || u.type != output) && Units.anyEntities(v.x - hsize/2f, v.y - hsize/2f, hsize, hsize, u -> (!same || u.type != output) && !u.spawnedByCore &&
((u.type.allowLegStep && output.allowLegStep) || (output.flying && u.isFlying()) || (!output.flying && u.isGrounded())))); ((u.type.allowLegStep && output.allowLegStep) || (output.flying && u.isFlying()) || (!output.flying && u.isGrounded()))));
} }