Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Balance & bugfixes

Browse Source
This commit is contained in:
Anuken
2020-09-05 22:58:07 -04:00
parent f87bd78674
commit e267519c6d
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Blocks.java
View File

@@ -509,7 +509,7 @@ public class Blocks implements ContentList{
siliconCrucible = new AttributeSmelter("silicon-crucible"){{ siliconCrucible = new AttributeSmelter("silicon-crucible"){{
requirements(Category.crafting, with(Items.titanium, 120, Items.metaglass, 80, Items.plastanium, 35, Items.silicon, 60)); requirements(Category.crafting, with(Items.titanium, 120, Items.metaglass, 80, Items.plastanium, 35, Items.silicon, 60));
craftEffect = Fx.smeltsmoke; craftEffect = Fx.smeltsmoke;
outputItem = new ItemStack(Items.silicon, 6); outputItem = new ItemStack(Items.silicon, 8);
craftTime = 90f; craftTime = 90f;
size = 3; size = 3;
hasPower = true; hasPower = true;
@@ -1564,13 +1564,13 @@ public class Blocks implements ContentList{
segment = new PointDefenseTurret("segment"){{ segment = new PointDefenseTurret("segment"){{
requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 25)); requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 25));
range = 100f; range = 125f;
hasPower = true; hasPower = true;
consumes.power(3f); consumes.power(3f);
size = 2; size = 2;
shootLength = 5f; shootLength = 5f;
bulletDamage = 18f; bulletDamage = 18f;
reloadTime = 15f; reloadTime = 11f;
health = 190 * size * size; health = 190 * size * size;
}}; }};

8
core/src/mindustry/content/UnitTypes.java
View File

@@ -138,6 +138,7 @@ public class UnitTypes implements ContentList{
health = 9000; health = 9000;
armor = 11f; armor = 11f;
mechLegMoveScl = 1.3f; mechLegMoveScl = 1.3f;
canDrown = false;
weapons.add( weapons.add(
new Weapon("scepter-weapon"){{ new Weapon("scepter-weapon"){{
@@ -194,6 +195,7 @@ public class UnitTypes implements ContentList{
health = 24000; health = 24000;
armor = 14f; armor = 14f;
mechLegMoveScl = 1.75f; mechLegMoveScl = 1.75f;
canDrown = false;
weapons.add( weapons.add(
new Weapon("reign-weapon"){{ new Weapon("reign-weapon"){{
@@ -206,7 +208,7 @@ public class UnitTypes implements ContentList{
ejectEffect = Fx.shellEjectBig; ejectEffect = Fx.shellEjectBig;
shootSound = Sounds.artillery; shootSound = Sounds.artillery;
bullet = new BasicBulletType(13f, 45){{ bullet = new BasicBulletType(13f, 55){{
pierce = true; pierce = true;
width = 14f; width = 14f;
height = 32f; height = 32f;
@@ -674,7 +676,7 @@ public class UnitTypes implements ContentList{
statusDuration = 60f * 10; statusDuration = 60f * 10;
fragLifeMin = 0.3f; fragLifeMin = 0.3f;
fragBullets = 12; fragBullets = 9;
fragBullet = new ArtilleryBulletType(2.3f, 30){{ fragBullet = new ArtilleryBulletType(2.3f, 30){{
hitEffect = Fx.sapExplosion; hitEffect = Fx.sapExplosion;
@@ -683,7 +685,7 @@ public class UnitTypes implements ContentList{
width = height = 20f; width = height = 20f;
collidesTiles = false; collidesTiles = false;
splashDamageRadius = 90f; splashDamageRadius = 90f;
splashDamage = 55f; splashDamage = 45f;
backColor = Pal.sapBulletBack; backColor = Pal.sapBulletBack;
frontColor = lightningColor = Pal.sapBullet; frontColor = lightningColor = Pal.sapBullet;
lightning = 2; lightning = 2;

6
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -90,6 +90,12 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
return 0; return 0;
} }
@Override
@Replace
public boolean canDrown(){
return isGrounded() && !hovering && type.canDrown && !(this instanceof WaterMovec);
}
@Override @Override
public int itemCapacity(){ public int itemCapacity(){
return type.itemCapacity; return type.itemCapacity;

6
core/src/mindustry/entities/comp/WaterMoveComp.java
View File

@@ -83,12 +83,6 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
} }
} }
@Replace
@Override
public boolean canDrown(){
return false;
}
@Replace @Replace
public float floorSpeedMultiplier(){ public float floorSpeedMultiplier(){
Floor on = isFlying() ? Blocks.air.asFloor() : floorOn(); Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();

2
core/src/mindustry/graphics/g3d/PlanetRenderer.java
View File

@@ -37,7 +37,7 @@ public class PlanetRenderer implements Disposable{
/** Camera used for rendering. */ /** Camera used for rendering. */
public Camera3D cam = new Camera3D(); public Camera3D cam = new Camera3D();
/** Raw vertex batch. */ /** Raw vertex batch. */
public final VertexBatch3D batch = new VertexBatch3D(10000, false, true, 0); public final VertexBatch3D batch = new VertexBatch3D(20000, false, true, 0);
public float zoom = 1f; public float zoom = 1f;

1
core/src/mindustry/type/UnitType.java
View File

@@ -69,6 +69,7 @@ public class UnitType extends UnlockableContent{
public int mineTier = -1; public int mineTier = -1;
public float buildSpeed = 1f, mineSpeed = 1f; public float buildSpeed = 1f, mineSpeed = 1f;
public boolean canDrown = true;
public float engineOffset = 5f, engineSize = 2.5f; public float engineOffset = 5f, engineSize = 2.5f;
public float strafePenalty = 0.5f; public float strafePenalty = 0.5f;
public float hitsize = 6f; public float hitsize = 6f;